May 2009 - Wine-Commits - list.winehq.org

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: bfe3c6430b227433150f4ae41454ccd4201d19e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe3c6430b227433150f4ae41… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed May 27 22:17:32 2009 +0100 comctl32: Constify some variables. --- dlls/comctl32/comboex.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 04464fd..8a0652c 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -356,7 +356,7 @@ static void COMBOEX_GetComboFontSize (COMBOEX_INFO *infoPtr, SIZE *size) } -static void COMBOEX_CopyItem (CBE_ITEMDATA *item, COMBOBOXEXITEMW *cit) +static void COMBOEX_CopyItem (const CBE_ITEMDATA *item, COMBOBOXEXITEMW *cit) { if (cit->mask & CBEIF_TEXT) { /* @@ -467,7 +467,7 @@ static void COMBOEX_SetEditText (COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) } -static CBE_ITEMDATA * COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT_PTR index) +static CBE_ITEMDATA * COMBOEX_FindItem(const COMBOEX_INFO *infoPtr, INT_PTR index) { CBE_ITEMDATA *item; INT i; @@ -542,7 +542,7 @@ static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT_PTR index) } -static BOOL COMBOEX_GetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) +static BOOL COMBOEX_GetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) { INT_PTR index = cit->iItem; CBE_ITEMDATA *item; @@ -563,7 +563,7 @@ static BOOL COMBOEX_GetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) } -static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) +static BOOL COMBOEX_GetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) { COMBOBOXEXITEMW tmpcit;

1 0

Vincent Povirk : gdiplus: Stub GdipCreateHICONFromBitmap.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 8219db2d6d9eb9212bbcd7864fd53cd964b6694b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8219db2d6d9eb9212bbcd7864… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 27 13:16:20 2009 -0500 gdiplus: Stub GdipCreateHICONFromBitmap. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 34c897a..dff3cf3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -94,7 +94,7 @@ @ stdcall GdipCreateFromHWND(long ptr) @ stdcall GdipCreateFromHWNDICM(long ptr) @ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) -@ stub GdipCreateHICONFromBitmap +@ stdcall GdipCreateHICONFromBitmap(ptr ptr) @ stdcall GdipCreateHalftonePalette() @ stdcall GdipCreateHatchBrush(long long long ptr) @ stdcall GdipCreateImageAttributes(ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9902f0f..29eb000 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -655,6 +655,13 @@ GpStatus WINGDIPAPI GdipCreateCachedBitmap(GpBitmap *bitmap, GpGraphics *graphic return Ok; } +GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap *bitmap, HICON *hicon) +{ + FIXME("(%p, %p)\n", bitmap, hicon); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap *cachedbmp) { TRACE("%p\n", cachedbmp);

1 0

Nikolay Sivov : comctl32/tooltips: Fix callback tip text retrieval.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 7d32cfef27bdb9d661cfbdc6570c3d24138396c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d32cfef27bdb9d661cfbdc65… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 27 23:01:51 2009 +0400 comctl32/tooltips: Fix callback tip text retrieval. --- dlls/comctl32/tests/tooltips.c | 104 +++++++++++++++++++++++++++++++++++++++- dlls/comctl32/tooltips.c | 64 +++++++++++++----------- 2 files changed, 136 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d32cfef27bdb9d661cfb…

1 0

Aric Stewart : advapi: Correct buffer length in LookupAccountNameW.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: a61885d64d14803689e15b5824df2b9ac01b2101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61885d64d14803689e15b582… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 27 14:31:10 2009 -0500 advapi: Correct buffer length in LookupAccountNameW. --- dlls/advapi32/security.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index efe34f4..0aa92ce 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2761,6 +2761,7 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI SetLastError(ERROR_NONE_MAPPED); ret = FALSE; } + nameLen = UNLEN + 1; } if (GetUserNameW(userName, &nameLen) && !strcmpW(lpAccountNamePtr, userName))

1 0

Piotr Caban : jscript: Added implementation of Math_pow with less then 2 arguments.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: f77489acd55eded4b7dfb1f75d5c35660a0de328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77489acd55eded4b7dfb1f75… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 18:44:00 2009 +0200 jscript: Added implementation of Math_pow with less then 2 arguments. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 1969ff7..9d609e5 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -441,8 +441,8 @@ static HRESULT Math_pow(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d TRACE("\n"); if(arg_cnt(dp) < 2) { - FIXME("unimplemented arg_cnt %d\n", arg_cnt(dp)); - return E_NOTIMPL; + if(retv) num_set_nan(retv); + return S_OK; } hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &x); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c1da8c8..a17b067 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -618,6 +618,12 @@ ok(tmp === 2, "Math.pow(2, 2) = " + tmp); tmp = Math.pow(2, 2, 3); ok(tmp === 4, "Math.pow(2, 2, 3) = " + tmp); +tmp = Math.pow(2); +ok(isNaN(tmp), "Math.pow(2) is not NaN"); + +tmp = Math.pow(); +ok(isNaN(tmp), "Math.pow() is not NaN"); + tmp = Math.random(); ok(typeof(tmp) == "number", "typeof(tmp) = " + typeof(tmp)); ok(0 <= tmp && tmp <= 1, "Math.random() = " + tmp);

1 0

Alexandre Julliard : rpcrt4/tests: Enable some tests that no longer crash Wine.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 49f1433cdcdb8414c9b54669aff13308c24259de URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f1433cdcdb8414c9b54669a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 11:41:12 2009 +0200 rpcrt4/tests: Enable some tests that no longer crash Wine. --- dlls/rpcrt4/tests/ndr_marshall.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ded87a8..d562d09 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -957,11 +957,7 @@ static void test_simple_struct(void) else *(unsigned int *)wiredata = (UINT_PTR)&s1; memcpy(wiredata + 4, &s1, wiredatalen); - if (0) - { - /* one of the unmarshallings crashes Wine */ test_pointer_marshal(fmtstr_simple_struct, &s1, 24, wiredata, 28, NULL, 0, "struct"); - } /* zero the entire structure, including the hole */ memset(&ps1, 0, sizeof(ps1)); @@ -988,14 +984,14 @@ static void test_simple_struct(void) test_simple_struct_marshal(fmtstr_pointer_struct + 4, &ps1, 17, wiredata + 4, 17, ps1_cmp, 2, "pointer_struct"); if (use_pointer_ids) + { *(unsigned int *)wiredata = 0x20000; + *(unsigned int *)(wiredata + 8) = 0x20004; + *(unsigned int *)(wiredata + 12) = 0x20008; + } else *(unsigned int *)wiredata = (UINT_PTR)&ps1; - if (0) - { - /* one of the unmarshallings crashes Wine */ test_pointer_marshal(fmtstr_pointer_struct, &ps1, 17, wiredata, 21, ps1_cmp, 2, "pointer_struct"); - } } static void test_fullpointer_xlat(void)

