September 2006 - Wine-commits

Mikołaj Zalewski : shell32: Remove the unused shell allocator.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: 455991a7a815665dbda17496533b74df613858d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=455991a7a815665dbda1749… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Sep 8 21:14:52 2006 +0200 shell32: Remove the unused shell allocator. --- dlls/shell32/shellole.c | 166 +---------------------------------------------- 1 files changed, 5 insertions(+), 161 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 2576cbf..3f672ac 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -293,132 +293,6 @@ DWORD WINAPI SHCLSIDFromStringAW (LPVOID } /************************************************************************* - * Shell Memory Allocator - */ - -/* set the vtable later */ -static const IMallocVtbl VT_Shell_IMalloc32; - -/* this is the static object instance */ -typedef struct { - const IMallocVtbl *lpVtbl; - DWORD dummy; -} _ShellMalloc; - -static _ShellMalloc Shell_Malloc = { &VT_Shell_IMalloc32,1}; - -/* this is the global allocator of shell32 */ -static IMalloc * ShellTaskAllocator = NULL; - -/****************************************************************************** - * IShellMalloc_QueryInterface [VTABLE] - */ -static HRESULT WINAPI IShellMalloc_fnQueryInterface(LPMALLOC iface, REFIID refiid, LPVOID *obj) -{ - TRACE("(%s,%p)\n",shdebugstr_guid(refiid),obj); - if (IsEqualIID(refiid, &IID_IUnknown) || IsEqualIID(refiid, &IID_IMalloc)) { - *obj = (LPMALLOC) &Shell_Malloc; - return S_OK; - } - return E_NOINTERFACE; -} - -/****************************************************************************** - * IShellMalloc_AddRefRelease [VTABLE] - */ -static ULONG WINAPI IShellMalloc_fnAddRefRelease(LPMALLOC iface) -{ - return 1; -} - -/****************************************************************************** - * IShellMalloc_Alloc [VTABLE] - */ -static LPVOID WINAPI IShellMalloc_fnAlloc(LPMALLOC iface, DWORD cb) -{ - LPVOID addr; - - addr = (LPVOID) LocalAlloc(LMEM_ZEROINIT, cb); - TRACE("(%p,%ld);\n",addr,cb); - return addr; -} - -/****************************************************************************** - * IShellMalloc_Realloc [VTABLE] - */ -static LPVOID WINAPI IShellMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) -{ - LPVOID addr; - - if (pv) { - if (cb) { - addr = (LPVOID) LocalReAlloc((HANDLE) pv, cb, LMEM_ZEROINIT | LMEM_MOVEABLE); - } else { - LocalFree((HANDLE) pv); - addr = NULL; - } - } else { - if (cb) { - addr = (LPVOID) LocalAlloc(LMEM_ZEROINIT, cb); - } else { - addr = NULL; - } - } - - TRACE("(%p->%p,%ld)\n",pv,addr,cb); - return addr; -} - -/****************************************************************************** - * IShellMalloc_Free [VTABLE] - */ -static VOID WINAPI IShellMalloc_fnFree(LPMALLOC iface, LPVOID pv) -{ - TRACE("(%p)\n",pv); - LocalFree((HANDLE) pv); -} - -/****************************************************************************** - * IShellMalloc_GetSize [VTABLE] - */ -static DWORD WINAPI IShellMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) -{ - DWORD cb = (DWORD) LocalSize((HANDLE)pv); - TRACE("(%p,%ld)\n", pv, cb); - return cb; -} - -/****************************************************************************** - * IShellMalloc_DidAlloc [VTABLE] - */ -static INT WINAPI IShellMalloc_fnDidAlloc(LPMALLOC iface, LPVOID pv) -{ - TRACE("(%p)\n",pv); - return -1; -} - -/****************************************************************************** - * IShellMalloc_HeapMinimize [VTABLE] - */ -static VOID WINAPI IShellMalloc_fnHeapMinimize(LPMALLOC iface) -{ - TRACE("()\n"); -} - -static const IMallocVtbl VT_Shell_IMalloc32 = -{ - IShellMalloc_fnQueryInterface, - IShellMalloc_fnAddRefRelease, - IShellMalloc_fnAddRefRelease, - IShellMalloc_fnAlloc, - IShellMalloc_fnRealloc, - IShellMalloc_fnFree, - IShellMalloc_fnGetSize, - IShellMalloc_fnDidAlloc, - IShellMalloc_fnHeapMinimize -}; - -/************************************************************************* * SHGetMalloc [SHELL32.@] * * Equivalent to CoGetMalloc(MEMCTX_TASK, ...). Under Windows 9x this function @@ -432,37 +306,13 @@ static const IMallocVtbl VT_Shell_IMallo * Success: S_OK. lpmal contains the shells IMalloc interface. * Failure. An HRESULT error code. * - * NOTES - * wine contains an implementation of an allocator to use when ole32.dll is not - * loaded but it is never used as ole32 is imported by shlwapi which is imported by - * shell32 - * * SEE ALSO * CoGetMalloc, SHLoadOLE */ HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal) { TRACE("(%p)\n", lpmal); - - if (!ShellTaskAllocator) - { - HMODULE hOle32 = GetModuleHandleA("OLE32.DLL"); - /* this is very suspect. we should not being using a different - * allocator from deallocator based on something undeterministic - * like whether ole32 is loaded. as it happens currently, they - * both map to the same allocator deep down, but this could - * change in the future. */ - if(hOle32) { - CoGetMalloc(MEMCTX_TASK, &ShellTaskAllocator); - TRACE("got ole32 IMalloc\n"); - } - if(!ShellTaskAllocator) { - ShellTaskAllocator = (IMalloc* ) &Shell_Malloc; - TRACE("use fallback allocator\n"); - } - } - *lpmal = ShellTaskAllocator; - return S_OK; + return CoGetMalloc(MEMCTX_TASK, lpmal); } /************************************************************************* @@ -480,14 +330,11 @@ HRESULT WINAPI SHGetMalloc(LPMALLOC *lpm */ LPVOID WINAPI SHAlloc(DWORD len) { - IMalloc * ppv; - LPBYTE ret; - - if (!ShellTaskAllocator) SHGetMalloc(&ppv); + LPVOID ret; - ret = (LPVOID) IMalloc_Alloc(ShellTaskAllocator, len); + ret = CoTaskMemAlloc(len); TRACE("%lu bytes at %p\n",len, ret); - return (LPVOID)ret; + return ret; } /************************************************************************* @@ -505,11 +352,8 @@ LPVOID WINAPI SHAlloc(DWORD len) */ void WINAPI SHFree(LPVOID pv) { - IMalloc * ppv; - TRACE("%p\n",pv); - if (!ShellTaskAllocator) SHGetMalloc(&ppv); - IMalloc_Free(ShellTaskAllocator, pv); + CoTaskMemFree(pv); } /*************************************************************************

1 0

Stefan Dösinger : ddraw: Pass the fullscreen flag to wined3d.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: 6286c4e70d6fa964dceecd517df6141dd6eacf1e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6286c4e70d6fa964dceecd5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Sep 9 13:33:17 2006 +0200 ddraw: Pass the fullscreen flag to wined3d. --- dlls/ddraw/ddraw.c | 5 +++++ dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 2 ++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5e4a909..333fcde 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -550,6 +550,9 @@ IDirectDrawImpl_SetCooperativeLevel(IDir { IWineD3DDevice_SetHWND(This->wineD3DDevice, hwnd); } + + IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + FALSE); } else if(cooplevel & DDSCL_FULLSCREEN) { @@ -571,6 +574,8 @@ IDirectDrawImpl_SetCooperativeLevel(IDir if(This->cooperative_level & DDSCL_NORMAL) { This->cooperative_level &= ~DDSCL_NORMAL; + IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + TRUE); } /* Don't override focus windows or private device windows */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a07adf..34026db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2175,6 +2175,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } +static void WINAPI IWineD3DDeviceImpl_SetFullscreen(IWineD3DDevice *iface, BOOL fullscreen) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + TRACE("(%p) Setting DDraw fullscreen mode to %s\n", This, fullscreen ? "true" : "false"); + + /* DirectDraw apps can change between fullscreen and windowed mode after device creation with + * IDirectDraw7::SetCooperativeLevel. The GDI surface implementation needs to know this. + * DDraw doesn't necessarilly have a swapchain, so we have to store the fullscreen flag + * seperately. + */ + This->ddraw_fullscreen = fullscreen; +} + static HRESULT WINAPI IWineD3DDeviceImpl_EnumDisplayModes(IWineD3DDevice *iface, DWORD Flags, UINT Width, UINT Height, WINED3DFORMAT pixelformat, LPVOID context, D3DCB_ENUMDISPLAYMODESCALLBACK callback) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -7965,6 +7977,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_ /*** Odd functions **/ IWineD3DDeviceImpl_Init3D, IWineD3DDeviceImpl_Uninit3D, + IWineD3DDeviceImpl_SetFullscreen, IWineD3DDeviceImpl_EnumDisplayModes, IWineD3DDeviceImpl_EvictManagedResources, IWineD3DDeviceImpl_GetAvailableTextureMem, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f103705..9b36a70 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -576,6 +576,7 @@ #define NEEDS_DI IWineD3DSurface *ddraw_primary; DWORD ddraw_width, ddraw_height; WINED3DFORMAT ddraw_format; + BOOL ddraw_fullscreen; /* List of GLSL shader programs and their associated vertex & pixel shaders */ struct list glsl_shader_progs; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 01cc8ef..e76bc55 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -381,6 +381,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD_(HRESULT,CreatePalette)(THIS_ DWORD Flags, PALETTEENTRY *PalEnt, struct IWineD3DPalette **Palette, IUnknown *Parent); STDMETHOD(Init3D)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain); STDMETHOD(Uninit3D)(THIS); + STDMETHOD_(void, SetFullscreen)(THIS_ BOOL fullscreen); STDMETHOD(EnumDisplayModes)(THIS_ DWORD Flags, UINT Width, UINT Height, WINED3DFORMAT Format, void *context, D3DCB_ENUMDISPLAYMODESCALLBACK cb) PURE; STDMETHOD(EvictManagedResources)(THIS) PURE; STDMETHOD_(UINT, GetAvailableTextureMem)(THIS) PURE; @@ -521,6 +522,7 @@ #define IWineD3DDevice_CreatePixelShader #define IWineD3DDevice_CreatePalette(p, a, b, c, d) (p)->lpVtbl->CreatePalette(p, a, b, c, d) #define IWineD3DDevice_Init3D(p, a, b) (p)->lpVtbl->Init3D(p, a, b) #define IWineD3DDevice_Uninit3D(p) (p)->lpVtbl->Uninit3D(p) +#define IWineD3DDevice_SetFullscreen(p, a) (p)->lpVtbl->SetFullscreen(p, a) #define IWineD3DDevice_EnumDisplayModes(p,a,b,c,d,e,f) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d,e,f) #define IWineD3DDevice_EvictManagedResources(p) (p)->lpVtbl->EvictManagedResources(p) #define IWineD3DDevice_GetAvailableTextureMem(p) (p)->lpVtbl->GetAvailableTextureMem(p)

