November 2009 - Wine-commits

Juan Lang : crypt32: Correct error when a constrained, permitted name type isn't found in the subject name.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: ee02d43731e945ac8045b81d44898786144874af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee02d43731e945ac8045b81d4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 9 16:52:00 2009 -0800 crypt32: Correct error when a constrained, permitted name type isn't found in the subject name. --- dlls/crypt32/chain.c | 4 +++- dlls/crypt32/tests/chain.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index eab7f00..c6eaaec 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -699,7 +699,8 @@ static void CRYPT_CheckNameConstraints( CRYPT_FindMatchingNameEntry( &nameConstraints->rgPermittedSubtree[i].Base, subjectName, trustErrorStatus, - 0, CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); LocalFree(subjectName); } else @@ -711,6 +712,7 @@ static void CRYPT_CheckNameConstraints( { if (nameConstraints->cPermittedSubtree) *trustErrorStatus |= + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; if (nameConstraints->cExcludedSubtree) *trustErrorStatus |= diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 1994d85..2209e1f 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2731,7 +2731,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, 0 }, 1, simpleStatus19 }, - TODO_ERROR }, + 0 }, { { sizeof(chain20) / sizeof(chain20[0]), chain20 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER }, @@ -2746,7 +2746,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, 0 }, 1, simpleStatus21 }, - TODO_ERROR }, + 0 }, { { sizeof(chain22) / sizeof(chain22[0]), chain22 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER },

1 0

Marcus Meissner : rpcrt4: Compare network options correctly (Coverity).
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 860c87bb1ca338c91a55d52e401a3f98be254d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=860c87bb1ca338c91a55d52e4… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Nov 8 10:08:56 2009 +0100 rpcrt4: Compare network options correctly (Coverity). --- dlls/rpcrt4/rpc_assoc.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 117301f..4030d3d 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -84,6 +84,15 @@ static RPC_STATUS RpcAssoc_Alloc(LPCSTR Protseq, LPCSTR NetworkAddr, return RPC_S_OK; } +static BOOL compare_networkoptions(LPCWSTR opts1, LPCWSTR opts2) +{ + if ((opts1 == NULL) && (opts2 == NULL)) + return TRUE; + if ((opts1 == NULL) || (opts2 == NULL)) + return FALSE; + return !strcmpW(opts1, opts2); +} + RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAssoc **assoc_out) @@ -97,7 +106,7 @@ RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, if (!strcmp(Protseq, assoc->Protseq) && !strcmp(NetworkAddr, assoc->NetworkAddr) && !strcmp(Endpoint, assoc->Endpoint) && - ((!assoc->NetworkOptions && !NetworkOptions) || !strcmpW(NetworkOptions, assoc->NetworkOptions))) + compare_networkoptions(NetworkOptions, assoc->NetworkOptions)) { assoc->refs++; *assoc_out = assoc;

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 7acbe7c933f29dca9f5e28cb604a96cfa1ef4788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7acbe7c933f29dca9f5e28cb6… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Nov 9 23:25:39 2009 +0200 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index 4d39895..a7b451e 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -44,6 +44,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_BOOL "Tikėtasi loginio objekto" IDS_JSCRIPT_EXPECTED "Tikėtasi JScript objekto" IDS_REGEXP_SYNTAX_ERROR "Sintaksės klaida reguliariajame reiškinyje" + IDS_URI_INVALID_CHAR "Koduotiname URI yra netinkamų simbolių" IDS_INVALID_LENGTH "Masyvo dydis turi būti teigiamas sveikasis skaičius" IDS_ARRAY_EXPECTED "Tikėtasi masyvo objekto" }

1 0

Henri Verbeet : d3d8/tests: Only run the vertex/ pixel shader constant apply tests when the implementation supports them.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: d72c9ffbf50c5c55ef2c564f949c90c2bfd1a3d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72c9ffbf50c5c55ef2c564f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 10 10:16:29 2009 +0100 d3d8/tests: Only run the vertex/pixel shader constant apply tests when the implementation supports them. --- dlls/d3d8/tests/stateblock.c | 191 ++++++++++++++++++++++++----------------- 1 files changed, 112 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d72c9ffbf50c5c55ef2c5…

