April 2006 - Wine-commits - list.winehq.org

Paul Vriens : dbghelp: Params of LPSTACKFRAME64 only has 4 elements.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 0c243013946048b63e608046dbe9b1d180216b82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c243013946048b63e60804… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Apr 17 10:53:13 2006 +0200 dbghelp: Params of LPSTACKFRAME64 only has 4 elements. --- dlls/dbghelp/stack.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index e4827a6..87ae919 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -551,7 +551,6 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp frame64->Params[1] = (ULONG)frame32.Params[1]; frame64->Params[2] = (ULONG)frame32.Params[2]; frame64->Params[3] = (ULONG)frame32.Params[3]; - frame64->Params[4] = (ULONG)frame32.Params[4]; frame64->Far = frame32.Far; frame64->Virtual = frame32.Virtual; frame64->Reserved[0] = (ULONG)frame32.Reserved[0];

1 0

Stefan Dösinger : wined3d: Add a method to change the front and back buffers.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 076fa811af7b3b188de52fbf6a998db15ce0b3ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=076fa811af7b3b188de52fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 15 22:40:14 2006 +0200 wined3d: Add a method to change the front and back buffers. --- dlls/wined3d/device.c | 6 ++++++ include/wine/wined3d_interface.h | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba2cceb..d5561cc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5963,6 +5963,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetR return WINED3D_OK; } +HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *iface, IWineD3DSurface *Front, IWineD3DSurface *Back) { + FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); + return WINED3DERR_INVALIDCALL; +} + HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice* iface, IWineD3DSurface **ppZStencilSurface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; *ppZStencilSurface = This->depthStencilBuffer; @@ -6875,6 +6880,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_ IWineD3DDeviceImpl_GetRenderState, IWineD3DDeviceImpl_SetRenderTarget, IWineD3DDeviceImpl_GetRenderTarget, + IWineD3DDeviceImpl_SetFrontBackBuffers, IWineD3DDeviceImpl_SetSamplerState, IWineD3DDeviceImpl_GetSamplerState, IWineD3DDeviceImpl_SetScissorRect, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index b7a79f2..5c2b4d8 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -425,6 +425,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(GetRenderState)(THIS_ D3DRENDERSTATETYPE State,DWORD * pValue) PURE; STDMETHOD(SetRenderTarget)(THIS_ DWORD RenderTargetIndex, struct IWineD3DSurface* pRenderTarget) PURE; STDMETHOD(GetRenderTarget)(THIS_ DWORD RenderTargetIndex, struct IWineD3DSurface** ppRenderTarget) PURE; + STDMETHOD(SetFrontBackBuffers)(THIS_ struct IWineD3DSurface *Front, struct IWineD3DSurface *Back) PURE; STDMETHOD(SetSamplerState)(THIS_ DWORD Sampler, WINED3DSAMPLERSTATETYPE Type, DWORD Value) PURE; STDMETHOD(GetSamplerState)(THIS_ DWORD Sampler, WINED3DSAMPLERSTATETYPE Type, DWORD* Value) PURE; STDMETHOD(SetScissorRect)(THIS_ CONST RECT* pRect) PURE; @@ -566,6 +567,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD #define IWineD3DDevice_GetRenderState(p,a,b) (p)->lpVtbl->GetRenderState(p,a,b) #define IWineD3DDevice_SetRenderTarget(p,a,b) (p)->lpVtbl->SetRenderTarget(p,a,b) #define IWineD3DDevice_GetRenderTarget(p,a,b) (p)->lpVtbl->GetRenderTarget(p,a,b) +#define IWineD3DDevice_SetFrontBackBuffers(p, a, b) (p)->lpVtbl->SetFrontBackBuffers(p,a,b); #define IWineD3DDevice_SetSamplerState(p,a,b,c) (p)->lpVtbl->SetSamplerState(p,a,b,c) #define IWineD3DDevice_GetSamplerState(p,a,b,c) (p)->lpVtbl->GetSamplerState(p,a,b,c) #define IWineD3DDevice_SetScissorRect(p,a) (p)->lpVtbl->SetScissorRect(p,a)

1 0

