April 2006 - Wine-commits - list.winehq.org

Mike McCormack : regsvr32: Ignore the /c flag.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 13dccd7541da30614b384af3b0d6cb1f9baf4604 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13dccd7541da30614b384af… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Apr 17 18:14:54 2006 +0900 regsvr32: Ignore the /c flag. --- programs/regsvr32/regsvr32.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index d284fb7..ed1fc64 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -31,6 +31,7 @@ * [/i] Call DllInstall passing it an optional [cmdline]; * when used with /u calls dll uninstall. * [/n] Do not call DllRegisterServer; this option must be used with [/i] + * [/c] Console output (seems to be deprecated and ignored) * * Note the complication that this version may be passed unix format file names * which might be mistaken for flags. Conveniently the Windows version @@ -242,6 +243,8 @@ int main(int argc, char* argv[]) } else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n"))) CallRegister = FALSE; + else if((!strcasecmp(argv[i], "/c"))||(!strcasecmp(argv[i], "-c"))) + /* console output */; else if (argv[i][0] == '/' && (!argv[i][2] || argv[i][2] == ':')) printf("Unrecognized switch %s\n", argv[i]); else

1 0

Detlef Riekenberg : winspool: Basic tests for DeleteMonitor.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 15e4ad4866c0b7a906f53b9c3a6c97e500ab705e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15e4ad4866c0b7a906f53b9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Apr 16 02:42:34 2006 +0200 winspool: Basic tests for DeleteMonitor. --- dlls/winspool/tests/info.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index c3c83bd..cc3969e 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -331,6 +331,89 @@ static void test_AddMonitor(void) /* ########################### */ +static void test_DeleteMonitor(void) +{ + MONITOR_INFO_2A mi2a; + struct monitor_entry * entry = NULL; + DWORD res; + + entry = find_installed_monitor(); + + if (!entry) { + trace("No usable Monitor found: Skip tests\n"); + return; + } + + mi2a.pName = winetest_monitor; + mi2a.pEnvironment = entry->env; + mi2a.pDLLName = entry->dllname; + + /* Testing DeleteMonitor with real options */ + AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + + SetLastError(MAGIC_DEAD); + res = DeleteMonitorA(NULL, entry->env, winetest_monitor); + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); + + /* Delete the Monitor twice */ + SetLastError(MAGIC_DEAD); + res = DeleteMonitorA(NULL, entry->env, winetest_monitor); + /* NT: ERROR_UNKNOWN_PRINT_MONITOR (3000), 9x: ERROR_INVALID_PARAMETER (87) */ + ok( !res && + ((GetLastError() == ERROR_UNKNOWN_PRINT_MONITOR) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %ld with %ld (expected '0' with: ERROR_UNKNOWN_PRINT_MONITOR" \ + " or ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + /* the environment */ + AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + SetLastError(MAGIC_DEAD); + res = DeleteMonitorA(NULL, NULL, winetest_monitor); + ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); + + AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + SetLastError(MAGIC_DEAD); + res = DeleteMonitorA(NULL, "", winetest_monitor); + ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); + + AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + SetLastError(MAGIC_DEAD); + res = DeleteMonitorA(NULL, "bad_env", winetest_monitor); + ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); + + /* the monitor-name */ + AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + SetLastError(MAGIC_DEAD); + res = DeleteMonitorA(NULL, entry->env, NULL); + /* NT: ERROR_INVALID_PARAMETER (87), 9x: ERROR_INVALID_NAME (123)*/ + ok( !res && + ((GetLastError() == ERROR_INVALID_PARAMETER) || + (GetLastError() == ERROR_INVALID_NAME)), + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " \ + "ERROR_INVALID_NAME)\n", res, GetLastError()); + + AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + SetLastError(MAGIC_DEAD); + res = DeleteMonitorA(NULL, entry->env, ""); + /* NT: ERROR_INVALID_PARAMETER (87), 9x: ERROR_INVALID_NAME (123)*/ + ok( !res && + ((GetLastError() == ERROR_INVALID_PARAMETER) || + (GetLastError() == ERROR_INVALID_NAME)), + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " \ + "ERROR_INVALID_NAME)\n", res, GetLastError()); + + AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + SetLastError(MAGIC_DEAD); + res = DeleteMonitorA("", entry->env, winetest_monitor); + ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); + + /* cleanup */ + DeleteMonitorA(NULL, entry->env, winetest_monitor); +} + + +/* ########################### */ + static void test_EnumMonitors(void) { DWORD res; @@ -1008,6 +1091,7 @@ START_TEST(info) find_default_printer(); test_AddMonitor(); + test_DeleteMonitor(); test_EnumMonitors(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory();

1 0

Detlef Riekenberg : winspool: Implement DeleteMonitor.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 3b38308a7a6960d5d50f6da2fdcc87b6372eef39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3b38308a7a6960d5d50f6da… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Apr 16 02:56:27 2006 +0200 winspool: Implement DeleteMonitor. --- dlls/winspool/info.c | 86 ++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 72 insertions(+), 14 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 115b51e..0288269 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -200,6 +200,7 @@ static BOOL WINSPOOL_GetPrinterDriver(HA DWORD cbBuf, LPDWORD pcbNeeded, BOOL unicode); static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey); +static DWORD WINSPOOL_SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey); /****************************************************************** * validate the user-supplied printing-environment [internal] @@ -1506,13 +1507,37 @@ DeletePrinterDriverW (LPWSTR pName, LPWS * See DeleteMonitorW. * */ -BOOL WINAPI -DeleteMonitorA (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName) +BOOL WINAPI DeleteMonitorA (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName) { - FIXME("(%s,%s,%s):stub\n",debugstr_a(pName),debugstr_a(pEnvironment), - debugstr_a(pMonitorName)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPWSTR nameW = NULL; + LPWSTR EnvironmentW = NULL; + LPWSTR MonitorNameW = NULL; + BOOL res; + INT len; + + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + + if (pEnvironment) { + len = MultiByteToWideChar(CP_ACP, 0, pEnvironment, -1, NULL, 0); + EnvironmentW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pEnvironment, -1, EnvironmentW, len); + } + if (pMonitorName) { + len = MultiByteToWideChar(CP_ACP, 0, pMonitorName, -1, NULL, 0); + MonitorNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pMonitorName, -1, MonitorNameW, len); + } + + res = DeleteMonitorW(nameW, EnvironmentW, MonitorNameW); + + HeapFree(GetProcessHeap(), 0, MonitorNameW); + HeapFree(GetProcessHeap(), 0, EnvironmentW); + HeapFree(GetProcessHeap(), 0, nameW); + return (res); } /****************************************************************** @@ -1529,17 +1554,50 @@ DeleteMonitorA (LPSTR pName, LPSTR pEnvi * Success: TRUE * Failure: FALSE * - * BUGS - * only a Stub + * NOTES + * pEnvironment is ignored in Windows for the local Computer. * */ -BOOL WINAPI -DeleteMonitorW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) + +BOOL WINAPI DeleteMonitorW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) { - FIXME("(%s,%s,%s):stub\n",debugstr_w(pName),debugstr_w(pEnvironment), - debugstr_w(pMonitorName)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + HKEY hroot = NULL; + + TRACE("(%s, %s, %s)\n",debugstr_w(pName),debugstr_w(pEnvironment), + debugstr_w(pMonitorName)); + + if (pName && (pName[0])) { + FIXME("for server %s not implemented\n", debugstr_w(pName)); + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + /* pEnvironment is ignored in Windows for the local Computer */ + + if (!pMonitorName || !pMonitorName[0]) { + WARN("pMonitorName %s is invalid\n", debugstr_w(pMonitorName)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, MonitorsW, &hroot) != ERROR_SUCCESS) { + ERR("unable to create key %s\n", debugstr_w(MonitorsW)); + return FALSE; + } + + /* change this, when advapi32.dll/RegDeleteTree is implemented */ + if(WINSPOOL_SHDeleteKeyW(hroot, pMonitorName) == ERROR_SUCCESS) { + TRACE("monitor %s deleted\n", debugstr_w(pMonitorName)); + RegCloseKey(hroot); + return TRUE; + } + + WARN("monitor %s does not exists\n", debugstr_w(pMonitorName)); + RegCloseKey(hroot); + + /* NT: ERROR_UNKNOWN_PRINT_MONITOR (3000), 9x: ERROR_INVALID_PARAMETER (87) */ + SetLastError(ERROR_UNKNOWN_PRINT_MONITOR); + return (FALSE); } /******************************************************************

1 0

James Hawkins : advpack: Add install_init/ release to perform install initialization.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: eb602fa8f083b69283a701899b7e8b207a27196f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb602fa8f083b69283a7018… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 17 01:51:06 2006 -0500 advpack: Add install_init/release to perform install initialization. --- dlls/advpack/install.c | 117 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 106 insertions(+), 11 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 66073aa..aeae7cd 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -42,6 +42,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); #define ADV_HRESULT(x) ((x & SPAPI_ERROR) ? HRESULT_FROM_SPAPI(x) : HRESULT_FROM_WIN32(x)) +/* contains information about a specific install instance */ +typedef struct _ADVInfo +{ + HINF hinf; + LPWSTR inf_filename; + LPWSTR install_sec; + LPWSTR working_dir; + DWORD flags; + BOOL need_reboot; +} ADVInfo; + /* sequentially returns pointers to parameters in a parameter list * returns NULL if the parameter is empty, e.g. one,,three */ LPWSTR get_parameter(LPWSTR *params, WCHAR separator) @@ -75,7 +86,7 @@ static BOOL is_full_path(LPWSTR path) } /* performs a setupapi-level install of the INF file */ -static HRESULT spapi_install(HINF hinf, LPCWSTR install_sec, LPCWSTR source_path) +static HRESULT spapi_install(ADVInfo *info) { BOOL ret; HRESULT res; @@ -85,9 +96,9 @@ static HRESULT spapi_install(HINF hinf, if (!context) return ADV_HRESULT(GetLastError()); - ret = SetupInstallFromInfSectionW(NULL, hinf, install_sec, SPINST_FILES, - NULL, source_path, SP_COPY_NEWER, - SetupDefaultQueueCallbackW, + ret = SetupInstallFromInfSectionW(NULL, info->hinf, info->install_sec, + SPINST_FILES, NULL, info->working_dir, + SP_COPY_NEWER, SetupDefaultQueueCallbackW, context, NULL, NULL); if (!ret) { @@ -99,7 +110,7 @@ static HRESULT spapi_install(HINF hinf, SetupTermDefaultQueueCallback(context); - ret = SetupInstallFromInfSectionW(NULL, hinf, install_sec, + ret = SetupInstallFromInfSectionW(NULL, info->hinf, info->install_sec, SPINST_INIFILES | SPINST_REGISTRY, HKEY_LOCAL_MACHINE, NULL, 0, NULL, NULL, NULL, NULL); @@ -109,6 +120,86 @@ static HRESULT spapi_install(HINF hinf, return S_OK; } +/* loads the INF file and performs checks on it */ +HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, + LPCWSTR working_dir, DWORD flags, ADVInfo *info) +{ + DWORD len; + LPCWSTR ptr; + + static const WCHAR default_install[] = { + 'D','e','f','a','u','l','t','I','n','s','t','a','l','l',0 + }; + + len = lstrlenW(inf_filename); + + info->inf_filename = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + if (!info->inf_filename) + return E_OUTOFMEMORY; + + lstrcpyW(info->inf_filename, inf_filename); + + /* FIXME: determine the proper platform to install (NTx86, etc) */ + if (!install_sec || !*install_sec) + { + len = sizeof(default_install) - 1; + ptr = default_install; + } + else + { + len = lstrlenW(install_sec); + ptr = install_sec; + } + + info->install_sec = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + if (!info->install_sec) + return E_OUTOFMEMORY; + + lstrcpyW(info->install_sec, ptr); + + /* FIXME: need to get the real working directory */ + if (!working_dir || !*working_dir) + { + ptr = strrchrW(info->inf_filename, '\\'); + len = ptr - info->inf_filename + 1; + ptr = info->inf_filename; + } + else + { + len = lstrlenW(working_dir); + ptr = working_dir; + } + + info->working_dir = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + if (!info->working_dir) + return E_OUTOFMEMORY; + + lstrcpynW(info->working_dir, ptr, len); + + info->hinf = SetupOpenInfFileW(info->inf_filename, NULL, INF_STYLE_WIN4, NULL); + if (info->hinf == INVALID_HANDLE_VALUE) + return ADV_HRESULT(GetLastError()); + + /* FIXME: set the ldids of the install section */ + /* FIXME: check that the INF is advanced */ + + info->flags = flags; + info->need_reboot = FALSE; + + return S_OK; +} + +/* release the install instance information */ +void install_release(ADVInfo *info) +{ + if (info->hinf && info->hinf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(info->hinf); + + HeapFree(GetProcessHeap(), 0, info->inf_filename); + HeapFree(GetProcessHeap(), 0, info->install_sec); + HeapFree(GetProcessHeap(), 0, info->working_dir); +} + /* this structure very closely resembles parameters of RunSetupCommand() */ typedef struct { @@ -472,7 +563,7 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn LPCWSTR lpszTitle, HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved) { - HINF hinf; + ADVInfo info; HRESULT hr; TRACE("(%p, %s, %s, %s, %s, %p, %ld, %p)\n", @@ -489,12 +580,16 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn if (!(dwFlags & RSC_FLAG_INF)) return launch_exe(szCmdName, szDir, phEXE); - hinf = SetupOpenInfFileW(szCmdName, NULL, INF_STYLE_WIN4, NULL); - if (hinf == INVALID_HANDLE_VALUE) - return ADV_HRESULT(GetLastError()); + ZeroMemory(&info, sizeof(ADVInfo)); - hr = spapi_install(hinf, szInfSection, szDir); + hr = install_init(szCmdName, szInfSection, szDir, dwFlags, &info); + if (hr != S_OK) + goto done; + + hr = spapi_install(&info); + +done: + install_release(&info); - SetupCloseInfFile(hinf); return hr; }

1 0

James Hawkins : advpack: Factor out OCX registering into do_ocx_reg.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 3f784a7339ec18f0d4718c3f1430a067cfea5b92 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f784a7339ec18f0d4718c3… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 17 01:51:37 2006 -0500 advpack: Factor out OCX registering into do_ocx_reg. --- dlls/advpack/advpack.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 4ee3b0c..f68ab2b 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -392,6 +392,22 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN return E_FAIL; } +/* registers the OCX if do_reg is TRUE, unregisters it otherwise */ +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) +{ + DLLREGISTER reg_func; + + if (do_reg) + reg_func = (DLLREGISTER)GetProcAddress(hocx, "DllRegisterServer"); + else + reg_func = (DLLREGISTER)GetProcAddress(hocx, "DllUnregisterServer"); + + if (!reg_func) + return E_FAIL; + + return reg_func(); +} + /*********************************************************************** * RegisterOCX (ADVPACK.@) * @@ -419,7 +435,6 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HI LPWSTR ocx_filename, str_flags, param; LPWSTR cmdline_copy, cmdline_ptr; UNICODE_STRING cmdlineW; - DLLREGISTER pfnRegister; HRESULT hr = E_FAIL; HMODULE hm = NULL; DWORD size; @@ -444,11 +459,7 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HI if (!hm) goto done; - pfnRegister = (DLLREGISTER)GetProcAddress(hm, "DllRegisterServer"); - if (!pfnRegister) - goto done; - - hr = pfnRegister(); + hr = do_ocx_reg(hm, TRUE); done: FreeLibrary(hm);

1 0

James Hawkins : advpack: Use get_parameter to read the three parameters of RegisterOCX.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 1bc69125af049dbee432af45b2f2e5dff71ff986 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1bc69125af049dbee432af4… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 17 01:50:46 2006 -0500 advpack: Use get_parameter to read the three parameters of RegisterOCX. Use get_parameter to read the three parameters to RegisterOCX. Remove the ERRs and TRACEs now that we return the HRESULT. --- dlls/advpack/advpack.c | 54 +++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 61ea5b7..4ee3b0c 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -416,44 +416,46 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN */ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) { - WCHAR wszBuff[MAX_PATH]; - WCHAR* pwcComma; - HMODULE hm; + LPWSTR ocx_filename, str_flags, param; + LPWSTR cmdline_copy, cmdline_ptr; + UNICODE_STRING cmdlineW; DLLREGISTER pfnRegister; - HRESULT hr; + HRESULT hr = E_FAIL; + HMODULE hm = NULL; + DWORD size; TRACE("(%s)\n", debugstr_a(cmdline)); - MultiByteToWideChar(CP_ACP, 0, cmdline, strlen(cmdline), wszBuff, MAX_PATH); - if ((pwcComma = strchrW( wszBuff, ',' ))) *pwcComma = 0; + RtlCreateUnicodeStringFromAsciiz(&cmdlineW, cmdline); - TRACE("Parsed DLL name (%s)\n", debugstr_w(wszBuff)); + size = (lstrlenW(cmdlineW.Buffer) + 1) * sizeof(WCHAR); + cmdline_copy = HeapAlloc(GetProcessHeap(), 0, size); + cmdline_ptr = cmdline_copy; + lstrcpyW(cmdline_copy, cmdlineW.Buffer); - hm = LoadLibraryExW(wszBuff, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + ocx_filename = get_parameter(&cmdline_ptr, ','); + if (!ocx_filename || !*ocx_filename) + goto done; + + str_flags = get_parameter(&cmdline_ptr, ','); + param = get_parameter(&cmdline_ptr, ','); + + hm = LoadLibraryExW(ocx_filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!hm) - { - ERR("Couldn't load DLL: %s\n", debugstr_w(wszBuff)); - return E_FAIL; - } + goto done; pfnRegister = (DLLREGISTER)GetProcAddress(hm, "DllRegisterServer"); - if (pfnRegister == NULL) - { - ERR("DllRegisterServer entry point not found\n"); - } - else - { - hr = pfnRegister(); - if (hr != S_OK) - { - ERR("DllRegisterServer entry point returned %08lx\n", hr); - } - } + if (!pfnRegister) + goto done; - TRACE("Successfully registered OCX\n"); + hr = pfnRegister(); +done: FreeLibrary(hm); - return S_OK; + HeapFree(GetProcessHeap(), 0, cmdline_copy); + RtlFreeUnicodeString(&cmdlineW); + + return hr; } /***********************************************************************

1 0

James Hawkins : advpack: The fallback directory is the fifth field index, not the sixth.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 39c0682bff94ae00ec1e62a16a8f17ba47ff5137 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39c0682bff94ae00ec1e62a… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 17 01:49:29 2006 -0500 advpack: The fallback directory is the fifth field index, not the sixth. --- dlls/advpack/advpack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 2796d55..61ea5b7 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -86,7 +86,7 @@ static void get_dest_dir(HINF hInf, PCWS if (RegOpenKeyW(root, key, &subkey) || RegQueryValueExW(subkey, value, NULL, NULL, (LPBYTE)pszBuffer, &size)) { - SetupGetStringFieldW(&context, 6, pszBuffer, dwSize, NULL); + SetupGetStringFieldW(&context, 5, pszBuffer, dwSize, NULL); } RegCloseKey(subkey);

1 0

James Hawkins : advpack: Use the default queue callback when calling SetupInstallFromInfSection.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: b70d65b227f07784ba348690f973ed9fef8ef4e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b70d65b227f07784ba34869… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 17 01:49:12 2006 -0500 advpack: Use the default queue callback when calling SetupInstallFromInfSection. --- dlls/advpack/install.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index ddb5f30..66073aa 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -87,7 +87,8 @@ static HRESULT spapi_install(HINF hinf, ret = SetupInstallFromInfSectionW(NULL, hinf, install_sec, SPINST_FILES, NULL, source_path, SP_COPY_NEWER, - NULL, context, NULL, NULL); + SetupDefaultQueueCallbackW, + context, NULL, NULL); if (!ret) { res = ADV_HRESULT(GetLastError());

1 0

James Hawkins : advpack: Fix the documentation for RegisterOCX.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: ab68238af7917c3549af839d54765d8b26c33f1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab68238af7917c3549af839… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 17 01:48:52 2006 -0500 advpack: Fix the documentation for RegisterOCX. --- dlls/advpack/advpack.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 198480d..2796d55 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -400,7 +400,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN * PARAMS * hWnd [I] Handle to the window used for the display. * hInst [I] Instance of the process. - * cmdline [I] Contains parameters in the order OCX,reboot,install_cmd + * cmdline [I] Contains parameters in the order OCX,flags,param. * show [I] How the window should be shown. * * RETURNS @@ -409,10 +409,10 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN * * NOTES * OCX - Filename of the OCX to register. - * reboot - smart reboot behavior - * 'I' Reboot if needed. - * 'N' No reboot. - * install_cmd - Command line to pass to the OCX's DllInstall. + * flags - Controls the operation of RegisterOCX. + * 'I' Call DllRegisterServer and DllInstall. + * 'N' Only call DllInstall. + * param - Command line passed to DllInstall. */ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) {

1 0

James Hawkins : advpack: Fix the return type of RegisterOCX.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 940af1b41cdbf6652a63cac56a0e52f6dae26801 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=940af1b41cdbf6652a63cac… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 17 01:48:34 2006 -0500 advpack: Fix the return type of RegisterOCX. --- dlls/advpack/advpack.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index eb8ca31..198480d 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -404,7 +404,8 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN * show [I] How the window should be shown. * * RETURNS - * This function does not return anything. + * Success: S_OK. + * Failure: E_FAIL. * * NOTES * OCX - Filename of the OCX to register. @@ -413,7 +414,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN * 'N' No reboot. * install_cmd - Command line to pass to the OCX's DllInstall. */ -void WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) +HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) { WCHAR wszBuff[MAX_PATH]; WCHAR* pwcComma; @@ -432,7 +433,7 @@ void WINAPI RegisterOCX(HWND hWnd, HINST if (!hm) { ERR("Couldn't load DLL: %s\n", debugstr_w(wszBuff)); - return; + return E_FAIL; } pfnRegister = (DLLREGISTER)GetProcAddress(hm, "DllRegisterServer"); @@ -452,6 +453,7 @@ void WINAPI RegisterOCX(HWND hWnd, HINST TRACE("Successfully registered OCX\n"); FreeLibrary(hm); + return S_OK; } /***********************************************************************

1 0