October 2013 - Wine-Commits

Volkan Gezer : Turkish Translation for version 1.7.4
by Jeremy Newman Oct. 15, 2013

Oct. 15, 2013

Module: website Branch: master Commit: da887931cb0b641744fe3dbd78ac29fd73c97770 URL: http://source.winehq.org/git/website.git/?a=commit;h=da887931cb0b641744fe3d… Author: Volkan Gezer <volkangezer(a)ieee.org> Date: Tue Oct 15 03:41:07 2013 +0200 Turkish Translation for version 1.7.4 >From ac65f87d5da48118432055d95acf09d0f87dbc03 Mon Sep 17 00:00:00 2001 From: Volkan Gezer <volkangezer(a)gmail.com> Date: Tue, 15 Oct 2013 03:36:15 +0200 Subject: Turkish Translation for version 1.7.4 --- news/tr/2013101101.xml | 15 +++++++++++++++ templates/tr/about.template | 2 +- templates/tr/license.template | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/news/tr/2013101101.xml b/news/tr/2013101101.xml new file mode 100644 index 0000000..a07f8f4 --- /dev/null +++ b/news/tr/2013101101.xml @@ -0,0 +1,15 @@ +<news> +<date>11 Ekim 2013</date> +<title>Wine 1.7.4 Yayınlandı</title> +<body> +<p> Wine geliştirme sürümü 1.7.4 artık kullanılabilir.</p> +<p> Bu sürümdeki <a href="{$root}/announce/1.7.4">yenilikler</a>: +<ul> + <li>Mac sürücüsünde Kakao biçemi tam ekran kipi desteği.</li> + <li>Direct3D komut akışı için daha fazla hazırlık çalışması.</li> + <li>Birçok Winsock ilerlemesi.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +<p><p>Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.4.tar.bz2">artık indirilebilir</a>. +İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. +</p></body></news> \ No newline at end of file diff --git a/templates/tr/about.template b/templates/tr/about.template index aebbc3f..06fa8ab 100644 --- a/templates/tr/about.template +++ b/templates/tr/about.template @@ -3,7 +3,7 @@ <h1 class="title">Wine Hakkında</h1> -<p>Wine ("Wine Is Not an Emulator (Wine Bir Öykünücü Değildir)" kelimelerinin kısaltılmışı olup, Linux, Mac OSX, & BSD benzeri POSIX uyumlu işletim çeşitli sistemlerinde Windows uygulamalarını çalıştırma yetisine sahip uyumluluk katmanıdır. Dahili Windows mantığındaki sanal makine veya öykünücü yerine; Wine, Windows API çağrımlarını anında POSIX çağrılarına dönüştürür ve diğer yöntemlerin dezavantajı olan performans ve bellek kayıplarını önler. Bunun sonucu olarak Windows uygulamalarını, masaüstünüze temiz bir şekilde bütünleştirmenizi sağlar.</p> +<p>Wine (Wine Is Not an Emulator - Wine Bir Öykünücü Değildir) kelimelerinin kısaltılmışı olup, Linux, Mac OSX, & BSD benzeri POSIX uyumlu işletim çeşitli sistemlerinde Windows uygulamalarını çalıştırma yetisine sahip uyumluluk katmanıdır. Dahili Windows mantığındaki sanal makine veya öykünücü yerine; Wine, Windows API çağrımlarını anında POSIX çağrılarına dönüştürür ve diğer yöntemlerin dezavantajı olan performans ve bellek kayıplarını önler. Bunun sonucu olarak Windows uygulamalarını, masaüstünüze temiz bir şekilde bütünleştirmenizi sağlar.</p> <p>Wine, 1993 yılında Bob Amstadt'ın Windows 3.1 programlarını Linux üzerinde çalıştırma desteğinin ilk koordinasyonu altında başladı. Çok başlarda, Wine'ın geliştirmesi bugüne kadar hala projeyi yönetmekte olan Alexandre Julliard'a geçti. Yıllar boyunca, Windows API ve uygulamalar gelişerek yeni donanım ve yazılımın avantajlarını aldıkça, Wine da yeni özelliklere destek vermek üzere uyum sağladı ve daha iyi kullanıcı deneyimi yaşatmak için daha kararlı olup diğer işletim sistemlerine de bağlandı.</p> diff --git a/templates/tr/license.template b/templates/tr/license.template index 9cb3e23..27845e3 100644 --- a/templates/tr/license.template +++ b/templates/tr/license.template @@ -1,5 +1,5 @@  - + <h1 class="title">Wine Lisansı</h1>

