wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Paul Vriens : shell32/tests: Decide whether to use CSIDL_PROGRAMS or CSIDL_COMMON_PROGRAMS by checking admin rights .
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 495d353c63f9f73b4b66959296ee4b3dec58ce56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495d353c63f9f73b4b6695929… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 8 15:15:10 2009 +0100 shell32/tests: Decide whether to use CSIDL_PROGRAMS or CSIDL_COMMON_PROGRAMS by checking admin rights. --- dlls/shell32/tests/progman_dde.c | 99 ++++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 42 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 610fb01..85dc819 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -22,17 +22,8 @@ * - Covers basic CreateGroup, ShowGroup, DeleteGroup, AddItem, and DeleteItem * functionality * - Todo: Handle CommonGroupFlag - * Handle Difference between administrator and non-administrator calls - * as documented * Better AddItem Tests (Lots of parameters to test) * Tests for Invalid Characters in Names / Invalid Parameters - * - Technically, calling as an administrator creates groups in the CSIDL_COMMON_PROGRAMS - * directory. Win 9x and non-administrator calls us CSIDL_PROGRAMS directory. - * Original plans were to check that items/groups were created in appropriate - * places. As of this writing and in order to simplify the test code, it now - * checks for existence in either place. From web searches, it is not at all - * obvious or trivial to detect if the call is coming from an administrator or - * non-administrator. IsUserAnAdmin */ #include <stdio.h> @@ -82,8 +73,40 @@ static void init_function_pointers(void) pReadCabinetState = (void*)GetProcAddress(hmod, (LPSTR)651); } -static char CommonPrograms[MAX_PATH]; -static char Programs[MAX_PATH]; +static BOOL use_common(void) +{ + HMODULE hmod; + static BOOL (WINAPI *pIsNTAdmin)(DWORD, LPDWORD); + + /* IsNTAdmin() is available on all platforms. */ + hmod = LoadLibraryA("advpack.dll"); + pIsNTAdmin = (void*)GetProcAddress(hmod, "IsNTAdmin"); + + if (!pIsNTAdmin(0, NULL)) + { + /* We are definitely not an administrator */ + FreeLibrary(hmod); + return FALSE; + } + FreeLibrary(hmod); + + /* If we end up here we are on NT4+ as Win9x and WinMe don't have the + * notion of administrators (as we need it). + */ + + /* As of Vista we should always use the users directory. Tests with the + * real Administrator account on Windows 7 proved this. + * + * FIXME: We need a better way of identifying Vista+ as currently this check + * also covers Wine and we don't know yet which behavior we want to follow. + */ + if (pSHGetLocalizedName) + return FALSE; + + return TRUE; +} + +static char ProgramsDir[MAX_PATH]; static char Group1Title[MAX_PATH] = "Group1"; static char Group2Title[MAX_PATH] = "Group2"; @@ -94,26 +117,16 @@ static char StartupTitle[MAX_PATH] = "Startup"; static void init_strings(void) { char startup[MAX_PATH]; + char commonprograms[MAX_PATH]; + char programs[MAX_PATH]; + CABINETSTATE cs; if (pSHGetSpecialFolderPathA) { - pSHGetSpecialFolderPathA(NULL, Programs, CSIDL_PROGRAMS, FALSE); - if (!pSHGetSpecialFolderPathA(NULL, CommonPrograms, CSIDL_COMMON_PROGRAMS, FALSE)) - { - /* Win9x */ - lstrcpyA(CommonPrograms, Programs); - } - if (pSHGetLocalizedName) - { - /* Vista and higher use CSIDL_PROGRAMS for these tests. - * Wine doesn't have SHGetKnownFolderPath yet but should most likely follow - * this new ProgMan DDE behavior once implemented. - */ - lstrcpyA(CommonPrograms, Programs); - } + pSHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + pSHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); pSHGetSpecialFolderPathA(NULL, startup, CSIDL_STARTUP, FALSE); - lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); } else { @@ -122,34 +135,39 @@ static void init_strings(void) LONG res; /* Older Win9x and NT4 */ + RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); - size = sizeof(Programs); - RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&Programs, &size); + size = sizeof(programs); + RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&programs, &size); size = sizeof(startup); RegQueryValueExA(key, "Startup", NULL, NULL, (LPBYTE)&startup, &size); lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); RegCloseKey(key); RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); - size = sizeof(CommonPrograms); - res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&CommonPrograms, &size); + size = sizeof(commonprograms); + res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&commonprograms, &size); RegCloseKey(key); - if (res != ERROR_SUCCESS) - { - /* Win9x */ - lstrcpyA(CommonPrograms, Programs); - } } + /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before Vista + * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) or + * not (CSIDL_PROGRAMS). + */ + if (use_common()) + lstrcpyA(ProgramsDir, commonprograms); + else + lstrcpyA(ProgramsDir, programs); + memset(&cs, 0, sizeof(cs)); pReadCabinetState(&cs, sizeof(cs)); if (cs.fFullPathTitle == -1) { - lstrcpyA(Group1Title, CommonPrograms); + lstrcpyA(Group1Title, ProgramsDir); lstrcatA(Group1Title, "\\Group1"); - lstrcpyA(Group2Title, CommonPrograms); + lstrcpyA(Group2Title, ProgramsDir); lstrcatA(Group2Title, "\\Group2"); - lstrcpyA(Group3Title, CommonPrograms); + lstrcpyA(Group3Title, ProgramsDir); lstrcatA(Group3Title, "\\Group3"); lstrcpyA(StartupTitle, startup); @@ -355,10 +373,7 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx DWORD attributes; int len; - if (testParams & DDE_TEST_COMMON) - lstrcpyA(path, CommonPrograms); - else - lstrcpyA(path, Programs); + lstrcpyA(path, ProgramsDir); len = strlen(path) + strlen(nameToCheck)+1; if (groupName != NULL)

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

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

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

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

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

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

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

