wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Jacek Caban : wineandroid: Use __wine_unix_call.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: 218e469812aa948057824cd0c41850e390af45ef URL: https://gitlab.winehq.org/wine/wine/-/commit/218e469812aa948057824cd0c41850… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 22 12:53:36 2022 +0200 wineandroid: Use __wine_unix_call. --- dlls/wineandroid.drv/dllmain.c | 4 +--- dlls/wineandroid.drv/init.c | 10 ---------- dlls/wineandroid.drv/unixlib.h | 4 +--- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index 6556a492505..b10491a22d8 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(android); static unixlib_handle_t unix_handle; -static NTSTATUS (CDECL *unix_call)( enum android_funcs code, void *params ); extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static HANDLE stop_event; @@ -130,12 +129,11 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) return FALSE; params.register_window_callback = register_window_callback; - if (__wine_unix_call( unix_handle, unix_init, &params )) return FALSE; + if (ANDROID_CALL( init, &params )) return FALSE; callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; callback_table[client_start_device] = android_start_device; - unix_call = params.unix_call; return TRUE; } diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 83fe224dccf..cf97b25fbb7 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -562,8 +562,6 @@ JavaVM **p_java_vm = NULL; jobject *p_java_object = NULL; unsigned short *p_java_gdt_sel = NULL; -static NTSTATUS CDECL unix_call( enum android_funcs code, void *params ); - static HRESULT android_init( void *arg ) { struct init_params *params = arg; @@ -609,7 +607,6 @@ static HRESULT android_init( void *arg ) #endif } __wine_set_user_driver( &android_drv_funcs, WINE_GDI_DRIVER_VERSION ); - params->unix_call = unix_call; return STATUS_SUCCESS; } @@ -625,10 +622,3 @@ const unixlib_entry_t __wine_unix_call_funcs[] = C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); - - -/* FIXME: Use __wine_unix_call instead */ -static NTSTATUS CDECL unix_call( enum android_funcs code, void *params ) -{ - return __wine_unix_call_funcs[code]( params ); -} diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h index 2b4d02648e5..98da6528fd5 100644 --- a/dlls/wineandroid.drv/unixlib.h +++ b/dlls/wineandroid.drv/unixlib.h @@ -30,14 +30,12 @@ enum android_funcs unix_funcs_count }; -/* FIXME: Use __wine_unix_call when the rest of the stack is ready */ -#define ANDROID_CALL(func, params) unix_call( unix_ ## func, params ) +#define ANDROID_CALL(func, params) __wine_unix_call( unix_handle, unix_ ## func, params ) /* android_init params */ struct init_params { PNTAPCFUNC register_window_callback; - NTSTATUS (CDECL *unix_call)( enum android_funcs code, void *params ); };

1 0

