wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Alexandre Julliard : kernel32: Fix some 64-bit issues in GlobalSize().
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 4b12e9c5a033d214831d9aa80ba986b04faf43b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b12e9c5a033d214831d9aa80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 11:40:53 2011 +0200 kernel32: Fix some 64-bit issues in GlobalSize(). --- dlls/kernel32/heap.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 4ade995..598bfe4 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -808,7 +808,7 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) */ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { - DWORD retval; + SIZE_T retval; PGLOBAL32_INTERN pintern; if (!((ULONG_PTR)hmem >> 16)) @@ -821,10 +821,10 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { retval=HeapSize(GetProcessHeap(), 0, hmem); - if (retval == (DWORD)-1) /* It might be a GMEM_MOVEABLE data pointer */ + if (retval == ~0ul) /* It might be a GMEM_MOVEABLE data pointer */ { - retval = HeapSize(GetProcessHeap(), 0, (char*)(hmem) - HGLOBAL_STORAGE); - if (retval != (DWORD)-1) retval -= HGLOBAL_STORAGE; + retval = HeapSize(GetProcessHeap(), 0, (char*)hmem - HGLOBAL_STORAGE); + if (retval != ~0ul) retval -= HGLOBAL_STORAGE; } } else @@ -838,9 +838,8 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) retval = 0; else { - retval = HeapSize(GetProcessHeap(), 0, - (char *)(pintern->Pointer) - HGLOBAL_STORAGE ); - if (retval != (DWORD)-1) retval -= HGLOBAL_STORAGE; + retval = HeapSize(GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); + if (retval != ~0ul) retval -= HGLOBAL_STORAGE; } } else @@ -851,8 +850,7 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) } RtlUnlockHeap(GetProcessHeap()); } - /* HeapSize returns 0xffffffff on failure */ - if (retval == 0xffffffff) retval = 0; + if (retval == ~0ul) retval = 0; return retval; }

1 0

David Hedberg : kernel32: GlobalSize() should also work with GMEM_MOVEABLE data pointers received from GlobalLock ().
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: fed025fd42b642ae86189f329043969599ed6501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed025fd42b642ae86189f329… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Jun 13 08:22:15 2011 +0200 kernel32: GlobalSize() should also work with GMEM_MOVEABLE data pointers received from GlobalLock(). --- dlls/kernel32/heap.c | 6 ++++++ dlls/kernel32/tests/heap.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 7be9172..4ade995 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -820,6 +820,12 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) if(ISPOINTER(hmem)) { retval=HeapSize(GetProcessHeap(), 0, hmem); + + if (retval == (DWORD)-1) /* It might be a GMEM_MOVEABLE data pointer */ + { + retval = HeapSize(GetProcessHeap(), 0, (char*)(hmem) - HGLOBAL_STORAGE); + if (retval != (DWORD)-1) retval -= HGLOBAL_STORAGE; + } } else { diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f7ac478..26bc58f 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -85,7 +85,7 @@ static void test_heap(void) UINT flags; HGLOBAL gbl; HGLOBAL hsecond; - SIZE_T size; + SIZE_T size, size2; /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -403,6 +403,36 @@ static void test_heap(void) "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); GlobalFree(gbl); + + /* trying to get size from data pointer (GMEM_MOVEABLE) */ + gbl = GlobalAlloc(GMEM_MOVEABLE, 0x123); + ok(gbl != NULL, "returned NULL\n"); + mem = GlobalLock(gbl); + ok(mem != NULL, "returned NULL.\n"); + ok(gbl != mem, "unexpectedly equal.\n"); + + size = GlobalSize(gbl); + size2 = GlobalSize(mem); + ok(size == 0x123, "got %lu\n", size); + ok(size2 == 0x123, "got %lu\n", size2); + + GlobalFree(gbl); + + /* trying to get size from data pointer (GMEM_FIXED) */ + gbl = GlobalAlloc(GMEM_FIXED, 0x123); + ok(gbl != NULL, "returned NULL\n"); + mem = GlobalLock(gbl); + ok(mem != NULL, "returned NULL.\n"); + ok(gbl == mem, "got %p, %p.\n", gbl, mem); + + size = GlobalSize(gbl); + ok(size == 0x123, "got %lu\n", size); + + GlobalFree(gbl); + + size = GlobalSize((void *)0xdeadbee0); + ok(size == 0, "got %lu\n", size); + } static void test_obsolete_flags(void)

1 0

Alexandre Goujon : winenas.drv: Avoid a warning in a trace on x86_64.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 43c648ecdc595a59abece282c5db178ede931f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c648ecdc595a59abece282c… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sat Jun 11 14:30:29 2011 +0200 winenas.drv: Avoid a warning in a trace on x86_64. --- dlls/winenas.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index a5768fa..4b63ea1 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -1360,7 +1360,7 @@ event_handler(AuServer* aud, AuEvent* ev, AuEventHandlerRec* hnd) nas_state(event->prev_state), nas_state(event->cur_state), nas_reason(event->reason), - event->num_bytes, wwo->freeBytes); + (long)event->num_bytes, wwo->freeBytes); if (event->cur_state == AuStatePause && event->reason != AuReasonUser) { wwo->freeBytes += event->num_bytes;

1 0

Francois Gouget : comdlg32: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 7777d61ff4f504f2ba1d34860970cad342ded345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7777d61ff4f504f2ba1d34860… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:50 2011 +0200 comdlg32: Add a trailing '\n' to a TRACE() call. --- dlls/comdlg32/itemdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 354e952..bc309c9 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -993,7 +993,7 @@ static LRESULT ctrl_container_on_create(HWND hwnd, CREATESTRUCTW *crs) static LRESULT ctrl_container_on_wm_destroy(FileDialogImpl *This) { customctrl *cur1, *cur2; - TRACE("%p", This); + TRACE("%p\n", This); LIST_FOR_EACH_ENTRY_SAFE(cur1, cur2, &This->cctrls, customctrl, entry) {

1 0

Francois Gouget : d3dx9_36/tests: Add a '\n' to a trace() call.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 07436dd465a84dbff7a64a7f07d8cb4a1957be5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07436dd465a84dbff7a64a7f0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:44 2011 +0200 d3dx9_36/tests: Add a '\n' to a trace() call. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 9b924fd..668097f 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1855,7 +1855,7 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllo } else { ok(mesh_data->Type == D3DXMESHTYPE_PATCHMESH, "Unknown mesh type %u\n", mesh_data->Type); if (mesh_data->Type == D3DXMESHTYPE_PATCHMESH) - trace("FIXME: copying adjacency data for patch mesh not implemented"); + trace("FIXME: copying adjacency data for patch mesh not implemented\n"); } }

1 0

Francois Gouget : d3dxof: Make read_bytes() static.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: bb658848c060377e4adc07bf0dfe8804a58349b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb658848c060377e4adc07bf0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:34 2011 +0200 d3dxof: Make read_bytes() static. --- dlls/d3dxof/d3dxof_private.h | 1 - dlls/d3dxof/parsing.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 40870ac..186e707 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -162,7 +162,6 @@ typedef struct { HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) DECLSPEC_HIDDEN; HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr) DECLSPEC_HIDDEN; BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; BOOL parse_templates(parse_buffer * buf) DECLSPEC_HIDDEN; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 4d72219..cbf1761 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -166,7 +166,7 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) DPRINTF("}\n"); } -BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) +static BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) { if (buf->rem_bytes < size) return FALSE;

1 0

Francois Gouget : ddraw: Make unsafe_impl_from_IDirectDrawSurface{2, 3}() static.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 9c99738780c6aeefbdc9e79fe8b49226130e313d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c99738780c6aeefbdc9e79fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:25 2011 +0200 ddraw: Make unsafe_impl_from_IDirectDrawSurface{2,3}() static. --- dlls/ddraw/ddraw_private.h | 2 -- dlls/ddraw/surface.c | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index cfea63e..42c1f13 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -249,8 +249,6 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface7(IDirectDrawS } IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) DECLSPEC_HIDDEN; -IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface) DECLSPEC_HIDDEN; -IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0d0220f..504e107 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -31,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface); +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); + static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawGammaControl(IDirectDrawGammaControl *iface) { return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawGammaControl_iface); @@ -4813,14 +4816,14 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface4_iface); } -IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &ddraw_surface3_vtbl); return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); } -IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface) +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &ddraw_surface2_vtbl);

