October 2008 - Wine-commits

Paul Vriens : spoolss/tests: Fix a failure on Vista/W2K8.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: a8c44d9aaffdd54363700b844ee615f38712aa12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c44d9aaffdd54363700b844… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 9 21:25:51 2008 +0200 spoolss/tests: Fix a failure on Vista/W2K8. --- dlls/spoolss/tests/spoolss.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/spoolss/tests/spoolss.c b/dlls/spoolss/tests/spoolss.c index d65f101..6a2711e 100644 --- a/dlls/spoolss/tests/spoolss.c +++ b/dlls/spoolss/tests/spoolss.c @@ -120,13 +120,42 @@ static void test_BuildOtherNamesFromMachineName(void) SetLastError(0xdeadbeef); res = pBuildOtherNamesFromMachineName(&buffers, &numentries); - /* An array with 3 stringpointer is returned: + /* An array with a number of stringpointers is returned (minimum of 3): entry_#0: "" (empty String) entry_#1: <hostname> (this is the same as the computername) - entry_#2: <ip-address> (string with the ip-address of <hostname>) + 1 entry per Ethernet adapter : <ip-address> (string with a IPv4 ip-address) + + As of Vista: + + IPv6 fully disabled (lan interfaces, connections, tunnel interfaces and loopback interfaces) + entry_#0: "" (empty String) + entry_#1: <hostname> (this is the same as the computername) + 1 entry per Ethernet adapter : <ip-address> (string with a IPv4 ip-address) + entry_#x: "::1" + + IPv6 partly disabled (lan interfaces, connections): + entry_#0: "" (empty String) + entry_#1: <hostname> (this is the same as the computername) + entry_#2: "::1" + 1 entry per Ethernet adapter : <ip-address> (string with a IPv4 ip-address) + + IPv6 fully enabled but not on all lan interfaces: + entry_#0: "" (empty String) + entry_#1: <hostname> (this is the same as the computername) + 1 entry per IPv6 enabled Ethernet adapter : <ip-address> (string with a Link-local IPv6 ip-address) + 1 entry per IPv4 enabled Ethernet adapter : <ip-address> (string with a IPv4 ip-address) + + IPv6 fully enabled on all lan interfaces: + entry_#0: "" (empty String) + entry_#1: <hostname> (this is the same as the computername) + 1 entry per IPv6 enabled Ethernet adapter : <ip-address> (string with a Link-local IPv6 ip-address) + entry_#x: <ip-address> Tunnel adapter (string with a Link-local IPv6 ip-address) + 1 entry per IPv4 enabled Ethernet adapter : <ip-address> (string with a IPv4 ip-address) + entry_#y: <ip-address> Tunnel adapter (string with a IPv6 ip-address) */ + todo_wine - ok( res && (buffers != NULL) && (numentries == 3) && (buffers[0] != NULL) && (buffers[0][0] == '\0'), + ok( res && (buffers != NULL) && (numentries >= 3) && (buffers[0] != NULL) && (buffers[0][0] == '\0'), "got %u with %u and %p,%u (%p:%d)\n", res, GetLastError(), buffers, numentries, ((numentries > 0) && buffers) ? buffers[0] : NULL, ((numentries > 0) && buffers && buffers[0]) ? lstrlenW(buffers[0]) : -1);

1 0

Paul Vriens : winmm/tests: Fix some failures on Vista and W2K8.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: c0e4e2da1e1595a061a341491f24ab8b7f024b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e4e2da1e1595a061a341491… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 9 18:14:57 2008 +0200 winmm/tests: Fix some failures on Vista and W2K8. --- dlls/winmm/tests/mixer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 4961547..25711b7 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -740,8 +740,9 @@ static void mixer_test_deviceW(int device) mmsys_error(rc)); rc=mixerGetDevCapsW(device,&capsW,4); - ok(rc==MMSYSERR_NOERROR, - "mixerGetDevCapsW: MMSYSERR_NOERROR expected, got %s\n", + ok(rc==MMSYSERR_NOERROR || + rc==MMSYSERR_INVALPARAM, /* Vista and W2K8 */ + "mixerGetDevCapsW: MMSYSERR_NOERROR or MMSYSERR_INVALPARAM expected, got %s\n", mmsys_error(rc)); rc=mixerGetDevCapsW(device,&capsW,sizeof(capsW));

1 0

Juan Lang : crypt32: Fix some test failures on Win9x.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: c2921eda4abe40d88aa78bdad7cc465eee0e5f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2921eda4abe40d88aa78bdad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 9 10:46:00 2008 -0700 crypt32: Fix some test failures on Win9x. --- dlls/crypt32/tests/encode.c | 50 ++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9d3635d..108df0d 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -225,18 +225,22 @@ static void test_decodeInt(DWORD dwEncoding) /* check with NULL integer buffer */ ret = pCryptDecodeObjectEx(dwEncoding, X509_INTEGER, NULL, 0, 0, NULL, NULL, &bufSize); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG /* Win9x */), + "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08x\n", GetLastError()); /* check with a valid, but too large, integer */ ret = pCryptDecodeObjectEx(dwEncoding, X509_INTEGER, bigInt, bigInt[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - ok(!ret && GetLastError() == CRYPT_E_ASN1_LARGE, + ok((!ret && GetLastError() == CRYPT_E_ASN1_LARGE) || + broken(ret) /* Win9x */, "Expected CRYPT_E_ASN1_LARGE, got %d\n", GetLastError()); /* check with a DER-encoded string */ ret = pCryptDecodeObjectEx(dwEncoding, X509_INTEGER, testStr, testStr[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, - "Expected CRYPT_E_ASN1_BADTAG, got %d\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_PDU_MISMATCH /* Win9x */ ), + "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %08x\n", + GetLastError()); for (i = 0; i < sizeof(ints) / sizeof(ints[0]); i++) { /* When the output buffer is NULL, this always succeeds */ @@ -525,8 +529,10 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, compareTime(&time->sysTime, &ft); } else - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, - "Expected CRYPT_E_ASN1_BADTAG, got 0x%08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_PDU_MISMATCH /* Win9x */ ), + "Expected CRYPT_E_ASN1_BADTAG or OSS_PDU_MISMATCH, got %08x\n", + GetLastError()); } static const BYTE bin20[] = { @@ -645,8 +651,10 @@ static void test_decodeFiletime(DWORD dwEncoding) size = sizeof(ft1); ret = pCryptDecodeObjectEx(dwEncoding, X509_CHOICE_OF_TIME, bogusTimes[i], bogusTimes[i][1] + 2, 0, NULL, &ft1, &size); - ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, - "Expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_DATA_ERROR /* Win9x */), + "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", + GetLastError()); } } @@ -1487,13 +1495,17 @@ static void test_decodeAltName(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, unimplementedType, sizeof(unimplementedType), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, - "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == OSS_DATA_ERROR /* Win9x */), + "Expected CRYPT_E_ASN1_BADTAG or OSS_DATA_ERROR, got %08x\n", + GetLastError()); ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, bogusType, sizeof(bogusType), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, - "Expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_DATA_ERROR /* Win9x */), + "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", + GetLastError()); /* Now expected cases */ ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, emptySequence, emptySequence[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, @@ -2147,8 +2159,10 @@ static void test_decodeBasicConstraints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, inverted, inverted[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, - "Expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_DATA_ERROR /* Win9x */), + "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", + GetLastError()); ok(!buf, "Expected buf to be set to NULL\n"); /* Check with a non-DER bool */ ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, @@ -2167,8 +2181,10 @@ static void test_decodeBasicConstraints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS2, (LPBYTE)encodedCommonName, encodedCommonName[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, - "Expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_DATA_ERROR /* Win9x */), + "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", + GetLastError()); /* Now check with the more complex CERT_BASIC_CONSTRAINTS_INFO */ ret = pCryptDecodeObjectEx(dwEncoding, X509_BASIC_CONSTRAINTS, emptyConstraint, sizeof(emptyConstraint), CRYPT_DECODE_ALLOC_FLAG, NULL,

1 0

James Hawkins : comctl32: Fix MCM_SETFIRSTDAYOFWEEK when the first day set is greater than max allowed .
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: a7762476f2206cf0b2d96e5a57591fc1ba264c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7762476f2206cf0b2d96e5a5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Oct 9 18:02:06 2008 -0500 comctl32: Fix MCM_SETFIRSTDAYOFWEEK when the first day set is greater than max allowed. --- dlls/comctl32/monthcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a3f9658..4125ea1 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -913,7 +913,7 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, LPARAM lParam) } else if(lParam >= 7) { - infoPtr->firstDay = localFirstDay; + infoPtr->firstDay = 6; /* max first day allowed */ infoPtr->firstDayHighWord = TRUE; } else