Jacek Caban : winex11: Use __wine_unix_call.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: d246c1a1da9f5ef757a9ede9e211e589e6e191cd URL: https://gitlab.winehq.org/wine/wine/-/commit/d246c1a1da9f5ef757a9ede9e211e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 18:34:12 2022 +0200 winex11: Use __wine_unix_call. --- dlls/winex11.drv/dllmain.c | 6 ++---- dlls/winex11.drv/unixlib.h | 6 ++---- dlls/winex11.drv/x11drv_main.c | 10 ---------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 086a32d2f85..99a137f66e7 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -23,8 +23,7 @@ HMODULE x11drv_module = 0; -static unixlib_handle_t x11drv_handle; -NTSTATUS (CDECL *x11drv_unix_call)( enum x11drv_funcs code, void *params ); +unixlib_handle_t x11drv_handle; typedef NTSTATUS (*callback_func)( UINT arg ); @@ -78,13 +77,12 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) &x11drv_handle, sizeof(x11drv_handle), NULL )) return FALSE; - if (__wine_unix_call( x11drv_handle, unix_init, &params )) return FALSE; + if (X11DRV_CALL( init, &params )) return FALSE; callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; memcpy( callback_table + NtUserDriverCallbackFirst, kernel_callbacks, sizeof(kernel_callbacks) ); show_systray = params.show_systray; - x11drv_unix_call = params.unix_call; return TRUE; } diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 208c395e02b..fa3685af33a 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -36,9 +36,8 @@ enum x11drv_funcs unix_funcs_count, }; -/* FIXME: Use __wine_unix_call when the rest of the stack is ready */ -extern NTSTATUS (CDECL *x11drv_unix_call)( enum x11drv_funcs code, void *params ) DECLSPEC_HIDDEN; -#define X11DRV_CALL(func, params) x11drv_unix_call( unix_ ## func, params ) +extern unixlib_handle_t x11drv_handle DECLSPEC_HIDDEN; +#define X11DRV_CALL(func, params) __wine_unix_call( x11drv_handle, unix_ ## func, params ) /* x11drv_create_desktop params */ struct create_desktop_params @@ -52,7 +51,6 @@ struct init_params { WNDPROC foreign_window_proc; BOOL show_systray; - NTSTATUS (CDECL *unix_call)( enum x11drv_funcs code, void *params ); }; struct systray_dock_params diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9e05ebaa9a5..20e07679635 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -220,8 +220,6 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/uri-list" }; -static NTSTATUS CDECL unix_call( enum x11drv_funcs code, void *params ); - /*********************************************************************** * ignore_error * @@ -717,7 +715,6 @@ static NTSTATUS x11drv_init( void *arg ) init_user_driver(); X11DRV_DisplayDevices_Init(FALSE); params->show_systray = show_systray; - params->unix_call = unix_call; return STATUS_SUCCESS; } @@ -1340,10 +1337,3 @@ const unixlib_entry_t __wine_unix_call_funcs[] = C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); - - -/* FIXME: Use __wine_unix_call instead */ -static NTSTATUS CDECL unix_call( enum x11drv_funcs code, void *params ) -{ - return __wine_unix_call_funcs[code]( params ); -}

1 0

Jacek Caban : win32u: Use syscall interface for message functions.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: a53330b9c137388f3b9e78f2aacffa3fc1692d6e URL: https://gitlab.winehq.org/wine/wine/-/commit/a53330b9c137388f3b9e78f2aacffa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 18:29:37 2022 +0200 win32u: Use syscall interface for message functions. --- dlls/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 ++++----- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 30 ------------------------- dlls/wow64win/syscall.h | 5 +++++ dlls/wow64win/user.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 67 insertions(+), 45 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for NtUserGetMessage.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: wine Branch: master Commit: 0d6d8f388aea4889a79a913fea7c10b1056ffdd2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d6d8f388aea4889a79a913fea7c10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 18:01:02 2022 +0200 win32u: Use syscall interface for NtUserGetMessage. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 13 +++++++++++++ 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index b20e3a7ddbb..a7bb62f29aa 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1180,7 +1180,6 @@ static struct unix_funcs unix_funcs = NtUserGetKeyNameText, NtUserGetKeyboardLayoutList, NtUserGetMenuBarInfo, - NtUserGetMessage, NtUserGetPriorityClipboardFormat, NtUserGetQueueStatus, NtUserGetScrollBarInfo, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index eeebf521bc2..a181c07402a 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -143,6 +143,7 @@ static void * const syscalls[] = NtUserGetKeyboardState, NtUserGetLayeredWindowAttributes, NtUserGetMenuItemRect, + NtUserGetMessage, NtUserGetMouseMovePointsEx, NtUserGetObjectInformation, NtUserGetOpenClipboardWindow, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 83de1ab87c8..6ba3d5492e7 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -955,7 +955,7 @@ @ stdcall NtUserGetMenuBarInfo(long long long ptr) @ stub NtUserGetMenuIndex @ stdcall -syscall NtUserGetMenuItemRect(long long long ptr) -@ stdcall NtUserGetMessage(ptr long long long) +@ stdcall -syscall NtUserGetMessage(ptr long long long) @ stdcall -syscall NtUserGetMouseMovePointsEx(long ptr ptr long long) @ stdcall -syscall NtUserGetObjectInformation(long long long long ptr) @ stub NtUserGetOemBitmapSize diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index bdc8235a831..74fb4f4b088 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -244,7 +244,6 @@ struct unix_funcs INT (WINAPI *pNtUserGetKeyNameText)( LONG lparam, WCHAR *buffer, INT size ); UINT (WINAPI *pNtUserGetKeyboardLayoutList)( INT size, HKL *layouts ); BOOL (WINAPI *pNtUserGetMenuBarInfo)( HWND hwnd, LONG id, LONG item, MENUBARINFO *info ); - BOOL (WINAPI *pNtUserGetMessage)( MSG *msg, HWND hwnd, UINT first, UINT last ); INT (WINAPI *pNtUserGetPriorityClipboardFormat)( UINT *list, INT count ); DWORD (WINAPI *pNtUserGetQueueStatus)( UINT flags ); BOOL (WINAPI *pNtUserGetScrollBarInfo)( HWND hwnd, LONG id, SCROLLBARINFO *info ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 923254dcf96..ed7b24a1f5f 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1000,12 +1000,6 @@ BOOL WINAPI NtUserGetMenuBarInfo( HWND hwnd, LONG id, LONG item, MENUBARINFO *in return unix_funcs->pNtUserGetMenuBarInfo( hwnd, id, item, info ); } -BOOL WINAPI NtUserGetMessage( MSG *msg, HWND hwnd, UINT first, UINT last ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtUserGetMessage( msg, hwnd, first, last ); -} - HMENU WINAPI NtUserGetSystemMenu( HWND hwnd, BOOL revert ) { if (!unix_funcs) return 0; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 937abaf8b3b..2955b4105d6 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -130,6 +130,7 @@ SYSCALL_ENTRY( NtUserGetKeyboardState ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetMenuItemRect ) \ + SYSCALL_ENTRY( NtUserGetMessage ) \ SYSCALL_ENTRY( NtUserGetMouseMovePointsEx ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetOpenClipboardWindow ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index be91b830e7a..b0a7f93df41 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -519,6 +519,19 @@ NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args ) return NtUserGetMenuItemRect( hwnd, handle, item, rect ); } +NTSTATUS WINAPI wow64_NtUserGetMessage( UINT *args ) +{ + MSG32 *msg32 = get_ptr( &args ); + HWND hwnd = get_handle( &args ); + UINT first = get_ulong( &args ); + UINT last = get_ulong( &args ); + MSG msg; + + if (!NtUserGetMessage( &msg, hwnd, first, last )) return FALSE; + msg_64to32( &msg, msg32 ); + return TRUE; +} + NTSTATUS WINAPI wow64_NtUserGetMouseMovePointsEx( UINT *args ) { UINT size = get_ulong( &args );

