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

Rob Shearman : kernel32: Fix several failing GetComputerNameA/ W tests on Windows.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 9dc55ab01de1f337224b8d4235b5a573c88331bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc55ab01de1f337224b8d423… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 16 01:39:11 2007 +0000 kernel32: Fix several failing GetComputerNameA/W tests on Windows. --- dlls/kernel32/tests/environ.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index aa61b8e..ec686ab 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -244,7 +244,9 @@ static void test_GetComputerName(void) size = 0; ret = GetComputerNameA((LPSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameA should have failed with ERROR_MORE_DATA instead of %d\n", error); + todo_wine + ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameA should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); + size++; /* nul terminating character */ name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = GetComputerNameA(name, &size); @@ -264,7 +266,9 @@ static void test_GetComputerName(void) size = 0; ret = GetComputerNameW((LPWSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameW should have failed with ERROR_MORE_DATA instead of %d\n", error); + todo_wine + ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameW should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); + size++; /* nul terminating character */ nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(nameW[0])); ok(nameW != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = GetComputerNameW(nameW, &size);

1 0

Rob Shearman : advapi32: Fix a failing test on Windows caused by the existence of one SID that always has no associated account .
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: c2b05d32f09b57cbfa6b3eeb2c4f6af67e3812fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b05d32f09b57cbfa6b3eeb2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 16 01:39:47 2007 +0000 advapi32: Fix a failing test on Windows caused by the existence of one SID that always has no associated account. --- dlls/advapi32/tests/security.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3e8459e..4de2476 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -896,8 +896,10 @@ static void test_token_attr(void) Name[0] = '\0'; Domain[0] = '\0'; ret = LookupAccountSid(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); - ok(ret, "LookupAccountSid(%s) failed with error %d\n", SidString, GetLastError()); - trace("\t%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); + if (ret) + trace("\t%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); + else + trace("\t%s, attr: 0x%08x LookupAccountSid failed with error %d\n", SidString, Groups->Groups[i].Attributes, GetLastError()); LocalFree(SidString); } HeapFree(GetProcessHeap(), 0, Groups);

1 0

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

16 Mar '07

Module: wine Branch: master Commit: e3c778eb58dcb2efa38ebd1f64fb41f135611d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c778eb58dcb2efa38ebd1f6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 15 22:47:13 2007 +0100 localspl/tests: Add tests for XcvDataPort_AddPort. --- dlls/localspl/tests/localmon.c | 75 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index bce9a48..2770862 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -66,6 +66,7 @@ static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); +static const WCHAR cmd_AddPortW[] = {'A','d','d','P','o','r','t',0}; 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}; @@ -376,6 +377,59 @@ static void test_XcvClosePort(void) /* ########################### */ +static void test_XcvDataPort_AddPort(void) +{ + DWORD res; + HANDLE hXcv; + + + 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; + + /* + * The following tests crash with native localspl.dll on w2k and xp, + * but it works, when the native dll (w2k and xp) is used in wine. + * also tested (same crash): replacing emptyW with portname_lpt1W + * and replacing "NULL, 0, NULL" with "buffer, MAX_PATH, &needed" + * + * We need to use a different API (AddPortEx) instead + */ + if (0) + { + /* create a Port for a normal, writeable file */ + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + + /* add our testport again */ + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + + /* create a well-known Port */ + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_lpt1W, (lstrlenW(portname_lpt1W) + 1) * sizeof(WCHAR), NULL, 0, NULL); + + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_lpt1W, (lstrlenW(portname_lpt1W) + 1) * sizeof(WCHAR), NULL, 0, NULL); + /* native localspl.dll on wine: ERROR_ALREADY_EXISTS */ + + /* ERROR_ALREADY_EXISTS is also returned from native localspl.dll on wine, + when "RPT1:" was already installed for redmonnt.dll: + res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_rpt1W, ... + */ + + /* cleanup */ + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + } + + pXcvClosePort(hXcv); +} + +/* ########################### */ + static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) { CHAR org_value[16]; @@ -1080,13 +1134,20 @@ START_TEST(localmon) test_ConfigurePort(); test_DeletePort(); test_EnumPorts(); - test_XcvClosePort(); - test_XcvDataPort_ConfigureLPTPortCommandOK(); - test_XcvDataPort_DeletePort(); - test_XcvDataPort_GetTransmissionRetryTimeout(); - test_XcvDataPort_MonitorUI(); - test_XcvDataPort_PortIsValid(); - test_XcvOpenPort(); + if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) { + skip("Xcv not supported\n"); + } + else + { + test_XcvClosePort(); + test_XcvDataPort_AddPort(); + test_XcvDataPort_ConfigureLPTPortCommandOK(); + test_XcvDataPort_DeletePort(); + test_XcvDataPort_GetTransmissionRetryTimeout(); + test_XcvDataPort_MonitorUI(); + test_XcvDataPort_PortIsValid(); + test_XcvOpenPort(); + } /* Cleanup our temporary file */ DeleteFileW(tempfileW);

