December 2023 - Wine-commits

Nikolay Sivov : oleaut32/typelib: Add a missing break (Coverity).
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: 28d95c0c91f17933ecca961e4fe412d73f6fb90c URL: https://gitlab.winehq.org/wine/wine/-/commit/28d95c0c91f17933ecca961e4fe412… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 16 20:31:13 2023 +0100 oleaut32/typelib: Add a missing break (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f412074bd21..d920ee7c0cc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2633,6 +2633,7 @@ static void TLB_fix_typeinfo_ptr_size(ITypeInfoImpl *info) case VT_VARIANT: info->typeattr.cbSizeInstance = sizeof(VARIANT); info->typeattr.cbAlignment = sizeof(void *); + break; default: if(info->typeattr.cbSizeInstance < sizeof(void*)) info->typeattr.cbAlignment = info->typeattr.cbSizeInstance;

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: 1cef923e203fc5664fc57b41d67c025804be47c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cef923e203fc5664fc57b41d67c02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 17 18:11:51 2023 +0900 po: Update Japanese translation. --- po/ja.po | 156 ++++++++++++++++----------------------------------------------- 1 file changed, 38 insertions(+), 118 deletions(-) diff --git a/po/ja.po b/po/ja.po index 7f6068c79c3..a6f6259464a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-12-18 19:29+0900\n" +"PO-Revision-Date: 2023-12-18 22:35+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -326,7 +326,7 @@ msgstr "" #: dlls/appwiz.cpl/appwiz.rc:47 msgid "Please wait until the current uninstall/modify process is complete." -msgstr "" +msgstr "実行中のアンインストール・変更が完了するのをお待ちください。" #: dlls/avifil32/avifil32.rc:42 msgid "Compress options" @@ -3706,16 +3706,12 @@ msgid "High" msgstr "高" #: dlls/ir50_32/ir50_32.rc:28 -#, fuzzy -#| msgid "Index" msgid "Indeo5" -msgstr "索引" +msgstr "Indeo5" #: dlls/ir50_32/ir50_32.rc:29 -#, fuzzy -#| msgid "Wine Video 1 video codec" msgid "Indeo Video Interactive version 5 video codec" -msgstr "Wine ビデオ 1 ビデオコーデック" +msgstr "Indeo Video Interactive バージョン 5 ビデオコーデック" #: dlls/joy.cpl/joy.rc:37 msgid "Joysticks" @@ -4015,10 +4011,8 @@ msgid "Syntax error in regular expression" msgstr "正規表現に構文誤りがあります" #: dlls/jscript/jscript.rc:66 -#, fuzzy -#| msgid "Expected identifier" msgid "Unexpected quantifier" -msgstr "識別子を期待していました" +msgstr "予期しない数量詞です" #: dlls/jscript/jscript.rc:67 msgid "Exception thrown and not caught" @@ -4081,10 +4075,8 @@ msgid "'this' is not a | object" msgstr "'this' は | オブジェクトではありません" #: dlls/jscript/jscript.rc:81 -#, fuzzy -#| msgid "'this' is not a | object" msgid "'key' is not an object" -msgstr "'this' は | オブジェクトではありません" +msgstr "'key' はオブジェクトではありません" #: dlls/jscript/jscript.rc:82 msgid "Property cannot have both accessors and a value" @@ -12626,8 +12618,6 @@ msgid "Duplex:" msgstr "両面印刷:" #: dlls/wineps.drv/wineps.rc:45 -#, fuzzy -#| msgid "&Tray:" msgid "Paper &Tray:" msgstr "給紙方法(&T):" @@ -14726,37 +14716,29 @@ msgid "&Run..." msgstr "実行(&R)..." #: programs/explorer/explorer.rc:36 -#, fuzzy -#| msgid "E&xit Windows" msgid "E&xit desktop" -msgstr "Windows の終了(&X)" +msgstr "デスクトップの終了(&X)" #: programs/explorer/explorer.rc:37 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "" "Are you sure you want to close all programs and exit the virtual desktop?" -msgstr "これらの値を削除しますか?" +msgstr "すべてのプログラムを閉じて、仮想デスクトップを終了しますか?" #: programs/findstr/findstr.rc:28 -#, fuzzy -#| msgid "Use c&onnection string" msgid "Usage: findstr /options string\n" -msgstr "利用する接続文字列(&O)" +msgstr "使い方: findstr /オプション文字列\n" #: programs/findstr/findstr.rc:29 -#, fuzzy -#| msgid "Invalid command line.\n" msgid "FINDSTR: Bad command line\n" -msgstr "コマンドラインが正しくありません。\n" +msgstr "FINDSTR: コマンドラインが正しくありません\n" #: programs/findstr/findstr.rc:30 msgid "FINDSTR: Cannot open %s\n" -msgstr "" +msgstr "FINDSTR: %s を開けません\n" #: programs/findstr/findstr.rc:31 msgid "FINDSTR: /%c ignored\n" -msgstr "" +msgstr "FINDSTR: /%c は無視されました\n" #: programs/fsutil/fsutil.mc:28 msgid "" @@ -14876,51 +14858,39 @@ msgstr "プライマリ DNS サフィックス" #: programs/klist/klist.rc:28 msgid "Usage: klist <tickets | tgt | purge | get [service principal name]>\n" msgstr "" +"使い方: klist <tickets | tgt | purge | get [サービスプリンシパル名]>\n" #: programs/klist/klist.rc:29 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown error\n" -msgstr "不明なエラー" +msgstr "不明なエラー\n" #: programs/klist/klist.rc:30 -#, fuzzy -#| msgid "Start Menu" msgid "Start Time" -msgstr "Start Menu" +msgstr "開始時刻" #: programs/klist/klist.rc:31 -#, fuzzy -#| msgctxt "maximum 31 characters" -#| msgid "FLE Standard Time" msgid "End Time" -msgstr "FLE 標準時" +msgstr "終了時刻" #: programs/klist/klist.rc:32 -#, fuzzy -#| msgid "Enter new time: " msgid "Renew Time" -msgstr "新しい時刻を入力してください: " +msgstr "更新時刻" #: programs/klist/klist.rc:33 msgid "Ticket Flags" -msgstr "" +msgstr "チケットフラグ" #: programs/klist/klist.rc:34 msgid "Cached Tickets" -msgstr "" +msgstr "キャッシュされたチケット" #: programs/klist/klist.rc:36 -#, fuzzy -#| msgid "Encryption Type" msgid "KerbTicket Encryption Type" -msgstr "暗号化の種類" +msgstr "Kerberos チケットの暗号化の種類" #: programs/klist/klist.rc:37 -#, fuzzy -#| msgid "Current Connections" msgid "Current LogonId is" -msgstr "現在の接続" +msgstr "現在のログオン ID は" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -15058,7 +15028,7 @@ msgstr "以下のサービスが実行中です:\n" #: programs/net/net.rc:44 msgid "A command was used with conflicting switches.\n" -msgstr "" +msgstr "コマンドで相反するスイッチが使われました。\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -17223,38 +17193,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: DLL '%1'のアンインストールに成功しました\n" #: programs/start/start.rc:56 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/exec Exec the specified file (for internal Wine usage).\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -17307,8 +17245,9 @@ msgstr "" "/belownormal 優先度クラス「通常以下」でプログラムを開始します。\n" "/node n 指定した NUMA ノードでプログラムを開始します。\n" "/affinity mask 指定した関連マスクでプログラムを開始します。\n" -"/wait 開始プログラムの完了を待ち、そのプログラムの終了コードで終了し\n" -"ます。\n" +"/machine arch アーキテクチャ (x86,arm,amd64,arm64) の利用を強制します。\n" +"/wait プログラムの完了を待ち、そのプログラムの終了コードで終了しま\n" +"す。\n" "/unix Unix ファイル名を使い、Windows エクスプローラーのようにファイ\n" "ルを開始します。\n" "/exec 指定したファイルを実行します (Wine 内部で使用)。\n" @@ -17391,27 +17330,24 @@ msgid "Error: Process self-termination is not permitted.\n" msgstr "エラー: このプロセス自身を終了することはできません。\n" #: programs/taskkill/taskkill.rc:44 -#, fuzzy -#| msgid "Process with PID %1!u! was forcibly terminated.\n" msgid "" "The process with PID %1!u! (child process of PID %2!u!) has been " "terminated.\n" -msgstr "プロセス(PID %1!u!)は強制的に終了されました。\n" +msgstr "PID %1!u! のプロセス (PID %2!u! の子プロセス) は終了されました。\n" #: programs/taskkill/taskkill.rc:45 msgid "" "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n" msgstr "" +"終了シグナルが PID %1!u! のプロセス (PID %2!u! の子) に送られました。\n" #: include/wine/wine_common_ver.rc:138 -#, fuzzy -#| msgid "page tab list" msgid "Wine tasklist" -msgstr "ページタブリスト" +msgstr "Wine tasklist" #: programs/tasklist/tasklist.rc:29 msgid "Usage: tasklist [/?]\n" -msgstr "" +msgstr "使い方: tasklist [/?]\n" #: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272 msgid "Image Name" @@ -17422,38 +17358,28 @@ msgid "PID" msgstr "PID" #: programs/tasklist/tasklist.rc:32 -#, fuzzy -#| msgid "Session ID" msgid "Session Name" -msgstr "セッション ID" +msgstr "セッション名" #: programs/tasklist/tasklist.rc:33 -#, fuzzy -#| msgid "Session ID" msgid "Session#" -msgstr "セッション ID" +msgstr "セッション#" #: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276 msgid "Mem Usage" msgstr "メモリ使用量" #: programs/tasklist/tasklist.rc:35 -#, fuzzy -#| msgid "OK" msgid "K" -msgstr "OK" +msgstr "K" #: programs/tasklist/tasklist.rc:36 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "ERROR: Invalid syntax\n" -msgstr "reg: 無効な構文です。" +msgstr "ERROR: 構文が無効です\n" #: programs/tasklist/tasklist.rc:37 -#, fuzzy -#| msgid "The filename cannot be resolved.\n" msgid "ERROR: The search filter cannot be recognized.\n" -msgstr "ファイル名は解決できません。\n" +msgstr "ERROR: 認識できない検索フィルタです。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -18583,10 +18509,8 @@ msgid "&Theme:" msgstr "テーマ(&T):" #: programs/winecfg/winecfg.rc:295 -#, fuzzy -#| msgid "&Theme:" msgid "&WinRT theme:" -msgstr "テーマ(&T):" +msgstr "&WinRT テーマ:" #: programs/winecfg/winecfg.rc:297 msgid "&Install theme..." @@ -18605,10 +18529,8 @@ msgid "MIME types" msgstr "MIME タイプ" #: programs/winecfg/winecfg.rc:311 -#, fuzzy -#| msgid "Manage file &associations" msgid "Manage file and protocol &associations" -msgstr "ファイル関連付けの管理(&A)" +msgstr "ファイルとプロトコル関連付けの管理(&A)" #: programs/winecfg/winecfg.rc:314 msgid "Folders" @@ -18711,14 +18633,12 @@ msgid "Mono" msgstr "モノラル" #: programs/winecfg/winecfg.rc:98 -#, fuzzy -#| msgid "Right" msgid "Light" -msgstr "右" +msgstr "ライト" #: programs/winecfg/winecfg.rc:99 msgid "Dark" -msgstr "" +msgstr "ダーク" #: programs/winecfg/winecfg.rc:53 msgid ""

