July 2018 - Wine-Devel - list.winehq.org

[PATCH] user32/menu: Inside HiliteMenuItem free menu earlier to avoid crash
by Fabian Maurer July 20, 2018

July 20, 2018

MENU_SelectItem sends a message, and we must not hold the lock when that happens Fixes bug 45457. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/menu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index bae45002b7..cd6e9fff2a 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3859,17 +3859,21 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, { POPUPMENU *menu; UINT pos; + HMENU handle_menu; TRACE("(%p, %p, %04x, %04x);\n", hWnd, hMenu, wItemID, wHilite); if (!(menu = find_menu_item(hMenu, wItemID, wHilite, &pos))) return FALSE; + handle_menu = menu->obj.handle; + release_menu_ptr(menu); + if (menu->FocusedItem != pos) { - MENU_HideSubPopups( hWnd, menu->obj.handle, FALSE, 0 ); - MENU_SelectItem( hWnd, menu->obj.handle, pos, TRUE, 0 ); + MENU_HideSubPopups( hWnd, handle_menu, FALSE, 0 ); + MENU_SelectItem( hWnd, handle_menu, pos, TRUE, 0 ); } - release_menu_ptr(menu); + return TRUE; } -- 2.18.0

2 3

RE: [PATCH] odbc32: Hide SQL functions to avoid conflicts with certain drivers.
by Daniel Lehman July 20, 2018

July 20, 2018

> All the functions that you hiding should be exported for linking. it linked and ran for me with a simple winelib app. the windows-facing functions are still exported - the intent was to hide at the linux-facing level (visibility("hidden")) I can send a version where wine's functions are prefixed with ODBC32_ or something, instead. that also works for me > Can you please explain what drivers are causing the issue? https://urldefense.proofpoint.com/v2/url?u=https-3A__docs.microsoft.com_en-… it causes a crash: Backtrace: =>0 0x00007fe48afbec89 in libodbc.so.2 (+0x6c89) (0x0000000000000001) 1 0x00007fe48b908edf SQLAllocEnv+0x6e() in odbc32 (0x0000000000000001) <----- Wine's SQLAllocEnv 2 0x00007fe48a85fda5 _Z12GetDMversionv+0xf4() in libmsodbcsql-17.2.so.0.1 (0x000000000023cad0) 3 0x00007fe48a861315 _ZN9ExportImp14SQLGetDiagRecWEsPvsPwPiS1_sPs+0xa4() in libmsodbcsql-17.2.so.0.1 (0x000000000023cad0) 4 0x00007fe48afcbfa1 SQLDriverConnect+0x1540() in libodbc.so.2 (0x0000000000000000) 5 0x00007fe48b912c4a SQLDriverConnect+0xb9() in odbc32 (0x000000007c8fd0e0) 6 0x0000000140001132 in sample-crash17 (+0x1131) (0x00007ffc9a54c0b0) <----- calls SQLAllocEnv ... In frame 6, it calls into SQLDriverConnect. the driver calls back into Wine's version of SQLAllocEnv in frame 1, which I'm sure was not intended seems like they dynamically load odbc functions and they pick up wine's version of SQLAllocEnv first instead of libodbc.so.2 mssql 13.1 versions works and so do other drivers for other databases we support. it's just the 17 version that fails thanks daniel

1 0

[PATCH 2/8] comctl32/taskdialog: Add support for navigating page.
by Zhiyi Zhang July 20, 2018