1 0

Jörg Höhle : winmm/tests: Fix MCI test failure on Win9x/WinME.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: d0e1a4f96fcb924da1b08e9d4f7945ade60d007c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e1a4f96fcb924da1b08e9d4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 7 23:57:24 2009 +0100 winmm/tests: Fix MCI test failure on Win9x/WinME. --- dlls/winmm/tests/mci.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index f783cd6..e5c7815 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include "windows.h" #include "mmsystem.h" #include "mmreg.h" @@ -523,8 +524,8 @@ static void test_AutoOpenWAVE(HWND hwnd) * fixme:winmm:MMDRV_Exit Closing while ll-driver open */ MCIERROR err; - char buf[1024]; - memset(buf, 0, sizeof(buf)); + char buf[512], path[300], command[330]; + memset(buf, 0, sizeof(buf)); memset(path, 0, sizeof(path)); /* Do not crash on NULL buffer pointer */ err = mciSendString("sysinfo waveaudio quantity open", NULL, 0, NULL); @@ -559,9 +560,18 @@ static void test_AutoOpenWAVE(HWND hwnd) /* This is the alias, not necessarily a file name. */ if(!err) ok(!strcmp(buf,"tempfile.wav"), "sysinfo name 1 open returned: %s\n", buf); + /* Save the full pathname to the file. */ + err = mciSendString("info tempfile.wav file", path, sizeof(path), NULL); + ok(!err,"mci info tempfile.wav file returned error: %d\n", err); + if(err) strcpy(path,"tempfile.wav"); + err = mciSendString("status tempfile.wav mode", NULL, 0, hwnd); ok(!err,"mci status tempfile.wav mode without buffer returned error: %d\n", err); + sprintf(command,"status \"%s\" mode",path); + err = mciSendString(command, buf, sizeof(buf), hwnd); + ok(!err,"mci status full-path-to-tempfile.wav mode returned error: %d\n", err); + buf[0]=0; err = mciSendString("status tempfile.wav mode", buf, sizeof(buf), hwnd); ok(!err,"mci status tempfile.wav mode returned error: %d\n", err); @@ -613,7 +623,11 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci sysinfo waveaudio quantity open after close returned error: %d\n", err); if(!err) todo_wine ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0 after auto-close, got: %s\n", buf); - err = mciSendString("status tempfile.wav mode wait", buf, sizeof(buf), hwnd); + /* w95-WinME (not w2k/XP) switch to C:\ after auto-playing once. Prevent + * MCIERR_FILE_NOT_FOUND by using the full path name from the Info file command. + */ + sprintf(command,"status \"%s\" mode wait",path); + err = mciSendString(command, buf, sizeof(buf), hwnd); ok(!err,"mci re-auto-open status mode returned error: %d\n", err); if(!err) ok(!strcmp(buf,"stopped"), "mci re-auto-open status mode, got: %s\n", buf); @@ -622,7 +636,8 @@ static void test_AutoOpenWAVE(HWND hwnd) if(!err) ok(!strcmp(buf,"waveaudio"), "mci capability device type response: %s\n", buf); /* waveaudio forbids Pause without Play. */ - err = mciSendString("pause tempfile.wav", NULL, 0, hwnd); + sprintf(command,"pause \"%s\"",path); + err = mciSendString(command, NULL, 0, hwnd); ok(err==MCIERR_NONAPPLICABLE_FUNCTION,"mci auto-open pause returned error: %d\n", err); }

1 0

