Ros-diffs September 2022

ros-diffs@reactos.org

21 participants
142 discussions

[reactos] 01/01: [HOTPLUG] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48141d2eb69b491948e94… commit 48141d2eb69b491948e94f17f180d8000b1e1e43 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:07:03 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:07:03 2022 +0900 [HOTPLUG] Improve Japanese translation (ja-JP) --- dll/cpl/hotplug/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/hotplug/lang/ja-JP.rc b/dll/cpl/hotplug/lang/ja-JP.rc index 25baa56a559..c2a9c356d50 100644 --- a/dll/cpl/hotplug/lang/ja-JP.rc +++ b/dll/cpl/hotplug/lang/ja-JP.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 CAPTION "" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic" BEGIN ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 LTEXT "取り外したいデバイスを選択して停止をクリックして下さい。デバイスが安全に取り外せるようになったら ReactOS があなたに通知します。", IDC_STATIC, 36, 10, 234, 24, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -35,5 +35,5 @@ END STRINGTABLE BEGIN IDS_CPLNAME "安全なハードウェアの取り外し" - IDS_CPLDESCRIPTION "Safely unplug or eject devices from your computer." + IDS_CPLDESCRIPTION "コンピュータからデバイスを安全に取り外しできます。" END

1 0

[reactos] 01/01: [JOY] Add Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a509f9a30d15260963275… commit a509f9a30d152609632754e26ed2c469f0c7ffab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:03:59 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:03:59 2022 +0900 [JOY] Add Japanese translation (ja-JP) --- dll/cpl/joy/joy.rc | 3 ++ dll/cpl/joy/lang/ja-JP.rc | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/dll/cpl/joy/joy.rc b/dll/cpl/joy/joy.rc index 8368fe7e2d9..c8eea60a3bc 100644 --- a/dll/cpl/joy/joy.rc +++ b/dll/cpl/joy/joy.rc @@ -48,6 +48,9 @@ IDI_CPLSYSTEM ICON "resources/applet.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif diff --git a/dll/cpl/joy/lang/ja-JP.rc b/dll/cpl/joy/lang/ja-JP.rc new file mode 100644 index 00000000000..e66087d3744 --- /dev/null +++ b/dll/cpl/joy/lang/ja-JP.rc @@ -0,0 +1,85 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "ゲームコントローラ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "これらの設定は、コンピューターにインストールされているゲームコントローラを構成するのに役立ちます。", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "インストール済みコントローラ(&N)", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "追加(&A)...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "削除(&R)", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "プロパティ(&P)", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "詳細設定(&D)...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 + PUSHBUTTON "ﾄﾗﾌﾞﾙｼｭｰﾃｨﾝｸﾞ(&T)...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "ゲームコントローラの追加" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "以下のリストからゲームコントローラを選択し、[OK] をクリックして下さい。ゲームコントローラが一覧にない場合は、[カスタム] をクリックして下さい。", -1, 35, 7, 210, 33 + LTEXT "コントローラ(&G):", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Enable rudders and pedals", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + LTEXT "ゲームポート(&G):", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "カスタム(&C)...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "カスタムゲームコントローラ" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "特性", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "ジョイスティック(&J)", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "フライトヨークまたはフライトスティック(&F)", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "ゲームパット(&G)", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "レースカーコントローラ(&R)", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "軸(&A)", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "ラダー/ペダル", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Z 軸", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "ボタン(&B)", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "視点コントロールを含む(&P)", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "コントローラ名(&O):", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "詳細設定" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 163, 65, 50, 14 + LTEXT "古いプログラムで使用するデバイスを選択して下さい。", -1, 7, 7, 208, 10 + LTEXT "好ましいデバイス(&P):", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "ゲームコントローラ" + IDS_CPLSYSTEMDESCRIPTION "ジョイスティックやゲームパッドなどのゲームコントローラハードウェアを追加、削除または構成します。" + IDS_CONTROLLER "コントローラ" + IDS_STATUS "状態" + IDS_NONE "(なし)" +END

1 0

