March 2007 - Wine-commits - list.winehq.org

Detlef Riekenberg : localspl/tests: Add tests for XcvDataPort_DeletePort.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 8db7b9c7c7c6e2232e4ef36454dc881fcc4bbaae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db7b9c7c7c6e2232e4ef3645… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 7 00:20:32 2007 +0100 localspl/tests: Add tests for XcvDataPort_DeletePort. --- dlls/localspl/tests/localmon.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 4361e71..bce9a48 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -69,6 +69,7 @@ static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', 'L','P','T','P','o','r','t', 'C','o','m','m','a','n','d','O','K',0}; +static WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','P','o','r','t',0}; static WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', 'T','r','a','n','s','m','i','s','s','i','o','n', 'R','e','t','r','y','T','i','m','e','o','u','t',0}; @@ -483,6 +484,48 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) /* ########################### */ +static void test_XcvDataPort_DeletePort(void) +{ + DWORD res; + HANDLE hXcv; + DWORD needed; + + + if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; + + hXcv = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, SERVER_ALL_ACCESS, &hXcv); + ok(res, "hXcv: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* cleanup: just to make sure */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed); + ok( !res || (res == ERROR_FILE_NOT_FOUND), + "returned %d with %u (expected ERROR_SUCCESS or ERROR_FILE_NOT_FOUND)\n", + res, GetLastError()); + + + /* ToDo: cmd_AddPortW for tempfileW, then cmd_DeletePortW for the existing Port */ + + + /* try to delete a non-existing Port */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed); + ok( res == ERROR_FILE_NOT_FOUND, + "returned %d with %u (expected ERROR_FILE_NOT_FOUND)\n", res, GetLastError()); + + /* emptyW as Portname: ERROR_FILE_NOT_FOUND is returned */ + /* NULL as Portname: Native localspl.dll crashed */ + + pXcvClosePort(hXcv); +} + +/* ########################### */ + static void test_XcvDataPort_GetTransmissionRetryTimeout(void) { CHAR org_value[16]; @@ -1039,6 +1082,7 @@ START_TEST(localmon) test_EnumPorts(); test_XcvClosePort(); test_XcvDataPort_ConfigureLPTPortCommandOK(); + test_XcvDataPort_DeletePort(); test_XcvDataPort_GetTransmissionRetryTimeout(); test_XcvDataPort_MonitorUI(); test_XcvDataPort_PortIsValid();

1 0

H. Verbeet : wined3d: Remove broken software shaders.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 2384bdde9db9f4c3ece1eca09b673ce23d65cf0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2384bdde9db9f4c3ece1eca09… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 6 22:35:23 2007 +0100 wined3d: Remove broken software shaders. --- dlls/wined3d/directx.c | 25 +-- dlls/wined3d/pixelshader.c | 661 +++++------------------------------ dlls/wined3d/vertexshader.c | 767 ++++------------------------------------ dlls/wined3d/wined3d_main.c | 5 - dlls/wined3d/wined3d_private.h | 4 - programs/winecfg/Bg.rc | 1 - programs/winecfg/De.rc | 1 - programs/winecfg/En.rc | 1 - programs/winecfg/Es.rc | 1 - programs/winecfg/Fi.rc | 1 - programs/winecfg/Fr.rc | 1 - programs/winecfg/Hu.rc | 1 - programs/winecfg/Ja.rc | 1 - programs/winecfg/Ko.rc | 1 - programs/winecfg/Nl.rc | 1 - programs/winecfg/No.rc | 1 - programs/winecfg/Ru.rc | 1 - programs/winecfg/Tr.rc | 1 - programs/winecfg/resource.h | 1 - programs/winecfg/x11drvdlg.c | 1 - 20 files changed, 147 insertions(+), 1330 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2384bdde9db9f4c3ece1e…

1 0