July 20, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 30 +++++++++++++++++ dlls/comctl32/tests/taskdialog.c | 58 ++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 5ffa4dc6fd..0f947a8098 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -1145,8 +1145,29 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_layout(dialog_info); } +static void takdialog_destroy_control(HWND hwnd) +{ + if(!hwnd) return; + DestroyWindow(hwnd); +} + static void taskdialog_destroy(struct taskdialog_info *dialog_info) { + INT i; + + takdialog_destroy_control(dialog_info->main_icon); + takdialog_destroy_control(dialog_info->main_instruction); + takdialog_destroy_control(dialog_info->content); + takdialog_destroy_control(dialog_info->progress_bar); + takdialog_destroy_control(dialog_info->expanded_info); + takdialog_destroy_control(dialog_info->expando_button); + takdialog_destroy_control(dialog_info->verification_box); + takdialog_destroy_control(dialog_info->footer_icon); + takdialog_destroy_control(dialog_info->footer_text); + for (i = 0; i < dialog_info->button_count; i++) takdialog_destroy_control(dialog_info->buttons[i]); + for (i = 0; i < dialog_info->radio_button_count; i++) takdialog_destroy_control(dialog_info->radio_buttons[i]); + for (i = 0; i < dialog_info->command_link_count; i++) takdialog_destroy_control(dialog_info->command_links[i]); + if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER); if (dialog_info->font) DeleteObject(dialog_info->font); if (dialog_info->main_instruction_font) DeleteObject(dialog_info->main_instruction_font); @@ -1170,6 +1191,15 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR switch (msg) { + case TDM_NAVIGATE_PAGE: + dialog_info->taskconfig = (const TASKDIALOGCONFIG *)lParam; + taskdialog_destroy(dialog_info); + taskdialog_init(dialog_info, hwnd); + taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); + /* Default radio button click notification is sent before TDN_NAVIGATED */ + taskdialog_check_default_radio_buttons(dialog_info); + taskdialog_notify(dialog_info, TDN_NAVIGATED, 0, 0); + break; case TDM_CLICK_BUTTON: taskdialog_click_button(dialog_info, wParam); break; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 8d60fb2eb8..9468573edd 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -271,6 +271,25 @@ static const struct message_info msg_return_verification_checked[] = { 0 } }; +static TASKDIALOGCONFIG navigated_info = {0}; + +static const struct message_info msg_send_navigate[] = +{ + { TDM_NAVIGATE_PAGE, 0, (LPARAM)&navigated_info, 0}, + { 0 } +}; + +static const struct message_info msg_return_navigated_page[] = +{ + { TDN_CREATED, 0, 0, S_OK, NULL }, + { TDN_RADIO_BUTTON_CLICKED, ID_START_RADIO_BUTTON, 0, S_OK, msg_send_navigate }, + { TDN_DIALOG_CONSTRUCTED, 0, 0, S_OK, NULL }, + { TDN_RADIO_BUTTON_CLICKED, ID_START_RADIO_BUTTON, 0, S_OK, NULL }, + { TDN_NAVIGATED, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -682,6 +701,44 @@ static void test_verification_box(void) "default verification box: default unchecked and then checked"); } +static void test_navigate_page(void) +{ + TASKDIALOGCONFIG info = {0}; + static const WCHAR textW[] = {'t', 'e', 'x', 't', 0}; + TASKDIALOG_BUTTON radio_buttons[TEST_NUM_RADIO_BUTTONS]; + const WCHAR button_format[] = {'%', '0', '2', 'd', 0}; + WCHAR radio_button_titles[TEST_NUM_BUTTONS * 3]; + int i; + + /* Init radio buttons */ + for (i = 0; i < TEST_NUM_RADIO_BUTTONS; i++) + { + WCHAR *text = &radio_button_titles[i * 3]; + wsprintfW(text, button_format, i); + + radio_buttons[i].pszButtonText = text; + radio_buttons[i].nButtonID = ID_START_RADIO_BUTTON + i; + } + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + info.dwCommonButtons = TDCBF_OK_BUTTON; + info.cRadioButtons = TEST_NUM_RADIO_BUTTONS; + info.pRadioButtons = radio_buttons; + + navigated_info = info; + navigated_info.pszVerificationText = textW; + navigated_info.dwFlags = TDF_VERIFICATION_FLAG_CHECKED; + + run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: default"); + + /* TDM_NAVIGATE_PAGE doesn't check cbSize. + * And null taskconfig pointer crash applicatioin, thus doesn't check pointer either */ + navigated_info.cbSize = 0; + run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: invalid taskconfig cbSize"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -722,6 +779,7 @@ START_TEST(taskdialog) test_timer(); test_progress_bar(); test_verification_box(); + test_navigate_page(); unload_v6_module(ctx_cookie, hCtx); } -- 2.18.0

2 1

[PATCH 1/8] comctl32/taskdialog: Update vertical layout only when expando button clicked.
by Zhiyi Zhang July 20, 2018

July 20, 2018

