August 2008 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Remove useless hash_table_t typedef.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: b4f43e372ed21a32d571c31ac5999abbb51760a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4f43e372ed21a32d571c31ac… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Fri Aug 29 02:12:10 2008 +0200 wined3d: Remove useless hash_table_t typedef. --- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/utils.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 97875c7..20c4ebe 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -50,7 +50,7 @@ struct atifs_ffp_desc struct atifs_private_data { - hash_table_t *fragment_shaders; /* A hashtable to track fragment pipeline replacement shaders */ + struct hash_table_t *fragment_shaders; /* A hashtable to track fragment pipeline replacement shaders */ }; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a577e28..31a1944 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1564,12 +1564,12 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4] /* Hash table functions */ -hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function_t *compare_function) +struct hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function_t *compare_function) { - hash_table_t *table; + struct hash_table_t *table; unsigned int initial_size = 8; - table = HeapAlloc(GetProcessHeap(), 0, sizeof(hash_table_t) + (initial_size * sizeof(struct list))); + table = HeapAlloc(GetProcessHeap(), 0, sizeof(struct hash_table_t) + (initial_size * sizeof(struct list))); if (!table) { ERR("Failed to allocate table, returning NULL.\n"); @@ -1607,7 +1607,7 @@ hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function return table; } -void hash_table_destroy(hash_table_t *table, void (*free_value)(void *value, void *cb), void *cb) +void hash_table_destroy(struct hash_table_t *table, void (*free_value)(void *value, void *cb), void *cb) { unsigned int i = 0; @@ -1624,7 +1624,7 @@ void hash_table_destroy(hash_table_t *table, void (*free_value)(void *value, voi HeapFree(GetProcessHeap(), 0, table); } -static inline struct hash_table_entry_t *hash_table_get_by_idx(hash_table_t *table, void *key, unsigned int idx) +static inline struct hash_table_entry_t *hash_table_get_by_idx(struct hash_table_t *table, void *key, unsigned int idx) { struct hash_table_entry_t *entry; @@ -1635,7 +1635,7 @@ static inline struct hash_table_entry_t *hash_table_get_by_idx(hash_table_t *tab return NULL; } -static BOOL hash_table_resize(hash_table_t *table, unsigned int new_bucket_count) +static BOOL hash_table_resize(struct hash_table_t *table, unsigned int new_bucket_count) { unsigned int new_entry_count = 0; struct hash_table_entry_t *new_entries; @@ -1694,7 +1694,7 @@ static BOOL hash_table_resize(hash_table_t *table, unsigned int new_bucket_count return TRUE; } -void hash_table_put(hash_table_t *table, void *key, void *value) +void hash_table_put(struct hash_table_t *table, void *key, void *value) { unsigned int idx; unsigned int hash; @@ -1767,12 +1767,12 @@ void hash_table_put(hash_table_t *table, void *key, void *value) ++table->count; } -void hash_table_remove(hash_table_t *table, void *key) +void hash_table_remove(struct hash_table_t *table, void *key) { hash_table_put(table, key, NULL); } -void *hash_table_get(hash_table_t *table, void *key) +void *hash_table_get(struct hash_table_t *table, void *key) { unsigned int idx; struct hash_table_entry_t *entry; @@ -2004,11 +2004,11 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting } #undef GLINFO_LOCATION -struct ffp_desc *find_ffp_shader(hash_table_t *fragment_shaders, struct ffp_settings *settings) +struct ffp_desc *find_ffp_shader(struct hash_table_t *fragment_shaders, struct ffp_settings *settings) { return (struct ffp_desc *)hash_table_get(fragment_shaders, settings);} -void add_ffp_shader(hash_table_t *shaders, struct ffp_desc *desc) { +void add_ffp_shader(struct hash_table_t *shaders, struct ffp_desc *desc) { struct ffp_settings *key = HeapAlloc(GetProcessHeap(), 0, sizeof(*key)); /* Note that the key is the implementation independent part of the ffp_desc structure, * whereas desc points to an extended structure with implementation specific parts. diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 897e654..f4b81f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -54,7 +54,7 @@ struct hash_table_entry_t { struct list entry; }; -typedef struct { +struct hash_table_t { hash_function_t *hash_function; compare_function_t *compare_function; struct list *buckets; @@ -65,13 +65,13 @@ typedef struct { unsigned int count; unsigned int grow_size; unsigned int shrink_size; -} hash_table_t; +}; -hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function_t *compare_function); -void hash_table_destroy(hash_table_t *table, void (*free_value)(void *value, void *cb), void *cb); -void *hash_table_get(hash_table_t *table, void *key); -void hash_table_put(hash_table_t *table, void *key, void *value); -void hash_table_remove(hash_table_t *table, void *key); +struct hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function_t *compare_function); +void hash_table_destroy(struct hash_table_t *table, void (*free_value)(void *value, void *cb), void *cb); +void *hash_table_get(struct hash_table_t *table, void *key); +void hash_table_put(struct hash_table_t *table, void *key, void *value); +void hash_table_remove(struct hash_table_t *table, void *key); /* Device caps */ #define MAX_PALETTES 65536 @@ -257,7 +257,7 @@ extern const shader_backend_t none_shader_backend; /* GLSL shader private data */ struct shader_glsl_priv { - hash_table_t *glsl_program_lookup; + struct hash_table_t *glsl_program_lookup; struct glsl_shader_prog_link *glsl_program; GLhandleARB depth_blt_glsl_program_id; }; @@ -269,7 +269,7 @@ struct shader_arb_priv { GLuint depth_blt_vprogram_id; GLuint depth_blt_fprogram_id; BOOL use_arbfp_fixed_func; - hash_table_t *fragment_shaders; + struct hash_table_t *fragment_shaders; }; /* X11 locking */ @@ -795,8 +795,8 @@ struct ffp_desc }; void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *settings, BOOL ignore_textype); -struct ffp_desc *find_ffp_shader(hash_table_t *fragment_shaders, struct ffp_settings *settings); -void add_ffp_shader(hash_table_t *shaders, struct ffp_desc *desc); +struct ffp_desc *find_ffp_shader(struct hash_table_t *fragment_shaders, struct ffp_settings *settings); +void add_ffp_shader(struct hash_table_t *shaders, struct ffp_desc *desc); BOOL ffp_program_key_compare(void *keya, void *keyb); unsigned int ffp_program_key_hash(void *key);

1 0

Alexander Nicolaysen Sørnes : regedit: Convert value creation to unicode.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 9d6b80b12131808d806564bb72d2ea14d6ee13ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6b80b12131808d806564bb7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 28 16:18:44 2008 +0200 regedit: Convert value creation to unicode. --- programs/regedit/edit.c | 14 ++++---- programs/regedit/framewnd.c | 71 ++++++++++++++++++++++-------------------- programs/regedit/main.h | 2 +- 3 files changed, 45 insertions(+), 42 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 1c26baa..4e4c1ed 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -449,27 +449,27 @@ done: return result; } -BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, DWORD valueType, LPTSTR valueName) +BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName) { LONG lRet = ERROR_SUCCESS; - TCHAR newValue[256]; + WCHAR newValue[256]; DWORD valueDword = 0; BOOL result = FALSE; int valueNum; HKEY hKey; - lRet = RegOpenKeyEx(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); + lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, lRet); return FALSE; } - if (!LoadString(GetModuleHandle(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; + if (!LoadStringW(GetModuleHandle(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; /* try to find out a name for the newly create key (max 100 times) */ for (valueNum = 1; valueNum < 100; valueNum++) { - wsprintf(valueName, newValue, valueNum); - lRet = RegQueryValueEx(hKey, valueName, 0, 0, 0, 0); + wsprintfW(valueName, newValue, valueNum); + lRet = RegQueryValueExW(hKey, valueName, 0, 0, 0, 0); if (lRet == ERROR_FILE_NOT_FOUND) break; } if (lRet != ERROR_FILE_NOT_FOUND) { @@ -477,7 +477,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, DWORD valueType, LPT goto done; } - lRet = RegSetValueEx(hKey, valueName, 0, valueType, (BYTE*)&valueDword, sizeof(DWORD)); + lRet = RegSetValueExW(hKey, valueName, 0, valueType, (BYTE*)&valueDword, sizeof(DWORD)); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, lRet); goto done; diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index dc76eab..2053f70 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -636,15 +636,11 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HKEY hKeyRoot = 0; - LPCTSTR keyPath; LPCTSTR valueName; - TCHAR newKey[MAX_NEW_KEY_LEN]; DWORD valueType; int curIndex; BOOL firstItem = TRUE; - keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - if (LOWORD(wParam) >= ID_FAVORITE_FIRST && LOWORD(wParam) <= ID_FAVORITE_LAST) { HKEY hKey; if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, @@ -683,15 +679,15 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } case ID_EDIT_DELETE: if (GetFocus() == g_pChildWnd->hTreeWnd) { - WCHAR* keyPathW = GetWideString(keyPath); + WCHAR* keyPath = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); if (keyPath == 0 || *keyPath == 0) { - MessageBeep(MB_ICONHAND); - } else if (DeleteKey(hWnd, hKeyRoot, keyPathW)) { + MessageBeep(MB_ICONHAND); + } else if (DeleteKey(hWnd, hKeyRoot, keyPath)) { DeleteNode(g_pChildWnd->hTreeWnd, 0); } - HeapFree(GetProcessHeap(), 0, keyPathW); + HeapFree(GetProcessHeap(), 0, keyPath); } else if (GetFocus() == g_pChildWnd->hListWnd) { - WCHAR* keyPathW = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + WCHAR* keyPath = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); while(curIndex != -1) { WCHAR* valueNameW; @@ -705,7 +701,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; } valueNameW = GetWideString(valueName); - if (!DeleteValue(hWnd, hKeyRoot, keyPathW, valueNameW, curIndex==-1 && firstItem)) + if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueNameW, curIndex==-1 && firstItem)) { HeapFree(GetProcessHeap(), 0, valueNameW); break; @@ -713,8 +709,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) firstItem = FALSE; HeapFree(GetProcessHeap(), 0, valueNameW); } - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPathW, NULL); - HeapFree(GetProcessHeap(), 0, keyPathW); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); + HeapFree(GetProcessHeap(), 0, keyPath); } break; case ID_EDIT_MODIFY: @@ -722,10 +718,12 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) LPCWSTR valueNameW = GetValueName(g_pChildWnd->hListWnd); CHAR* valueNameA = GetMultiByteString(valueNameW); WCHAR* keyPathW = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - if (ModifyValue(hWnd, hKeyRoot, keyPath, valueNameA)) + CHAR* keyPathA = GetMultiByteString(keyPathW); + if (ModifyValue(hWnd, hKeyRoot, keyPathA, valueNameA)) RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPathW, valueNameW); HeapFree(GetProcessHeap(), 0, valueNameA); HeapFree(GetProcessHeap(), 0, keyPathW); + HeapFree(GetProcessHeap(), 0, keyPathA); break; } case ID_EDIT_FIND: @@ -774,12 +772,12 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_NEW_KEY: { WCHAR newKeyW[MAX_NEW_KEY_LEN]; - WCHAR* keyPathW = GetWideString(keyPath); - if (CreateKey(hWnd, hKeyRoot, keyPathW, newKeyW)) { + WCHAR* keyPath = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + if (CreateKey(hWnd, hKeyRoot, keyPath, newKeyW)) { if (InsertNode(g_pChildWnd->hTreeWnd, 0, newKeyW)) StartKeyRename(g_pChildWnd->hTreeWnd); } - HeapFree(GetProcessHeap(), 0, keyPathW); + HeapFree(GetProcessHeap(), 0, keyPath); } break; case ID_EDIT_NEW_STRINGVALUE: @@ -795,24 +793,29 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) valueType = REG_DWORD; /* fall through */ create_value: - if (CreateValue(hWnd, hKeyRoot, keyPath, valueType, newKey)) { - WCHAR* keyPathW = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - WCHAR* newKeyW = GetWideString(newKey); - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPathW, newKeyW); - HeapFree(GetProcessHeap(), 0, keyPathW); - HeapFree(GetProcessHeap(), 0, newKeyW); + { + WCHAR* keyPath = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + WCHAR newKey[MAX_NEW_KEY_LEN]; + if (CreateValue(hWnd, hKeyRoot, keyPath, valueType, newKey)) { + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, newKey); StartValueRename(g_pChildWnd->hListWnd); - /* FIXME: start rename */ - } + /* FIXME: start rename */ + } + HeapFree(GetProcessHeap(), 0, keyPath); + } break; case ID_EDIT_RENAME: - if (keyPath == 0 || *keyPath == 0) { - MessageBeep(MB_ICONHAND); - } else if (GetFocus() == g_pChildWnd->hTreeWnd) { - StartKeyRename(g_pChildWnd->hTreeWnd); - } else if (GetFocus() == g_pChildWnd->hListWnd) { - StartValueRename(g_pChildWnd->hListWnd); - } + { + WCHAR* keyPath = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + if (keyPath == 0 || *keyPath == 0) { + MessageBeep(MB_ICONHAND); + } else if (GetFocus() == g_pChildWnd->hTreeWnd) { + StartKeyRename(g_pChildWnd->hTreeWnd); + } else if (GetFocus() == g_pChildWnd->hListWnd) { + StartValueRename(g_pChildWnd->hListWnd); + } + HeapFree(GetProcessHeap(), 0, keyPath); + } break; case ID_REGISTRY_PRINTERSETUP: /*PRINTDLG pd;*/ @@ -856,10 +859,10 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } case ID_VIEW_REFRESH: { - WCHAR* keyPathW = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + WCHAR* keyPath = GetItemPathW(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); RefreshTreeView(g_pChildWnd->hTreeWnd); - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPathW, NULL); - HeapFree(GetProcessHeap(), 0, keyPathW); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); + HeapFree(GetProcessHeap(), 0, keyPath); } break; /*case ID_OPTIONS_TOOLBAR:*/ diff --git a/programs/regedit/main.h b/programs/regedit/main.h index af1e9bb..aacacc6 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -141,7 +141,7 @@ extern HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mod /* edit.c */ extern BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); -extern BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, DWORD valueType, LPTSTR valueName); +extern BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); extern BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName); extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox);

