September 2013 - Wine-Commits

Henri Verbeet : wined3d: Don' t set WINED3DUSAGE_RENDERTARGET on the front buffer.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 6325f3ddd8d9922b49608b3afc096eaebada737d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6325f3ddd8d9922b49608b3af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:45 2013 +0200 wined3d: Don't set WINED3DUSAGE_RENDERTARGET on the front buffer. We never render directly to the front buffer, and in case of e.g. a P8 front buffer, we would fail surface creation if we were to enforce format restrictions. --- dlls/wined3d/swapchain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d1cb2f5..981d946 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -882,7 +882,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 surface_desc.format = swapchain->desc.backbuffer_format; surface_desc.multisample_type = swapchain->desc.multisample_type; surface_desc.multisample_quality = swapchain->desc.multisample_quality; - surface_desc.usage = WINED3DUSAGE_RENDERTARGET; + surface_desc.usage = 0; surface_desc.pool = WINED3D_POOL_DEFAULT; surface_desc.width = swapchain->desc.backbuffer_width; surface_desc.height = swapchain->desc.backbuffer_height; @@ -992,6 +992,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 goto err; } + surface_desc.usage |= WINED3DUSAGE_RENDERTARGET; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i);

1 0

Nikolay Sivov : shell32: Fix remaining cases of implementation pointer being returned.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 725b069e68d288009f1a3d9bcb7120adddfda96b URL: http://source.winehq.org/git/wine.git/?a=commit;h=725b069e68d288009f1a3d9bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 4 10:12:30 2013 +0400 shell32: Fix remaining cases of implementation pointer being returned. --- dlls/shell32/shfldr_desktop.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shfldr_printers.c | 2 +- dlls/shell32/shlview.c | 14 ++++---------- dlls/shell32/shlview_cmenu.c | 2 +- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index e2b73d0..c4072b7 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -112,7 +112,7 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = &This->IShellFolder2_iface; } else if (IsEqualIID (riid, &IID_IPersist) || IsEqualIID (riid, &IID_IPersistFolder) || diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index a21a2f3..686edb0 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -140,7 +140,7 @@ static HRESULT WINAPI ISF_MyComputer_fnQueryInterface (IShellFolder2 *iface, IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = &This->IShellFolder2_iface; } else if (IsEqualIID (riid, &IID_IPersist) || IsEqualIID (riid, &IID_IPersistFolder) || diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 1cff18d..36d18bc 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -133,7 +133,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnQueryInterface (IShellFolder2 *iface, IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = &This->IShellFolder2_iface; } else if (IsEqualIID (riid, &IID_IPersist) || IsEqualIID (riid, &IID_IPersistFolder) || diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index e8d17d1..7ee6548 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -80,7 +80,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *ifac IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = &This->IShellFolder2_iface; } else if (IsEqualIID (riid, &IID_IPersist) || IsEqualIID (riid, &IID_IPersistFolder) || diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2cdd160..29593f8 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1751,17 +1751,11 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView2 *iface, REFIID rii *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IShellView) || + IsEqualIID(riid, &IID_IShellView2)) { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IShellView)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IShellView2)) - { - *ppvObj = This; + *ppvObj = &This->IShellView2_iface; } else if(IsEqualIID(riid, &IID_IShellFolderView)) { diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 4c4edef..fb4ef4e 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -78,7 +78,7 @@ static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu3 *iface, REFIID ri IsEqualIID(riid, &IID_IContextMenu2) || IsEqualIID(riid, &IID_IContextMenu3)) { - *ppvObj = This; + *ppvObj = &This->IContextMenu3_iface; } else if (IsEqualIID(riid, &IID_IShellExtInit)) /*IShellExtInit*/ {

1 0