1 0

Paul Vriens : winmm/tests: Fix the failures on Win9x and WinMe.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: 6c0467c18c63956d09260642e5f26ff1dc84853b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0467c18c63956d09260642e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 9 16:51:44 2008 +0200 winmm/tests: Fix the failures on Win9x and WinMe. --- dlls/winmm/tests/mci.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 90a185f..9138b60 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -31,15 +31,19 @@ START_TEST(mci) const char command_sysinfo[] = "sysinfo waveaudio quantity open"; MSG msg; char buf[1024]; + HWND hwnd; + + hwnd = CreateWindowExA(0, "winmm test", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); err = mciSendString(command_open, NULL, 0, NULL); ok(!err,"mciSendString(%s, NULL, 0 , NULL) returned error: %d\n", command_open, err); - err = mciSendString(command_close_my, NULL, 0, NULL); + err = mciSendString(command_close_my, NULL, 0, hwnd); ok(!err,"mciSendString(%s, NULL, 0 , NULL) returned error: %d\n", command_close_my, err); - ok(PeekMessageW( &msg, (HWND)-1, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); - ok(msg.hwnd == NULL, "got %p instead of NULL\n", msg.hwnd); + ok(PeekMessageA( &msg, hwnd, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.hwnd == hwnd, "Didn't get the handle to our test window\n"); ok(msg.message == MM_MCINOTIFY, "got %04x instead of MM_MCINOTIFY\n", msg.message); ok(msg.wParam == MCI_NOTIFY_SUCCESSFUL, "got %08lx instead of MCI_NOTIFY_SUCCESSFUL\n", msg.wParam); @@ -47,7 +51,7 @@ START_TEST(mci) todo_wine ok(!err,"mciSendString(%s, NULL, 0 , NULL) returned error: %d\n", command_close_all, err); memset(buf, 0, sizeof(buf)); - err = mciSendString(command_close_all, buf, sizeof(buf), NULL); + err = mciSendString(command_close_all, buf, sizeof(buf), hwnd); todo_wine ok(!err,"mciSendString(%s, buf, sizeof(buf) , NULL) returned error: %d\n", command_close_all, err); todo_wine ok(buf[0] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL) changed output buffer: %s\n", command_close_all, buf); @@ -57,7 +61,10 @@ START_TEST(mci) todo_wine ok(buf[0] == '0' && buf[1] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL), expected output buffer '0', got: '%s'\n", command_sysinfo, buf); err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0); - todo_wine ok(err == MCIERR_INVALID_DEVICE_ID, + todo_wine ok(err == MCIERR_INVALID_DEVICE_ID || + broken(!err), /* Win9x and WinMe */ "mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, NULL) returned %d instead of %d\n", err, MCIERR_INVALID_DEVICE_ID); + + DestroyWindow(hwnd); }

