October 2013 - Wine-commits

Volkan Gezer : Turkish Translation for version 1.7.4
by Jeremy Newman 15 Oct '13

15 Oct '13

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

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

15 Oct '13

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

Zhenbo Li : atl90: Added new dll.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 7003bbdfd41b8dd690b41aa1d367927e75ad781f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7003bbdfd41b8dd690b41aa1d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Oct 12 12:11:58 2013 +0800 atl90: Added new dll. --- configure | 2 + configure.ac | 1 + dlls/atl90/Makefile.in | 7 ++++ dlls/atl90/atl90.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/atl90/atl90.spec | 52 ++++++++++++++++++++++++++ include/atlbase.h | 1 + tools/make_specfiles | 1 + 7 files changed, 158 insertions(+), 0 deletions(-) diff --git a/configure b/configure index bfde1af..b523d82 100755 --- a/configure +++ b/configure @@ -881,6 +881,7 @@ enable_atl enable_atl100 enable_atl110 enable_atl80 +enable_atl90 enable_authz enable_avicap32 enable_avifil32 @@ -16679,6 +16680,7 @@ wine_fn_config_test dlls/atl100/tests atl100_test wine_fn_config_dll atl110 enable_atl110 wine_fn_config_dll atl80 enable_atl80 implib wine_fn_config_test dlls/atl80/tests atl80_test +wine_fn_config_dll atl90 enable_atl90 wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 clean,implib,po diff --git a/configure.ac b/configure.ac index a2e1874..4f6e263 100644 --- a/configure.ac +++ b/configure.ac @@ -2716,6 +2716,7 @@ WINE_CONFIG_TEST(dlls/atl100/tests) WINE_CONFIG_DLL(atl110) WINE_CONFIG_DLL(atl80,,[implib]) WINE_CONFIG_TEST(dlls/atl80/tests) +WINE_CONFIG_DLL(atl90) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[clean,implib,po]) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in new file mode 100644 index 0000000..92b5d44 --- /dev/null +++ b/dlls/atl90/Makefile.in @@ -0,0 +1,7 @@ +MODULE = atl90.dll +IMPORTS = atl100 oleaut32 user32 ole32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_90 + +C_SRCS = atl90.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c new file mode 100644 index 0000000..1b46dcb --- /dev/null +++ b/dlls/atl90/atl90.c @@ -0,0 +1,94 @@ +/* + * Copyright 2013 Zhenbo Li + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "atlbase.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl); + +/*********************************************************************** + * AtlGetVersion [atl90.@] + */ +DWORD WINAPI AtlGetVersion(void *reserved) +{ + return _ATL_VER; +} + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + if ( msg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hwnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hwnd, ptr, len ); + AtlAxCreateControlEx( ptr, hwnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin90[] = {'A','t','l','A','x','W','i','n','9','0',0}; + const WCHAR AtlAxWinLic90[] = {'A','t','l','A','x','W','i','n','L','i','c','9','0',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin90; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic90; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec new file mode 100644 index 0000000..aed22bd --- /dev/null +++ b/dlls/atl90/atl90.spec @@ -0,0 +1,52 @@ +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects +20 stub AtlComModuleRevokeClassObjects +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +34 stdcall AtlGetVersion(ptr) +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +42 stdcall AtlAxWinInit() +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc +65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +66 stub AtlWinModuleTerm +67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration +68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration diff --git a/include/atlbase.h b/include/atlbase.h index 660fbf5..bcd634e 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -28,6 +28,7 @@ #define _ATL_VER_30 0x0300 #define _ATL_VER_70 0x0700 #define _ATL_VER_80 0x0800 +#define _ATL_VER_90 0x0900 #define _ATL_VER_100 0x0a00 #define _ATL_VER_110 0x0b00 diff --git a/tools/make_specfiles b/tools/make_specfiles index 5314c41..dbfa5e3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,6 +123,7 @@ my @dll_groups = "atl110", "atl", "atl80", + "atl90", ], [ "advapi32",

1 0

Piotr Caban : comctl32: Ignore tooltip position passed in TTM_TRACKPOSITION if TTF_TRACK flag is not set .
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 26c751ea2968cb1ec63025a4f19567e7cafe86de URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c751ea2968cb1ec63025a4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 15 15:52:30 2013 +0200 comctl32: Ignore tooltip position passed in TTM_TRACKPOSITION if TTF_TRACK flag is not set. --- dlls/comctl32/tests/tooltips.c | 57 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 2 +- 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 71c66a5..87e1d9b 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -758,6 +758,62 @@ static void test_longtextW(void) DestroyWindow(hwnd); } +static BOOL almost_eq(int a, int b) +{ + return a-5<b && a+5>b; +} + +static void test_track(void) +{ + WCHAR textW[] = {'t','e','x','t',0}; + TTTOOLINFOW info = { 0 }; + HWND parent, tt; + LRESULT res; + RECT pos; + + parent = CreateWindowExW(0, WC_STATICW, NULL, WS_CAPTION | WS_VISIBLE, + 50, 50, 300, 300, NULL, NULL, NULL, 0); + ok(parent != NULL, "creation of parent window failed\n"); + + ShowWindow(parent, SW_SHOWNORMAL); + flush_events(100); + + tt = CreateWindowExW(WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleW(NULL), 0); + ok(tt != NULL, "creation of tooltip window failed\n"); + + info.cbSize = TTTOOLINFO_V1_SIZE; + info.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE; + info.hwnd = parent; + info.hinst = GetModuleHandleW(NULL); + info.lpszText = textW; + info.uId = (UINT_PTR)parent; + GetClientRect(parent, &info.rect); + + res = SendMessageW(tt, TTM_ADDTOOLW, 0, (LPARAM)&info); + ok(res, "adding the tool to the tooltip failed\n"); + + SendMessageW(tt, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0)); + SendMessageW(tt, TTM_TRACKACTIVATE, (WPARAM)TRUE, (LPARAM)&info); + SendMessageW(tt, TTM_TRACKPOSITION, 0, MAKELPARAM(10, 10)); + + GetWindowRect(tt, &pos); + ok(almost_eq(pos.left, 10), "pos.left = %d\n", pos.left); + ok(almost_eq(pos.top, 10), "pos.top = %d\n", pos.top); + + info.uFlags = TTF_IDISHWND | TTF_ABSOLUTE; + SendMessageW(tt, TTM_SETTOOLINFO, 0, (LPARAM)&info); + SendMessageW(tt, TTM_TRACKPOSITION, 0, MAKELPARAM(10, 10)); + + GetWindowRect(tt, &pos); + ok(!almost_eq(pos.left, 10), "pos.left = %d\n", pos.left); + ok(!almost_eq(pos.top, 10), "pos.top = %d\n", pos.top); + + DestroyWindow(tt); + DestroyWindow(parent); +} + START_TEST(tooltips) { InitCommonControls(); @@ -768,4 +824,5 @@ START_TEST(tooltips) test_ttm_gettoolinfo(); test_longtextA(); test_longtextW(); + test_track(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 2cc7e47..a325bcc 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -626,7 +626,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) TOOLTIPS_CalcTipSize (infoPtr, &size); TRACE("size %d x %d\n", size.cx, size.cy); - if (track_activate) + if (track_activate && (toolPtr->uFlags & TTF_TRACK)) { rect.left = infoPtr->xTrackPos; rect.top = infoPtr->yTrackPos;

1 0

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

15 Oct '13

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

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

15 Oct '13

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

Jacek Caban : crypt32: Moved CertAddCertificateContextToStore to cert.c.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 988e8a78c2deda0463c8bad9734fa6fd8d4ec543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988e8a78c2deda0463c8bad97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:52:57 2013 +0200 crypt32: Moved CertAddCertificateContextToStore to cert.c. --- dlls/crypt32/cert.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 128 -------------------------------------------------- 2 files changed, 128 insertions(+), 128 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9016d8c..2c96419 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -121,6 +121,134 @@ static const context_vtbl_t cert_vtbl = { Cert_free }; +BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, + PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext) +{ + WINECRYPT_CERTSTORE *store = hCertStore; + BOOL ret = TRUE; + PCCERT_CONTEXT toAdd = NULL, existing = NULL; + + TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, + dwAddDisposition, ppStoreContext); + + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + break; + case CERT_STORE_ADD_NEW: + case CERT_STORE_ADD_REPLACE_EXISTING: + case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: + case CERT_STORE_ADD_USE_EXISTING: + case CERT_STORE_ADD_NEWER: + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: + { + BYTE hashToAdd[20]; + DWORD size = sizeof(hashToAdd); + + ret = CertGetCertificateContextProperty(pCertContext, CERT_HASH_PROP_ID, + hashToAdd, &size); + if (ret) + { + CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd }; + + existing = CertFindCertificateInStore(hCertStore, + pCertContext->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, + NULL); + } + break; + } + default: + FIXME("Unimplemented add disposition %d\n", dwAddDisposition); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_NEW: + if (existing) + { + TRACE("found matching certificate, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_REPLACE_EXISTING: + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: + toAdd = CertDuplicateCertificateContext(pCertContext); + if (existing) + Context_CopyProperties(toAdd, existing); + break; + case CERT_STORE_ADD_USE_EXISTING: + if (existing) + { + Context_CopyProperties(existing, pCertContext); + if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(existing); + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_NEWER: + if (existing) + { + if (CompareFileTime(&existing->pCertInfo->NotBefore, + &pCertContext->pCertInfo->NotBefore) >= 0) + { + TRACE("existing certificate is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: + if (existing) + { + if (CompareFileTime(&existing->pCertInfo->NotBefore, + &pCertContext->pCertInfo->NotBefore) >= 0) + { + TRACE("existing certificate is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + { + toAdd = CertDuplicateCertificateContext(pCertContext); + Context_CopyProperties(toAdd, existing); + } + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + } + + if (toAdd) + { + if (store) + ret = store->vtbl->certs.addContext(store, (void *)toAdd, + (void *)existing, (const void **)ppStoreContext); + else if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(toAdd); + CertFreeCertificateContext(toAdd); + } + CertFreeCertificateContext(existing); + + TRACE("returning %d\n", ret); + return ret; +} + BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, PCCERT_CONTEXT *ppCertContext) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index f11279c..5bd19eb 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -892,134 +892,6 @@ HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV_LEGACY hProv, CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol); } -BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, - PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, - PCCERT_CONTEXT *ppStoreContext) -{ - WINECRYPT_CERTSTORE *store = hCertStore; - BOOL ret = TRUE; - PCCERT_CONTEXT toAdd = NULL, existing = NULL; - - TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, - dwAddDisposition, ppStoreContext); - - switch (dwAddDisposition) - { - case CERT_STORE_ADD_ALWAYS: - break; - case CERT_STORE_ADD_NEW: - case CERT_STORE_ADD_REPLACE_EXISTING: - case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: - case CERT_STORE_ADD_USE_EXISTING: - case CERT_STORE_ADD_NEWER: - case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: - { - BYTE hashToAdd[20]; - DWORD size = sizeof(hashToAdd); - - ret = CertGetCertificateContextProperty(pCertContext, CERT_HASH_PROP_ID, - hashToAdd, &size); - if (ret) - { - CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd }; - - existing = CertFindCertificateInStore(hCertStore, - pCertContext->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, - NULL); - } - break; - } - default: - FIXME("Unimplemented add disposition %d\n", dwAddDisposition); - SetLastError(E_INVALIDARG); - ret = FALSE; - } - - switch (dwAddDisposition) - { - case CERT_STORE_ADD_ALWAYS: - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_NEW: - if (existing) - { - TRACE("found matching certificate, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - ret = FALSE; - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_REPLACE_EXISTING: - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: - toAdd = CertDuplicateCertificateContext(pCertContext); - if (existing) - Context_CopyProperties(toAdd, existing); - break; - case CERT_STORE_ADD_USE_EXISTING: - if (existing) - { - Context_CopyProperties(existing, pCertContext); - if (ppStoreContext) - *ppStoreContext = CertDuplicateCertificateContext(existing); - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_NEWER: - if (existing) - { - if (CompareFileTime(&existing->pCertInfo->NotBefore, - &pCertContext->pCertInfo->NotBefore) >= 0) - { - TRACE("existing certificate is newer, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - ret = FALSE; - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: - if (existing) - { - if (CompareFileTime(&existing->pCertInfo->NotBefore, - &pCertContext->pCertInfo->NotBefore) >= 0) - { - TRACE("existing certificate is newer, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - ret = FALSE; - } - else - { - toAdd = CertDuplicateCertificateContext(pCertContext); - Context_CopyProperties(toAdd, existing); - } - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - } - - if (toAdd) - { - if (store) - ret = store->vtbl->certs.addContext(store, (void *)toAdd, - (void *)existing, (const void **)ppStoreContext); - else if (ppStoreContext) - *ppStoreContext = CertDuplicateCertificateContext(toAdd); - CertFreeCertificateContext(toAdd); - } - CertFreeCertificateContext(existing); - - TRACE("returning %d\n", ret); - return ret; -} - PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pPrev) {

1 0

Jacek Caban : crypt32: Store list entry directly in context_t.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 06f5ee4b2cc7fca44dd32bc1b6d5db1dd11b92f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f5ee4b2cc7fca44dd32bc1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:53:11 2013 +0200 crypt32: Store list entry directly in context_t. --- dlls/crypt32/collectionstore.c | 1 - dlls/crypt32/context.c | 65 ++++++++++++--------------------------- dlls/crypt32/crl.c | 2 +- dlls/crypt32/crypt32_private.h | 5 +++ dlls/crypt32/provstore.c | 1 - dlls/crypt32/regstore.c | 1 - dlls/crypt32/store.c | 1 - 7 files changed, 26 insertions(+), 50 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index dbcf21b..284519f 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -20,7 +20,6 @@ #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index b2b2282..527eb79 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -21,7 +21,6 @@ #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(context); @@ -163,50 +162,30 @@ struct ContextList *ContextList_Create( return list; } -static inline struct list *ContextList_ContextToEntry(const struct ContextList *list, - const void *context) -{ - struct list *ret; - - if (context) - ret = Context_GetExtra(context, list->contextSize); - else - ret = NULL; - return ret; -} - -static inline void *ContextList_EntryToContext(const struct ContextList *list, - struct list *entry) -{ - return (LPBYTE)entry - list->contextSize; -} - void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) { context_t *context; TRACE("(%p, %p, %p)\n", list, toLink, toReplace); - context = Context_CreateLinkContext(list->contextSize, context_from_ptr(toLink), sizeof(struct list)); + context = Context_CreateLinkContext(list->contextSize, context_from_ptr(toLink), 0); if (context) { - struct list *entry = ContextList_ContextToEntry(list, CONTEXT_FROM_BASE_CONTEXT(context)); - TRACE("adding %p\n", context); EnterCriticalSection(&list->cs); if (toReplace) { - struct list *existing = ContextList_ContextToEntry(list, toReplace); + context_t *existing = context_from_ptr(toReplace); - entry->prev = existing->prev; - entry->next = existing->next; - entry->prev->next = entry; - entry->next->prev = entry; - existing->prev = existing->next = existing; + context->u.entry.prev = existing->u.entry.prev; + context->u.entry.next = existing->u.entry.next; + context->u.entry.prev->next = &context->u.entry; + context->u.entry.next->prev = &context->u.entry; + list_init(&existing->u.entry); Context_Release(context_from_ptr(toReplace)); } else - list_add_head(&list->contexts, entry); + list_add_head(&list->contexts, &context->u.entry); LeaveCriticalSection(&list->cs); } return CONTEXT_FROM_BASE_CONTEXT(context); @@ -220,9 +199,7 @@ void *ContextList_Enum(struct ContextList *list, void *pPrev) EnterCriticalSection(&list->cs); if (pPrev) { - struct list *prevEntry = ContextList_ContextToEntry(list, pPrev); - - listNext = list_next(&list->contexts, prevEntry); + listNext = list_next(&list->contexts, &context_from_ptr(pPrev)->u.entry); Context_Release(context_from_ptr(pPrev)); } else @@ -231,7 +208,7 @@ void *ContextList_Enum(struct ContextList *list, void *pPrev) if (listNext) { - ret = ContextList_EntryToContext(list, listNext); + ret = CONTEXT_FROM_BASE_CONTEXT(LIST_ENTRY(listNext, context_t, u.entry)); Context_AddRef(context_from_ptr(ret)); } else @@ -239,35 +216,33 @@ void *ContextList_Enum(struct ContextList *list, void *pPrev) return ret; } -BOOL ContextList_Remove(struct ContextList *list, void *context) +BOOL ContextList_Remove(struct ContextList *list, void *ctx) { - struct list *entry = ContextList_ContextToEntry(list, context); + context_t *context = context_from_ptr(ctx); BOOL inList = FALSE; EnterCriticalSection(&list->cs); - if (!list_empty(entry)) + if (!list_empty(&context->u.entry)) { - list_remove(entry); + list_remove(&context->u.entry); + list_init(&context->u.entry); inList = TRUE; } LeaveCriticalSection(&list->cs); - if (inList) - list_init(entry); + return inList; } static void ContextList_Empty(struct ContextList *list) { - struct list *entry, *next; + context_t *context, *next; EnterCriticalSection(&list->cs); - LIST_FOR_EACH_SAFE(entry, next, &list->contexts) + LIST_FOR_EACH_ENTRY_SAFE(context, next, &list->contexts, context_t, u.entry) { - const void *context = ContextList_EntryToContext(list, entry); - TRACE("removing %p\n", context); - list_remove(entry); - Context_Release(context_from_ptr(context)); + list_remove(&context->u.entry); + Context_Release(context); } LeaveCriticalSection(&list->cs); } diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 9ecc23f..2e3a58f 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -343,7 +343,7 @@ PCCRL_CONTEXT WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT pCrlContext) return pCrlContext; } -BOOL WINAPI CertFreeCRLContext( PCCRL_CONTEXT pCrlContext) +BOOL WINAPI CertFreeCRLContext(PCCRL_CONTEXT pCrlContext) { BOOL ret = TRUE; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 287e0c2..20ba276 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -19,6 +19,8 @@ #ifndef __CRYPT32_PRIVATE_H__ #define __CRYPT32_PRIVATE_H__ +#include "wine/list.h" + /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) @@ -170,6 +172,9 @@ typedef struct _context_t { LONG ref; struct _context_t *linked; CONTEXT_PROPERTY_LIST *properties; + union { + struct list entry; + } u; } BASE_CONTEXT; static inline context_t *context_from_ptr(const void *ptr) diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c index 97b5454..ce9c145 100644 --- a/dlls/crypt32/provstore.c +++ b/dlls/crypt32/provstore.c @@ -20,7 +20,6 @@ #include "winbase.h" #include "wincrypt.h" #include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 8fb7eeb..b79387f 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -23,7 +23,6 @@ #include "winreg.h" #include "winuser.h" #include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 5bd19eb..3dfb850 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -35,7 +35,6 @@ #include "winuser.h" #include "wincrypt.h" #include "wine/debug.h" -#include "wine/list.h" #include "wine/exception.h" #include "crypt32_private.h"

1 0

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

15 Oct '13

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

Jacek Caban : crypt32: Pass contexts as context_t to CONTEXT_FUNCS->delete.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 05f248e968c40374886251565bde57fe30f5f01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f248e968c40374886251565… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:53:38 2013 +0200 crypt32: Pass contexts as context_t to CONTEXT_FUNCS->delete. --- dlls/crypt32/collectionstore.c | 27 ++++++++++++++----------- dlls/crypt32/context.c | 3 +- dlls/crypt32/crypt32_private.h | 6 +--- dlls/crypt32/ctl.c | 3 +- dlls/crypt32/provstore.c | 20 +++++++++--------- dlls/crypt32/store.c | 42 +++++++++++++++++---------------------- 6 files changed, 48 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05f248e968c4037488625…

1 0