November 2007 - Wine-Commits

Alexandre Julliard : user32: Make all internal user32 functions and variables hidden.
by Alexandre Julliard Nov. 8, 2007

Nov. 8, 2007

Module: wine Branch: master Commit: c57b5057dbb3e27d3672ff2d50d19fbf98c0cfa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57b5057dbb3e27d3672ff2d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 18:05:49 2007 +0100 user32: Make all internal user32 functions and variables hidden. --- dlls/user32/class.c | 13 ------- dlls/user32/controls.h | 79 +++++++++++++++++++++++++------------------ dlls/user32/dde_private.h | 80 ++++++++++++++++++++++---------------------- dlls/user32/user_private.h | 74 ++++++++++++++++++++-------------------- include/win.h | 46 ++++++++++++------------ 5 files changed, 146 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c57b5057dbb3e27d3672f…

1 0

Alexandre Julliard : winebuild: Add a few nops to stub entry points to make Safedisc happy.
by Alexandre Julliard Nov. 8, 2007

Nov. 8, 2007

Module: wine Branch: master Commit: c32e02e48d3aeba7588b566973c9fb02253e8a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32e02e48d3aeba7588b56697… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 20:36:04 2007 +0100 winebuild: Add a few nops to stub entry points to make Safedisc happy. --- tools/winebuild/import.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index da4b1db..1e9cfe3 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1194,8 +1194,19 @@ void output_stubs( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", asm_name(name) ); - output( "\tsubl $4,%%esp\n" ); + /* flesh out the stub a bit to make safedisc happy */ + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + + output( "\tsubl $4,%%esp\n" ); if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") );

1 0

Alex Villacís Lasso : user32: Fix for failing tests of LB_GETTEXT on listbox on Win98.
by Alexandre Julliard Nov. 8, 2007

Nov. 8, 2007

