wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Jacek Caban : win32u: Move reply_message_result implementation from user32.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: e72d4630722db6e945b5c238019782e4b080879b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e72d4630722db6e945b5c238… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 15:36:02 2022 +0200 win32u: Move reply_message_result implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 181 +---------------------------- dlls/win32u/message.c | 264 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 9 ++ dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 153 +++++++++++++++++++++++++ 6 files changed, 431 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e72d4630722db6e945b5…

1 0

Jacek Caban : user32: Introduce reply_message_result helper.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: f499b1a7abe92f54f4749f9f98981ada734b848a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f499b1a7abe92f54f4749f9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 15:35:51 2022 +0200 user32: Introduce reply_message_result helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 426352da584..6707565d5d7 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -261,6 +261,7 @@ struct received_message_info enum message_type type; MSG msg; UINT flags; /* InSendMessageEx return flags */ + struct received_message_info *prev; }; /* structure to group all parameters for sent messages of the various kinds */ @@ -1824,10 +1825,11 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, * * Send a reply to a sent message. */ -static void reply_message( struct received_message_info *info, LRESULT result, BOOL remove ) +static void reply_message( struct received_message_info *info, LRESULT result, MSG *msg ) { struct packed_message data; int i, replied = info->flags & ISMEX_REPLIED; + BOOL remove = msg != NULL; if (info->flags & ISMEX_NOTIFY) return; /* notify messages don't get replies */ if (!remove && replied) return; /* replied already */ @@ -1837,8 +1839,8 @@ static void reply_message( struct received_message_info *info, LRESULT result, B if (info->type == MSG_OTHER_PROCESS && !replied) { - pack_reply( info->msg.hwnd, info->msg.message, info->msg.wParam, - info->msg.lParam, result, &data ); + if (!msg) msg = &info->msg; + pack_reply( msg->hwnd, msg->message, msg->wParam, msg->lParam, result, &data ); } SERVER_START_REQ( reply_message ) @@ -1852,6 +1854,22 @@ static void reply_message( struct received_message_info *info, LRESULT result, B } +/*********************************************************************** + * reply_message_result + * + * Send a reply to a sent message and update thread receive info. + */ +static BOOL reply_message_result( LRESULT result, MSG *msg ) +{ + struct received_message_info *info = get_user_thread_info()->receive_info; + + if (!info) return FALSE; + reply_message( info, result, msg ); + if (msg) get_user_thread_info()->receive_info = info->prev; + return TRUE; +} + + /*********************************************************************** * handle_internal_message * @@ -2665,7 +2683,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, LRESULT result; struct user_thread_info *thread_info = get_user_thread_info(); INPUT_MESSAGE_SOURCE prev_source = thread_info->msg_source; - struct received_message_info info, *old_info; + struct received_message_info info; unsigned int hw_id = 0; /* id of previous hardware message */ void *buffer; size_t buffer_size = 1024; @@ -2810,7 +2828,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, hook.pt.x, hook.pt.y, hook.mouseData, hook.flags, hook.time, hook.dwExtraInfo ); result = HOOK_CallHooks( WH_MOUSE_LL, HC_ACTION, info.msg.wParam, (LPARAM)&hook, TRUE ); } - reply_message( &info, result, TRUE ); + reply_message( &info, result, &info.msg ); continue; case MSG_OTHER_PROCESS: info.flags = ISMEX_SEND; @@ -2818,7 +2836,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, &info.msg.lParam, &buffer, size )) { /* ignore it */ - reply_message( &info, 0, TRUE ); + reply_message( &info, 0, &info.msg ); continue; } break; @@ -2878,14 +2896,14 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, } /* if we get here, we have a sent message; call the window procedure */ - old_info = thread_info->receive_info; + info.prev = thread_info->receive_info; thread_info->receive_info = &info; thread_info->msg_source = msg_source_unavailable; result = call_window_proc( info.msg.hwnd, info.msg.message, info.msg.wParam, info.msg.lParam, (info.type != MSG_ASCII), FALSE, WMCHAR_MAP_RECVMESSAGE ); - reply_message( &info, result, TRUE ); - thread_info->receive_info = old_info; + if (thread_info->receive_info == &info ) + reply_message_result( result, &info.msg ); /* if some PM_QS* flags were specified, only handle sent messages from now on */ if (HIWORD(flags) && !changed_mask) flags = PM_QS_SENDMESSAGE | LOWORD(flags); @@ -3573,11 +3591,7 @@ BOOL WINAPI SendMessageCallbackW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa */ BOOL WINAPI ReplyMessage( LRESULT result ) { - struct received_message_info *info = get_user_thread_info()->receive_info; - - if (!info) return FALSE; - reply_message( info, result, FALSE ); - return TRUE; + return reply_message_result( result, NULL ); }