[reactos] 01/01: [SHIMGVW] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f1c77c8752e135af8809… commit 7f1c77c8752e135af88095e985b46d35bcc5031c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 12:33:22 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 12:33:22 2022 +0900 [SHIMGVW] Improve Japanese translation (ja-JP) --- dll/win32/shimgvw/lang/ja-JP.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/shimgvw/lang/ja-JP.rc b/dll/win32/shimgvw/lang/ja-JP.rc index 46c024fb7d2..5f3cd2dbc45 100644 --- a/dll/win32/shimgvw/lang/ja-JP.rc +++ b/dll/win32/shimgvw/lang/ja-JP.rc @@ -9,9 +9,9 @@ BEGIN /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "次の画像" IDS_TOOLTIP_PREV_PIC "前の画像" - IDS_TOOLTIP_BEST_FIT "Best fit to window (Ctrl+B)" - IDS_TOOLTIP_REAL_SIZE "Actual size (Ctrl+A)" - IDS_TOOLTIP_SLIDE_SHOW "Start slideshow (F11)" + IDS_TOOLTIP_BEST_FIT "ウィンドウに合わせる (Ctrl+B)" + IDS_TOOLTIP_REAL_SIZE "実寸大 (Ctrl+A)" + IDS_TOOLTIP_SLIDE_SHOW "スライドショーの開始 (F11)" IDS_TOOLTIP_ZOOM_IN "ズームイン (+)" IDS_TOOLTIP_ZOOM_OUT "ズームアウト (-)" IDS_TOOLTIP_ROT_CLOCKW "時計回りに回転 (Ctrl+K)" @@ -19,8 +19,8 @@ BEGIN IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "印刷 (Ctrl+P)" IDS_TOOLTIP_SAVEAS "名前を付けて保存... (Ctrl+S)" - IDS_TOOLTIP_MODIFY "Modify (Ctrl+E)" - IDS_TOOLTIP_HELP_TOC "Help topics (F1)" + IDS_TOOLTIP_MODIFY "変更 (Ctrl+E)" + IDS_TOOLTIP_HELP_TOC "ヘルプトピックス (F1)" END STRINGTABLE

1 0

[reactos] 01/01: [SHELL32] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b73da2c410437b11ba46… commit 7b73da2c410437b11ba46ee0bfdae839bb5c35dd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 12:30:41 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 12:31:07 2022 +0900 [SHELL32] Improve Japanese translation (ja-JP) --- dll/win32/shell32/lang/ja-JP.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index ff6eb6994a1..c4c87a5709c 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -498,11 +498,11 @@ FONT 9, "MS UI Gothic" BEGIN CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 180, 2, 32, 26 - PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 57, 46, 19, 19, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "ユーザー切り替え(&S)", IDC_SWITCH_USER_BUTTON, 57, 46, 19, 19, BS_OWNERDRAW | WS_DISABLED | WS_GROUP PUSHBUTTON "ログオフ(&L)", IDC_LOG_OFF_BUTTON, 134, 46, 19, 19, BS_OWNERDRAW PUSHBUTTON "キャンセル", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT LTEXT "ReactOS のログオフ", IDC_LOG_OFF_TEXT_STATIC, 4, 9, 130, 20 - CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "ユーザー切り替え", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 CTEXT "ログオフ", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 END @@ -802,8 +802,8 @@ BEGIN IDS_COPYERRORSAME "コピーできません '%s': コピー元とコピー先のファイル名が同じです。" IDS_MOVEERRORSUBFOLDER "移動できません '%s': 移動先のフォルダは移動元のフォルダのサブフォルダです。" IDS_COPYERRORSUBFOLDER "コピーできません '%s': コピー先のフォルダはコピー元のフォルダのサブフォルダです。" - IDS_MOVEERROR "Cannot move '%s': %s" - IDS_COPYERROR "Cannot copy '%s': %s" + IDS_MOVEERROR "移動できません '%s': %s" + IDS_COPYERROR "コピーできません '%s': %s" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" @@ -839,8 +839,8 @@ BEGIN IDS_FORMAT_COMPLETE "フォーマット完了。" /* Warning format system drive dialog strings */ - IDS_NO_FORMAT_TITLE "Cannot format this volume" - IDS_NO_FORMAT "This volume cannot be formatted! It contains important system files in order for ReactOS to run." + IDS_NO_FORMAT_TITLE "ボリュームをフォーマットできません" + IDS_NO_FORMAT "このボリュームをフォーマットできません! ReactOS を実行するための重要なシステムファイルが含まれています。" /* Run File dialog */ IDS_RUNDLG_ERROR "「ファイルの実行」ダイアログを表示できませんでした (内部エラー)" @@ -948,7 +948,7 @@ BEGIN IDS_EDIT_VERB "編集" IDS_FIND_VERB "検索" IDS_PRINT_VERB "印刷" - IDS_CMD_VERB "Command Prompt here" + IDS_CMD_VERB "ここでコマンドプロンプトを開く" IDS_FILE_FOLDER "%u 個のファイル、 %u 個のフォルダ" IDS_PRINTERS "プリンタ" @@ -1023,11 +1023,11 @@ BEGIN IDS_MOVEITEMS "項目の移動先" IDS_MOVEBUTTON "移動" - IDS_SYSTEMFOLDER "System Folder" + IDS_SYSTEMFOLDER "システムフォルダ" /* For IDD_LOG_OFF_FANCY */ - IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." - IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_DESC "プログラムを終了し、ReactOS セッションを終了します。" + IDS_SWITCH_USER_DESC "プログラムとファイルを開いたまま、別のユーザーがログオンできるようにします。\r\n\r\n(Win+L を押して、ユーザーを切り替えることもできます)" IDS_LOG_OFF_TITLE "ログオフ" - IDS_SWITCH_USER_TITLE "Switch User" + IDS_SWITCH_USER_TITLE "ユーザー切り替え" END