1 0

Alexandre Julliard : winetest: Remove the obsolete winetest service.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: tools Branch: master Commit: c8a37f4f3d59cab512ef9a7328337090ec9bbeb6 URL: https://gitlab.winehq.org/winehq/tools/-/commit/c8a37f4f3d59cab512ef9a73283… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 17:26:43 2022 +0200 winetest: Remove the obsolete winetest service. --- winetest/INSTALL.txt | 12 -- winetest/error.cgi | 49 -------- winetest/make-winetest | 6 - winetest/service.cgi | 328 ------------------------------------------------- 4 files changed, 395 deletions(-)

1 0

Alexandre Julliard : gitlab: Support configuring the path of the maintainers file.
by Alexandre Julliard 22 Jul '22

22 Jul '22

Module: tools Branch: master Commit: acecdb925f7b2d22d62f1fd626c6cc97408a729e URL: https://gitlab.winehq.org/winehq/tools/-/commit/acecdb925f7b2d22d62f1fd626c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 11:57:12 2022 +0200 gitlab: Support configuring the path of the maintainers file. --- gitlab/gitlab-to-mail/assign.py | 4 +++- gitlab/gitlab-to-mail/example.cfg | 3 +++ gitlab/gitlab-to-mail/util.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/assign.py b/gitlab/gitlab-to-mail/assign.py index 6b35f577..a4d8709d 100755 --- a/gitlab/gitlab-to-mail/assign.py +++ b/gitlab/gitlab-to-mail/assign.py @@ -44,7 +44,9 @@ def append_user(user_map, line, id_array, name_array, verbose=False): print("Cannot find GitLab account for [{}]".format(name), file=sys.stderr) def get_maintainers_map(verbose=False): - url = urljoin(settings.GITLAB_URL, f"{settings.GITLAB_PROJECT_NAME}/-/raw/master/MAINTAINERS") + if settings.MAINTAINERS is None: + return [] + url = urljoin(settings.GITLAB_URL, f"{settings.GITLAB_PROJECT_NAME}/-/raw/master/{settings.MAINTAINERS}") r = requests.get(url, headers={"PRIVATE-TOKEN": settings.GITLAB_TOKEN}) r = requests.get(url) r.raise_for_status() diff --git a/gitlab/gitlab-to-mail/example.cfg b/gitlab/gitlab-to-mail/example.cfg index a4e4f238..49ee8c7d 100644 --- a/gitlab/gitlab-to-mail/example.cfg +++ b/gitlab/gitlab-to-mail/example.cfg @@ -41,3 +41,6 @@ MAXIMUM_PATCHES = 50 # Configure runner.py behavior. A minimum delay of 30 seconds is enforced. RUNNER_COMMAND = ./gitlabtomail.py RUNNER_INTERVAL = 300 + +# Name of maintainers file for reviewers assignments +MAINTAINERS = "MAINTAINERS" diff --git a/gitlab/gitlab-to-mail/util.py b/gitlab/gitlab-to-mail/util.py index 231e8e21..b83b10b2 100644 --- a/gitlab/gitlab-to-mail/util.py +++ b/gitlab/gitlab-to-mail/util.py @@ -30,7 +30,7 @@ class Settings: sys.exit(1) for s in ['DATABASE', 'GITLAB_TOKEN', 'GITLAB_URL', 'GITLAB_PROJECT_NAME', - 'BRIDGE_FROM_EMAIL', 'BRIDGE_TO_EMAIL', 'BRIDGE_TAG', + 'BRIDGE_FROM_EMAIL', 'BRIDGE_TO_EMAIL', 'BRIDGE_TAG', 'MAINTAINERS', 'SMTP_DOMAIN', 'SMTP_USER', 'SMTP_PASSWORD', 'RUNNER_COMMAND']: if s in self.cp['settings']: self.__dict__[s] = self.cp['settings'][s].strip('"')