1 0

Henri Verbeet : ddraw: Remove a few more redundant inits (LLVM/Clang).
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: 8299df900c5571f301d7c64ef34545e984349952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8299df900c5571f301d7c64ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 15:33:05 2008 +0200 ddraw: Remove a few more redundant inits (LLVM/Clang). --- dlls/ddraw/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cb0bda5..2eb2ae2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3248,7 +3248,7 @@ IDirect3DDeviceImpl_7_SetTransform(IDirect3DDevice7 *iface, D3DMATRIX *Matrix) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); - D3DTRANSFORMSTATETYPE type = TransformStateType; + D3DTRANSFORMSTATETYPE type; HRESULT hr; TRACE("(%p)->(%08x,%p): Relay\n", This, TransformStateType, Matrix); @@ -3343,7 +3343,7 @@ IDirect3DDeviceImpl_7_GetTransform(IDirect3DDevice7 *iface, D3DMATRIX *Matrix) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); - D3DTRANSFORMSTATETYPE type = TransformStateType; + D3DTRANSFORMSTATETYPE type; HRESULT hr; TRACE("(%p)->(%08x,%p): Relay\n", This, TransformStateType, Matrix);

1 0

Henri Verbeet : wined3d: Pass the correct RECT to LoadLocation() in LockRect().
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: a98b19cef5897325d294267038cf84bbd7192baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98b19cef5897325d29426703… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 15:32:44 2008 +0200 wined3d: Pass the correct RECT to LoadLocation() in LockRect(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4c7e157..c22a547 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1102,7 +1102,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED case RTL_AUTO: case RTL_READDRAW: case RTL_READTEX: - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, pRect); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, pass_rect); break; case RTL_DISABLE:

