December 2009 - Wine-commits

Roderick Colenbrander : winex11: Move X11 display failure MESSAGE to winediag.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 662653c8ff55d71e60738e455f93f261b48beb9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=662653c8ff55d71e60738e455… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Dec 8 13:11:20 2009 +0100 winex11: Move X11 display failure MESSAGE to winediag. --- dlls/winex11.drv/x11drv_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 3600cd0..3bd934b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -56,6 +56,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DECLARE_DEBUG_CHANNEL(synchronous); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static CRITICAL_SECTION X11DRV_CritSection; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -643,8 +644,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) if (!(data->display = XOpenDisplay(NULL))) { wine_tsx11_unlock(); - MESSAGE( "x11drv: Can't open display: %s\n", XDisplayName(NULL) ); - MESSAGE( "Please ensure that your X server is running and that $DISPLAY is set correctly.\n" ); + ERR_(winediag)( "x11drv: Can't open display: %s. Please ensure that your X server is running and that $DISPLAY is set correctly.\n", XDisplayName(NULL)); ExitProcess(1); }

1 0

Paul Vriens : winspool.drv/tests: Fix test failures on XP+ with long printer names.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 5719881ed5244135bce6800584a90ebb14a7a2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5719881ed5244135bce680058… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 8 10:25:18 2009 +0100 winspool.drv/tests: Fix test failures on XP+ with long printer names. --- dlls/winspool.drv/tests/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index ef726f4..1f876b3 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2412,7 +2412,8 @@ static void test_DEVMODE(const DEVMODE *dm, LONG dmSize, LPCSTR exp_prn_name) We skip the Tests on this Platform */ if (dm->dmSpecVersion || dm->dmDriverVersion || dm->dmDriverExtra) { /* The 0-terminated Printername can be larger (MAX_PATH) than CCHDEVICENAME */ - ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -1), + ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -1) || + !strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -2), /* XP+ */ "expected '%s', got '%s'\n", exp_prn_name, dm->dmDeviceName); ok(dm->dmSize + dm->dmDriverExtra == dmSize, "%u != %d\n", dm->dmSize + dm->dmDriverExtra, dmSize);

1 0

Juan Lang : snmpapi: Add stub for SnmpSvcGetUptime.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: b7f753a826e6c35086e16867b40918d293e783a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f753a826e6c35086e16867b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 7 12:02:07 2009 -0800 snmpapi: Add stub for SnmpSvcGetUptime. --- dlls/snmpapi/main.c | 18 ++++++++++++++++++ dlls/snmpapi/snmpapi.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 9e14a19..1c4d1fa 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -112,6 +112,8 @@ static void asn_any_free(AsnAny *any) any->asnType = ASN_NULL; } +static ULONGLONG startTime; + /*********************************************************************** * DllMain for SNMPAPI */ @@ -127,6 +129,7 @@ BOOL WINAPI DllMain( return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); + startTime = GetTickCount64(); break; case DLL_PROCESS_DETACH: break; @@ -136,6 +139,21 @@ BOOL WINAPI DllMain( } /*********************************************************************** + * SnmpSvcGetUptime (SNMPAPI.@) + * + * BUGS + * This returns the number of centiseconds since the DLL was loaded, + * rather than the number of centiseconds since the SNMP service was + * started, since there isn't yet any SNMP service in Wine. + */ +DWORD WINAPI SnmpSvcGetUptime(void) +{ + ULONGLONG now = GetTickCount64(); + + return (now - startTime) / 10; +} + +/*********************************************************************** * SnmpUtilDbgPrint (SNMPAPI.@) * * NOTES diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec index 385ca8a..208231e 100644 --- a/dlls/snmpapi/snmpapi.spec +++ b/dlls/snmpapi/snmpapi.spec @@ -11,7 +11,7 @@ @ stub SnmpSvcGenerateTrap @ stub SnmpSvcGenerateWarmStartTrap @ stub SnmpSvcGetEnterpriseOID -@ stub SnmpSvcGetUptime +@ stdcall SnmpSvcGetUptime() @ stub SnmpSvcInitUptime @ stub SnmpSvcReleaseMessage @ stub SnmpSvcReportEvent

1 0

Francois Gouget : crypt32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: d1e592ad20dcacdce40a64775a260ec594061c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e592ad20dcacdce40a64775… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 8 12:26:13 2009 +0100 crypt32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/crypt32/tests/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 4192e11..a626b82 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4018,7 +4018,7 @@ static void check_ssl_policy(void) /* And again authenticating a client, but specify the size of the policy * parameter. */ - sslPolicyPara.cbSize = sizeof(sslPolicyCheck); + U(sslPolicyPara).cbSize = sizeof(sslPolicyCheck); sslPolicyPara.dwAuthType = AUTHTYPE_CLIENT; for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++)