1 0

Rémi Bernon : user32/tests: Dynamically resize the keyboard layout preload list.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: 6e815d773de5cba380f3c66ed2840a7a296e4c04 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e815d773de5cba380f3c66ed2840a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 18 13:23:17 2023 +0100 user32/tests: Dynamically resize the keyboard layout preload list. --- dlls/user32/tests/input.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 6a28bd24301..8619cfe30ee 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3379,7 +3379,7 @@ static void test_keyboard_layout_name(void) len = GetKeyboardLayoutList(len, layouts); ok(len > 0, "GetKeyboardLayoutList returned %d\n", len); - layouts_preload = calloc(len, sizeof(HKL)); + layouts_preload = calloc(1, sizeof(HKL)); ok(layouts_preload != NULL, "Could not allocate memory\n"); if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", &hkey )) @@ -3388,24 +3388,26 @@ static void test_keyboard_layout_name(void) type = REG_SZ; klid_size = sizeof(klid); value_size = ARRAY_SIZE(value); - while (i < len && !RegEnumValueW( hkey, i++, value, &value_size, NULL, &type, (void *)&klid, &klid_size )) + while (!RegEnumValueW( hkey, i++, value, &value_size, NULL, &type, (void *)&klid, &klid_size )) { klid_size = sizeof(klid); value_size = ARRAY_SIZE(value); + layouts_preload = realloc( layouts_preload, (i + 1) * sizeof(*layouts_preload) ); + ok(layouts_preload != NULL, "Could not allocate memory\n"); layouts_preload[i - 1] = UlongToHandle( wcstoul( klid, NULL, 16 ) ); + layouts_preload[i] = 0; id = (DWORD_PTR)layouts_preload[i - 1]; if (id & 0x80000000) todo_wine_if(HIWORD(id) == 0xe001) ok((id & 0xf0000000) == 0xd0000000, "Unexpected preloaded keyboard layout high bits %#lx\n", id); else ok(!(id & 0xf0000000), "Unexpected preloaded keyboard layout high bits %#lx\n", id); } - ok(i <= len, "Unexpected keyboard count %d in preload list\n", i); RegCloseKey( hkey ); } if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Keyboard Layout\\Substitutes", &hkey )) { - for (i = 0; i < len && layouts_preload[i]; ++i) + for (i = 0; layouts_preload[i]; ++i) { type = REG_SZ; klid_size = sizeof(klid); @@ -3447,7 +3449,7 @@ static void test_keyboard_layout_name(void) GetKeyboardLayoutNameW(klid); - for (j = 0; j < len; ++j) + for (j = 0; layouts_preload[j]; ++j) { swprintf( tmpklid, KL_NAMELENGTH, L"%08X", layouts_preload[j] ); if (!wcscmp( tmpklid, klid )) break;

