wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Marcin Baczyński : gdiplus: Add missing declarations for gdiplus.c.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 46686d770e8ca1842c2f40267a5d13539ce47ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46686d770e8ca1842c2f40267… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Wed Dec 9 01:08:44 2009 +0100 gdiplus: Add missing declarations for gdiplus.c. --- include/gdiplusflat.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4aed5d3..7c4fa70 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -528,6 +528,10 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream*,MetafileHeader*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE,GDIPCONST WmfPlaceableFileHeader*,MetafileHeader*); +/* Notification */ +GpStatus WINAPI GdiplusNotificationHook(ULONG_PTR*); +void WINAPI GdiplusNotificationUnhook(ULONG_PTR); + /* PathGradientBrush */ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF*,INT,GpWrapMode,GpPathGradient**); GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint*,INT,GpWrapMode,GpPathGradient**);

1 0

Juan Lang : inetmib1: Copy an IP net row' s physical address using a type-specific helper function, rather than using a generic helper function which made an invalid alignment assumption .
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 960a1a9ab7c7f8841fe0db72356823206e970cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960a1a9ab7c7f8841fe0db723… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 7 13:37:29 2009 -0800 inetmib1: Copy an IP net row's physical address using a type-specific helper function, rather than using a generic helper function which made an invalid alignment assumption. --- dlls/inetmib1/main.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index f11bc3b..9aef4d5 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -50,14 +50,6 @@ static void setStringValue(AsnAny *value, BYTE type, DWORD len, BYTE *str) SnmpUtilAsnAnyCpy(value, &strValue); } -static DWORD copyLengthPrecededString(AsnAny *value, void *src) -{ - DWORD len = *(DWORD *)src; - - setStringValue(value, ASN_OCTETSTRING, len, (BYTE *)src + sizeof(DWORD)); - return SNMP_ERRORSTATUS_NOERROR; -} - typedef DWORD (*copyValueFunc)(AsnAny *value, void *src); struct structToAsnValue @@ -919,9 +911,18 @@ static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, static UINT mib2IpNet[] = { 1,3,6,1,2,1,4,22,1 }; static PMIB_IPNETTABLE ipNetTable; +static DWORD copyIpNetPhysAddr(AsnAny *value, void *src) +{ + PMIB_IPNETROW row = (PMIB_IPNETROW)((BYTE *)src - FIELD_OFFSET(MIB_IPNETROW, + dwPhysAddrLen)); + + setStringValue(value, ASN_OCTETSTRING, row->dwPhysAddrLen, row->bPhysAddr); + return SNMP_ERRORSTATUS_NOERROR; +} + static struct structToAsnValue mib2IpNetMap[] = { { FIELD_OFFSET(MIB_IPNETROW, dwIndex), copyInt }, - { FIELD_OFFSET(MIB_IPNETROW, dwPhysAddrLen), copyLengthPrecededString }, + { FIELD_OFFSET(MIB_IPNETROW, dwPhysAddrLen), copyIpNetPhysAddr }, { FIELD_OFFSET(MIB_IPNETROW, dwAddr), copyIpAddr }, { FIELD_OFFSET(MIB_IPNETROW, dwType), copyInt }, };

1 0

