January 2009 - Wine-commits

Vincent Pelletier : dinput: Move WARN where it belongs.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 0ea7dc15f8f3153516a5bf9fa9ad60cd4f1b4df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea7dc15f8f3153516a5bf9fa… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sat Jan 17 22:14:10 2009 +0100 dinput: Move WARN where it belongs. --- dlls/dinput/joystick_linuxinput.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6f5b362..be5dccf 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -657,11 +657,11 @@ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) IDirectInputDevice2AImpl_Unacquire(iface); return DIERR_NOTFOUND; } - } - else - { - /* Couldn't open in r/w but opened in read-only. */ - WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n", This->joydev->device); + else + { + /* Couldn't open in r/w but opened in read-only. */ + WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n", This->joydev->device); + } } return DI_OK;

1 0

Andrey Turkin : ole32: Add CoGetCallContext and CoSwitchCallContext implementations.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: a06f568a2a356a979c9371930023c1032e34e9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06f568a2a356a979c9371930… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Jan 18 17:17:45 2009 +0300 ole32: Add CoGetCallContext and CoSwitchCallContext implementations. --- dlls/ole32/compobj.c | 42 ++++++++++++++++- dlls/ole32/compobj_private.h | 1 + dlls/ole32/ole32.spec | 2 +- dlls/ole32/tests/compobj.c | 103 ++++++++++++++++++++++++++++++++++++++++++ include/objbase.h | 1 + 5 files changed, 145 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 9501473..b291db4 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3352,10 +3352,46 @@ HRESULT WINAPI CoCopyProxy(IUnknown *pProxy, IUnknown **ppCopy) */ HRESULT WINAPI CoGetCallContext(REFIID riid, void **ppv) { - FIXME("(%s, %p): stub\n", debugstr_guid(riid), ppv); + struct oletls *info = COM_CurrentInfo(); - *ppv = NULL; - return E_NOINTERFACE; + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + if (!info) + return E_OUTOFMEMORY; + + if (!info->call_state) + return RPC_E_CALL_COMPLETE; + + return IUnknown_QueryInterface(info->call_state, riid, ppv); +} + +/*********************************************************************** + * CoSwitchCallContext [OLE32.@] + * + * Switches the context of the currently executing server call in the current + * thread. + * + * PARAMS + * pObject [I] Pointer to new context object + * ppOldObject [O] Pointer to memory that will receive old context object pointer + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + */ +HRESULT WINAPI CoSwitchCallContext(IUnknown *pObject, IUnknown **ppOldObject) +{ + struct oletls *info = COM_CurrentInfo(); + + TRACE("(%p, %p)\n", pObject, ppOldObject); + + if (!info) + return E_OUTOFMEMORY; + + *ppOldObject = info->call_state; + info->call_state = pObject; /* CoSwitchCallContext does not addref nor release objects */ + + return S_OK; } /*********************************************************************** diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 3c3e96d..8f2cc2c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -181,6 +181,7 @@ struct oletls GUID causality_id; /* unique identifier for each COM call */ LONG pending_call_count_client; /* number of client calls pending */ LONG pending_call_count_server; /* number of server calls pending */ + IUnknown *call_state; /* current call context */ }; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 49ff1d3..7d69bd8 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -73,7 +73,7 @@ @ stdcall CoSetProxyBlanket(ptr long long wstr long long ptr long) @ stdcall CoSetState(ptr) @ stdcall CoSuspendClassObjects() -@ stub CoSwitchCallContext +@ stdcall CoSwitchCallContext(ptr ptr) @ stdcall CoTaskMemAlloc(long) @ stdcall CoTaskMemFree(ptr) @ stdcall CoTaskMemRealloc(ptr long) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 63891b7..046b91a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -37,6 +37,7 @@ /* functions that are not present on all versions of Windows */ HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); +HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -1039,6 +1040,106 @@ static void test_CoGetObjectContext(void) CoUninitialize(); } +typedef struct { + const IUnknownVtbl *lpVtbl; + LONG refs; +} Test_CallContext; + +static HRESULT WINAPI Test_CallContext_QueryInterface( + IUnknown *iface, + REFIID riid, + LPVOID *ppvObj) +{ + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown)) + { + *ppvObj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Test_CallContext_AddRef(IUnknown *iface) +{ + Test_CallContext *This = (Test_CallContext*)iface; + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI Test_CallContext_Release(IUnknown *iface) +{ + Test_CallContext *This = (Test_CallContext*)iface; + ULONG refs = InterlockedDecrement(&This->refs); + if (!refs) + HeapFree(GetProcessHeap(), 0, This); + return refs; +} + +static const IUnknownVtbl TestCallContext_Vtbl = +{ + Test_CallContext_QueryInterface, + Test_CallContext_AddRef, + Test_CallContext_Release +}; + +static void test_CoGetCallContext(void) +{ + HRESULT hr; + ULONG refs; + IUnknown *pUnk; + IUnknown *test_object; + + if (!pCoSwitchCallContext) + { + skip("CoSwitchCallContext not present\n"); + return; + } + + CoInitialize(NULL); + + test_object = HeapAlloc(GetProcessHeap(), 0, sizeof(Test_CallContext)); + ((Test_CallContext*)test_object)->lpVtbl = &TestCallContext_Vtbl; + ((Test_CallContext*)test_object)->refs = 1; + + hr = CoGetCallContext(&IID_IUnknown, (void**)&pUnk); + ok(hr == RPC_E_CALL_COMPLETE, "Expected RPC_E_CALL_COMPLETE, got 0x%08x\n", hr); + + pUnk = (IUnknown*)0xdeadbeef; + hr = pCoSwitchCallContext(test_object, &pUnk); + ok_ole_success(hr, "CoSwitchCallContext"); + ok(pUnk == NULL, "expected NULL, got %p\n", pUnk); + refs = IUnknown_AddRef(test_object); + ok(refs == 2, "Expected refcount 2, got %d\n", refs); + IUnknown_Release(test_object); + + pUnk = (IUnknown*)0xdeadbeef; + hr = CoGetCallContext(&IID_IUnknown, (void**)&pUnk); + ok_ole_success(hr, "CoGetCallContext"); + ok(pUnk == test_object, "expected %p, got %p\n", test_object, pUnk); + refs = IUnknown_AddRef(test_object); + ok(refs == 3, "Expected refcount 3, got %d\n", refs); + IUnknown_Release(test_object); + IUnknown_Release(pUnk); + + pUnk = (IUnknown*)0xdeadbeef; + hr = pCoSwitchCallContext(NULL, &pUnk); + ok_ole_success(hr, "CoSwitchCallContext"); + ok(pUnk == test_object, "expected %p, got %p\n", test_object, pUnk); + refs = IUnknown_AddRef(test_object); + ok(refs == 2, "Expected refcount 2, got %d\n", refs); + IUnknown_Release(test_object); + + hr = CoGetCallContext(&IID_IUnknown, (void**)&pUnk); + ok(hr == RPC_E_CALL_COMPLETE, "Expected RPC_E_CALL_COMPLETE, got 0x%08x\n", hr); + + IUnknown_Release(test_object); + + CoUninitialize(); +} + static void test_CoInitializeEx(void) { HRESULT hr; @@ -1064,6 +1165,7 @@ START_TEST(compobj) { HMODULE hOle32 = GetModuleHandle("ole32"); pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); + pCoSwitchCallContext = (void*)GetProcAddress(hOle32, "CoSwitchCallContext"); if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) { trace("You need DCOM95 installed to run this test\n"); @@ -1088,5 +1190,6 @@ START_TEST(compobj) test_registered_object_thread_affinity(); test_CoFreeUnusedLibraries(); test_CoGetObjectContext(); + test_CoGetCallContext(); test_CoInitializeEx(); } diff --git a/include/objbase.h b/include/objbase.h index 9f606c0..7e72fad 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -391,6 +391,7 @@ BOOL WINAPI CoIsHandlerConnected(LPUNKNOWN pUnk); /* security */ HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE* asAuthSvc, void* pReserved1, DWORD dwAuthnLevel, DWORD dwImpLevel, void* pReserved2, DWORD dwCapabilities, void* pReserved3); HRESULT WINAPI CoGetCallContext(REFIID riid, void** ppInterface); +HRESULT WINAPI CoSwitchCallContext(IUnknown *pContext, IUnknown **ppOldContext); HRESULT WINAPI CoQueryAuthenticationServices(DWORD* pcAuthSvc, SOLE_AUTHENTICATION_SERVICE** asAuthSvc); HRESULT WINAPI CoQueryProxyBlanket(IUnknown* pProxy, DWORD* pwAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTH_IDENTITY_HANDLE* pAuthInfo, DWORD* pCapabilities);

1 0

Andrey Turkin : ole32: Add a few fields to OLE TLS area to match native memory layout.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: d0a345f914ff804b09df8072e2380a0852c73a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a345f914ff804b09df8072e… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Jan 18 17:18:03 2009 +0300 ole32: Add a few fields to OLE TLS area to match native memory layout. --- dlls/ole32/compobj.c | 5 ++++- dlls/ole32/compobj_private.h | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b291db4..4e926ec 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3951,9 +3951,12 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) */ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) { + struct oletls *info = COM_CurrentInfo(); static int calls; if(!(calls++)) FIXME( "stub\n" ); - if (token) *token = 0; + if (!info) + return E_OUTOFMEMORY; + if (token) *token = info->context_token; return E_NOTIMPL; } diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 8f2cc2c..38a6475 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -175,13 +175,18 @@ struct oletls struct apartment *apt; IErrorInfo *errorinfo; /* see errorinfo.c */ IUnknown *state; /* see CoSetState */ + DWORD apt_mask; /* apartment mask (+0Ch on x86) */ IInitializeSpy *spy; /* The "SPY" from CoInitializeSpy */ DWORD inits; /* number of times CoInitializeEx called */ DWORD ole_inits; /* number of times OleInitialize called */ GUID causality_id; /* unique identifier for each COM call */ LONG pending_call_count_client; /* number of client calls pending */ LONG pending_call_count_server; /* number of server calls pending */ - IUnknown *call_state; /* current call context */ + DWORD unknown; + ULONG_PTR context_token; /* (+38h on x86) */ + IUnknown *call_state; /* current call context (+3Ch on x86) */ + DWORD unknown2[46]; + IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ };

