March 2022 - Wine-commits - list.winehq.org

Eric Pouech : ntdll/tests: Enable compilation with long types in directory.c.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 570cff9dd222d2061547656eb658eafd2e16142b URL: https://source.winehq.org/git/wine.git/?a=commit;h=570cff9dd222d2061547656e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:33:51 2022 +0100 ntdll/tests: Enable compilation with long types in directory.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 239 ++++++++++++++++++++++--------------------- 1 file changed, 120 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=570cff9dd222d2061547…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in error.c.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 44d604f57e8b4da93f5b267c9d6cc3afa0473298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d604f57e8b4da93f5b267c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:33:59 2022 +0100 ntdll/tests: Enable compilation with long types in error.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/error.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 8f099e6903a..7784886c79b 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdio.h> @@ -75,7 +76,7 @@ static void cmp_call(NTSTATUS win_nt, ULONG win32, const char* message) err = pRtlNtStatusToDosError(win_nt); ok(err == win32, - "%s (%x): got %u, expected %u\n", + "%s (%lx): got %lu, expected %lu\n", message, win_nt, err, win32); } @@ -86,7 +87,7 @@ static void cmp_call2(NTSTATUS win_nt, ULONG win32, const char* message) err = pRtlNtStatusToDosError(win_nt); ok(err == win32 || (!strict && err == ERROR_MR_MID_NOT_FOUND), - "%s (%x): got %u, expected %u (or MID_NOT_FOUND)\n", + "%s (%lx): got %lu, expected %lu (or MID_NOT_FOUND)\n", message, win_nt, err, win32); } @@ -96,7 +97,7 @@ static void cmp_call3(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && err == win32_2), - "%s (%x): got %u, expected %u or %u\n", + "%s (%lx): got %lu, expected %lu or %lu\n", message, win_nt, err, win32_1, win32_2); } @@ -107,7 +108,7 @@ static void cmp_call4(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && (err == win32_2 || err == ERROR_MR_MID_NOT_FOUND)), - "%s (%x): got %u, expected %u or %u\n", + "%s (%lx): got %lu, expected %lu or %lu\n", message, win_nt, err, win32_1, win32_2); }

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in change.c.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 7516cb051060d24f0a1287f0eb94c8f730566130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7516cb051060d24f0a1287f0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:33:48 2022 +0100 ntdll/tests: Enable compilation with long types in change.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/change.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index e7201b52a3c..89e319bccd7 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <ntstatus.h> #define WIN32_NO_STATUS @@ -301,9 +302,9 @@ static void test_ntncdf_async(void) CloseHandle(hdir); - ok(U(iosb).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb).Status); - ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb2).Status); - ok(U(iosb3).Status == STATUS_SUCCESS, "status wrong %x\n",U(iosb3).Status); + ok(U(iosb).Status == STATUS_CANCELLED, "status wrong %lx\n",U(iosb).Status); + ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %lx\n",U(iosb2).Status); + ok(U(iosb3).Status == STATUS_SUCCESS, "status wrong %lx\n",U(iosb3).Status); ok(iosb.Information == 0, "info wrong\n"); ok(iosb2.Information == 0, "info wrong\n"); @@ -312,8 +313,8 @@ static void test_ntncdf_async(void) U(iosb3).Status = 0x111111; iosb3.Information = 0x222222; r = pNtCancelIoFile(hdir, &iosb3); - ok( r == STATUS_INVALID_HANDLE, "cancel failed %x\n", r); - ok(U(iosb3).Status == 0x111111, "status wrong %x\n",U(iosb3).Status); + ok( r == STATUS_INVALID_HANDLE, "cancel failed %lx\n", r); + ok(U(iosb3).Status == 0x111111, "status wrong %lx\n",U(iosb3).Status); ok(iosb3.Information == 0x222222, "info wrong\n"); r = RemoveDirectoryW( path );

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in exception.c.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: e6d9dabae4ad2547554a9d7f9a4674c234174019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6d9dabae4ad2547554a9d7f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:34:07 2022 +0100 ntdll/tests: Enable compilation with long types in exception.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 1307 +++++++++++++++++++++--------------------- 1 file changed, 654 insertions(+), 653 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6d9dabae4ad2547554a…

1 0

Alexandre Julliard : mlang: Use a registry script to register codepages.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 8adebaaab73d67386ba05f0677523ead4e185f6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8adebaaab73d67386ba05f06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 13:46:30 2022 +0100 mlang: Use a registry script to register codepages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/Makefile.in | 8 +- dlls/mlang/mlang.c | 63 --------- dlls/mlang/mlang.rc | 20 +++ dlls/mlang/mlang.rgs | 372 +++++++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 1 - 5 files changed, 396 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8adebaaab73d67386ba0…

1 0