H. Verbeet : d3d9: Add a mova rounding test.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 26344ce3f281a5fdef2bdfb2de3ab67d4c95ae04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26344ce3f281a5fdef2bdfb2d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 6 22:35:45 2007 +0100 d3d9: Add a mova rounding test. --- dlls/d3d9/tests/visual.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 108 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b586c22..4d7e721 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Henri Verbeet + * Copyright 2005, 2007 Henri Verbeet * Copyright (C) 2007 Stefan D�singer(for CodeWeavers) * * This library is free software; you can redistribute it and/or @@ -314,9 +314,108 @@ static void clear_test(IDirect3DDevice9 *device) ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color); } +typedef struct { + float in[4]; + DWORD out; +} test_data_t; + +/* + * c7 rounded ARGB + * -2.4 -2 0x00ffff00 + * -1.6 -2 0x00ffff00 + * -0.4 0 0x0000ffff + * 0.4 0 0x0000ffff + * 1.6 2 0x00ff00ff + * 2.4 2 0x00ff00ff + */ +static void test_mova(IDirect3DDevice9 *device) +{ + static const DWORD mova_test[] = { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x05000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ + 0x05000051, 0xa00f0001, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, /* def c1, 1.0, 1.0, 0.0, 1.0 */ + 0x05000051, 0xa00f0002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, /* def c2, 0.0, 1.0, 0.0, 1.0 */ + 0x05000051, 0xa00f0003, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c3, 0.0, 1.0, 1.0, 1.0 */ + 0x05000051, 0xa00f0004, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, /* def c4, 0.0, 0.0, 1.0, 1.0 */ + 0x05000051, 0xa00f0005, 0x3f800000, 0x00000000, 0x3f800000, 0x3f800000, /* def c5, 1.0, 0.0, 1.0, 1.0 */ + 0x05000051, 0xa00f0006, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c6, 1.0, 1.0, 1.0, 1.0 */ + 0x0200002e, 0xb0010000, 0xa0000007, /* mova a0.x, c7.x */ + 0x03000001, 0xd00f0000, 0xa0e42003, 0xb0000000, /* mov oD0, c[a0.x + 3] */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x0000ffff /* END */ + }; + + static const test_data_t test_data[] = { + {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff}, + {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} + }; + + static const float quad[][3] = { + {-1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, 0.0f}, + { 1.0f, -1.0f, 0.0f}, + { 1.0f, 1.0f, 0.0f}, + }; + + static const D3DVERTEXELEMENT9 decl_elements[] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END() + }; + + IDirect3DVertexDeclaration9 *vertex_declaration = NULL; + IDirect3DVertexShader9 *mova_shader = NULL; + HRESULT hr; + int i; + + hr = IDirect3DDevice9_CreateVertexShader(device, mova_test, &mova_shader); + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, mova_shader); + ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%08x)\n", hr); + + for (i = 0; i < (sizeof(test_data) / sizeof(test_data_t)); ++i) + { + DWORD color; + + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, test_data[i].in, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (%08x)\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (%08x)\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color == test_data[i].out, "Expected color %08x, got %08x (for input %f)\n", test_data[i].out, color, test_data[i].in[0]); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed (%08x)\n", hr); + } + + IDirect3DVertexDeclaration9_Release(vertex_declaration); + IDirect3DVertexShader9_Release(mova_shader); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; + D3DCAPS9 caps; HRESULT hr; DWORD color; @@ -330,6 +429,8 @@ START_TEST(visual) device_ptr = init_d3d9(); if (!device_ptr) return; + IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); + /* Check for the reliability of the returned data */ hr = IDirect3DDevice9_Clear(device_ptr, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); if(FAILED(hr)) @@ -365,6 +466,12 @@ START_TEST(visual) lighting_test(device_ptr); clear_test(device_ptr); + if (caps.VertexShaderVersion >= D3DVS_VERSION(2, 0)) + { + test_mova(device_ptr); + } + else skip("No vs_2_0 support\n"); + cleanup: if(device_ptr) IDirect3DDevice9_Release(device_ptr); }

1 0