Juan Lang : inetmib1: Return SNMP_ERRORSTATUS_NOSUCHNAME for an interface' s description if it has none.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 950202a59bf3f7003ee5bea1c7e622ce8b66bd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950202a59bf3f7003ee5bea1c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 7 13:32:57 2009 -0800 inetmib1: Return SNMP_ERRORSTATUS_NOSUCHNAME for an interface's description if it has none. --- dlls/inetmib1/main.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 2a5f97a..f11bc3b 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -553,6 +553,22 @@ static INT setOidWithItemAndInteger(AsnObjectIdentifier *dst, return ret; } +static DWORD copyIfRowDescr(AsnAny *value, void *src) +{ + PMIB_IFROW row = (PMIB_IFROW)((BYTE *)src - + FIELD_OFFSET(MIB_IFROW, dwDescrLen)); + DWORD ret; + + if (row->dwDescrLen) + { + setStringValue(value, ASN_OCTETSTRING, row->dwDescrLen, row->bDescr); + ret = SNMP_ERRORSTATUS_NOERROR; + } + else + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + return ret; +} + static DWORD copyIfRowPhysAddr(AsnAny *value, void *src) { PMIB_IFROW row = (PMIB_IFROW)((BYTE *)src - @@ -572,7 +588,7 @@ static DWORD copyIfRowPhysAddr(AsnAny *value, void *src) static struct structToAsnValue mib2IfEntryMap[] = { { FIELD_OFFSET(MIB_IFROW, dwIndex), copyInt }, - { FIELD_OFFSET(MIB_IFROW, dwDescrLen), copyLengthPrecededString }, + { FIELD_OFFSET(MIB_IFROW, dwDescrLen), copyIfRowDescr }, { FIELD_OFFSET(MIB_IFROW, dwType), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwMtu), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwSpeed), copyInt },

1 0

Alexandre Julliard : msvcrt/tests: Fix the signal handler calling convention.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: da9bc130c67138a37f56f35b8b86f2c02f6a3586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9bc130c67138a37f56f35b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:41 2009 +0100 msvcrt/tests: Fix the signal handler calling convention. --- dlls/msvcrt/tests/signal.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/signal.c b/dlls/msvcrt/tests/signal.c index b2c16d5..d33498b 100644 --- a/dlls/msvcrt/tests/signal.c +++ b/dlls/msvcrt/tests/signal.c @@ -24,16 +24,14 @@ static int test_value = 0; -typedef void (sighandler_type)(int); - -static void sighandler(int signum) +static void __cdecl sighandler(int signum) { ++test_value; } static void test_signal(void) { - sighandler_type *old; + void (__cdecl *old)(int); int res; old = signal(SIGBREAK, sighandler);

1 0

Alexandre Julliard : d3d9/tests: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 506a62776c4b3246cb6a043fff834920bd5475ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=506a62776c4b3246cb6a043ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:27 2009 +0100 d3d9/tests: Fix some pointer cast warnings on 64-bit. --- dlls/d3d9/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index f580062..9430ab2 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1974,7 +1974,7 @@ static void resource_test_data_init(IDirect3DDevice9 *device, static void resource_poison_data_init(struct resource_test_data *data, const struct resource_test_arg *arg) { - DWORD poison = 0xdeadbeef; + DWORD_PTR poison = 0xdeadbeef; unsigned int i; data->decl = (IDirect3DVertexDeclaration9 *)poison++;

1 0

Alexandre Julliard : d3d8/tests: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 6062679b086a172f1726dd6702f535aa735d3980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6062679b086a172f1726dd670… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:22 2009 +0100 d3d8/tests: Fix some pointer cast warnings on 64-bit. --- dlls/d3d8/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 630c4de..33cc56d 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1745,7 +1745,7 @@ static void resource_test_data_init(IDirect3DDevice8 *device, static void resource_poison_data_init(struct resource_test_data *data, const struct resource_test_arg *arg) { - DWORD poison = 0xdeadbeef; + DWORD_PTR poison = 0xdeadbeef; unsigned int i; data->vs = poison++;

1 0

Alexandre Julliard : uxtheme: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: de3e06a745e38df5d04ade13fb95e62dc4082f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3e06a745e38df5d04ade13f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:08 2009 +0100 uxtheme: Fix some pointer cast warnings on 64-bit. --- dlls/uxtheme/draw.c | 5 ++--- dlls/uxtheme/system.c | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 9e22025..17900f8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -56,7 +56,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) TRACE("(%p,0x%08x\n", hwnd, dwFlags); res = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), - (HANDLE)(dwFlags|0x80000000)); + UlongToHandle(dwFlags|0x80000000)); /* 0x80000000 serves as a "flags set" flag */ if (!res) return HRESULT_FROM_WIN32(GetLastError()); @@ -74,8 +74,7 @@ BOOL WINAPI IsThemeDialogTextureEnabled(HWND hwnd) DWORD dwDialogTextureFlags; TRACE("(%p)\n", hwnd); - dwDialogTextureFlags = (DWORD)GetPropW (hwnd, - (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled)); + dwDialogTextureFlags = HandleToUlong( GetPropW( hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled) )); if (dwDialogTextureFlags == 0) /* Means EnableThemeDialogTexture wasn't called for this dialog */ return TRUE; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 2839539..b84e978 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -393,8 +393,7 @@ static void UXTHEME_RestoreSystemMetrics(void) if (RegQueryValueExW (hKey, bsp->keyName, 0, &type, (LPBYTE)&value, &count) == ERROR_SUCCESS) { - SystemParametersInfoW (bsp->spiSet, 0, (LPVOID)value, - SPIF_UPDATEINIFILE); + SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); } bsp++; @@ -445,9 +444,7 @@ static void UXTHEME_SaveSystemMetrics(void) DWORD value; SystemParametersInfoW (bsp->spiGet, 0, &value, 0); - SystemParametersInfoW (bsp->spiSet, 0, (LPVOID)value, - SPIF_UPDATEINIFILE); - + SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); bsp++; }

1 0

Alexandre Julliard : ole32: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 44a9bae9f8f97180f26501dcc6d59e9f73f63fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a9bae9f8f97180f26501dcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:01 2009 +0100 ole32: Fix some pointer cast warnings on 64-bit. --- dlls/ole32/compobj.c | 8 +++----- dlls/ole32/rpc.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 58e8f0d..583a9cb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2062,6 +2062,7 @@ HRESULT WINAPI CoRegisterClassObject( DWORD flags, LPDWORD lpdwRegister) { + static LONG next_cookie; RegisteredClass* newClass; LPUNKNOWN foundObject; HRESULT hr; @@ -2115,11 +2116,8 @@ HRESULT WINAPI CoRegisterClassObject( newClass->pMarshaledData = NULL; newClass->RpcRegistration = NULL; - /* - * Use the address of the chain node as the cookie since we are sure it's - * unique. FIXME: not on 64-bit platforms. - */ - newClass->dwCookie = (DWORD)newClass; + if (!(newClass->dwCookie = InterlockedIncrement( &next_cookie ))) + newClass->dwCookie = InterlockedIncrement( &next_cookie ); /* * Since we're making a copy of the object pointer, we have to increase its diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 9a34465..0daa4ab 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1358,7 +1358,7 @@ void RPC_ExecuteCall(struct dispatch_params *params) handlecall = IMessageFilter_HandleInComingCall(COM_CurrentApt()->filter, calltype, - (HTASK)GetCurrentProcessId(), + UlongToHandle(GetCurrentProcessId()), 0 /* FIXME */, &interface_info); TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall);