Module: wine Branch: master Commit: 188610e603ec1a9daa2229a69472fc1421c75555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=188610e603ec1a9daa2229a69… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Nov 7 10:36:53 2007 -0500 user32: Fix for failing tests of LB_GETTEXT on listbox on Win98. --- dlls/user32/tests/listbox.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 7fd5659..8009d38 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -166,15 +166,23 @@ check (const struct listbox_test test) DWORD size = SendMessage (hLB, LB_GETTEXTLEN, i, 0); CHAR *txt; WCHAR *txtw; + int resA, resW; txt = HeapAlloc (GetProcessHeap(), 0, size+1); - SendMessageA(hLB, LB_GETTEXT, i, (LPARAM)txt); + memset(txt, 0, size+1); + resA=SendMessageA(hLB, LB_GETTEXT, i, (LPARAM)txt); ok(!strcmp (txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); txtw = HeapAlloc (GetProcessHeap(), 0, 2*size+2); - SendMessageW(hLB, LB_GETTEXT, i, (LPARAM)txtw); - WideCharToMultiByte( CP_ACP, 0, txtw, -1, txt, size, NULL, NULL ); - ok(!strcmp (txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); + memset(txtw, 0, 2*size+2); + resW=SendMessageW(hLB, LB_GETTEXT, i, (LPARAM)txtw); + if (resA != resW) { + trace("SendMessageW(LB_GETTEXT) not supported on this platform (resA=%d resW=%d), skipping...\n", + resA, resW); + } else { + WideCharToMultiByte( CP_ACP, 0, txtw, -1, txt, size, NULL, NULL ); + ok(!strcmp (txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); + } HeapFree (GetProcessHeap(), 0, txtw); HeapFree (GetProcessHeap(), 0, txt);

1 0

Alex Villacís Lasso : user32: Fix LB_ITEMFROMPOINT tests for listbox control.
by Alexandre Julliard Nov. 8, 2007

Nov. 8, 2007

Module: wine Branch: master Commit: 5f603f823e3f9da62d44b28a4df0895d5e3549ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f603f823e3f9da62d44b28a4… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Nov 7 10:34:55 2007 -0500 user32: Fix LB_ITEMFROMPOINT tests for listbox control. --- dlls/user32/tests/listbox.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 663e37f..7fd5659 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -441,7 +441,12 @@ static void test_listbox_height(void) static void test_itemfrompoint(void) { - HWND hList = CreateWindow( "ListBox", "list test", 0, + /* WS_POPUP is required in order to have a more accurate size calculation ( + without caption). LBS_NOINTEGRALHEIGHT is required in order to test + behavior of partially-displayed item. + */ + HWND hList = CreateWindow( "ListBox", "list test", + WS_VISIBLE|WS_POPUP|LBS_NOINTEGRALHEIGHT, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); LONG r, id; RECT rc; @@ -464,10 +469,14 @@ static void test_itemfrompoint(void) r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); ok( r == 0x1, "ret %x\n", r ); - r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 37 )); + r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 601 )); ok( r == 0x10001, "ret %x\n", r ); - + /* Resize control so that below assertions about sizes are valid */ + r = SendMessage( hList, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok( r == 1, "ret %x\n", r); + r = MoveWindow(hList, 1, 1, 600, (rc.bottom - rc.top + 1) * 9 / 2, TRUE); + ok( r != 0, "ret %x\n", r); id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi2"); ok( id == 2, "item id wrong\n");

1 0

Alexandre Julliard : gdi32: Make all internal gdi functions hidden.
by Alexandre Julliard Nov. 8, 2007

Nov. 8, 2007

Module: wine Branch: master Commit: 9a368cc4756a5bd3ca6fe9380062bec95732a82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a368cc4756a5bd3ca6fe9380… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 17:50:57 2007 +0100 gdi32: Make all internal gdi functions hidden. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 144 ++++++++++++++-------------- dlls/gdi32/gdi_private.h | 173 +++++++++++++++++----------------- dlls/gdi32/mfdrv/metafiledrv.h | 162 ++++++++++++++++---------------- 3 files changed, 240 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a368cc4756a5bd3ca6fe…

1 0

Detlef Riekenberg : winspool: Use unsigned type to avoid a compiler warning .
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: d244a55cce0bb17fc22571c3b144f13091710371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d244a55cce0bb17fc22571c3b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 4 17:57:54 2007 +0100 winspool: Use unsigned type to avoid a compiler warning. --- dlls/winspool.drv/info.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index c4381d4..adb1b63 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -145,7 +145,7 @@ static struct list monitor_handles = LIST_INIT( monitor_handles ); static monitor_t * pm_localport; static opened_printer_t **printer_handles; -static int nb_printer_handles; +static UINT nb_printer_handles; static LONG next_job_id = 1; static DWORD (WINAPI *GDI_CallDeviceCapabilities16)( LPCSTR lpszDevice, LPCSTR lpszPort, @@ -1566,11 +1566,9 @@ static opened_printer_t *get_opened_printer(HANDLE hprn) EnterCriticalSection(&printer_handles_cs); - if ((idx <= 0) || (idx > nb_printer_handles)) - goto end; - - ret = printer_handles[idx - 1]; -end: + if ((idx > 0) && (idx <= nb_printer_handles)) { + ret = printer_handles[idx - 1]; + } LeaveCriticalSection(&printer_handles_cs); return ret; }

1 0

Alexandre Julliard : wine.inf: Add APPDATA and LOCALAPPDATA environment variables.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 28b32972d95185ccafa3430a1db41c2671aa0f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b32972d95185ccafa3430a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:32:57 2007 +0100 wine.inf: Add APPDATA and LOCALAPPDATA environment variables. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index fdb47b9..338dbd2 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -253,7 +253,9 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll" [Environment] +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"APPDATA",,"%16410%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",,"%11%\cmd.exe" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"LOCALAPPDATA",,"%16412%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",2,"%11%;%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive",2,"c:"

1 0

Dan Kegel : msvcrt: Fix two buglets in heap test.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: a1e4758f076190dbef7d06f9e10241d0aabe3788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e4758f076190dbef7d06f9e… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Nov 6 16:52:19 2007 -0800 msvcrt: Fix two buglets in heap test. --- dlls/msvcrt/tests/heap.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 6dac9b4..e2e9a4a 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -148,11 +148,12 @@ static void test_aligned_realloc(size_t size1, size_t size2, size_t alignment) } } } - } - else + p_aligned_free(mem2); + } else { ok(errno == EINVAL, "_aligned_realloc(%p, %d, %d) errno: %d != %d\n", mem, size2, alignment, errno, EINVAL); + p_aligned_free(mem); + } - p_aligned_free(mem); free(mem1); } else @@ -219,11 +220,12 @@ static void test_aligned_offset_realloc(size_t size1, size_t size2, size_t align } } } - } - else + p_aligned_free(mem2); + } else { ok(errno == EINVAL, "_aligned_offset_realloc(%p, %d, %d, %d) errno: %d != %d\n", mem, size2, alignment, offset, errno, EINVAL); + p_aligned_free(mem); + } - p_aligned_free(mem); free(mem1); } else @@ -353,5 +355,8 @@ START_TEST(heap) mem = realloc(NULL, 0); ok(mem != NULL, "memory not (re)allocated for size 0\n"); + if (mem) + free(mem); + test_aligned(); }

1 0