1 0

Henri Verbeet : wined3d: Declare diffuseColor and specularColor inside their respective blocks ( LLVM/Clang).
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: cb472a3be79f07aacf1c0d0b784cc638edf338b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb472a3be79f07aacf1c0d0b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 15:32:33 2008 +0200 wined3d: Declare diffuseColor and specularColor inside their respective blocks (LLVM/Clang). --- dlls/wined3d/drawprim.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 512d85c..31bbb85 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -294,8 +294,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData const WORD *pIdxBufS = NULL; const DWORD *pIdxBufL = NULL; LONG vx_index; - DWORD diffuseColor = 0xFFFFFFFF; /* Diffuse Color */ - DWORD specularColor = 0; /* Specular Color */ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT *streamOffset = This->stateBlock->streamOffset; long SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; @@ -382,10 +380,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData /* For each primitive */ for (vx_index = 0; vx_index < NumVertexes; ++vx_index) { - - /* Initialize diffuse color */ - diffuseColor = 0xFFFFFFFF; - /* Blending data and Point sizes are not supported by this function. They are not supported by the fixed * function pipeline at all. A Fixme for them is printed after decoding the vertex declaration */ @@ -451,10 +445,10 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData diffuse_funcs[sd->u.s.diffuse.dwType]((void *) ptrToCoords); if(This->activeContext->num_untracked_materials) { + DWORD diffuseColor = ptrToCoords[0]; unsigned char i; float color[4]; - diffuseColor = ptrToCoords[0]; color[0] = D3DCOLOR_B_R(diffuseColor) / 255.0; color[1] = D3DCOLOR_B_G(diffuseColor) / 255.0; color[2] = D3DCOLOR_B_B(diffuseColor) / 255.0; @@ -475,7 +469,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData (This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] == WINED3DFOG_NONE || sd->u.s.position.dwType == WINED3DDECLTYPE_FLOAT4 )&& This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { if(GL_SUPPORT(EXT_FOG_COORD)) { - specularColor = ptrToCoords[0]; + DWORD specularColor = ptrToCoords[0]; GL_EXTCALL(glFogCoordfEXT(specularColor >> 24)); } else { static BOOL warned = FALSE;

1 0

Aric Stewart : mlang/tests: Make sure a given codepage has 'abc' before depending on that conversion to detect if a codepage is convertable .
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: f2dbaeff645ce91a8a764e289dcfa176d458a3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2dbaeff645ce91a8a764e289… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 9 08:40:39 2008 -0500 mlang/tests: Make sure a given codepage has 'abc' before depending on that conversion to detect if a codepage is convertable. --- dlls/mlang/tests/mlang.c | 41 ++++++++++++++++++++++++++++------------- 1 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index a1e5793..f42836d 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -250,7 +250,7 @@ static const char *dump_mime_flags(DWORD flags) } #endif -static BOOL check_convertible(IMultiLanguage2 *iML2, UINT from, UINT to) +static HRESULT check_convertible(IMultiLanguage2 *iML2, UINT from, UINT to) { CHAR convert[MAX_PATH]; BYTE dest[MAX_PATH]; @@ -259,21 +259,37 @@ static BOOL check_convertible(IMultiLanguage2 *iML2, UINT from, UINT to) static WCHAR strW[] = {'a','b','c',0}; + /* Check to see if the target codepage has these characters or not */ + if (from != CP_UTF8) + { + BOOL fDefaultChar; + char ch[10]; + int cb; + cb = WideCharToMultiByte( from, WC_NO_BEST_FIT_CHARS | WC_COMPOSITECHECK | WC_DEFAULTCHAR, + strW, 3, ch, sizeof(ch), NULL, &fDefaultChar); + + if(cb == 0 || fDefaultChar) + { + trace("target codepage %i does not contain 'abc'\n",from); + return E_FAIL; + } + } + srcsz = lstrlenW(strW) + 1; destsz = MAX_PATH; hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, from, strW, &srcsz, convert, &destsz); if (hr != S_OK) - return FALSE; + return S_FALSE; srcsz = -1; destsz = MAX_PATH; hr = IMultiLanguage2_ConvertString(iML2, NULL, from, to, (BYTE *)convert, &srcsz, dest, &destsz); if (hr != S_OK) - return FALSE; + return S_FALSE; - return TRUE; + return S_OK; } static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) @@ -333,8 +349,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) { CHARSETINFO csi; MIMECSETINFO mcsi; - BOOL convertible; - HRESULT check = S_OK; + HRESULT convertible = S_OK; static const WCHAR autoW[] = {'_','a','u','t','o',0}; static const WCHAR feffW[] = {'u','n','i','c','o','d','e','F','E','F','F',0}; @@ -386,13 +401,13 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UNICODE -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); convertible = check_convertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); - if (!convertible) - check = S_FALSE; - - ret = IMultiLanguage2_IsConvertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); - ok(ret == check, "IMultiLanguage2_IsConvertible(%u -> CP_UTF8) = %08x\n", cpinfo[i].uiCodePage, ret); - ret = IMultiLanguage2_IsConvertible(iML2, CP_UTF8, cpinfo[i].uiCodePage); - ok(ret == check, "IMultiLanguage2_IsConvertible(CP_UTF8 -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); + if (convertible != E_FAIL) + { + ret = IMultiLanguage2_IsConvertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); + ok(ret == convertible, "IMultiLanguage2_IsConvertible(%u -> CP_UTF8) = %08x\n", cpinfo[i].uiCodePage, ret); + ret = IMultiLanguage2_IsConvertible(iML2, CP_UTF8, cpinfo[i].uiCodePage); + ok(ret == convertible, "IMultiLanguage2_IsConvertible(CP_UTF8 -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); + } } else trace("IsValidCodePage failed for cp %u\n", cpinfo[i].uiCodePage);

1 0

Michael Karcher : msxml3: Text node should not aggregate element.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: 9fe98546e44719684102f1d39ae7197a6cee3960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe98546e44719684102f1d39… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Thu Oct 9 15:36:14 2008 +0200 msxml3: Text node should not aggregate element. --- dlls/msxml3/tests/domdoc.c | 3 +++ dlls/msxml3/text.c | 17 ++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9bc1469..15a60e5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -559,6 +559,9 @@ static void test_domdoc( void ) { IXMLDOMNamedNodeMap *pAttribs; + r = IXMLDOMText_QueryInterface(nodetext, &IID_IXMLDOMElement, (LPVOID*)&element); + ok(r == E_NOINTERFACE, "ret %08x\n", r ); + /* Text Last Child Checks */ r = IXMLDOMText_get_lastChild(nodetext, NULL); ok(r == E_INVALIDARG, "ret %08x\n", r ); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 59b6bfe..7cb1d42 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -42,7 +42,7 @@ typedef struct _domtext { const struct IXMLDOMTextVtbl *lpVtbl; LONG ref; - IUnknown *element_unk; + IUnknown *node_unk; IXMLDOMNode *node; } domtext; @@ -66,10 +66,9 @@ static HRESULT WINAPI domtext_QueryInterface( { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) || - IsEqualGUID( riid, &IID_IXMLDOMElement ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - return IUnknown_QueryInterface(This->element_unk, riid, ppvObject); + return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } else { @@ -98,7 +97,7 @@ static ULONG WINAPI domtext_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - IUnknown_Release( This->element_unk ); + IUnknown_Release( This->node_unk ); HeapFree( GetProcessHeap(), 0, This ); } @@ -773,17 +772,17 @@ IUnknown* create_text( xmlNodePtr text ) This->lpVtbl = &domtext_vtbl; This->ref = 1; - This->element_unk = create_element( text, (IUnknown*)&This->lpVtbl ); - if(!This->element_unk) + This->node_unk = create_basic_node( text, (IUnknown*)&This->lpVtbl ); + if(!This->node_unk) { HeapFree(GetProcessHeap(), 0, This); return NULL; } - hr = IUnknown_QueryInterface(This->element_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); + hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); if(FAILED(hr)) { - IUnknown_Release(This->element_unk); + IUnknown_Release(This->node_unk); HeapFree( GetProcessHeap(), 0, This ); return NULL; }

1 0