- Wine-Commits - list.winehq.org

Paul Gofman : include: Fix ID3DXLoadUserData definition.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 0761c363f4d0711fbd7d812839419b37f674dcbc URL: https://gitlab.winehq.org/wine/wine/-/commit/0761c363f4d0711fbd7d812839419b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 21 10:01:08 2023 -0600 include: Fix ID3DXLoadUserData definition. --- include/d3dx9anim.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 81b8e2f6b2c..54f7ce9b70c 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -183,23 +183,25 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy) #define INTERFACE ID3DXLoadUserData DECLARE_INTERFACE(ID3DXLoadUserData) { - STDMETHOD(LoadTopLevelData)(ID3DXFileData *child_data) PURE; - STDMETHOD(LoadFrameChildData)(D3DXFRAME *frame, ID3DXFileData *child_data) PURE; - STDMETHOD(LoadMeshChildData)(D3DXMESHCONTAINER *mesh_container, ID3DXFileData *child_data) PURE; + /* MS DirectX SDK headers define these methods without 'this' parameter. */ + STDMETHOD(LoadTopLevelData)(THIS_ ID3DXFileData *child_data) PURE; + STDMETHOD(LoadFrameChildData)(THIS_ D3DXFRAME *frame, ID3DXFileData *child_data) PURE; + STDMETHOD(LoadMeshChildData)(THIS_ D3DXMESHCONTAINER *mesh_container, ID3DXFileData *child_data) PURE; }; #undef INTERFACE #define INTERFACE ID3DXSaveUserData DECLARE_INTERFACE(ID3DXSaveUserData) { - STDMETHOD(AddFrameChildData)(const D3DXFRAME *frame, + /* MS DirectX SDK headers define these methods without 'this' parameter. */ + STDMETHOD(AddFrameChildData)(THIS_ const D3DXFRAME *frame, ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *frame_data) PURE; - STDMETHOD(AddMeshChildData)(const D3DXMESHCONTAINER *mesh_container, + STDMETHOD(AddMeshChildData)(THIS_ const D3DXMESHCONTAINER *mesh_container, ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; - STDMETHOD(AddTopLevelDataObjectsPre)(ID3DXFileSaveObject *save_obj) PURE; - STDMETHOD(AddTopLevelDataObjectsPost)(ID3DXFileSaveObject *save_obj) PURE; - STDMETHOD(RegisterTemplates)(ID3DXFile *file) PURE; - STDMETHOD(SaveTemplates)(ID3DXFileSaveObject *save_obj) PURE; + STDMETHOD(AddTopLevelDataObjectsPre)(THIS_ ID3DXFileSaveObject *save_obj) PURE; + STDMETHOD(AddTopLevelDataObjectsPost)(THIS_ ID3DXFileSaveObject *save_obj) PURE; + STDMETHOD(RegisterTemplates)(THIS_ ID3DXFile *file) PURE; + STDMETHOD(SaveTemplates)(THIS_ ID3DXFileSaveObject *save_obj) PURE; }; #undef INTERFACE

1 0