1 0

Hugh McMaster : regedit: Use 'struct edit_params' with read_value().
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 97f10736db6fc9c58ed181b3f23534513d6f9e13 URL: https://gitlab.winehq.org/wine/wine/-/commit/97f10736db6fc9c58ed181b3f23534… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 21 18:50:36 2022 +1000 regedit: Use 'struct edit_params' with read_value(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 136 ++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 69 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 27251420dde..44ef45993fd 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -30,7 +30,6 @@ #include "main.h" static const WCHAR* editValueName; -static WCHAR* stringValueData; static BOOL isDecimal; struct edit_params @@ -267,39 +266,42 @@ static INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wP return FALSE; } -static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len) +static BOOL read_value(HWND hwnd, struct edit_params *params) { - DWORD valueDataLen; - LPWSTR buffer = NULL; - LONG lRet; + LONG ret; + WCHAR *buf = NULL; - lRet = RegQueryValueExW(hKey, valueName, NULL, lpType, NULL, &valueDataLen); - if (lRet) { - if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ - if (len) *len = 1; - if (lpType) *lpType = REG_SZ; - buffer = malloc(sizeof(WCHAR)); - *buffer = '\0'; - return buffer; + if ((ret = RegQueryValueExW(params->hkey, params->value_name, NULL, &params->type, NULL, &params->size))) + { + if (ret == ERROR_FILE_NOT_FOUND && !params->value_name) + { + params->type = REG_SZ; + params->size = sizeof(WCHAR); + params->data = malloc(params->size); + *(WCHAR *)params->data = 0; + return TRUE; } - error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); - goto done; - } - buffer = malloc(valueDataLen + sizeof(WCHAR)); - lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); - if (lRet) { - error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); - goto done; + goto error; } - if((valueDataLen % sizeof(WCHAR)) == 0) - buffer[valueDataLen / sizeof(WCHAR)] = 0; - if(len) *len = valueDataLen; - return buffer; -done: - free(buffer); - return NULL; + buf = malloc(params->size + sizeof(WCHAR)); + + if (RegQueryValueExW(params->hkey, params->value_name, NULL, &params->type, (BYTE *)buf, &params->size)) + goto error; + + if (params->size % sizeof(WCHAR) == 0) + buf[params->size / sizeof(WCHAR)] = 0; + + params->data = buf; + + return TRUE; + +error: + error_code_messagebox(hwnd, IDS_BAD_VALUE, params->value_name); + free(buf); + params->data = NULL; + return FALSE; } BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) @@ -383,27 +385,24 @@ static void format_dlgproc_string(struct edit_params *params) BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { - HKEY hKey; - DWORD type; - LONG lRet; - LONG len; struct edit_params params; BOOL result = FALSE; - lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet) { + editValueName = valueName ? valueName : g_pszDefaultValueName; + + if (RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &params.hkey)) + { error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); - return FALSE; + return FALSE; } - editValueName = valueName ? valueName : g_pszDefaultValueName; - if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done; - - params.hkey = hKey; params.value_name = valueName; - params.type = type; - params.data = stringValueData; - params.size = len; + + if (!read_value(hwnd, &params)) + { + RegCloseKey(params.hkey); + return FALSE; + } switch (params.type) { @@ -433,15 +432,13 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); - free(stringValueData); - stringValueData = read_value(hwnd, hKey, valueName, &type, &len); - format_value_data(g_pChildWnd->hListWnd, index, type, stringValueData, len); + + read_value(hwnd, &params); + format_value_data(g_pChildWnd->hListWnd, index, params.type, params.data, params.size); } -done: - free(stringValueData); - stringValueData = NULL; - RegCloseKey(hKey); + free(params.data); + RegCloseKey(params.hkey); return result; } @@ -564,47 +561,48 @@ done: BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName) { - LPWSTR value = NULL; - DWORD type; - LONG len, lRet; + struct edit_params params; BOOL result = FALSE; - HKEY hKey; if (!oldName) return FALSE; if (!newName) return FALSE; - lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet) { + if (RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &params.hkey)) + { error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); - return FALSE; + return FALSE; } - if (!RegQueryValueExW(hKey, newName, NULL, NULL, NULL, NULL)) { + if (!RegQueryValueExW(params.hkey, newName, NULL, NULL, NULL, NULL)) + { error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName); goto done; } - value = read_value(hwnd, hKey, oldName, &type, &len); - if(!value) goto done; - lRet = RegSetValueExW(hKey, newName, 0, type, (BYTE*)value, len); - if (lRet) { + + params.value_name = oldName; + if (!read_value(hwnd, &params)) goto done; + + if (RegSetValueExW(params.hkey, newName, 0, params.type, (BYTE *)params.data, params.size)) + { error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); - goto done; + goto done; } - lRet = RegDeleteValueW(hKey, oldName); - if (lRet) { - RegDeleteValueW(hKey, newName); + + if (RegDeleteValueW(params.hkey, oldName)) + { + RegDeleteValueW(params.hkey, newName); error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); - goto done; + goto done; } + result = TRUE; done: - free(value); - RegCloseKey(hKey); + free(params.data); + RegCloseKey(params.hkey); return result; } - BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) { LPWSTR parentPath = 0;