1 0

Juan Lang : cryptuiapi: Add a stub for CryptUIDlgCertMgr.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 6c4d39bcaf2ae817612b876e46d365d13e2b06b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4d39bcaf2ae817612b876e4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 28 08:41:59 2008 -0700 cryptuiapi: Add a stub for CryptUIDlgCertMgr. --- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index aa4b00a..b023ed2 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -1,5 +1,5 @@ 1 stub ACUIProviderInvokeUI -2 stub CryptUIDlgCertMgr +2 stdcall CryptUIDlgCertMgr(ptr) 3 stub CryptUIDlgFreeCAContext 4 stub CryptUIDlgSelectCA 5 stub CryptUIDlgSelectCertificateA diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a951f01..8784915 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -22,6 +22,8 @@ #include "windef.h" #include "winbase.h" +#include "winuser.h" +#include "cryptuiapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cryptui); @@ -44,3 +46,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/*********************************************************************** + * CryptUIDlgCertMgr (CRYPTUI.@) + */ +BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) +{ + FIXME("(%p): stub\n", pCryptUICertMgr); + return FALSE; +}

1 0

Juan Lang : crypt32: Add tests showing signed CTLs aren' t decoded by CryptDecodeObject.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 7ddb29f6fdbb18258e50bdc5f31e764cad8020d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ddb29f6fdbb18258e50bdc5f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 28 08:55:39 2008 -0700 crypt32: Add tests showing signed CTLs aren't decoded by CryptDecodeObject. --- dlls/crypt32/tests/encode.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3f5b763..107ed3d 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5285,6 +5285,42 @@ static void compareCTLInfo(LPCSTR header, const CTL_INFO *expected, } } +static const BYTE signedCTL[] = { +0x30,0x81,0xc7,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0, +0x81,0xb9,0x30,0x81,0xb6,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x28,0x06,0x09,0x2a,0x86, +0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x1b,0x04,0x19,0x30,0x17,0x30,0x00, +0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30, +0x30,0x5a,0x30,0x02,0x06,0x00,0x31,0x77,0x30,0x75,0x02,0x01,0x01,0x30,0x1a, +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08, +0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05, +0x00,0x04,0x40,0xca,0xd8,0x32,0xd1,0xbd,0x97,0x61,0x54,0xd6,0x80,0xcf,0x0d, +0xbd,0xa2,0x42,0xc7,0xca,0x37,0x91,0x7d,0x9d,0xac,0x8c,0xdf,0x05,0x8a,0x39, +0xc6,0x07,0xc1,0x37,0xe6,0xb9,0xd1,0x0d,0x26,0xec,0xa5,0xb0,0x8a,0x51,0x26, +0x2b,0x4f,0x73,0x44,0x86,0x83,0x5e,0x2b,0x6e,0xcc,0xf8,0x1b,0x85,0x53,0xe9, +0x7a,0x80,0x8f,0x6b,0x42,0x19,0x93 }; +static const BYTE signedCTLWithCTLInnerContent[] = { +0x30,0x82,0x01,0x0f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02, +0xa0,0x82,0x01,0x00,0x30,0x81,0xfd,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06, +0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x30,0x06,0x09, +0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x0a,0x01,0xa0,0x23,0x30,0x21,0x30,0x00, +0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30, +0x30,0x5a,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05, +0x00,0x31,0x81,0xb5,0x30,0x81,0xb2,0x02,0x01,0x01,0x30,0x1a,0x30,0x15,0x31, +0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20, +0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48, +0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0xa0,0x3b,0x30,0x18,0x06,0x09,0x2a,0x86, +0x48,0x86,0xf7,0x0d,0x01,0x09,0x03,0x31,0x0b,0x06,0x09,0x2b,0x06,0x01,0x04, +0x01,0x82,0x37,0x0a,0x01,0x30,0x1f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x01,0x09,0x04,0x31,0x12,0x04,0x10,0x54,0x71,0xbc,0xe1,0x56,0x31,0xa2,0xf9, +0x65,0x70,0x34,0xf8,0xe2,0xe9,0xb4,0xf4,0x30,0x04,0x06,0x00,0x05,0x00,0x04, +0x40,0x2f,0x1b,0x9f,0x5a,0x4a,0x15,0x73,0xfa,0xb1,0x93,0x3d,0x09,0x52,0xdf, +0x6b,0x98,0x4b,0x13,0x5e,0xe7,0xbf,0x65,0xf4,0x9c,0xc2,0xb1,0x77,0x09,0xb1, +0x66,0x4d,0x72,0x0d,0xb1,0x1a,0x50,0x20,0xe0,0x57,0xa2,0x39,0xc7,0xcd,0x7f, +0x8e,0xe7,0x5f,0x76,0x2b,0xd1,0x6a,0x82,0xb3,0x30,0x25,0x61,0xf6,0x25,0x23, +0x57,0x6c,0x0b,0x47,0xb8 }; + static void test_decodeCTL(DWORD dwEncoding) { static char oid1[] = "1.2.3"; @@ -5452,6 +5488,18 @@ static void test_decodeCTL(DWORD dwEncoding) LocalFree(buf); buf = NULL; } + /* A signed CTL isn't decodable, even if the inner content is a CTL */ + SetLastError(0xdeadbeef); + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, signedCTL, + sizeof(signedCTL), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CTL, + signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); } static const BYTE emptyPKCSContentInfo[] = { 0x30,0x04,0x06,0x02,0x2a,0x03 };