Juan Lang : rsaenh: Use helper function to persist keys.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 58269419e508e1cb8b88420466f0a4daa94d56bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=58269419e508e1cb8b8842046… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 6 11:27:24 2007 -0800 rsaenh: Use helper function to persist keys. --- dlls/rsaenh/rsaenh.c | 161 +++++++++++++++++++++++++------------------------- 1 files changed, 80 insertions(+), 81 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 3318da6..3561339 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -858,108 +858,107 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK } /****************************************************************************** - * destroy_key_container [Internal] + * store_key_pair [Internal] * - * Destructor for key containers. + * Stores a key pair to the registry * * PARAMS - * pObjectHdr [I] Pointer to the key container to be destroyed. + * hCryptKey [I] Handle to the key to be stored + * hKey [I] Registry key where the key pair is to be stored + * szValueName [I] Registry value where key pair's value is to be stored + * dwFlags [I] Flags for protecting the key */ -static void destroy_key_container(OBJECTHDR *pObjectHdr) +static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, LPCSTR szValueName, DWORD dwFlags) { - KEYCONTAINER *pKeyContainer = (KEYCONTAINER*)pObjectHdr; DATA_BLOB blobIn, blobOut; CRYPTKEY *pKey; - CHAR szRSABase[MAX_PATH]; - HKEY hKey, hRootKey; DWORD dwLen; BYTE *pbKey; - if (!(pKeyContainer->dwFlags & CRYPT_VERIFYCONTEXT)) { - /* On WinXP, persistent keys are stored in a file located at: - * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string - */ - sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); - - if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) { - hRootKey = HKEY_LOCAL_MACHINE; - } else { - hRootKey = HKEY_CURRENT_USER; - } - - /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ - /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ - if (RegCreateKeyExA(hRootKey, szRSABase, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY, + (OBJECTHDR**)&pKey)) + { + if (RSAENH_CPExportKey(pKey->hProv, hCryptKey, 0, PRIVATEKEYBLOB, 0, 0, + &dwLen)) { - if (lookup_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair, RSAENH_MAGIC_KEY, - (OBJECTHDR**)&pKey)) + pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen); + if (pbKey) { - if (RSAENH_CPExportKey(pKey->hProv, pKeyContainer->hKeyExchangeKeyPair, 0, - PRIVATEKEYBLOB, 0, 0, &dwLen)) + if (RSAENH_CPExportKey(pKey->hProv, hCryptKey, 0, + PRIVATEKEYBLOB, 0, pbKey, &dwLen)) { - pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen); - if (pbKey) - { - if (RSAENH_CPExportKey(pKey->hProv, pKeyContainer->hKeyExchangeKeyPair, 0, - PRIVATEKEYBLOB, 0, pbKey, &dwLen)) - { - blobIn.pbData = pbKey; - blobIn.cbData = dwLen; - - if (CryptProtectData(&blobIn, NULL, NULL, NULL, NULL, - (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) ? - CRYPTPROTECT_LOCAL_MACHINE : 0, - &blobOut)) - { - RegSetValueExA(hKey, "KeyExchangeKeyPair", 0, REG_BINARY, - blobOut.pbData, blobOut.cbData); - HeapFree(GetProcessHeap(), 0, blobOut.pbData); - } - } - HeapFree(GetProcessHeap(), 0, pbKey); - } - } - release_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair, - RSAENH_MAGIC_KEY); - } + blobIn.pbData = pbKey; + blobIn.cbData = dwLen; - if (lookup_handle(&handle_table, pKeyContainer->hSignatureKeyPair, RSAENH_MAGIC_KEY, - (OBJECTHDR**)&pKey)) - { - if (RSAENH_CPExportKey(pKey->hProv, pKeyContainer->hSignatureKeyPair, 0, - PRIVATEKEYBLOB, 0, 0, &dwLen)) - { - pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen); - if (pbKey) + if (CryptProtectData(&blobIn, NULL, NULL, NULL, NULL, + dwFlags, &blobOut)) { - if (RSAENH_CPExportKey(pKey->hProv, pKeyContainer->hSignatureKeyPair, 0, - PRIVATEKEYBLOB, 0, pbKey, &dwLen)) - { - blobIn.pbData = pbKey; - blobIn.cbData = dwLen; - - if (CryptProtectData(&blobIn, NULL, NULL, NULL, NULL, - (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) ? - CRYPTPROTECT_LOCAL_MACHINE : 0, - &blobOut)) - { - RegSetValueExA(hKey, "SignatureKeyPair", 0, REG_BINARY, - blobOut.pbData, blobOut.cbData); - HeapFree(GetProcessHeap(), 0, blobOut.pbData); - } - } - HeapFree(GetProcessHeap(), 0, pbKey); + RegSetValueExA(hKey, szValueName, 0, REG_BINARY, + blobOut.pbData, blobOut.cbData); + HeapFree(GetProcessHeap(), 0, blobOut.pbData); } } - release_handle(&handle_table, pKeyContainer->hSignatureKeyPair, - RSAENH_MAGIC_KEY); + HeapFree(GetProcessHeap(), 0, pbKey); } - - RegCloseKey(hKey); } + release_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY); + } +} + +/****************************************************************************** + * store_key_container_keys [Internal] + * + * Stores key container's keys in a persistent location. + * + * PARAMS + * pKeyContainer [I] Pointer to the key container to be destroyed. + */ +static void store_key_container_keys(KEYCONTAINER *pKeyContainer) +{ + CHAR szRSABase[MAX_PATH]; + HKEY hKey, hRootKey; + DWORD dwFlags; + + /* On WinXP, persistent keys are stored in a file located at: + * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string + */ + sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); + + if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) { + hRootKey = HKEY_LOCAL_MACHINE; + dwFlags = CRYPTPROTECT_LOCAL_MACHINE; + } else { + hRootKey = HKEY_CURRENT_USER; + dwFlags = 0; } + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ + if (RegCreateKeyExA(hRootKey, szRSABase, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + { + store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey, + "KeyExchangeKeyPair", dwFlags); + store_key_pair(pKeyContainer->hSignatureKeyPair, hKey, + "SignatureKeyPair", dwFlags); + RegCloseKey(hKey); + } +} + +/****************************************************************************** + * destroy_key_container [Internal] + * + * Destructor for key containers. + * + * PARAMS + * pObjectHdr [I] Pointer to the key container to be destroyed. + */ +static void destroy_key_container(OBJECTHDR *pObjectHdr) +{ + KEYCONTAINER *pKeyContainer = (KEYCONTAINER*)pObjectHdr; + + if (!(pKeyContainer->dwFlags & CRYPT_VERIFYCONTEXT)) + store_key_container_keys(pKeyContainer); HeapFree( GetProcessHeap(), 0, pKeyContainer ); }