Paul Vriens : adapi32/tests: Fix test failures when the computername is fully qualified on W2K3 and earlier .
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 72c54e5d3b5bb8c1a66eee9291597fd49750993f URL: http://source.winehq.org/git/wine.git/?a=commit;h=72c54e5d3b5bb8c1a66eee929… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 8 09:28:49 2009 +0100 adapi32/tests: Fix test failures when the computername is fully qualified on W2K3 and earlier. --- dlls/advapi32/tests/eventlog.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index a781c06..c0f516a 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -712,7 +712,7 @@ static void test_readwrite(void) BOOL ret, sidavailable; BOOL on_vista = FALSE; /* Used to indicate Vista, W2K8 or Win7 */ int i; - char *localcomputer; + char *localcomputer = NULL; DWORD size; if (pCreateWellKnownSid) @@ -730,24 +730,6 @@ static void test_readwrite(void) user = NULL; } - if (pGetComputerNameExA) - { - size = 0; - SetLastError(0xdeadbeef); - pGetComputerNameExA(ComputerNameDnsFullyQualified, NULL, &size); - /* Cope with W2K (needed size is not set) */ - if (size == 0 && GetLastError() == ERROR_MORE_DATA) - size = 1024; - localcomputer = HeapAlloc(GetProcessHeap(), 0, size); - pGetComputerNameExA(ComputerNameDnsFullyQualified, localcomputer, &size); - } - else - { - size = MAX_COMPUTERNAME_LENGTH + 1; - localcomputer = HeapAlloc(GetProcessHeap(), 0, size); - GetComputerNameA(localcomputer, &size); - } - /* Write an event with an incorrect event type. This will fail on Windows 7 * but succeed on all others, hence it's not part of the struct. */ @@ -878,6 +860,22 @@ static void test_readwrite(void) if (on_vista) skip("There is no DWORD alignment enforced for UserSid on Vista, W2K8 or Win7\n"); + if (on_vista && pGetComputerNameExA) + { + /* New Vista+ behavior */ + size = 0; + SetLastError(0xdeadbeef); + pGetComputerNameExA(ComputerNameDnsFullyQualified, NULL, &size); + localcomputer = HeapAlloc(GetProcessHeap(), 0, size); + pGetComputerNameExA(ComputerNameDnsFullyQualified, localcomputer, &size); + } + else + { + size = MAX_COMPUTERNAME_LENGTH + 1; + localcomputer = HeapAlloc(GetProcessHeap(), 0, size); + GetComputerNameA(localcomputer, &size); + } + /* Read all events from our created eventlog, one by one */ handle = OpenEventLogA(NULL, eventlogname); i = 0;

1 0

Huw Davies : ntdll: Only free the string if the test succeeded.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: af0bb4a141855c4384003782bb64a6cbbe29753b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0bb4a141855c4384003782b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 8 10:34:40 2009 +0000 ntdll: Only free the string if the test succeeded. --- dlls/ntdll/tests/rtlstr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 80e9efa..d9ba0c9 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -468,7 +468,7 @@ static void test_RtlDuplicateUnicodeString(void) ok(memcmp(dest_str.Buffer, res_str.Buffer, dupl_ustr[test_num].res_buf_size) == 0, "(test %d): RtlDuplicateUnicodeString(%d, source, dest) has destination \"%s\" expected \"%s\"\n", test_num, dupl_ustr[test_num].add_nul, dest_ansi_str.Buffer, dupl_ustr[test_num].res_buf); - pRtlFreeUnicodeString(&dest_str); + if(result == STATUS_SUCCESS) pRtlFreeUnicodeString(&dest_str); } else { ok(dest_str.Buffer == NULL && dupl_ustr[test_num].res_buf == NULL, "(test %d): RtlDuplicateUnicodeString(%d, source, dest) has destination %p expected %p\n",

1 0

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 December 2009