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

Henri Verbeet : wined3d: Also change the resource' s format desc in IWineD3DBaseSurfaceImpl_SetFormat().
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: e56a4cb7990e2e81b3c1aa029c8220c26f460178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e56a4cb7990e2e81b3c1aa029… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 13 10:44:17 2009 +0100 wined3d: Also change the resource's format desc in IWineD3DBaseSurfaceImpl_SetFormat(). --- dlls/wined3d/surface_base.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 54c20f0..4bd860c 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -508,7 +508,9 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetContainer(IWineD3DSurface *iface, IWin HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORMAT format) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - const StaticPixelFormatDesc *formatEntry = getFormatDescEntry(format, NULL, NULL); + const struct GlPixelFormatDesc *format_desc; + const StaticPixelFormatDesc *formatEntry = getFormatDescEntry(format, + &This->resource.wineD3DDevice->adapter->gl_info, &format_desc); if (This->resource.format != WINED3DFMT_UNKNOWN) { FIXME("(%p) : The format of the surface must be WINED3DFORMAT_UNKNOWN\n", This); @@ -540,6 +542,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3D This->Flags |= (WINED3DFMT_D16_LOCKABLE == format) ? SFLAG_LOCKABLE : 0; This->resource.format = format; + This->resource.format_desc = format_desc; TRACE("(%p) : Size %d, bytesPerPixel %d\n", This, This->resource.size, This->bytesPerPixel);

1 0

Nikolay Sivov : comctl32: LVN_ITEMCHANGED notification should be sent for each item when group selected for ~LVS_OWNERDATA .
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: b7f0dd64da73a07ec1096a48a78797eff3b7ce2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f0dd64da73a07ec1096a48a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Mar 13 05:23:07 2009 -0400 comctl32: LVN_ITEMCHANGED notification should be sent for each item when group selected for ~LVS_OWNERDATA. --- dlls/comctl32/listview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5379561..caf82b9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3170,8 +3170,10 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) iterator_destroy(&i); } + /* disable per item notifications on LVS_OWNERDATA style + FIXME: single LVN_ODSTATECHANGED should be used */ bOldChange = infoPtr->bDoChangeNotify; - infoPtr->bDoChangeNotify = FALSE; + if (infoPtr->dwStyle & LVS_OWNERDATA) infoPtr->bDoChangeNotify = FALSE; LISTVIEW_DeselectAllSkipItems(infoPtr, selection);

1 0

Henri Verbeet : d3d8: Release the d3d8 shader once we' re done with it in IDirect3DDevice8Impl_GetPixelShader().
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: 24100cd026714a4f412bdc3e48f09ebf9afb81a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24100cd026714a4f412bdc3e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 13 10:44:16 2009 +0100 d3d8: Release the d3d8 shader once we're done with it in IDirect3DDevice8Impl_GetPixelShader(). --- dlls/d3d8/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7f891ff..d5f71fc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2210,6 +2210,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(LPDIRECT3DDEVICE8 ifac hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)&d3d8_shader); IWineD3DPixelShader_Release(object); *ppShader = d3d8_shader->handle; + IDirect3DPixelShader8_Release((IDirect3DPixelShader8 *)d3d8_shader); } else { *ppShader = 0; }

1 0

Michael Stefaniuc : widl: Output "LONG" instead of "long" for a 32bit integer.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: efbb4ebf3e2a75a8947d89082ef9c919218c9819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbb4ebf3e2a75a8947d89082… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 12 23:04:35 2009 +0100 widl: Output "LONG" instead of "long" for a 32bit integer. long is always 32bit in IDL files but that's not true in C. --- dlls/amstream/amstream.c | 4 ++-- dlls/amstream/mediastreamfilter.c | 4 ++-- dlls/inkobj/inkcollector.c | 12 ++++++------ dlls/ole32/marshal.c | 10 +++++----- dlls/ole32/rpc.c | 6 +++--- dlls/ole32/stg_prop.c | 2 +- dlls/ole32/stubmanager.c | 4 ++-- dlls/ole32/tests/stg_prop.c | 6 +++--- dlls/ole32/tests/usrmarshal.c | 2 +- dlls/ole32/usrmarshal.c | 4 ++-- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/quartz/memallocator.c | 2 +- dlls/quartz/pin.c | 4 ++-- dlls/rpcrt4/tests/server.c | 6 +++--- dlls/shdocvw/ie.c | 26 +++++++++++++------------- dlls/shdocvw/tests/webbrowser.c | 4 ++-- dlls/shdocvw/webbrowser.c | 26 +++++++++++++------------- programs/rpcss/epmp.c | 8 ++++---- tools/widl/header.c | 10 ++++++++-- 19 files changed, 74 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efbb4ebf3e2a75a8947d8…