1 0

Stefan Dösinger : ddraw: Double buffered primary surfaces can only be created in EXLUSIVE mode.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: 2d5b19c182b5c73dc7b4e2903ba220a53e1f291f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d5b19c182b5c73dc7b4e29… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Sep 9 13:35:50 2006 +0200 ddraw: Double buffered primary surfaces can only be created in EXLUSIVE mode. --- dlls/ddraw/ddcomimpl.h | 2 +- dlls/ddraw/ddraw.c | 8 ++++++++ dlls/ddraw/tests/ddrawmodes.c | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddcomimpl.h b/dlls/ddraw/ddcomimpl.h index 594d541..553d29f 100644 --- a/dlls/ddraw/ddcomimpl.h +++ b/dlls/ddraw/ddcomimpl.h @@ -45,7 +45,7 @@ #define ICOM_THIS_FROM(impltype, ifacena /* Given an object and interface name, returns a pointer to that interface. */ #define ICOM_INTERFACE(implobj, iface) \ - (&((implobj)->ICOM_VFIELD_MULTI_NAME(iface))) + (implobj == NULL ? NULL :&((implobj)->ICOM_VFIELD_MULTI_NAME(iface))) #define ICOM_INIT_INTERFACE(implobj, ifacename, vtblname) \ do { \ diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 44fe5a0..5e4a909 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2132,6 +2132,14 @@ IDirectDrawImpl_CreateSurface(IDirectDra DDSD->dwFlags &= ~DDSD_LPSURFACE; } + if((DDSD->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) && + !(This->cooperative_level & DDSCL_EXCLUSIVE)) + { + TRACE("(%p): Attempt to create a flipable primary surface without DDSCL_EXCLUSIVE set\n", This); + *Surf = NULL; + return DDERR_NOEXCLUSIVEMODE; + } + if (Surf == NULL) { FIXME("(%p) You want to get back a surface? Don't give NULL ptrs!\n", This); diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 4b2bf17..fd00bb6 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -222,6 +222,15 @@ static void testdisplaymodes(void) static void testcooperativelevels_normal(void) { HRESULT rc; + DDSURFACEDESC surfacedesc; + IDirectDrawSurface *surface = (IDirectDrawSurface *) 0xdeadbeef; + + memset(&surfacedesc, 0, sizeof(surfacedesc)); + surfacedesc.dwSize = sizeof(surfacedesc); + surfacedesc.ddpfPixelFormat.dwSize = sizeof(surfacedesc.ddpfPixelFormat); + surfacedesc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + surfacedesc.dwBackBufferCount = 1; + surfacedesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; /* Do some tests with DDSCL_NORMAL mode */ @@ -229,6 +238,12 @@ static void testcooperativelevels_normal hwnd, DDSCL_NORMAL); ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_NORMAL) returned: %lx\n",rc); + /* Try creating a double buffered primary in normal mode */ + rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); + ok(rc == DDERR_NOEXCLUSIVEMODE, "IDirectDraw_CreateSurface returned %08lx\n", rc); + ok(surface == NULL, "Returned surface pointer is %p\n", surface); + if(surface) IDirectDrawSurface_Release(surface); + /* Set the focus window */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW);