1 0

[reactos] 01/01: [EXPLORER] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 24 Sep '22

24 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d29c27127d3b9ebc92e88… commit d29c27127d3b9ebc92e88338267a624e868a3e15 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 12:22:55 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 12:22:55 2022 +0900 [EXPLORER] Improve Japanese translation (ja-JP) --- base/shell/explorer/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index 5ff1420b7ac..11be9a74331 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -194,5 +194,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "タスクバーとスタートメニュー" - IDS_RESTORE_ALL "&Show Open Windows" + IDS_RESTORE_ALL "開いているウィンドウを表示(&S)" END

1 0

[reactos] 02/02: [ISAPNP] Generate hardware ids and compatible ids in upper case
by Hervé Poussineau 23 Sep '22

23 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a32d5980ca075efd1fe5… commit 3a32d5980ca075efd1fe5f459613b829c820e827 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Sep 23 23:06:34 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Sep 23 23:07:45 2022 +0200 [ISAPNP] Generate hardware ids and compatible ids in upper case --- drivers/bus/isapnp/pdo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index f2014ffbc90..3946ce31485 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -146,7 +146,7 @@ IsaPdoQueryId( &End, &Remaining, 0, - L"ISAPNP\\%.3S%04x", + L"ISAPNP\\%.3S%04X", LogDev->VendorId, LogDev->ProdId); if (!NT_VERIFY(NT_SUCCESS(Status))) @@ -194,7 +194,7 @@ IsaPdoQueryId( &End, &Remaining, 0, - L"ISAPNP\\%.3S%04x", + L"ISAPNP\\%.3S%04X", LogDev->VendorId, LogDev->ProdId); if (!NT_VERIFY(NT_SUCCESS(Status))) @@ -225,7 +225,7 @@ IsaPdoQueryId( &End, &Remaining, 0, - L"*%.3S%04x", + L"*%.3S%04X", LogDev->LogVendorId, LogDev->LogProdId); if (!NT_VERIFY(NT_SUCCESS(Status))) @@ -275,7 +275,7 @@ IsaPdoQueryId( &End, &Remaining, 0, - L"*%.3S%04x", + L"*%.3S%04X", CompatibleId->VendorId, CompatibleId->ProdId); if (!NT_VERIFY(NT_SUCCESS(Status)))

1 0

[reactos] 01/02: [SHELL32] Prevent use after free
by Hervé Poussineau 23 Sep '22