1 0

Sven Baars : winemenubuilder: Use the full path name when extracting an icon.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: 3cac7e1d0c11945cebec8c0d2e77b751d2f8067f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cac7e1d0c11945cebec8c0d… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Mar 31 12:54:47 2022 +0200 winemenubuilder: Use the full path name when extracting an icon. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index a2aa5eef0e4..1579ca8dafa 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1146,16 +1146,25 @@ static WCHAR *extract_icon(LPCWSTR icoPathW, int index, const WCHAR *destFilenam int numEntries; HRESULT hr; WCHAR *nativeIdentifier = NULL; + WCHAR fullPathW[MAX_PATH]; + DWORD len; WINE_TRACE("path=[%s] index=%d destFilename=[%s]\n", wine_dbgstr_w(icoPathW), index, wine_dbgstr_w(destFilename)); - hr = open_icon(icoPathW, index, bWait, &stream, &pIconDirEntries, &numEntries); + len = GetFullPathNameW(icoPathW, MAX_PATH, fullPathW, NULL); + if (len == 0 || len > MAX_PATH) + { + WINE_WARN("GetFullPathName failed\n"); + return NULL; + } + + hr = open_icon(fullPathW, index, bWait, &stream, &pIconDirEntries, &numEntries); if (FAILED(hr)) { - WINE_WARN("opening icon %s index %d failed, hr=0x%08lX\n", wine_dbgstr_w(icoPathW), index, hr); + WINE_WARN("opening icon %s index %d failed, hr=0x%08lX\n", wine_dbgstr_w(fullPathW), index, hr); goto end; } - hr = platform_write_icon(stream, pIconDirEntries, numEntries, index, icoPathW, destFilename, &nativeIdentifier); + hr = platform_write_icon(stream, pIconDirEntries, numEntries, index, fullPathW, destFilename, &nativeIdentifier); if (FAILED(hr)) WINE_WARN("writing icon failed, error 0x%08lX\n", hr);

1 0

Sven Baars : winemenubuilder: Search for an executable file when no file extension is provided.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: 8a17ad4b3f38adc7da7c1ef52bf46cbcf7efe631 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a17ad4b3f38adc7da7c1ef5… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Mar 31 12:54:46 2022 +0200 winemenubuilder: Search for an executable file when no file extension is provided. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ab8798a88b5..a2aa5eef0e4 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -802,16 +802,25 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre GRPICONDIR *pIconDir; ENUMRESSTRUCT sEnumRes; HRESULT hr = E_FAIL; + WCHAR fullPathW[MAX_PATH]; + DWORD len; + + len = SearchPathW(NULL, szFileName, L".exe", MAX_PATH, fullPathW, NULL); + if (len == 0 || len > MAX_PATH) + { + WINE_WARN("SearchPath failed\n"); + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + } - hModule = LoadLibraryExW(szFileName, 0, LOAD_LIBRARY_AS_DATAFILE); + hModule = LoadLibraryExW(fullPathW, 0, LOAD_LIBRARY_AS_DATAFILE); if (!hModule) { if (GetLastError() == ERROR_BAD_EXE_FORMAT) - return open_module16_icon(szFileName, nIndex, ppStream); + return open_module16_icon(fullPathW, nIndex, ppStream); else { WINE_WARN("LoadLibraryExW (%s) failed, error %ld\n", - wine_dbgstr_w(szFileName), GetLastError()); + wine_dbgstr_w(fullPathW), GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } } @@ -820,7 +829,7 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre { hResInfo = FindResourceW(hModule, MAKEINTRESOURCEW(-nIndex), (LPCWSTR)RT_GROUP_ICON); WINE_TRACE("FindResourceW (%s) called, return %p, error %ld\n", - wine_dbgstr_w(szFileName), hResInfo, GetLastError()); + wine_dbgstr_w(fullPathW), hResInfo, GetLastError()); } else {

1 0

Nikolay Sivov : explorerframe: Use CRT memory allocation functions.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: 8498a9d1efc08da657fd338a4d2964b52895c651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8498a9d1efc08da657fd338a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 31 15:00:23 2022 +0300 explorerframe: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 15 +++++++-------- dlls/explorerframe/taskbarlist.c | 5 ++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 315316f7e7a..3b56d33367a 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -33,7 +33,6 @@ #include "wine/list.h" #include "wine/debug.h" -#include "wine/heap.h" #include "explorerframe_main.h" @@ -852,7 +851,7 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface) if(!ref) { TRACE("Freeing.\n"); - heap_free(This); + free(This); EFRAME_UnlockModule(); } @@ -989,7 +988,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, TRACE("%p, %d, %p, %lx, %lx, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); - new_root = heap_alloc(sizeof(*new_root)); + new_root = malloc(sizeof(*new_root)); if(!new_root) return E_OUTOFMEMORY; @@ -1013,7 +1012,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, if(!new_root->htreeitem) { WARN("Failed to add the root.\n"); - heap_free(new_root); + free(new_root); return E_FAIL; } @@ -1081,7 +1080,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, events_OnItemDeleted(This, root->psi, TRUE); SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); list_remove(&root->entry); - heap_free(root); + free(root); return S_OK; } else @@ -1123,7 +1122,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, if(!count) return E_INVALIDARG; - array = heap_alloc(sizeof(LPITEMIDLIST)*count); + array = malloc(sizeof(LPITEMIDLIST)*count); i = 0; LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry) @@ -1137,7 +1136,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, for(i = 0; i < count; i++) ILFree(array[i]); - heap_free(array); + free(array); return hr; } @@ -1598,7 +1597,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); - nstc = heap_alloc_zero(sizeof(*nstc)); + nstc = calloc(1, sizeof(*nstc)); if (!nstc) return E_OUTOFMEMORY; diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index b4bc104cd6b..dd61cc62ae4 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -21,7 +21,6 @@ #include "explorerframe_main.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); @@ -81,7 +80,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface) if (!refcount) { - heap_free(This); + free(This); EFRAME_UnlockModule(); } @@ -309,7 +308,7 @@ HRESULT TaskbarList_Constructor(IUnknown *outer, REFIID riid, void **taskbar_lis return CLASS_E_NOAGGREGATION; } - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if (!object) { ERR("Failed to allocate taskbar list object memory\n");

1 0

Nikolay Sivov : sxs: Use CRT memory allocation functions.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: 686843655cc91873164a25694c023aba7e542a11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=686843655cc91873164a2569… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 31 14:55:58 2022 +0300 sxs: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 593c8644b7e..012bc054129 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -106,19 +106,19 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, */ static void FreeAppInfo(APPINFO *info) { - HeapFree(GetProcessHeap(), 0, info->title); - HeapFree(GetProcessHeap(), 0, info->path); - HeapFree(GetProcessHeap(), 0, info->path_modify); - HeapFree(GetProcessHeap(), 0, info->icon); - HeapFree(GetProcessHeap(), 0, info->publisher); - HeapFree(GetProcessHeap(), 0, info->version); - HeapFree(GetProcessHeap(), 0, info->contact); - HeapFree(GetProcessHeap(), 0, info->helplink); - HeapFree(GetProcessHeap(), 0, info->helptelephone); - HeapFree(GetProcessHeap(), 0, info->readme); - HeapFree(GetProcessHeap(), 0, info->urlupdateinfo); - HeapFree(GetProcessHeap(), 0, info->comments); - HeapFree(GetProcessHeap(), 0, info); + free(info->title); + free(info->path); + free(info->path_modify); + free(info->icon); + free(info->publisher); + free(info->version); + free(info->contact); + free(info->helplink); + free(info->helptelephone); + free(info->readme); + free(info->urlupdateinfo); + free(info->comments); + free(info); } static WCHAR *get_reg_str(HKEY hkey, const WCHAR *value) @@ -127,7 +127,7 @@ static WCHAR *get_reg_str(HKEY hkey, const WCHAR *value) WCHAR *ret = NULL; if (!RegQueryValueExW(hkey, value, NULL, &type, NULL, &len) && type == REG_SZ) { - if (!(ret = HeapAlloc(GetProcessHeap(), 0, len))) return NULL; + if (!(ret = malloc(len))) return NULL; RegQueryValueExW(hkey, value, 0, 0, (BYTE *)ret, &len); } return ret; @@ -176,12 +176,12 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) { int len = lstrlenW(L"msiexec /x%s") + lstrlenW(subKeyName); - if (!(command = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; + if (!(command = malloc(len * sizeof(WCHAR)))) goto err; wsprintfW(command, L"msiexec /x%s", subKeyName); } else if (!RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, NULL, &uninstlen)) { - if (!(command = HeapAlloc(GetProcessHeap(), 0, uninstlen))) goto err; + if (!(command = malloc(uninstlen))) goto err; RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, (BYTE *)command, &uninstlen); } else @@ -191,10 +191,10 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) continue; } - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct APPINFO)); + info = calloc(1, sizeof(*info)); if (!info) goto err; - info->title = HeapAlloc(GetProcessHeap(), 0, displen); + info->title = malloc(displen); if (!info->title) goto err; @@ -209,7 +209,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) info->icon = 0; else { - info->icon = HeapAlloc(GetProcessHeap(), 0, displen); + info->icon = malloc(displen); if (!info->icon) goto err; @@ -259,12 +259,12 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) { int len = lstrlenW(L"msiexec /i%s") + lstrlenW(subKeyName); - if (!(info->path_modify = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; + if (!(info->path_modify = malloc(len * sizeof(WCHAR)))) goto err; wsprintfW(info->path_modify, L"msiexec /i%s", subKeyName); } else if (!RegQueryValueExW(hkeyApp, L"ModifyPath", 0, 0, NULL, &displen)) { - if (!(info->path_modify = HeapAlloc(GetProcessHeap(), 0, displen))) goto err; + if (!(info->path_modify = malloc(displen))) goto err; RegQueryValueExW(hkeyApp, L"ModifyPath", 0, 0, (BYTE *)info->path_modify, &displen); } } @@ -286,7 +286,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) err: RegCloseKey(hkeyApp); if (info) FreeAppInfo(info); - HeapFree(GetProcessHeap(), 0, command); + free(command); return FALSE; }