1 0

Paul Vriens : crypt32/tests: Fix some crashes on older NT4 boxes.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: 190ffe58b27a8064a0e83e730a08951fb4fee890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190ffe58b27a8064a0e83e730… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 13 09:28:02 2009 +0100 crypt32/tests: Fix some crashes on older NT4 boxes. --- dlls/crypt32/tests/msg.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 1f4389b..c1464d9 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -29,7 +29,8 @@ #include "wine/test.h" -static BOOL have_nt; +static BOOL have_nt = TRUE; +static BOOL old_crypt32 = FALSE; static char oid_rsa_md5[] = szOID_RSA_MD5; static BOOL (WINAPI * pCryptAcquireContextA) @@ -196,7 +197,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_DATA, "Expected CMSG_DATA, got %d\n", value); - for (i = CMSG_CONTENT_PARAM; have_nt && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) + for (i = CMSG_CONTENT_PARAM; !old_crypt32 && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -211,7 +212,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_ENVELOPED, "Expected CMSG_ENVELOPED, got %d\n", value); - for (i = CMSG_CONTENT_PARAM; have_nt && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) + for (i = CMSG_CONTENT_PARAM; !old_crypt32 && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -226,7 +227,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_HASHED, "Expected CMSG_HASHED, got %d\n", value); - for (i = CMSG_CONTENT_PARAM; have_nt && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) + for (i = CMSG_CONTENT_PARAM; !old_crypt32 && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -241,7 +242,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_SIGNED, "Expected CMSG_SIGNED, got %d\n", value); - for (i = CMSG_CONTENT_PARAM; have_nt && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) + for (i = CMSG_CONTENT_PARAM; !old_crypt32 && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -428,7 +429,7 @@ static void test_data_msg_update(void) ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); - if (have_nt) + if (!old_crypt32) { /* Calling update after opening with an empty stream info (with a bogus * output function) yields an error: @@ -2070,7 +2071,7 @@ static void test_decode_msg_update(void) ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); - if (have_nt) + if (!old_crypt32) { msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); /* Updating a message that has a NULL stream callback fails */ @@ -2656,14 +2657,6 @@ static void test_msg_control(void) CMSG_HASHED_ENCODE_INFO hashInfo = { 0 }; CMSG_SIGNED_ENCODE_INFO signInfo = { sizeof(signInfo), 0 }; CMSG_CTRL_DECRYPT_PARA decryptPara = { sizeof(decryptPara), 0 }; - BOOL old_crypt32 = FALSE; - - /* I_CertUpdateStore can be used for verification if crypt32 is new enough */ - if (!GetProcAddress(GetModuleHandleA("crypt32.dll"), "I_CertUpdateStore")) - { - win_skip("Some tests will crash on older crypt32 implementations\n"); - old_crypt32 = TRUE; - } /* Crashes ret = CryptMsgControl(NULL, 0, 0, NULL); @@ -2763,7 +2756,7 @@ static void test_msg_control(void) "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); CryptMsgClose(msg); - if (have_nt) + if (!old_crypt32) { msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, NULL); @@ -3177,6 +3170,13 @@ START_TEST(msg) if (!have_nt) win_skip("Win9x crashes on some parameter checks\n"); + /* I_CertUpdateStore can be used for verification if crypt32 is new enough */ + if (!GetProcAddress(GetModuleHandleA("crypt32.dll"), "I_CertUpdateStore")) + { + win_skip("Some tests will crash on older crypt32 implementations\n"); + old_crypt32 = TRUE; + } + /* Basic parameter checking tests */ test_msg_open_to_encode(); test_msg_open_to_decode();

1 0

