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

Alexandre Julliard : msftedit: Explicitly load riched20 to make sure the window classes are created.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: bddb2e671bb3246fd9e2bdbd8127b69744f446bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddb2e671bb3246fd9e2bdbd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 28 20:55:37 2008 +0200 msftedit: Explicitly load riched20 to make sure the window classes are created. --- dlls/msftedit/msftedit_main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msftedit/msftedit_main.c b/dlls/msftedit/msftedit_main.c index 58a8b60..b505999 100644 --- a/dlls/msftedit/msftedit_main.c +++ b/dlls/msftedit/msftedit_main.c @@ -45,14 +45,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(msftedit); */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { + static const WCHAR riched20W[] = {'r','i','c','h','e','d','2','0','.','d','l','l',0}; + static HMODULE richedit; + switch(reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + /* explicitly load riched20 since it creates the window classes at dll attach time */ + richedit = LoadLibraryW( riched20W ); DisableThreadLibraryCalls(inst); break; case DLL_PROCESS_DETACH: + FreeLibrary( richedit ); break; } return TRUE;

1 0

Paul Vriens : setupapi/tests: Remove leftovers from old tests.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: 057c92db54b7404a08ac704f1a2e280344cd5b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=057c92db54b7404a08ac704f1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 28 18:17:19 2008 +0200 setupapi/tests: Remove leftovers from old tests. --- dlls/setupapi/tests/devinst.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index ec1542d..cd72db4 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -459,15 +459,41 @@ static void testCreateDeviceInfo(void) pSetupDiDestroyDeviceInfoList(set); } + /* The bogus registry key shouldn't be there after this test. The only + * reasons this key would still be present: + * + * - We are running on Wine which has to be fixed + * - We have leftovers from old tests + */ res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected key to not exist\n"); - /* FIXME: Remove when Wine is fixed */ if (res == ERROR_SUCCESS) { - /* Wine doesn't delete the information currently */ - trace("We are most likely on Wine\n"); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, bogus); + DWORD subkeys; + + /* Check if we have subkeys */ + RegQueryInfoKey(key, NULL, NULL, NULL, &subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (subkeys > 0) + { + int i; + + /* Leftovers from old tests */ + trace("Going to remove %d devices\n", subkeys); + for (i = 0; i < subkeys; i++) + { + BOOL ret; + + ret = remove_device(); + ok(ret, "Expected a device to be removed\n"); + } + } + else + { + /* Wine doesn't delete the bogus key itself currently */ + trace("We are most likely on Wine\n"); + RegDeleteKeyW(HKEY_LOCAL_MACHINE, bogus); + } } }

1 0

Jon Griffiths : msvcrt: Fix file test which fails on Vista.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: 09627c8f611e868dc9d8dba6a29acca376a83c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09627c8f611e868dc9d8dba6a… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Tue May 27 22:14:29 2008 -0700 msvcrt: Fix file test which fails on Vista. --- dlls/msvcrt/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index aa58a32..ec22d81 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -783,8 +783,8 @@ static void test_fopen_fclose_fcloseall( void ) ok(stream3 != NULL, "The file '%s' should be opened now\n", fname3 ); errno = 0xfaceabad; stream4 = fopen("", "w+"); - ok(stream4 == NULL && errno == ENOENT, - "filename is empty, errno = %d (expected 2)\n", errno); + ok(stream4 == NULL && (errno == EINVAL || errno == ENOENT), + "filename is empty, errno = %d (expected 2 or 22)\n", errno); errno = 0xfaceabad; stream4 = fopen(NULL, "w+"); ok(stream4 == NULL && (errno == EINVAL || errno == ENOENT),

1 0

Jon Griffiths : msvcrt: Fix a test that fails on win95.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: 148483062882dab3c941ac153d2fc75f7b153552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148483062882dab3c941ac153… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Wed May 28 06:01:39 2008 -0700 msvcrt: Fix a test that fails on win95. --- dlls/msvcrt/tests/printf.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 7e07241..2cd08a7 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -221,8 +221,15 @@ static void test_sprintf( void ) format = "%I32d"; r = sprintf(buffer,format,1); - ok(!strcmp(buffer,"1"),"I32d failed\n"); - ok( r==1, "return count wrong\n"); + if (r == 1) + { + ok(!strcmp(buffer,"1"),"I32d failed, got '%s'\n",buffer); + } + else + { + /* Older versions don't grok I32 format */ + ok(r == 4 && !strcmp(buffer,"I32d"),"I32d failed, got '%s',%d\n",buffer,r); + } format = "%I64D"; r = sprintf(buffer,format,(LONGLONG)-1);

1 0

Paul Vriens : user32/tests: Prevent writing to not allocated memory.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: c6fd6b6ab82ece9dad04bb87a30453bdcf7541af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6fd6b6ab82ece9dad04bb87a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 28 13:54:16 2008 +0200 user32/tests: Prevent writing to not allocated memory. --- dlls/user32/tests/cursoricon.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index dcac002..e00c45e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -593,10 +593,14 @@ static void test_CreateIcon(void) bmpinfo.bmiHeader.biBitCount = 8; bmpinfo.bmiHeader.biCompression = BI_RGB; hbmColor = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); - memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + ok(hbmColor != NULL, "Expected a handle to the DIB\n"); + if (bits) + memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); bmpinfo.bmiHeader.biBitCount = 1; hbmMask = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); - memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + ok(hbmMask != NULL, "Expected a handle to the DIB\n"); + if (bits) + memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); info.fIcon = TRUE; info.xHotspot = 8; @@ -612,7 +616,9 @@ static void test_CreateIcon(void) bmpinfo.bmiHeader.biBitCount = 16; hbmColor = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); - memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + ok(hbmColor != NULL, "Expected a handle to the DIB\n"); + if (bits) + memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); info.fIcon = TRUE; info.xHotspot = 8; @@ -628,7 +634,9 @@ static void test_CreateIcon(void) bmpinfo.bmiHeader.biBitCount = 32; hbmColor = CreateDIBSection( hdc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); - memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); + ok(hbmColor != NULL, "Expected a handle to the DIB\n"); + if (bits) + memset( bits, 0x55, 32 * 32 * bmpinfo.bmiHeader.biBitCount / 8 ); info.fIcon = TRUE; info.xHotspot = 8;

