December 2006 - Wine-Commits

Hans Leidekker : usp10: Implement ScriptString_pSize.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: 092edd81e653b2be20e65f5d2af8458ec7b01701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092edd81e653b2be20e65f5d2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 23 11:07:55 2006 +0100 usp10: Implement ScriptString_pSize. --- dlls/usp10/tests/usp10.c | 2 +- dlls/usp10/usp10.c | 50 +++++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/usp10.spec | 2 +- include/usp10.h | 2 +- 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b291301..d637aeb 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -897,7 +897,7 @@ static void test_ScriptCacheGetHeight(HD { HRESULT hr; SCRIPT_CACHE sc = NULL; - long height; + LONG height; hr = ScriptCacheGetHeight(NULL, NULL, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 448153f..85fc82d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -703,6 +703,7 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_S HeapFree(GetProcessHeap(), 0, analysis->glyphs); HeapFree(GetProcessHeap(), 0, analysis->pItem); + HeapFree(GetProcessHeap(), 0, analysis->sz); HeapFree(GetProcessHeap(), 0, analysis); if(invalid) @@ -1248,7 +1249,7 @@ HRESULT WINAPI ScriptTextOut(const HDC h * Success: S_OK * Failure: Non-zero HRESULT value. */ -HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, long *height) +HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *height) { HDC phdc; Scriptcache *pScriptcache; @@ -1388,3 +1389,50 @@ HRESULT WINAPI ScriptStringValidate(SCRI FIXME("(%p): stub\n", ssa); return S_OK; } + +/*********************************************************************** + * ScriptString_pSize (USP10.@) + * + * Retrieve width and height of an analysed string. + * + * PARAMS + * ssa [I] string analysis. + * + * RETURNS + * Success: Pointer to a SIZE structure. + * Failure: NULL + */ +const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) +{ + unsigned int i, j; + StringAnalysis *analysis = ssa; + TEXTMETRICW metric; + + TRACE("(%p)\n", ssa); + + if (!analysis) return NULL; + + if (!analysis->sz) + { + if (!(analysis->sz = HeapAlloc(GetProcessHeap(), 0, sizeof(SIZE)))) + return NULL; + + /* FIXME: These values should be calculated at a more + * appropriate place so that we can just pass cached + * values here. + */ + if (!GetTextMetricsW(analysis->hdc, &metric)) + { + HeapFree(GetProcessHeap(), 0, analysis->sz); + analysis->sz = NULL; + return NULL; + } + analysis->sz->cy = metric.tmHeight; + + analysis->sz->cx = 0; + for (i = 0; i < analysis->numItems; i++) + for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) + analysis->sz->cx += analysis->glyphs[i].piAdvance[j]; + } + return analysis->sz; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 56fd85b..73ea447 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -26,7 +26,7 @@ @ stdcall ScriptStringValidate(ptr) @ stdcall ScriptStringXtoCP(ptr long ptr ptr) @ stub ScriptString_pLogAttr -@ stub ScriptString_pSize +@ stdcall ScriptString_pSize(ptr) @ stub ScriptString_pcOutChars @ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) @ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) diff --git a/include/usp10.h b/include/usp10.h index 9b997c4..6dc7584 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -245,7 +245,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ); HRESULT WINAPI ScriptBreak(const WCHAR *pwcChars, int cChars, const SCRIPT_ANALYSIS *psa, SCRIPT_LOGATTR *psla); -HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, long *tmHeight); +HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *tmHeight); HRESULT WINAPI ScriptCPtoX(int iCP, BOOL fTrailing, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piX); HRESULT WINAPI ScriptXtoCP(int iX, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva,

1 0

Rob Shearman : oleaut32: Fix a crash when executing the VarAnd test with an old version of oleaut32 .dll.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: 029d244ea9acdcd688463fb41888345eaa396a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=029d244ea9acdcd688463fb41… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 23 15:51:41 2006 +0000 oleaut32: Fix a crash when executing the VarAnd test with an old version of oleaut32.dll. --- dlls/oleaut32/tests/vartest.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 58abd26..554c96f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5350,9 +5350,9 @@ static void test_VarAnd(void) V_VT(&right) = rightvt | ExtraFlags[i]; V_VT(&result) = VT_EMPTY; resvt = VT_EMPTY; - if (leftvt == VT_BSTR) + if ((leftvt | ExtraFlags[i]) == VT_BSTR) V_BSTR(&left) = true_str; - if (rightvt == VT_BSTR) + if ((rightvt | ExtraFlags[i]) == VT_BSTR) V_BSTR(&right) = true_str; /* Native VarAnd always returns a error when using any extra

1 0

Rob Shearman : oleaut32: Fix the VarPow tests for older versions of oleaut32.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: 452c12707137551131da39e266bf84d8f48c0965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=452c12707137551131da39e26… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 23 15:50:42 2006 +0000 oleaut32: Fix the VarPow tests for older versions of oleaut32. --- dlls/oleaut32/tests/vartest.c | 186 ++++++++++++++++++++++++++--------------- 1 files changed, 120 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=452c12707137551131da3…

1 0

Rob Shearman : ole32: Performing a COM call from within the processing of a sent message during a wait for completion of another COM call is not allowed .
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: 844037ab01a8682f8c91ab7942f6decf23574d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=844037ab01a8682f8c91ab794… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 23 15:51:27 2006 +0000 ole32: Performing a COM call from within the processing of a sent message during a wait for completion of another COM call is not allowed. Add a test for the behaviour where RPC_E_CANTCALLOUT_ININPUTSYNCCALL is returned. --- dlls/ole32/compobj.c | 6 ++- dlls/ole32/compobj_private.h | 3 +- dlls/ole32/rpc.c | 22 ++++++++- dlls/ole32/tests/marshal.c | 100 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 125 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 81236c7..ca51a9a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3190,10 +3190,12 @@ HRESULT WINAPI CoWaitForMultipleHandles( if (COM_CurrentApt()->filter) { + PENDINGTYPE pendingtype = + COM_CurrentInfo()->pending_call_count_server ? + PENDINGTYPE_NESTED : PENDINGTYPE_TOPLEVEL; DWORD be_handled = IMessageFilter_MessagePending( COM_CurrentApt()->filter, 0 /* FIXME */, - now - start_time, - COM_CurrentInfo()->pending_call_count ? PENDINGTYPE_NESTED : PENDINGTYPE_TOPLEVEL); + now - start_time, pendingtype); TRACE("IMessageFilter_MessagePending returned %d\n", be_handled); switch (be_handled) { diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 276d82e..6abfdfd 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -169,7 +169,8 @@ struct oletls IUnknown *state; /* see CoSetState */ DWORD inits; /* number of times CoInitializeEx called */ GUID causality_id; /* unique identifier for each COM call */ - LONG pending_call_count; /* number of calls pending */ + LONG pending_call_count_client; /* number of client calls pending */ + LONG pending_call_count_server; /* number of server calls pending */ }; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index eec961d..c31aa4a 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -566,6 +566,18 @@ static HRESULT WINAPI ClientRpcChannelBu wine_dbgstr_longlong(This->oxid)); return RPC_E_WRONG_THREAD; } + /* this situation should be impossible in multi-threaded apartments, + * because the calling thread isn't re-entrable. + * Note: doing a COM call during the processing of a sent message is + * only disallowed if a client call is already being waited for + * completion */ + if (!COM_CurrentApt()->multi_threaded && + COM_CurrentInfo()->pending_call_count_client && + InSendMessage()) + { + ERR("can't make an outgoing COM call in response to a sent message\n"); + return RPC_E_CANTCALLOUT_ININPUTSYNCCALL; + } params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*params)); if (!params) return E_OUTOFMEMORY; @@ -632,7 +644,11 @@ static HRESULT WINAPI ClientRpcChannelBu if (hr == S_OK) { if (WaitForSingleObject(params->handle, 0)) + { + COM_CurrentInfo()->pending_call_count_client++; hr = CoWaitForMultipleHandles(0, INFINITE, 1, &params->handle, &index); + COM_CurrentInfo()->pending_call_count_client--; + } } ClientRpcChannelBuffer_ReleaseEventHandle(This, params->handle); @@ -986,7 +1002,7 @@ void RPC_ExecuteCall(struct dispatch_par if (IsEqualGUID(&orpcthis.cid, &COM_CurrentInfo()->causality_id)) calltype = CALLTYPE_NESTED; - else if (COM_CurrentInfo()->pending_call_count == 0) + else if (COM_CurrentInfo()->pending_call_count_server == 0) calltype = CALLTYPE_TOPLEVEL; else calltype = CALLTYPE_TOPLEVEL_CALLPENDING; @@ -1023,9 +1039,9 @@ void RPC_ExecuteCall(struct dispatch_par * this call - this should be checked with what Windows does */ old_causality_id = COM_CurrentInfo()->causality_id; COM_CurrentInfo()->causality_id = orpcthis.cid; - COM_CurrentInfo()->pending_call_count++; + COM_CurrentInfo()->pending_call_count_server++; params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); - COM_CurrentInfo()->pending_call_count--; + COM_CurrentInfo()->pending_call_count_server--; COM_CurrentInfo()->causality_id = old_causality_id; message_state = (struct message_state *)msg->Handle; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index f573a47..beb6597 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1614,6 +1614,38 @@ static LRESULT CALLBACK window_proc(HWND return 0; } + case WM_USER+2: + { + HRESULT hr; + IStream *pStream = NULL; + IClassFactory *proxy = NULL; + IUnknown *object; + DWORD tid; + HANDLE thread; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, CreateStreamOnHGlobal); + tid = start_host_object(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &thread); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&proxy); + ok_ole_success(hr, CoReleaseMarshalData); + IStream_Release(pStream); + + /* shows that COM calls executed during the processing of sent + * messages should fail */ + hr = IClassFactory_CreateInstance(proxy, NULL, &IID_IUnknown, (void **)&object); + ok(hr == RPC_E_CANTCALLOUT_ININPUTSYNCCALL, + "COM call during processing of sent message should return RPC_E_CANTCALLOUT_ININPUTSYNCCALL instead of 0x%08x\n", hr); + + IClassFactory_Release(proxy); + + end_host_object(tid, thread); + + PostQuitMessage(0); + + return 0; + } default: return DefWindowProc(hwnd, msg, wparam, lparam); } @@ -1642,6 +1674,73 @@ static void test_message_reentrancy(void } } +static HRESULT WINAPI TestMsg_IClassFactory_CreateInstance( + LPCLASSFACTORY iface, + LPUNKNOWN pUnkOuter, + REFIID riid, + LPVOID *ppvObj) +{ + *ppvObj = NULL; + SendMessage(hwnd_app, WM_USER+2, 0, 0); + return S_OK; +} + +static IClassFactoryVtbl TestMsgClassFactory_Vtbl = +{ + Test_IClassFactory_QueryInterface, + Test_IClassFactory_AddRef, + Test_IClassFactory_Release, + TestMsg_IClassFactory_CreateInstance, + Test_IClassFactory_LockServer +}; + +IClassFactory TestMsg_ClassFactory = { &TestMsgClassFactory_Vtbl }; + +static void test_call_from_message(void) +{ + MSG msg; + IStream *pStream; + HRESULT hr; + IClassFactory *proxy; + DWORD tid; + HANDLE thread; + IUnknown *object; + + hwnd_app = CreateWindow("WineCOMTest", NULL, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, 0); + ok(hwnd_app != NULL, "Window creation failed\n"); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, CreateStreamOnHGlobal); + tid = start_host_object(pStream, &IID_IClassFactory, (IUnknown*)&TestMsg_ClassFactory, MSHLFLAGS_NORMAL, &thread); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&proxy); + ok_ole_success(hr, CoReleaseMarshalData); + IStream_Release(pStream); + + ok_more_than_one_lock(); + + hr = CoRegisterMessageFilter(&MessageFilter, NULL); + + /* start message re-entrancy test */ + hr = IClassFactory_CreateInstance(proxy, NULL, &IID_IUnknown, (void **)&object); + ok_ole_success(hr, IClassFactory_CreateInstance); + + IClassFactory_Release(proxy); + + ok_no_locks(); + + end_host_object(tid, thread); + + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } +} + static void test_WM_QUIT_handling(void) { MSG msg; @@ -2131,6 +2230,7 @@ START_TEST(marshal) test_stubbuffer(&IID_IClassFactory); test_proxybuffer(&IID_IClassFactory); test_message_reentrancy(); + test_call_from_message(); test_WM_QUIT_handling(); test_freethreadedmarshaler();

1 0

Rob Shearman : ole32: Call the MessagePending function for message filters.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: 038c8e642a8871e9454fc7b709d1bd00b5a36d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=038c8e642a8871e9454fc7b70… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 23 15:50:07 2006 +0000 ole32: Call the MessagePending function for message filters. --- dlls/ole32/compobj.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4a88390..81236c7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -34,8 +34,6 @@ * - Implement the OXID resolver so we don't need magic endpoint names for * clients and servers to meet up * - * - Call IMessageFilter functions. - * * - Make all ole interface marshaling use NDR to be wire compatible with * native DCOM * - Use & interpret ORPCTHIS & ORPCTHAT. @@ -2720,9 +2718,6 @@ HRESULT WINAPI CoRegisterMessageFilter( else if (lpOldMessageFilter) IMessageFilter_Release(lpOldMessageFilter); - if (lpMessageFilter) - FIXME("message filter has been registered, but will not be used\n"); - return S_OK; } @@ -3191,6 +3186,32 @@ HRESULT WINAPI CoWaitForMultipleHandles( { MSG msg; + /* call message filter */ + + if (COM_CurrentApt()->filter) + { + DWORD be_handled = IMessageFilter_MessagePending( + COM_CurrentApt()->filter, 0 /* FIXME */, + now - start_time, + COM_CurrentInfo()->pending_call_count ? PENDINGTYPE_NESTED : PENDINGTYPE_TOPLEVEL); + TRACE("IMessageFilter_MessagePending returned %d\n", be_handled); + switch (be_handled) + { + case PENDINGMSG_CANCELCALL: + WARN("call canceled\n"); + hr = RPC_E_CALL_CANCELED; + break; + case PENDINGMSG_WAITNOPROCESS: + case PENDINGMSG_WAITDEFPROCESS: + default: + /* FIXME: MSDN is very vague about the difference + * between WAITNOPROCESS and WAITDEFPROCESS - there + * appears to be none, so it is possibly a left-over + * from the 16-bit world. */ + break; + } + } + /* note: using "if" here instead of "while" might seem less * efficient, but only if we are optimising for quick delivery * of pending messages, rather than quick completion of the

1 0

Rob Shearman : ole32: Track the pending call count so that the correct call type can be passed to the message filter HandleInComingCall function .
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: aca17cd1207686e4683f1f3b7f7617806662b3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca17cd1207686e4683f1f3b7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 23 15:49:47 2006 +0000 ole32: Track the pending call count so that the correct call type can be passed to the message filter HandleInComingCall function. --- dlls/ole32/compobj_private.h | 1 + dlls/ole32/rpc.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f9d1c76..276d82e 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -169,6 +169,7 @@ struct oletls IUnknown *state; /* see CoSetState */ DWORD inits; /* number of times CoInitializeEx called */ GUID causality_id; /* unique identifier for each COM call */ + LONG pending_call_count; /* number of calls pending */ }; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 49f5842..eec961d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -983,10 +983,14 @@ void RPC_ExecuteCall(struct dispatch_par interface_info.pUnk = params->iface; interface_info.iid = params->iid; interface_info.wMethod = msg->ProcNum; + if (IsEqualGUID(&orpcthis.cid, &COM_CurrentInfo()->causality_id)) calltype = CALLTYPE_NESTED; - else /* FIXME: also detect CALLTYPE_TOPLEVEL_CALLPENDING */ + else if (COM_CurrentInfo()->pending_call_count == 0) calltype = CALLTYPE_TOPLEVEL; + else + calltype = CALLTYPE_TOPLEVEL_CALLPENDING; + handlecall = IMessageFilter_HandleInComingCall(COM_CurrentApt()->filter, calltype, (HTASK)GetCurrentProcessId(), @@ -1019,7 +1023,9 @@ void RPC_ExecuteCall(struct dispatch_par * this call - this should be checked with what Windows does */ old_causality_id = COM_CurrentInfo()->causality_id; COM_CurrentInfo()->causality_id = orpcthis.cid; + COM_CurrentInfo()->pending_call_count++; params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); + COM_CurrentInfo()->pending_call_count--; COM_CurrentInfo()->causality_id = old_causality_id; message_state = (struct message_state *)msg->Handle;

1 0

Duane Clark : msvcrt: Add function _mbsspnp.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: 67386352c8794df0c56b3ea55409e12f13a3d7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67386352c8794df0c56b3ea55… Author: Duane Clark <fpga(a)pacbell.net> Date: Fri Dec 22 15:24:30 2006 -0800 msvcrt: Add function _mbsspnp. --- dlls/msvcrt/mbcs.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 19 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 06c07e4..91549eb 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1196,6 +1196,40 @@ MSVCRT_size_t CDECL _mbsspn(const unsign } /********************************************************************* + * _mbsspnp (MSVCRT.@) + */ +const unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* set) +{ + const unsigned char *p, *q; + + for (p = string; *p; p++) + { + if (MSVCRT_isleadbyte(*p)) + { + for (q = set; *q; q++) + { + if (!q[1]) + break; + if ((*p == *q) && (p[1] == q[1])) + break; + q++; + } + if (!q[0] || !q[1]) break; + } + else + { + for (q = set; *q; q++) + if (*p == *q) + break; + if (!*q) break; + } + } + if (*p == '\0') + return NULL; + return p; +} + +/********************************************************************* * _mbscspn(MSVCRT.@) */ MSVCRT_size_t CDECL _mbscspn(const unsigned char* str, const unsigned char* cmp) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7712045..165ad42 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -386,7 +386,7 @@ @ cdecl _mbsrev(str) @ cdecl _mbsset(str long) @ cdecl _mbsspn(str str) -@ stub _mbsspnp #(str str) +@ cdecl _mbsspnp(str str) @ cdecl _mbsstr(str str) @ cdecl _mbstok(str str) @ cdecl _mbstrlen(str) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index cd4ca02..8ff8bbd 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -99,6 +99,24 @@ static void test_mbsspn( void) ok( ret==0, "_mbsspn returns %d should be 0\n", ret); } +static void test_mbsspnp( void) +{ + unsigned char str1[]="cabernet"; + unsigned char str2[]="shiraz"; + unsigned char set[]="abc"; + unsigned char empty[]=""; + unsigned char full[]="abcenrt"; + unsigned char* ret; + ret=_mbsspnp( str1, set); + ok( ret[0]=='e', "_mbsspnp returns %c should be e\n", ret[0]); + ret=_mbsspnp( str2, set); + ok( ret[0]=='s', "_mbsspnp returns %c should be s\n", ret[0]); + ret=_mbsspnp( str1, empty); + ok( ret[0]=='c', "_mbsspnp returns %c should be c\n", ret[0]); + ret=_mbsspnp( str1, full); + ok( ret==NULL, "_mbsspnp returns %p should be NULL\n", ret); +} + static void test_strdup(void) { char *str; @@ -138,6 +156,7 @@ START_TEST(string) test_ismbblead(); /* test _mbsspn */ test_mbsspn(); + test_mbsspnp(); /* test _strdup */ test_strdup(); }

1 0

Rob Shearman : ole32: Allow the marshaling/ unmarshaling of NULL interfaces for IClassFactory.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: d3217872b34c1be49740d3744397ea278cb4ca62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3217872b34c1be49740d3744… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 23 15:50:22 2006 +0000 ole32: Allow the marshaling/unmarshaling of NULL interfaces for IClassFactory. --- dlls/ole32/oleproxy.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 889e03c..dd12e5c 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -181,12 +181,19 @@ CFStub_Invoke( FIXME("Failed to create stream on hglobal\n"); goto getbuffer; } - hres = CoMarshalInterface(pStm,&iid,ppv,0,NULL,0); - IUnknown_Release((IUnknown*)ppv); + hres = IStream_Write(pStm, &ppv, sizeof(ppv), NULL); if (hres) { - FIXME("CoMarshalInterface failed, %x!\n",hres); - goto getbuffer; + ERR("IStream_Write failed, 0x%08x\n", hres); + goto getbuffer; } + if (ppv) { + hres = CoMarshalInterface(pStm,&iid,ppv,0,NULL,0); + IUnknown_Release(ppv); + if (hres) { + FIXME("CoMarshalInterface failed, %x!\n",hres); + goto getbuffer; + } + } hres = IStream_Stat(pStm,&ststg,0); if (hres) { FIXME("Stat failed.\n"); @@ -401,11 +408,16 @@ static HRESULT WINAPI CFProxy_CreateInst IRpcChannelBuffer_FreeBuffer(This->chanbuf,&msg); return hres; } - hres = CoUnmarshalInterface( - pStream, - riid, - ppv - ); + hres = IStream_Read(pStream, ppv, sizeof(*ppv), NULL); + if (hres != S_OK) + hres = E_FAIL; + else if (*ppv) { + hres = CoUnmarshalInterface( + pStream, + riid, + ppv + ); + } IStream_Release(pStream); /* Does GlobalFree hGlobal too. */ IRpcChannelBuffer_FreeBuffer(This->chanbuf,&msg);

1 0

Vitaliy Margolen : dinput: AddRef and Release parent DirectInput class.
by Alexandre Julliard Dec. 24, 2006

Dec. 24, 2006

Module: wine Branch: master Commit: ce5fb9bb297b50e3810aba6d27eeb04678039fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5fb9bb297b50e3810aba6d2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Dec 22 10:54:29 2006 -0700 dinput: AddRef and Release parent DirectInput class. --- dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++++ dlls/dinput/keyboard.c | 10 +++++++++- dlls/dinput/mouse.c | 5 +++++ dlls/dinput/tests/keyboard.c | 2 ++ dlls/dinput/tests/mouse.c | 4 +++- 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 745fd5c..914d05d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -484,7 +484,7 @@ static HRESULT alloc_device(REFGUID rgui hr = create_DataFormat(&c_dfDIJoystick2, &newDevice->base.data_format); if (hr != DI_OK) goto FAILED; - IDirectInputDevice_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); + IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); newDevice->devcaps.dwSize = sizeof(newDevice->devcaps); newDevice->devcaps.dwFlags = DIDC_ATTACHED; @@ -613,8 +613,8 @@ static ULONG WINAPI JoystickAImpl_Releas release_DataFormat(&This->base.data_format); This->base.crit.DebugInfo->Spare[0] = 0; + IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput); DeleteCriticalSection(&This->base.crit); - IDirectInputDevice_Release((LPDIRECTINPUTDEVICE8A)This->dinput); HeapFree(GetProcessHeap(),0,This); return 0; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 4cce222..b049730 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -393,7 +393,10 @@ static JoystickImpl *alloc_device(REFGUI /* create the default transform filter */ if (create_DataFormat(&c_dfDIJoystick2, &newDevice->base.data_format) == DI_OK) + { + IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); return newDevice; + } HeapFree(GetProcessHeap(),0,newDevice); return NULL; @@ -491,6 +494,7 @@ static ULONG WINAPI JoystickAImpl_Releas /* release the data transform filter */ release_DataFormat(&This->base.data_format); + IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput); DeleteCriticalSection(&This->base.crit); HeapFree(GetProcessHeap(),0,This); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 14562b4..4308b45 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -198,7 +198,12 @@ static SysKeyboardImpl *alloc_device(REF newDevice->base.data_format.wine_df = &c_dfDIKeyboard; if (create_DataFormat(&c_dfDIKeyboard, &newDevice->base.data_format) == DI_OK) + { + IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); return newDevice; + } + + HeapFree(GetProcessHeap(), 0, newDevice); return NULL; } @@ -214,6 +219,7 @@ static HRESULT keyboarddev_create_device IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &SysKeyboardAvt, dinput); TRACE("Creating a Keyboard device (%p)\n", *pdev); + if (!*pdev) return DIERR_OUTOFMEMORY; return DI_OK; } else return DIERR_NOINTERFACE; @@ -232,6 +238,7 @@ static HRESULT keyboarddev_create_device IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &SysKeyboardWvt, dinput); TRACE("Creating a Keyboard device (%p)\n", *pdev); + if (!*pdev) return DIERR_OUTOFMEMORY; return DI_OK; } else return DIERR_NOINTERFACE; @@ -257,8 +264,9 @@ static ULONG WINAPI SysKeyboardAImpl_Rel set_dinput_hook(WH_KEYBOARD_LL, NULL); - DeleteCriticalSection(&This->base.crit); HeapFree(GetProcessHeap(), 0, This->base.data_queue); + IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput); + DeleteCriticalSection(&This->base.crit); HeapFree(GetProcessHeap(), 0, This); return DI_OK; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 9ab1b1f..7b4fef6 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -194,8 +194,12 @@ static SysMouseImpl *alloc_device(REFGUI newDevice->base.data_format.wine_df = &c_dfDIMouse2; if (create_DataFormat(&c_dfDIMouse2, &newDevice->base.data_format) == DI_OK) + { + IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); return newDevice; + } + HeapFree(GetProcessHeap(), 0, newDevice); return NULL; } @@ -270,6 +274,7 @@ static ULONG WINAPI SysMouseAImpl_Releas release_DataFormat(&This->base.data_format); + IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput); DeleteCriticalSection(&This->base.crit); HeapFree(GetProcessHeap(),0,This); return 0; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index c911dcb..4503f2f 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -94,6 +94,8 @@ static void acquire_tests(LPDIRECTINPUT ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(10,) should have failed: %s\n", DXGetErrorString8(hr)); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %s\n", DXGetErrorString8(hr)); + + if (pKeyboard) IUnknown_Release(pKeyboard); } static const HRESULT SetCoop_null_window[16] = { diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 0743a2e..db95ab2 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -95,6 +95,7 @@ static void mouse_tests(void) LPDIRECTINPUT pDI = NULL; HINSTANCE hInstance = GetModuleHandle(NULL); HWND hwnd; + ULONG ref = 0; hr = DirectInputCreate(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); @@ -112,7 +113,8 @@ static void mouse_tests(void) DestroyWindow(hwnd); } - if (pDI) IUnknown_Release(pDI); + if (pDI) ref = IUnknown_Release(pDI); + ok(!ref, "IDirectInput_Release() reference count = %d\n", ref); } START_TEST(mouse)