1 0

Hugh McMaster : regedit: Pass updated REG_MULTI_SZ data via 'struct edit_params'.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: becf11084fa59b9b0e814e28af61c5ecfcb03597 URL: https://gitlab.winehq.org/wine/wine/-/commit/becf11084fa59b9b0e814e28af61c5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 18 22:27:01 2022 +1000 regedit: Pass updated REG_MULTI_SZ data via 'struct edit_params'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 224 +++++++++++++++++++++++++----------------------- 1 file changed, 119 insertions(+), 105 deletions(-)

1 0

Hugh McMaster : regedit: Pass updated REG_SZ and REG_EXPAND_SZ data via 'struct edit_params'.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 72fced02366d2897f8235656cc63ec31a6c9f386 URL: https://gitlab.winehq.org/wine/wine/-/commit/72fced02366d2897f8235656cc63ec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 11 21:39:32 2022 +1000 regedit: Pass updated REG_SZ and REG_EXPAND_SZ data via 'struct edit_params'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 64 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index d668425b137..e0d9d388bea 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -81,29 +81,53 @@ static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) va_end(ap); } -static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) +static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) { HWND hwndValue; unsigned int len; + WCHAR *buf; + LONG ret; + + hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); + len = GetWindowTextLengthW(hwndValue); + buf = malloc((len + 1) * sizeof(WCHAR)); + len = GetWindowTextW(hwndValue, buf, len + 1); + + free(params->data); + params->data = buf; + params->size = (len + 1) * sizeof(WCHAR); + + ret = RegSetValueExW(params->hkey, params->value_name, 0, params->type, (BYTE *)params->data, params->size); + if (ret) error_code_messagebox(hwndDlg, IDS_SET_VALUE_FAILED); + + free(params->data); + params->data = NULL; + + return !ret; +} + +static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + struct edit_params *params; + int ret = 0; switch (msg) { case WM_INITDIALOG: + params = (struct edit_params *)lparam; + SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); - SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData); + SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, params->data); return TRUE; case WM_COMMAND: switch (LOWORD(wparam)) { case IDOK: - hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); - len = GetWindowTextLengthW(hwndValue); - stringValueData = realloc(stringValueData, (len + 1) * sizeof(WCHAR)); - if (!GetWindowTextW(hwndValue, stringValueData, len + 1)) - *stringValueData = 0; + params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + ret = update_registry_value(hwndDlg, params); /* fall through */ case IDCANCEL: - EndDialog(hwndDlg, wparam); + EndDialog(hwndDlg, ret); return TRUE; } } @@ -281,11 +305,12 @@ done: BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { - BOOL result = FALSE; + HKEY hKey; DWORD type; LONG lRet; - HKEY hKey; LONG len; + struct edit_params params; + BOOL result = FALSE; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet) { @@ -296,12 +321,14 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) editValueName = valueName ? valueName : g_pszDefaultValueName; if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done; + params.hkey = hKey; + params.value_name = valueName; + params.type = type; + params.data = stringValueData; + params.size = len; + if ( (type == REG_SZ) || (type == REG_EXPAND_SZ) ) { - if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_string_dlgproc) == IDOK) { - lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, (lstrlenW(stringValueData) + 1) * sizeof(WCHAR)); - if (lRet == ERROR_SUCCESS) result = TRUE; - else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); - } + result = DialogBoxParamW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_string_dlgproc, (LPARAM)&params); } else if ( type == REG_DWORD ) { DWORD value = *((DWORD*)stringValueData); stringValueData = realloc(stringValueData, 64); @@ -383,13 +410,6 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) } else /* hex data types */ { - struct edit_params params; - - params.hkey = hKey; - params.value_name = valueName; - params.type = type; - params.data = stringValueData; - params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, bin_modify_dlgproc, (LPARAM)&params); }