1 0

Francois Gouget : oleaut32: Fix a typo in a documentation comment.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 30664aa0917b2cbe3a1a3a7909c531727de352d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30664aa0917b2cbe3a1a3a790… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:05 2011 +0200 oleaut32: Fix a typo in a documentation comment. --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2d4d4e3..2b1307e 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -1655,7 +1655,7 @@ HRESULT WINAPI VarI4FromBool(VARIANT_BOOL boolIn, LONG *piOut) /************************************************************************ * VarI4FromI1 (OLEAUT32.209) * - * Convert a VT_I4 to a VT_I4. + * Convert a VT_I1 to a VT_I4. * * PARAMS * cIn [I] Source

1 0

Austin English : shdocvw: Add a stub for RunInstallUninstallStubs2.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 830c2bde1880c5b2fbc48c06eaa8a4ae0249c82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=830c2bde1880c5b2fbc48c06e… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jun 11 13:12:26 2011 -0500 shdocvw: Add a stub for RunInstallUninstallStubs2. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index be59d85..672c7fa 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -20,7 +20,7 @@ 123 stdcall -noname StopWatchAFORWARD(long str long long long) 124 stdcall -noname StopWatchWFORWARD(long wstr long long long) 125 stdcall -noname RunInstallUninstallStubs() -130 stub -noname RunInstallUninstallStubs2 +130 stdcall -noname RunInstallUninstallStubs2() 131 stub -noname SHCreateSplashScreen 135 stub -noname IsFileUrl 136 stub -noname IsFileUrlW diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 4386ddc..9bf2fa7 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -210,6 +210,17 @@ DWORD WINAPI RunInstallUninstallStubs(void) } /*********************************************************************** + * @ (SHDOCVW.130) + * + * Called by Emerge Desktop (alternative Windows Shell). + */ +DWORD WINAPI RunInstallUninstallStubs2(void) +{ + FIXME("(), stub!\n"); + return 0x0deadbee; +} + +/*********************************************************************** * SetQueryNetSessionCount (SHDOCVW.@) */ DWORD WINAPI SetQueryNetSessionCount(DWORD arg)

1 0

Marcus Meissner : d3dx9_36: Moved param NULL a bit forward (Coverity).
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 6c902b4201b8237195ef492dae2be70c70793612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c902b4201b8237195ef492da… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 11 11:00:33 2011 +0200 d3dx9_36: Moved param NULL a bit forward (Coverity). --- dlls/d3dx9_36/effect.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bbe21f0..ca88f76 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1516,6 +1516,11 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH TRACE("iface %p, parameter %p, data %p, bytes %u\n", This, parameter, data, bytes); if (!param) param = get_parameter_by_name(This, NULL, parameter); + if (!param) + { + WARN("Invalid parameter %p specified\n", parameter); + return D3DERR_INVALIDCALL; + } /* samplers don't touch data */ if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER @@ -1526,7 +1531,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH return E_FAIL; } - if (data && param && param->bytes <= bytes) + if (data && param->bytes <= bytes) { TRACE("Type %s\n", debug_d3dxparameter_type(param->type));

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011