1 0

Rémi Bernon : user32/tests: Skip some keyboard layout tests on broken VMs.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: c29d7330bc5879aae1064a41f05083e15ff64e8d URL: https://gitlab.winehq.org/wine/wine/-/commit/c29d7330bc5879aae1064a41f05083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 15:15:54 2023 +0100 user32/tests: Skip some keyboard layout tests on broken VMs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55327 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55328 --- dlls/user32/tests/input.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8619cfe30ee..f92b839f1cb 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3369,6 +3369,16 @@ static void test_keyboard_layout_name(void) ok(GetLastError() == ERROR_NOACCESS, "got %ld\n", GetLastError()); layout = GetKeyboardLayout(0); + if (broken( layout == (HKL)0x040a0c0a )) + { + /* The testbot w7u_es has a broken layout configuration, its active layout is 040a:0c0a, + * with 0c0a its user locale and 040a its layout langid. Its layout preload list contains + * a 00000c0a layout but the system layouts OTOH only contains the standard 0000040a layout. + * Later, after activating 0409:0409 layout, GetKeyboardLayoutNameW returns 00000c0a. + */ + win_skip( "broken keyboard layout, skipping tests\n" ); + return; + } len = GetKeyboardLayoutList(0, NULL); ok(len > 0, "GetKeyboardLayoutList returned %d\n", len); @@ -3549,6 +3559,13 @@ static void test_ActivateKeyboardLayout( char **argv ) DWORD ret; layout = GetKeyboardLayout( 0 ); + if (broken( layout == (HKL)0x040a0c0a )) + { + /* The testbot w7u_es has a broken layout configuration, see test_keyboard_layout_name above. */ + win_skip( "broken keyboard layout, skipping tests\n" ); + return; + } + count = GetKeyboardLayoutList( 0, NULL ); ok( count > 0, "GetKeyboardLayoutList returned %d\n", count ); layouts = malloc( count * sizeof(HKL) );