1 0

Austin Lund : riched20/tests: Added ITextServices::TxGetNaturalSize test.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 80e71e63f2c697a620a933b5934d295b4813c07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e71e63f2c697a620a933b59… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Jan 16 09:18:05 2009 +1000 riched20/tests: Added ITextServices::TxGetNaturalSize test. --- dlls/riched20/tests/txtsrv.c | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 0714535..cb11469 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -32,6 +32,7 @@ #include <textserv.h> #include <wine/test.h> #include <oleauto.h> +#include <limits.h> static HMODULE hmoduleRichEdit; @@ -434,12 +435,16 @@ static void WINAPI ITextHostImpl_TxImmReleaseContext(ITextHost *iface, HIMC himc TRACECALL("Call to TxImmReleaseContext(%p, himc=%p)\n", This, himc); } +/* This function must set the variable pointed to by *lSelBarWidth. + Otherwise an uninitalized value will be used to calculate + positions and sizes even if E_NOTIMPL is returned. */ static HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *iface, LONG *lSelBarWidth) { ITextHostTestImpl *This = (ITextHostTestImpl *)iface; TRACECALL("Call to TxGetSelectionBarWidth(%p, lSelBarWidth=%p)\n", This, lSelBarWidth); + *lSelBarWidth = 0; return E_NOTIMPL; } @@ -666,6 +671,66 @@ static void test_TxSetText(void) CoTaskMemFree(dummyTextHost); } +void test_TxGetNaturalSize() { + HRESULT result; + + /* This value is used when calling TxGetNaturalSize. MSDN says + that this is not supported however a null pointer cannot be + used as it will cause a segmentation violation. The values in + the structure being pointed to are required to be INT_MAX + otherwise calculations can give wrong values. */ + const SIZEL psizelExtent = {INT_MAX,INT_MAX}; + + static const WCHAR oneA[] = {'A',0}; + + /* Results of measurements */ + LONG xdim, ydim; + + /* The device context to do the tests in */ + HDC hdcDraw; + + /* Variables with the text metric information */ + INT charwidth_caps_text[26]; + TEXTMETRIC tmInfo_text; + + if (!init_texthost()) + return; + + hdcDraw = GetDC(NULL); + SaveDC(hdcDraw); + + /* Populate the metric strucs */ + SetMapMode(hdcDraw,MM_TEXT); + GetTextMetrics(hdcDraw, &tmInfo_text); + GetCharWidth32(hdcDraw,'A','Z',charwidth_caps_text); + + /* Make measurements in MM_TEXT */ + SetMapMode(hdcDraw,MM_TEXT); + xdim = 0; ydim = 0; + + result = ITextServices_TxSetText(txtserv, oneA); + todo_wine ok(result == S_OK, "ITextServices_TxSetText failed\n"); + + result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, + hdcDraw, NULL, NULL, + TXTNS_FITTOCONTENT, &psizelExtent, + &xdim, &ydim); + todo_wine ok(result == S_OK, "TxGetNaturalSize failed\n"); + todo_wine ok(ydim == tmInfo_text.tmHeight, + "Height calculated incorrectly (expected %d, got %d)\n", + tmInfo_text.tmHeight, ydim); + /* The native DLL adds one pixel extra when calculating widths. */ + todo_wine ok(xdim >= charwidth_caps_text[0] && xdim <= charwidth_caps_text[0] + 1, + "Width calculated incorrectly (expected %d {+1}, got %d)\n", + charwidth_caps_text[0], xdim); + + RestoreDC(hdcDraw,1); + ReleaseDC(NULL,hdcDraw); + + IUnknown_Release(txtserv); + CoTaskMemFree(dummyTextHost); +} + START_TEST( txtsrv ) { setup_thiscall_wrappers(); @@ -682,6 +747,7 @@ START_TEST( txtsrv ) test_TxGetText(); test_TxSetText(); + test_TxGetNaturalSize(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); }