23 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3506ee626bc2c32bb38a… commit f3506ee626bc2c32bb38a06011c7616ae2c93459 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Sep 12 22:59:49 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Sep 23 23:07:26 2022 +0200 [SHELL32] Prevent use after free 'buffer' is local to the function, while m_sPath is an instance class member. Fix that by calling the IShellLink::Resolve() function, which will allocate and fill the m_sPath variable. CORE-15229 --- dll/win32/shell32/CShellLink.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 209961454e8..7ad91f5c2d9 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2735,12 +2735,9 @@ LPWSTR SH_GetTargetTypeByPath(LPCWSTR lpcwFullPath) BOOL CShellLink::OnInitDialog(HWND hwndDlg, HWND hwndFocus, LPARAM lParam) { - WCHAR buffer[MAX_PATH]; - TRACE("CShellLink::OnInitDialog(hwnd %p hwndFocus %p lParam %p)\n", hwndDlg, hwndFocus, lParam); - if (m_pPidl && SHGetPathFromIDListW(m_pPidl, buffer)) - m_sPath = buffer; + Resolve(0, SLR_NO_UI | SLR_NOUPDATE | SLR_NOSEARCH | SLR_NOTRACK); TRACE("m_sArgs: %S sComponent: %S m_sDescription: %S m_sIcoPath: %S m_sPath: %S m_sPathRel: %S sProduct: %S m_sWorkDir: %S\n", m_sArgs, sComponent, m_sDescription, m_sIcoPath, m_sPath, m_sPathRel, sProduct, m_sWorkDir);

1 0

[reactos] 01/01: [USER32][IMM32] Use wcscspn instead of wcsspn
by Katayama Hirofumi MZ 23 Sep '22

23 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f79e80c520a2e39baf024… commit f79e80c520a2e39baf024a5d81450eebde73b1bd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 23 13:50:24 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 23 13:50:24 2022 +0900 [USER32][IMM32] Use wcscspn instead of wcsspn b4575ec and db00a75 were my mistakes. CORE-11700 --- dll/win32/imm32/utils.c | 2 +- win32ss/user/user32/windows/input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index fc7461d61ad..90fa7d6c1d1 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -909,7 +909,7 @@ UINT APIENTRY Imm32GetImeLayout(PREG_IME pLayouts, UINT cLayouts) RegCloseKey(hkeyIME); /* We don't allow the invalid "IME File" values for security reason */ - if (!szImeFileName[0] || wcsspn(szImeFileName, L":\\/") != wcslen(szImeFileName)) + if (!szImeFileName[0] || wcscspn(szImeFileName, L":\\/") != wcslen(szImeFileName)) break; Imm32StrToUInt(szImeKey, &Value, 16); diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 57cb1e18b7a..092a92efefc 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -805,7 +805,7 @@ IntLoadKeyboardLayout( /* We don't allow the invalid "IME File" values for security reason */ if (dwType != REG_SZ || szImeFileName[0] == 0 || - wcsspn(szImeFileName, L":\\/") != wcslen(szImeFileName) || + wcscspn(szImeFileName, L":\\/") != wcslen(szImeFileName) || GetFileAttributesW(szPath) == INVALID_FILE_ATTRIBUTES) /* Does not exist? */ { bIsIME = FALSE;

1 0

[reactos] 01/01: [EXPLORER] Follow-up of #4718 (ba2cead)
by Katayama Hirofumi MZ 22 Sep '22

22 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46de3a22acc964f27a526… commit 46de3a22acc964f27a5260e144089125f83586ff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 23 08:25:27 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 23 08:25:27 2022 +0900 [EXPLORER] Follow-up of #4718 (ba2cead) Handle click OnNcLButtonUp instead of OnNcLButtonDown/OnNcLButtonDblClick. CORE-15369 --- base/shell/explorer/traywnd.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index b3384a4dc06..2b648e80568 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2861,9 +2861,6 @@ ChangePos: bHandled = FALSE; - if (CheckShowDesktopButtonClick(lParam, bHandled)) - return TRUE; - RECT rcStartBtn; m_StartButton.GetWindowRect(&rcStartBtn); @@ -3038,9 +3035,6 @@ HandleTrayContextMenu: LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (CheckShowDesktopButtonClick(lParam, bHandled)) - return TRUE; - /* Let the clock handle the double click */ ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); @@ -3049,6 +3043,14 @@ HandleTrayContextMenu: return TRUE; } + LRESULT OnNcLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (CheckShowDesktopButtonClick(lParam, bHandled)) + return 0; + + return 0; + } + LRESULT OnAppTrayDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { DestroyWindow(); @@ -3423,6 +3425,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_SYSCHAR, OnSysChar) MESSAGE_HANDLER(WM_NCRBUTTONUP, OnNcRButtonUp) MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick) + MESSAGE_HANDLER(WM_NCLBUTTONUP, OnNcLButtonUp) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_NCMOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_APP_TRAYDESTROY, OnAppTrayDestroy)

1 0

[reactos] 01/01: [EXPLORER] 'Show Desktop' button should work on button up (#4718)
by Katayama Hirofumi MZ 22 Sep '22

22 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba2cead8a2494f7c1bf36… commit ba2cead8a2494f7c1bf366d4a1a0f66ab96316d1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 22 23:01:12 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 22 23:01:12 2022 +0900 [EXPLORER] 'Show Desktop' button should work on button up (#4718) Follow-up of PR #4715. CORE-15369 - The 'Show Desktop' button of taskbar works on button up instead of button down. - Add NULL checks for m_ShowDesktopButton. - Fix hung-up in rebooting. --- base/shell/explorer/traywnd.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index f1ff6242182..b3384a4dc06 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -310,7 +310,7 @@ public: return 0; // Show/Hide Desktop - ::SendMessageW(::GetParent(m_hWnd), WM_COMMAND, TRAYCMD_TOGGLE_DESKTOP, 0); + GetParent().SendMessage(WM_COMMAND, TRAYCMD_TOGGLE_DESKTOP, 0); return 0; } @@ -324,7 +324,7 @@ public: PostMessage(TSDB_CLICK, 0, 0); } - LRESULT OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { Click(); // Left-click return 0; @@ -357,6 +357,8 @@ public: BOOL PtInButton(POINT pt) { + if (!IsWindow()) + return FALSE; RECT rc; GetWindowRect(&rc); INT cxEdge = ::GetSystemMetrics(SM_CXEDGE), cyEdge = ::GetSystemMetrics(SM_CYEDGE); @@ -375,7 +377,7 @@ public: m_bHovering = TRUE; SetTimer(SHOW_DESKTOP_TIMER_ID, SHOW_DESKTOP_TIMER_INTERVAL, NULL); InvalidateRect(NULL, TRUE); - ::SendMessageW(::GetParent(m_hWnd), WM_NCPAINT, 0, 0); + GetParent().PostMessage(WM_NCPAINT, 0, 0); } LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -396,7 +398,7 @@ public: m_bHovering = FALSE; KillTimer(SHOW_DESKTOP_TIMER_ID); InvalidateRect(NULL, TRUE); - ::SendMessageW(::GetParent(m_hWnd), WM_NCPAINT, 0, 0); + GetParent().PostMessage(WM_NCPAINT, 0, 0); } return 0; @@ -413,7 +415,7 @@ public: } BEGIN_MSG_MAP(CTrayShowDesktopButton) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) + MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) MESSAGE_HANDLER(WM_THEMECHANGED, OnSettingChanged) MESSAGE_HANDLER(WM_PAINT, OnPaint) @@ -2605,13 +2607,15 @@ ChangePos: // We have to draw non-client area because the 'Show Desktop' button is beyond client area. void DrawShowDesktopButton() { + if (!m_ShowDesktopButton.IsWindow()) + return; // Get the rectangle in window coordinates RECT rcButton, rcWnd; GetWindowRect(&rcWnd); m_ShowDesktopButton.GetWindowRect(&rcButton); ::OffsetRect(&rcButton, -rcWnd.left, -rcWnd.top); - HDC hdc = GetDCEx(NULL, DCX_WINDOW | DCX_CACHE | DCX_NORESETATTRS); + HDC hdc = GetDCEx(NULL, DCX_WINDOW | DCX_CACHE); m_ShowDesktopButton.OnDraw(hdc, &rcButton); // Draw the button ReleaseDC(hdc); } @@ -3232,10 +3236,10 @@ HandleTrayContextMenu: LRESULT OnNcActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DefWindowProc(uMsg, wParam, lParam); + LRESULT ret = DefWindowProc(uMsg, wParam, lParam); DrawShowDesktopButton(); // We have to draw non-client area bHandled = TRUE; - return 0; + return ret; } LRESULT OnNcCalcSize(INT code, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

1 0

← Newer
1
2
3
4
5
6
7
8
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2022