Paul Vriens : uxtheme: Fix GetThemeSysString as the error-path was always taken.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 02bf3558bd860a01eaf1f7da2af6b0b3d14a5fb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02bf3558bd860a01eaf1f7d… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sat Apr 15 16:46:26 2006 +0200 uxtheme: Fix GetThemeSysString as the error-path was always taken. --- dlls/uxtheme/metric.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index bfbec29..2d92691 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -215,8 +215,8 @@ HRESULT WINAPI GetThemeSysString(HTHEME TRACE("(%p, %d)\n", hTheme, iStringID); if(!hTheme) return E_HANDLE; - if(iStringID <= TMT_FIRSTSTRING || iStringID >= TMT_LASTSTRING) { - TRACE("Unknown StringID: %d\n", iStringID); + if(iStringID < TMT_FIRSTSTRING || iStringID > TMT_LASTSTRING) { + WARN("Unknown StringID: %d\n", iStringID); return STG_E_INVALIDPARAMETER; } if((tp = MSSTYLES_FindMetric(TMT_STRING, iStringID)))

1 0

Stefan Dösinger : wined3d: Add IWineD3DSurface::Blt.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: ffc8e46e769ababf7b238fcdfde49b208ecc69c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ffc8e46e769ababf7b238fc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 14 19:15:46 2006 +0200 wined3d: Add IWineD3DSurface::Blt. --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d9/d3d9_private.h | 2 +- dlls/wined3d/surface.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 6 ++++++ 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 77a73c9..29556d1 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -46,6 +46,7 @@ #include "wingdi.h" #include "wine/debug.h" #include "d3d8.h" +#include "ddraw.h" #include "wine/wined3d_interface.h" /* Device caps */ diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 797eb4b..3256716 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -49,7 +49,7 @@ #include "gdi.h" #include "d3d9.h" -#include "d3d9_private.h" +#include "ddraw.h" #include "wine/wined3d_interface.h" /* =========================================================================== diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e8a38c0..2f16f54 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1450,6 +1450,11 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Flip( return WINED3DERR_INVALIDCALL; } +HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, DDBLTFX *DDBltFx) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -1475,6 +1480,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_GetDC, IWineD3DSurfaceImpl_ReleaseDC, IWineD3DSurfaceImpl_Flip, + IWineD3DSurfaceImpl_Blt, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ea820e..7d8cd36 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -39,6 +39,7 @@ #include "d3d9.h" #include "d3d9types.h" +#include "ddraw.h" #include "wine/wined3d_interface.h" #include "wine/wined3d_gl.h" diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index f48cae3..b7a79f2 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -31,6 +31,10 @@ # error You must include d3d.h, d3d8.h or d3d9.h header to use this header #endif +#if !defined( __WINE_DDRAW_H) +#error You must include ddraw.h to use this header +#endif + #include "wined3d_types.h" /***************************************************************** * THIS FILE MUST NOT CONTAIN X11 or MESA DEFINES @@ -1107,6 +1111,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(GetDC)(THIS_ HDC *pHdc) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hdc) PURE; STDMETHOD(Flip)(THIS_ IWineD3DSurface *Override, DWORD FLAGS) PURE; + STDMETHOD(Blt)(THIS_ RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, DDBLTFX *DDBltFx) PURE; /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1146,6 +1151,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine #define IWineD3DSurface_GetDC(p,a) (p)->lpVtbl->GetDC(p,a) #define IWineD3DSurface_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a) #define IWineD3DSurface_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b) +#define IWineD3DSurface_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)

1 0

Aric Stewart : comctl32: Listview notify fix.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 097aec39ca86fb84cda58c1db0b84c2c035b1ef4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=097aec39ca86fb84cda58c1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 13 14:18:55 2006 -0500 comctl32: Listview notify fix. Turn off updating for that the unselect and select and then turns it on for the focus call, this results in 1 edit notify being sent at the end of the operation. --- dlls/comctl32/listview.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 23c5802..808dc93 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3046,6 +3046,7 @@ static void LISTVIEW_SetGroupSelection(L RANGES selection; LVITEMW item; ITERATOR i; + BOOL bOldChange; if (!(selection = ranges_create(100))) return; @@ -3087,12 +3088,19 @@ static void LISTVIEW_SetGroupSelection(L iterator_destroy(&i); } + bOldChange = infoPtr->bDoChangeNotify; + infoPtr->bDoChangeNotify = FALSE; + LISTVIEW_DeselectAllSkipItems(infoPtr, selection); + + iterator_rangesitems(&i, selection); while(iterator_next(&i)) LISTVIEW_SetItemState(infoPtr, i.nItem, &item); /* this will also destroy the selection */ iterator_destroy(&i); + + infoPtr->bDoChangeNotify = bOldChange; LISTVIEW_SetItemFocus(infoPtr, nItem); }

1 0

Andrew Riedi : explorer: Fixed a typo in system tray.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 58c61b5615854f0c36e97be96883c4e547db64a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58c61b5615854f0c36e97be… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Fri Apr 14 10:58:40 2006 -0700 explorer: Fixed a typo in system tray. --- programs/explorer/systray.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 00036ff..48c29cb 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -155,7 +155,7 @@ static struct icon *get_icon(HWND owner, /* search for the icon */ LIST_FOR_EACH_ENTRY( this, &tray.icons, struct icon, entry ) - if ((this->id == id) && (this->owner = owner)) return this; + if ((this->id == id) && (this->owner == owner)) return this; return NULL; }

1 0

Eric Kohl : widl: Implement support for unique pointers to arrays.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: e7134bd4cd72df412fe73575a29ef97ef29893b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7134bd4cd72df412fe7357… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sat Apr 15 11:09:42 2006 +0200 widl: Implement support for unique pointers to arrays. --- tools/widl/typegen.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index dbdfbc8..b2f160a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1769,7 +1769,12 @@ void write_remoting_arguments(FILE *file print_file(file, indent, "_StubMsg.pfnFree(%s);\n", var->name); } else if (phase != PHASE_FREE) - print_phase_function(file, indent, array_type, phase, var->name, *type_offset + 4); + { + if (pointer_type == RPC_FC_UP) + print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); + else + print_phase_function(file, indent, array_type, phase, var->name, *type_offset + 4); + } } else if (var->ptr_level == 0 && is_base_type(type->type)) {

1 0

appdb/include application.php
by WineHQ 16 Apr '06

16 Apr '06

ChangeSet ID: 24245 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/04/16 11:33:41 Modified files: include : application.php Log message: Alexander N. Sørnes <alex(a)thehandofagony.com> When vendor changes display before and after vendors instead of displaying the before vendor twice. Patch: http://cvs.winehq.org/patch.py?id=24245 Old revision New revision Changes Path 1.43 1.44 +1 -1 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.43 appdb/include/application.php:1.44 --- appdb/include/application.php:1.43 16 Apr 2006 16:33:41 -0000 +++ appdb/include/application.php 16 Apr 2006 16:33:41 -0000 @@ -188,7 +188,7 @@ class Application { return false; $oVendorBefore = new Vendor($oApp->iVendorId); $oVendorAfter = new Vendor($this->iVendorId); - $sWhatChanged .= "Vendor was changed from ".$oVendorBefore->sName." to ".$oVendorBefore->sName.".\n\n"; + $sWhatChanged .= "Vendor was changed from ".$oVendorBefore->sName." to ".$oVendorAfter->sName.".\n\n"; } if ($this->iCatId && ($this->iCatId!=$oApp->iCatId))

1 0

Detlef Riekenberg : kernel: Add some tests for Lock/Unlock memory handles.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: d78a3eec41c08ce8cf601a6b068336c5b1a1915e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d78a3eec41c08ce8cf601a6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 14 10:20:56 2006 +0200 kernel: Add some tests for Lock/Unlock memory handles. --- dlls/kernel/tests/heap.c | 143 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 137 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c index 089c502..d0fb5db 100644 --- a/dlls/kernel/tests/heap.c +++ b/dlls/kernel/tests/heap.c @@ -2,6 +2,7 @@ * Unit test suite for heap functions * * Copyright 2003 Dimitrie O. Paun + * Copyright 2006 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,7 +36,9 @@ static SIZE_T resize_9x(SIZE_T size) START_TEST(heap) { - void *mem; + LPVOID mem; + LPVOID msecond; + DWORD res; UINT flags; HGLOBAL gbl; HGLOBAL hsecond; @@ -79,9 +82,57 @@ START_TEST(heap) gbl = GlobalReAlloc(0, 10, GMEM_MOVEABLE); ok(gbl == NULL, "global realloc allocated memory\n"); - /* invalid handles are catched in windows */ + /* GlobalLock / GlobalUnlock with a valid handle */ gbl = GlobalAlloc(GMEM_MOVEABLE, 256); + + SetLastError(MAGIC_DEAD); + mem = GlobalLock(gbl); /* #1 */ + ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); + SetLastError(MAGIC_DEAD); + flags = GlobalFlags(gbl); + ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", + flags, GetLastError()); + + SetLastError(MAGIC_DEAD); + msecond = GlobalLock(gbl); /* #2 */ + ok( msecond == mem, "returned %p with %ld (expected '%p')\n", + msecond, GetLastError(), mem); + SetLastError(MAGIC_DEAD); + flags = GlobalFlags(gbl); + ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", + flags, GetLastError()); + SetLastError(MAGIC_DEAD); + + SetLastError(MAGIC_DEAD); + res = GlobalUnlock(gbl); /* #1 */ + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); + SetLastError(MAGIC_DEAD); + flags = GlobalFlags(gbl); + ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", + flags, GetLastError()); + + SetLastError(MAGIC_DEAD); + res = GlobalUnlock(gbl); /* #0 */ + /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ + ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), + "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " \ + "MAGIC_DEAD)\n", res, GetLastError()); + SetLastError(MAGIC_DEAD); + flags = GlobalFlags(gbl); + ok( !flags , "returned 0x%04x with %ld (expected '0')\n", + flags, GetLastError()); + + /* Unlock an already unlocked Handle */ + SetLastError(MAGIC_DEAD); + res = GlobalUnlock(gbl); + /* NT: ERROR_NOT_LOCKED, 9x: untouched */ + ok( !res && + ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), + "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " \ + "MAGIC_DEAD)\n", res, GetLastError()); + GlobalFree(gbl); + /* invalid handles are catched in windows: */ SetLastError(MAGIC_DEAD); hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), @@ -98,7 +149,24 @@ START_TEST(heap) "returned %ld with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); + SetLastError(MAGIC_DEAD); + mem = GlobalLock(gbl); + ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", + mem, GetLastError()); + + /* documented on MSDN: GlobalUnlock() return FALSE on failure. + Win9x and wine return FALSE with ERROR_INVALID_HANDLE, but on + NT 3.51 and XPsp2, TRUE with ERROR_INVALID_HANDLE is returned. + The similar Test for LocalUnlock() works on all Systems */ + SetLastError(MAGIC_DEAD); + res = GlobalUnlock(gbl); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "returned %ld with %ld (expected ERROR_INVALID_HANDLE)\n", + res, GetLastError()); + + /* ####################################### */ /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0); ok(gbl != NULL, "local memory not allocated for size 0\n"); @@ -120,9 +188,56 @@ START_TEST(heap) gbl = LocalReAlloc(0, 10, LMEM_MOVEABLE); ok(gbl == NULL, "local realloc allocated memory\n"); - /* invalid handles are catched in windows */ + /* LocalLock / LocalUnlock with a valid handle */ gbl = LocalAlloc(LMEM_MOVEABLE, 256); + SetLastError(MAGIC_DEAD); + mem = LocalLock(gbl); /* #1 */ + ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); + SetLastError(MAGIC_DEAD); + flags = LocalFlags(gbl); + ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", + flags, GetLastError()); + + SetLastError(MAGIC_DEAD); + msecond = LocalLock(gbl); /* #2 */ + ok( msecond == mem, "returned %p with %ld (expected '%p')\n", + msecond, GetLastError(), mem); + SetLastError(MAGIC_DEAD); + flags = LocalFlags(gbl); + ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", + flags, GetLastError()); + SetLastError(MAGIC_DEAD); + + SetLastError(MAGIC_DEAD); + res = LocalUnlock(gbl); /* #1 */ + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); + SetLastError(MAGIC_DEAD); + flags = LocalFlags(gbl); + ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", + flags, GetLastError()); + + SetLastError(MAGIC_DEAD); + res = LocalUnlock(gbl); /* #0 */ + /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ + ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), + "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " \ + "MAGIC_DEAD)\n", res, GetLastError()); + SetLastError(MAGIC_DEAD); + flags = LocalFlags(gbl); + ok( !flags , "returned 0x%04x with %ld (expected '0')\n", + flags, GetLastError()); + + /* Unlock an already unlocked Handle */ + SetLastError(MAGIC_DEAD); + res = LocalUnlock(gbl); + /* NT: ERROR_NOT_LOCKED, 9x: untouched */ + ok( !res && + ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), + "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " \ + "MAGIC_DEAD)\n", res, GetLastError()); + LocalFree(gbl); + /* invalid handles are catched in windows: */ SetLastError(MAGIC_DEAD); hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), @@ -139,13 +254,29 @@ START_TEST(heap) "returned %ld with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); + SetLastError(MAGIC_DEAD); + mem = LocalLock(gbl); + ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", + mem, GetLastError()); + + /* This Test works the same on all Systems (GlobalUnlock() is different) */ + SetLastError(MAGIC_DEAD); + res = LocalUnlock(gbl); + ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %ld with %ld (expected '0' with ERROR_INVALID_HANDLE)\n", + res, GetLastError()); /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0); ok(gbl != NULL, "returned NULL\n"); - SetLastError(0xdeadbeef); + SetLastError(MAGIC_DEAD); mem = GlobalLock(gbl); - ok( GetLastError() == ERROR_DISCARDED, "should return an error\n"); - ok( mem == NULL, "should return NULL\n"); + /* NT: ERROR_DISCARDED, 9x: untouched */ + ok( (mem == NULL) && + ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == MAGIC_DEAD)), + "returned %p with 0x%lx/%ld (expected 'NULL' with: ERROR_DISCARDED or " \ + "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); + GlobalFree(gbl); }