Eric Pouech : regedit: Use message boxes by default for output.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 6b2a3dcdbab958121318de29a24134c5173aa75b URL: https://gitlab.winehq.org/wine/wine/-/commit/6b2a3dcdbab958121318de29a24134… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 23 18:28:40 2023 +0100 regedit: Use message boxes by default for output. regedit is in GUI subsystem and shouldn't interact with console. Keeping unix I/O output in silent mode (forcing English locale for Unix integration). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/regedit/main.h | 2 +- programs/regedit/regedit.c | 103 +++++++++++++++++++++++---------------------- programs/regedit/regproc.c | 11 +++-- 3 files changed, 62 insertions(+), 54 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 310469f83f6..d9998d743a2 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -154,7 +154,7 @@ BOOL IsDefaultValue(HWND hwndLV, int i); /* regedit.c */ void WINAPIV output_message(unsigned int id, ...); -void WINAPIV error_exit(unsigned int id, ...); +void WINAPIV error_exit(void); /* regproc.c */ char *GetMultiByteString(const WCHAR *strW); diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 03e0ec9c7cb..fd8a98ae8c0 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -28,74 +28,76 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); -static void output_writeconsole(const WCHAR *str, DWORD wlen) +static BOOL silent; + +static void output_formatstring(BOOL with_help, UINT id, va_list va_args) { - DWORD count; + WCHAR buffer[4096]; + WCHAR fmt[1536]; + DWORD len; + LCID current_lcid; + + if (silent && with_help) return; + + current_lcid = GetThreadLocale(); + if (silent) /* force en-US not to have localized strings */ + SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)); - if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL)) + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { - DWORD len; - char *msgA; - - /* WriteConsole() fails on Windows if its output is redirected. If this occurs, - * we should call WriteFile() with OEM code page. - */ - len = WideCharToMultiByte(GetOEMCP(), 0, str, wlen, NULL, 0, NULL, NULL); - msgA = malloc(len); - if (!msgA) return; - - WideCharToMultiByte(GetOEMCP(), 0, str, wlen, msgA, len, NULL, NULL); - WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - free(msgA); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); + if (silent) SetThreadLocale(current_lcid); + return; } -} -static void output_formatstring(const WCHAR *fmt, va_list va_args) -{ - WCHAR *str; - DWORD len; - - len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, - fmt, 0, 0, (WCHAR *)&str, 0, &va_args); + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, + fmt, 0, 0, buffer, ARRAY_SIZE(buffer), &va_args); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + if (silent) SetThreadLocale(current_lcid); return; } - output_writeconsole(str, len); - LocalFree(str); + if (with_help && + !LoadStringW(GetModuleHandleW(NULL), STRING_HELP, + &buffer[wcslen(buffer)], ARRAY_SIZE(buffer) - wcslen(buffer))) + { + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); + if (silent) SetThreadLocale(current_lcid); + return; + } + if (silent) + { + MESSAGE("%ls", buffer); + SetThreadLocale(current_lcid); + } + else + MessageBoxW(NULL, buffer, MAKEINTRESOURCEW(IDS_APP_TITLE), MB_OK | MB_ICONHAND); } void WINAPIV output_message(unsigned int id, ...) { - WCHAR fmt[1536]; va_list va_args; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) - { - WINE_FIXME("LoadString failed with %ld\n", GetLastError()); - return; - } va_start(va_args, id); - output_formatstring(fmt, va_args); + output_formatstring(FALSE, id, va_args); va_end(va_args); } -void WINAPIV error_exit(unsigned int id, ...) +void WINAPIV error_exit(void) +{ + exit(0); /* regedit.exe always terminates with error code zero */ +} + +static void WINAPIV usage(unsigned int id, ...) { - WCHAR fmt[1536]; va_list va_args; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) - { - WINE_FIXME("LoadString failed with %lu\n", GetLastError()); - return; - } va_start(va_args, id); - output_formatstring(fmt, va_args); + output_formatstring(TRUE, id, va_args); va_end(va_args); - exit(0); /* regedit.exe always terminates with error code zero */ + error_exit(); } typedef enum { @@ -159,8 +161,8 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) break; } default: - error_exit(STRING_UNHANDLED_ACTION); - break; + output_message(STRING_UNHANDLED_ACTION); + error_exit(); } } @@ -195,7 +197,8 @@ BOOL ProcessCmdLine(WCHAR *cmdline) switch (towupper(argv[i][1])) { case '?': - error_exit(STRING_USAGE); + output_message(STRING_USAGE); + error_exit(); break; case 'D': action = ACTION_DELETE; @@ -210,12 +213,13 @@ BOOL ProcessCmdLine(WCHAR *cmdline) /* unhandled */; break; case 'S': + silent = TRUE; + break; case 'V': /* ignored */; break; default: - output_message(STRING_INVALID_SWITCH, argv[i]); - error_exit(STRING_HELP); + usage(STRING_INVALID_SWITCH, argv[i]); } } @@ -225,13 +229,12 @@ BOOL ProcessCmdLine(WCHAR *cmdline) { case ACTION_ADD: case ACTION_EXPORT: - output_message(STRING_NO_FILENAME); + usage(STRING_NO_FILENAME); break; case ACTION_DELETE: - output_message(STRING_NO_REG_KEY); + usage(STRING_NO_REG_KEY); break; } - error_exit(STRING_HELP); } for (; i < argc; i++) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 15a64fdf97d..0a580f0cd12 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1091,11 +1091,15 @@ void delete_registry_key(WCHAR *reg_key_name) if (!(key_class = parse_key_name(reg_key_name, &key_name))) { if (key_name) *(key_name - 1) = 0; - error_exit(STRING_INVALID_SYSTEM_KEY, reg_key_name); + output_message(STRING_INVALID_SYSTEM_KEY, reg_key_name); + error_exit(); } if (!key_name || !*key_name) - error_exit(STRING_DELETE_FAILED, reg_key_name); + { + output_message(STRING_DELETE_FAILED, reg_key_name); + error_exit(); + } RegDeleteTreeW(key_class, key_name); } @@ -1411,7 +1415,8 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) if (!file) { _wperror(L"regedit"); - error_exit(STRING_CANNOT_OPEN_FILE, file_name); + output_message(STRING_CANNOT_OPEN_FILE, file_name); + error_exit(); } }