1 0

Alexandre Julliard : ntdll/tests: Skip test if LdrAddRefDll is missing.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 63092712c98b68a38011673d19d47f3699bac73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63092712c98b68a38011673d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 18:37:05 2013 +0200 ntdll/tests: Skip test if LdrAddRefDll is missing. --- dlls/ntdll/tests/rtl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 54e3db5..6eb6de3 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1494,6 +1494,12 @@ static void test_LdrAddRefDll(void) NTSTATUS status; BOOL ret; + if (!pLdrAddRefDll) + { + win_skip( "LdrAddRefDll not supported\n" ); + return; + } + mod = LoadLibraryA("comctl32.dll"); ok(mod != NULL, "got %p\n", mod); ret = FreeLibrary(mod);

1 0

Nikolay Sivov : comdlg32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: e011d0e3c73c5483ff2005a72fcfda8eca27d35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e011d0e3c73c5483ff2005a72… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 16:07:35 2013 +0400 comdlg32/tests: Compile with -D__WINESRC__. --- dlls/comdlg32/tests/Makefile.in | 1 - dlls/comdlg32/tests/filedlg.c | 85 ++++++++++++++++++++------------------- dlls/comdlg32/tests/finddlg.c | 5 +- dlls/comdlg32/tests/printdlg.c | 18 +++++---- 4 files changed, 57 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e011d0e3c73c5483ff200…

1 0

Austin English : explorerframe/tests: Build with -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 97861a524b1f8347b8d1cdf06fa181282e5eed08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97861a524b1f8347b8d1cdf06… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 14 10:59:12 2013 -0700 explorerframe/tests: Build with -D__WINESRC__. --- dlls/explorerframe/tests/Makefile.in | 1 - dlls/explorerframe/tests/nstc.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/tests/Makefile.in b/dlls/explorerframe/tests/Makefile.in index 727670e..921eaa9 100644 --- a/dlls/explorerframe/tests/Makefile.in +++ b/dlls/explorerframe/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = explorerframe.dll IMPORTS = uuid shell32 ole32 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ nstc.c diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index ab6a0ce..94ca06c 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -418,10 +418,10 @@ static void process_msgs(void) do { got_msg = FALSE; Sleep(100); - while(PeekMessage( &msg, NULL, 0, 0, PM_REMOVE)) + while(PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); got_msg = TRUE; } } while(got_msg); @@ -432,10 +432,10 @@ static void process_msgs(void) sending WM_TIMER manually does not seem to help us.) */ Sleep(500); - while(PeekMessage( &msg, NULL, 0, 0, PM_REMOVE)) + while(PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } } @@ -1928,17 +1928,17 @@ static void test_events(void) /* Test On*Expand */ hroot = (HTREEITEM)SendMessageW(hwnd_tv, TVM_GETNEXTITEM, TVGN_ROOT, 0); - SendMessage(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot); + SendMessageW(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot); process_msgs(); ok_event_count(pnstceimpl, OnBeforeExpand, 1); ok_event_count(pnstceimpl, OnAfterExpand, 1); ok_event_broken(pnstceimpl, OnItemAdded); /* No event on Vista */ todo_wine ok_event_count(pnstceimpl, OnSelectionChanged, 1); ok_no_events(pnstceimpl); - SendMessage(hwnd_tv, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hroot); + SendMessageW(hwnd_tv, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hroot); process_msgs(); ok_no_events(pnstceimpl); - SendMessage(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot); + SendMessageW(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot); process_msgs(); ok_no_events(pnstceimpl);

1 0