1 0

Rémi Bernon : dinput/tests: Avoid calling UnloadKeyboardLayout.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: e98388b6a09f2115d35aa340d4a57fdc8bc5680e URL: https://gitlab.winehq.org/wine/wine/-/commit/e98388b6a09f2115d35aa340d4a57f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 16:01:29 2023 +0100 dinput/tests: Avoid calling UnloadKeyboardLayout. This seems to later mess up with the preload keyboard list and GetKeyboardLayoutNameW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51478 --- dlls/dinput/tests/device8.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 1d53d35a93b..5d4c2bb4366 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1707,7 +1707,6 @@ static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwn skip_key_tests: ActivateKeyboardLayout( old_hkl, 0 ); - UnloadKeyboardLayout( hkl ); winetest_pop_context(); } @@ -2253,7 +2252,6 @@ static void test_sys_keyboard( DWORD version ) skip_key_tests: ActivateKeyboardLayout( old_hkl, 0 ); - UnloadKeyboardLayout( hkl ); test_dik_codes( device, event, hwnd, version );

1 0

Rémi Bernon : user32/tests: Avoid calling UnloadKeyboardLayout.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: 7b947654b2d5ee2433d3965c4213d317374f1145 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b947654b2d5ee2433d3965c4213d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 16:08:11 2023 +0100 user32/tests: Avoid calling UnloadKeyboardLayout. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51478 --- dlls/user32/tests/msg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0059afcbac7..bb7b74558c4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16535,7 +16535,6 @@ static void test_unicode_wm_char(void) DestroyWindow( hwnd ); ActivateKeyboardLayout( hkl_orig, 0 ); - UnloadKeyboardLayout( hkl_greek ); } #define ID_LISTBOX 0x000f