1 0

Nikolay Sivov : atl: Use CRT allocation functions.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: 6341e6d9244e27c26f87715d4978fe9028115a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6341e6d9244e27c26f87715d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 31 14:54:48 2022 +0300 atl: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 11 +++++------ dlls/atl/atl30.c | 2 +- dlls/atl/atl_ax.c | 24 ++++++++++++------------ dlls/atl/registrar.c | 45 ++++++++++++++++++++++----------------------- 4 files changed, 40 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6341e6d9244e27c26f87…

1 0

Hans Leidekker : crypt32/tests: Use wide character string literals.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: 33ff4a6671db8d515ef6f1a205c5fb46569ee978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ff4a6671db8d515ef6f1a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 31 11:06:03 2022 +0200 crypt32/tests: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 52 ++++---- dlls/crypt32/tests/chain.c | 59 +++------- dlls/crypt32/tests/encode.c | 88 ++++++-------- dlls/crypt32/tests/main.c | 16 +-- dlls/crypt32/tests/object.c | 54 +++------ dlls/crypt32/tests/oid.c | 65 +++++----- dlls/crypt32/tests/protectdata.c | 13 +- dlls/crypt32/tests/sip.c | 35 +++--- dlls/crypt32/tests/store.c | 222 ++++++++++++---------------------- dlls/crypt32/tests/str.c | 249 ++++++++++++--------------------------- 10 files changed, 294 insertions(+), 559 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33ff4a6671db8d515ef6…