1 0

Detlef Riekenberg : kernel: Update WARN/ ERR and documentation for GlobalLock/GlobalUnlock.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: f64f9ef5faad5d9d139efb4bbc026d37b3a5c8a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f64f9ef5faad5d9d139efb4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 14 09:57:19 2006 +0200 kernel: Update WARN/ERR and documentation for GlobalLock/GlobalUnlock. --- dlls/kernel/heap.c | 41 ++++++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 730379c..467bf29 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -392,15 +392,20 @@ HGLOBAL WINAPI GlobalAlloc( /*********************************************************************** * GlobalLock (KERNEL32.@) * - * Lock a global memory object. + * Lock a global memory object and return a pointer to first byte of the memory + * + * PARAMS + * hmem [I] Handle of the global memory object * * RETURNS - * Pointer to first byte of block - * NULL: Failure + * Success: Pointer to first byte of the memory block + * Failure: NULL + * + * NOTES + * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE + * */ -LPVOID WINAPI GlobalLock( - HGLOBAL hmem /* [in] Handle of global memory object */ -) +LPVOID WINAPI GlobalLock(HGLOBAL hmem) { PGLOBAL32_INTERN pintern; LPVOID palloc; @@ -422,14 +427,14 @@ LPVOID WINAPI GlobalLock( } else { - WARN("invalid handle %p\n", hmem); + WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); palloc = NULL; SetLastError(ERROR_INVALID_HANDLE); } } __EXCEPT_PAGE_FAULT { - WARN("page fault on %p\n", hmem); + WARN("(%p): Page fault occurred ! Caused by bug ?\n", hmem); palloc = NULL; SetLastError(ERROR_INVALID_HANDLE); } @@ -444,13 +449,19 @@ LPVOID WINAPI GlobalLock( * * Unlock a global memory object. * + * PARAMS + * hmem [I] Handle of the global memory object + * * RETURNS - * TRUE: Object is still locked - * FALSE: Object is unlocked + * Success: Object is still locked + * Failure: FALSE (The Object is unlocked) + * + * NOTES + * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE + * */ -BOOL WINAPI GlobalUnlock( - HGLOBAL hmem /* [in] Handle of global memory object */ -) { +BOOL WINAPI GlobalUnlock(HGLOBAL hmem) +{ PGLOBAL32_INTERN pintern; BOOL locked; @@ -477,14 +488,14 @@ BOOL WINAPI GlobalUnlock( } else { - WARN("invalid handle\n"); + WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); SetLastError(ERROR_INVALID_HANDLE); locked=FALSE; } } __EXCEPT_PAGE_FAULT { - ERR("page fault occurred ! Caused by bug ?\n"); + WARN("(%p): Page fault occurred ! Caused by bug ?\n", hmem); SetLastError( ERROR_INVALID_PARAMETER ); locked=FALSE; }

1 0