Piotr Caban : msvcrt: Don't validate parameters in _itoa function.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: f906be9ef46635e55d96944de0e45b5618c7e979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f906be9ef46635e55d96944de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 15 16:29:00 2013 +0200 msvcrt: Don't validate parameters in _itoa function. --- dlls/msvcrt/string.c | 31 ++++++++++++++++++------------- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a6b328b..10fb35f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -980,10 +980,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas return MSVCRT_strtoui64_l(nptr, endptr, base, NULL); } -/********************************************************************* - * _ltoa_s (MSVCRT.@) - */ -int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) +static int ltoa_helper(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) { MSVCRT_ulong val; unsigned int digit; @@ -991,14 +988,6 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) char buffer[33], *pos; size_t len; - if (!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; - if (!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; - if (!MSVCRT_CHECK_PMT(radix >= 2 && radix <= 36)) - { - str[0] = '\0'; - return MSVCRT_EINVAL; - } - if (value < 0 && radix == 10) { is_negative = TRUE; @@ -1056,6 +1045,22 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _ltoa_s (MSVCRT.@) + */ +int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) +{ + if (!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(radix >= 2 && radix <= 36)) + { + str[0] = '\0'; + return MSVCRT_EINVAL; + } + + return ltoa_helper(value, str, size, radix); +} + +/********************************************************************* * _ltow_s (MSVCRT.@) */ int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) @@ -1143,7 +1148,7 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) */ char* CDECL _itoa(int value, char *str, int radix) { - return _itoa_s(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str; + return ltoa_helper(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3877d18..d778586 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1882,6 +1882,11 @@ static void test__itoa_s(void) ok(!strcmp(buffer, "-12345678"), "Expected output buffer string to be \"-12345678\", got \"%s\"\n", buffer); + + itoa(100, buffer, 100); + ok(!strcmp(buffer, "10"), + "Expected output buffer string to be \"10\", got \"%s\"\n", buffer); + if (p_set_invalid_parameter_handler) ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n");

1 0

Andrew Eikum : advapi32: Don' t cache HKCR if WOW64 redirection flags are set.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 0d1526bf4a6178063486c517e38141705ba85b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1526bf4a6178063486c517e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 4 09:44:28 2013 -0500 advapi32: Don't cache HKCR if WOW64 redirection flags are set. --- dlls/advapi32/registry.c | 69 +++++++++++++++++++++++----------------- dlls/advapi32/tests/registry.c | 36 ++++++++++++++++++++- 2 files changed, 75 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d1526bf4a6178063486c…

1 0

Kohei Takahashi : msi: Return -1 on open failure in FDI callbacks.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 953359c73f5c609132e6d7caea0947d164a3d4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=953359c73f5c609132e6d7cae… Author: Kohei Takahashi <flast(a)flast.jp> Date: Wed Oct 16 01:08:38 2013 +0900 msi: Return -1 on open failure in FDI callbacks. --- dlls/msi/media.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index d97f4bd..8646069 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -137,7 +137,6 @@ static void CDECL cabinet_free(void *pv) static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) { - HANDLE handle; DWORD dwAccess = 0; DWORD dwShareMode = 0; DWORD dwCreateDisposition = OPEN_EXISTING; @@ -163,12 +162,8 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) else if (oflag & _O_CREAT) dwCreateDisposition = CREATE_ALWAYS; - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - if (handle == INVALID_HANDLE_VALUE) - return 0; - - return (INT_PTR)handle; + return (INT_PTR)CreateFileA(pszFile, dwAccess, dwShareMode, NULL, + dwCreateDisposition, 0, NULL); } static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb) @@ -225,12 +220,12 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) if (!cab) { WARN("failed to get cabinet stream\n"); - return 0; + return -1; } if (!cab->stream[0] || !(encoded = encode_streamname( FALSE, cab->stream + 1 ))) { WARN("failed to encode stream name\n"); - return 0; + return -1; } if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) { @@ -239,7 +234,7 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) { WARN("failed to open stream 0x%08x\n", hr); msi_free( encoded ); - return 0; + return -1; } } msi_free( encoded );

1 0