1 0

Detlef Riekenberg : localspl/tests: Check for Xcv-API only once.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: ee2e5672acc7691d02be1aab2a1543ad19595db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2e5672acc7691d02be1aab2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 15 22:47:16 2007 +0100 localspl/tests: Check for Xcv-API only once. --- dlls/localspl/tests/localmon.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 2770862..7030b1f 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -347,7 +347,6 @@ static void test_XcvClosePort(void) DWORD res; HANDLE hXcv; - if ((pXcvOpenPort == NULL) || (pXcvClosePort == NULL)) return; if (0) { @@ -439,7 +438,6 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) DWORD res; DWORD needed; - if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; hXcv = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); @@ -545,8 +543,6 @@ static void test_XcvDataPort_DeletePort(void) DWORD needed; - if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; - hXcv = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvOpenPort(emptyW, SERVER_ALL_ACCESS, &hXcv); @@ -591,8 +587,6 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) DWORD len; - if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; - hXcv = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); @@ -717,8 +711,6 @@ static void test_XcvDataPort_MonitorUI(void) DWORD len; - if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; - hXcv = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); @@ -832,8 +824,6 @@ static void test_XcvDataPort_PortIsValid(void) DWORD needed; - if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; - hXcv = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); @@ -989,7 +979,6 @@ static void test_XcvOpenPort(void) DWORD res; HANDLE hXcv; - if ((pXcvOpenPort == NULL) || (pXcvClosePort == NULL)) return; if (0) {

1 0

H. Verbeet : d3d9: Add a cubemap wrapping test.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: fd64779fd06bb3d5e6b4cccc80aede1b1f7ad79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd64779fd06bb3d5e6b4cccc8… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Mar 15 23:27:41 2007 +0100 d3d9: Add a cubemap wrapping test. --- dlls/d3d9/tests/visual.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 67729db..d9d0913 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -548,6 +548,144 @@ static void fog_test(IDirect3DDevice9 *device) IDirect3DDevice9_SetVertexDeclaration(device, NULL); } +/* This test verifies the behaviour of cube maps wrt. texture wrapping. + * D3D cube map wrapping always behaves like GL_CLAMP_TO_EDGE, + * regardless of the actual addressing mode set. */ +static void test_cube_wrap(IDirect3DDevice9 *device) +{ + static const float quad[][6] = { + {-1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f}, + }; + + static const D3DVERTEXELEMENT9 decl_elements[] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, + D3DDECL_END() + }; + + static const struct { + D3DTEXTUREADDRESS mode; + const char *name; + } address_modes[] = { + {D3DTADDRESS_WRAP, "D3DTADDRESS_WRAP"}, + {D3DTADDRESS_MIRROR, "D3DTADDRESS_MIRROR"}, + {D3DTADDRESS_CLAMP, "D3DTADDRESS_CLAMP"}, + {D3DTADDRESS_BORDER, "D3DTADDRESS_BORDER"}, + {D3DTADDRESS_MIRRORONCE, "D3DTADDRESS_MIRRORONCE"}, + }; + + IDirect3DVertexDeclaration9 *vertex_declaration = NULL; + IDirect3DCubeTexture9 *texture = NULL; + IDirect3DSurface9 *surface = NULL; + D3DLOCKED_RECT locked_rect; + HRESULT hr; + INT x, y, face; + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(SUCCEEDED(hr), "SetVertexDeclaration failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surface, NULL); + ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (0x%08x)\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + + for (y = 0; y < 128; ++y) + { + DWORD *ptr = (DWORD *)(((BYTE *)locked_rect.pBits) + (y * locked_rect.Pitch)); + for (x = 0; x < 64; ++x) + { + *ptr++ = 0xffff0000; + } + for (x = 64; x < 128; ++x) + { + *ptr++ = 0xff0000ff; + } + } + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_CreateCubeTexture(device, 128, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "CreateCubeTexture failed (0x%08x)\n", hr); + + /* Create cube faces */ + for (face = 0; face < 6; ++face) + { + IDirect3DSurface9 *face_surface = NULL; + + hr= IDirect3DCubeTexture9_GetCubeMapSurface(texture, face, 0, &face_surface); + ok(SUCCEEDED(hr), "GetCubeMapSurface failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, surface, NULL, face_surface, NULL); + ok(SUCCEEDED(hr), "UpdateSurface failed (0x%08x)\n", hr); + + IDirect3DSurface9_Release(face_surface); + } + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "SetTexture failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR); + ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MINFILTER failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); + ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MAGFILTER failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_BORDERCOLOR, 0xff00ff00); + ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_BORDERCOLOR failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + + for (x = 0; x < (sizeof(address_modes) / sizeof(*address_modes)); ++x) + { + DWORD color; + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSU, address_modes[x].mode); + ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_ADDRESSU (%s) failed (0x%08x)\n", address_modes[x].name, hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSV, address_modes[x].mode); + ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_ADDRESSV (%s) failed (0x%08x)\n", address_modes[x].name, hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], sizeof(quad[0])); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + /* Due to the nature of this test, we sample essentially at the edge + * between two faces. Because of this it's undefined from which face + * the driver will sample. Furtunately that's not important for this + * test, since all we care about is that it doesn't sample from the + * other side of the surface or from the border. */ + color = getPixelColor(device, 320, 240); + ok(color == 0x00ff0000 || color == 0x000000ff, + "Got color 0x%08x for addressing mode %s, expected 0x00ff0000 or 0x000000ff.\n", + color, address_modes[x].name); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed (0x%08x)\n", hr); + } + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed (0x%08x)\n", hr); + + IDirect3DVertexDeclaration9_Release(vertex_declaration); + IDirect3DCubeTexture9_Release(texture); + IDirect3DSurface9_Release(surface); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -602,6 +740,7 @@ START_TEST(visual) lighting_test(device_ptr); clear_test(device_ptr); fog_test(device_ptr); + test_cube_wrap(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(2, 0)) {

