wine-commits January 2009

wine-commits@winehq.org

3 participants
1348 discussions

Juan Lang : crypt32: Implement CertFindCertificateInStore for CERT_FIND_PUBLIC_KEY.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: bf0406cf3a2f9450983e4b48537dfe9f12fdf707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0406cf3a2f9450983e4b485… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 27 09:00:40 2009 -0800 crypt32: Implement CertFindCertificateInStore for CERT_FIND_PUBLIC_KEY. --- dlls/crypt32/cert.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 3d2b3de..5c2c786 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -966,6 +966,17 @@ static BOOL compare_cert_by_name(PCCERT_CONTEXT pCertContext, DWORD dwType, return ret; } +static BOOL compare_cert_by_public_key(PCCERT_CONTEXT pCertContext, + DWORD dwType, DWORD dwFlags, const void *pvPara) +{ + CERT_PUBLIC_KEY_INFO *publicKey = (CERT_PUBLIC_KEY_INFO *)pvPara; + BOOL ret; + + ret = CertComparePublicKeyInfo(pCertContext->dwCertEncodingType, + &pCertContext->pCertInfo->SubjectPublicKeyInfo, publicKey); + return ret; +} + static BOOL compare_cert_by_subject_cert(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { @@ -1201,6 +1212,9 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_NAME: compare = compare_cert_by_name; break; + case CERT_COMPARE_PUBLIC_KEY: + compare = compare_cert_by_public_key; + break; case CERT_COMPARE_SUBJECT_CERT: compare = compare_cert_by_subject_cert; break;

1 0

Juan Lang : crypt32: Add stub for PFXImportCertStore.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 3ae5e99cbada243f63670571343d803c4445e858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae5e99cbada243f636705713… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 27 09:00:25 2009 -0800 crypt32: Add stub for PFXImportCertStore. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/decode.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 3f5db87..ea2b6fa 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -218,7 +218,7 @@ @ stub I_CryptUninstallOssGlobal @ stdcall PFXExportCertStore(ptr ptr ptr long) @ stdcall PFXExportCertStoreEx(ptr ptr ptr ptr long) -@ stub PFXImportCertStore +@ stdcall PFXImportCertStore(ptr ptr long) @ stdcall PFXIsPFXBlob(ptr) @ stub RegCreateHKCUKeyExU @ stub RegCreateKeyExU diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index bc0ee17..f353131 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5546,3 +5546,10 @@ BOOL WINAPI PFXIsPFXBlob(CRYPT_DATA_BLOB *pPFX) ret = FALSE; return ret; } + +HCERTSTORE WINAPI PFXImportCertStore(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, + DWORD dwFlags) +{ + FIXME("(%p, %p, %08x): stub\n", pPFX, szPassword, dwFlags); + return NULL; +}

1 0

Juan Lang : crypt32: Implement PFXIsPFXBlob.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 2ffc042ebf50351a8bb02dbedf2d9d032b5a8382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffc042ebf50351a8bb02dbed… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 27 09:00:03 2009 -0800 crypt32: Implement PFXIsPFXBlob. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/decode.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index fcffab2..3f5db87 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -219,6 +219,7 @@ @ stdcall PFXExportCertStore(ptr ptr ptr long) @ stdcall PFXExportCertStoreEx(ptr ptr ptr ptr long) @ stub PFXImportCertStore +@ stdcall PFXIsPFXBlob(ptr) @ stub RegCreateHKCUKeyExU @ stub RegCreateKeyExU @ stub RegDeleteValueU diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d917d9b..bc0ee17 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5511,3 +5511,38 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, TRACE_(crypt)("returning %d\n", ret); return ret; } + +BOOL WINAPI PFXIsPFXBlob(CRYPT_DATA_BLOB *pPFX) +{ + BOOL ret; + + TRACE("(%p)\n", pPFX); + + /* A PFX blob is an asn.1-encoded sequence, consisting of at least a + * version integer of length 1 (3 encoded byes) and at least one other + * datum (two encoded bytes), plus at least two bytes for the outer + * sequence. Thus, even an empty PFX blob is at least 7 bytes in length. + */ + if (pPFX->cbData < 7) + ret = FALSE; + else if (pPFX->pbData[0] == ASN_SEQUENCE) + { + DWORD len; + + if ((ret = CRYPT_GetLengthIndefinite(pPFX->pbData, pPFX->cbData, &len))) + { + BYTE lenLen = GET_LEN_BYTES(pPFX->pbData[1]); + + /* Need at least three bytes for the integer version */ + if (pPFX->cbData < 1 + lenLen + 3) + ret = FALSE; + else if (pPFX->pbData[1 + lenLen] != ASN_INTEGER || /* Tag */ + pPFX->pbData[1 + lenLen + 1] != 1 || /* Definite length */ + pPFX->pbData[1 + lenLen + 2] != 3) /* PFX version */ + ret = FALSE; + } + } + else + ret = FALSE; + return ret; +}