1 0

Alexandre Julliard : rpcrt4: Implement NdrPointerMemorySize and enable the corresponding tests.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: feeaf97c8162b95c0f7816f9d04da02fd7450eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=feeaf97c8162b95c0f7816f9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 11:52:36 2009 +0200 rpcrt4: Implement NdrPointerMemorySize and enable the corresponding tests. --- dlls/rpcrt4/ndr_marshall.c | 29 +++++++++++++++++++++++++---- dlls/rpcrt4/tests/ndr_marshall.c | 12 +----------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1dfb661..4ba2c50 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1042,6 +1042,8 @@ static ULONG PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, } if (attr & RPC_FC_P_DEREF) { + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void*)); + pStubMsg->MemorySize += sizeof(void*); TRACE("deref\n"); } @@ -1554,10 +1556,14 @@ void WINAPI NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, ULONG WINAPI NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - /* unsigned size = *(LPWORD)(pFormat+2); */ - FIXME("(%p,%p): stub\n", pStubMsg, pFormat); - PointerMemorySize(pStubMsg, pStubMsg->Buffer, pFormat); - return 0; + unsigned char *Buffer = pStubMsg->Buffer; + if (*pFormat != RPC_FC_RP) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + safe_buffer_increment(pStubMsg, 4); + } + ALIGN_LENGTH(pStubMsg->MemorySize, 4); + return PointerMemorySize(pStubMsg, Buffer, pFormat); } /*********************************************************************** @@ -6561,36 +6567,51 @@ static ULONG WINAPI NdrBaseTypeMemorySize( case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); safe_buffer_increment(pStubMsg, sizeof(USHORT)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(USHORT)); pStubMsg->MemorySize += sizeof(USHORT); return sizeof(USHORT); case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG)); safe_buffer_increment(pStubMsg, sizeof(ULONG)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(ULONG)); pStubMsg->MemorySize += sizeof(ULONG); return sizeof(ULONG); case RPC_FC_FLOAT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(float)); safe_buffer_increment(pStubMsg, sizeof(float)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(float)); pStubMsg->MemorySize += sizeof(float); return sizeof(float); case RPC_FC_DOUBLE: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(double)); safe_buffer_increment(pStubMsg, sizeof(double)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(double)); pStubMsg->MemorySize += sizeof(double); return sizeof(double); case RPC_FC_HYPER: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG)); safe_buffer_increment(pStubMsg, sizeof(ULONGLONG)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(ULONGLONG)); pStubMsg->MemorySize += sizeof(ULONGLONG); return sizeof(ULONGLONG); case RPC_FC_ERROR_STATUS_T: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(error_status_t)); safe_buffer_increment(pStubMsg, sizeof(error_status_t)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(error_status_t)); pStubMsg->MemorySize += sizeof(error_status_t); return sizeof(error_status_t); case RPC_FC_ENUM16: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); safe_buffer_increment(pStubMsg, sizeof(USHORT)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(UINT)); pStubMsg->MemorySize += sizeof(UINT); return sizeof(UINT); case RPC_FC_IGNORE: + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void *)); pStubMsg->MemorySize += sizeof(void *); return sizeof(void *); default: diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d562d09..0b8b655 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -217,9 +217,6 @@ static void test_pointer_marshal(const unsigned char *formattypes, StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; - if (0) - { - /* NdrPointerMemorySize crashes under Wine */ size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); @@ -247,7 +244,6 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(size == srcsize + 4 + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); - } size = srcsize; if(formattypes[1] & 0x10) size += 4; @@ -493,7 +489,7 @@ static void test_simple_types(void) else *(unsigned int *)wiredata = (UINT_PTR)&i; *(unsigned short*)(wiredata + 4) = i; - test_pointer_marshal(fmtstr_up_enum16, &i, 2, wiredata, 6, NULL, 0, "up_enum16"); + test_pointer_marshal(fmtstr_up_enum16, &i, 4, wiredata, 6, NULL, 0, "up_enum16"); l = 0xcafebabe; if (use_pointer_ids) @@ -725,9 +721,6 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart); ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled %08x %08x %08x\n", msgpfx, *(DWORD*)StubMsg.BufferStart,*((DWORD*)StubMsg.BufferStart+1),*((DWORD*)StubMsg.BufferStart+2)); - if (0) - { - /* FIXME: Causes Wine to crash */ StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; size = NdrSimpleStructMemorySize( &StubMsg, formattypes ); @@ -737,12 +730,9 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, StubMsg.Buffer = StubMsg.BufferStart; size = NdrSimpleStructMemorySize( &StubMsg, formattypes ); -todo_wine { ok(size == StubMsg.MemorySize, "%s: size != MemorySize\n", msgpfx); -} ok(StubMsg.MemorySize == ((srcsize + 3) & ~3) + srcsize, "%s: mem size %u\n", msgpfx, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart); - } size = srcsize; /*** Unmarshalling first with must_alloc false ***/