1 0

Santino Mazza : mlang/tests: Test for codepages priority.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 1ccd67cc32dff4a3269729fba13e4a29bcd90804 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ccd67cc32dff4a3269729fba13e4a… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Wed Nov 22 20:00:38 2023 -0300 mlang/tests: Test for codepages priority. --- dlls/mlang/tests/mlang.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 3240d945245..1047e8a029d 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1283,6 +1283,50 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); ok(processed == 3, "expected 3, got %ld\n", processed); + dwCmpCodePages = FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC | FS_GREEK | FS_TURKISH + | FS_HEBREW | FS_ARABIC | FS_BALTIC | FS_VIETNAMESE | FS_THAI + | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG | FS_CHINESETRAD; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, FS_LATIN1, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); + + dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, FS_CYRILLIC, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + todo_wine ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + todo_wine ok(processed == 2, "expected 2, got %ld\n", processed); + + dwCmpCodePages = FS_JISJAPAN; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, FS_JISJAPAN, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + todo_wine ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + todo_wine ok(processed == 3, "expected 3, got %ld\n", processed); + + dwCmpCodePages = FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC | FS_GREEK | FS_TURKISH + | FS_HEBREW | FS_ARABIC | FS_BALTIC | FS_VIETNAMESE | FS_THAI + | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG | FS_CHINESETRAD; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, FS_TURKISH, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); + + dwCmpCodePages = FS_JISJAPAN; + dwCodePages = 0; + processed = 0; + ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[1], 3, FS_TURKISH, &dwCodePages, &processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 2, "expected 2, got %ld\n", processed); + dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed);

1 0

Eric Pouech : winedbg: Use dbghelp extended module info.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 8a94049770ac542346b85527a8da1309e6c9d71f URL: https://gitlab.winehq.org/wine/wine/-/commit/8a94049770ac542346b85527a8da13… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Nov 24 15:33:39 2023 +0100 winedbg: Use dbghelp extended module info. To pickup module's data model. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/types.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 44872a7edad..ff1b68bd33c 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -978,16 +978,13 @@ static const struct data_model* get_data_model(DWORD64 modaddr) else if (ADDRSIZE == 4) model = ilp32_data_model; else { - IMAGEHLP_MODULEW64 mi; - DWORD opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); + struct dhext_module_information wmi; - mi.SizeOfStruct = sizeof(mi); - if (SymGetModuleInfoW64(dbg_curr_process->handle, modaddr, &mi) && - (wcsstr(mi.ModuleName, L".so") || wcsstr(mi.ModuleName, L"<"))) + if (wine_get_module_information(dbg_curr_process->handle, modaddr, &wmi, sizeof(wmi)) && + wmi.type != DMT_PE) model = lp64_data_model; else model = llp64_data_model; - SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); } return model; }

1 0

