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

Aric Cyr : wined3d: Reverse GL_BGR to GL_RGB for the D3D RGB formats.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 252c4adb965a26db19c1c9161c40a82b488cb6d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=252c4adb965a26db19c1c91… Author: Aric Cyr <aric.cyr(a)gmail.com> Date: Thu Mar 2 00:45:42 2006 +0900 wined3d: Reverse GL_BGR to GL_RGB for the D3D RGB formats. This fixes texture colours in many D3D games (verified with Age Of Mythology). --- dlls/wined3d/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 90a8292..53a9533 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1703,9 +1703,9 @@ GLenum D3DFmt2GLFmt(IWineD3DDeviceImpl* case WINED3DFMT_Q8W8V8U8: retVal = GL_RGBA; break; case WINED3DFMT_Q16W16V16U16: retVal = GL_COLOR_INDEX; break; /* color buffer */ - case WINED3DFMT_R3G3B2: retVal = GL_BGR; break; - case WINED3DFMT_R5G6B5: retVal = GL_BGR; break; - case WINED3DFMT_R8G8B8: retVal = GL_BGR; break; + case WINED3DFMT_R3G3B2: retVal = GL_RGB; break; + case WINED3DFMT_R5G6B5: retVal = GL_RGB; break; + case WINED3DFMT_R8G8B8: retVal = GL_RGB; break; case WINED3DFMT_A1R5G5B5: retVal = GL_BGRA; break; case WINED3DFMT_X1R5G5B5: retVal = GL_BGRA; break; case WINED3DFMT_A4R4G4B4: retVal = GL_BGRA; break;

1 0

Juan Lang : crypt32: Use CertFindCertificateInStore to simplify adding certificates.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 661d80708b5c57308c22684ba8372e33c991cd8e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=661d80708b5c57308c22684… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Mar 1 08:38:32 2006 -0800 crypt32: Use CertFindCertificateInStore to simplify adding certificates. --- dlls/crypt32/store.c | 78 ++++++++++++++++++-------------------------------- 1 files changed, 28 insertions(+), 50 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 840d168..47e595c 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -373,74 +373,50 @@ static BOOL CRYPT_MemAddCert(PWINECRYPT_ { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; BOOL add = FALSE, ret; + PCCERT_CONTEXT existing = NULL; TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext); - switch (dwAddDisposition) - { - case CERT_STORE_ADD_ALWAYS: - add = TRUE; - break; - case CERT_STORE_ADD_NEW: + if (dwAddDisposition != CERT_STORE_ADD_ALWAYS) { - BYTE hashToAdd[20], hash[20]; + BYTE hashToAdd[20]; DWORD size = sizeof(hashToAdd); ret = CRYPT_GetCertificateContextProperty(cert, CERT_HASH_PROP_ID, hashToAdd, &size); if (ret) { - PWINE_CERT_LIST_ENTRY cursor; + CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd }; - /* Add if no cert with the same hash is found. */ - add = TRUE; - EnterCriticalSection(&ms->cs); - LIST_FOR_EACH_ENTRY(cursor, &ms->certs, WINE_CERT_LIST_ENTRY, entry) - { - size = sizeof(hash); - ret = CertGetCertificateContextProperty(&cursor->cert.cert, - CERT_HASH_PROP_ID, hash, &size); - if (ret && !memcmp(hashToAdd, hash, size)) - { - TRACE("found matching certificate, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - add = FALSE; - break; - } - } - LeaveCriticalSection(&ms->cs); + existing = CertFindCertificateInStore(store, + cert->cert.dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, + NULL); + } + } + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + add = TRUE; + break; + case CERT_STORE_ADD_NEW: + { + if (existing) + { + TRACE("found matching certificate, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + add = FALSE; } + else + add = TRUE; break; } case CERT_STORE_ADD_REPLACE_EXISTING: { - BYTE hashToAdd[20], hash[20]; - DWORD size = sizeof(hashToAdd); - add = TRUE; - ret = CRYPT_GetCertificateContextProperty(cert, CERT_HASH_PROP_ID, - hashToAdd, &size); - if (ret) + if (existing) { - PWINE_CERT_LIST_ENTRY cursor, next; - - /* Look for existing cert to delete */ - EnterCriticalSection(&ms->cs); - LIST_FOR_EACH_ENTRY_SAFE(cursor, next, &ms->certs, - WINE_CERT_LIST_ENTRY, entry) - { - size = sizeof(hash); - ret = CertGetCertificateContextProperty(&cursor->cert.cert, - CERT_HASH_PROP_ID, hash, &size); - if (ret && !memcmp(hashToAdd, hash, size)) - { - TRACE("found matching certificate, replacing\n"); - list_remove(&cursor->entry); - CertFreeCertificateContext((PCCERT_CONTEXT)cursor); - break; - } - } - LeaveCriticalSection(&ms->cs); + TRACE("found matching certificate, replacing\n"); + CertDeleteCertificateFromStore(existing); } break; } @@ -448,6 +424,8 @@ static BOOL CRYPT_MemAddCert(PWINECRYPT_ FIXME("Unimplemented add disposition %ld\n", dwAddDisposition); add = FALSE; } + if (existing) + CertFreeCertificateContext(existing); if (add) { PWINE_CERT_LIST_ENTRY entry = CryptMemAlloc(

1 0

Robert Shearman : rpcrt4: Implement marshaling and unmarshaling for enum types.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: e8877ede800d3fc7b7f79a89bd32c879842ccb84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8877ede800d3fc7b7f79a8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:21:56 2006 +0000 rpcrt4: Implement marshaling and unmarshaling for enum types. --- dlls/rpcrt4/ndr_marshall.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3045b42..b77c281 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <string.h> #include <assert.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -2985,6 +2986,7 @@ static unsigned char *WINAPI NdrBaseType case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ERROR_STATUS_T: + case RPC_FC_ENUM32: ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); *(ULONG *)pStubMsg->Buffer = *(ULONG *)pMemory; pStubMsg->Buffer += sizeof(ULONG); @@ -3007,7 +3009,14 @@ static unsigned char *WINAPI NdrBaseType TRACE("value: %s\n", wine_dbgstr_longlong(*(ULONGLONG*)pMemory)); break; case RPC_FC_ENUM16: - case RPC_FC_ENUM32: + /* only 16-bits on the wire, so do a sanity check */ + if (*(UINT *)pMemory > USHRT_MAX) + RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + *(USHORT *)pStubMsg->Buffer = *(UINT *)pMemory; + pStubMsg->Buffer += sizeof(USHORT); + TRACE("value: 0x%04x\n", *(UINT *)pMemory); + break; default: FIXME("Unhandled base type: 0x%02x\n", *pFormat); } @@ -3055,6 +3064,7 @@ static unsigned char *WINAPI NdrBaseType case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ERROR_STATUS_T: + case RPC_FC_ENUM32: ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); **(ULONG **)ppMemory = *(ULONG *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(ULONG); @@ -3079,7 +3089,12 @@ static unsigned char *WINAPI NdrBaseType TRACE("value: %s\n", wine_dbgstr_longlong(**(ULONGLONG **)ppMemory)); break; case RPC_FC_ENUM16: - case RPC_FC_ENUM32: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + /* 16-bits on the wire, but int in memory */ + **(UINT **)ppMemory = *(USHORT *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(USHORT); + TRACE("value: 0x%08x\n", **(UINT **)ppMemory); + break; default: FIXME("Unhandled base type: 0x%02x\n", *pFormat); } @@ -3110,11 +3125,13 @@ static void WINAPI NdrBaseTypeBufferSize case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + case RPC_FC_ENUM16: ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(USHORT) - 1); pStubMsg->BufferLength += sizeof(USHORT); break; case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_ENUM32: ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(ULONG) - 1); pStubMsg->BufferLength += sizeof(ULONG); break; @@ -3134,8 +3151,6 @@ static void WINAPI NdrBaseTypeBufferSize ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(error_status_t) - 1); pStubMsg->BufferLength += sizeof(error_status_t); break; - case RPC_FC_ENUM16: - case RPC_FC_ENUM32: default: FIXME("Unhandled base type: 0x%02x\n", *pFormat); } @@ -3172,6 +3187,7 @@ static unsigned long WINAPI NdrBaseTypeM return sizeof(error_status_t); case RPC_FC_ENUM16: case RPC_FC_ENUM32: + return sizeof(INT); default: FIXME("Unhandled base type: 0x%02x\n", *pFormat); return 0;

1 0

Robert Shearman : rpcrt4: Change the stubless parameter attributes to using a bitfield
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 4253b0123932102a6be3d8397f02feea41ef83a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4253b0123932102a6be3d83… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:22:26 2006 +0000 rpcrt4: Change the stubless parameter attributes to using a bitfield (as defined by the PSDK) so the ServerAllocSize part is easier to calculate. --- dlls/rpcrt4/ndr_stubless.c | 133 +++++++++++++++++--------------------------- include/Makefile.in | 1 include/ndrtypes.h | 57 +++++++++++++++++++ 3 files changed, 110 insertions(+), 81 deletions(-) create mode 100644 include/ndrtypes.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4253b0123932102a6be…

1 0

Jason Edmeades : user32: Ensure VK_UP displays the popup menu for the selected item if
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: 24dc3de4c952b1205c637d0a165a04ae389ed0f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24dc3de4c952b1205c637d0… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Mar 1 12:39:09 2006 +0100 user32: Ensure VK_UP displays the popup menu for the selected item if the popup menu is not visible --- dlls/user/menu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index a72e922..e2c6318 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -3053,19 +3053,19 @@ static BOOL MENU_TrackMenu( HMENU hmenu, case VK_END: MENU_SelectItem( mt.hOwnerWnd, mt.hCurrentMenu, NO_SELECTED_ITEM, FALSE, 0 ); - /* fall through */ - case VK_UP: MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu, (msg.wParam == VK_HOME)? ITEM_NEXT : ITEM_PREV ); break; + case VK_UP: case VK_DOWN: /* If on menu bar, pull-down the menu */ menu = MENU_GetMenu( mt.hCurrentMenu ); if (!(menu->wFlags & MF_POPUP)) mt.hCurrentMenu = MENU_ShowSubPopup(mt.hOwnerWnd, mt.hTopMenu, TRUE, wFlags); else /* otherwise try to move selection */ - MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu, ITEM_NEXT ); + MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu, + (msg.wParam == VK_UP)? ITEM_PREV : ITEM_NEXT ); break; case VK_LEFT:

1 0

Jon Parshall : shell32: New icons for Desktop and My Computer.
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: b84c9d41e4a16d5f3bb4c466e80c5011f82cc95d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b84c9d41e4a16d5f3bb4c46… Author: Jon Parshall <jparshall(a)codeweavers.com> Date: Wed Mar 1 14:08:45 2006 +0800 shell32: New icons for Desktop and My Computer. --- dlls/shell32/shres.rc | 482 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 361 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b84c9d41e4a16d5f3bb…

1 0

Mike McCormack : server: Print a message if wineserver crashes and we don' t dump cores.
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: 0cd0626de019c8ca288ed8a61a053c0f485c5c5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0cd0626de019c8ca288ed8a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 1 01:07:04 2006 +0900 server: Print a message if wineserver crashes and we don't dump cores. --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 3 +++ server/signal.c | 26 ++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 392808f..9e163c8 100755 --- a/configure +++ b/configure @@ -7038,6 +7038,7 @@ done + for ac_header in \ IOKit/IOKitLib.h \ alsa/asoundlib.h \ @@ -7119,6 +7120,7 @@ for ac_header in \ sys/poll.h \ sys/ptrace.h \ sys/reg.h \ + sys/resource.h \ sys/scsiio.h \ sys/shm.h \ sys/signal.h \ diff --git a/configure.ac b/configure.ac index e88d337..f2f910d 100644 --- a/configure.ac +++ b/configure.ac @@ -252,6 +252,7 @@ AC_CHECK_HEADERS(\ sys/poll.h \ sys/ptrace.h \ sys/reg.h \ + sys/resource.h \ sys/scsiio.h \ sys/shm.h \ sys/signal.h \ diff --git a/include/config.h.in b/include/config.h.in index 18f1127..d2c9f3b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -734,6 +734,9 @@ /* Define to 1 if you have the <sys/reg.h> header file. */ #undef HAVE_SYS_REG_H +/* Define to 1 if you have the <sys/resource.h> header file. */ +#undef HAVE_SYS_RESOURCE_H + /* Define to 1 if you have the <sys/scsiio.h> header file. */ #undef HAVE_SYS_SCSIIO_H diff --git a/server/signal.c b/server/signal.c index 0c2a579..e12532e 100644 --- a/server/signal.c +++ b/server/signal.c @@ -28,6 +28,9 @@ #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif #include <unistd.h> #include "file.h" @@ -215,6 +218,13 @@ static void do_sigchld( int signum ) do_signal( handler_sigchld ); } +/* SIGSEGV handler */ +static void do_sigsegv( int signum ) +{ + fprintf( stderr, "wineserver crashed, please report this.\n"); + abort(); +} + /* SIGIO handler */ #ifdef HAVE_SIGINFO_T_SI_FD static void do_sigio( int signum, siginfo_t *si, void *x ) @@ -241,6 +251,17 @@ int watchdog_triggered(void) return watchdog != 0; } +static int core_dump_disabled( void ) +{ + int r = 0; +#ifdef RLIMIT_CORE + struct rlimit lim; + + r = !getrlimit(RLIMIT_CORE, &lim) && (lim.rlim_cur == 0); +#endif + return r; +} + void init_signals(void) { struct sigaction action; @@ -279,6 +300,11 @@ void init_signals(void) action.sa_handler = do_sigterm; sigaction( SIGQUIT, &action, NULL ); sigaction( SIGTERM, &action, NULL ); + if (core_dump_disabled()) + { + action.sa_handler = do_sigsegv; + sigaction( SIGSEGV, &action, NULL ); + } action.sa_handler = SIG_IGN; sigaction( SIGXFSZ, &action, NULL ); #ifdef HAVE_SIGINFO_T_SI_FD

1 0

Gerald Pfeifer : README: Fix spelling Red Hat. Remove unneeded references to Debian
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: 2d979b6a893e0d3a918d801b25bcf010e4fcbe35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d979b6a893e0d3a918d801… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Feb 28 23:19:19 2006 +0100 README: Fix spelling Red Hat. Remove unneeded references to Debian and Red Hat. Document the use of libxml2 as a weak prerequisite. --- README | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 3468646..029f592 100644 --- a/README +++ b/README @@ -70,7 +70,7 @@ Supported file systems: Basic requirements: You need to have the X11 development include files installed - (called xlib6g-dev in Debian and XFree86-devel in RedHat). + (called xlib6g-dev in Debian and XFree86-devel in Red Hat). Build tool requirements: On x86 Systems gcc >= 2.7.2 is required. @@ -81,12 +81,12 @@ Build tool requirements: Of course you also need "make" (most likely GNU make). - You also need flex version 2.5 or later and bison. If you are - using RedHat or Debian, install the flex and bison packages. + You also need flex version 2.5 or later and bison. Optional support libraries: If you want CUPS printing support, please install both cups and cups-devel packages. + Install the libxml2 package to get a functional msxml implementation. 4. COMPILATION

1 0

Marcus Meissner : PACKAGING: Mention more libraries / tools in the needed dependencies section.
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: ec2cb1871cdf15ba13515eeef31480a0fbcf81c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec2cb1871cdf15ba13515ee… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Mar 1 07:10:34 2006 +0100 PACKAGING: Mention more libraries / tools in the needed dependencies section. --- documentation/PACKAGING | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/documentation/PACKAGING b/documentation/PACKAGING index 9a34630..dd04422 100644 --- a/documentation/PACKAGING +++ b/documentation/PACKAGING @@ -64,6 +64,9 @@ they should appear as "Suggests" or "Rec better support of fonts than using the X11 fonts engine. It is only needed for the X11 back end engine. Used from GDI. + * fontforge: http://sourceforge.net/projects/fontforge/ + Used by WINE to create our own set of TrueType fonts during build. + * fontconfig Used to find TrueType fonts for rendering with freetype. Used by GDI. @@ -119,6 +122,15 @@ they should appear as "Suggests" or "Rec Xi - X Input handling (for asian input methods mostly) Xext - X extensions + * libxml2, libxslt + These two libraries are used for our msxml3.dll implementation. + + * prelink + Used during build to locate WINE at a specific virtual address. + + * capi4linux + Used to implement our capi2032.dll. + GOALS ~~~~~

1 0

Juan Lang : crypt32: Eliminate an unnecessary function pointer from stores.
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: ba2c1e51164efc91e1998e09821cf31a4f226be2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba2c1e51164efc91e1998e0… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Feb 28 09:08:03 2006 -0800 crypt32: Eliminate an unnecessary function pointer from stores. --- dlls/crypt32/store.c | 81 +++++++++++++++++++++++--------------------------- 1 files changed, 37 insertions(+), 44 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 444d9c3..840d168 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -135,14 +135,13 @@ typedef struct _WINE_CERT_CONTEXT_REF * struct _WINE_CERT_CONTEXT; -/* Called to create a new reference to an existing cert context. Should call - * CRYPT_InitCertRef to make sure the reference count is properly updated. - * If the store does not provide any additional allocated data (that is, does - * not need to implement a FreeCertFunc), it may use CRYPT_CreateCertRef for - * this. +/* Called to add a new certificate context to a store. The context does not + * yet have a reference. If ppStoreContext is not NULL, a reference to the + * added context should be returned in *ppStoreContext. */ -typedef struct _WINE_CERT_CONTEXT_REF * (*CreateRefFunc) - (struct _WINE_CERT_CONTEXT *context, HCERTSTORE store); +typedef BOOL (*AddCertFunc)(struct WINE_CRYPTCERTSTORE *store, + struct _WINE_CERT_CONTEXT *context, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext); /* Optional, called when a cert context reference is being freed. Don't free * the ref pointer itself, CertFreeCertificateContext does that. @@ -161,7 +160,6 @@ typedef enum _CertStoreType { * is still needed to distinguish collection stores from other types. * On the function pointers: * - closeStore is called when the store's ref count becomes 0 - * - addCert is called with a PWINE_CERT_CONTEXT as the second parameter * - control is optional, but should be implemented by any store that supports * persistence */ @@ -173,8 +171,7 @@ typedef struct WINE_CRYPTCERTSTORE HCRYPTPROV cryptProv; CertStoreType type; PFN_CERT_STORE_PROV_CLOSE closeStore; - PFN_CERT_STORE_PROV_WRITE_CERT addCert; - CreateRefFunc createCertRef; + AddCertFunc addCert; EnumCertFunc enumCert; PFN_CERT_STORE_PROV_DELETE_CERT deleteCert; DupCertFunc dupCert; @@ -370,13 +367,14 @@ static PWINE_CERT_CONTEXT_REF CRYPT_Crea return pCertRef; } -static BOOL WINAPI CRYPT_MemAddCert(HCERTSTORE store, PCCERT_CONTEXT pCert, - DWORD dwAddDisposition) +static BOOL CRYPT_MemAddCert(PWINECRYPT_CERTSTORE store, + PWINE_CERT_CONTEXT cert, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; BOOL add = FALSE, ret; - TRACE("(%p, %p, %ld)\n", store, pCert, dwAddDisposition); + TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext); switch (dwAddDisposition) { @@ -388,8 +386,8 @@ static BOOL WINAPI CRYPT_MemAddCert(HCER BYTE hashToAdd[20], hash[20]; DWORD size = sizeof(hashToAdd); - ret = CRYPT_GetCertificateContextProperty((PWINE_CERT_CONTEXT)pCert, - CERT_HASH_PROP_ID, hashToAdd, &size); + ret = CRYPT_GetCertificateContextProperty(cert, CERT_HASH_PROP_ID, + hashToAdd, &size); if (ret) { PWINE_CERT_LIST_ENTRY cursor; @@ -420,8 +418,8 @@ static BOOL WINAPI CRYPT_MemAddCert(HCER DWORD size = sizeof(hashToAdd); add = TRUE; - ret = CRYPT_GetCertificateContextProperty((PWINE_CERT_CONTEXT)pCert, - CERT_HASH_PROP_ID, hashToAdd, &size); + ret = CRYPT_GetCertificateContextProperty(cert, CERT_HASH_PROP_ID, + hashToAdd, &size); if (ret) { PWINE_CERT_LIST_ENTRY cursor, next; @@ -458,10 +456,13 @@ static BOOL WINAPI CRYPT_MemAddCert(HCER if (entry) { TRACE("adding %p\n", entry); - CRYPT_InitCertRef(&entry->cert, (PWINE_CERT_CONTEXT)pCert, store); + CRYPT_InitCertRef(&entry->cert, cert, store); EnterCriticalSection(&ms->cs); list_add_tail(&ms->certs, &entry->entry); LeaveCriticalSection(&ms->cs); + if (ppStoreContext) + *ppStoreContext = + CertDuplicateCertificateContext((PCCERT_CONTEXT)entry); ret = TRUE; } else @@ -612,7 +613,6 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpe CRYPT_InitStore(&store->hdr, hCryptProv, dwFlags, StoreTypeMem); store->hdr.closeStore = CRYPT_MemCloseStore; store->hdr.addCert = CRYPT_MemAddCert; - store->hdr.createCertRef = CRYPT_CreateCertRef; store->hdr.enumCert = CRYPT_MemEnumCert; store->hdr.deleteCert = CRYPT_MemDeleteCert; store->hdr.freeCert = NULL; @@ -625,14 +625,15 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpe return (PWINECRYPT_CERTSTORE)store; } -static BOOL WINAPI CRYPT_CollectionAddCert(HCERTSTORE store, - PCCERT_CONTEXT pCert, DWORD dwAddDisposition) +static BOOL CRYPT_CollectionAddCert(PWINECRYPT_CERTSTORE store, + PWINE_CERT_CONTEXT cert, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext) { PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; PWINE_STORE_LIST_ENTRY entry, next; BOOL ret; - TRACE("(%p, %p, %ld)\n", store, pCert, dwAddDisposition); + TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext); ret = FALSE; EnterCriticalSection(&cs->cs); @@ -641,7 +642,8 @@ static BOOL WINAPI CRYPT_CollectionAddCe { if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) { - ret = entry->store->addCert(entry->store, pCert, dwAddDisposition); + ret = entry->store->addCert(entry->store, cert, dwAddDisposition, + ppStoreContext); break; } } @@ -837,7 +839,6 @@ static WINECRYPT_CERTSTORE *CRYPT_Collec StoreTypeCollection); store->hdr.closeStore = CRYPT_CollectionCloseStore; store->hdr.addCert = CRYPT_CollectionAddCert; - store->hdr.createCertRef = CRYPT_CollectionCreateCertRef; store->hdr.enumCert = CRYPT_CollectionEnumCert; store->hdr.deleteCert = CRYPT_CollectionDeleteCert; store->hdr.dupCert = CRYPT_CollectionDupCert; @@ -862,15 +863,16 @@ static void WINAPI CRYPT_ProvCloseStore( CryptMemFree(store); } -static BOOL WINAPI CRYPT_ProvAddCert(HCERTSTORE hCertStore, PCCERT_CONTEXT cert, - DWORD dwAddDisposition) +static BOOL CRYPT_ProvAddCert(PWINECRYPT_CERTSTORE store, + PWINE_CERT_CONTEXT cert, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext) { - PWINE_PROVIDERSTORE store = (PWINE_PROVIDERSTORE)hCertStore; + PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; BOOL ret; - TRACE("(%p, %p, %ld)\n", hCertStore, cert, dwAddDisposition); + TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext); - if (store->hdr.dwOpenFlags & CERT_STORE_READONLY_FLAG) + if (ps->hdr.dwOpenFlags & CERT_STORE_READONLY_FLAG) { SetLastError(ERROR_ACCESS_DENIED); ret = FALSE; @@ -878,12 +880,12 @@ static BOOL WINAPI CRYPT_ProvAddCert(HCE else { ret = TRUE; - if (store->provWriteCert) - ret = store->provWriteCert(store->hStoreProv, cert, + if (ps->provWriteCert) + ret = ps->provWriteCert(ps->hStoreProv, (PCCERT_CONTEXT)cert, CERT_STORE_PROV_WRITE_ADD_FLAG); if (ret) - ret = store->memStore->addCert(store->memStore, cert, - dwAddDisposition); + ret = ps->memStore->addCert(ps->memStore, cert, + dwAddDisposition, ppStoreContext); } return ret; } @@ -1006,7 +1008,6 @@ static PWINECRYPT_CERTSTORE CRYPT_ProvCr ret->hStoreProv = pProvInfo->hStoreProv; ret->hdr.closeStore = CRYPT_ProvCloseStore; ret->hdr.addCert = CRYPT_ProvAddCert; - ret->hdr.createCertRef = CRYPT_ProvCreateCertRef; ret->hdr.enumCert = CRYPT_ProvEnumCert; ret->hdr.deleteCert = CRYPT_ProvDeleteCert; ret->hdr.dupCert = CRYPT_ProvDupCert; @@ -2478,12 +2479,7 @@ BOOL WINAPI CertAddCertificateContextToS CryptMemFree(buf); LeaveCriticalSection(&ref->context->cs); if (ret) - { - ret = store->addCert(store, (PCCERT_CONTEXT)cert, dwAddDisposition); - if (ret && ppStoreContext) - *ppStoreContext = (PCCERT_CONTEXT)store->createCertRef(cert, - hCertStore); - } + ret = store->addCert(store, cert, dwAddDisposition, ppStoreContext); if (!ret) CRYPT_FreeCert(cert); } @@ -2513,10 +2509,7 @@ BOOL WINAPI CertAddEncodedCertificateToS if (cert) { - ret = hcs->addCert(hcs, (PCCERT_CONTEXT)cert, dwAddDisposition); - if (ret && ppCertContext) - *ppCertContext = (PCCERT_CONTEXT)hcs->createCertRef(cert, - hCertStore); + ret = hcs->addCert(hcs, cert, dwAddDisposition, ppCertContext); if (!ret) CRYPT_FreeCert(cert); }

1 0