1 0

Juan Lang : rsaenh: Use helper function to create a container' s registry key.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 060ed4cf02d6144e5a35d6f01f94f26dbe44634f URL: http://source.winehq.org/git/wine.git/?a=commit;h=060ed4cf02d6144e5a35d6f01… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 6 11:37:00 2007 -0800 rsaenh: Use helper function to create a container's registry key. --- dlls/rsaenh/rsaenh.c | 64 +++++++++++++++++++++++++++++--------------------- 1 files changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 3561339..2e9ebfd 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -906,6 +906,35 @@ static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, LPCSTR szValueName, D } /****************************************************************************** + * create_container_key [Internal] + * + * Creates the registry key for a key container's persistent storage. + * + * PARAMS + * pKeyContainer [I] Pointer to the key container + * sam [I] Desired registry access + * phKey [O] Returned key + */ +static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey) +{ + CHAR szRSABase[MAX_PATH]; + HKEY hRootKey; + + sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); + + if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) + hRootKey = HKEY_LOCAL_MACHINE; + else + hRootKey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ + return RegCreateKeyExA(hRootKey, szRSABase, 0, NULL, + REG_OPTION_NON_VOLATILE, sam, NULL, phKey, NULL) + == ERROR_SUCCESS; +} + +/****************************************************************************** * store_key_container_keys [Internal] * * Stores key container's keys in a persistent location. @@ -915,27 +944,19 @@ static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, LPCSTR szValueName, D */ static void store_key_container_keys(KEYCONTAINER *pKeyContainer) { - CHAR szRSABase[MAX_PATH]; - HKEY hKey, hRootKey; + HKEY hKey; DWORD dwFlags; /* On WinXP, persistent keys are stored in a file located at: * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string */ - sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); - if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) { - hRootKey = HKEY_LOCAL_MACHINE; + if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) dwFlags = CRYPTPROTECT_LOCAL_MACHINE; - } else { - hRootKey = HKEY_CURRENT_USER; + else dwFlags = 0; - } - - /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ - /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ - if (RegCreateKeyExA(hRootKey, szRSABase, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + + if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) { store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey, "KeyExchangeKeyPair", dwFlags); @@ -1006,21 +1027,10 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const /* The new key container has to be inserted into the CSP immediately * after creation to be available for CPGetProvParam's PP_ENUMCONTAINERS. */ if (!(dwFlags & CRYPT_VERIFYCONTEXT)) { - CHAR szRSABase[MAX_PATH]; - HKEY hRootKey, hKey; - - sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); - - if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) { - hRootKey = HKEY_LOCAL_MACHINE; - } else { - hRootKey = HKEY_CURRENT_USER; - } + HKEY hKey; - /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ - /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ - RegCreateKeyA(hRootKey, szRSABase, &hKey); - RegCloseKey(hKey); + if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) + RegCloseKey(hKey); } }

1 0