September 2008 - Wine-Commits

James Hawkins : setupapi: Fix a failing test in Vista.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 9b96881163ea7c0780acf3166205d9668842079c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b96881163ea7c0780acf3166… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 10 23:01:25 2008 -0500 setupapi: Fix a failing test in Vista. --- dlls/setupapi/tests/query.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 9c35767..c3dc46b 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -136,6 +136,7 @@ static void test_SetupGetInfInformation(void) PSP_INF_INFORMATION info; CHAR inf_filename[MAX_PATH]; CHAR inf_one[MAX_PATH], inf_two[MAX_PATH]; + LPSTR revfile; DWORD size; HINF hinf; BOOL ret; @@ -240,11 +241,6 @@ static void test_SetupGetInfInformation(void) ok(check_info_filename(info, inf_filename), "Expected returned filename to be equal\n"); SetupCloseInfFile(hinf); - lstrcpyA(inf_one, WIN_DIR); - lstrcatA(inf_one, "\\inf\\"); - lstrcatA(inf_one, "test.inf"); - create_inf_file(inf_one); - lstrcpyA(inf_two, WIN_DIR); lstrcatA(inf_two, "\\system32\\"); lstrcatA(inf_two, "test.inf"); @@ -253,9 +249,24 @@ static void test_SetupGetInfInformation(void) HeapFree(GetProcessHeap(), 0, info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); + /* check if system32 is searched for inf */ + ret = SetupGetInfInformationA("test.inf", INFINFO_DEFAULT_SEARCH, info, size, &size); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + revfile = inf_one; /* Vista */ + else + revfile = inf_two; + + lstrcpyA(inf_one, WIN_DIR); + lstrcatA(inf_one, "\\inf\\"); + lstrcatA(inf_one, "test.inf"); + create_inf_file(inf_one); + + HeapFree(GetProcessHeap(), 0, info); + info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); + /* test the INFINFO_DEFAULT_SEARCH search flag */ ret = SetupGetInfInformationA("test.inf", INFINFO_DEFAULT_SEARCH, info, size, &size); - ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); + ok(ret == TRUE, "Expected SetupGetInfInformation to succeed: %d\n", GetLastError()); ok(check_info_filename(info, inf_one), "Expected returned filename to be equal\n"); HeapFree(GetProcessHeap(), 0, info); @@ -264,7 +275,7 @@ static void test_SetupGetInfInformation(void) /* test the INFINFO_REVERSE_DEFAULT_SEARCH search flag */ ret = SetupGetInfInformationA("test.inf", INFINFO_REVERSE_DEFAULT_SEARCH, info, size, &size); ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); - ok(check_info_filename(info, inf_two), "Expected returned filename to be equal\n"); + ok(check_info_filename(info, revfile), "Expected returned filename to be equal\n"); HeapFree(GetProcessHeap(), 0, info);

1 0

James Hawkins : crypt32: Fix a failing test in Vista.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 18c45d8be74cc7f9f6bd0c3edd300811a6d04806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c45d8be74cc7f9f6bd0c3ed… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 10 23:00:53 2008 -0500 crypt32: Fix a failing test in Vista. --- dlls/crypt32/tests/oid.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index a583fc7..1145131 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -103,7 +103,8 @@ static void testOIDToAlgID(void) ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER || /* Vista */ - GetLastError() == ERROR_SUCCESS, /* win2k */ + GetLastError() == ERROR_SUCCESS || /* win2k */ + GetLastError() == ERROR_FILE_INVALID, /* another Vista */ "Expected ERROR_RESOURCE_NAME_NOT_FOUND, ERROR_INVALID_PARAMETER, " "ERROR_SUCCESS or no error set, got %08x\n", GetLastError());

1 0