1 0

Juan Lang : crypt32: Implement PFXExportCertStore on top of PFXExportCertStoreEx.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 7127985641023e427866b087a009ca565dcf4ee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7127985641023e427866b087a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 27 08:55:45 2009 -0800 crypt32: Implement PFXExportCertStore on top of PFXExportCertStoreEx. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/encode.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index bc80b64..fcffab2 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -216,7 +216,7 @@ @ stdcall I_CryptSetTls(long ptr) @ stdcall I_CryptUninstallAsn1Module(long) @ stub I_CryptUninstallOssGlobal -@ stub PFXExportCertStore +@ stdcall PFXExportCertStore(ptr ptr ptr long) @ stdcall PFXExportCertStoreEx(ptr ptr ptr ptr long) @ stub PFXImportCertStore @ stub RegCreateHKCUKeyExU diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 3abc7c9..14d193f 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4499,6 +4499,12 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, return ret; } +BOOL WINAPI PFXExportCertStore(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, + LPCWSTR szPassword, DWORD dwFlags) +{ + return PFXExportCertStoreEx(hStore, pPFX, szPassword, NULL, dwFlags); +} + BOOL WINAPI PFXExportCertStoreEx(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, void *pvReserved, DWORD dwFlags) {

1 0

Juan Lang : crypt32: Add stub for PFXExportCertStoreEx.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 6e32746f6ec6a47b4f6d1267cb724a25e98fc65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e32746f6ec6a47b4f6d1267c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 27 08:55:30 2009 -0800 crypt32: Add stub for PFXExportCertStoreEx. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/encode.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 3f9ac98..bc80b64 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -217,6 +217,7 @@ @ stdcall I_CryptUninstallAsn1Module(long) @ stub I_CryptUninstallOssGlobal @ stub PFXExportCertStore +@ stdcall PFXExportCertStoreEx(ptr ptr ptr ptr long) @ stub PFXImportCertStore @ stub RegCreateHKCUKeyExU @ stub RegCreateKeyExU diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 277be83..3abc7c9 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4499,6 +4499,14 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, return ret; } +BOOL WINAPI PFXExportCertStoreEx(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, + LPCWSTR szPassword, void *pvReserved, DWORD dwFlags) +{ + FIXME_(crypt)("(%p, %p, %p, %p, %08x): stub\n", hStore, pPFX, szPassword, + pvReserved, dwFlags); + return FALSE; +} + BOOL WINAPI CryptExportPublicKeyInfo(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWORD dwKeySpec, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, DWORD *pcbInfo) {

1 0

Juan Lang : include: Add PFX definitions.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: f2ee8242a2ca2426d934abc9e1e4d7ff47a64945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ee8242a2ca2426d934abc9e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 27 08:55:15 2009 -0800 include: Add PFX definitions. --- include/wincrypt.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 1594bbd..a24a99e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3769,6 +3769,15 @@ typedef struct _CMSG_CMS_RECIPIENT_INFO { #define CMSG_ENCODED_SORTED_CTL_FLAG 0x1 #define CMSG_ENCODE_HASHED_SUBJECT_IDENTIFIER_FLAG 0x2 +/* PFXImportCertStore flags */ +#define CRYPT_USER_KEYSET 0x00001000 +#define PKCS12_IMPORT_RESERVED_MASK 0xffff0000 +/* PFXExportCertStore flags */ +#define REPORT_NO_PRIVATE_KEY 0x00000001 +#define REPORT_NOT_ABLE_TO_EXPORT_PRIVATE_KEY 0x00000002 +#define EXPORT_PRIVATE_KEYS 0x00000004 +#define PKCS12_EXPORT_RESERVED_MASK 0xffff0000 + /* function declarations */ /* advapi32.dll */ WINADVAPI BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD); @@ -4389,6 +4398,17 @@ BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, const BYTE *rgpbToBeHashed[], DWORD rgcbToBeHashed[], BYTE *pbComputedHash, DWORD *pcbComputedHash); +/* PFX functions */ +HCERTSTORE WINAPI PFXImportCertStore(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, + DWORD dwFlags); +BOOL WINAPI PFXIsPFXBlob(CRYPT_DATA_BLOB *pPFX); +BOOL WINAPI PFXVerifyPassword(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, + DWORD dwFlags); +BOOL WINAPI PFXExportCertStoreEx(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, + LPCWSTR szPassword, void *pvReserved, DWORD dwFlags); +BOOL WINAPI PFXExportCertStore(HCERTSTORE hStore, CRYPT_DATA_BLOB *pPFX, + LPCWSTR szPassword, DWORD dwFlags); + /* cryptnet.dll functions */ BOOL WINAPI CryptCancelAsyncRetrieval(HCRYPTASYNC hAsyncRetrieval);

1 0

Juan Lang : include: Add a few definitions.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: a53537d66d99f8e02a33fa7f0a09a809a868c960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53537d66d99f8e02a33fa7f0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 27 08:54:58 2009 -0800 include: Add a few definitions. --- include/wincrypt.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index f574997..1594bbd 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1957,6 +1957,9 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' #define CRYPT_READ 0x0008 #define CRYPT_WRITE 0x0010 #define CRYPT_MAC 0x0020 +#define CRYPT_EXPORT_KEY 0x0040 +#define CRYPT_IMPORT_KEY 0x0080 +#define CRYPT_ARCHIVE 0x0100 /* Crypt*Key */ #define CRYPT_EXPORTABLE 0x00000001

1 0

Hans Leidekker : wuapi: Add class factory for CLSID_AutomaticUpdates.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: ecb5bdf9013ad101ae8b47a29c546437d3a8fc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb5bdf9013ad101ae8b47a29… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 27 16:14:15 2009 +0100 wuapi: Add class factory for CLSID_AutomaticUpdates. --- dlls/wuapi/main.c | 12 +++++++++--- dlls/wuapi/regsvr.c | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index 18a86bc..d8d6fcb 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -111,7 +111,8 @@ static const struct IClassFactoryVtbl wucf_vtbl = wucf_LockServer }; -static wucf updatecf = { &wucf_vtbl, UpdateSession_create }; +static wucf sessioncf = { &wucf_vtbl, UpdateSession_create }; +static wucf updatescf = { &wucf_vtbl, AutomaticUpdates_create }; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) { @@ -135,8 +136,13 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); if (IsEqualGUID( rclsid, &CLSID_UpdateSession )) - cf = (IClassFactory *)&updatecf.vtbl; - + { + cf = (IClassFactory *)&sessioncf.vtbl; + } + else if (IsEqualGUID( rclsid, &CLSID_AutomaticUpdates )) + { + cf = (IClassFactory *)&updatescf.vtbl; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); } diff --git a/dlls/wuapi/regsvr.c b/dlls/wuapi/regsvr.c index 875902c..10d3974 100644 --- a/dlls/wuapi/regsvr.c +++ b/dlls/wuapi/regsvr.c @@ -383,6 +383,12 @@ static struct regsvr_coclass const coclass_list[] = { "wuapi.dll", "Both" }, + { &CLSID_AutomaticUpdates, + "CLSID_AutomaticUpdates", + NULL, + "wuapi.dll", + "Both" + }, { NULL } /* list terminator */ };

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the GetObjectA/W methods for GDI objects.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 68d19b9552ad7b24671124e20d78ae801b9931ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d19b9552ad7b24671124e20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 27 16:30:43 2009 +0100 gdi32: Don't hold the GDI lock while calling the GetObjectA/W methods for GDI objects. --- dlls/gdi32/bitmap.c | 22 ++++++++++------- dlls/gdi32/brush.c | 19 ++++++++------ dlls/gdi32/font.c | 40 +++++++++++++++++++------------ dlls/gdi32/gdi_private.h | 4 +- dlls/gdi32/gdiobj.c | 17 ++++++++---- dlls/gdi32/palette.c | 18 ++++++++----- dlls/gdi32/pen.c | 58 ++++++++++++++++++++++----------------------- 7 files changed, 100 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68d19b9552ad7b2467112…

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the UnrealizeObject method for GDI objects .
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 9ff44b815b956aa228a63dfe48a224ed6c212dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff44b815b956aa228a63dfe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 27 16:26:35 2009 +0100 gdi32: Don't hold the GDI lock while calling the UnrealizeObject method for GDI objects. --- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 21 ++++++++++----------- dlls/gdi32/palette.c | 22 +++++++++++----------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b5cb04c..9cb3796 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -74,7 +74,7 @@ struct gdi_obj_funcs HGDIOBJ (*pSelectObject)( HGDIOBJ handle, HDC hdc ); INT (*pGetObjectA)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); INT (*pGetObjectW)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); - BOOL (*pUnrealizeObject)( HGDIOBJ handle, void *obj ); + BOOL (*pUnrealizeObject)( HGDIOBJ handle ); BOOL (*pDeleteObject)( HGDIOBJ handle ); }; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 77cb23f..080632a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1145,20 +1145,19 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) */ BOOL WINAPI UnrealizeObject( HGDIOBJ obj ) { - BOOL result = TRUE; - /* Check if object is valid */ - + BOOL result = FALSE; GDIOBJHDR * header = GDI_GetObjPtr( obj, MAGIC_DONTCARE ); - if (!header) return FALSE; - - TRACE("%p\n", obj ); - /* Unrealize object */ - - if (header->funcs && header->funcs->pUnrealizeObject) - result = header->funcs->pUnrealizeObject( obj, header ); + if (header) + { + const struct gdi_obj_funcs *funcs = header->funcs; - GDI_ReleaseObj( obj ); + GDI_ReleaseObj( obj ); + if (funcs && funcs->pUnrealizeObject) + result = header->funcs->pUnrealizeObject( obj ); + else + result = TRUE; + } return result; } diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index c184862..35f6f71 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -46,7 +46,7 @@ typedef struct tagPALETTEOBJ } PALETTEOBJ; static INT PALETTE_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); -static BOOL PALETTE_UnrealizeObject( HGDIOBJ handle, void *obj ); +static BOOL PALETTE_UnrealizeObject( HGDIOBJ handle ); static BOOL PALETTE_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs palette_funcs = @@ -374,12 +374,11 @@ BOOL WINAPI ResizePalette( if (!(palPtr = GDI_ReallocObject( size, hPal, palPtr ))) return FALSE; - PALETTE_UnrealizeObject( hPal, palPtr ); - if( cEntries > cPrevEnt ) memset( (BYTE*)palPtr + prevsize, 0, size - prevsize ); palPtr->logpalette.palNumEntries = cEntries; palPtr->logpalette.palVersion = prevVer; GDI_ReleaseObj( hPal ); + PALETTE_UnrealizeObject( hPal ); return TRUE; } @@ -647,15 +646,16 @@ static INT PALETTE_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffe /*********************************************************************** * PALETTE_UnrealizeObject */ -static BOOL PALETTE_UnrealizeObject( HGDIOBJ handle, void *obj ) +static BOOL PALETTE_UnrealizeObject( HGDIOBJ handle ) { - PALETTEOBJ *palette = obj; + PALETTEOBJ *palette = GDI_GetObjPtr( handle, PALETTE_MAGIC ); - if (palette->funcs) + if (palette) { - if (palette->funcs->pUnrealizePalette) - palette->funcs->pUnrealizePalette( handle ); + const DC_FUNCTIONS *funcs = palette->funcs; palette->funcs = NULL; + GDI_ReleaseObj( handle ); + if (funcs && funcs->pUnrealizePalette) funcs->pUnrealizePalette( handle ); } if (InterlockedCompareExchangePointer( (void **)&hLastRealizedPalette, 0, handle ) == handle) @@ -670,10 +670,10 @@ static BOOL PALETTE_UnrealizeObject( HGDIOBJ handle, void *obj ) */ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) { - PALETTEOBJ *obj = GDI_GetObjPtr( handle, PALETTE_MAGIC ); + PALETTEOBJ *obj; - if (!obj) return FALSE; - PALETTE_UnrealizeObject( handle, obj ); + PALETTE_UnrealizeObject( handle ); + if (!(obj = GDI_GetObjPtr( handle, PALETTE_MAGIC ))) return FALSE; return GDI_FreeObject( handle, obj ); }

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