Paul Vriens : crypt32/tests: Fix some test failures on older NT4 boxes.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: d11e14d77fa09fadae129f70963830f304aebe6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11e14d77fa09fadae129f709… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 13 09:36:38 2009 +0100 crypt32/tests: Fix some test failures on older NT4 boxes. --- dlls/crypt32/tests/msg.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index c1464d9..66b09f3 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -416,11 +416,15 @@ static void test_data_msg_update(void) */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - ok(!ret && GetLastError() == E_INVALIDARG, + ok(!ret && + (GetLastError() == E_INVALIDARG || + broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ "Expected E_INVALIDARG, got %x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && GetLastError() == E_INVALIDARG, + ok(!ret && + (GetLastError() == E_INVALIDARG || + broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ "Expected E_INVALIDARG, got %x\n", GetLastError()); } else

1 0

Paul Vriens : crypt32/tests: Fix some test failures on Win9x.
by Alexandre Julliard March 13, 2009

March 13, 2009

Module: wine Branch: master Commit: 1bf308eaa7a8c7d1e94cc7029f909453fb640fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf308eaa7a8c7d1e94cc7029… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 12 18:14:26 2009 +0100 crypt32/tests: Fix some test failures on Win9x. --- dlls/crypt32/tests/msg.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 1236153..1f4389b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -840,7 +840,8 @@ static void test_hash_msg_get_param(void) ok(!ret && (GetLastError() == NTE_BAD_HASH_STATE /* NT */ || GetLastError() == NTE_BAD_ALGID /* 9x */ || - GetLastError() == CRYPT_E_MSG_ERROR /* Vista */), + GetLastError() == CRYPT_E_MSG_ERROR /* Vista */ || + broken(GetLastError() == ERROR_SUCCESS) /* Some Win9x */), "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, got 0x%x\n", GetLastError()); /* Even after a final update, the hash data aren't available */ @@ -894,7 +895,8 @@ static void test_hash_msg_get_param(void) ok(!ret && (GetLastError() == NTE_BAD_HASH_STATE /* NT */ || GetLastError() == NTE_BAD_ALGID /* 9x */ || - GetLastError() == CRYPT_E_MSG_ERROR /* Vista */), + GetLastError() == CRYPT_E_MSG_ERROR /* Vista */ || + broken(GetLastError() == ERROR_SUCCESS) /* Some Win9x */), "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, got 0x%x\n", GetLastError()); CryptMsgClose(msg); @@ -1240,8 +1242,10 @@ static void test_signed_msg_update(void) */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - ok(!ret && (GetLastError() == NTE_BAD_KEYSET || - GetLastError() == NTE_NO_KEY), + ok(!ret && + (GetLastError() == NTE_BAD_KEYSET || + GetLastError() == NTE_NO_KEY || + broken(GetLastError() == ERROR_SUCCESS)), /* Some Win9x */ "Expected NTE_BAD_KEYSET or NTE_NO_KEY, got %x\n", GetLastError()); ret = CryptImportKey(signer.hCryptProv, privKey, sizeof(privKey), 0, 0, &key);

1 0

Alexandre Julliard : winetest: Display summary headers as mixed if there were some successful runs.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: tools Branch: master Commit: bc29aac10d8aa078c6501ad42d0563445649b9ff URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc29aac10d8aa078c6501ad4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 16:20:15 2009 +0100 winetest: Display summary headers as mixed if there were some successful runs. --- winetest/gather | 5 +++-- winetest/summary.css | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/winetest/gather b/winetest/gather index d3bb878..ebc50f1 100755 --- a/winetest/gather +++ b/winetest/gather @@ -359,7 +359,8 @@ $msg </th> EOF - my $class = $report->{errors} ? "fail" : + my $class = $report->{errors} ? + ($report->{successes} ? "mixed" : "fail") . ($report->{todos} ? " also-todo" : "") : $report->{todos} ? "todo" : "pass"; my $count=!$report->{todos} ? $report->{errors} : @@ -373,7 +374,7 @@ EOF my $title = "$unit_count unit tests, $report->{errors} have errors"; $title .= ", $report->{todos} have todos" if $report->{todos}; - $stats .= " <th class=\"$class\"><a title=\"$title\">$count<br>$prcnt\%</a></th>\n"; + $stats .= " <th class=\"result $class\"><a title=\"$title\">$count<br>$prcnt\%</a></th>\n"; } chop $title; chop $stats; diff --git a/winetest/summary.css b/winetest/summary.css index 1a0711e..9dd7219 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -105,7 +105,8 @@ table.report { table.report th { line-height: 0.9; vertical-align: text-top; - border-width: thin; + border-top-width: thin; + border-bottom-width: thin; } table.report th.test { text-align: center;

1 0

Paul Vriens : gdi32/tests: Fix two test failures on Win9x.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: dde935f0bf21207265a28a35045165d6a416b2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde935f0bf21207265a28a350… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 12 15:08:13 2009 +0100 gdi32/tests: Fix two test failures on Win9x. --- dlls/gdi32/tests/metafile.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b0c6f24..cf889c1 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1223,7 +1223,9 @@ static void test_SetMetaFileBits(void) SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(0, MF_GRAPHICS_BITS); ok(!hmf, "SetMetaFileBitsEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_DATA, "wrong error %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_DATA || + broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + "wrong error %d\n", GetLastError()); /* Now with not even size */ SetLastError(0xdeadbeef); @@ -1242,7 +1244,9 @@ static void test_SetMetaFileBits(void) SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_DATA, "wrong error %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_DATA || + broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + "wrong error %d\n", GetLastError()); /* Now with corrupted mtSize field */ memcpy(buf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS));

1 0

Paul Vriens : fusion/tests: Fix some test failures on Win98.
by Alexandre Julliard March 12, 2009

March 12, 2009

Module: wine Branch: master Commit: 78402cfa7a290d87d8ed6393a0ee025cd4eba1b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78402cfa7a290d87d8ed6393a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 12 14:45:21 2009 +0100 fusion/tests: Fix some test failures on Win98. --- dlls/fusion/tests/asmenum.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 8883d0b..48f7b2a 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -442,8 +442,7 @@ static void test_enumerate_name(void) hr = IAssemblyName_GetDisplayName(next, buf, &size, 0); to_multibyte(disp, buf); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpA(disp, exp[0]) || - !lstrcmpA(disp, exp[1]), + ok(!lstrcmpA(disp, exp[0]), "Expected \"%s\" or \"%s\", got \"%s\"\n", exp[0], exp[1], disp); IAssemblyName_Release(next); @@ -458,7 +457,7 @@ static void test_enumerate_name(void) to_multibyte(disp, buf); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpA(disp, exp[1]) || - !lstrcmpA(disp, exp[2]), + !lstrcmpA(disp, exp[2]), /* Win98 */ "Expected \"%s\" or \"%s\", got \"%s\"\n", exp[1], exp[2], disp); IAssemblyName_Release(next); @@ -472,7 +471,9 @@ static void test_enumerate_name(void) hr = IAssemblyName_GetDisplayName(next, buf, &size, 0); to_multibyte(disp, buf); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpA(disp, exp[2]), "Expected \"%s\", got \"%s\"\n", exp[2], disp); + ok(!lstrcmpA(disp, exp[2]) || + !lstrcmpA(disp, exp[1]), /* Win98 */ + "Expected \"%s\" or \"%s\", got \"%s\"\n", exp[2], exp[1], disp); IAssemblyName_Release(next); @@ -506,7 +507,9 @@ static void test_enumerate_name(void) hr = IAssemblyName_GetDisplayName(next, buf, &size, 0); to_multibyte(disp, buf); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpA(disp, exp[4]), "Expected \"%s\", got \"%s\"\n", exp[4], disp); + ok(!lstrcmpA(disp, exp[4]) || + !lstrcmpA(disp, exp[5]), /* Win98 */ + "Expected \"%s\" or \"%s\", got \"%s\"\n", exp[4], exp[5], disp); IAssemblyName_Release(next); @@ -519,7 +522,9 @@ static void test_enumerate_name(void) hr = IAssemblyName_GetDisplayName(next, buf, &size, 0); to_multibyte(disp, buf); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpA(disp, exp[5]), "Expected \"%s\", got \"%s\"\n", exp[5], disp); + ok(!lstrcmpA(disp, exp[5]) || + !lstrcmpA(disp, exp[4]), /* Win98 */ + "Expected \"%s\" or \"%s\", got \"%s\"\n", exp[5], exp[4], disp); IAssemblyName_Release(next); @@ -614,7 +619,7 @@ static void test_enumerate_name(void) to_multibyte(disp, buf); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!lstrcmpA(disp, exp[1]) || - !lstrcmpA(disp, exp[2]), + !lstrcmpA(disp, exp[2]), /* Win98 */ "Expected \"%s\" or \"%s\", got \"%s\"\n", exp[1], exp[2], disp); IAssemblyName_Release(next); @@ -628,9 +633,9 @@ static void test_enumerate_name(void) hr = IAssemblyName_GetDisplayName(next, buf, &size, 0); to_multibyte(disp, buf); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!lstrcmpA(disp, exp[1]) || - !lstrcmpA(disp, exp[2]), - "Expected \"%s\" or \"%s\", got \"%s\"\n", exp[1], exp[2], disp); + ok(!lstrcmpA(disp, exp[2]) || + !lstrcmpA(disp, exp[1]), /* Win98 */ + "Expected \"%s\" or \"%s\", got \"%s\"\n", exp[2], exp[1], disp); IAssemblyName_Release(next);

1 0