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

Stefan Dösinger : d3d8: Back buffer count fix.
by Alexandre Julliard May 31, 2006

May 31, 2006

Module: wine Branch: refs/heads/master Commit: 1c46c693c7daee92ce680bae36cc31bc2e161a7a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c46c693c7daee92ce680ba… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 30 23:32:32 2006 +0200 d3d8: Back buffer count fix. --- dlls/d3d8/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0119a1f..6ebe678 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -182,6 +182,11 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea TRACE("(%p) Relay\n", This); + /* Fix the back buffer count */ + if(pPresentationParameters->BackBufferCount == 0) { + pPresentationParameters->BackBufferCount = 1; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (NULL == object) { FIXME("Allocation of memory failed\n");

1 0

Stefan Dösinger : d3d8: Backport of the d3d9 swapchain test to d3d8.
by Alexandre Julliard May 31, 2006

May 31, 2006

Module: wine Branch: refs/heads/master Commit: 6311d44488404c42d6dc2bf75bd9ff341bc034e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6311d44488404c42d6dc2bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 30 23:30:21 2006 +0200 d3d8: Backport of the d3d9 swapchain test to d3d8. --- dlls/d3d8/tests/device.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9a1259d..5a5ac79 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -37,6 +37,122 @@ #define CHECK_CALL(r,c,d,rc) \ trace("%s failed: %s\n", c, DXGetErrorString8(r)); \ } +void test_swapchain(void) +{ + HRESULT hr; + HWND hwnd = NULL; + IDirect3D8 *pD3d = NULL; + IDirect3DDevice8 *pDevice = NULL; + IDirect3DSwapChain8 *swapchain1 = NULL; + IDirect3DSwapChain8 *swapchain2 = NULL; + IDirect3DSwapChain8 *swapchain3 = NULL; + IDirect3DSurface8 *backbuffer = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + + pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D8_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.BackBufferCount = 0; + + hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", DXGetErrorString8(hr)); + if (FAILED(hr)) goto cleanup; + + /* Check if the back buffer count was modified */ + ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + + /* Create a bunch of swapchains */ + d3dpp.BackBufferCount = 0; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(pDevice, &d3dpp, &swapchain1); + ok(SUCCEEDED(hr), "Failed to create a swapchain (%s)\n", DXGetErrorString8(hr)); + ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + + d3dpp.BackBufferCount = 1; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(pDevice, &d3dpp, &swapchain2); + ok(SUCCEEDED(hr), "Failed to create a swapchain (%s)\n", DXGetErrorString8(hr)); + + /* Unsupported by wine for now */ + d3dpp.BackBufferCount = 2; + hr = IDirect3DDevice8_CreateAdditionalSwapChain(pDevice, &d3dpp, &swapchain3); + todo_wine ok(SUCCEEDED(hr), "Failed to create a swapchain (%s)\n", DXGetErrorString8(hr)); + if(SUCCEEDED(hr)) { + /* Swapchain 3, created with backbuffercount 2 */ + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, 0, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the 1st back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer != NULL && backbuffer != (void *) 0xdeadbeef, "The back buffer is %p\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 1, 0, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the 2nd back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer != NULL && backbuffer != (void *) 0xdeadbeef, "The back buffer is %p\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 2, 0, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "GetBackBuffer returned %s\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 3, 0, &backbuffer); + ok(FAILED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + } + + /* Check the back buffers of the swapchains */ + /* Swapchain 1, created with backbuffercount 0 */ + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain1, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer != NULL, "The back buffer is NULL (%s)\n", DXGetErrorString8(hr)); + if(backbuffer) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain1, 1, 0, &backbuffer); + ok(FAILED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + /* Swapchain 2 - created with backbuffercount 1 */ + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain2, 0, 0, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer != NULL && backbuffer != (void *) 0xdeadbeef, "The back buffer is %p\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain2, 1, 0, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "GetBackBuffer returned %s\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + backbuffer = (void *) 0xdeadbeef; + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain2, 2, 0, &backbuffer); + ok(FAILED(hr), "Failed to get the back buffer (%s)\n", DXGetErrorString8(hr)); + ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); + if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); + + cleanup: + if(swapchain1) IDirect3DSwapChain8_Release(swapchain1); + if(swapchain2) IDirect3DSwapChain8_Release(swapchain2); + if(swapchain3) IDirect3DSwapChain8_Release(swapchain3); + if(pDevice) IDirect3DDevice8_Release(pDevice); + if(pD3d) IDirect3DDevice8_Release(pD3d); + DestroyWindow( hwnd ); +} + void test_refcount(void) { HRESULT hr; @@ -189,5 +305,6 @@ START_TEST(device) if (pDirect3DCreate8) { test_refcount(); + test_swapchain(); } }

1 0

Andrew Talbot : winmm/joystick: joystick.c requires Unicode library.
by Alexandre Julliard May 31, 2006

May 31, 2006

Module: wine Branch: refs/heads/master Commit: 9480d3e50ac9e7764e4f021d93591c67f8d1d56f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9480d3e50ac9e7764e4f021… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 30 20:10:35 2006 +0100 winmm/joystick: joystick.c requires Unicode library. --- dlls/winmm/joystick/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/joystick/Makefile.in b/dlls/winmm/joystick/Makefile.in index 341383c..aef4ecb 100644 --- a/dlls/winmm/joystick/Makefile.in +++ b/dlls/winmm/joystick/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = joystick.drv IMPORTS = winmm user32 kernel32 +EXTRALIBS = $(LIBUNICODE) C_SRCS = \ joystick.c

1 0

Alexandre Julliard : comctl32: propsheet: Fixed buffer sizes for LoadStringW.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 1d40bf0141b7f67b1188555962698f5dab631bc3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d40bf0141b7f67b1188555… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 30 20:01:19 2006 +0200 comctl32: propsheet: Fixed buffer sizes for LoadStringW. --- dlls/comctl32/propsheet.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 2dad74f..ba20116 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2908,8 +2908,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee else { UINT id = LOWORD(ppsp->pszTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); - ppsp->pszTitle = Alloc( len ); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; + ppsp->pszTitle = Alloc( len * sizeof(WCHAR) ); LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszTitle, len ); } } @@ -2926,8 +2926,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee else { UINT id = LOWORD(ppsp->pszHeaderTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); - ppsp->pszHeaderTitle = Alloc( len ); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; + ppsp->pszHeaderTitle = Alloc( len * sizeof(WCHAR) ); LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderTitle, len ); } } @@ -2941,8 +2941,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee else { UINT id = LOWORD(ppsp->pszHeaderSubTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); - ppsp->pszHeaderSubTitle = Alloc( len ); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; + ppsp->pszHeaderSubTitle = Alloc( len * sizeof(WCHAR) ); LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderSubTitle, len ); } } @@ -2996,8 +2996,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee else { UINT id = LOWORD(ppsp->pszTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); - ppsp->pszTitle = Alloc( len ); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; + ppsp->pszTitle = Alloc( len * sizeof(WCHAR) ); LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszTitle, len ); } } @@ -3018,8 +3018,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee else { UINT id = LOWORD(ppsp->pszHeaderTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); - ppsp->pszHeaderTitle = Alloc( len ); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; + ppsp->pszHeaderTitle = Alloc( len * sizeof(WCHAR) ); LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderTitle, len ); } } @@ -3037,8 +3037,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee else { UINT id = LOWORD(ppsp->pszHeaderSubTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); - ppsp->pszHeaderSubTitle = Alloc( len ); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; + ppsp->pszHeaderSubTitle = Alloc( len * sizeof(WCHAR) ); LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderSubTitle, len ); } }