Update vertical layout only to improve efficiency. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 60 +++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 457a5ff9d0..5ffa4dc6fd 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -232,11 +232,69 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } +static void taskdialog_move_controls_vertically(HWND parent, HWND *controls, INT count, INT offset) +{ + RECT rect; + POINT pt; + INT i; + + for (i = 0; i < count; i++) + { + if (!controls[i]) continue; + + GetWindowRect(controls[i], &rect); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(HWND_DESKTOP, parent, &pt, 1); + SetWindowPos(controls[i], 0, pt.x, pt.y + offset, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + } +} + static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_info) { + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + const WCHAR *text; + HWND after_expanded_info_hwnds[5] = {0}; + RECT info_rect, rect; + INT height, offset, i = 0; + dialog_info->expanded = !dialog_info->expanded; + text = dialog_info->expanded ? dialog_info->expanded_text : dialog_info->collapsed_text; + SendMessageW(dialog_info->expando_button, WM_SETTEXT, 0, (LPARAM)text); ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); - taskdialog_layout(dialog_info); + + GetWindowRect(dialog_info->expanded_info, &info_rect); + /* If expanded information starts up not expanded, call taskdialog_layout() + * to to set size for expanded information control at least once */ + if (IsRectEmpty(&info_rect)) + { + taskdialog_layout(dialog_info); + return; + } + height = info_rect.bottom - info_rect.top + dialog_info->m.v_spacing; + offset = dialog_info->expanded ? height : -height; + + /* Update vertical layout, move all controls after expanded information */ + /* Move dialog */ + GetWindowRect(dialog_info->hwnd, &rect); + SetWindowPos(dialog_info->hwnd, 0, 0, 0, rect.right - rect.left, rect.bottom - rect.top + offset, + SWP_NOMOVE | SWP_NOZORDER); + /* Move controls */ + if (!(taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA)) + { + after_expanded_info_hwnds[i++] = dialog_info->progress_bar; + after_expanded_info_hwnds[i++] = dialog_info->expando_button; + after_expanded_info_hwnds[i++] = dialog_info->verification_box; + after_expanded_info_hwnds[i++] = dialog_info->footer_icon; + after_expanded_info_hwnds[i] = dialog_info->footer_text; + taskdialog_move_controls_vertically(dialog_info->hwnd, after_expanded_info_hwnds, + ARRAY_SIZE(after_expanded_info_hwnds), offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->buttons, dialog_info->button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->radio_buttons, + dialog_info->radio_button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->command_links, + dialog_info->command_link_count, offset); + } } static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) -- 2.18.0

2 1

[PATCH 1/3] msvcp140: Implement _Temp_get (v2).
by Stefan Dösinger July 20, 2018

July 20, 2018

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- This is a resend of the patch from months ago with a tautological check removed. I tried to test what happens if the temp path is longer than MAX_PATH characters, but I could not get Windows to accept a long temp path. If %TMP% is longer than 100 characters (or somewhere in that area, I did not test the precise limit) it falls back to %TEMP%, %USERPROFILE% and finally "C:\Windows". I assume msvcp does not clear the extra bytes like GetTempPathW either because it doesn't call GetTempPath and implements the logic itself or because it writes to a temp buffer and copies the data. --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 26 ++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 6 ++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e705e1eb84..57d02776c3 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3718,7 +3718,7 @@ @ stub _Strxfrm @ cdecl _Symlink(wstr wstr) tr2_sys__Symlink_wchar @ stub _Symlink_get -@ stub _Temp_get +@ cdecl _Temp_get(ptr) @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl -norelay _Thrd_current() diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 06ea11d55b..b1a5bfc9cf 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -178,6 +178,7 @@ static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static MSVCP_bool (__cdecl *p_Remove_dir)(WCHAR const*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_Symlink)(WCHAR const*, WCHAR const*); +static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); @@ -260,6 +261,7 @@ static BOOL init(void) SET(p_Remove_dir, "_Remove_dir"); SET(p_Stat, "_Stat"); SET(p_Symlink, "_Symlink"); + SET(p_Temp_get, "_Temp_get"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); SET(p_Unlink, "_Unlink"); @@ -1060,6 +1062,29 @@ static void test_Unlink(void) ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); } +static void test_Temp_get(void) +{ + WCHAR path[MAX_PATH + 1], temp_path[MAX_PATH]; + WCHAR *retval; + DWORD len; + + GetTempPathW(sizeof(temp_path)/sizeof(*temp_path), temp_path); + + /* This crashes on Windows, the input pointer is not validated. */ + if (0) + { + retval = p_Temp_get(NULL); + ok(!retval, "_Temp_get(): Got %p\n", retval); + } + + memset(path, 0xaa, sizeof(path)); + retval = p_Temp_get(path); + ok(retval == path, "_Temp_get(): Got %p, expected %p\n", retval, path); + ok(!wcscmp(path, temp_path), "Expected path %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(path)); + len = wcslen(path); + todo_wine ok(path[len + 1] == 0xaaaa, "Too many bytes were zeroed - %x\n", path[len + 1]); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1078,5 +1103,6 @@ START_TEST(msvcp140) test_Stat(); test_dir_operation(); test_Unlink(); + test_Temp_get(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 3f859979cb..ab9d7a44a4 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15745,6 +15745,12 @@ enum file_type __cdecl _Lstat(WCHAR const* path, int* permissions) return _Stat(path, permissions); } +WCHAR * __cdecl _Temp_get(WCHAR *dst) +{ + GetTempPathW(MAX_PATH, dst); + return dst; +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4) -- 2.16.4