Jacek Caban : crypt32: Get rid of no longer needed Context_GetLinkedContext .
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 4553e6d144e2aecde7a566edb03bad171d9668e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4553e6d144e2aecde7a566edb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:54:05 2013 +0200 crypt32: Get rid of no longer needed Context_GetLinkedContext. --- dlls/crypt32/collectionstore.c | 43 +++++++++++++++++++++------------------ dlls/crypt32/crypt32_private.h | 3 -- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 855365a..f90eae4 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -98,14 +98,14 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, ret = FALSE; if (toReplace) { - void *existingLinked = Context_GetLinkedContext(toReplace); + context_t *existingLinked = context_from_ptr(toReplace)->linked; CONTEXT_FUNCS *contextFuncs; storeEntry = context_from_ptr(toReplace)->u.ptr; contextFuncs = (CONTEXT_FUNCS*)((LPBYTE)storeEntry->store->vtbl + contextFuncsOffset); ret = contextFuncs->addContext(storeEntry->store, context, - existingLinked, (const void **)&childContext); + context_ptr(existingLinked), (const void **)&childContext); } else { @@ -147,7 +147,8 @@ 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) { - void *ret, *child; + context_t *child; + void *ret, *tmp; struct list *storeNext = list_next(&store->stores, &storeEntry->entry); TRACE("(%p, %p, %p)\n", store, storeEntry, pPrev); @@ -157,17 +158,21 @@ static void *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, /* Ref-counting funny business: "duplicate" (addref) the child, because * the free(pPrev) below can cause the ref count to become negative. */ - child = Context_GetLinkedContext(pPrev); - Context_AddRef(context_from_ptr(child)); - child = contextFuncs->enumContext(storeEntry->store, child); + child = context_from_ptr(pPrev)->linked; + Context_AddRef(child); + tmp = contextFuncs->enumContext(storeEntry->store, context_ptr(child)); + child = tmp ? context_from_ptr(tmp) : NULL; Context_Release(context_from_ptr(pPrev)); pPrev = NULL; } else - child = contextFuncs->enumContext(storeEntry->store, NULL); + { + tmp = contextFuncs->enumContext(storeEntry->store, NULL); + child = tmp ? context_from_ptr(tmp) : NULL; + } if (child) { - ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, context_from_ptr(child), contextSize); - Context_Release(context_from_ptr(child)); + ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, child, contextSize); + Context_Release(child); } else { @@ -259,13 +264,13 @@ static void *Collection_enumCert(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL Collection_deleteCert(WINECRYPT_CERTSTORE *store, context_t *context) { cert_t *cert = (cert_t*)context; + cert_t *linked; BOOL ret; - PCCERT_CONTEXT linked; TRACE("(%p, %p)\n", store, cert); - linked = Context_GetLinkedContext(&cert->ctx); - ret = CertDeleteCertificateFromStore(linked); + linked = (cert_t*)context->linked; + ret = CertDeleteCertificateFromStore(&linked->ctx); Context_Release(&cert->base); return ret; } @@ -332,14 +337,13 @@ static void *Collection_enumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL Collection_deleteCRL(WINECRYPT_CERTSTORE *store, context_t *context) { - crl_t *crl = (crl_t*)context; + crl_t *crl = (crl_t*)context, *linked; BOOL ret; - PCCRL_CONTEXT linked; TRACE("(%p, %p)\n", store, crl); - linked = Context_GetLinkedContext(&crl->ctx); - ret = CertDeleteCRLFromStore(linked); + linked = (crl_t*)context->linked; + ret = CertDeleteCRLFromStore(&linked->ctx); Context_Release(&crl->base); return ret; } @@ -406,14 +410,13 @@ static void *Collection_enumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL Collection_deleteCTL(WINECRYPT_CERTSTORE *store, context_t *context) { - ctl_t *ctl = (ctl_t*)context; + ctl_t *ctl = (ctl_t*)context, *linked; BOOL ret; - PCCTL_CONTEXT linked; TRACE("(%p, %p)\n", store, ctl); - linked = Context_GetLinkedContext(&ctl->ctx); - ret = CertDeleteCTLFromStore(linked); + linked = (ctl_t*)context->linked; + ret = CertDeleteCTLFromStore(&linked->ctx); Context_Release(&ctl->base); return ret; } diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 9382841..33e13a8 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -402,9 +402,6 @@ void *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl) */ context_t *Context_CreateLinkContext(unsigned contextSize, context_t *linked) DECLSPEC_HIDDEN; -/* Gets the context linked to by context, which must be a link context. */ -void *Context_GetLinkedContext(void*) DECLSPEC_HIDDEN; - /* Copies properties from fromContext to toContext. */ void Context_CopyProperties(const void *to, const void *from) DECLSPEC_HIDDEN;

1 0

Jacek Caban : crypt32: Added cloning logic to context's vtbl.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 6ab429363a904529f5de0f4952a98257383723c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab429363a904529f5de0f495… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:53:54 2013 +0200 crypt32: Added cloning logic to context's vtbl. --- dlls/crypt32/cert.c | 15 ++++++++++++- dlls/crypt32/collectionstore.c | 8 +------ dlls/crypt32/context.c | 4 +- dlls/crypt32/crl.c | 15 ++++++++++++- dlls/crypt32/crypt32_private.h | 9 ++++--- dlls/crypt32/ctl.c | 15 ++++++++++++- dlls/crypt32/store.c | 46 ++++++++++++++++++--------------------- 7 files changed, 71 insertions(+), 41 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2c96419..60cff2d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -117,8 +117,21 @@ static void Cert_free(context_t *context) LocalFree(cert->ctx.pCertInfo); } +static context_t *Cert_clone(context_t *context, WINECRYPT_CERTSTORE *store) +{ + cert_t *cert; + + cert = (cert_t*)Context_CreateLinkContext(sizeof(CERT_CONTEXT), context); + if(!cert) + return NULL; + + cert->ctx.hCertStore = store; + return &cert->base; +} + static const context_vtbl_t cert_vtbl = { - Cert_free + Cert_free, + Cert_clone }; BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 9fa1f05..855365a 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -76,7 +76,7 @@ static void *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *store, { context_t *ret; - ret = Context_CreateLinkContext(contextSize, child); + ret = child->vtbl->clone(child, &store->hdr); if (!ret) return NULL; @@ -210,8 +210,6 @@ static BOOL Collection_addCert(WINECRYPT_CERTSTORE *store, void *cert, PCERT_CONTEXT context = CRYPT_CollectionCreateContextFromChild(cs, storeEntry, context_from_ptr(childContext), sizeof(CERT_CONTEXT)); - if (context) - context->hCertStore = store; *ppStoreContext = context; } CertFreeCertificateContext(childContext); @@ -287,8 +285,6 @@ static BOOL Collection_addCRL(WINECRYPT_CERTSTORE *store, void *crl, PCRL_CONTEXT context = CRYPT_CollectionCreateContextFromChild(cs, storeEntry, context_from_ptr(childContext), sizeof(CRL_CONTEXT)); - if (context) - context->hCertStore = store; *ppStoreContext = context; } CertFreeCRLContext(childContext); @@ -363,8 +359,6 @@ static BOOL Collection_addCTL(WINECRYPT_CERTSTORE *store, void *ctl, PCTL_CONTEXT context = CRYPT_CollectionCreateContextFromChild(cs, storeEntry, context_from_ptr(childContext), sizeof(CTL_CONTEXT)); - if (context) - context->hCertStore = store; *ppStoreContext = context; } CertFreeCTLContext(childContext); diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 05e5d79..bb919f2 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -162,13 +162,13 @@ struct ContextList *ContextList_Create( return list; } -void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) +void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace, struct WINE_CRYPTCERTSTORE *store) { context_t *context; TRACE("(%p, %p, %p)\n", list, toLink, toReplace); - context = Context_CreateLinkContext(list->contextSize, context_from_ptr(toLink)); + context = context_from_ptr(toLink)->vtbl->clone(BASE_CONTEXT_FROM_CONTEXT(toLink), store); if (context) { TRACE("adding %p\n", context); diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 2e3a58f..75fdc8e 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -37,8 +37,21 @@ static void CRL_free(context_t *context) LocalFree(crl->ctx.pCrlInfo); } +static context_t *CRL_clone(context_t *context, WINECRYPT_CERTSTORE *store) +{ + crl_t *crl; + + crl = (crl_t*)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context); + if(!crl) + return NULL; + + crl->ctx.hCertStore = store; + return &crl->base; +} + static const context_vtbl_t crl_vtbl = { - CRL_free + CRL_free, + CRL_clone }; PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index fc1e122..9382841 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -159,12 +159,16 @@ void crypt_sip_free(void) DECLSPEC_HIDDEN; void root_store_free(void) DECLSPEC_HIDDEN; void default_chain_engine_free(void) DECLSPEC_HIDDEN; +/* (Internal) certificate store types and functions */ +struct WINE_CRYPTCERTSTORE; + typedef struct _CONTEXT_PROPERTY_LIST CONTEXT_PROPERTY_LIST; typedef struct _context_t context_t; typedef struct { void (*free)(context_t*); + struct _context_t *(*clone)(context_t*,struct WINE_CRYPTCERTSTORE*); } context_vtbl_t; typedef struct _context_t { @@ -257,9 +261,6 @@ extern const WINE_CONTEXT_INTERFACE *pCertInterface DECLSPEC_HIDDEN; extern const WINE_CONTEXT_INTERFACE *pCRLInterface DECLSPEC_HIDDEN; extern const WINE_CONTEXT_INTERFACE *pCTLInterface DECLSPEC_HIDDEN; -/* (Internal) certificate store types and functions */ -struct WINE_CRYPTCERTSTORE; - typedef struct WINE_CRYPTCERTSTORE * (*StoreOpenFunc)(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara); @@ -454,7 +455,7 @@ struct ContextList; struct ContextList *ContextList_Create( const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) DECLSPEC_HIDDEN; -void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) DECLSPEC_HIDDEN; +void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace, struct WINE_CRYPTCERTSTORE *store) DECLSPEC_HIDDEN; void *ContextList_Enum(struct ContextList *list, void *pPrev) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 26072ab..ed92f90 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -39,8 +39,21 @@ static void CTL_free(context_t *context) LocalFree(ctl->ctx.pCtlInfo); } +static context_t *CTL_clone(context_t *context, WINECRYPT_CERTSTORE *store) +{ + ctl_t *ctl; + + ctl = (ctl_t*)Context_CreateLinkContext(sizeof(CTL_CONTEXT), context); + if(!ctl) + return NULL; + + ctl->ctx.hCertStore = store; + return &ctl->base; +} + static const context_vtbl_t ctl_vtbl = { - CTL_free + CTL_free, + CTL_clone }; BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 1ba81c9..4f27e62 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -150,15 +150,13 @@ static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, void *cert, TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); - context = ContextList_Add(ms->certs, cert, toReplace); - if (context) - { - context->hCertStore = store; - if (ppStoreContext) { - *ppStoreContext = CertDuplicateCertificateContext(context); - } - } - return context != 0; + context = ContextList_Add(ms->certs, cert, toReplace, store); + if (!context) + return FALSE; + + if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(context); + return TRUE; } static void *MemStore_enumCert(WINECRYPT_CERTSTORE *store, void *pPrev) @@ -194,14 +192,13 @@ static BOOL MemStore_addCRL(WINECRYPT_CERTSTORE *store, void *crl, TRACE("(%p, %p, %p, %p)\n", store, crl, toReplace, ppStoreContext); - context = ContextList_Add(ms->crls, crl, toReplace); - if (context) - { - context->hCertStore = store; - if (ppStoreContext) - *ppStoreContext = CertDuplicateCRLContext(context); - } - return context != 0; + context = ContextList_Add(ms->crls, crl, toReplace, store); + if (!context) + return FALSE; + + if (ppStoreContext) + *ppStoreContext = CertDuplicateCRLContext(context); + return TRUE; } static void *MemStore_enumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) @@ -237,14 +234,13 @@ static BOOL MemStore_addCTL(WINECRYPT_CERTSTORE *store, void *ctl, TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); - context = ContextList_Add(ms->ctls, ctl, toReplace); - if (context) - { - context->hCertStore = store; - if (ppStoreContext) - *ppStoreContext = CertDuplicateCTLContext(context); - } - return context != 0; + context = ContextList_Add(ms->ctls, ctl, toReplace, store); + if (!context) + return FALSE; + + if (ppStoreContext) + *ppStoreContext = CertDuplicateCTLContext(context); + return TRUE; } static void *MemStore_enumCTL(WINECRYPT_CERTSTORE *store, void *pPrev)