Alexandre Julliard : mlang: Register MIME charsets from the registry script.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 2b963bf519eb21e60080f021187999d524fb5208 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b963bf519eb21e60080f021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:24:20 2022 +0100 mlang: Register MIME charsets from the registry script. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.rgs | 160 +++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 187 --------------------------------------------------- 2 files changed, 160 insertions(+), 187 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b963bf519eb21e60080…

1 0

Alexandre Julliard : mlang: Use EnumSystemLocalesEx() to enumerate locales.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: d55233cc7f128b3146223d904290193404b360e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d55233cc7f128b3146223d90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 13:46:51 2022 +0100 mlang: Use EnumSystemLocalesEx() to enumerate locales. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 35ae7aabec9..a34c0749ecf 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -48,8 +48,6 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); -static DWORD MLANG_tls_index; /* to store various per thead data */ - /* FIXME: * Under what circumstances HKEY_CLASSES_ROOT\MIME\Database\Codepage and * HKEY_CLASSES_ROOT\MIME\Database\Charset are used? @@ -930,21 +928,6 @@ static void UnlockModule(void) InterlockedDecrement(&dll_count); } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) { - case DLL_PROCESS_ATTACH: - MLANG_tls_index = TlsAlloc(); - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - if (lpv) break; - TlsFree(MLANG_tls_index); - break; - } - return TRUE; -} - HRESULT WINAPI ConvertINetMultiByteToUnicode( LPDWORD pdwMode, DWORD dwEncoding, @@ -2403,26 +2386,24 @@ struct enum_locales_data DWORD total, allocated; }; -static BOOL CALLBACK enum_locales_proc(LPWSTR locale) +static BOOL CALLBACK enum_locales_proc(LPWSTR locale, DWORD flags, LPARAM lparam) { - WCHAR *end; - struct enum_locales_data *data = TlsGetValue(MLANG_tls_index); + struct enum_locales_data *data = (struct enum_locales_data *)lparam; RFC1766INFO *info; TRACE("%s\n", debugstr_w(locale)); if (data->total >= data->allocated) { - data->allocated += 32; + data->allocated *= 2; data->info = HeapReAlloc(GetProcessHeap(), 0, data->info, data->allocated * sizeof(RFC1766INFO)); if (!data->info) return FALSE; } info = &data->info[data->total]; - info->lcid = wcstol(locale, &end, 16); - if (*end) /* invalid number */ - return FALSE; + info->lcid = LocaleNameToLCID( locale, 0 ); + if (info->lcid == LOCALE_CUSTOM_UNSPECIFIED) return TRUE; info->wszRfc1766[0] = 0; lcid_to_rfc1766W( info->lcid, info->wszRfc1766, MAX_RFC1766_NAME ); @@ -2458,9 +2439,7 @@ static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum) return E_OUTOFMEMORY; } - TlsSetValue(MLANG_tls_index, &data); - EnumSystemLocalesW(enum_locales_proc, 0/*LOCALE_SUPPORTED*/); - TlsSetValue(MLANG_tls_index, NULL); + EnumSystemLocalesEx(enum_locales_proc, LOCALE_WINDOWS, (LPARAM)&data, NULL); TRACE("enumerated %ld rfc1766 structures\n", data.total);

1 0

Alexandre Julliard : mlang/tests: Don't test all possible invalid codepages.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 9f1762e8310522d1f3a4c22003f4946fb0c4adec URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f1762e8310522d1f3a4c220… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:24:39 2022 +0100 mlang/tests: Don't test all possible invalid codepages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index c9e22adfd4e..da0b87ed729 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2214,7 +2214,7 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) UINT i; HRESULT hr; - for (i = 0; i < 0xffff; i++) + for (i = 0; i < 1000; i++) { hr = IMultiLanguage2_IsCodePageInstallable(ml2, i);

1 0

Alexandre Julliard : mlang: Skip Unicode codepages in GetCharCodePages().
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 1d23255e20dcda568828a26b689d14985832a4f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d23255e20dcda568828a26b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:46:46 2022 +0100 mlang: Skip Unicode codepages in GetCharCodePages(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50351 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index a34c0749ecf..fc5e227721e 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3312,7 +3312,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface *ret_codepages = 0; - for (i = 0; i < ARRAY_SIZE(mlang_data); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data) - 1 /* skip unicode codepages */; i++) { BOOL used_dc; CHAR buf;

1 0

Alexandre Julliard : mlang: Store the codepage data in Unicode.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 55dc240fa801a533726afc6a8714df2687b6d9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55dc240fa801a533726afc6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:58:57 2022 +0100 mlang: Store the codepage data in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 426 +++++++++++++++++++++++++---------------------------- 1 file changed, 201 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55dc240fa801a533726a…

1 0