James Hawkins : crypt32: Fix a failing test in Vista.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: a4d375c9f02eff7c9a872ef5f4692dd8a8ef395a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d375c9f02eff7c9a872ef5f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 10 23:00:17 2008 -0500 crypt32: Fix a failing test in Vista. --- dlls/crypt32/tests/msg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b03f5a4..78d49d8 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2856,8 +2856,10 @@ static void test_msg_control(void) /* Now that the signature's been checked, can't do the final update */ ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); todo_wine - ok(!ret && GetLastError() == NTE_BAD_HASH_STATE, - "expected NTE_BAD_HASH_STATE, got %08x\n", GetLastError()); + ok(!ret && + (GetLastError() == NTE_BAD_HASH_STATE || + GetLastError() == CRYPT_E_MSG_ERROR), /* Vista */ + "expected NTE_BAD_HASH_STATE or CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); CryptMsgClose(msg); /* Updating with the detached portion of the message and the data of the * the message allows the sig to be verified.

1 0

James Hawkins : crypt32: Fix a failing test in win9x.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 1779c64ba09152ff568c9b553d8f5a50b58c8cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1779c64ba09152ff568c9b553… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 10 22:59:43 2008 -0500 crypt32: Fix a failing test in win9x. --- dlls/crypt32/tests/ctl.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 799e9c9..5ed4381 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -359,10 +359,17 @@ static void testAddCTLToStore(void) signedCTLWithCTLInnerContentAndBadSig, sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW, NULL); - ok(!ret && - (GetLastError() == CRYPT_E_EXISTS || - GetLastError() == CRYPT_E_NOT_FOUND), /* win9x */ - "expected CRYPT_E_EXISTS, got %d %08x\n", ret, GetLastError()); + if (ret) + { + /* win9x */ + ok(GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + } + else + { + ok(!ret && GetLastError() == CRYPT_E_EXISTS, + "expected CRYPT_E_EXISTS, got %d %08x\n", ret, GetLastError()); + } CertCloseStore(store, 0); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,

1 0

James Hawkins : mstask: Fix a few failing tests in win2k.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: a58945de8423d2310d8f4658cc589c8e3778274e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58945de8423d2310d8f4658c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Sep 11 02:42:30 2008 -0500 mstask: Fix a few failing tests in win2k. --- dlls/mstask/tests/task.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 46635ae..88a4fdf 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -466,7 +466,9 @@ static void test_SetAccountInformation_GetAccountInformation(void) ok(hres == S_OK, "Failed setting dummy account with no password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); - ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + ok(hres == S_OK || + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), + "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, dummy_account_name), @@ -482,7 +484,9 @@ static void test_SetAccountInformation_GetAccountInformation(void) ok(hres == S_OK, "Failed setting dummy account with password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); - ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + ok(hres == S_OK || + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), + "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, dummy_account_name_b), @@ -495,7 +499,9 @@ static void test_SetAccountInformation_GetAccountInformation(void) hres = ITask_SetAccountInformation(test_task, empty, NULL); ok(hres == S_OK, "Failed setting system account: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); - ok(hres == S_OK, "GetAccountInformation failed: %08x\n", hres); + ok(hres == S_OK || + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), + "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, empty),

1 0

James Hawkins : shell32: Fix two failing tests in win2k.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 147464c000c518b3704ee3330a854e1a992490bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=147464c000c518b3704ee3330… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Sep 11 02:37:28 2008 -0500 shell32: Fix two failing tests in win2k. --- dlls/shell32/tests/shlfileop.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index eca4f94..a4d2559 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -942,7 +942,9 @@ static void test_copy(void) shfo.pTo = "two.txt\0"; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval); + ok(retval == 1148 || retval == 1026 || + retval == ERROR_ACCESS_DENIED, /* win2k */ + "Expected 1148, 1026 or ERROR_ACCESS_DENIED, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(!DeleteFileA("two.txt"), "Expected file to not exist\n"); @@ -984,7 +986,9 @@ static void test_copy(void) shfo.pTo = to; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == 1148 || retval == 1026, "Expected 1148 or 1026, got %d\n", retval); + ok(retval == 1148 || retval == 1026 || + retval == ERROR_ACCESS_DENIED, /* win2k */ + "Expected 1148, 1026 or ERROR_ACCESS_DENIED, got %d\n", retval); ok(DeleteFileA("one.txt"), "Expected file to exist\n"); ok(!DeleteFileA("two.txt"), "Expected file to not exist\n");

1 0

James Hawkins : secur32: Fix two failing tests in win2k.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 852b3673611f7cafd9bea4d3fbdfcf47ea18c864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852b3673611f7cafd9bea4d3f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Sep 11 02:34:01 2008 -0500 secur32: Fix two failing tests in win2k. --- dlls/secur32/tests/schannel.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 881f443..9f7c2a8 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -283,14 +283,16 @@ static void testAcquireSecurityContext(void) schanCred.paCred = &certs[1]; st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n", - st); + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS || + st == SEC_E_INTERNAL_ERROR, /* win2k */ + "Expected SEC_E_UNKNOWN_CREDENTIALS, SEC_E_NO_CREDENTIALS " + "or SEC_E_INTERNAL_ERROR, got %08x\n", st); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, NULL, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, - "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n", - st); + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS || + st == SEC_E_INTERNAL_ERROR, /* win2k */ + "Expected SEC_E_UNKNOWN_CREDENTIALS, SEC_E_NO_CREDENTIALS " + "or SEC_E_INTERNAL_ERROR, got %08x\n", st); /* Good cert, with CRYPT_KEY_PROV_INFO set before it's had a key loaded. */ if (pCertSetCertificateContextProperty)

1 0

Alexandre Julliard : kernel32: Added implementation for UnregisterWaitEx.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: ee375f7c22f727c4a26e194c4076f3663d04d171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee375f7c22f727c4a26e194c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 11:49:40 2008 +0200 kernel32: Added implementation for UnregisterWaitEx. --- dlls/kernel32/sync.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 1cc88b6..e92679a 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -308,8 +308,13 @@ BOOL WINAPI UnregisterWait( HANDLE WaitHandle ) */ BOOL WINAPI UnregisterWaitEx( HANDLE WaitHandle, HANDLE CompletionEvent ) { - FIXME("%p %p\n",WaitHandle, CompletionEvent); - return FALSE; + NTSTATUS status; + + TRACE("%p %p\n",WaitHandle, CompletionEvent); + + status = RtlDeregisterWaitEx( WaitHandle, CompletionEvent ); + if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } /***********************************************************************

1 0

Dmitry Timoshkov : user32: Make GetMonitorInfoW print the monitor properties.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 5587387c9f07e0632d81090a1364b749156c90fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5587387c9f07e0632d81090a1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 11 13:13:14 2008 +0900 user32: Make GetMonitorInfoW print the monitor properties. --- dlls/user32/misc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index f91be62..9de9b91 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -477,7 +477,12 @@ BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) */ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) { - return USER_Driver->pGetMonitorInfo( hMonitor, lpMonitorInfo ); + BOOL ret = USER_Driver->pGetMonitorInfo( hMonitor, lpMonitorInfo ); + if (ret) + TRACE("flags %04x, monitor %s, work %s\n", lpMonitorInfo->dwFlags, + wine_dbgstr_rect(&lpMonitorInfo->rcMonitor), + wine_dbgstr_rect(&lpMonitorInfo->rcWork)); + return ret; } /***********************************************************************

1 0

Dmitry Timoshkov : user32: Implement SystemParametersInfo(SPI_GETWORKAREA) properly.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: c707e7d9a6a5c804b3ae286c9bd8bab279327dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c707e7d9a6a5c804b3ae286c9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 11 13:20:15 2008 +0900 user32: Implement SystemParametersInfo(SPI_GETWORKAREA) properly. --- dlls/user32/sysparams.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6e260ea..fc5785a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1139,6 +1139,19 @@ static void load_nonclient_metrics(void) spi_loaded[SPI_NONCLIENTMETRICS_IDX] = TRUE; } +static BOOL CALLBACK enum_monitors( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) +{ + MONITORINFO mi; + + mi.cbSize = sizeof(mi); + if (GetMonitorInfoW( monitor, &mi ) && (mi.dwFlags & MONITORINFOF_PRIMARY)) + { + LPRECT work = (LPRECT)lp; + *work = mi.rcWork; + return FALSE; + } + return TRUE; +} /*********************************************************************** * SystemParametersInfoW (USER32.@) @@ -1725,10 +1738,11 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, SetRect( &work_area, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + EnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area ); spi_loaded[spi_idx] = TRUE; } CopyRect( (RECT *)pvParam, &work_area ); - + TRACE("work area %s\n", wine_dbgstr_rect( &work_area )); break; }

1 0