3 6

[PATCH] msvcp140: Implement _Temp_get (v3).
by Stefan Dösinger July 20, 2018

July 20, 2018

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- v3: Use ARRAY_SIZE. This is a resend of the patch from months ago with a tautological check removed. I tried to test what happens if the temp path is longer than MAX_PATH characters, but I could not get Windows to accept a long temp path. If %TMP% is longer than 100 characters (or somewhere in that area, I did not test the precise limit) it falls back to %TEMP%, %USERPROFILE% and finally "C:\Windows". I assume msvcp does not clear the extra bytes like GetTempPathW either because it doesn't call GetTempPath and implements the logic itself or because it writes to a temp buffer and copies the data. --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 26 ++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 6 ++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e705e1eb84..57d02776c3 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3718,7 +3718,7 @@ @ stub _Strxfrm @ cdecl _Symlink(wstr wstr) tr2_sys__Symlink_wchar @ stub _Symlink_get -@ stub _Temp_get +@ cdecl _Temp_get(ptr) @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl -norelay _Thrd_current() diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 06ea11d55b..fdec4298db 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -178,6 +178,7 @@ static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static MSVCP_bool (__cdecl *p_Remove_dir)(WCHAR const*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_Symlink)(WCHAR const*, WCHAR const*); +static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); @@ -260,6 +261,7 @@ static BOOL init(void) SET(p_Remove_dir, "_Remove_dir"); SET(p_Stat, "_Stat"); SET(p_Symlink, "_Symlink"); + SET(p_Temp_get, "_Temp_get"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); SET(p_Unlink, "_Unlink"); @@ -1060,6 +1062,29 @@ static void test_Unlink(void) ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); } +static void test_Temp_get(void) +{ + WCHAR path[MAX_PATH + 1], temp_path[MAX_PATH]; + WCHAR *retval; + DWORD len; + + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); + + /* This crashes on Windows, the input pointer is not validated. */ + if (0) + { + retval = p_Temp_get(NULL); + ok(!retval, "_Temp_get(): Got %p\n", retval); + } + + memset(path, 0xaa, sizeof(path)); + retval = p_Temp_get(path); + ok(retval == path, "_Temp_get(): Got %p, expected %p\n", retval, path); + ok(!wcscmp(path, temp_path), "Expected path %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(path)); + len = wcslen(path); + todo_wine ok(path[len + 1] == 0xaaaa, "Too many bytes were zeroed - %x\n", path[len + 1]); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1078,5 +1103,6 @@ START_TEST(msvcp140) test_Stat(); test_dir_operation(); test_Unlink(); + test_Temp_get(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fb9d6687ca..1e7c4813f9 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15734,6 +15734,12 @@ enum file_type __cdecl _Lstat(WCHAR const* path, int* permissions) return _Stat(path, permissions); } +WCHAR * __cdecl _Temp_get(WCHAR *dst) +{ + GetTempPathW(MAX_PATH, dst); + return dst; +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4) -- 2.16.4

2 1

[PATCH 2/2] bcrypt: Move the ASN1 buffer functions to gnutls.c.
by Hans Leidekker July 20, 2018