1 0

Paul Chitescu : server: Only check if permission bits changed before calling fchmod().
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 923524951aa3c138d67f7a848baeef3bcc1bae34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=923524951aa3c138d67f7a848… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Dec 8 14:10:01 2009 +0200 server: Only check if permission bits changed before calling fchmod(). --- server/change.c | 2 +- server/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/change.c b/server/change.c index 7ef456f..11b4729 100644 --- a/server/change.c +++ b/server/change.c @@ -376,7 +376,7 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); mode |= sd_to_mode( sd, owner ); - if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1) + if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) { file_set_error(); return 0; diff --git a/server/file.c b/server/file.c index 3e09ddd..5db64cd 100644 --- a/server/file.c +++ b/server/file.c @@ -560,7 +560,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); mode |= sd_to_mode( sd, owner ); - if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1) + if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) { file_set_error(); return 0;

1 0

Roderick Colenbrander : ws2_32: Use winediag for socket failures.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 6a8aae0becf4c9ab801ca3f13581cc02107b2fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8aae0becf4c9ab801ca3f13… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Dec 8 14:09:05 2009 +0100 ws2_32: Use winediag for socket failures. --- dlls/ws2_32/socket.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df9c37d..02d8af5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -166,6 +166,7 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(winsock); +WINE_DECLARE_DEBUG_CHANNEL(winediag); /* critical section to protect some non-reentrant net function */ static CRITICAL_SECTION csWSgetXXXbyYYY; @@ -4322,11 +4323,9 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (GetLastError() == WSAEACCES) /* raw socket denied */ { if (type == SOCK_RAW) - MESSAGE("WARNING: Trying to create a socket of type SOCK_RAW, this" - " will fail unless you have special permissions.\n"); + ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); else - MESSAGE("WS_SOCKET: Failed to create socket, this requires" - " special permissions.\n"); + ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); SetLastError(WSAESOCKTNOSUPPORT); }

1 0

Roderick Colenbrander : iphlpapi: Use winediag for icmp failure.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 715a3988998ffabd3eabb3093a3765b47b5b0ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715a3988998ffabd3eabb3093… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Dec 8 14:14:21 2009 +0100 iphlpapi: Use winediag for icmp failure. --- dlls/iphlpapi/icmp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index ca965fb..d8ee101 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -99,6 +99,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(icmp); +WINE_DECLARE_DEBUG_CHANNEL(winediag); typedef struct { @@ -153,7 +154,7 @@ HANDLE WINAPI IcmpCreateFile(VOID) int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); if (sid < 0) { - MESSAGE("WARNING: Trying to use ICMP (network ping) will fail unless running as root\n"); + ERR_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); SetLastError(ERROR_ACCESS_DENIED); return INVALID_HANDLE_VALUE; }

1 0