Dmitry Timoshkov : server: Print the debug trace to stderr.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: e22f8d2fd86421c61c03de8e675054c9ca3922da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22f8d2fd86421c61c03de8e6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 4 11:47:03 2013 +0900 server: Print the debug trace to stderr. --- server/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/sock.c b/server/sock.c index d6a228e..145e2a7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -466,7 +466,7 @@ static void sock_dump( struct object *obj, int verbose ) { struct sock *sock = (struct sock *)obj; assert( obj->ops == &sock_ops ); - printf( "Socket fd=%p, state=%x, mask=%x, pending=%x, held=%x\n", + fprintf( stderr, "Socket fd=%p, state=%x, mask=%x, pending=%x, held=%x\n", sock->fd, sock->state, sock->mask, sock->pmask, sock->hmask ); }

1 0

Jacek Caban : crypt32: Get rid of PCONTEXT_FUNCS typedef.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: ebaf4dd5a4001a31288bf965ff02162cfad22f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebaf4dd5a4001a31288bf965f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:27 2013 +0200 crypt32: Get rid of PCONTEXT_FUNCS typedef. --- dlls/crypt32/collectionstore.c | 10 +++++----- dlls/crypt32/crypt32_private.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index d17c3b7..57a0513 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -88,11 +88,11 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, if (toReplace) { void *existingLinked = Context_GetLinkedContext(toReplace, contextSize); - PCONTEXT_FUNCS contextFuncs; + CONTEXT_FUNCS *contextFuncs; storeEntry = *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(toReplace, contextSize); - contextFuncs = (PCONTEXT_FUNCS)((LPBYTE)storeEntry->store + + contextFuncs = (CONTEXT_FUNCS*)((LPBYTE)storeEntry->store + contextFuncsOffset); ret = contextFuncs->addContext(storeEntry->store, context, existingLinked, (const void **)&childContext); @@ -107,7 +107,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, { if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) { - PCONTEXT_FUNCS contextFuncs = (PCONTEXT_FUNCS)( + CONTEXT_FUNCS *contextFuncs = (CONTEXT_FUNCS*)( (LPBYTE)entry->store + contextFuncsOffset); storeEntry = entry; @@ -168,8 +168,8 @@ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, size_t offset = (const BYTE *)contextFuncs - (LPBYTE)storeEntry->store; PWINE_STORE_LIST_ENTRY storeNextEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry); - PCONTEXT_FUNCS storeNextContexts = - (PCONTEXT_FUNCS)((LPBYTE)storeNextEntry->store + offset); + CONTEXT_FUNCS *storeNextContexts = + (CONTEXT_FUNCS*)((LPBYTE)storeNextEntry->store + offset); ret = CRYPT_CollectionAdvanceEnum(store, storeNextEntry, storeNextContexts, contextInterface, NULL, contextSize); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 94a3e52..e96d244 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -225,7 +225,7 @@ typedef struct _CONTEXT_FUNCS AddFunc addContext; EnumFunc enumContext; DeleteFunc deleteContext; -} CONTEXT_FUNCS, *PCONTEXT_FUNCS; +} CONTEXT_FUNCS; typedef enum _CertStoreType { StoreTypeMem,

1 0

Piotr Caban : winedump: Fix TLB function dumping.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 074941c04f4bb0f8a6198ca33bd3e18da8ef9c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=074941c04f4bb0f8a6198ca33… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 4 09:09:44 2013 +0200 winedump: Fix TLB function dumping. --- tools/winedump/tlb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index a65c76e..73e384d 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -597,6 +597,8 @@ static void dump_msft_func(int n) print_hex("HelpStringContext"); if(extra_attr >= 7) print_hex("oCustData"); + for(i = 0; i < extra_attr-7; i++) + print_hex_id("oArgCustData", i); if(fkccic & 0x1000) { for(i=0; i < args_cnt; i++)

1 0

Henri Verbeet : wined3d: Avoid a couple of useless glGetUniformLocationARB( ) calls.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 99092c2700d315136f79b2a96400f6900476fc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99092c2700d315136f79b2a96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:44 2013 +0200 wined3d: Avoid a couple of useless glGetUniformLocationARB() calls. --- dlls/wined3d/glsl_shader.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 280ec20..93ec2a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5754,18 +5754,20 @@ static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(str static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *gl_info, - GLhandleARB program_id, struct glsl_vs_program *vs) + GLhandleARB program_id, struct glsl_vs_program *vs, unsigned int vs_c_count) { unsigned int i; char name[32]; vs->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); - for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) + for (i = 0; i < vs_c_count; ++i) { snprintf(name, sizeof(name), "vs_c[%u]", i); vs->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + memset(&vs->uniform_f_locations[vs_c_count], 0xff, + (gl_info->limits.glsl_vs_float_constants - vs_c_count) * sizeof(GLhandleARB)); for (i = 0; i < MAX_CONST_I; ++i) { @@ -5777,18 +5779,20 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * } static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info *gl_info, - GLhandleARB program_id, struct glsl_ps_program *ps) + GLhandleARB program_id, struct glsl_ps_program *ps, unsigned int ps_c_count) { unsigned int i; char name[32]; ps->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); - for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) + for (i = 0; i < ps_c_count; ++i) { snprintf(name, sizeof(name), "ps_c[%u]", i); ps->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + memset(&ps->uniform_f_locations[ps_c_count], 0xff, + (gl_info->limits.glsl_ps_float_constants - ps_c_count) * sizeof(GLhandleARB)); for (i = 0; i < MAX_CONST_I; ++i) { @@ -6002,8 +6006,10 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glLinkProgramARB(programId)); shader_glsl_validate_link(gl_info, programId); - shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs); - shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps); + shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs, + vshader ? vshader->limits.constant_float : 0); + shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps, + pshader ? pshader->limits.constant_float : 0); checkGLcall("Find glsl program uniform locations"); if (pshader && pshader->reg_maps.shader_version.major >= 3

1 0

Jacek Caban : crypt32: Get rid of PWINE_HASH_TO_DELETE and PWINE_REGSTOREINFO typedefs.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: cc7b0d40194c48ffb5d5465f8bc64f1a2ba1fef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7b0d40194c48ffb5d5465f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:40:17 2013 +0200 crypt32: Get rid of PWINE_HASH_TO_DELETE and PWINE_REGSTOREINFO typedefs. --- dlls/crypt32/regstore.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 728122b..a5d69a1 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -32,7 +32,7 @@ typedef struct _WINE_HASH_TO_DELETE { BYTE hash[20]; struct list entry; -} WINE_HASH_TO_DELETE, *PWINE_HASH_TO_DELETE; +} WINE_HASH_TO_DELETE; typedef struct _WINE_REGSTOREINFO { @@ -44,7 +44,7 @@ typedef struct _WINE_REGSTOREINFO struct list certsToDelete; struct list crlsToDelete; struct list ctlsToDelete; -} WINE_REGSTOREINFO, *PWINE_REGSTOREINFO; +} WINE_REGSTOREINFO; static void CRYPT_HashToStr(const BYTE *hash, LPWSTR asciiHash) { @@ -246,7 +246,7 @@ static BOOL CRYPT_SerializeContextsToReg(HKEY key, return ret; } -static BOOL CRYPT_RegWriteToReg(PWINE_REGSTOREINFO store) +static BOOL CRYPT_RegWriteToReg(WINE_REGSTOREINFO *store) { static const WCHAR * const subKeys[] = { CertsW, CRLsW, CTLsW }; const WINE_CONTEXT_INTERFACE * const interfaces[] = { pCertInterface, @@ -266,7 +266,7 @@ static BOOL CRYPT_RegWriteToReg(PWINE_REGSTOREINFO store) { if (listToDelete[i]) { - PWINE_HASH_TO_DELETE toDelete, next; + WINE_HASH_TO_DELETE *toDelete, *next; WCHAR asciiHash[20 * 2 + 1]; EnterCriticalSection(&store->cs); @@ -304,7 +304,7 @@ static BOOL CRYPT_RegWriteToReg(PWINE_REGSTOREINFO store) /* If force is true or the registry store is dirty, writes the contents of the * store to the registry. */ -static BOOL CRYPT_RegFlushStore(PWINE_REGSTOREINFO store, BOOL force) +static BOOL CRYPT_RegFlushStore(WINE_REGSTOREINFO *store, BOOL force) { BOOL ret; @@ -319,7 +319,7 @@ static BOOL CRYPT_RegFlushStore(PWINE_REGSTOREINFO store, BOOL force) static void WINAPI CRYPT_RegCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %08x)\n", store, dwFlags); if (dwFlags) @@ -332,7 +332,7 @@ static void WINAPI CRYPT_RegCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) CryptMemFree(store); } -static BOOL CRYPT_RegWriteContext(PWINE_REGSTOREINFO store, +static BOOL CRYPT_RegWriteContext(WINE_REGSTOREINFO *store, const void *context, DWORD dwFlags) { BOOL ret; @@ -347,7 +347,7 @@ static BOOL CRYPT_RegWriteContext(PWINE_REGSTOREINFO store, return ret; } -static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, +static BOOL CRYPT_RegDeleteContext(WINE_REGSTOREINFO *store, struct list *deleteList, const void *context, const WINE_CONTEXT_INTERFACE *contextInterface) { @@ -360,8 +360,7 @@ static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, } else { - PWINE_HASH_TO_DELETE toDelete = - CryptMemAlloc(sizeof(WINE_HASH_TO_DELETE)); + WINE_HASH_TO_DELETE *toDelete = CryptMemAlloc(sizeof(WINE_HASH_TO_DELETE)); if (toDelete) { @@ -392,7 +391,7 @@ static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, static BOOL WINAPI CRYPT_RegWriteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT cert, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, cert, dwFlags); @@ -402,7 +401,7 @@ static BOOL WINAPI CRYPT_RegWriteCert(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegDeleteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", store, pCertContext, dwFlags); @@ -413,7 +412,7 @@ static BOOL WINAPI CRYPT_RegDeleteCert(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegWriteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT crl, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, crl, dwFlags); @@ -423,7 +422,7 @@ static BOOL WINAPI CRYPT_RegWriteCRL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegDeleteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT pCrlContext, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", store, pCrlContext, dwFlags); @@ -434,7 +433,7 @@ static BOOL WINAPI CRYPT_RegDeleteCRL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegWriteCTL(HCERTSTORE hCertStore, PCCTL_CONTEXT ctl, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, ctl, dwFlags); @@ -444,7 +443,7 @@ static BOOL WINAPI CRYPT_RegWriteCTL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegDeleteCTL(HCERTSTORE hCertStore, PCCTL_CONTEXT pCtlContext, DWORD dwFlags) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", store, pCtlContext, dwFlags); @@ -455,7 +454,7 @@ static BOOL WINAPI CRYPT_RegDeleteCTL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { - PWINE_REGSTOREINFO store = hCertStore; + WINE_REGSTOREINFO *store = hCertStore; BOOL ret; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, @@ -541,7 +540,7 @@ WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, CERT_STORE_CREATE_NEW_FLAG, NULL); if (memStore) { - PWINE_REGSTOREINFO regInfo = CryptMemAlloc( + WINE_REGSTOREINFO *regInfo = CryptMemAlloc( sizeof(WINE_REGSTOREINFO)); if (regInfo)

1 0

Jacek Caban : crypt32: Get rid of PWINE_PROVIDERSTORE typedef.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: d759a6a5a423650ef6adb0bf98506a49ab146a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d759a6a5a423650ef6adb0bf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:40:08 2013 +0200 crypt32: Get rid of PWINE_PROVIDERSTORE typedef. --- dlls/crypt32/provstore.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c index c28deac..cd13d73 100644 --- a/dlls/crypt32/provstore.c +++ b/dlls/crypt32/provstore.c @@ -39,11 +39,11 @@ typedef struct _WINE_PROVIDERSTORE PFN_CERT_STORE_PROV_WRITE_CTL provWriteCtl; PFN_CERT_STORE_PROV_DELETE_CTL provDeleteCtl; PFN_CERT_STORE_PROV_CONTROL provControl; -} WINE_PROVIDERSTORE, *PWINE_PROVIDERSTORE; +} WINE_PROVIDERSTORE; static void WINAPI CRYPT_ProvCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { - PWINE_PROVIDERSTORE store = hCertStore; + WINE_PROVIDERSTORE *store = hCertStore; TRACE("(%p, %08x)\n", store, dwFlags); @@ -57,7 +57,7 @@ static void WINAPI CRYPT_ProvCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) static BOOL CRYPT_ProvAddCert(WINECRYPT_CERTSTORE *store, void *cert, void *toReplace, const void **ppStoreContext) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret; TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); @@ -85,7 +85,7 @@ static BOOL CRYPT_ProvAddCert(WINECRYPT_CERTSTORE *store, void *cert, static void *CRYPT_ProvEnumCert(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; void *ret; ret = ps->memStore->certs.enumContext(ps->memStore, pPrev); @@ -101,7 +101,7 @@ static void *CRYPT_ProvEnumCert(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL CRYPT_ProvDeleteCert(WINECRYPT_CERTSTORE *store, void *cert) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret = TRUE; TRACE("(%p, %p)\n", store, cert); @@ -116,7 +116,7 @@ static BOOL CRYPT_ProvDeleteCert(WINECRYPT_CERTSTORE *store, void *cert) static BOOL CRYPT_ProvAddCRL(WINECRYPT_CERTSTORE *store, void *crl, void *toReplace, const void **ppStoreContext) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret; TRACE("(%p, %p, %p, %p)\n", store, crl, toReplace, ppStoreContext); @@ -152,7 +152,7 @@ static BOOL CRYPT_ProvAddCRL(WINECRYPT_CERTSTORE *store, void *crl, static void *CRYPT_ProvEnumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; void *ret; ret = ps->memStore->crls.enumContext(ps->memStore, pPrev); @@ -168,7 +168,7 @@ static void *CRYPT_ProvEnumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL CRYPT_ProvDeleteCRL(WINECRYPT_CERTSTORE *store, void *crl) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret = TRUE; TRACE("(%p, %p)\n", store, crl); @@ -183,7 +183,7 @@ static BOOL CRYPT_ProvDeleteCRL(WINECRYPT_CERTSTORE *store, void *crl) static BOOL CRYPT_ProvAddCTL(WINECRYPT_CERTSTORE *store, void *ctl, void *toReplace, const void **ppStoreContext) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret; TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); @@ -219,7 +219,7 @@ static BOOL CRYPT_ProvAddCTL(WINECRYPT_CERTSTORE *store, void *ctl, static void *CRYPT_ProvEnumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; void *ret; ret = ps->memStore->ctls.enumContext(ps->memStore, pPrev); @@ -235,7 +235,7 @@ static void *CRYPT_ProvEnumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL CRYPT_ProvDeleteCTL(WINECRYPT_CERTSTORE *store, void *ctl) { - PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + WINE_PROVIDERSTORE *ps = (WINE_PROVIDERSTORE*)store; BOOL ret = TRUE; TRACE("(%p, %p)\n", store, ctl); @@ -250,7 +250,7 @@ static BOOL CRYPT_ProvDeleteCTL(WINECRYPT_CERTSTORE *store, void *ctl) static BOOL WINAPI CRYPT_ProvControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { - PWINE_PROVIDERSTORE store = hCertStore; + WINE_PROVIDERSTORE *store = hCertStore; BOOL ret = TRUE; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, @@ -265,7 +265,7 @@ static BOOL WINAPI CRYPT_ProvControl(HCERTSTORE hCertStore, DWORD dwFlags, WINECRYPT_CERTSTORE *CRYPT_ProvCreateStore(DWORD dwFlags, WINECRYPT_CERTSTORE *memStore, const CERT_STORE_PROV_INFO *pProvInfo) { - PWINE_PROVIDERSTORE ret = CryptMemAlloc(sizeof(WINE_PROVIDERSTORE)); + WINE_PROVIDERSTORE *ret = CryptMemAlloc(sizeof(WINE_PROVIDERSTORE)); if (ret) {

1 0

Jacek Caban : crypt32: Get rid of PCONTEXT_PROPERTY typedef.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 4c77772e1930ed21cdf60758b6d606e1ff46a6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c77772e1930ed21cdf60758b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:58 2013 +0200 crypt32: Get rid of PCONTEXT_PROPERTY typedef. --- dlls/crypt32/proplist.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/proplist.c b/dlls/crypt32/proplist.c index 31185d5..be9bf8d 100644 --- a/dlls/crypt32/proplist.c +++ b/dlls/crypt32/proplist.c @@ -38,7 +38,7 @@ typedef struct _CONTEXT_PROPERTY DWORD cbData; LPBYTE pbData; struct list entry; -} CONTEXT_PROPERTY, *PCONTEXT_PROPERTY; +} CONTEXT_PROPERTY; CONTEXT_PROPERTY_LIST *ContextPropertyList_Create(void) { @@ -55,7 +55,7 @@ CONTEXT_PROPERTY_LIST *ContextPropertyList_Create(void) void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) { - PCONTEXT_PROPERTY prop, next; + CONTEXT_PROPERTY *prop, *next; LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY, entry) @@ -72,7 +72,7 @@ void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) BOOL ContextPropertyList_FindProperty(CONTEXT_PROPERTY_LIST *list, DWORD id, PCRYPT_DATA_BLOB blob) { - PCONTEXT_PROPERTY prop; + CONTEXT_PROPERTY *prop; BOOL ret = FALSE; TRACE("(%p, %d, %p)\n", list, id, blob); @@ -108,7 +108,7 @@ BOOL ContextPropertyList_SetProperty(CONTEXT_PROPERTY_LIST *list, DWORD id, data = NULL; if (!cbData || data) { - PCONTEXT_PROPERTY prop; + CONTEXT_PROPERTY *prop; BOOL found = FALSE; EnterCriticalSection(&list->cs); @@ -148,7 +148,7 @@ BOOL ContextPropertyList_SetProperty(CONTEXT_PROPERTY_LIST *list, DWORD id, void ContextPropertyList_RemoveProperty(CONTEXT_PROPERTY_LIST *list, DWORD id) { - PCONTEXT_PROPERTY prop, next; + CONTEXT_PROPERTY *prop, *next; EnterCriticalSection(&list->cs); LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY, @@ -175,7 +175,7 @@ DWORD ContextPropertyList_EnumPropIDs(CONTEXT_PROPERTY_LIST *list, DWORD id) EnterCriticalSection(&list->cs); if (id) { - PCONTEXT_PROPERTY cursor = NULL; + CONTEXT_PROPERTY *cursor = NULL; LIST_FOR_EACH_ENTRY(cursor, &list->properties, CONTEXT_PROPERTY, entry) { @@ -204,7 +204,7 @@ DWORD ContextPropertyList_EnumPropIDs(CONTEXT_PROPERTY_LIST *list, DWORD id) void ContextPropertyList_Copy(CONTEXT_PROPERTY_LIST *to, CONTEXT_PROPERTY_LIST *from) { - PCONTEXT_PROPERTY prop; + CONTEXT_PROPERTY *prop; EnterCriticalSection(&from->cs); LIST_FOR_EACH_ENTRY(prop, &from->properties, CONTEXT_PROPERTY, entry)

1 0

Jacek Caban : crypt32: Get rid of PWINE_COLLECTIONSTORE typedef.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 8ad37f8a641e3d4cd892a3b10ded922585f15c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad37f8a641e3d4cd892a3b10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:26 2013 +0200 crypt32: Get rid of PWINE_COLLECTIONSTORE typedef. --- dlls/crypt32/collectionstore.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 5ed74c4..677f7bd 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -38,11 +38,11 @@ typedef struct _WINE_COLLECTIONSTORE WINECRYPT_CERTSTORE hdr; CRITICAL_SECTION cs; struct list stores; -} WINE_COLLECTIONSTORE, *PWINE_COLLECTIONSTORE; +} WINE_COLLECTIONSTORE; static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags) { - PWINE_COLLECTIONSTORE cs = store; + WINE_COLLECTIONSTORE *cs = store; WINE_STORE_LIST_ENTRY *entry, *next; TRACE("(%p, %08x)\n", store, dwFlags); @@ -59,7 +59,7 @@ static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags) CRYPT_FreeStore(store); } -static void *CRYPT_CollectionCreateContextFromChild(PWINE_COLLECTIONSTORE store, +static void *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *store, WINE_STORE_LIST_ENTRY *storeEntry, void *child, size_t contextSize, BOOL addRef) { @@ -73,7 +73,7 @@ static void *CRYPT_CollectionCreateContextFromChild(PWINE_COLLECTIONSTORE store, return ret; } -static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, +static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, unsigned int contextFuncsOffset, void *context, void *toReplace, unsigned int contextSize, void **pChildContext) { @@ -133,7 +133,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, * Returns NULL if the collection contains no more items or on error. * Assumes the collection store's lock is held. */ -static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, +static void *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, WINE_STORE_LIST_ENTRY *storeEntry, const CONTEXT_FUNCS *contextFuncs, const WINE_CONTEXT_INTERFACE *contextInterface, void *pPrev, size_t contextSize) { @@ -189,7 +189,7 @@ static BOOL CRYPT_CollectionAddCert(WINECRYPT_CERTSTORE *store, void *cert, { BOOL ret; void *childContext = NULL; - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; ret = CRYPT_CollectionAddContext(cs, offsetof(WINECRYPT_CERTSTORE, certs), cert, toReplace, sizeof(CERT_CONTEXT), &childContext); @@ -211,7 +211,7 @@ static BOOL CRYPT_CollectionAddCert(WINECRYPT_CERTSTORE *store, void *cert, static void *CRYPT_CollectionEnumCert(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; void *ret; TRACE("(%p, %p)\n", store, pPrev); @@ -276,7 +276,7 @@ static BOOL CRYPT_CollectionAddCRL(WINECRYPT_CERTSTORE *store, void *crl, { BOOL ret; void *childContext = NULL; - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; ret = CRYPT_CollectionAddContext(cs, offsetof(WINECRYPT_CERTSTORE, crls), crl, toReplace, sizeof(CRL_CONTEXT), &childContext); @@ -298,7 +298,7 @@ static BOOL CRYPT_CollectionAddCRL(WINECRYPT_CERTSTORE *store, void *crl, static void *CRYPT_CollectionEnumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; void *ret; TRACE("(%p, %p)\n", store, pPrev); @@ -360,7 +360,7 @@ static BOOL CRYPT_CollectionAddCTL(WINECRYPT_CERTSTORE *store, void *ctl, { BOOL ret; void *childContext = NULL; - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; ret = CRYPT_CollectionAddContext(cs, offsetof(WINECRYPT_CERTSTORE, ctls), ctl, toReplace, sizeof(CTL_CONTEXT), &childContext); @@ -382,7 +382,7 @@ static BOOL CRYPT_CollectionAddCTL(WINECRYPT_CERTSTORE *store, void *ctl, static void *CRYPT_CollectionEnumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) { - PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + WINE_COLLECTIONSTORE *cs = (WINE_COLLECTIONSTORE*)store; void *ret; TRACE("(%p, %p)\n", store, pPrev); @@ -443,7 +443,7 @@ static BOOL WINAPI CRYPT_CollectionControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { BOOL ret; - PWINE_COLLECTIONSTORE store = hCertStore; + WINE_COLLECTIONSTORE *store = hCertStore; WINE_STORE_LIST_ENTRY *entry; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, @@ -481,7 +481,7 @@ static BOOL WINAPI CRYPT_CollectionControl(HCERTSTORE hCertStore, DWORD dwFlags, WINECRYPT_CERTSTORE *CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { - PWINE_COLLECTIONSTORE store; + WINE_COLLECTIONSTORE *store; if (dwFlags & CERT_STORE_DELETE_FLAG) { @@ -517,7 +517,7 @@ WINECRYPT_CERTSTORE *CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv, BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, HCERTSTORE hSiblingStore, DWORD dwUpdateFlags, DWORD dwPriority) { - PWINE_COLLECTIONSTORE collection = hCollectionStore; + WINE_COLLECTIONSTORE *collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; WINE_STORE_LIST_ENTRY *entry; BOOL ret; @@ -585,7 +585,7 @@ BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore, void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore, HCERTSTORE hSiblingStore) { - PWINE_COLLECTIONSTORE collection = hCollectionStore; + WINE_COLLECTIONSTORE *collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; WINE_STORE_LIST_ENTRY *store, *next;

1 0