wine-commits September 2009

wine-commits@winehq.org

3 participants
866 discussions

Hans Leidekker : msi: Test the Installed property.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 2beee126a7fe9dae1a4481a26b9478727440bbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2beee126a7fe9dae1a4481a26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 29 14:56:26 2009 +0200 msi: Test the Installed property. --- dlls/msi/custom.c | 2 +- dlls/msi/tests/install.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 7fcb09a..5ac9c1b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1055,7 +1055,7 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, msi_free( deformated ); - return ERROR_FUNCTION_FAILED; + return ERROR_INSTALL_FAILURE; } static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9a33b79..627b81c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -886,6 +886,32 @@ static const CHAR ai_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; +static const CHAR ip_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "ValidateProductID\t\t700\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "RemoveFiles\t\t3500\n" + "InstallFiles\t\t4000\n" + "RegisterUser\t\t6000\n" + "RegisterProduct\t\t6100\n" + "PublishFeatures\t\t6300\n" + "PublishProduct\t\t6400\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "UnpublishFeatures\t\t1800\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100\n" + "TestInstalledProp\tInstalled AND NOT REMOVE\t950\n"; + +static const CHAR ip_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestInstalledProp\t19\t\tTest failed\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1500,6 +1526,19 @@ static const msi_table pc_tables[] = ADD_TABLE(property) }; +static const msi_table ip_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(ip_install_exec_seq), + ADD_TABLE(ip_custom_action), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6600,6 +6639,44 @@ static void test_preselected(void) delete_test_files(); } +static void test_installed_prop(void) +{ + static char prodcode[] = "{7df88a48-996f-4ec8-a022-bf956f9b2cbb}"; + UINT r; + + create_test_files(); + create_database(msifile, ip_tables, sizeof(ip_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "FULL=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "FULL=1"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + r = MsiConfigureProductExA(prodcode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, "FULL=1"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -6685,6 +6762,7 @@ START_TEST(install) test_envvar(); test_lastusedsource(); test_preselected(); + test_installed_prop(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Respect UI level in custom action type 19.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 1b7d1d4c8701b8d77b79d0f96aeac39f3691b331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b7d1d4c8701b8d77b79d0f96… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 29 14:55:58 2009 +0200 msi: Respect UI level in custom action type 19. --- dlls/msi/custom.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index cbbcde5..7fcb09a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1046,10 +1046,11 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, if( row ) { LPCWSTR error = MSI_RecordGetString( row, 1 ); - MessageBoxW( NULL, error, NULL, MB_OK ); + if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) + MessageBoxW( NULL, error, NULL, MB_OK ); msiobj_release( &row->hdr ); } - else + else if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) MessageBoxW( NULL, deformated, NULL, MB_OK ); msi_free( deformated );

1 0

Jeff Zaroyko : imm32/tests: Add another combination which should fail.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 26f380941be0a5a3c791f6da19cecce0d087fafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f380941be0a5a3c791f6da1… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Tue Sep 29 21:33:04 2009 +1000 imm32/tests: Add another combination which should fail. --- dlls/imm32/tests/imm32.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index db1cd8d..97a7201 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -287,6 +287,11 @@ static void test_ImmSetCompositionString(void) todo_wine ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR | SCS_CHANGECLAUSE, + NULL, 0, NULL, 0); + todo_wine + ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); + ImmReleaseContext(hwnd, imc); }

1 0