1 0

Alexandre Julliard : kernel32: Remove the old locale information stored in resources.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: 2366d19b458f534388b0f1f58afbd58f5aa021ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2366d19b458f534388b0f1f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 11:01:16 2022 +0200 kernel32: Remove the old locale information stored in resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/locale_rc.rc | 260 --------------------------------------------- dlls/kernel32/nls/afk.nls | 159 --------------------------- dlls/kernel32/nls/ara.nls | 159 --------------------------- dlls/kernel32/nls/arb.nls | 159 --------------------------- dlls/kernel32/nls/are.nls | 159 --------------------------- dlls/kernel32/nls/arg.nls | 159 --------------------------- dlls/kernel32/nls/arh.nls | 159 --------------------------- dlls/kernel32/nls/ari.nls | 159 --------------------------- dlls/kernel32/nls/arj.nls | 159 --------------------------- dlls/kernel32/nls/ark.nls | 159 --------------------------- dlls/kernel32/nls/arl.nls | 159 --------------------------- dlls/kernel32/nls/arm.nls | 159 --------------------------- dlls/kernel32/nls/aro.nls | 159 --------------------------- dlls/kernel32/nls/arq.nls | 159 --------------------------- dlls/kernel32/nls/ars.nls | 159 --------------------------- dlls/kernel32/nls/art.nls | 159 --------------------------- dlls/kernel32/nls/aru.nls | 159 --------------------------- dlls/kernel32/nls/ary.nls | 159 --------------------------- dlls/kernel32/nls/ast.nls | 159 --------------------------- dlls/kernel32/nls/aze.nls | 159 --------------------------- dlls/kernel32/nls/azl.nls | 159 --------------------------- dlls/kernel32/nls/bel.nls | 159 --------------------------- dlls/kernel32/nls/ben.nls | 153 -------------------------- dlls/kernel32/nls/bgr.nls | 159 --------------------------- dlls/kernel32/nls/brf.nls | 160 ---------------------------- dlls/kernel32/nls/cat.nls | 159 --------------------------- dlls/kernel32/nls/chs.nls | 159 --------------------------- dlls/kernel32/nls/cht.nls | 159 --------------------------- dlls/kernel32/nls/cor.nls | 160 ---------------------------- dlls/kernel32/nls/csy.nls | 159 --------------------------- dlls/kernel32/nls/cym.nls | 160 ---------------------------- dlls/kernel32/nls/dan.nls | 159 --------------------------- dlls/kernel32/nls/dea.nls | 159 --------------------------- dlls/kernel32/nls/dec.nls | 159 --------------------------- dlls/kernel32/nls/del.nls | 159 --------------------------- dlls/kernel32/nls/des.nls | 159 --------------------------- dlls/kernel32/nls/deu.nls | 159 --------------------------- dlls/kernel32/nls/div.nls | 159 --------------------------- dlls/kernel32/nls/ell.nls | 159 --------------------------- dlls/kernel32/nls/ena.nls | 159 --------------------------- dlls/kernel32/nls/enb.nls | 159 --------------------------- dlls/kernel32/nls/enc.nls | 159 --------------------------- dlls/kernel32/nls/eng.nls | 159 --------------------------- dlls/kernel32/nls/eni.nls | 159 --------------------------- dlls/kernel32/nls/enj.nls | 159 --------------------------- dlls/kernel32/nls/enl.nls | 159 --------------------------- dlls/kernel32/nls/enp.nls | 159 --------------------------- dlls/kernel32/nls/ens.nls | 159 --------------------------- dlls/kernel32/nls/ent.nls | 159 --------------------------- dlls/kernel32/nls/enu.nls | 159 --------------------------- dlls/kernel32/nls/enw.nls | 159 --------------------------- dlls/kernel32/nls/enz.nls | 159 --------------------------- dlls/kernel32/nls/eox.nls | 175 ------------------------------ dlls/kernel32/nls/esa.nls | 159 --------------------------- dlls/kernel32/nls/esb.nls | 159 --------------------------- dlls/kernel32/nls/esc.nls | 159 --------------------------- dlls/kernel32/nls/esd.nls | 159 --------------------------- dlls/kernel32/nls/ese.nls | 159 --------------------------- dlls/kernel32/nls/esf.nls | 159 --------------------------- dlls/kernel32/nls/esg.nls | 159 --------------------------- dlls/kernel32/nls/esh.nls | 159 --------------------------- dlls/kernel32/nls/esi.nls | 159 --------------------------- dlls/kernel32/nls/esl.nls | 159 --------------------------- dlls/kernel32/nls/esm.nls | 159 --------------------------- dlls/kernel32/nls/esn.nls | 159 --------------------------- dlls/kernel32/nls/eso.nls | 159 --------------------------- dlls/kernel32/nls/esp.nls | 159 --------------------------- dlls/kernel32/nls/esr.nls | 159 --------------------------- dlls/kernel32/nls/ess.nls | 159 --------------------------- dlls/kernel32/nls/esu.nls | 159 --------------------------- dlls/kernel32/nls/esv.nls | 159 --------------------------- dlls/kernel32/nls/esy.nls | 159 --------------------------- dlls/kernel32/nls/esz.nls | 159 --------------------------- dlls/kernel32/nls/eti.nls | 159 --------------------------- dlls/kernel32/nls/euq.nls | 159 --------------------------- dlls/kernel32/nls/far.nls | 159 --------------------------- dlls/kernel32/nls/fin.nls | 159 --------------------------- dlls/kernel32/nls/fos.nls | 159 --------------------------- dlls/kernel32/nls/fra.nls | 159 --------------------------- dlls/kernel32/nls/frb.nls | 159 --------------------------- dlls/kernel32/nls/frc.nls | 159 --------------------------- dlls/kernel32/nls/frl.nls | 159 --------------------------- dlls/kernel32/nls/frm.nls | 159 --------------------------- dlls/kernel32/nls/frs.nls | 159 --------------------------- dlls/kernel32/nls/gae.nls | 160 ---------------------------- dlls/kernel32/nls/gdh.nls | 160 ---------------------------- dlls/kernel32/nls/gdv.nls | 160 ---------------------------- dlls/kernel32/nls/glc.nls | 159 --------------------------- dlls/kernel32/nls/guj.nls | 159 --------------------------- dlls/kernel32/nls/heb.nls | 160 ---------------------------- dlls/kernel32/nls/hin.nls | 159 --------------------------- dlls/kernel32/nls/hrv.nls | 159 --------------------------- dlls/kernel32/nls/hun.nls | 159 --------------------------- dlls/kernel32/nls/hye.nls | 159 --------------------------- dlls/kernel32/nls/ind.nls | 159 --------------------------- dlls/kernel32/nls/isl.nls | 159 --------------------------- dlls/kernel32/nls/ita.nls | 159 --------------------------- dlls/kernel32/nls/its.nls | 159 --------------------------- dlls/kernel32/nls/ivl.nls | 159 --------------------------- dlls/kernel32/nls/jpn.nls | 159 --------------------------- dlls/kernel32/nls/kan.nls | 159 --------------------------- dlls/kernel32/nls/kat.nls | 159 --------------------------- dlls/kernel32/nls/kkz.nls | 159 --------------------------- dlls/kernel32/nls/knk.nls | 159 --------------------------- dlls/kernel32/nls/kor.nls | 159 --------------------------- dlls/kernel32/nls/kyr.nls | 159 --------------------------- dlls/kernel32/nls/lth.nls | 159 --------------------------- dlls/kernel32/nls/lvi.nls | 159 --------------------------- dlls/kernel32/nls/mar.nls | 159 --------------------------- dlls/kernel32/nls/mki.nls | 159 --------------------------- dlls/kernel32/nls/mon.nls | 159 --------------------------- dlls/kernel32/nls/msb.nls | 159 --------------------------- dlls/kernel32/nls/msl.nls | 159 --------------------------- dlls/kernel32/nls/nep.nls | 153 -------------------------- dlls/kernel32/nls/nlb.nls | 159 --------------------------- dlls/kernel32/nls/nld.nls | 159 --------------------------- dlls/kernel32/nls/nls.nls | 165 ---------------------------- dlls/kernel32/nls/non.nls | 159 --------------------------- dlls/kernel32/nls/nor.nls | 160 ---------------------------- dlls/kernel32/nls/pan.nls | 159 --------------------------- dlls/kernel32/nls/plk.nls | 159 --------------------------- dlls/kernel32/nls/ptb.nls | 159 --------------------------- dlls/kernel32/nls/ptg.nls | 159 --------------------------- dlls/kernel32/nls/rmc.nls | 170 ----------------------------- dlls/kernel32/nls/rom.nls | 159 --------------------------- dlls/kernel32/nls/rus.nls | 159 --------------------------- dlls/kernel32/nls/san.nls | 159 --------------------------- dlls/kernel32/nls/sin.nls | 159 --------------------------- dlls/kernel32/nls/sky.nls | 159 --------------------------- dlls/kernel32/nls/slv.nls | 159 --------------------------- dlls/kernel32/nls/sqi.nls | 159 --------------------------- dlls/kernel32/nls/srb.nls | 159 --------------------------- dlls/kernel32/nls/srl.nls | 159 --------------------------- dlls/kernel32/nls/srm.nls | 156 --------------------------- dlls/kernel32/nls/sve.nls | 159 --------------------------- dlls/kernel32/nls/svf.nls | 159 --------------------------- dlls/kernel32/nls/swk.nls | 159 --------------------------- dlls/kernel32/nls/syr.nls | 159 --------------------------- dlls/kernel32/nls/tam.nls | 159 --------------------------- dlls/kernel32/nls/tel.nls | 159 --------------------------- dlls/kernel32/nls/tha.nls | 159 --------------------------- dlls/kernel32/nls/trk.nls | 159 --------------------------- dlls/kernel32/nls/ttt.nls | 159 --------------------------- dlls/kernel32/nls/ukr.nls | 159 --------------------------- dlls/kernel32/nls/urd.nls | 159 --------------------------- dlls/kernel32/nls/uzb.nls | 159 --------------------------- dlls/kernel32/nls/uzl.nls | 159 --------------------------- dlls/kernel32/nls/vit.nls | 159 --------------------------- dlls/kernel32/nls/wal.nls | 159 --------------------------- dlls/kernel32/nls/zhh.nls | 159 --------------------------- dlls/kernel32/nls/zhi.nls | 159 --------------------------- dlls/kernel32/nls/zhm.nls | 159 --------------------------- 153 files changed, 24296 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2366d19b458f534388b0…