July 20, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 12 ----- dlls/bcrypt/bcrypt_main.c | 97 --------------------------------------- dlls/bcrypt/gnutls.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 109 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 11c8b30416..a40f9d1a4b 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -105,18 +105,6 @@ VOID WINAPI A_SHAInit(SHA_CTX *ctx); VOID WINAPI A_SHAUpdate(SHA_CTX *ctx, const UCHAR *buffer, UINT size); VOID WINAPI A_SHAFinal(SHA_CTX *ctx, PULONG result); -struct buffer -{ - BYTE *buffer; - DWORD length; - DWORD pos; - BOOL error; -}; - -void buffer_init( struct buffer * ) DECLSPEC_HIDDEN; -void buffer_free( struct buffer * ) DECLSPEC_HIDDEN; -void buffer_append_asn1_r_s( struct buffer *, BYTE *, DWORD, BYTE *, DWORD ) DECLSPEC_HIDDEN; - #define MAGIC_ALG (('A' << 24) | ('L' << 16) | ('G' << 8) | '0') #define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') #define MAGIC_KEY (('K' << 24) | ('E' << 16) | ('Y' << 8) | '0') diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 4edfbdd663..2b9ae0b766 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -718,103 +718,6 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) -void buffer_init( struct buffer *buffer ) -{ - buffer->buffer = NULL; - buffer->length = 0; - buffer->pos = 0; - buffer->error = FALSE; -} - -void buffer_free( struct buffer *buffer ) -{ - heap_free( buffer->buffer ); -} - -static void buffer_append( struct buffer *buffer, BYTE *data, DWORD len ) -{ - if (!len) return; - - if (buffer->pos + len > buffer->length) - { - DWORD new_length = max( max( buffer->pos + len, buffer->length * 2 ), 64 ); - BYTE *new_buffer; - - if (!(new_buffer = heap_realloc( buffer->buffer, new_length ))) - { - ERR( "out of memory\n" ); - buffer->error = TRUE; - return; - } - - buffer->buffer = new_buffer; - buffer->length = new_length; - } - - memcpy( &buffer->buffer[buffer->pos], data, len ); - buffer->pos += len; -} - -static void buffer_append_byte( struct buffer *buffer, BYTE value ) -{ - buffer_append( buffer, &value, sizeof(value) ); -} - -static void buffer_append_asn1_length( struct buffer *buffer, DWORD length ) -{ - DWORD num_bytes; - - if (length < 128) - { - buffer_append_byte( buffer, length ); - return; - } - - if (length <= 0xff) num_bytes = 1; - else if (length <= 0xffff) num_bytes = 2; - else if (length <= 0xffffff) num_bytes = 3; - else num_bytes = 4; - - buffer_append_byte( buffer, 0x80 | num_bytes ); - while (num_bytes--) buffer_append_byte( buffer, length >> (num_bytes * 8) ); -} - -static void buffer_append_asn1_integer( struct buffer *buffer, BYTE *data, DWORD len ) -{ - DWORD leading_zero = (*data & 0x80) != 0; - - buffer_append_byte( buffer, 0x02 ); /* tag */ - buffer_append_asn1_length( buffer, len + leading_zero ); - if (leading_zero) buffer_append_byte( buffer, 0 ); - buffer_append( buffer, data, len ); -} - -static void buffer_append_asn1_sequence( struct buffer *buffer, struct buffer *content ) -{ - if (content->error) - { - buffer->error = TRUE; - return; - } - - buffer_append_byte( buffer, 0x30 ); /* tag */ - buffer_append_asn1_length( buffer, content->pos ); - buffer_append( buffer, content->buffer, content->pos ); -} - -void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE *s, DWORD s_len ) -{ - struct buffer value; - - buffer_init( &value ); - buffer_append_asn1_integer( &value, r, r_len ); - buffer_append_asn1_integer( &value, s, s_len ); - buffer_append_asn1_sequence( buffer, &value ); - buffer_free( &value ); -} -#endif - #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 BOOL key_is_symmetric( struct key *key ) { diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index f5bc0e5896..69276be925 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -215,6 +215,109 @@ void gnutls_uninitialize(void) libgnutls_handle = NULL; } +struct buffer +{ + BYTE *buffer; + DWORD length; + DWORD pos; + BOOL error; +}; + +static void buffer_init( struct buffer *buffer ) +{ + buffer->buffer = NULL; + buffer->length = 0; + buffer->pos = 0; + buffer->error = FALSE; +} + +static void buffer_free( struct buffer *buffer ) +{ + heap_free( buffer->buffer ); +} + +static void buffer_append( struct buffer *buffer, BYTE *data, DWORD len ) +{ + if (!len) return; + + if (buffer->pos + len > buffer->length) + { + DWORD new_length = max( max( buffer->pos + len, buffer->length * 2 ), 64 ); + BYTE *new_buffer; + + if (!(new_buffer = heap_realloc( buffer->buffer, new_length ))) + { + ERR( "out of memory\n" ); + buffer->error = TRUE; + return; + } + + buffer->buffer = new_buffer; + buffer->length = new_length; + } + + memcpy( &buffer->buffer[buffer->pos], data, len ); + buffer->pos += len; +} + +static void buffer_append_byte( struct buffer *buffer, BYTE value ) +{ + buffer_append( buffer, &value, sizeof(value) ); +} + +static void buffer_append_asn1_length( struct buffer *buffer, DWORD length ) +{ + DWORD num_bytes; + + if (length < 128) + { + buffer_append_byte( buffer, length ); + return; + } + + if (length <= 0xff) num_bytes = 1; + else if (length <= 0xffff) num_bytes = 2; + else if (length <= 0xffffff) num_bytes = 3; + else num_bytes = 4; + + buffer_append_byte( buffer, 0x80 | num_bytes ); + while (num_bytes--) buffer_append_byte( buffer, length >> (num_bytes * 8) ); +} + +static void buffer_append_asn1_integer( struct buffer *buffer, BYTE *data, DWORD len ) +{ + DWORD leading_zero = (*data & 0x80) != 0; + + buffer_append_byte( buffer, 0x02 ); /* tag */ + buffer_append_asn1_length( buffer, len + leading_zero ); + if (leading_zero) buffer_append_byte( buffer, 0 ); + buffer_append( buffer, data, len ); +} + +static void buffer_append_asn1_sequence( struct buffer *buffer, struct buffer *content ) +{ + if (content->error) + { + buffer->error = TRUE; + return; + } + + buffer_append_byte( buffer, 0x30 ); /* tag */ + buffer_append_asn1_length( buffer, content->pos ); + buffer_append( buffer, content->buffer, content->pos ); +} + +static void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE *s, DWORD s_len ) +{ + struct buffer value; + + buffer_init( &value ); + buffer_append_asn1_integer( &value, r, r_len ); + buffer_append_asn1_integer( &value, s, s_len ); + buffer_append_asn1_sequence( buffer, &value ); + buffer_free( &value ); +} + NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) { if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) -- 2.11.0

