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

Nikolay Sivov : comctl32/tooltips: Move parameter cast to WinProc.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 7fd17023bef589cb27c0b877aa059da20979a0de URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd17023bef589cb27c0b877a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 27 21:55:42 2009 +0400 comctl32/tooltips: Move parameter cast to WinProc. --- dlls/comctl32/tooltips.c | 284 ++++++++++++++++++++-------------------------- 1 files changed, 123 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fd17023bef589cb27c0b…

1 0

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

28 May '09

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

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 28 May '09

28 May '09

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

Michael Stefaniuc : notepad: Rename the SIZEOF macro to the more descriptive ARRAY_SIZE.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: cdc5b0c29b2ba3c76c9fdf4fe71eca9ea4e71b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc5b0c29b2ba3c76c9fdf4fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 27 23:48:57 2009 +0200 notepad: Rename the SIZEOF macro to the more descriptive ARRAY_SIZE. SIZEOF looks just like one of the typical Win32 API capitalizations of the basic C construct which it isn't. --- programs/notepad/dialog.c | 36 ++++++++++++++++++------------------ programs/notepad/main.c | 6 +++--- programs/notepad/main.h | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 4e56d8e..761705b 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -45,7 +45,7 @@ VOID ShowLastError(void) LPWSTR lpMsgBuf; WCHAR szTitle[MAX_STRING_LEN]; - LoadStringW(Globals.hInstance, STRING_ERROR, szTitle, SIZEOF(szTitle)); + LoadStringW(Globals.hInstance, STRING_ERROR, szTitle, ARRAY_SIZE(szTitle)); FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, (LPWSTR)&lpMsgBuf, 0, NULL); @@ -68,9 +68,9 @@ static void UpdateWindowCaption(void) if (Globals.szFileTitle[0] != '\0') lstrcpyW(szCaption, Globals.szFileTitle); else - LoadStringW(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption)); + LoadStringW(Globals.hInstance, STRING_UNTITLED, szCaption, ARRAY_SIZE(szCaption)); - LoadStringW(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); + LoadStringW(Globals.hInstance, STRING_NOTEPAD, szNotepad, ARRAY_SIZE(szNotepad)); lstrcatW(szCaption, hyphenW); lstrcatW(szCaption, szNotepad); @@ -83,14 +83,14 @@ int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCWSTR szString, DWORD dwFl WCHAR szResource[MAX_STRING_LEN]; /* Load and format szMessage */ - LoadStringW(Globals.hInstance, formatId, szResource, SIZEOF(szResource)); - wnsprintfW(szMessage, SIZEOF(szMessage), szResource, szString); + LoadStringW(Globals.hInstance, formatId, szResource, ARRAY_SIZE(szResource)); + wnsprintfW(szMessage, ARRAY_SIZE(szMessage), szResource, szString); /* Load szCaption */ if ((dwFlags & MB_ICONMASK) == MB_ICONEXCLAMATION) - LoadStringW(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + LoadStringW(Globals.hInstance, STRING_ERROR, szResource, ARRAY_SIZE(szResource)); else - LoadStringW(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); + LoadStringW(Globals.hInstance, STRING_NOTEPAD, szResource, ARRAY_SIZE(szResource)); /* Display Modal Dialog */ if (hParent == NULL) @@ -107,7 +107,7 @@ static int AlertFileNotSaved(LPCWSTR szFileName) { WCHAR szUntitled[MAX_STRING_LEN]; - LoadStringW(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled)); + LoadStringW(Globals.hInstance, STRING_UNTITLED, szUntitled, ARRAY_SIZE(szUntitled)); return DIALOG_StringMsgBox(NULL, STRING_NOTSAVED, szFileName[0] ? szFileName : szUntitled, MB_ICONQUESTION|MB_YESNOCANCEL); } @@ -292,7 +292,7 @@ VOID DIALOG_FileOpen(VOID) ZeroMemory(&openfilename, sizeof(openfilename)); - GetCurrentDirectoryW(SIZEOF(szDir), szDir); + GetCurrentDirectoryW(ARRAY_SIZE(szDir), szDir); lstrcpyW(szPath, txt_files); openfilename.lStructSize = sizeof(openfilename); @@ -300,7 +300,7 @@ VOID DIALOG_FileOpen(VOID) openfilename.hInstance = Globals.hInstance; openfilename.lpstrFilter = Globals.szFilter; openfilename.lpstrFile = szPath; - openfilename.nMaxFile = SIZEOF(szPath); + openfilename.nMaxFile = ARRAY_SIZE(szPath); openfilename.lpstrInitialDir = szDir; openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLESIZING; @@ -331,7 +331,7 @@ BOOL DIALOG_FileSaveAs(VOID) ZeroMemory(&saveas, sizeof(saveas)); - GetCurrentDirectoryW(SIZEOF(szDir), szDir); + GetCurrentDirectoryW(ARRAY_SIZE(szDir), szDir); lstrcpyW(szPath, txt_files); saveas.lStructSize = sizeof(OPENFILENAMEW); @@ -339,7 +339,7 @@ BOOL DIALOG_FileSaveAs(VOID) saveas.hInstance = Globals.hInstance; saveas.lpstrFilter = Globals.szFilter; saveas.lpstrFile = szPath; - saveas.nMaxFile = SIZEOF(szPath); + saveas.nMaxFile = ARRAY_SIZE(szPath); saveas.lpstrInitialDir = szDir; saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_ENABLESIZING; @@ -733,7 +733,7 @@ VOID DIALOG_Search(VOID) Globals.find.hwndOwner = Globals.hMainWnd; Globals.find.hInstance = Globals.hInstance; Globals.find.lpstrFindWhat = Globals.szFindText; - Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); + Globals.find.wFindWhatLen = ARRAY_SIZE(Globals.szFindText); Globals.find.Flags = FR_DOWN|FR_HIDEWHOLEWORD; /* We only need to create the modal FindReplace dialog which will */ @@ -765,9 +765,9 @@ VOID DIALOG_Replace(VOID) Globals.find.hwndOwner = Globals.hMainWnd; Globals.find.hInstance = Globals.hInstance; Globals.find.lpstrFindWhat = Globals.szFindText; - Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); + Globals.find.wFindWhatLen = ARRAY_SIZE(Globals.szFindText); Globals.find.lpstrReplaceWith = Globals.szReplaceText; - Globals.find.wReplaceWithLen = SIZEOF(Globals.szReplaceText); + Globals.find.wReplaceWithLen = ARRAY_SIZE(Globals.szReplaceText); Globals.find.Flags = FR_DOWN|FR_HIDEWHOLEWORD; /* We only need to create the modal FindReplace dialog which will */ @@ -799,7 +799,7 @@ VOID DIALOG_HelpAboutNotepad(VOID) HICON icon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD), IMAGE_ICON, 48, 48, LR_SHARED); - LoadStringW(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); + LoadStringW(Globals.hInstance, STRING_NOTEPAD, szNotepad, ARRAY_SIZE(szNotepad)); ShellAboutW(Globals.hMainWnd, szNotepad, notepadW, icon); } @@ -830,8 +830,8 @@ static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wPara { case IDOK: /* save user input and close dialog */ - GetDlgItemTextW(hDlg, IDC_PAGESETUP_HEADERVALUE, Globals.szHeader, SIZEOF(Globals.szHeader)); - GetDlgItemTextW(hDlg, IDC_PAGESETUP_FOOTERVALUE, Globals.szFooter, SIZEOF(Globals.szFooter)); + GetDlgItemTextW(hDlg, IDC_PAGESETUP_HEADERVALUE, Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); + GetDlgItemTextW(hDlg, IDC_PAGESETUP_FOOTERVALUE, Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); Globals.iMarginTop = GetDlgItemInt(hDlg, IDC_PAGESETUP_TOPVALUE, NULL, FALSE) * 100; Globals.iMarginBottom = GetDlgItemInt(hDlg, IDC_PAGESETUP_BOTTOMVALUE, NULL, FALSE) * 100; diff --git a/programs/notepad/main.c b/programs/notepad/main.c index b3c5411..57018ce 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -576,7 +576,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, WCHAR szFileName[MAX_PATH]; HANDLE hDrop = (HANDLE) wParam; - DragQueryFileW(hDrop, 0, szFileName, SIZEOF(szFileName)); + DragQueryFileW(hDrop, 0, szFileName, ARRAY_SIZE(szFileName)); DragFinish(hDrop); DoOpenFile(szFileName); break; @@ -598,10 +598,10 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) WCHAR szMessage[MAX_STRING_LEN]; WCHAR szResource[MAX_STRING_LEN]; - LoadStringW(Globals.hInstance, STRING_DOESNOTEXIST, szResource, SIZEOF(szResource)); + LoadStringW(Globals.hInstance, STRING_DOESNOTEXIST, szResource, ARRAY_SIZE(szResource)); wsprintfW(szMessage, szResource, szFileName); - LoadStringW(Globals.hInstance, STRING_ERROR, szResource, SIZEOF(szResource)); + LoadStringW(Globals.hInstance, STRING_ERROR, szResource, ARRAY_SIZE(szResource)); nResult = MessageBoxW(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION | MB_YESNO); diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 69c31af..f81c437 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define SIZEOF(a) sizeof(a)/sizeof((a)[0]) +#define ARRAY_SIZE(a) sizeof(a)/sizeof((a)[0]) #include "notepad_res.h"