Detlef Riekenberg : include: Fix the fpAddPortEx prototype in struct PRINTPROVIDOR.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 29c9c7f50d192417b1c9783e5688f2f1991e2103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c9c7f50d192417b1c9783e5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 14:54:04 2009 +0200 include: Fix the fpAddPortEx prototype in struct PRINTPROVIDOR. --- include/ddk/winsplp.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h index 4dfdb5b..c532be9 100644 --- a/include/ddk/winsplp.h +++ b/include/ddk/winsplp.h @@ -280,8 +280,7 @@ typedef struct _PRINTPROVIDOR { HANDLE (WINAPI *fpFindFirstPrinterChangeNotification)(HANDLE hPrinter, DWORD fdwFlags, DWORD fdwOptions, LPVOID pPrinterNotifyOptions); BOOL (WINAPI *fpFindClosePrinterChangeNotification)(HANDLE hChange); - BOOL (WINAPI *fpAddPortEx)(HANDLE hMonitor, LPWSTR pName, DWORD Level, - LPBYTE lpBuffer, LPWSTR lpMonitorName); + BOOL (WINAPI *fpAddPortEx)(LPWSTR, DWORD, LPBYTE, LPWSTR); BOOL (WINAPI *fpShutDown)(LPVOID pvReserved); BOOL (WINAPI *fpRefreshPrinterChangeNotification)(HANDLE hPrinter, DWORD Reserved, PVOID pvReserved, PVOID pPrinterNotifyInfo);

1 0

Detlef Riekenberg : localui: Fix a memory leak.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 64bcb540bb8f147f1f4e652043247c07bf50e570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64bcb540bb8f147f1f4e65204… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:35:45 2009 +0200 localui: Fix a memory leak. --- dlls/localui/localui.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 2acfc7e..b9e4c4e 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -503,7 +503,6 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam { addportui_t data; HANDLE hXcv; - LPWSTR ptr = NULL; DWORD needed; DWORD dummy; DWORD status; @@ -529,14 +528,11 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam (PBYTE) &dummy, 0, &needed, &status); TRACE("got %u with status %u\n", res, status); - if (res && (status == ERROR_SUCCESS)) { + if (res && (status == ERROR_SUCCESS) && ppPortName) { /* Native localui uses GlobalAlloc also. The caller must GlobalFree the buffer */ - ptr = GlobalAlloc(GPTR, (lstrlenW(data.portname)+1) * sizeof(WCHAR)); - if (ptr) { - lstrcpyW(ptr, data.portname); - if (ppPortName) *ppPortName = ptr; - } + *ppPortName = GlobalAlloc(GPTR, (lstrlenW(data.portname)+1) * sizeof(WCHAR)); + if (*ppPortName) lstrcpyW(*ppPortName, data.portname); } if (res && (status == ERROR_ALREADY_EXISTS)) {

1 0

Detlef Riekenberg : winspool: Use the backend for AddPortW.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: f6120c2aa4a739c7fff9b3ac72ef4c5f509cd259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6120c2aa4a739c7fff9b3ac7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:27:53 2009 +0200 winspool: Use the backend for AddPortW. --- dlls/winspool.drv/info.c | 88 +-------------------------------------------- 1 files changed, 2 insertions(+), 86 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index de7df36..67c1252 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -221,7 +221,6 @@ static const WCHAR Help_FileW[] = {'H','e','l','p',' ','F','i','l','e',0}; static const WCHAR LocationW[] = {'L','o','c','a','t','i','o','n',0}; static const WCHAR ManufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR MonitorW[] = {'M','o','n','i','t','o','r',0}; -static const WCHAR MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; static const WCHAR NameW[] = {'N','a','m','e',0}; static const WCHAR ObjectGUIDW[] = {'O','b','j','e','c','t','G','U','I','D',0}; static const WCHAR OEM_UrlW[] = {'O','E','M',' ','U','r','l',0}; @@ -946,48 +945,6 @@ cleanup: } /****************************************************************** - * monitor_loadui [internal] - * - * load the userinterface-dll for a given portmonitor - * - * On failure, NULL is returned - */ - -static monitor_t * monitor_loadui(monitor_t * pm) -{ - monitor_t * pui = NULL; - LPWSTR buffer[MAX_PATH]; - HANDLE hXcv; - DWORD len; - DWORD res; - - if (pm == NULL) return NULL; - TRACE("(%p) => dllname: %s\n", pm, debugstr_w(pm->dllname)); - - /* Try the Portmonitor first; works for many monitors */ - if (pm->monitorUI) { - EnterCriticalSection(&monitor_handles_cs); - pm->refcount++; - LeaveCriticalSection(&monitor_handles_cs); - return pm; - } - - /* query the userinterface-dllname from the Portmonitor */ - if ((pm->monitor) && (pm->monitor->pfnXcvDataPort)) { - /* building (",XcvMonitor %s",pm->name) not needed yet */ - res = pm->monitor->pfnXcvOpenPort(emptyStringW, SERVER_ACCESS_ADMINISTER, &hXcv); - TRACE("got %u with %p\n", res, hXcv); - if (res) { - res = pm->monitor->pfnXcvDataPort(hXcv, MonitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); - TRACE("got %u with %s\n", res, debugstr_w((LPWSTR) buffer)); - if (res == ERROR_SUCCESS) pui = monitor_load(NULL, (LPWSTR) buffer); - pm->monitor->pfnXcvClosePort(hXcv); - } - } - return pui; -} - -/****************************************************************** * get_servername_from_name (internal) * * for an external server, a copy of the serverpart from the full name is returned @@ -6015,57 +5972,16 @@ BOOL WINAPI AddPortA(LPSTR pName, HWND hWnd, LPSTR pMonitorName) */ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) { - monitor_t * pm; - monitor_t * pui; - DWORD res; - TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pMonitorName)); - if (pName && pName[0]) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if ((backend == NULL) && !load_backend()) return FALSE; if (!pMonitorName) { SetLastError(RPC_X_NULL_REF_POINTER); return FALSE; } - /* an empty Monitorname is Invalid */ - if (!pMonitorName[0]) { - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; - } - - pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPort) { - res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); - TRACE("got %d with %u\n", res, GetLastError()); - res = TRUE; - } - else - { - pui = monitor_loadui(pm); - if (pui && pui->monitorUI && pui->monitorUI->pfnAddPortUI) { - TRACE("use %p: %s\n", pui, debugstr_w(pui->dllname)); - res = pui->monitorUI->pfnAddPortUI(pName, hWnd, pMonitorName, NULL); - TRACE("got %d with %u\n", res, GetLastError()); - res = TRUE; - } - else - { - FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pMonitorName), - pm, debugstr_w(pm ? pm->dllname : NULL), pui, debugstr_w(pui ? pui->dllname : NULL)); - - /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ - SetLastError(ERROR_NOT_SUPPORTED); - res = FALSE; - } - monitor_unload(pui); - } - monitor_unload(pm); - TRACE("returning %d with %u\n", res, GetLastError()); - return res; + return backend->fpAddPort(pName, hWnd, pMonitorName); } /******************************************************************************

1 0

Detlef Riekenberg : localspl: Implement fpAddPort.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 9d5377f50fe807252d836f56f9897bd02dc7cdf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5377f50fe807252d836f56f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:25:07 2009 +0200 localspl: Implement fpAddPort. --- dlls/localspl/provider.c | 68 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 2bf9414..0f1c293 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1458,6 +1458,72 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) } /****************************************************************************** + * fpAddPort [exported through PRINTPROVIDOR] + * + * Add a Port for a specific Monitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pMonitorName [I] Name of the Monitor that manage the Port + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) +{ + monitor_t * pm; + monitor_t * pui; + LONG lres; + DWORD res; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pMonitorName)); + + lres = copy_servername_from_name(pName, NULL); + if (lres) { + FIXME("server %s not supported\n", debugstr_w(pName)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* an empty Monitorname is Invalid */ + if (!pMonitorName[0]) { + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; + } + + pm = monitor_load(pMonitorName, NULL); + if (pm && pm->monitor && pm->monitor->pfnAddPort) { + res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); + TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); + } + else + { + pui = monitor_loadui(pm); + if (pui && pui->monitorUI && pui->monitorUI->pfnAddPortUI) { + res = pui->monitorUI->pfnAddPortUI(pName, hWnd, pMonitorName, NULL); + TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pui->dllname)); + } + else + { + FIXME("not implemented for %s (monitor %p: %s / monitorui %p: %s)\n", + debugstr_w(pMonitorName), pm, debugstr_w(pm ? pm->dllname : NULL), + pui, debugstr_w(pui ? pui->dllname : NULL)); + + SetLastError(ERROR_NOT_SUPPORTED); + res = FALSE; + } + monitor_unload(pui); + } + monitor_unload(pm); + + TRACE("returning %d with %u\n", res, GetLastError()); + return res; +} + +/****************************************************************************** * fpAddPrinterDriverEx [exported through PRINTPROVIDOR] * * Install a Printer Driver with the Option to upgrade / downgrade the Files @@ -2017,7 +2083,7 @@ void setup_provider(void) NULL, /* fpEnumForms */ fpEnumMonitors, fpEnumPorts, - NULL, /* fpAddPort */ + fpAddPort, fpConfigurePort, fpDeletePort, NULL, /* fpCreatePrinterIC */