1 0

Keith Stevens : comctl32/tests: trackbar: Reorganize the getter and setter tests into functions.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: ab2eb1f42b89fc5066be74d3a4f249f765b7d4f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2eb1f42b89fc5066be74d3a… Author: Keith Stevens <fozziethebeat(a)gmail.com> Date: Thu Mar 15 10:47:32 2007 -0800 comctl32/tests: trackbar: Reorganize the getter and setter tests into functions. --- dlls/comctl32/tests/trackbar.c | 167 ++++++++++++++++++++++++++++------------ 1 files changed, 116 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab2eb1f42b89fc5066be7…

1 0

Keith Stevens : comctl32/tests: trackbar: Test message sequences.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: 06c91e925fb160418d6b8ea79c8c1c5615ff32f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c91e925fb160418d6b8ea79… Author: Keith Stevens <fozziethebeat(a)gmail.com> Date: Thu Mar 15 10:48:56 2007 -0800 comctl32/tests: trackbar: Test message sequences. --- dlls/comctl32/tests/trackbar.c | 549 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 543 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06c91e925fb160418d6b8…

1 0

Dmitry Timoshkov : user32: Restore erroneously removed chunk of code.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: cecd205f13d0576c39ed6f60aac01d4c942daaae URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecd205f13d0576c39ed6f60a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Mar 16 00:41:01 2007 +0800 user32: Restore erroneously removed chunk of code. --- dlls/user32/mdi.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index de43ae3..8da2060 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -910,11 +910,19 @@ static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild ) { MENUITEMINFOW menuInfo; HMENU menu = GetMenu( frame ); + INT nItems; + UINT iId; TRACE("frame %p, child %p\n", frame, hChild); if( !menu ) return 0; + /* if there is no system buttons then nothing to do */ + nItems = GetMenuItemCount(menu) - 1; + iId = GetMenuItemID(menu, nItems); + if ( !(iId == SC_RESTORE || iId == SC_CLOSE) ) + return 0; + /* * Remove the system menu, If that menu is the icon of the window * as it is in win95, we have to delete the bitmap. @@ -1531,7 +1539,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, frame = GetParent(client); MDI_RestoreFrameMenu( frame, hwnd ); - MDI_UpdateFrameText( frame, client, FALSE, NULL ); + MDI_UpdateFrameText( frame, client, TRUE, NULL ); } if( wParam == SIZE_MAXIMIZED )

1 0

Kanit Therdsteerasukdi : comctl32: datetime: Return 1 in DTM_SETFORMAT when successful.
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: fed00cb82e03a7ecb52f683a69bfbb48dd8bc413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed00cb82e03a7ecb52f683a6… Author: Kanit Therdsteerasukdi <therdste(a)ucla.edu> Date: Thu Mar 15 09:47:48 2007 -0700 comctl32: datetime: Return 1 in DTM_SETFORMAT when successful. --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/tests/datetime.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 08e0d58..c495666 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -279,7 +279,7 @@ DATETIME_SetFormatW (DATETIME_INFO *infoPtr, LPCWSTR lpszFormat) DATETIME_UseFormat (infoPtr, lpszFormat); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); - return infoPtr->nrFields; + return 1; } diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 3751862..a338e7f 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -190,14 +190,12 @@ static void test_dtm_set_format(HWND hWndDateTime) { LRESULT r; - todo_wine { - r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, (LPARAM)NULL); - expect(1, r); + r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, (LPARAM)NULL); + expect(1, r); - r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, - (LPARAM)"'Today is: 'hh':'m':'s dddd MMM dd', 'yyyy"); - expect(1, r); - } + r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, + (LPARAM)"'Today is: 'hh':'m':'s dddd MMM dd', 'yyyy"); + expect(1, r); ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_format_seq, "test_dtm_set_format", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Gerald Pfeifer : cabinet: Simplify code in fdi_decomp().
by Alexandre Julliard 16 Mar '07

16 Mar '07

Module: wine Branch: master Commit: cd7aecd52acc70d90a15d71a52365e8edac4f4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7aecd52acc70d90a15d71a5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Mar 14 20:49:42 2007 +0100 cabinet: Simplify code in fdi_decomp(). --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 6815d6d..cb58949 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2107,7 +2107,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state do { - pathlen = (userpath) ? strlen(userpath) : 0; + pathlen = strlen(userpath); filenamelen = (cab->mii.nextname) ? strlen(cab->mii.nextname) : 0; /* slight overestimation here to save CPU cycles in the developer's brain */

1 0