1 0

lostwages/ include/winehq.conf news/2006122201.xml
by Alexandre Julliard Dec. 22, 2006

Dec. 22, 2006

ChangeSet ID: 30762 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/12/22 10:52:57 Modified files: include : winehq.conf Added files: news : 2006122201.xml Log message: Release 0.9.28 Patch: http://cvs.winehq.org/patch.py?id=30762 Old revision New revision Changes Path 1.50 1.51 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006122201.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.50 lostwages/include/winehq.conf:1.51 --- lostwages/include/winehq.conf:1.50 22 Dec 2006 16:52:57 -0000 +++ lostwages/include/winehq.conf 22 Dec 2006 16:52:57 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.27 +snapshot_date: 0.9.28 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006122201.xml diff -u -p /dev/null lostwages/news/2006122201.xml:1.1 --- /dev/null 22 Dec 2006 16:52:57 -0000 +++ lostwages/news/2006122201.xml 22 Dec 2006 16:52:57 -0000 @@ -0,0 +1,25 @@ +<news> +<date>December 22, 2006</date> +<title>Wine 0.9.28 Released</title> +<body> +<p>Wine 0.9.28 was released today, with the following main changes:</p> + +<ul> +<li>OpenGL in child windows should work again.</li> +<li>Better mouse support in games.</li> +<li>Beginnings of new state management in Direct3D.</li> +<li>Improved audio and font support on Mac OS.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.28.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.28">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0