1 0

Michael Gruber : winex11.drv: Remove " German keyboard layout without dead keys 105".
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 8c914986a6dd2ac475d701495eccb22c3fe59ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c914986a6dd2ac475d701495… Author: Michael Gruber <lists.mg(a)googlemail.com> Date: Tue Jan 13 16:41:37 2009 +0100 winex11.drv: Remove "German keyboard layout without dead keys 105". --- dlls/winex11.drv/keyboard.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 8f839f7..c9e4d16 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -190,15 +190,6 @@ static const WORD main_key_vkey_qwertz[MAIN_LEN] = VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */ }; -static const WORD main_key_vkey_qwertz_105[MAIN_LEN] = -{ -/* NOTE: this layout must concur with the scan codes layout above */ - VK_OEM_3,'1','2','3','4','5','6','7','8','9','0',VK_OEM_MINUS,VK_OEM_PLUS, - 'Q','W','E','R','T','Z','U','I','O','P',VK_OEM_4,VK_OEM_6, - 'A','S','D','F','G','H','J','K','L',VK_OEM_1,VK_OEM_7,VK_OEM_5, - VK_OEM_102,'Y','X','C','V','B','N','M',VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2 -}; - static const WORD main_key_vkey_abnt_qwerty[MAIN_LEN] = { /* NOTE: this layout must concur with the scan codes layout above */ @@ -343,15 +334,6 @@ static const char main_key_DE_nodead[MAIN_LEN][4] = "<>" }; -/*** German keyboard layout without dead keys 105 Keys (contributed by Matthias Fechner)*/ -static const char main_key_DE_nodead_105[MAIN_LEN][4] = -{ - "^�","1!","2\"�","3��","4$","5%","6&","7/{","8([","9)]","0=}","�?\\","\0`", - "qQ@","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","+*~", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","#'", - "<>|","yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", -}; - /*** Swiss German keyboard layout (setxkbmap ch -variant de) */ static const char main_key_SG[MAIN_LEN][4] = { @@ -931,7 +913,6 @@ static const struct { {0x0407, "German keyboard layout", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x0407, "German keyboard layout without dead keys", &main_key_DE_nodead, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x0407, "German keyboard layout for logitech desktop pro", &main_key_DE_logitech, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0407, "German keyboard layout without dead keys 105", &main_key_DE_nodead_105, &main_key_scan_qwerty, &main_key_vkey_qwertz_105}, {0x0807, "Swiss German keyboard layout", &main_key_SG, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x100c, "Swiss French keyboard layout", &main_key_SF, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x041d, "Swedish keyboard layout", &main_key_SE, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2},

1 0

Christian Costa : mciavi: Don't wait for events we don't handle.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: c51ef12b17f38ec3e5121f89c9942863ebd6f5b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51ef12b17f38ec3e5121f89c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Jan 19 12:26:23 2009 +0100 mciavi: Don't wait for events we don't handle. --- dlls/mciavi32/mciavi.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 35d8046..4e5faac 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -506,8 +506,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms delta = GetTickCount() - tc; LeaveCriticalSection(&wma->cs); - ret = MsgWaitForMultipleObjectsEx(2, events, - (delta >= frameTime) ? 0 : frameTime - delta, QS_ALLINPUT, MWMO_INPUTAVAILABLE); + ret = WaitForMultipleObjects(2, events, FALSE, (delta >= frameTime) ? 0 : frameTime - delta); EnterCriticalSection(&wma->cs); if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break; @@ -520,8 +519,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms delta = 0; LeaveCriticalSection(&wma->cs); - ret = MsgWaitForMultipleObjectsEx(1, &wma->hStopEvent, delta, - QS_ALLINPUT, MWMO_INPUTAVAILABLE); + ret = WaitForMultipleObjects(1, &wma->hStopEvent, FALSE, delta); EnterCriticalSection(&wma->cs); if (ret == WAIT_OBJECT_0) break;

1 0

Hans Leidekker : msvcrt: Forward ANSI open functions to their Unicode counterparts instead of the other way around . Implement _wfreopen.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: d2a383b65885254cd596bd94d7afe9b4ff8e8ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a383b65885254cd596bd94d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 19 11:41:15 2009 +0100 msvcrt: Forward ANSI open functions to their Unicode counterparts instead of the other way around. Implement _wfreopen. --- dlls/msvcrt/file.c | 242 ++++++++++++++++++++++++++++++----------------- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 156 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2a383b65885254cd596b…

1 0

Hans Leidekker : wininet: Avoid illegal filenames in CreateUrlCacheEntryW.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: b33792235eba3fe74aea7589a8c561cddb36ec75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33792235eba3fe74aea7589a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 19 11:40:45 2009 +0100 wininet: Avoid illegal filenames in CreateUrlCacheEntryW. --- dlls/wininet/urlcache.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index d1d54ae..687290c 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2313,9 +2313,26 @@ BOOL WINAPI CreateUrlCacheEntryW( for (i = 0; i < 255; i++) { - static const WCHAR szFormat[] = {'[','%','u',']','%','s',0}; + static const WCHAR szFormat[] = {'[','%','u',']','%','s',0}; HANDLE hFile; + WCHAR *p; + wsprintfW(lpszFileNameNoPath + countnoextension, szFormat, i, szExtension); + for (p = lpszFileNameNoPath + 1; *p; p++) + { + switch (*p) + { + case '<': case '>': + case ':': case '"': + case '/': case '\\': + case '|': case '?': + case '*': + *p = '_'; break; + default: break; + } + } + if (p[-1] == ' ' || p[-1] == '.') p[-1] = '_'; + TRACE("Trying: %s\n", debugstr_w(lpszFileName)); hFile = CreateFileW(lpszFileName, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); if (hFile != INVALID_HANDLE_VALUE)

1 0

Paul Vriens : wintrust/tests: Make the catalog properties test a bit more flexible.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: db8cce3fcb6b6ecca54cb6e7d9c8c964a3a88b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8cce3fcb6b6ecca54cb6e7d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 19 09:53:28 2009 +0100 wintrust/tests: Make the catalog properties test a bit more flexible. --- dlls/wintrust/tests/crypt.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 1f7656a..687f0bd 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -551,7 +551,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) DeleteFileA(tmpfile); } -static void test_catalog_properties(void) +static void test_catalog_properties(int members, int attributes) { static const WCHAR hashmeW[] = {'h','a','s','h','m','e',0}; static const WCHAR attr1W[] = {'a','t','t','r','1',0}; @@ -566,7 +566,7 @@ static void test_catalog_properties(void) DWORD written; HANDLE file; BOOL ret; - int attrcount = 0; + int attrcount = 0, membercount = 0; if (!GetTempFileNameA(CURR_DIR, "cat", 0, catalog)) return; file = CreateFileA(catalog, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -585,16 +585,23 @@ static void test_catalog_properties(void) m = pCryptCATEnumerateMember(NULL, NULL); ok(m == NULL, "CryptCATEnumerateMember succeeded\n"); - m = pCryptCATEnumerateMember(hcat, NULL); - ok(m != NULL, "CryptCATEnumerateMember failed %u\n", GetLastError()); - - ok(m->cbStruct == sizeof(CRYPTCATMEMBER), "unexpected size %u\n", m->cbStruct); - todo_wine ok(!lstrcmpW(m->pwszReferenceTag, hashmeW), "unexpected tag\n"); - ok(!memcmp(&m->gSubjectType, &subject, sizeof(subject)), "guid differs\n"); - ok(!m->fdwMemberFlags, "got %x expected 0\n", m->fdwMemberFlags); - ok(m->dwCertVersion == 0x200, "got %x expected 0x200\n", m->dwCertVersion); - ok(!m->dwReserved, "got %x expected 0\n", m->dwReserved); - ok(m->hReserved == NULL, "got %p expected NULL\n", m->hReserved); + m = NULL; + while ((m = pCryptCATEnumerateMember(hcat, m))) + { + ok(m->cbStruct == sizeof(CRYPTCATMEMBER), "unexpected size %u\n", m->cbStruct); + todo_wine ok(!lstrcmpW(m->pwszReferenceTag, hashmeW), "unexpected tag\n"); + ok(!memcmp(&m->gSubjectType, &subject, sizeof(subject)), "guid differs\n"); + ok(!m->fdwMemberFlags, "got %x expected 0\n", m->fdwMemberFlags); + ok(m->dwCertVersion == 0x200, "got %x expected 0x200\n", m->dwCertVersion); + ok(!m->dwReserved, "got %x expected 0\n", m->dwReserved); + ok(m->hReserved == NULL, "got %p expected NULL\n", m->hReserved); + + attr = pCryptCATEnumerateAttr(hcat, m, NULL); + ok(attr == NULL, "CryptCATEnumerateAttr succeeded\n"); + + membercount++; + } + ok(membercount == members, "Expected %d member, got %d\n", members, membercount); attr = pCryptCATEnumerateAttr(NULL, NULL, NULL); ok(attr == NULL, "CryptCATEnumerateAttr succeeded\n"); @@ -602,12 +609,6 @@ static void test_catalog_properties(void) attr = pCryptCATEnumerateAttr(hcat, NULL, NULL); ok(attr == NULL, "CryptCATEnumerateAttr succeeded\n"); - attr = pCryptCATEnumerateAttr(hcat, m, NULL); - ok(attr == NULL, "CryptCATEnumerateAttr succeeded\n"); - - m = pCryptCATEnumerateMember(hcat, m); - ok(m == NULL, "CryptCATEnumerateMember succeeded\n"); - attr = NULL; while ((attr = pCryptCATEnumerateCatAttr(hcat, attr))) { @@ -618,7 +619,7 @@ static void test_catalog_properties(void) attrcount++; } todo_wine - ok(attrcount == 2, "Expected 2 catalog attributes, got %d\n", attrcount); + ok(attrcount == attributes, "Expected %d catalog attributes, got %d\n", attributes, attrcount); ret = pCryptCATClose(hcat); ok(ret, "CryptCATClose failed\n"); @@ -656,5 +657,5 @@ START_TEST(crypt) /* Parameter checking only */ test_CryptCATCDF_params(); test_CryptCATAdminAddRemoveCatalog(); - test_catalog_properties(); + test_catalog_properties(1, 2); }

1 0

Paul Vriens : wintrust/tests: Add some tests that creates catalog files.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 2c9a41a4e4c7f02a4b1fd560a041cf20dd24ea7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9a41a4e4c7f02a4b1fd560a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 19 11:31:45 2009 +0100 wintrust/tests: Add some tests that creates catalog files. --- dlls/wintrust/tests/crypt.c | 179 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 165 insertions(+), 14 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 687f0bd..624f2c4 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -32,6 +32,10 @@ static CHAR CURR_DIR[MAX_PATH]; static CHAR catroot[MAX_PATH]; static CHAR catroot2[MAX_PATH]; +static const WCHAR hashmeW[] = {'h','a','s','h','m','e',0}; +static const WCHAR attr1W[] = {'a','t','t','r','1',0}; +static const WCHAR attr2W[] = {'a','t','t','r','2',0}; + /* * Minimalistic catalog file. To reconstruct, save text below as winetest.cdf, * convert to DOS line endings and run 'makecat /cat winetest.cdf' @@ -50,6 +54,18 @@ CATATTR2=0x10010001:attr2:value2 hashme=.\winetest.cdf */ +static const CHAR test_cdf[] = + "[CatalogHeader]\r\n" + "Name=winetest.cat\r\n" + "ResultDir=.\\\r\n" + "PublicVersion=0x00000001\r\n" + "EncodingType=\r\n" + "CATATTR1=0x10010001:attr1:value1\r\n" + "CATATTR2=0x10010001:attr2:value2\r\n" + "\r\n" + "[CatalogFiles]\r\n" + "hashme=.\\winetest.cdf\r\n"; + static const BYTE test_catalog[] = { 0x30, 0x82, 0x01, 0xbc, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x01, 0xad, 0x30, 0x82, 0x01, 0xa9, 0x02, 0x01, 0x01, 0x31, 0x00, 0x30, 0x82, 0x01, 0x9e, @@ -90,6 +106,10 @@ static BOOL (WINAPI * pCryptCATAdminReleaseCatalogContext)(HCATADMIN, HCATINFO, static HANDLE (WINAPI * pCryptCATOpen)(LPWSTR, DWORD, HCRYPTPROV, DWORD, DWORD); static BOOL (WINAPI * pCryptCATCatalogInfoFromContext)(HCATINFO, CATALOG_INFO *, DWORD); static BOOL (WINAPI * pCryptCATCDFClose)(CRYPTCATCDF *); +static CRYPTCATATTRIBUTE * (WINAPI * pCryptCATCDFEnumCatAttributes)(CRYPTCATCDF *, CRYPTCATATTRIBUTE *, + PFN_CDF_PARSE_ERROR_CALLBACK); +static LPWSTR (WINAPI * pCryptCATCDFEnumMembersByCDFTagEx)(CRYPTCATCDF *, LPWSTR, PFN_CDF_PARSE_ERROR_CALLBACK, + CRYPTCATMEMBER **, BOOL, LPVOID); static CRYPTCATCDF * (WINAPI * pCryptCATCDFOpen)(LPWSTR, PFN_CDF_PARSE_ERROR_CALLBACK); static CRYPTCATATTRIBUTE * (WINAPI * pCryptCATEnumerateCatAttr)(HANDLE, CRYPTCATATTRIBUTE *); static CRYPTCATMEMBER * (WINAPI * pCryptCATEnumerateMember)(HANDLE, CRYPTCATMEMBER *); @@ -115,6 +135,8 @@ static void InitFunctionPtrs(void) WINTRUST_GET_PROC(CryptCATOpen) WINTRUST_GET_PROC(CryptCATCatalogInfoFromContext) WINTRUST_GET_PROC(CryptCATCDFClose) + WINTRUST_GET_PROC(CryptCATCDFEnumCatAttributes) + WINTRUST_GET_PROC(CryptCATCDFEnumMembersByCDFTagEx) WINTRUST_GET_PROC(CryptCATCDFOpen) WINTRUST_GET_PROC(CryptCATEnumerateCatAttr) WINTRUST_GET_PROC(CryptCATEnumerateMember) @@ -418,6 +440,7 @@ static void test_CryptCATCDF_params(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } +/* FIXME: Once Wine can create catalog files we should use the created catalog file in this test */ static void test_CryptCATAdminAddRemoveCatalog(void) { static WCHAR basenameW[] = {'w','i','n','e','t','e','s','t','.','c','a','t',0}; @@ -551,11 +574,8 @@ static void test_CryptCATAdminAddRemoveCatalog(void) DeleteFileA(tmpfile); } -static void test_catalog_properties(int members, int attributes) +static void test_catalog_properties(CHAR *catfile, int attributes, int members) { - static const WCHAR hashmeW[] = {'h','a','s','h','m','e',0}; - static const WCHAR attr1W[] = {'a','t','t','r','1',0}; - static const WCHAR attr2W[] = {'a','t','t','r','2',0}; static const GUID subject = {0xde351a42,0x8e59,0x11d0,{0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee}}; HANDLE hcat; @@ -563,16 +583,31 @@ static void test_catalog_properties(int members, int attributes) CRYPTCATATTRIBUTE *attr; char catalog[MAX_PATH]; WCHAR catalogW[MAX_PATH]; - DWORD written; - HANDLE file; + DWORD attrs; BOOL ret; int attrcount = 0, membercount = 0; - if (!GetTempFileNameA(CURR_DIR, "cat", 0, catalog)) return; - file = CreateFileA(catalog, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); - WriteFile(file, test_catalog, sizeof(test_catalog), &written, NULL); - CloseHandle(file); + /* FIXME: Wine can't create catalog files out of catalog definition files yet. Remove this piece + * once wine is fixed + */ + attrs = GetFileAttributesA(catfile); + if (attrs == INVALID_FILE_ATTRIBUTES) + { + HANDLE file; + DWORD written; + + trace("Creating the catalog file\n"); + if (!GetTempFileNameA(CURR_DIR, "cat", 0, catalog)) return; + file = CreateFileA(catalog, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); + WriteFile(file, test_catalog, sizeof(test_catalog), &written, NULL); + CloseHandle(file); + + attributes = 2; + members = 1; + } + else + strcpy(catalog, catfile); hcat = pCryptCATOpen(NULL, 0, 0, 0, 0); ok(hcat == INVALID_HANDLE_VALUE, "CryptCATOpen succeeded\n"); @@ -601,7 +636,7 @@ static void test_catalog_properties(int members, int attributes) membercount++; } - ok(membercount == members, "Expected %d member, got %d\n", members, membercount); + ok(membercount == members, "Expected %d members, got %d\n", members, membercount); attr = pCryptCATEnumerateAttr(NULL, NULL, NULL); ok(attr == NULL, "CryptCATEnumerateAttr succeeded\n"); @@ -623,10 +658,125 @@ static void test_catalog_properties(int members, int attributes) ret = pCryptCATClose(hcat); ok(ret, "CryptCATClose failed\n"); +} - DeleteFileA(catalog); +static void test_create_catalog_file(void) +{ + static CHAR catfileA[] = "winetest.cat"; + static CHAR cdffileA[] = "winetest.cdf"; + static WCHAR cdffileW[] = {'w','i','n','e','t','e','s','t','.','c','d','f',0}; + CRYPTCATCDF *catcdf; + CRYPTCATATTRIBUTE *catattr; + CRYPTCATMEMBER *catmember; + WCHAR *catmembertag; + DWORD written, attrs; + HANDLE file; + BOOL ret; + int attrcount, membercount; + + if (!pCryptCATCDFOpen) + { + win_skip("CryptCATCDFOpen is not available\n"); + return; + } + + /* Create the cdf file */ + file = CreateFileA(cdffileA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); + WriteFile(file, test_cdf, sizeof(test_cdf) - 1, &written, NULL); + CloseHandle(file); + + /* Don't enumerate attributes and members */ + trace("No attribs and members\n"); + SetLastError(0xdeadbeef); + catcdf = pCryptCATCDFOpen(cdffileW, NULL); + todo_wine + { + ok(catcdf != NULL, "CryptCATCDFOpen failed\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + } + + ret = pCryptCATCDFClose(catcdf); + todo_wine + { + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + } + + attrs = GetFileAttributesA(catfileA); + todo_wine + ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected the catalog file to exist\n"); + + test_catalog_properties(catfileA, 0, 0); + DeleteFileA(catfileA); + + /* Only enumerate the attributes */ + trace("Only attributes\n"); + attrcount = membercount = 0; + catcdf = pCryptCATCDFOpen(cdffileW, NULL); + + catattr = NULL; + while ((catattr = pCryptCATCDFEnumCatAttributes(catcdf, catattr, NULL))) + { + ok(!lstrcmpW(catattr->pwszReferenceTag, attr1W) || + !lstrcmpW(catattr->pwszReferenceTag, attr2W), + "Expected 'attr1' or 'attr2'\n"); + + attrcount++; + } + todo_wine + ok(attrcount == 2, "Expected 2 attributes, got %d\n", attrcount); + + pCryptCATCDFClose(catcdf); + /* Eventhough the resulting catalogfile shows the attributes, they will not be enumerated */ + test_catalog_properties(catfileA, 0, 0); + DeleteFileA(catfileA); + + /* Only enumerate the members */ + trace("Only members\n"); + attrcount = membercount = 0; + catcdf = pCryptCATCDFOpen(cdffileW, NULL); + + catmember = NULL; + catmembertag = NULL; + while ((catmembertag = pCryptCATCDFEnumMembersByCDFTagEx(catcdf, catmembertag, NULL, &catmember, FALSE, NULL))) + { + ok(!lstrcmpW(catmembertag, hashmeW), "Expected 'hashme'\n"); + membercount++; + } + todo_wine + ok(membercount == 1, "Expected 1 member, got %d\n", membercount); + + pCryptCATCDFClose(catcdf); + test_catalog_properties(catfileA, 0, 1); + DeleteFileA(catfileA); + + /* Enumerate members and attributes */ + trace("Attributes and members\n"); + attrcount = membercount = 0; + catcdf = pCryptCATCDFOpen(cdffileW, NULL); + + catattr = NULL; + while ((catattr = pCryptCATCDFEnumCatAttributes(catcdf, catattr, NULL))) + attrcount++; + todo_wine + ok(attrcount == 2, "Expected 2 attributes, got %d\n", attrcount); + + catmember = NULL; + catmembertag = NULL; + while ((catmembertag = pCryptCATCDFEnumMembersByCDFTagEx(catcdf, catmembertag, NULL, &catmember, FALSE, NULL))) + membercount++; + todo_wine + ok(membercount == 1, "Expected 1 member, got %d\n", membercount); + + pCryptCATCDFClose(catcdf); + test_catalog_properties(catfileA, 2, 1); + DeleteFileA(catfileA); + + DeleteFileA(cdffileA); } + START_TEST(crypt) { int myARGC; @@ -656,6 +806,7 @@ START_TEST(crypt) test_calchash(); /* Parameter checking only */ test_CryptCATCDF_params(); + /* Create a catalogfile out of our own catalog definition file */ + test_create_catalog_file(); test_CryptCATAdminAddRemoveCatalog(); - test_catalog_properties(1, 2); }

1 0