1 0

Emmanuel Maillard : winecoreaudio: Initial Audio Driver for Mac OS X.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 144a5353effb94b7e30ab2c5be0600cad609ce5e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=144a5353effb94b7e30ab2c… Author: Emmanuel Maillard <mahanuu(a)opendarwin.org> Date: Sun May 28 22:46:23 2006 +0200 winecoreaudio: Initial Audio Driver for Mac OS X. --- configure | 16 configure.ac | 8 dlls/Makefile.in | 6 dlls/winmm/winecoreaudio/.gitignore | 1 dlls/winmm/winecoreaudio/Makefile.in | 16 dlls/winmm/winecoreaudio/audio.c | 1433 +++++++++++++++++++++++ dlls/winmm/winecoreaudio/audiounit.c | 141 ++ dlls/winmm/winecoreaudio/coreaudio.c | 114 ++ dlls/winmm/winecoreaudio/coreaudio.h | 28 dlls/winmm/winecoreaudio/winecoreaudio.drv.spec | 2 include/config.h.in | 6 11 files changed, 1769 insertions(+), 2 deletions(-) create mode 100644 dlls/winmm/winecoreaudio/.gitignore create mode 100644 dlls/winmm/winecoreaudio/Makefile.in create mode 100644 dlls/winmm/winecoreaudio/audio.c create mode 100644 dlls/winmm/winecoreaudio/audiounit.c create mode 100644 dlls/winmm/winecoreaudio/coreaudio.c create mode 100644 dlls/winmm/winecoreaudio/coreaudio.h create mode 100644 dlls/winmm/winecoreaudio/winecoreaudio.drv.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=144a5353effb94b7e30…

1 0