Eric Pouech : regsvr32: Use message boxes by default for output.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: ac8da35b87005e45947b8164a4132f3bbb4ec2cc URL: https://gitlab.winehq.org/wine/wine/-/commit/ac8da35b87005e45947b8164a4132f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Nov 23 18:28:40 2023 +0100 regsvr32: Use message boxes by default for output. regsvr32 is in GUI subsystem and shouldn't interact with console. Keeping unix I/O output in silent mode. Removing -c option as not existing in native. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msi/action.c | 4 +-- programs/regsvr32/regsvr32.c | 77 +++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 43 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8b3d1c42aa5..575af431854 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4581,8 +4581,8 @@ static UINT ACTION_RemoveIniValues( MSIPACKAGE *package ) static void register_dll( const WCHAR *dll, BOOL unregister ) { - static const WCHAR regW[] = L"regsvr32.exe \"%s\""; - static const WCHAR unregW[] = L"regsvr32.exe /u \"%s\""; + static const WCHAR regW[] = L"regsvr32.exe /s \"%s\""; + static const WCHAR unregW[] = L"regsvr32.exe /s /u \"%s\""; PROCESS_INFORMATION pi; STARTUPINFOW si; WCHAR *cmd; diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 81caeb2c820..98038652505 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -24,6 +24,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <winternl.h> +#include <winnls.h> #include <ole2.h> #include "regsvr32.h" #include "wine/debug.h" @@ -34,51 +35,50 @@ typedef HRESULT (WINAPI *DLLREGISTER) (void); typedef HRESULT (WINAPI *DLLUNREGISTER) (void); typedef HRESULT (WINAPI *DLLINSTALL) (BOOL,LPCWSTR); -static BOOL Silent = FALSE; +static BOOL Silent; -static void WINAPIV output_write(UINT id, ...) +static void WINAPIV output_write(BOOL with_usage, UINT id, ...) { + WCHAR buffer[4096]; WCHAR fmt[1024]; va_list va_args; - WCHAR *str; - DWORD len, nOut; + DWORD len; + LCID current_lcid; - if (Silent) return; + current_lcid = GetThreadLocale(); + if (Silent) /* force en-US not to have localized strings */ + SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)); if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %ld\n", GetLastError()); + SetThreadLocale(current_lcid); return; } va_start(va_args, id); - len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, - fmt, 0, 0, (LPWSTR)&str, 0, &va_args); + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, + fmt, 0, 0, buffer, ARRAY_SIZE(buffer), &va_args); va_end(va_args); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + SetThreadLocale(current_lcid); return; } - - /* WriteConsole fails if its output is redirected to a file. - * If this occurs, we should use an OEM codepage and call WriteFile. - */ - if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL)) + if (with_usage && + !LoadStringW(GetModuleHandleW(NULL), STRING_USAGE, + &buffer[wcslen(buffer)], ARRAY_SIZE(buffer) - wcslen(buffer))) { - DWORD lenA; - char *strA; - - lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, lenA); - if (strA) - { - WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); - WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &nOut, FALSE); - HeapFree(GetProcessHeap(), 0, strA); - } + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); + SetThreadLocale(current_lcid); + return; } - LocalFree(str); + if (Silent) + MESSAGE("%ls", buffer); + else + MessageBoxW(NULL, buffer, L"RegSvr32", MB_OK); + SetThreadLocale(current_lcid); } static LPCWSTR find_arg_start(LPCWSTR cmdline) @@ -180,13 +180,13 @@ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHan IMAGE_NT_HEADERS *nt = RtlImageNtHeader( (HMODULE)((ULONG_PTR)module & ~3) ); reexec_self( nt->FileHeader.Machine ); } - output_write(STRING_DLL_LOAD_FAILED, strDll); + output_write(FALSE, STRING_DLL_LOAD_FAILED, strDll); ExitProcess(LOADLIBRARY_FAILED); } proc = (VOID *) GetProcAddress(*DllHandle, procName); if(!proc) { - output_write(STRING_PROC_NOT_IMPLEMENTED, procName, strDll); + output_write(FALSE, STRING_PROC_NOT_IMPLEMENTED, procName, strDll); FreeLibrary(*DllHandle); return NULL; } @@ -206,10 +206,10 @@ static int RegisterDll(const WCHAR* strDll, BOOL firstDll) hr = pfRegister(); if(FAILED(hr)) { - output_write(STRING_REGISTER_FAILED, strDll); + output_write(FALSE, STRING_REGISTER_FAILED, strDll); return DLLSERVER_FAILED; } - output_write(STRING_REGISTER_SUCCESSFUL, strDll); + output_write(FALSE, STRING_REGISTER_SUCCESSFUL, strDll); if(DllHandle) FreeLibrary(DllHandle); @@ -229,10 +229,10 @@ static int UnregisterDll(const WCHAR* strDll, BOOL firstDll) hr = pfUnregister(); if(FAILED(hr)) { - output_write(STRING_UNREGISTER_FAILED, strDll); + output_write(FALSE, STRING_UNREGISTER_FAILED, strDll); return DLLSERVER_FAILED; } - output_write(STRING_UNREGISTER_SUCCESSFUL, strDll); + output_write(FALSE, STRING_UNREGISTER_SUCCESSFUL, strDll); if(DllHandle) FreeLibrary(DllHandle); @@ -253,15 +253,15 @@ static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_li if(FAILED(hr)) { if (install) - output_write(STRING_INSTALL_FAILED, strDll); + output_write(FALSE, STRING_INSTALL_FAILED, strDll); else - output_write(STRING_UNINSTALL_FAILED, strDll); + output_write(FALSE, STRING_UNINSTALL_FAILED, strDll); return DLLSERVER_FAILED; } if (install) - output_write(STRING_INSTALL_SUCCESSFUL, strDll); + output_write(FALSE, STRING_INSTALL_SUCCESSFUL, strDll); else - output_write(STRING_UNINSTALL_SUCCESSFUL, strDll); + output_write(FALSE, STRING_UNINSTALL_SUCCESSFUL, strDll); if(DllHandle) FreeLibrary(DllHandle); @@ -340,12 +340,8 @@ int __cdecl wmain(int argc, WCHAR* argv[]) case 'n': CallRegister = FALSE; break; - case 'c': - /* console output */; - break; default: - output_write(STRING_UNRECOGNIZED_SWITCH, argv[i]); - output_write(STRING_USAGE); + output_write(TRUE, STRING_UNRECOGNIZED_SWITCH, argv[i]); return INVALID_ARG; } argv[i] = NULL; @@ -401,8 +397,7 @@ int __cdecl wmain(int argc, WCHAR* argv[]) if (!DllFound) { - output_write(STRING_HEADER); - output_write(STRING_USAGE); + output_write(TRUE, STRING_HEADER); return INVALID_ARG; }