1 0

Paul Vriens : user32/tests: Run tests on win95 again.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: d2d8d71e6b2d73a0b99808b853a3bca475372bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d8d71e6b2d73a0b99808b85… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 28 13:07:55 2008 +0200 user32/tests: Run tests on win95 again. --- dlls/user32/tests/win.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index aebf781..33f8831 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -46,6 +46,7 @@ void dump_region(HRGN hrgn); static HWND (WINAPI *pGetAncestor)(HWND,UINT); static BOOL (WINAPI *pGetWindowInfo)(HWND,WINDOWINFO*); +static UINT (WINAPI *pGetWindowModuleFileNameA)(HWND,LPSTR,UINT); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -4638,6 +4639,12 @@ static void test_GetWindowModuleFileName(void) UINT ret1, ret2; char buf1[MAX_PATH], buf2[MAX_PATH]; + if (!pGetWindowModuleFileNameA) + { + skip("GetWindowModuleFileNameA is not available\n"); + return; + } + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL); assert(hwnd); @@ -4651,8 +4658,8 @@ static void test_GetWindowModuleFileName(void) buf2[0] = 0; SetLastError(0xdeadbeef); - ret2 = GetWindowModuleFileName(hwnd, buf2, sizeof(buf2)); - ok(ret2, "GetWindowModuleFileName error %u\n", GetLastError()); + ret2 = pGetWindowModuleFileNameA(hwnd, buf2, sizeof(buf2)); + ok(ret2, "GetWindowModuleFileNameA error %u\n", GetLastError()); ok(ret1 == ret2, "%u != %u\n", ret1, ret2); ok(!strcmp(buf1, buf2), "%s != %s\n", buf1, buf2); @@ -4671,12 +4678,12 @@ static void test_GetWindowModuleFileName(void) ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret2 = GetWindowModuleFileName(hwnd, buf2, ret1 - 2); + ret2 = pGetWindowModuleFileNameA(hwnd, buf2, ret1 - 2); ok(ret2 == ret1 - 2, "expected %u, got %u\n", ret1 - 2, ret2); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret2 = GetWindowModuleFileName(hwnd, buf2, 0); + ret2 = pGetWindowModuleFileNameA(hwnd, buf2, 0); ok(!ret2, "expected 0, got %u\n", ret2); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); @@ -4685,20 +4692,20 @@ static void test_GetWindowModuleFileName(void) buf2[0] = 0; hwnd = (HWND)0xdeadbeef; SetLastError(0xdeadbeef); - ret1 = GetWindowModuleFileName(hwnd, buf1, sizeof(buf1)); + ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1)); ok(!ret1, "expected 0, got %u\n", ret1); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %u\n", GetLastError()); hwnd = GetDesktopWindow(); ok(IsWindow(hwnd), "got invalid desktop window %p\n", hwnd); SetLastError(0xdeadbeef); - ret1 = GetWindowModuleFileName(hwnd, buf1, sizeof(buf1)); + ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1)); ok(!ret1, "expected 0, got %u\n", ret1); hwnd = FindWindow("Shell_TrayWnd", NULL); ok(IsWindow(hwnd), "got invalid tray window %p\n", hwnd); SetLastError(0xdeadbeef); - ret1 = GetWindowModuleFileName(hwnd, buf1, sizeof(buf1)); + ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1)); ok(!ret1, "expected 0, got %u\n", ret1); } @@ -4706,6 +4713,7 @@ START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); pGetWindowInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetWindowInfo" ); + pGetWindowModuleFileNameA = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetWindowModuleFileNameA" ); hwndMain = CreateWindowExA(0, "static", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, 0, NULL); if (hwndMain)

1 0