1 0

Marcus Meissner : dbghelp: Add a missing NULL check (Coverity).
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 30c1df4a087c3e8794a848b83960df7aa8a796a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c1df4a087c3e8794a848b83… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Dec 9 00:01:29 2009 +0100 dbghelp: Add a missing NULL check (Coverity). --- dlls/dbghelp/symbol.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c322a62..c266ce2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1034,6 +1034,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Mask, regex_t mod_regex, sym_regex; pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; if (BaseOfDll == 0) { /* do local variables ? */

1 0

Vincent Povirk : ole32: Add an attribute to StorageBaseImpl to track its reverted status.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: df0ef756b3be9da2a868137a8ece05664c9af901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0ef756b3be9da2a868137a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 30 17:07:37 2009 -0600 ole32: Add an attribute to StorageBaseImpl to track its reverted status. --- dlls/ole32/storage32.c | 28 ++++++++++++++++++---------- dlls/ole32/storage32.h | 5 +++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c39915e..266d677 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -425,7 +425,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( goto end; } - if (!This->ancestorStorage) + if (This->reverted) { res = STG_E_REVERTED; goto end; @@ -553,7 +553,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( goto end; } - if (!This->ancestorStorage) + if (This->reverted) return STG_E_REVERTED; /* @@ -638,7 +638,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( if ( (This==0) || (ppenum==0)) return E_INVALIDARG; - if (!This->ancestorStorage) + if (This->reverted) return STG_E_REVERTED; newEnum = IEnumSTATSTGImpl_Construct( @@ -682,7 +682,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( goto end; } - if (!This->ancestorStorage) + if (This->reverted) { res = STG_E_REVERTED; goto end; @@ -733,7 +733,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( TRACE("(%p, %s, %s)\n", iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName)); - if (!This->ancestorStorage) + if (This->reverted) return STG_E_REVERTED; currentEntryRef = findElement(This->ancestorStorage, @@ -830,7 +830,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( if (STGM_SHARE_MODE(grfMode) != STGM_SHARE_EXCLUSIVE) return STG_E_INVALIDFLAG; - if (!This->ancestorStorage) + if (This->reverted) return STG_E_REVERTED; /* @@ -959,7 +959,7 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( TRACE("(%p, %p)\n", iface, clsid); - if (!This->ancestorStorage) + if (This->reverted) return STG_E_REVERTED; hRes = StorageBaseImpl_ReadDirEntry(This, @@ -1028,7 +1028,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( return STG_E_INVALIDFLAG; } - if (!This->ancestorStorage) + if (This->reverted) return STG_E_REVERTED; /* @@ -1772,7 +1772,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( if (pwcsName==NULL) return STG_E_INVALIDPOINTER; - if (!This->ancestorStorage) + if (This->reverted) return STG_E_REVERTED; if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) @@ -2173,7 +2173,7 @@ static HRESULT WINAPI StorageBaseImpl_SetStateBits( { StorageBaseImpl* const This = (StorageBaseImpl*)iface; - if (!This->ancestorStorage) + if (This->reverted) return STG_E_REVERTED; This->stateBits = (This->stateBits & ~grfMask) | (grfStateBits & grfMask); @@ -2465,6 +2465,8 @@ static HRESULT StorageImpl_Construct( */ This->base.ancestorStorage = This; + This->base.reverted = 0; + This->hFile = hFile; if(pwcsName) { @@ -3826,6 +3828,10 @@ static void StorageInternalImpl_Invalidate( StorageInternalImpl *This ) This->base.ancestorStorage = NULL; + This->base.reverted = 1; + + This->parentStorage = NULL; + StorageBaseImpl_DeleteAll(&This->base); list_remove(&This->ParentListEntry); @@ -4387,6 +4393,8 @@ static StorageInternalImpl* StorageInternalImpl_Construct( */ newStorage->base.ancestorStorage = parentStorage->ancestorStorage; + newStorage->base.reverted = 0; + newStorage->parentStorage = parentStorage; /* diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index ba4288d..ff526bf 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -219,6 +219,11 @@ struct StorageBaseImpl StorageImpl* ancestorStorage; /* + * TRUE if this object has been invalidated + */ + int reverted; + + /* * Index of the directory entry of this storage */ DirRef storageDirEntry;

1 0

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 December 2009