Jörg Höhle : mciwave: Return on error in Seek.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: c75d1cba15e704c6c8739a6ebaf49cb95f1bdcb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75d1cba15e704c6c8739a6eb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 7 08:34:16 2009 +0100 mciwave: Return on error in Seek. --- dlls/mciwave/mciwave.c | 42 +++++++++++++++++++----------------------- 1 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index e7afab7..b8f394e 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1202,37 +1202,33 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR */ static DWORD WAVE_mciSeek(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) { - DWORD ret = 0; WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); - if (lpParms == NULL) { - ret = MCIERR_NULL_PARAMETER_BLOCK; - } else if (wmw == NULL) { - ret = MCIERR_INVALID_DEVICE_ID; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; + + WAVE_mciStop(wDevID, MCI_WAIT, 0); + + if (dwFlags & MCI_SEEK_TO_START) { + wmw->dwPosition = 0; + } else if (dwFlags & MCI_SEEK_TO_END) { + wmw->dwPosition = wmw->ckWaveData.cksize; + } else if (dwFlags & MCI_TO) { + wmw->dwPosition = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwTo); } else { - WAVE_mciStop(wDevID, MCI_WAIT, 0); - - if (dwFlags & MCI_SEEK_TO_START) { - wmw->dwPosition = 0; - } else if (dwFlags & MCI_SEEK_TO_END) { - wmw->dwPosition = wmw->ckWaveData.cksize; - } else if (dwFlags & MCI_TO) { - wmw->dwPosition = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwTo); - } else { - WARN("dwFlag doesn't tell where to seek to...\n"); - return MCIERR_MISSING_PARAMETER; - } + WARN("dwFlag doesn't tell where to seek to...\n"); + return MCIERR_MISSING_PARAMETER; + } - TRACE("Seeking to position=%u bytes\n", wmw->dwPosition); + TRACE("Seeking to position=%u bytes\n", wmw->dwPosition); - if (dwFlags & MCI_NOTIFY) { - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmw->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL); - } + if (dwFlags & MCI_NOTIFY) { + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmw->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL); } - return ret; + return MMSYSERR_NOERROR; } /**************************************************************************

1 0

Jörg Höhle : mciwave: Stop must not reset current position.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: c4b5bd44c0c83b7667686aa922535af8a80d36c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b5bd44c0c83b7667686aa92… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Oct 22 09:26:28 2009 +0200 mciwave: Stop must not reset current position. --- dlls/mciwave/mciwave.c | 2 -- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index b8f394e..266fa1b 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -614,8 +614,6 @@ static DWORD WAVE_mciStop(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS break; } - wmw->dwPosition = 0; - /* sanity resets */ wmw->dwStatus = MCI_MODE_STOP; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index e5c7815..f5bdba0 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -446,7 +446,7 @@ static void test_asyncWAVE(HWND hwnd) trace("position once stopped: %sms\n",buf); p2 = atoi(buf); /* An XP machine let the position increase slightly after pause. */ - todo_wine ok(p2>=p1 && p2<=p1+16,"position changed from %ums to %ums\n",p1,p2); + ok(p2>=p1 && p2<=p1+16,"position changed from %ums to %ums\n",p1,p2); /* No Resume once stopped (waveaudio, sequencer and cdaudio differ). */ err = mciSendString("resume mysound wait", NULL, 0, NULL);

1 0