1 0

Santino Mazza : mlang: Implement codepages priority.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: d9fcbf451a90d62b9a362da6ded0f8f8da5b419e URL: https://gitlab.winehq.org/wine/wine/-/commit/d9fcbf451a90d62b9a362da6ded0f8… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Thu Nov 23 21:36:00 2023 -0300 mlang: Implement codepages priority. --- dlls/mlang/mlang.c | 7 ++++--- dlls/mlang/tests/mlang.c | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 6b0f2922a77..9846e3ad0e4 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3333,10 +3333,12 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface, for (i = 0; i < src_len; i++) { - DWORD cp; + DWORD cp, next_cp = 0; HRESULT ret; ret = IMLangFontLink2_GetCharCodePages(iface, src[i], &cp); + if (i + 1 < src_len) + ret = IMLangFontLink2_GetCharCodePages(iface, src[i + 1], &next_cp); if (ret != S_OK) return E_FAIL; if (!cps) cps = cp; @@ -3347,8 +3349,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface, break; } - /* FIXME: not tested */ - if (priority_cp & cps) break; + if ((priority_cp & cps) && !(priority_cp & next_cp)) break; } if (codepages) *codepages = cps; diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 1047e8a029d..704576005d2 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1298,16 +1298,16 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) processed = 0; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, FS_CYRILLIC, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); - todo_wine ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); - todo_wine ok(processed == 2, "expected 2, got %ld\n", processed); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 2, "expected 2, got %ld\n", processed); dwCmpCodePages = FS_JISJAPAN; dwCodePages = 0; processed = 0; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 4, FS_JISJAPAN, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); - todo_wine ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); - todo_wine ok(processed == 3, "expected 3, got %ld\n", processed); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 3, "expected 3, got %ld\n", processed); dwCmpCodePages = FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC | FS_GREEK | FS_TURKISH | FS_HEBREW | FS_ARABIC | FS_BALTIC | FS_VIETNAMESE | FS_THAI