1 0

Alexandre Julliard : rpcrt4/tests: Fix a number of 64-bit issues in the ndr_marshall test.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 36965f5726e828ce3a34bc156356ee60b88b5ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36965f5726e828ce3a34bc156… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:18:35 2009 +0200 rpcrt4/tests: Fix a number of 64-bit issues in the ndr_marshall test. --- dlls/rpcrt4/tests/ndr_marshall.c | 80 +++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36965f5726e828ce3a34b…

1 0

Alexandre Julliard : rpcrt4: Fix the PSFactoryBuffer proxy refcounting, with tests.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 7571c1fd5397bd59de3f88f2d5ab89bdd07a496e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7571c1fd5397bd59de3f88f2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:25:10 2009 +0200 rpcrt4: Fix the PSFactoryBuffer proxy refcounting, with tests. --- dlls/rpcrt4/cproxy.c | 13 +++----- dlls/rpcrt4/tests/cstub.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index a677ca0..f5fb6f3 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -147,11 +147,11 @@ HRESULT StdProxy_Construct(REFIID riid, if (stubless) { CInterfaceStubVtbl *svtbl = ProxyInfo->pStubVtblList[Index]; - unsigned long i, count = svtbl->header.DispatchTableCount; + ULONG i, count = svtbl->header.DispatchTableCount; /* Maybe the original vtbl is just modified directly to point at * ObjectStublessClientXXX thunks in real Windows, but I don't like it */ - TRACE("stubless thunks: count=%ld\n", count); + TRACE("stubless thunks: count=%d\n", count); This->thunks = HeapAlloc(GetProcessHeap(),0,sizeof(struct StublessThunk)*count); This->PVtbl = HeapAlloc(GetProcessHeap(),0,sizeof(LPVOID)*count); for (i=0; i<count; i++) { @@ -159,7 +159,7 @@ HRESULT StdProxy_Construct(REFIID riid, if (vtbl->Vtbl[i] == (LPVOID)-1) { PFORMAT_STRING fs = stubless->ProcFormatString + stubless->FormatStringOffset[i]; unsigned bytes = *(const WORD*)(fs+8) - STACK_ADJUST; - TRACE("method %ld: stacksize=%d\n", i, bytes); + TRACE("method %d: stacksize=%d\n", i, bytes); FILL_STUBLESS(thunk, i, bytes) This->PVtbl[i] = thunk; } @@ -172,6 +172,7 @@ HRESULT StdProxy_Construct(REFIID riid, else This->PVtbl = vtbl->Vtbl; + if (!pUnkOuter) pUnkOuter = (IUnknown *)This; This->lpVtbl = &StdProxy_Vtbl; /* one reference for the proxy */ This->RefCount = 1; @@ -183,11 +184,7 @@ HRESULT StdProxy_Construct(REFIID riid, This->pChannel = NULL; *ppProxy = (LPRPCPROXYBUFFER)&This->lpVtbl; *ppvObj = &This->PVtbl; - /* if there is no outer unknown then the caller will control the lifetime - * of the proxy object through the proxy buffer, so no need to increment the - * ref count of the proxy object */ - if (pUnkOuter) - IUnknown_AddRef((IUnknown *)*ppvObj); + IUnknown_AddRef((IUnknown *)*ppvObj); IPSFactoryBuffer_AddRef(pPSFactory); return S_OK; diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 69d5ea7..4ef70c2 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -613,6 +613,74 @@ static IUnknownVtbl create_stub_test_fail_vtbl = NULL }; +struct dummy_unknown +{ + const IUnknownVtbl *vtbl; + LONG ref; +}; + +static HRESULT WINAPI dummy_QueryInterface(IUnknown *This, REFIID iid, void **ppv) +{ + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dummy_AddRef(LPUNKNOWN iface) +{ + struct dummy_unknown *this = (struct dummy_unknown *)iface; + return InterlockedIncrement( &this->ref ); +} + +ULONG WINAPI dummy_Release(LPUNKNOWN iface) +{ + struct dummy_unknown *this = (struct dummy_unknown *)iface; + return InterlockedDecrement( &this->ref ); +} + +static IUnknownVtbl dummy_unknown_vtbl = +{ + dummy_QueryInterface, + dummy_AddRef, + dummy_Release +}; +static struct dummy_unknown dummy_unknown = { &dummy_unknown_vtbl, 0 }; + +static void create_proxy_test( IPSFactoryBuffer *ppsf, REFIID iid, const void *expected_vtbl ) +{ + IRpcProxyBuffer *proxy = NULL; + IUnknown *iface = NULL; + HRESULT r; + ULONG count; + + r = IPSFactoryBuffer_CreateProxy(ppsf, NULL, iid, &proxy, (void **)&iface); + ok( r == S_OK, "IPSFactoryBuffer_CreateProxy failed %x\n", r ); + ok( *(void **)iface == expected_vtbl, "wrong iface pointer %p/%p\n", *(void **)iface, expected_vtbl ); + count = IUnknown_Release( iface ); + ok( count == 1, "wrong refcount %u\n", count ); + count = IRpcProxyBuffer_Release( proxy ); + ok( count == 0, "wrong refcount %u\n", count ); + + dummy_unknown.ref = 4; + r = IPSFactoryBuffer_CreateProxy(ppsf, (IUnknown *)&dummy_unknown, iid, &proxy, (void **)&iface); + ok( r == S_OK, "IPSFactoryBuffer_CreateProxy failed %x\n", r ); + ok( dummy_unknown.ref == 5, "wrong refcount %u\n", dummy_unknown.ref ); + ok( *(void **)iface == expected_vtbl, "wrong iface pointer %p/%p\n", *(void **)iface, expected_vtbl ); + count = IUnknown_Release( iface ); + ok( count == 4, "wrong refcount %u\n", count ); + ok( dummy_unknown.ref == 4, "wrong refcount %u\n", dummy_unknown.ref ); + count = IRpcProxyBuffer_Release( proxy ); + ok( count == 0, "wrong refcount %u\n", count ); + ok( dummy_unknown.ref == 4, "wrong refcount %u\n", dummy_unknown.ref ); +} + +static void test_CreateProxy( IPSFactoryBuffer *ppsf ) +{ + create_proxy_test( ppsf, &IID_if1, if1_proxy_vtbl.Vtbl ); + create_proxy_test( ppsf, &IID_if2, if2_proxy_vtbl.Vtbl ); + create_proxy_test( ppsf, &IID_if3, if3_proxy_vtbl.Vtbl ); + create_proxy_test( ppsf, &IID_if4, if4_proxy_vtbl.Vtbl ); +} + static void test_CreateStub(IPSFactoryBuffer *ppsf) { IUnknownVtbl *vtbl = &create_stub_test_vtbl; @@ -951,6 +1019,7 @@ START_TEST( cstub ) ppsf = test_NdrDllGetClassObject(); test_NdrStubForwardingFunction(); + test_CreateProxy(ppsf); test_CreateStub(ppsf); test_Connect(ppsf); test_Disconnect(ppsf);

1 0

Ge van Geldorp : winetest: Use wininet if available.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 0fc9920be9f7f81e1d83029f9e2c6846b244d99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc9920be9f7f81e1d83029f9… Author: Ge van Geldorp <ge(a)gse.nl> Date: Wed May 27 11:45:35 2009 +0200 winetest: Use wininet if available. --- programs/winetest/send.c | 222 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 203 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fc9920be9f7f81e1d830…

1 0