1 0

Detlef Riekenberg : kernel: Remove dead code in computername.c.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: ce3d8361104c7eb8b68def443e45498366368f55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce3d8361104c7eb8b68def4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Sep 9 23:07:17 2006 +0200 kernel: Remove dead code in computername.c. --- dlls/kernel/computername.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel/computername.c b/dlls/kernel/computername.c index 016d3e6..7d80157 100644 --- a/dlls/kernel/computername.c +++ b/dlls/kernel/computername.c @@ -269,13 +269,12 @@ void COMPUTERNAME_Init (void) if ( NtSetValueKey( hsubkey, &nameW, 0, REG_SZ, computer_name, len ) != STATUS_SUCCESS ) WARN ( "failed to set ComputerName\n" ); } - else if ( st == STATUS_SUCCESS) + else { len = (len - offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data )); TRACE( "found in registry\n" ); } - else goto out; - + NtClose( hsubkey ); TRACE(" ComputerName: %s (%lu)\n", debugstr_w ( computer_name ), len / sizeof(WCHAR));

1 0

Stefan Dösinger : ddraw: Return DDERR_NOPALETTEATTACHED if no palette is attached.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: 49beec8635ce984a40c1d2b3140ae086068bc1f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49beec8635ce984a40c1d2b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Sep 9 13:45:19 2006 +0200 ddraw: Return DDERR_NOPALETTEATTACHED if no palette is attached. --- dlls/ddraw/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 587a3e9..74987bf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1984,6 +1984,7 @@ IDirectDrawSurfaceImpl_GetPalette(IDirec else { *Pal = NULL; + hr = DDERR_NOPALETTEATTACHED; } return hr; @@ -2055,7 +2056,7 @@ IDirectDrawSurfaceImpl_SetPalette(IDirec /* Find the old palette */ hr = IDirectDrawSurface_GetPalette(iface, &oldPal); - if(hr != DD_OK) return hr; + if(hr != DD_OK && hr != DDERR_NOPALETTEATTACHED) return hr; if(oldPal) IDirectDrawPalette_Release(oldPal); /* For the GetPalette */ /* Set the new Palette */

1 0

Paul Vriens : crypt32: Fix the adding of pwszIsFunctionName and pwszIsFunctionNameFmt2.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: 869b6f7759cbdbbec884f05b1a05413621f22199 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=869b6f7759cbdbbec884f05… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 8 16:35:24 2006 +0200 crypt32: Fix the adding of pwszIsFunctionName and pwszIsFunctionNameFmt2. --- dlls/crypt32/main.c | 8 +++++--- dlls/crypt32/tests/main.c | 9 +++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 405990a..40cf7c3 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -285,11 +285,12 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_ return FALSE; } - TRACE("%s %s %s %s\n", + TRACE("%s %s %s %s %s\n", debugstr_guid( psNewProv->pgSubject ), debugstr_w( psNewProv->pwszDLLFileName ), debugstr_w( psNewProv->pwszMagicNumber ), - debugstr_w( psNewProv->pwszIsFunctionName ) ); + debugstr_w( psNewProv->pwszIsFunctionName ), + debugstr_w( psNewProv->pwszIsFunctionNameFmt2 ) ); #define CRYPT_SIPADDPROV( key, field ) \ r = CRYPT_SIPWriteFunction( psNewProv->pgSubject, key, \ @@ -301,7 +302,8 @@ #define CRYPT_SIPADDPROV( key, field ) \ CRYPT_SIPADDPROV( szRemoveSigned, pwszRemoveFuncName ); CRYPT_SIPADDPROV( szCreate, pwszCreateFuncName ); CRYPT_SIPADDPROV( szVerify, pwszVerifyFuncName ); - CRYPT_SIPADDPROV( szIsMyFile, pwszIsFunctionNameFmt2 ); + CRYPT_SIPADDPROV( szIsMyFile, pwszIsFunctionName ); + CRYPT_SIPADDPROV( szIsMyFile2, pwszIsFunctionNameFmt2 ); #undef CRYPT_SIPADDPROV diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 3e27170..76ffab7 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -415,12 +415,9 @@ static void test_AddRemoveProvider(void) /* Dummy provider should be deleted */ SetLastError(0xdeadbeef); ret = CryptSIPRemoveProvider(&actionid); - todo_wine - { - ok ( ret, "CryptSIPRemoveProvider should have succeeded\n"); - ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", - GetLastError()); - } + ok ( ret, "CryptSIPRemoveProvider should have succeeded\n"); + ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", + GetLastError()); } START_TEST(main)

1 0

Stefan Leichter : dswave: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: 14b5e014e4c040922975c6c5f1ce82b84839abb7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14b5e014e4c040922975c6c… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Sep 8 20:29:44 2006 +0200 dswave: Print 64bit integers with wine_dbgstr_longlong. --- dlls/dswave/dswave_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 7fb96e6..daa37fd 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -524,7 +524,8 @@ const char *debugstr_DMUS_OBJECTDESC (LP if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = %lli\n - pbMemData = %p\n", pDesc->llMemLength, pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); return wine_dbg_sprintf("%s", buffer);

1 0

Damjan Jovanovic : setupapi: Fixed returns values and added a test for SetupDiOpenClassRegKeyExW.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: 9bbcb857f9aea3832e2def74fa4f517996061780 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9bbcb857f9aea3832e2def7… Author: Damjan Jovanovic <dj015(a)yahoo.com> Date: Sat Sep 9 04:25:30 2006 -0700 setupapi: Fixed returns values and added a test for SetupDiOpenClassRegKeyExW. --- dlls/setupapi/devinst.c | 4 ++-- dlls/setupapi/tests/devinst.c | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 30ed085..778c66c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1453,7 +1453,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( if (UuidToStringW((UUID*)ClassGuid, &lpGuidString) != RPC_S_OK) { RegCloseKey(hClassesKey); - return FALSE; + return INVALID_HANDLE_VALUE; } if (RegOpenKeyExW(hClassesKey, @@ -1464,7 +1464,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( { RpcStringFreeW(&lpGuidString); RegCloseKey(hClassesKey); - return FALSE; + return INVALID_HANDLE_VALUE; } RpcStringFreeW(&lpGuidString); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 60915d1..56d809e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "guiddef.h" #include "setupapi.h" #include "wine/test.h" @@ -34,6 +35,7 @@ #include "wine/test.h" static HMODULE hSetupAPI; static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); +static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); static void init_function_pointers(void) { @@ -43,6 +45,7 @@ static void init_function_pointers(void) { pSetupDiCreateDeviceInfoListExW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoListExW"); pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); + pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); } } @@ -79,6 +82,20 @@ static void test_SetupDiCreateDeviceInfo ok(ret, "SetupDiDestroyDeviceInfoList failed : %ld\n", error); } +static void test_SetupDiOpenClassRegKeyExA(void) +{ + /* This is a unique guid for testing purposes */ + GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, + 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + HKEY hkey; + + /* Check return value for non-existent key */ + hkey = SetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, + DIOCR_INSTALLER, NULL, NULL); + ok(hkey == INVALID_HANDLE_VALUE, + "returned %p (expected INVALID_HANDLE_VALUE)\n", hkey); +} + START_TEST(devinst) { init_function_pointers(); @@ -88,5 +105,10 @@ START_TEST(devinst) if (pSetupDiCreateDeviceInfoListExW && pSetupDiDestroyDeviceInfoList) test_SetupDiCreateDeviceInfoListEx(); else - trace("Needed calls not all available, skipping tests.\n"); + trace("Needed calls for SetupDiCreateDeviceInfoListEx not all available, skipping test.\n"); + + if (pSetupDiOpenClassRegKeyExA) + test_SetupDiOpenClassRegKeyExA(); + else + trace("Needed call for SetupDiOpenClassRegKeyExA not available, skipping test.\n"); }

1 0

Andrew Talbot : dnsapi: Cast-qual warnings fix.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: ba645eaab1d12fdb10076e1bb4864fc1c5e2561b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba645eaab1d12fdb10076e1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Sep 9 17:10:21 2006 +0100 dnsapi: Cast-qual warnings fix. --- dlls/dnsapi/query.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 4c95b9d..975e77d 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -249,7 +249,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg { case ns_t_a: { - r->Data.A.IpAddress = *(DWORD *)pos; + r->Data.A.IpAddress = *(const DWORD *)pos; *dlen = sizeof(DNS_A_DATA); break; } @@ -257,7 +257,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg { for (i = 0; i < sizeof(IP6_ADDRESS)/sizeof(DWORD); i++) { - r->Data.AAAA.Ip6Address.IP6Dword[i] = *(DWORD *)pos; + r->Data.AAAA.Ip6Address.IP6Dword[i] = *(const DWORD *)pos; pos += sizeof(DWORD); } @@ -267,14 +267,14 @@ static DNS_STATUS dns_copy_rdata( ns_msg case ns_t_key: { /* FIXME: byte order? */ - r->Data.KEY.wFlags = *(WORD *)pos; pos += sizeof(WORD); - r->Data.KEY.chProtocol = *(BYTE *)pos++; - r->Data.KEY.chAlgorithm = *(BYTE *)pos++; + r->Data.KEY.wFlags = *(const WORD *)pos; pos += sizeof(WORD); + r->Data.KEY.chProtocol = *(const BYTE *)pos++; + r->Data.KEY.chAlgorithm = *(const BYTE *)pos++; size = rr->rdata + rr->rdlength - pos; for (i = 0; i < size; i++) - r->Data.KEY.Key[i] = *(BYTE *)pos++; + r->Data.KEY.Key[i] = *(const BYTE *)pos++; *dlen = sizeof(DNS_KEY_DATA) + (size - 1) * sizeof(BYTE); break; @@ -302,7 +302,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg case ns_t_rt: case ns_t_mx: { - r->Data.MX.wPreference = ntohs( *(WORD *)pos ); + r->Data.MX.wPreference = ntohs( *(const WORD *)pos ); r->Data.MX.pNameExchange = dns_dname_from_msg( msg, pos + sizeof(WORD) ); if (!r->Data.MX.pNameExchange) return ERROR_NOT_ENOUGH_MEMORY; @@ -341,18 +341,18 @@ static DNS_STATUS dns_copy_rdata( ns_msg return DNS_ERROR_BAD_PACKET; /* FIXME: byte order? */ - r->Data.SIG.wTypeCovered = *(WORD *)pos; pos += sizeof(WORD); - r->Data.SIG.chAlgorithm = *(BYTE *)pos++; - r->Data.SIG.chLabelCount = *(BYTE *)pos++; - r->Data.SIG.dwOriginalTtl = *(DWORD *)pos; pos += sizeof(DWORD); - r->Data.SIG.dwExpiration = *(DWORD *)pos; pos += sizeof(DWORD); - r->Data.SIG.dwTimeSigned = *(DWORD *)pos; pos += sizeof(DWORD); - r->Data.SIG.wKeyTag = *(WORD *)pos; + r->Data.SIG.wTypeCovered = *(const WORD *)pos; pos += sizeof(WORD); + r->Data.SIG.chAlgorithm = *(const BYTE *)pos++; + r->Data.SIG.chLabelCount = *(const BYTE *)pos++; + r->Data.SIG.dwOriginalTtl = *(const DWORD *)pos; pos += sizeof(DWORD); + r->Data.SIG.dwExpiration = *(const DWORD *)pos; pos += sizeof(DWORD); + r->Data.SIG.dwTimeSigned = *(const DWORD *)pos; pos += sizeof(DWORD); + r->Data.SIG.wKeyTag = *(const WORD *)pos; size = rr->rdata + rr->rdlength - pos; for (i = 0; i < size; i++) - r->Data.SIG.Signature[i] = *(BYTE *)pos++; + r->Data.SIG.Signature[i] = *(const BYTE *)pos++; *dlen = sizeof(DNS_SIG_DATAA) + (size - 1) * sizeof(BYTE); break; @@ -375,20 +375,20 @@ static DNS_STATUS dns_copy_rdata( ns_msg if (dns_ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) return DNS_ERROR_BAD_PACKET; - r->Data.SOA.dwSerialNo = ntohl( *(DWORD *)pos ); pos += sizeof(DWORD); - r->Data.SOA.dwRefresh = ntohl( *(DWORD *)pos ); pos += sizeof(DWORD); - r->Data.SOA.dwRetry = ntohl( *(DWORD *)pos ); pos += sizeof(DWORD); - r->Data.SOA.dwExpire = ntohl( *(DWORD *)pos ); pos += sizeof(DWORD); - r->Data.SOA.dwDefaultTtl = ntohl( *(DWORD *)pos ); pos += sizeof(DWORD); + r->Data.SOA.dwSerialNo = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); + r->Data.SOA.dwRefresh = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); + r->Data.SOA.dwRetry = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); + r->Data.SOA.dwExpire = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); + r->Data.SOA.dwDefaultTtl = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); *dlen = sizeof(DNS_SOA_DATAA); break; } case ns_t_srv: { - r->Data.SRV.wPriority = ntohs( *(WORD *)pos ); pos += sizeof(WORD); - r->Data.SRV.wWeight = ntohs( *(WORD *)pos ); pos += sizeof(WORD); - r->Data.SRV.wPort = ntohs( *(WORD *)pos ); pos += sizeof(WORD); + r->Data.SRV.wPriority = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); + r->Data.SRV.wWeight = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); + r->Data.SRV.wPort = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); r->Data.SRV.pNameTarget = dns_dname_from_msg( msg, pos ); if (!r->Data.SRV.pNameTarget) return ERROR_NOT_ENOUGH_MEMORY;

1 0

Andrew Talbot : dplayx: Cast-qual warnings fix.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: ded7d0bcd5ecca9a9a587d01d01ef5fa963e27ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ded7d0bcd5ecca9a9a587d0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Sep 10 00:14:23 2006 +0100 dplayx: Cast-qual warnings fix. --- dlls/dplayx/dplay.c | 4 ++-- dlls/dplayx/name_server.c | 19 +++++++++---------- dlls/dplayx/name_server.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index c60d2a9..baafb8d 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -691,7 +691,7 @@ HRESULT DP_HandleMessage( IDirectPlay2Im /* No reply expected */ NS_AddRemoteComputerAsNameServer( lpcMessageHeader, This->dp2->spData.dwSPHeaderSize, - (LPDPMSG_ENUMSESSIONSREPLY)lpcMessageBody, + lpcMessageBody, This->dp2->lpNameServerData ); break; } @@ -742,7 +742,7 @@ #endif #if 1 case DPMSGCMD_JUSTENVELOPE: { - TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08lx\n", lpcMessageHeader, ((LPDWORD)lpcMessageHeader)[1] ); + TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08lx\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] ); NS_SetLocalAddr( This->dp2->lpNameServerData, lpcMessageHeader, 20 ); DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); } diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index e108695..86d333e 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -96,21 +96,20 @@ static DPQ_DECL_COMPARECB( cbUglyPig, GU } /* Store the given NS remote address for future reference */ -/* FIXME: LPDPMSG_ENUMSESSIONSREPLY should be const */ -void NS_AddRemoteComputerAsNameServer( LPCVOID lpcNSAddrHdr, - DWORD dwHdrSize, - LPDPMSG_ENUMSESSIONSREPLY lpMsg, - LPVOID lpNSInfo ) +void NS_AddRemoteComputerAsNameServer( LPCVOID lpcNSAddrHdr, + DWORD dwHdrSize, + LPCDPMSG_ENUMSESSIONSREPLY lpcMsg, + LPVOID lpNSInfo ) { DWORD len; lpNSCache lpCache = (lpNSCache)lpNSInfo; lpNSCacheData lpCacheNode; - TRACE( "%p, %p, %p\n", lpcNSAddrHdr, lpMsg, lpNSInfo ); + TRACE( "%p, %p, %p\n", lpcNSAddrHdr, lpcMsg, lpNSInfo ); /* See if we can find this session. If we can, remove it as it's a dup */ DPQ_REMOVE_ENTRY_CB( lpCache->first, next, data->guidInstance, cbUglyPig, - lpMsg->sd.guidInstance, lpCacheNode ); + lpcMsg->sd.guidInstance, lpCacheNode ); if( lpCacheNode != NULL ) { @@ -140,11 +139,11 @@ void NS_AddRemoteComputerAsNameServer( L return; } - CopyMemory( lpCacheNode->data, &lpMsg->sd, sizeof( *lpCacheNode->data ) ); - len = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)(lpMsg+1), -1, NULL, 0, NULL, NULL ); + CopyMemory( lpCacheNode->data, &lpcMsg->sd, sizeof( *lpCacheNode->data ) ); + len = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)(lpcMsg+1), -1, NULL, 0, NULL, NULL ); if ((lpCacheNode->data->u1.lpszSessionNameA = HeapAlloc( GetProcessHeap(), 0, len ))) { - WideCharToMultiByte( CP_ACP, 0, (LPWSTR)(lpMsg+1), -1, + WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)(lpcMsg+1), -1, lpCacheNode->data->u1.lpszSessionNameA, len, NULL, NULL ); } diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h index 4b48c2b..ec2c298 100644 --- a/dlls/dplayx/name_server.h +++ b/dlls/dplayx/name_server.h @@ -32,7 +32,7 @@ void NS_SetLocalComputerAsNameServer( LP void NS_SetRemoteComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ); void NS_AddRemoteComputerAsNameServer( LPCVOID lpNSAddrHdr, DWORD dwHdrSize, - LPDPMSG_ENUMSESSIONSREPLY lpMsg, + LPCDPMSG_ENUMSESSIONSREPLY lpcMsg, LPVOID lpNSInfo ); LPVOID NS_GetNSAddr( LPVOID lpNSInfo ); DWORD NS_GetNsMagic( LPVOID lpNSInfo );

1 0