1 0

Eric Pouech : riched20: Don't crash when no OLE obj is present.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: 015aae30cf2217164f631d1c03abfc9ea63bb43d URL: https://gitlab.winehq.org/wine/wine/-/commit/015aae30cf2217164f631d1c03abfc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Dec 13 10:41:41 2023 +0100 riched20: Don't crash when no OLE obj is present. This was generating a lot of crashes in riched20 tests. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/riched20/richole.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5bc1c30c1f2..51ae41d2fe7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5799,6 +5799,8 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); + if (!run->reobj->obj.poleobj) return; + if (SUCCEEDED(IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IViewObject, (void**)&ivo))) { HRESULT hr;

1 0

Eric Pouech : riched20: Don't write past end of buffer.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: 5cbe3a6cb186cffed20e3fea5f88abd0880d3914 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cbe3a6cb186cffed20e3fea5f88ab… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Dec 13 15:12:38 2023 +0100 riched20: Don't write past end of buffer. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4b246dda9c5..ff05ba60333 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4309,7 +4309,7 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, str = get_text( run, 0 ); } /* append '\r' to the last paragraph. */ - if (run == para_end_run( para_prev( editor_end_para( editor ) ) ) && bEOP) + if (run == para_end_run( para_prev( editor_end_para( editor ) ) ) && bEOP && buflen) { *buffer = '\r'; buffer ++;

1 0

Jacek Caban : win32u: Use 32-bit window extra size on wow64.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: 46df584cc586587e1d46767719eb8421f64375b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/46df584cc586587e1d46767719eb84… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 18 13:32:45 2023 +0100 win32u: Use 32-bit window extra size on wow64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55582 --- dlls/win32u/class.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 1fb5044b2e5..33baed3dc23 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -1125,14 +1125,6 @@ static const struct builtin_class_descr builtin_classes[] = .extra = DLGWINDOWEXTRA, .cursor = IDC_ARROW, }, - /* edit */ - { - .name = "Edit", - .style = CS_DBLCLKS | CS_PARENTDC, - .proc = WINPROC_EDIT, - .extra = sizeof(UINT64), - .cursor = IDC_IBEAM, - }, /* icon title */ { .name = MAKEINTRESOURCEA(ICONTITLE_CLASS_ATOM), @@ -1233,7 +1225,19 @@ static void register_builtins(void) ULONG ret_len, i; void *ret_ptr; + /* 64-bit Windows use sizeof(UINT64) for all processes, while 32-bit Windows use 6 for extra + * bytes size. Civilization II depends on the size being 6, so we use that even in wow64. */ + const struct builtin_class_descr edit_class = + { + .name = "Edit", + .style = CS_DBLCLKS | CS_PARENTDC, + .proc = WINPROC_EDIT, + .extra = sizeof(void *) == 4 || NtCurrentTeb()->WowTebOffset ? 6 : sizeof(UINT64), + .cursor = IDC_IBEAM, + }; + for (i = 0; i < ARRAYSIZE(builtin_classes); i++) register_builtin( &builtin_classes[i] ); + register_builtin( &edit_class ); KeUserModeCallback( NtUserInitBuiltinClasses, NULL, 0, &ret_ptr, &ret_len ); }

1 0

Rémi Bernon : server: Always queue mouse messages delivered to another window.
by Alexandre Julliard 18 Dec '23

18 Dec '23

Module: wine Branch: master Commit: bb496ea847bb019067ea4b60b9916378ed6fc452 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb496ea847bb019067ea4b60b99163… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 18 09:54:42 2023 +0100 server: Always queue mouse messages delivered to another window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306 --- server/queue.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/queue.c b/server/queue.c index 15a63f880f1..67249d06599 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1711,6 +1711,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg } input = thread->queue->input; + if (win != msg->win) always_queue = 1; if (!always_queue || merge_message( input, msg )) free_message( msg ); else {

1 0