1 0

Detlef Riekenberg : localspl: Fix type of a WCHAR buffer.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 650f85174a5fd869fdb7a1bc4e2bd5456a49942c URL: http://source.winehq.org/git/wine.git/?a=commit;h=650f85174a5fd869fdb7a1bc4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:21:00 2009 +0200 localspl: Fix type of a WCHAR buffer. --- dlls/localspl/provider.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 7bfc32d..2bf9414 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -568,7 +568,7 @@ static DWORD monitor_loadall(void) static monitor_t * monitor_loadui(monitor_t * pm) { monitor_t * pui = NULL; - LPWSTR buffer[MAX_PATH]; + WCHAR buffer[MAX_PATH]; HANDLE hXcv; DWORD len; DWORD res; @@ -591,8 +591,8 @@ static monitor_t * monitor_loadui(monitor_t * pm) TRACE("got %u with %p\n", res, hXcv); if (res) { res = pm->monitor->pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); - TRACE("got %u with %s\n", res, debugstr_w((LPWSTR) buffer)); - if (res == ERROR_SUCCESS) pui = monitor_load(NULL, (LPWSTR) buffer); + TRACE("got %u with %s\n", res, debugstr_w(buffer)); + if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); pm->monitor->pfnXcvClosePort(hXcv); } }