Jörg Höhle : winmm: MCI Close all causes one notification per open driver.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 6b22861bfd15cb1f712234ba613f109edee92196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b22861bfd15cb1f712234ba6… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Oct 19 22:14:45 2009 +0200 winmm: MCI Close all causes one notification per open driver. --- dlls/winmm/mci.c | 10 +--------- dlls/winmm/tests/mci.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index c6f3701..82b1de1 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1676,11 +1676,8 @@ static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); + /* Every device must handle MCI_NOTIFY on its own. */ if (wDevID == MCI_ALL_DEVICE_ID) { - /* FIXME: shall I notify once after all is done, or for - * each of the open drivers ? if the latest, which notif - * to return when only one fails ? - */ while (MciDrivers) { /* Retrieve the device ID under lock, but send the message without, * the driver might be calling some winmm functions from another @@ -1707,11 +1704,6 @@ static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms MCI_UnLoadMciDriver(wmd); - if (dwParam & MCI_NOTIFY) - mciDriverNotify(lpParms ? (HWND)lpParms->dwCallback : 0, - wDevID, - dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL); - return dwRet; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index f5bdba0..05da6cd 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -152,6 +152,7 @@ static void test_notification1(HWND hwnd, const char* command, WPARAM type) static void test_openCloseWAVE(HWND hwnd) { MCIERROR err; + MCI_GENERIC_PARMS parm; const char command_open[] = "open new type waveaudio alias mysound"; const char command_close_my[] = "close mysound notify"; const char command_close_all[] = "close all notify"; @@ -179,7 +180,7 @@ static void test_openCloseWAVE(HWND hwnd) ok(!err,"mci %s returned error: %d\n", command_close_my, err); test_notification(hwnd, command_close_my, MCI_NOTIFY_SUCCESSFUL); Sleep(5); - todo_wine test_notification1(hwnd, command_close_my, 0); + test_notification(hwnd, command_close_my, 0); err = mciSendString(command_close_all, NULL, 0, NULL); todo_wine ok(!err,"mci %s (without buffer) returned error: %d\n", command_close_all, err); @@ -198,10 +199,12 @@ static void test_openCloseWAVE(HWND hwnd) todo_wine ok(buf[0] == '0' && buf[1] == 0, "mci %s, expected output buffer '0', got: '%s'\n", command_sysinfo, buf); err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0); - todo_wine ok(err == MCIERR_INVALID_DEVICE_ID || - broken(!err), /* Win9x and WinMe */ - "mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0) returned %s instead of MCIERR_INVALID_DEVICE_ID\n", - dbg_mcierr(err)); + ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0) returned %s\n", dbg_mcierr(err)); + + parm.dwCallback = (DWORD_PTR)hwnd; + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, (DWORD_PTR)&parm); + ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, hwnd) returned %s\n", dbg_mcierr(err)); + test_notification(hwnd, command_close_all, 0); /* None left */ } static void test_recordWAVE(HWND hwnd)

1 0

André Hentschel : ws2_32/tests: Test for initial state of SIOCATMARK.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 511c76dfdf9bd8a9ad3da9f9b8df5b2de92fb279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=511c76dfdf9bd8a9ad3da9f9b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 9 22:02:10 2009 +0100 ws2_32/tests: Test for initial state of SIOCATMARK. --- dlls/ws2_32/tests/sock.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5975684..c17b894 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2453,6 +2453,7 @@ static void test_ioctlsocket(void) int ret; static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; UINT i; + u_long arg = 0; sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); @@ -2470,6 +2471,13 @@ static void test_ioctlsocket(void) ret = WSAGetLastError(); ok(ret == WSAEFAULT, "expected WSAEFAULT, got %d instead\n", ret); } + + /* A fresh and not connected socket has no urgent data, this test shows + * that normal(not urgent) data returns a non-zero value for SIOCATMARK. */ + + ret = ioctlsocket(sock, SIOCATMARK, &arg); + if(ret != SOCKET_ERROR) + todo_wine ok(arg, "expected a non-zero value\n"); } static int drain_pause=0;

1 0

Aric Stewart : msctf/tests: Handle an occasional unexpected SetFocus from wine.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 25bfe9df49c8ba1cad7e13693f42d83295d160a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bfe9df49c8ba1cad7e13693… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Nov 7 09:52:09 2009 -0600 msctf/tests: Handle an occasional unexpected SetFocus from wine. --- dlls/msctf/tests/inputprocessor.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index edf5cc0..f4f737f 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1997,11 +1997,14 @@ static void test_AssociateFocus(void) test_CurrentFocus = dm2; test_PrevFocus = dm1; - test_OnSetFocus = SINK_EXPECTED; + test_OnSetFocus = SINK_OPTIONAL; /* wine and Winxp */ ShowWindow(wnd2,SW_SHOWNORMAL); SetFocus(wnd2); - processPendingMessages(); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + test_CurrentFocus = FOCUS_IGNORE; /* occasional wine race */ + test_PrevFocus = FOCUS_IGNORE; /* occasional wine race */ + test_OnSetFocus = SINK_IGNORE; /* occasional wine race */ + processPendingMessages(); ShowWindow(wnd3,SW_SHOWNORMAL); SetFocus(wnd3);

1 0