1 0

Alexandre Julliard : ws2_32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 741985693ddf92fe2988e3427f2fe74e83a306f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/741985693ddf92fe2988e3427f2fe7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:34:24 2023 +0100 ws2_32: Remove DECLSPEC_HIDDEN usage. --- dlls/ws2_32/ws2_32_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index a009a1eefd3..9e116de814d 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -73,7 +73,7 @@ static inline char *strdupWtoA( const WCHAR *str ) static const char magic_loopback_addr[] = {127, 12, 34, 56}; -const char *debugstr_sockaddr( const struct sockaddr *addr ) DECLSPEC_HIDDEN; +const char *debugstr_sockaddr( const struct sockaddr *addr ); struct per_thread_data { @@ -88,9 +88,9 @@ struct per_thread_data char ntoa_buffer[16]; /* 4*3 digits + 3 '.' + 1 '\0' */ }; -extern int num_startup DECLSPEC_HIDDEN; +extern int num_startup; -struct per_thread_data *get_per_thread_data(void) DECLSPEC_HIDDEN; +struct per_thread_data *get_per_thread_data(void); struct getaddrinfo_params {

1 0

Alexandre Julliard : winedump: Display PE section offsets using their virtual address.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 2d338e22f25a5d94a5a6d8944fcc39d3175799cc URL: https://gitlab.winehq.org/wine/wine/-/commit/2d338e22f25a5d94a5a6d8944fcc39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 14:03:44 2023 +0100 winedump: Display PE section offsets using their virtual address. --- tools/winedump/dump.c | 11 ++++++++--- tools/winedump/pe.c | 3 ++- tools/winedump/winedump.h | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index abfc2ab8c74..90602d43367 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -33,11 +33,11 @@ void *dump_base = NULL; size_t dump_total_len = 0; -void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix ) +void dump_data_offset( const unsigned char *ptr, unsigned int size, unsigned int offset, const char *prefix ) { unsigned int i, j; - printf( "%s%08x: ", prefix, 0 ); + printf( "%s%08x: ", prefix, offset ); if (!ptr) { printf("NULL\n"); @@ -51,7 +51,7 @@ void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix printf( " " ); for (j = 0; j < 16; j++) printf( "%c", isprint(ptr[i-15+j]) ? ptr[i-15+j] : '.' ); - if (i < size-1) printf( "\n%s%08x: ", prefix, i + 1 ); + if (i < size-1) printf( "\n%s%08x: ", prefix, offset + i + 1 ); } } if (i % 16) @@ -63,6 +63,11 @@ void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix printf( "\n" ); } +void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix ) +{ + dump_data_offset( ptr, size, 0, prefix ); +} + static char* dump_want_n(unsigned sz) { static char buffer[64 * 1024]; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 3defdcd664b..a49c4e83d52 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -539,7 +539,8 @@ static void dump_sections(const void *base, const void* addr, unsigned num_sect) if (globals.do_dump_rawdata) { - dump_data((const unsigned char *)base + sectHead->PointerToRawData, sectHead->SizeOfRawData, " " ); + dump_data_offset((const unsigned char *)base + sectHead->PointerToRawData, + sectHead->SizeOfRawData, sectHead->VirtualAddress, " " ); printf("\n"); } } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 91b7170b774..3df2410a6c3 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -224,6 +224,7 @@ unsigned long Offset(const void* ptr); typedef void (*file_dumper)(void); BOOL dump_analysis(const char*, file_dumper, enum FileSig); +void dump_data_offset( const unsigned char *ptr, unsigned int size, unsigned int offset, const char *prefix ); void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix ); const char* get_time_str( unsigned long ); unsigned int strlenW( const unsigned short *str );

1 0

Alexandre Julliard : winebus.sys: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: d1d15757a44c59122b0592957597deaad06169c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d15757a44c59122b0592957597de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:33:50 2023 +0100 winebus.sys: Remove DECLSPEC_HIDDEN usage. --- dlls/winebus.sys/unix_private.h | 76 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 3001c32e89e..1ec414cce73 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -217,57 +217,57 @@ struct unix_device struct hid_physical hid_physical; }; -extern void *raw_device_create(const struct raw_device_vtbl *vtbl, SIZE_T size) DECLSPEC_HIDDEN; -extern void *hid_device_create(const struct hid_device_vtbl *vtbl, SIZE_T size) DECLSPEC_HIDDEN; +extern void *raw_device_create(const struct raw_device_vtbl *vtbl, SIZE_T size); +extern void *hid_device_create(const struct hid_device_vtbl *vtbl, SIZE_T size); -extern NTSTATUS sdl_bus_init(void *) DECLSPEC_HIDDEN; -extern NTSTATUS sdl_bus_wait(void *) DECLSPEC_HIDDEN; -extern NTSTATUS sdl_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS sdl_bus_init(void *); +extern NTSTATUS sdl_bus_wait(void *); +extern NTSTATUS sdl_bus_stop(void *); -extern NTSTATUS udev_bus_init(void *) DECLSPEC_HIDDEN; -extern NTSTATUS udev_bus_wait(void *) DECLSPEC_HIDDEN; -extern NTSTATUS udev_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS udev_bus_init(void *); +extern NTSTATUS udev_bus_wait(void *); +extern NTSTATUS udev_bus_stop(void *); -extern NTSTATUS iohid_bus_init(void *) DECLSPEC_HIDDEN; -extern NTSTATUS iohid_bus_wait(void *) DECLSPEC_HIDDEN; -extern NTSTATUS iohid_bus_stop(void *) DECLSPEC_HIDDEN; +extern NTSTATUS iohid_bus_init(void *); +extern NTSTATUS iohid_bus_wait(void *); +extern NTSTATUS iohid_bus_stop(void *); -extern void bus_event_cleanup(struct bus_event *event) DECLSPEC_HIDDEN; -extern void bus_event_queue_destroy(struct list *queue) DECLSPEC_HIDDEN; -extern BOOL bus_event_queue_device_removed(struct list *queue, struct unix_device *device) DECLSPEC_HIDDEN; -extern BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) DECLSPEC_HIDDEN; +extern void bus_event_cleanup(struct bus_event *event); +extern void bus_event_queue_destroy(struct list *queue); +extern BOOL bus_event_queue_device_removed(struct list *queue, struct unix_device *device); +extern BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc); extern BOOL bus_event_queue_input_report(struct list *queue, struct unix_device *device, - BYTE *report, USHORT length) DECLSPEC_HIDDEN; -extern BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) DECLSPEC_HIDDEN; + BYTE *report, USHORT length); +extern BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event); -extern BOOL hid_device_begin_report_descriptor(struct unix_device *iface, const USAGE_AND_PAGE *device_usage) DECLSPEC_HIDDEN; -extern BOOL hid_device_end_report_descriptor(struct unix_device *iface) DECLSPEC_HIDDEN; +extern BOOL hid_device_begin_report_descriptor(struct unix_device *iface, const USAGE_AND_PAGE *device_usage); +extern BOOL hid_device_end_report_descriptor(struct unix_device *iface); -extern BOOL hid_device_begin_input_report(struct unix_device *iface, const USAGE_AND_PAGE *physical_usage) DECLSPEC_HIDDEN; -extern BOOL hid_device_end_input_report(struct unix_device *iface) DECLSPEC_HIDDEN; +extern BOOL hid_device_begin_input_report(struct unix_device *iface, const USAGE_AND_PAGE *physical_usage); +extern BOOL hid_device_end_input_report(struct unix_device *iface); extern BOOL hid_device_add_buttons(struct unix_device *iface, USAGE usage_page, - USAGE usage_min, USAGE usage_max) DECLSPEC_HIDDEN; -extern BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) DECLSPEC_HIDDEN; + USAGE usage_min, USAGE usage_max); +extern BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count); extern BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usage_page, - const USAGE *usages, BOOL rel, LONG min, LONG max) DECLSPEC_HIDDEN; + const USAGE *usages, BOOL rel, LONG min, LONG max); -extern BOOL hid_device_add_haptics(struct unix_device *iface) DECLSPEC_HIDDEN; -extern BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count) DECLSPEC_HIDDEN; +extern BOOL hid_device_add_haptics(struct unix_device *iface); +extern BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count); -extern BOOL hid_device_set_abs_axis(struct unix_device *iface, ULONG index, LONG value) DECLSPEC_HIDDEN; -extern BOOL hid_device_set_rel_axis(struct unix_device *iface, ULONG index, LONG value) DECLSPEC_HIDDEN; -extern BOOL hid_device_set_button(struct unix_device *iface, ULONG index, BOOL is_set) DECLSPEC_HIDDEN; -extern BOOL hid_device_set_hatswitch_x(struct unix_device *iface, ULONG index, LONG new_x) DECLSPEC_HIDDEN; -extern BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new_y) DECLSPEC_HIDDEN; -extern BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) DECLSPEC_HIDDEN; +extern BOOL hid_device_set_abs_axis(struct unix_device *iface, ULONG index, LONG value); +extern BOOL hid_device_set_rel_axis(struct unix_device *iface, ULONG index, LONG value); +extern BOOL hid_device_set_button(struct unix_device *iface, ULONG index, BOOL is_set); +extern BOOL hid_device_set_hatswitch_x(struct unix_device *iface, ULONG index, LONG new_x); +extern BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new_y); +extern BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y); -extern BOOL hid_device_sync_report(struct unix_device *iface) DECLSPEC_HIDDEN; -extern void hid_device_drop_report(struct unix_device *iface) DECLSPEC_HIDDEN; +extern BOOL hid_device_sync_report(struct unix_device *iface); +extern void hid_device_drop_report(struct unix_device *iface); -extern void hid_device_set_effect_state(struct unix_device *iface, BYTE index, BYTE flags) DECLSPEC_HIDDEN; +extern void hid_device_set_effect_state(struct unix_device *iface, BYTE index, BYTE flags); -BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; -BOOL is_dualshock4_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; -BOOL is_dualsense_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; +BOOL is_xbox_gamepad(WORD vid, WORD pid); +BOOL is_dualshock4_gamepad(WORD vid, WORD pid); +BOOL is_dualsense_gamepad(WORD vid, WORD pid); #endif /* __WINEBUS_UNIX_PRIVATE_H */