1 0

Alexandre Julliard : ntdll: Try any address in map_image no matter what the failure was for a fixed address .
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 54ac26b7af68630d1e1f90693937206cf2f208f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ac26b7af68630d1e1f90693… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:17:09 2009 +0200 ntdll: Try any address in map_image no matter what the failure was for a fixed address. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0475bd9..33918ca 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1004,7 +1004,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz status = map_view( &view, base, total_size, mask, FALSE, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); - if (status == STATUS_CONFLICTING_ADDRESSES) + if (status != STATUS_SUCCESS) status = map_view( &view, NULL, total_size, mask, FALSE, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE );

1 0

Alexandre Julliard : include: Fix the packing of the MIDL_STUB_MESSAGE structure on 64-bit.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: cdbd3fdc6ab7e83336690ede6c8f7860f935846e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbd3fdc6ab7e83336690ede6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:17:32 2009 +0200 include: Fix the packing of the MIDL_STUB_MESSAGE structure on 64-bit. --- include/rpcndr.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 10aac4c..78c9a47 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -170,7 +170,6 @@ typedef struct _NDR_PIPE_MESSAGE *PNDR_PIPE_MESSAGE; typedef struct _NDR_ASYNC_MESSAGE *PNDR_ASYNC_MESSAGE; typedef struct _NDR_CORRELATION_INFO *PNDR_CORRELATION_INFO; -#include <pshpack4.h> typedef struct _MIDL_STUB_MESSAGE { PRPC_MESSAGE RpcMsg; @@ -247,7 +246,6 @@ typedef struct _MIDL_STUB_MESSAGE INT_PTR Reserved51_4; INT_PTR Reserved51_5; } MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE; -#include <poppack.h> typedef void * (__RPC_API * GENERIC_BINDING_ROUTINE)(void *); typedef void (__RPC_API * GENERIC_UNBIND_ROUTINE)(void *, unsigned char *);