1 0

Hugh McMaster : regedit: Use a separate dialog proc function for string data types.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: b00a4b66b93e24e00c6638fd0b18716908885d06 URL: https://gitlab.winehq.org/wine/wine/-/commit/b00a4b66b93e24e00c6638fd0b1871… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 8 10:44:21 2022 +1000 regedit: Use a separate dialog proc function for string data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 4cb48799090..d668425b137 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -81,6 +81,35 @@ static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) va_end(ap); } +static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + HWND hwndValue; + unsigned int len; + + switch (msg) + { + case WM_INITDIALOG: + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); + SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData); + return TRUE; + case WM_COMMAND: + switch (LOWORD(wparam)) + { + case IDOK: + hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); + len = GetWindowTextLengthW(hwndValue); + stringValueData = realloc(stringValueData, (len + 1) * sizeof(WCHAR)); + if (!GetWindowTextW(hwndValue, stringValueData, len + 1)) + *stringValueData = 0; + /* fall through */ + case IDCANCEL: + EndDialog(hwndDlg, wparam); + return TRUE; + } + } + return FALSE; +} + static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) { WCHAR buf[128]; @@ -268,7 +297,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done; if ( (type == REG_SZ) || (type == REG_EXPAND_SZ) ) { - if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_dlgproc) == IDOK) { + if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_string_dlgproc) == IDOK) { lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, (lstrlenW(stringValueData) + 1) * sizeof(WCHAR)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022