1 0

Juan Lang : crypt32: Fix typo.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 0ab7781d99146c20c889b41a4414805c0dcd2f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab7781d99146c20c889b41a4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 28 10:05:30 2008 -0700 crypt32: Fix typo. --- dlls/crypt32/crl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 9caf46d..23c623f 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -386,7 +386,7 @@ static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { PCONTEXT_PROPERTY_LIST properties = - Context_GetProperties(context, sizeof(CERT_CONTEXT)); + Context_GetProperties(context, sizeof(CRL_CONTEXT)); BOOL ret; TRACE("(%p, %d, %08x, %p)\n", context, dwPropId, dwFlags, pvData);

1 0

Juan Lang : crypt32: Fix typo.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: fc1f9b9157a7913138f44e4969731d35adc06982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1f9b9157a7913138f44e496… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 28 10:05:13 2008 -0700 crypt32: Fix typo. --- dlls/crypt32/provstore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c index b1053ae..33f765d 100644 --- a/dlls/crypt32/provstore.c +++ b/dlls/crypt32/provstore.c @@ -240,13 +240,13 @@ PWINECRYPT_CERTSTORE CRYPT_ProvCreateStore(DWORD dwFlags, ret->provWriteCrl = pProvInfo->rgpvStoreProvFunc[ CERT_STORE_PROV_WRITE_CRL_FUNC]; else - ret->provWriteCert = NULL; + ret->provWriteCrl = NULL; if (pProvInfo->cStoreProvFunc > CERT_STORE_PROV_DELETE_CRL_FUNC) ret->provDeleteCrl = pProvInfo->rgpvStoreProvFunc[ CERT_STORE_PROV_DELETE_CRL_FUNC]; else - ret->provDeleteCert = NULL; + ret->provDeleteCrl = NULL; if (pProvInfo->cStoreProvFunc > CERT_STORE_PROV_CONTROL_FUNC) ret->provControl = pProvInfo->rgpvStoreProvFunc[

1 0

Juan Lang : wincrypt.h: Add missing definitions.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: ece736209b2bc6f692282f311f0c82e214b30be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece736209b2bc6f692282f311… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 28 10:23:38 2008 -0700 wincrypt.h: Add missing definitions. --- include/wincrypt.h | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index f7d2620..ba16cd5 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2685,6 +2685,33 @@ typedef struct _CRL_FIND_ISSUED_FOR_PARA PCCERT_CONTEXT pIssuerCert; } CRL_FIND_ISSUED_FOR_PARA, *PCRL_FIND_ISSUED_FOR_PARA; +#define CTL_FIND_ANY 0 +#define CTL_FIND_SHA1_HASH 1 +#define CTL_FIND_MD5_HASH 2 +#define CTL_FIND_USAGE 3 +#define CTL_FIND_SUBJECT 4 +#define CTL_FIND_EXISTING 5 + +typedef struct _CTL_FIND_USAGE_PARA +{ + DWORD cbSize; + CTL_USAGE SubjectUsage; + CRYPT_DATA_BLOB ListIdentifier; + PCERT_INFO pSigner; +} CTL_FIND_USAGE_PARA, *PCTL_FIND_USAGE_PARA; + +#define CTL_FIND_NO_LIST_ID_CBDATA 0xffffffff +#define CTL_FIND_NO_SIGNER_PTR ((PCERT_INFO)-1) +#define CTL_FIND_SAME_USAGE_FLAG 0x00000001 + +typedef struct _CTL_FIND_SUBJECT_PARA +{ + DWORD cbSize; + PCTL_FIND_USAGE_PARA pUsagePara; + DWORD dwSubjectType; + void *pvSubject; +} CTL_FIND_SUBJECT_PARA, *PCTL_FIND_SUBJECT_PARA; + /* PFN_CERT_STORE_PROV_WRITE_CERT dwFlags values */ #define CERT_STORE_PROV_WRITE_ADD_FLAG 0x1

1 0

Juan Lang : wincrypt.h: Fix typos.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: c950c8d28f906521c386a62ae17c29c092824057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c950c8d28f906521c386a62ae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 28 09:34:28 2008 -0700 wincrypt.h: Fix typos. --- include/wincrypt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 0f0cec6..f7d2620 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2947,8 +2947,8 @@ typedef struct _CRL_FIND_ISSUED_FOR_PARA #endif #define szOID_REMOVE_CERTIFICATE "1.3.6.1.4.1.311.10.8.1" #define szOID_CROSS_CERT_DIST_POINTS "1.3.6.1.4.1.311.10.9.1" -#define szOID_CTL "1.3.6.1.4.1.311.10.10.1" -#define szOID_SORTED_CTL "1.3.6.1.4.1.311.10.10.1.1" +#define szOID_CTL "1.3.6.1.4.1.311.10.1" +#define szOID_SORTED_CTL "1.3.6.1.4.1.311.10.1.1" #define szOID_ANY_APPLICATION_POLICY "1.3.6.1.4.1.311.10.12.1" #define szOID_RENEWAL_CERTIFICATE "1.3.6.1.4.1.311.13.1" #define szOID_ENROLLMENT_NAME_VALUE_PAIR "1.3.6.1.4.1.311.13.2.1"

1 0

Huw Davies : crypt32: Fix streamed, detached updates.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: e8d834e02d0ee0d1b7fcc96f4dff1697457217a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d834e02d0ee0d1b7fcc96f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 28 15:28:26 2008 +0100 crypt32: Fix streamed, detached updates. Thanks to Juan for confirming this is the correct fix. --- dlls/crypt32/msg.c | 2 +- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 82bed31..449b944 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1880,7 +1880,7 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } } } - if (ret && + if (ret && fFinal && ((msg->base.open_flags & CMSG_DETACHED_FLAG && msg->base.state == MsgStateDataFinalized) || (!(msg->base.open_flags & CMSG_DETACHED_FLAG) && msg->base.state == diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index e9e2018..aa969e1 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2248,7 +2248,6 @@ static void test_decode_msg_update(void) ret = CryptMsgUpdate(msg, NULL, 0, TRUE); ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); ret = CryptMsgUpdate(msg, detachedSignedContent, sizeof(detachedSignedContent), FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); ret = CryptMsgUpdate(msg, NULL, 0, TRUE); ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError());

1 0

Huw Davies : crypt32/tests: Add a test for streamed, detached updates.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 152a55eef2a45b30ec14abca36833ab2a18fc2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152a55eef2a45b30ec14abca3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 28 14:54:24 2008 +0100 crypt32/tests: Add a test for streamed, detached updates. --- dlls/crypt32/tests/msg.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index c734e6f..e9e2018 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2241,6 +2241,22 @@ static void test_decode_msg_update(void) ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, "expected CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, 0, 0, NULL, &streamInfo); + ret = CryptMsgUpdate(msg, detachedSignedContent, sizeof(detachedSignedContent), FALSE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ret = CryptMsgUpdate(msg, detachedSignedContent, sizeof(detachedSignedContent), FALSE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + + ret = CryptMsgUpdate(msg, detachedSignedContent, sizeof(detachedSignedContent), TRUE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); + CryptMsgClose(msg); } static const BYTE hashParam[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,

1 0