Hans Leidekker : dnsapi: Implement DnsQuery_{A,UTF8,W}.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 5931739cdea8465618bbcc1d37840fcdef7b5d5e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5931739cdea8465618bbcc1… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon May 29 12:47:31 2006 +0200 dnsapi: Implement DnsQuery_{A,UTF8,W}. --- dlls/dnsapi/dnsapi.h | 2 dlls/dnsapi/dnsapi.spec | 6 dlls/dnsapi/query.c | 588 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 591 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5931739cdea8465618b…

1 0

Hans Leidekker : dnsapi: Add DNS message parsing routines from BIND.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 4cbbce8ea6cef81eb5f0e4cc0dc95b05af3b2c32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cbbce8ea6cef81eb5f0e4c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon May 29 12:47:19 2006 +0200 dnsapi: Add DNS message parsing routines from BIND. --- dlls/dnsapi/Makefile.in | 2 dlls/dnsapi/dnsapi.h | 5 dlls/dnsapi/ns_name.c | 708 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/ns_parse.c | 196 +++++++++++++ 4 files changed, 911 insertions(+), 0 deletions(-) create mode 100644 dlls/dnsapi/ns_name.c create mode 100644 dlls/dnsapi/ns_parse.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4cbbce8ea6cef81eb5f…

1 0

Mikołaj Zalewski : comctl32: header: Ignore out-of-range iOrder in SetItemT.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 414128eb949b810f432ac1836880f7cd7b6b35e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=414128eb949b810f432ac18… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue May 30 14:17:06 2006 +0200 comctl32: header: Ignore out-of-range iOrder in SetItemT. --- dlls/comctl32/header.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index d47e7f5..b00adc2 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1460,9 +1460,9 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L lpItem = &infoPtr->items[nItem]; HEADER_StoreHDItemInHeader(lpItem, phdi->mask, phdi, bUnicode); - /* FIXME: check it order is not out of bound */ if (phdi->mask & HDI_ORDER) - HEADER_ChangeItemOrder(infoPtr, nItem, phdi->iOrder); + if (phdi->iOrder >= 0 && phdi->iOrder < infoPtr->uNumItem) + HEADER_ChangeItemOrder(infoPtr, nItem, phdi->iOrder); HEADER_SendHeaderNotifyT (hwnd, HDN_ITEMCHANGEDW, nItem, phdi->mask, &hdNotify);

1 0

Mikołaj Zalewski : kernel32: Prevent truncating characters to 8 bits in FormatMessageW.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: 2c86775d91695b99d9364b35a0387c9956156c77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c86775d91695b99d9364b3… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue May 30 14:13:51 2006 +0200 kernel32: Prevent truncating characters to 8 bits in FormatMessageW. --- dlls/kernel/format_msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/format_msg.c b/dlls/kernel/format_msg.c index 3426e25..375c5da 100644 --- a/dlls/kernel/format_msg.c +++ b/dlls/kernel/format_msg.c @@ -362,7 +362,7 @@ #if defined(__i386__) || defined(__sparc LPWSTR from,f; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; - CHAR ch; + WCHAR ch; TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);

1 0

Andrew Ziem : msi: Increase verbosity in some failing tests.
by Alexandre Julliard May 30, 2006

May 30, 2006

Module: wine Branch: refs/heads/master Commit: f1b449942f9307520eeca01692f988e240a4cef6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1b449942f9307520eeca01… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Sun May 28 23:33:55 2006 -0600 msi: Increase verbosity in some failing tests. --- dlls/msi/tests/format.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 5d79a31..6016c62 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1042,8 +1042,8 @@ static void test_formatrecord(void) r = MsiRecordSetString(hrec, 1, "hoo"); sz = sizeof buffer; r = MsiFormatRecord(0, hrec, buffer, &sz); - ok( sz == 3, "size wrong\n"); - ok( 0 == strcmp(buffer,"[1]"), "wrong output\n"); + ok( sz == 3, "size wrong: got %lu, expected 3\n", sz); + ok( 0 == strcmp(buffer,"[1]"), "wrong output: got %s, expected [1]\n", buffer); } ok( r == ERROR_SUCCESS, "format failed\n"); @@ -1052,8 +1052,8 @@ static void test_formatrecord(void) r = MsiRecordSetString(hrec, 1, "hoo"); sz = sizeof buffer; r = MsiFormatRecord(0, hrec, buffer, &sz); - ok( sz == 3, "size wrong\n"); - ok( 0 == strcmp(buffer,"[1]"), "wrong output\n"); + ok( sz == 3, "size wrong: got %lu, expected 3\n", sz); + ok( 0 == strcmp(buffer,"[1]"), "wrong output: got %s, expected [1]\n", buffer); } ok( r == ERROR_SUCCESS, "format failed\n");

1 0