1 0

Detlef Riekenberg : localspl: Unload only portmonitors in monitor_unloadall .
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 068e861d06de80ef264b6850926388d8f8222a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=068e861d06de80ef264b68509… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:17:02 2009 +0200 localspl: Unload only portmonitors in monitor_unloadall. --- dlls/localspl/provider.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 51bf2f9..7bfc32d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -346,7 +346,7 @@ static void monitor_unload(monitor_t * pm) /****************************************************************** * monitor_unloadall [internal] * - * release all printmonitors and unload them from memory, when needed + * release all registered printmonitors and unload them from memory, when needed * */ @@ -359,7 +359,8 @@ static void monitor_unloadall(void) /* iterate through the list, with safety against removal */ LIST_FOR_EACH_ENTRY_SAFE(pm, next, &monitor_handles, monitor_t, entry) { - monitor_unload(pm); + /* skip monitorui dlls */ + if (pm->monitor) monitor_unload(pm); } LeaveCriticalSection(&monitor_handles_cs); }

1 0

Nikolay Sivov : comctl32/monthcal: Fix locale dependent test failure.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: c685729b72976c4155f8905ba05eb934d439e2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c685729b72976c4155f8905ba… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 29 14:14:37 2009 +0400 comctl32/monthcal: Fix locale dependent test failure. --- dlls/comctl32/tests/monthcal.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 5c5a8f8..268c25a 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -768,7 +768,7 @@ static void test_monthcal_currdate(void) static void test_monthcal_firstDay(void) { int res, fday, i, prev; - TCHAR b[128]; + CHAR b[128]; LCID lcid = LOCALE_USER_DEFAULT; HWND hwnd; @@ -778,7 +778,7 @@ static void test_monthcal_firstDay(void) /* Setter and Getters for first day of week */ /* check for locale first day */ - if(GetLocaleInfo(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ + if(GetLocaleInfoA(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ fday = atoi(b); trace("fday: %d\n", fday); res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); @@ -1267,6 +1267,9 @@ static void test_monthcal_monthrange(void) res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st); expect(1,res); + /* to be locale independent */ + SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM)6); + flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2009