Index: boot/bootdata/hivesft.inf =================================================================== --- boot/bootdata/hivesft.inf (revision 63086) +++ boot/bootdata/hivesft.inf (working copy) @@ -1342,7 +1342,7 @@ ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost", "netsvcs",0x00010000,"DHCP" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost", "netsvcs",0x00010000,"DHCP","BITS" ; Win32 config HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 Index: boot/bootdata/hivesys.inf =================================================================== --- boot/bootdata/hivesys.inf (revision 63086) +++ boot/bootdata/hivesys.inf (working copy) @@ -1304,6 +1304,16 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001 +; Background Intelligent Transfer Service (BITS) +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","DisplayName",0x00000000,"BITS" +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","Description",0x00000000,"Background Intelligent Transfer Service (BITS)" +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\BITS\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\qmgr.dll" + ; BlueScreen device driver HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Group",0x00000000,"Video Init" @@ -1393,13 +1403,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 -; Kernel-Mode Tests -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ImagePath",0x00020000,"system32\drivers\kmtest.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Type",0x00010001,0x00000001 - ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class" Index: dll/win32/qmgr/CMakeLists.txt =================================================================== --- dll/win32/qmgr/CMakeLists.txt (revision 63086) +++ dll/win32/qmgr/CMakeLists.txt (working copy) @@ -21,7 +21,7 @@ rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def) -set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qmgr.inf) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qmgr.rgs) add_idl_headers(qmgr_idlheader qmgr_local.idl) set_module_type(qmgr win32dll) target_link_libraries(qmgr uuid wine) Index: dll/win32/qmgr/qmgr.inf =================================================================== --- dll/win32/qmgr/qmgr.inf (revision 63086) +++ dll/win32/qmgr/qmgr.inf (working copy) @@ -1,16 +0,0 @@ -[version] -Signature="$CHICAGO$" - -[RegisterDll] -AddReg = Qmgr.Reg - -[UnregisterDll] -DelReg = Qmgr.Reg - -[Qmgr.Reg] -HKCR,"AppID\BITS","AppID",,"%CLSID_BackgroundCopyQMgr%" -HKCR,"AppID\%CLSID_BackgroundCopyQMgr%","LocalService",,"BITS" -HKCR,"CLSID\%CLSID_BackgroundCopyManager%","AppID",,"%CLSID_BackgroundCopyQMgr%" - -HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010008,"BITS" -HKLM,"System\CurrentControlSet\Services\BITS\Parameters","ServiceDll",0x00020000,"qmgr.dll" Index: dll/win32/qmgr/qmgr.rgs =================================================================== --- dll/win32/qmgr/qmgr.rgs (revision 0) +++ dll/win32/qmgr/qmgr.rgs (working copy) @@ -0,0 +1,15 @@ +HKCR +{ + NoRemove AppID + { + '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' { val LocalService = s 'BITS' } + BITS { val AppID = s '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' } + } + NoRemove CLSID + { + '{4991D34B-80A1-4291-83B6-3328366B9097}' + { + val AppID = s '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' + } + } +} Index: dll/win32/qmgr/qmgr.rgs =================================================================== --- dll/win32/qmgr/qmgr.rgs (revision 0) +++ dll/win32/qmgr/qmgr.rgs (working copy) Property changes on: dll/win32/qmgr/qmgr.rgs ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: dll/win32/qmgr/qmgr_main.c =================================================================== --- dll/win32/qmgr/qmgr_main.c (revision 63086) +++ dll/win32/qmgr/qmgr_main.c (working copy) @@ -29,6 +29,7 @@ #include #include #include +#include #include /* Handle to the base address of this DLL */ @@ -55,81 +56,12 @@ return TRUE; } -static HRESULT init_register_strtable(STRTABLEA *strtable) -{ -#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } - static const struct { - const char *name; - const CLSID *clsid; - } expns[] = { - CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr), - CLSID_EXPANSION_ENTRY(BackgroundCopyManager) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - DWORD i; - - strtable->cEntries = sizeof pse / sizeof pse[0]; - strtable->pse = pse; - for (i = 0; i < strtable->cEntries; i++) { - static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; - const CLSID *clsid = expns[i].clsid; - pse[i].pszName = qmgr_strdup(expns[i].name); - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); - if (!pse[i].pszName || !pse[i].pszValue) - return E_OUTOFMEMORY; - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], - clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); - } - - return S_OK; -} - -static void cleanup_register_strtable(STRTABLEA *strtable) -{ - DWORD i; - for (i = 0; i < strtable->cEntries; i++) { - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); - if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) - return; - } -} - -/* Use an INF file to register or unregister the DLL */ -static HRESULT register_server(BOOL do_register) -{ - HRESULT hr; - STRTABLEA strtable; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - TRACE("(%x)\n", do_register); - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hr = init_register_strtable(&strtable); - if (SUCCEEDED(hr)) - hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", - &strtable); - cleanup_register_strtable(&strtable); - - if (FAILED(hr)) - ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources(hInst); } HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources(hInst); } Index: dll/win32/qmgr/rsrc.rc =================================================================== --- dll/win32/qmgr/rsrc.rc (revision 63086) +++ dll/win32/qmgr/rsrc.rc (working copy) @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: qmgr.inf */ -REGINST REGINST qmgr.inf +/* @makedep: qmgr.rgs */ +1 WINE_REGISTRY qmgr.rgs