1 0

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

28 May '09

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 28 May '09

28 May '09

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

Alexandre Julliard : rpcrt4/tests: Comment out a couple of tests that crash on older Windows versions.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: bb18c5ab0764e078608406a4879252b045796298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb18c5ab0764e078608406a48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:38:17 2009 +0200 rpcrt4/tests: Comment out a couple of tests that crash on older Windows versions. --- dlls/rpcrt4/tests/ndr_marshall.c | 56 +++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 339d3c9..ded87a8 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -301,21 +301,24 @@ todo_wine { NdrPointerFree(&StubMsg, mem, formattypes); /* again pass address of NULL ptr, but pretend we're a server */ - mem = NULL; - StubMsg.Buffer = StubMsg.BufferStart; - StubMsg.IsClient = 0; - ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); - ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - if (formattypes[2] == 0xd /* FC_ENUM16 */) - ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); - else - ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); - ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); - if (formattypes[2] != 0xd /* FC_ENUM16 */) { - ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); - my_alloc_called = 0; + if (0) /* crashes on Win9x and NT4 */ + { + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + StubMsg.IsClient = 0; + ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); + ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); + if (formattypes[2] == 0xd /* FC_ENUM16 */) + ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); + else + ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); + ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); + if (formattypes[2] != 0xd /* FC_ENUM16 */) { + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + my_alloc_called = 0; + } } } HeapFree(GetProcessHeap(), 0, mem_orig); @@ -770,16 +773,19 @@ todo_wine { Passing a NULL ptr while we're a client && !must_alloc crashes on Windows, so we won't do that. */ - mem = NULL; - StubMsg.IsClient = 0; - StubMsg.Buffer = StubMsg.BufferStart; - ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, 0 ); - ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - ok(mem == StubMsg.BufferStart, "%s: mem not equal buffer\n", msgpfx); - ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); - ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); - my_alloc_called = 0; - ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + if (0) /* crashes on Win9x and NT4 */ + { + mem = NULL; + StubMsg.IsClient = 0; + StubMsg.Buffer = StubMsg.BufferStart; + ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, FALSE ); + ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); + ok(mem == StubMsg.BufferStart, "%s: mem not equal buffer\n", msgpfx); + ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + my_alloc_called = 0; + ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + } /*** now must_alloc is true ***/

1 0

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

28 May '09

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