1 0

Alexandre Julliard : ntdll: Use RtlFindExportedRoutineByName to simplify loader initialization.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: d57c41990acde38f085da1c8dd6051e5fd287fb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d57c41990acde38f085da1c8dd6051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 11:27:44 2023 +0100 ntdll: Use RtlFindExportedRoutineByName to simplify loader initialization. --- dlls/ntdll/loader.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4bc7e66d76b..5b0d3f6b6ee 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4268,8 +4268,6 @@ void loader_init( CONTEXT *context, void **entry ) if (!imports_fixup_done) { MEMORY_BASIC_INFORMATION meminfo; - ANSI_STRING base_thread_init_thunk = RTL_CONSTANT_STRING( "BaseThreadInitThunk" ); - ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" ); WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb; @@ -4305,13 +4303,8 @@ void loader_init( CONTEXT *context, void **entry ) NtTerminateProcess( GetCurrentProcess(), status ); } node_kernel32 = kernel32->ldr.DdagNode; - if ((status = LdrGetProcedureAddress( kernel32->ldr.DllBase, &base_thread_init_thunk, - 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) - { - MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %lx\n", status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - LdrGetProcedureAddress( kernel32->ldr.DllBase, &ctrl_routine, 0, (void **)&pCtrlRoutine ); + pBaseThreadInitThunk = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "BaseThreadInitThunk" ); + pCtrlRoutine = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "CtrlRoutine" ); actctx_init(); locale_init();

1 0