Jacek Caban : atl: Compare file handle to INVALID_HANDLE_VALUE to handle errors.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: ecac3c1c064ce16fe6a69564d24d7d15e67e2051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecac3c1c064ce16fe6a69564d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 7 00:05:15 2007 +0100 atl: Compare file handle to INVALID_HANDLE_VALUE to handle errors. --- dlls/atl/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 6fa2fbd..353e113 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -479,7 +479,7 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist HRESULT hres; file = CreateFileW(fileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); - if(file) { + if(file != INVALID_HANDLE_VALUE) { filelen = GetFileSize(file, NULL); regstra = HeapAlloc(GetProcessHeap(), 0, filelen); lres = ReadFile(file, regstra, filelen, NULL, NULL);

1 0

Jacek Caban : mshtml: Improve ReadSegments implementation.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 7437cc1e963df71e695084a744325dd7d3109973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7437cc1e963df71e695084a74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 7 00:05:52 2007 +0100 mshtml: Improve ReadSegments implementation. --- dlls/mshtml/navigate.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 44d74c9..f9525e7 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -141,12 +141,13 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, nsres = aWriter(NSINSTREAM(This), aClousure, This->buf, 0, This->buf_size, &written); if(NS_FAILED(nsres)) - FIXME("aWritter failed: %08x\n", nsres); - if(written != This->buf_size) - FIXME("written != buf_size\n"); + TRACE("aWritter failed: %08x\n", nsres); + else if(written != This->buf_size) + FIXME("written %d != buf_size %d\n", written, This->buf_size); This->buf_size -= written; + *_retval = written; return nsres; }

1 0

Jacek Caban : mshtml: Remove false FIXME.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 4bd9f22f1de27b2928d51e6aa4eebec322f05c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd9f22f1de27b2928d51e6aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 7 00:06:30 2007 +0100 mshtml: Remove false FIXME. --- dlls/mshtml/nsio.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 6bf8649..06bad64 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -236,7 +236,6 @@ static nsresult NSAPI nsChannel_GetName(nsIHttpChannel *iface, nsACString *aName if(This->channel) return nsIChannel_GetName(This->channel, aName); - FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; }

1 0

H. Verbeet : wined3d: Fix a typo.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 318fb2987cef9bb61fec5d2420a4d5822e40d87a URL: http://source.winehq.org/git/wine.git/?a=commit;h=318fb2987cef9bb61fec5d242… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 6 22:35:12 2007 +0100 wined3d: Fix a typo. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c464fbe..3136e77 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -704,7 +704,7 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { TRACE_(d3d_caps)(" FOUND: EXT Point parameters support\n"); gl_info->supported[EXT_POINT_PARAMETERS] = TRUE; } else if (strcmp(ThisExtn, "GL_EXT_secondary_color") == 0) { - TRACE_(d3d_caps)(" FOUND: EXT Secondary coord support\n"); + TRACE_(d3d_caps)(" FOUND: EXT Secondary color support\n"); gl_info->supported[EXT_SECONDARY_COLOR] = TRUE; } else if (strcmp(ThisExtn, "GL_EXT_stencil_two_side") == 0) { TRACE_(d3d_caps)(" FOUND: EXT Stencil two side support\n");

1 0

Andrew Talbot : user32: Replace const pointer parameters with correct pointers to const.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 3ad92b0c2522de5aa1c6b7910533b17a248ce1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad92b0c2522de5aa1c6b7910… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Mar 6 20:41:06 2007 +0000 user32: Replace const pointer parameters with correct pointers to const. --- dlls/user32/mdi.c | 4 ++-- dlls/user32/painting.c | 2 +- include/winuser.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 190e0cc..de43ae3 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1852,7 +1852,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, * Failure: 0 */ WORD WINAPI -CascadeWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect, +CascadeWindows (HWND hwndParent, UINT wFlags, const RECT *lpRect, UINT cKids, const HWND *lpKids) { FIXME("(%p,0x%08x,...,%u,...): stub\n", hwndParent, wFlags, cKids); @@ -1868,7 +1868,7 @@ CascadeWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect, * Failure: 0 */ WORD WINAPI -TileWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect, +TileWindows (HWND hwndParent, UINT wFlags, const RECT *lpRect, UINT cKids, const HWND *lpKids) { FIXME("(%p,0x%08x,...,%u,...): stub\n", hwndParent, wFlags, cKids); diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 9fe6764..5c70b2a 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -353,7 +353,7 @@ static void update_now( HWND hwnd, UINT rdw_flags ) * caret. Its caret needs to be hidden during the scroll operation and * moved to new_caret_pos if move_caret is TRUE. */ -static HWND fix_caret(HWND hWnd, const LPRECT scroll_rect, INT dx, INT dy, +static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, UINT flags, LPBOOL move_caret, LPPOINT new_caret_pos) { GUITHREADINFO info; diff --git a/include/winuser.h b/include/winuser.h index c3056d2..e5de917 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4185,7 +4185,7 @@ BOOL WINAPI UpdateLayeredWindowIndirect(HWND,UPDATELAYEREDWINDOWINFO CONS #endif /* defined(_WINGDI_) && !defined(NOGDI) */ HKL WINAPI ActivateKeyboardLayout(HKL,UINT); -WORD WINAPI CascadeWindows(HWND, UINT, const LPRECT, UINT, const HWND *); +WORD WINAPI CascadeWindows(HWND, UINT, const RECT *, UINT, const HWND *); INT WINAPI CopyAcceleratorTableA(HACCEL,LPACCEL,INT); INT WINAPI CopyAcceleratorTableW(HACCEL,LPACCEL,INT); #define CopyAcceleratorTable WINELIB_NAME_AW(CopyAcceleratorTable) @@ -4259,7 +4259,7 @@ BOOL WINAPI SetMenuItemInfoW(HMENU,UINT,BOOL,const MENUITEMINFOW*); #define SetMenuItemInfo WINELIB_NAME_AW(SetMenuItemInfo) BOOL WINAPI SetWindowContextHelpId(HWND,DWORD); HWINEVENTHOOK WINAPI SetWinEventHook(DWORD,DWORD,HMODULE,WINEVENTPROC,DWORD,DWORD,DWORD); -WORD WINAPI TileWindows (HWND, UINT, const LPRECT, +WORD WINAPI TileWindows (HWND, UINT, const RECT *, UINT, const HWND *); INT WINAPI ToUnicode(UINT,UINT,PBYTE,LPWSTR,int,UINT); INT WINAPI ToUnicodeEx(UINT,UINT,LPBYTE,LPWSTR,int,UINT,HKL);

1 0

Rob Shearman : ole32: Remove some unnecessary traces from the HeapUnknown implementation.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: c19076cb192c777b22e3318cc65fdb6b8046a4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19076cb192c777b22e3318cc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 6 17:58:56 2007 +0000 ole32: Remove some unnecessary traces from the HeapUnknown implementation. --- dlls/ole32/tests/marshal.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index f6397eb..308d848 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1438,7 +1438,6 @@ static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, v static ULONG WINAPI HeapUnknown_AddRef(IUnknown *iface) { HeapUnknown *This = (HeapUnknown *)iface; - trace("HeapUnknown_AddRef(%p)\n", iface); return InterlockedIncrement((LONG*)&This->refs); } @@ -1446,7 +1445,6 @@ static ULONG WINAPI HeapUnknown_Release(IUnknown *iface) { HeapUnknown *This = (HeapUnknown *)iface; ULONG refs = InterlockedDecrement((LONG*)&This->refs); - trace("HeapUnknown_Release(%p)\n", iface); if (!refs) HeapFree(GetProcessHeap(), 0, This); return refs; }

1 0

Rob Shearman : ole32: Add some tests for IBindCtx.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: a4187777086e560e11b5223eedbd2b74d6d5bb47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4187777086e560e11b5223ee… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 6 17:59:33 2007 +0000 ole32: Add some tests for IBindCtx. --- dlls/ole32/tests/moniker.c | 123 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index f603f72..861fc33 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -139,6 +139,45 @@ static const IClassFactoryVtbl TestClassFactory_Vtbl = static IClassFactory Test_ClassFactory = { &TestClassFactory_Vtbl }; +typedef struct +{ + const IUnknownVtbl *lpVtbl; + ULONG refs; +} HeapUnknown; + +static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *ppv = (LPVOID)iface; + return S_OK; + } + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI HeapUnknown_AddRef(IUnknown *iface) +{ + HeapUnknown *This = (HeapUnknown *)iface; + return InterlockedIncrement((LONG*)&This->refs); +} + +static ULONG WINAPI HeapUnknown_Release(IUnknown *iface) +{ + HeapUnknown *This = (HeapUnknown *)iface; + ULONG refs = InterlockedDecrement((LONG*)&This->refs); + if (!refs) HeapFree(GetProcessHeap(), 0, This); + return refs; +} + +static const IUnknownVtbl HeapUnknown_Vtbl = +{ + HeapUnknown_QueryInterface, + HeapUnknown_AddRef, + HeapUnknown_Release +}; + static HRESULT WINAPI MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { @@ -1397,6 +1436,88 @@ static void test_generic_composite_moniker(void) IMoniker_Release(moniker); } +static void test_bind_context(void) +{ + HRESULT hr; + IBindCtx *pBindCtx; + IEnumString *pEnumString; + BIND_OPTS2 bind_opts; + HeapUnknown *unknown; + HeapUnknown *unknown2; + ULONG refs; + static const WCHAR wszParamName[] = {'G','e','m','m','a',0}; + + hr = CreateBindCtx(0xdeadbeef, &pBindCtx); + todo_wine + ok(hr == E_INVALIDARG, "CreateBindCtx with reserved value non-zero should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = CreateBindCtx(0, &pBindCtx); + ok_ole_success(hr, "CreateBindCtx"); + + bind_opts.cbStruct = -1; + hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); + todo_wine { + ok_ole_success(hr, "IBindCtx_GetBindOptions"); + ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + } + + bind_opts.cbStruct = sizeof(bind_opts); + hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); + ok_ole_success(hr, "IBindCtx_GetBindOptions"); + ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.grfFlags == 0, "bind_opts.grfFlags was 0x%x instead of 0\n", bind_opts.grfFlags); + ok(bind_opts.grfMode == STGM_READWRITE, "bind_opts.grfMode was 0x%x instead of STGM_READWRITE\n", bind_opts.grfMode); + ok(bind_opts.dwTickCountDeadline == 0, "bind_opts.dwTickCountDeadline was %d instead of 0\n", bind_opts.dwTickCountDeadline); + ok(bind_opts.dwTrackFlags == 0, "bind_opts.dwTrackFlags was 0x%x instead of 0\n", bind_opts.dwTrackFlags); + ok(bind_opts.dwClassContext == (CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER), + "bind_opts.dwClassContext should have been 0x15 instead of 0x%x\n", bind_opts.dwClassContext); + if (bind_opts.locale != GetThreadLocale()) /* should be removed once wine is fixed */ + { + todo_wine + ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); + } + else + ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); + + ok(bind_opts.pServerInfo == NULL, "bind_opts.pServerInfo should have been NULL instead of %p\n", bind_opts.pServerInfo); + + bind_opts.cbStruct = -1; + hr = IBindCtx_SetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); + ok(hr == E_INVALIDARG, "IBindCtx_SetBindOptions with bad cbStruct should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = IBindCtx_RegisterObjectParam(pBindCtx, (WCHAR *)wszParamName, NULL); + ok(hr == E_INVALIDARG, "IBindCtx_RegisterObjectParam should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + unknown = (HeapUnknown *)HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown)); + unknown->lpVtbl = &HeapUnknown_Vtbl; + unknown->refs = 1; + hr = IBindCtx_RegisterObjectParam(pBindCtx, (WCHAR *)wszParamName, (IUnknown *)&unknown->lpVtbl); + ok_ole_success(hr, "IBindCtx_RegisterObjectParam"); + + hr = IBindCtx_EnumObjectParam(pBindCtx, &pEnumString); + ok(hr == E_NOTIMPL, "IBindCtx_EnumObjectParam should have returned E_NOTIMPL instead of 0x%08x\n", hr); + todo_wine + ok(!pEnumString, "pEnumString should be NULL\n"); + + hr = IBindCtx_RegisterObjectBound(pBindCtx, NULL); + todo_wine + ok_ole_success(hr, "IBindCtx_RegisterObjectBound(NULL)"); + + unknown2 = (HeapUnknown *)HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown)); + unknown2->lpVtbl = &HeapUnknown_Vtbl; + unknown2->refs = 1; + hr = IBindCtx_RegisterObjectBound(pBindCtx, (IUnknown *)&unknown2->lpVtbl); + ok_ole_success(hr, "IBindCtx_RegisterObjectBound"); + + IBindCtx_Release(pBindCtx); + + refs = IUnknown_Release((IUnknown *)&unknown->lpVtbl); + ok(!refs, "object param should have been destroyed, instead of having %d refs\n", refs); + + refs = IUnknown_Release((IUnknown *)&unknown2->lpVtbl); + ok(!refs, "bound object should have been destroyed, instead of having %d refs\n", refs); +} + START_TEST(moniker) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1411,5 +1532,7 @@ START_TEST(moniker) /* FIXME: test moniker creation funcs and parsing other moniker formats */ + test_bind_context(); + CoUninitialize(); }

1 0