Paul Vriens : shell32/tests: Cope with non-English Vista+ and short names in the title bar of explorer windows .
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: b965a5f0e0d20658a7240767f6a236089487e0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b965a5f0e0d20658a7240767f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 8 14:54:53 2009 +0100 shell32/tests: Cope with non-English Vista+ and short names in the title bar of explorer windows. --- dlls/shell32/tests/progman_dde.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 7e6c874..610fb01 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -66,6 +66,7 @@ #define DDE_TEST_NUMMASK 0x0000ffff +static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); static BOOL (WINAPI *pReadCabinetState)(CABINETSTATE *, int); @@ -74,6 +75,7 @@ static void init_function_pointers(void) HMODULE hmod; hmod = GetModuleHandleA("shell32.dll"); + pSHGetLocalizedName = (void*)GetProcAddress(hmod, "SHGetLocalizedName"); pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); pReadCabinetState = (void*)GetProcAddress(hmod, "ReadCabinetState"); if (!pReadCabinetState) @@ -102,7 +104,7 @@ static void init_strings(void) /* Win9x */ lstrcpyA(CommonPrograms, Programs); } - if (GetProcAddress(GetModuleHandleA("shell32.dll"), "SHGetKnownFolderPath")) + if (pSHGetLocalizedName) { /* Vista and higher use CSIDL_PROGRAMS for these tests. * Wine doesn't have SHGetKnownFolderPath yet but should most likely follow @@ -154,7 +156,32 @@ static void init_strings(void) } else { - lstrcpyA(StartupTitle, Startup); + /* Vista has the nice habit of displaying the full path in English + * and the short one localized. CSIDL_STARTUP on Vista gives us the + * English version so we have to 'translate' this one. + * + * MSDN claims it should be used for files not folders but this one + * suits our purposes just fine. + */ + if (pSHGetLocalizedName) + { + WCHAR startupW[MAX_PATH]; + WCHAR module[MAX_PATH]; + WCHAR module_expanded[MAX_PATH]; + WCHAR localized[MAX_PATH]; + int id; + + MultiByteToWideChar(CP_ACP, 0, startup, -1, startupW, sizeof(startupW)/sizeof(WCHAR)); + pSHGetLocalizedName(startupW, module, MAX_PATH, &id); + ExpandEnvironmentStringsW(module, module_expanded, MAX_PATH); + LoadStringW(GetModuleHandleW(module_expanded), id, localized, MAX_PATH); + + WideCharToMultiByte(CP_ACP, 0, localized, -1, StartupTitle, sizeof(StartupTitle), NULL, NULL); + } + else + { + lstrcpyA(StartupTitle, (strrchr(startup, '\\') + 1)); + } } }

1 0

James Hawkins : msi: Free the column info data when updating the table column info.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: b13803ea40ec15d39540694d45b431ce31b46463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13803ea40ec15d39540694d4… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 7 19:55:21 2009 -0800 msi: Free the column info data when updating the table column info. --- dlls/msi/table.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a0317da..d2b9a00 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1042,17 +1042,22 @@ static UINT get_tablecolumns( MSIDATABASE *db, static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) { MSITABLE *table; + LPWSTR tablename; UINT size, offset, old_count; UINT n; - table = find_cached_table( db, name ); + /* We may free name in msi_free_colinfo. */ + tablename = strdupW( name ); + + table = find_cached_table( db, tablename ); old_count = table->col_count; + msi_free_colinfo( table->colinfo, table->col_count ); msi_free( table->colinfo ); table->colinfo = NULL; - table_get_column_info( db, name, &table->colinfo, &table->col_count ); + table_get_column_info( db, tablename, &table->colinfo, &table->col_count ); if (!table->col_count) - return; + goto done; size = msi_table_get_row_size( db, table->colinfo, table->col_count ); offset = table->colinfo[table->col_count - 1].offset; @@ -1063,6 +1068,9 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) if (old_count < table->col_count) memset( &table->data[n][offset], 0, size - offset ); } + +done: + msi_free(tablename); } /* try to find the table name in the _Tables table */

1 0

James Hawkins : msi: Add a NULL terminator to file->dest after reallocation .
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: d90aca35c4d3e0d4d5cebaeae3a8628fb9d62767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90aca35c4d3e0d4d5cebaeae… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 7 19:55:32 2009 -0800 msi: Add a NULL terminator to file->dest after reallocation. --- dlls/msi/action.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0755f42..ef30dda 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5288,6 +5288,11 @@ static BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) goto done; } + /* file->dest may be shorter after the reallocation, so add a NULL + * terminator. This is needed for the call to strrchrW, as there will no + * longer be a NULL terminator within the bounds of the allocation in this case. + */ + file->dest[size - 1] = '\0'; lstrcpyW(strrchrW(file->dest, '\\') + 1, file->destname); while (!list_empty(&files.entry))

1 0