1 0

[PATCH 1/2] bcrypt: Default to building with GnuTLS support on macOS, if present.
by Hans Leidekker July 20, 2018

July 20, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 5 ++--- dlls/bcrypt/gnutls.c | 2 +- dlls/bcrypt/macos.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 851767de5e..4edfbdd663 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -815,7 +815,6 @@ void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE * } #endif - #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 BOOL key_is_symmetric( struct key *key ) { @@ -1421,14 +1420,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst ); -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#ifdef HAVE_GNUTLS_CIPHER_INIT gnutls_initialize(); #endif break; case DLL_PROCESS_DETACH: if (reserved) break; -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#ifdef HAVE_GNUTLS_CIPHER_INIT gnutls_uninitialize(); #endif break; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index f191d2c8dd..f5bc0e5896 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -42,7 +42,7 @@ #include "wine/library.h" #include "wine/unicode.h" -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#ifdef HAVE_GNUTLS_CIPHER_INIT WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); WINE_DECLARE_DEBUG_CHANNEL(winediag); diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 94d5dbd0d3..a6eaee8b1d 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -41,7 +41,7 @@ #include "wine/library.h" #include "wine/unicode.h" -#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 && !defined(HAVE_GNUTLS_CIPHER_INIT) WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -- 2.11.0

1 0

[PATCH] winegcc: Allow specifying 32-bit libdir via configure script.
by Jacek Caban July 20, 2018

July 20, 2018

64-bit Wine build has no informations about 32-bit configuration. We have some heuristics in winegcc to find 32-bit libraries, but it may not be enough. 32-bit libraries can be in an arbitrary place in 32-bit build if it's using --libdir. This patch makes it possible to instruct 64-bit build where to find 32-bit libraries, so that winegcc -m32 can work correctly in such config. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Makefile.in | 1 + configure.ac | 11 +++++++++++ tools/winegcc/Makefile.in | 1 + tools/winegcc/winegcc.c | 6 +++++- 4 files changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH] wine/vulkan.h: Properly declare enum values that use value attribute in spec.
by Jacek Caban July 20, 2018

July 20, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 12 +++++++----- include/wine/vulkan.h | 5 ++--- 2 files changed, 9 insertions(+), 8 deletions(-)

2 1