1 0

Jacek Caban : crypt32: Store extra pointer directly in context_t and get rid of Context_GetExtra.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 03ff35c270f8c7786574208d5954825b2a3d76c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ff35c270f8c7786574208d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:53:26 2013 +0200 crypt32: Store extra pointer directly in context_t and get rid of Context_GetExtra. --- dlls/crypt32/collectionstore.c | 42 ++++++++++++++++----------------------- dlls/crypt32/context.c | 8 +++--- dlls/crypt32/crypt32_private.h | 10 ++------ 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 284519f..7be5afb 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -72,14 +72,15 @@ static DWORD Collection_release(WINECRYPT_CERTSTORE *store, DWORD flags) } static void *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *store, - WINE_STORE_LIST_ENTRY *storeEntry, void *child, size_t contextSize) + WINE_STORE_LIST_ENTRY *storeEntry, context_t *child, size_t contextSize) { - context_t *ret = Context_CreateLinkContext(contextSize, context_from_ptr(child), - sizeof(WINE_STORE_LIST_ENTRY*)); + context_t *ret; - if (ret) - *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(context_ptr(ret), contextSize) = storeEntry; + ret = Context_CreateLinkContext(contextSize, child); + if (!ret) + return NULL; + ret->u.ptr = storeEntry; return context_ptr(ret); } @@ -100,8 +101,7 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, void *existingLinked = Context_GetLinkedContext(toReplace); CONTEXT_FUNCS *contextFuncs; - storeEntry = *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(toReplace, - contextSize); + storeEntry = context_from_ptr(toReplace)->u.ptr; contextFuncs = (CONTEXT_FUNCS*)((LPBYTE)storeEntry->store->vtbl + contextFuncsOffset); ret = contextFuncs->addContext(storeEntry->store, context, @@ -166,7 +166,7 @@ static void *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, else child = contextFuncs->enumContext(storeEntry->store, NULL); if (child) { - ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, child, contextSize); + ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, context_from_ptr(child), contextSize); Context_Release(context_from_ptr(child)); } else @@ -206,10 +206,9 @@ static BOOL Collection_addCert(WINECRYPT_CERTSTORE *store, void *cert, cert, toReplace, sizeof(CERT_CONTEXT), &childContext); if (ppStoreContext && childContext) { - WINE_STORE_LIST_ENTRY *storeEntry = *(WINE_STORE_LIST_ENTRY **) - Context_GetExtra(childContext, sizeof(CERT_CONTEXT)); + WINE_STORE_LIST_ENTRY *storeEntry = context_from_ptr(childContext)->u.ptr; PCERT_CONTEXT context = - CRYPT_CollectionCreateContextFromChild(cs, storeEntry, childContext, sizeof(CERT_CONTEXT)); + CRYPT_CollectionCreateContextFromChild(cs, storeEntry, context_from_ptr(childContext), sizeof(CERT_CONTEXT)); if (context) context->hCertStore = store; @@ -229,9 +228,7 @@ static void *Collection_enumCert(WINECRYPT_CERTSTORE *store, void *pPrev) EnterCriticalSection(&cs->cs); if (pPrev) { - WINE_STORE_LIST_ENTRY *storeEntry = - *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(pPrev, - sizeof(CERT_CONTEXT)); + WINE_STORE_LIST_ENTRY *storeEntry = context_from_ptr(pPrev)->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, &storeEntry->store->vtbl->certs, pCertInterface, pPrev, @@ -285,10 +282,9 @@ static BOOL Collection_addCRL(WINECRYPT_CERTSTORE *store, void *crl, crl, toReplace, sizeof(CRL_CONTEXT), &childContext); if (ppStoreContext && childContext) { - WINE_STORE_LIST_ENTRY *storeEntry = *(WINE_STORE_LIST_ENTRY **) - Context_GetExtra(childContext, sizeof(CRL_CONTEXT)); + WINE_STORE_LIST_ENTRY *storeEntry = context_from_ptr(childContext)->u.ptr; PCRL_CONTEXT context = - CRYPT_CollectionCreateContextFromChild(cs, storeEntry, childContext, sizeof(CRL_CONTEXT)); + CRYPT_CollectionCreateContextFromChild(cs, storeEntry, context_from_ptr(childContext), sizeof(CRL_CONTEXT)); if (context) context->hCertStore = store; @@ -308,9 +304,7 @@ static void *Collection_enumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) EnterCriticalSection(&cs->cs); if (pPrev) { - WINE_STORE_LIST_ENTRY *storeEntry = - *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(pPrev, - sizeof(CRL_CONTEXT)); + WINE_STORE_LIST_ENTRY *storeEntry = context_from_ptr(pPrev)->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, &storeEntry->store->vtbl->crls, pCRLInterface, pPrev, sizeof(CRL_CONTEXT)); @@ -363,10 +357,9 @@ static BOOL Collection_addCTL(WINECRYPT_CERTSTORE *store, void *ctl, ctl, toReplace, sizeof(CTL_CONTEXT), &childContext); if (ppStoreContext && childContext) { - WINE_STORE_LIST_ENTRY *storeEntry = *(WINE_STORE_LIST_ENTRY **) - Context_GetExtra(childContext, sizeof(CTL_CONTEXT)); + WINE_STORE_LIST_ENTRY *storeEntry = context_from_ptr(childContext)->u.ptr; PCTL_CONTEXT context = - CRYPT_CollectionCreateContextFromChild(cs, storeEntry, childContext, sizeof(CTL_CONTEXT)); + CRYPT_CollectionCreateContextFromChild(cs, storeEntry, context_from_ptr(childContext), sizeof(CTL_CONTEXT)); if (context) context->hCertStore = store; @@ -386,8 +379,7 @@ static void *Collection_enumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) EnterCriticalSection(&cs->cs); if (pPrev) { - WINE_STORE_LIST_ENTRY *storeEntry = - *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(pPrev, sizeof(CTL_CONTEXT)); + WINE_STORE_LIST_ENTRY *storeEntry = context_from_ptr(pPrev)->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, &storeEntry->store->vtbl->ctls, pCTLInterface, pPrev, sizeof(CTL_CONTEXT)); diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 527eb79..6809b4b 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -50,13 +50,13 @@ void *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl) return CONTEXT_FROM_BASE_CONTEXT(context); } -context_t *Context_CreateLinkContext(unsigned int contextSize, context_t *linked, unsigned int extra) +context_t *Context_CreateLinkContext(unsigned int contextSize, context_t *linked) { context_t *context; - TRACE("(%d, %p, %d)\n", contextSize, linked, extra); + TRACE("(%d, %p)\n", contextSize, linked); - context = CryptMemAlloc(contextSize + sizeof(BASE_CONTEXT) + extra); + context = CryptMemAlloc(sizeof(context_t) + contextSize); if (!context) return NULL; @@ -168,7 +168,7 @@ void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) TRACE("(%p, %p, %p)\n", list, toLink, toReplace); - context = Context_CreateLinkContext(list->contextSize, context_from_ptr(toLink), 0); + context = Context_CreateLinkContext(list->contextSize, context_from_ptr(toLink)); if (context) { TRACE("adding %p\n", context); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 20ba276..de1383c 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -174,6 +174,7 @@ typedef struct _context_t { CONTEXT_PROPERTY_LIST *properties; union { struct list entry; + void *ptr; } u; } BASE_CONTEXT; @@ -395,17 +396,12 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indent, */ void *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl) DECLSPEC_HIDDEN; -/* Creates a new link context with extra bytes. The context refers to linked +/* Creates a new link context. The context refers to linked * rather than owning its own properties. If addRef is TRUE (which ordinarily * it should be) linked is addref'd. * Free with Context_Release. */ -context_t *Context_CreateLinkContext(unsigned contextSize, context_t *linked, unsigned extra) DECLSPEC_HIDDEN; - -/* Returns a pointer to the extra bytes allocated with context, which must be - * a link context. - */ -void *Context_GetExtra(const void *context, size_t contextSize) DECLSPEC_HIDDEN; +context_t *Context_CreateLinkContext(unsigned contextSize, context_t *linked) DECLSPEC_HIDDEN; /* Gets the context linked to by context, which must be a link context. */ void *Context_GetLinkedContext(void*) DECLSPEC_HIDDEN;

1 0