Vitaliy Margolen : dinput: Convert keyboard buffer from internal data format to user data format.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: e850b4f13dd5bf91c63df147fb26a83505eea0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e850b4f13dd5bf91c63df147f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Apr 24 23:32:32 2008 +0300 dinput: Convert keyboard buffer from internal data format to user data format. --- dlls/dinput/keyboard.c | 6 +++--- dlls/dinput/tests/keyboard.c | 11 ++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 84d9f60..cb290f6 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -270,7 +270,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( if (!This->base.acquired) return DIERR_NOTACQUIRED; - if (len != WINE_DINPUT_KEYBOARD_MAX_KEYS) + if (len != This->base.data_format.user_df->dwDataSize ) return DIERR_INVALIDPARAM; EnterCriticalSection(&This->base.crit); @@ -282,8 +282,8 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( TRACE(" - %02X: %02x\n", i, This->DInputKeyState[i]); } } - - memcpy(ptr, This->DInputKeyState, WINE_DINPUT_KEYBOARD_MAX_KEYS); + + fill_DataFormat(ptr, This->DInputKeyState, &This->base.data_format); LeaveCriticalSection(&This->base.crit); return DI_OK; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 440cd3c..baac4db 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -116,13 +116,10 @@ static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); hr = IDirectInputDevice_Acquire(pKeyboard); ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %s\n", DXGetErrorString8(hr)); - todo_wine - { - hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); - ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState(4,) failed: %s\n", DXGetErrorString8(hr)); - hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); - ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(256,) should have failed: %s\n", DXGetErrorString8(hr)); - } + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState(4,) failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(256,) should have failed: %s\n", DXGetErrorString8(hr)); if (pKeyboard) IUnknown_Release(pKeyboard); }

1 0

Igor Tarasov : fonts: Tahoma Bold Cyrillic glyphs added.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: 89164d427529a89998c0c28965210471d36f8c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89164d427529a89998c0c2896… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Wed May 28 19:27:59 2008 +0900 fonts: Tahoma Bold Cyrillic glyphs added. --- fonts/tahomabd.sfd | 2098 +++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/tahomabd.ttf | Bin 62804 -> 75296 bytes 2 files changed, 2090 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89164d427529a89998c0c…

1 0

Jens Albretsen : ddraw: Test for IDirect3DTexture_Load of Texture into itself.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: a2b645128f01980a832f7906d83b5e7fa4bea8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b645128f01980a832f7906d… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Thu May 22 23:33:31 2008 +0200 ddraw: Test for IDirect3DTexture_Load of Texture into itself. --- dlls/ddraw/tests/d3d.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 1f71235..43cdb3a 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1445,6 +1445,10 @@ static void TextureLoadTest(void) goto cleanup; } + /* test load of Texture to Texture */ + hr = IDirect3DTexture_Load(Texture, Texture); + ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + /* test Load when both textures have no palette */ hr = IDirect3DTexture_Load(Texture2, Texture); ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr);

1 0

Vitaliy Margolen : dxdiagn: A number of FIXMEs can be replaced with TRACEs.
by Alexandre Julliard 28 May '08

28 May '08

Module: wine Branch: master Commit: e66b15c20407ee65db184bc7997270d483aaa627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66b15c20407ee65db184bc79… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue May 27 21:14:45 2008 -0600 dxdiagn: A number of FIXMEs can be replaced with TRACEs. --- dlls/dxdiagn/container.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index b517dce..9172fa7 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -133,7 +133,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER if WCHAR* cur; HRESULT hr = E_INVALIDARG; - FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszContainer), ppInstance); + TRACE("(%p, %s, %p)\n", iface, debugstr_w(pwszContainer), ppInstance); if (NULL == ppInstance || NULL == pwszContainer) { return E_INVALIDARG; @@ -182,7 +182,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, IDxDiagContainerImpl_Property* p = NULL; DWORD i = 0; - FIXME("(%p, %u, %s, %u)\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); + TRACE("(%p, %u, %s, %u)\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); if (NULL == pwszPropName) { return E_INVALIDARG; @@ -209,7 +209,8 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; IDxDiagContainerImpl_Property* p = NULL; - FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pvarProp); + + TRACE("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pvarProp); if (NULL == pvarProp || NULL == pwszPropName) { return E_INVALIDARG; @@ -231,7 +232,7 @@ HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwsz IDxDiagContainerImpl_Property* p = NULL; IDxDiagContainerImpl_Property* pNew = NULL; - FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pVarProp); + TRACE("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pVarProp); if (NULL == pVarProp || NULL == pwszPropName) { return E_INVALIDARG; @@ -265,7 +266,7 @@ HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LP IDxDiagContainerImpl_SubContainer* p = NULL; IDxDiagContainerImpl_SubContainer* pNew = NULL; - FIXME("(%p, %s, %p)\n", iface, debugstr_w(pszContName), pSubCont); + TRACE("(%p, %s, %p)\n", iface, debugstr_w(pszContName), pSubCont); if (NULL == pSubCont || NULL == pszContName) { return E_INVALIDARG;

1 0