1 0

Alexandre Julliard : msvcrt: Use EnumSystemLocalesEx instead of directly accessing kernel32 resources.
by Alexandre Julliard 31 Mar '22

31 Mar '22

Module: wine Branch: master Commit: f14adf592838a52d1e47b2ff123ba83f5787265b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f14adf592838a52d1e47b2ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 10:56:18 2022 +0200 msvcrt: Use EnumSystemLocalesEx instead of directly accessing kernel32 resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 037660d0a91..2421830e7b5 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -255,22 +255,19 @@ static int compare_info(LCID lcid, DWORD flags, char* buff, const char* cmp, BOO } static BOOL CALLBACK -find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LONG_PTR lParam) +find_best_locale_proc( WCHAR *name, DWORD locale_flags, LPARAM lParam ) { locale_search_t *res = (locale_search_t *)lParam; - const LCID lcid = MAKELCID(LangID, SORT_DEFAULT); + const LCID lcid = LocaleNameToLCID( name, 0 ); char buff[MAX_ELEM_LEN]; unsigned int flags = 0; - if(PRIMARYLANGID(LangID) == LANG_NEUTRAL) - return CONTINUE_LOOKING; - #if _MSVCR_VER >= 110 if (res->allow_sname && compare_info(lcid,LOCALE_SNAME,buff,res->search_language, TRUE)) { TRACE(":Found locale: %s->%s\n", res->search_language, buff); res->match_flags = FOUND_SNAME; - res->found_lang_id = LangID; + res->found_lang_id = LANGIDFROMLCID(lcid); return STOP_LOOKING; } #endif @@ -305,7 +302,7 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO { /* Found a better match than previously */ res->match_flags = flags; - res->found_lang_id = LangID; + res->found_lang_id = LANGIDFROMLCID(lcid); } if ((flags & (FOUND_LANGUAGE | FOUND_COUNTRY)) == (FOUND_LANGUAGE | FOUND_COUNTRY)) @@ -363,9 +360,7 @@ LCID locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *sname) search.allow_sname = TRUE; } - EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, - (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, - (LONG_PTR)&search); + EnumSystemLocalesEx( find_best_locale_proc, 0, (LPARAM)&search, NULL); if (!search.match_flags) return -1;

1 0

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 March 2022