Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Improve Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69fb160a4823314408107… commit 69fb160a4823314408107d55bd748ceec437d722 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 16 12:57:17 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 16 12:57:17 2023 +0900 [SHELL32] Improve Japanese (ja-JP) translation CORE-18706 --- dll/win32/shell32/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index b6dce2c0418..dd766f49493 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -934,7 +934,7 @@ BEGIN IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "アプリケーション" IDS_NLS_FILE "各国語サポートファイル" - IDS_OCX_FILE "ActiveX Control" + IDS_OCX_FILE "ActiveX コントロール" IDS_TLB_FILE "型ライブラリ" IDS_FON_FILE "フォントファイル" IDS_TTF_FILE "TrueType フォントファイル" @@ -947,7 +947,7 @@ BEGIN IDS_PIF_FILE "NT VDM プログラム情報ファイル" IDS_SCR_FILE "スクリーンセーバー" IDS_SYS_FILE "システムファイル" - IDS_VXD_FILE "仮想デバイスドライバ" + IDS_VXD_FILE "仮想デバイスドライバ" IDS_ANY_FILE "%s ファイル" IDS_OPEN_VERB "開く"

1 year, 11 months

[reactos] 01/01: [BOOTDATA][INF] hivecls.inf: Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de7f1ceeef6035700c315… commit de7f1ceeef6035700c3153ce957264818cca0e69 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 16 12:55:01 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 16 12:55:01 2023 +0900 [BOOTDATA][INF] hivecls.inf: Add Japanese (ja-JP) translation CORE-18706 --- boot/bootdata/hivecls.inf | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 89a72322516..3dda5a8c7ce 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -802,6 +802,7 @@ UNINSTALL="Uninstall" REPAIR="Repair" TEST="Test" +;------------------------------------------------------------------------ ; LANG_GERMAN SUBLANG_NEUTRAL [Strings.0007] ;; In shell32.dll @@ -842,6 +843,7 @@ CPLFILE_OPENWITH="Mit der Systemsteuerung öffnen" ;REPAIR="Repair" ;TEST="Test" +;------------------------------------------------------------------------ ; LANG_SPANISH SUBLANG_NEUTRAL [Strings.000A] ;; In shell32.dll @@ -882,6 +884,7 @@ UNINSTALL="Desinstalar" REPAIR="Reparar" TEST="Probar" +;------------------------------------------------------------------------ ; LANG_FRENCH SUBLANG_NEUTRAL [Strings.000C] ;; In shell32.dll @@ -922,6 +925,7 @@ UNINSTALL="Désinstaller" REPAIR="Réparer" TEST="Tester" +;------------------------------------------------------------------------ ; LANG_ITALIAN SUBLANG_NEUTRAL [Strings.0010] ;; In shell32.dll @@ -962,6 +966,7 @@ UNINSTALL="Rimuovi" REPAIR="Ripara" TEST="Prova" +;------------------------------------------------------------------------ ; LANG_POLISH SUBLANG_NEUTRAL [Strings.0015] ;; In shell32.dll @@ -1002,6 +1007,7 @@ UNINSTALL="Odinstaluj" REPAIR="Napraw" TEST="Testuj" +;------------------------------------------------------------------------ ; LANG_ROMANIAN SUBLANG_NEUTRAL [Strings.0018] ;; In shell32.dll @@ -1042,6 +1048,7 @@ UNINSTALL="Dezinstalează" REPAIR="Repară" TEST="Testează" +;------------------------------------------------------------------------ ; LANG_RUSSIAN SUBLANG_NEUTRAL [Strings.0019] ;; In shell32.dll @@ -1082,6 +1089,7 @@ UNINSTALL="Удалить" REPAIR="Исправить" TEST="Тест" +;------------------------------------------------------------------------ ; LANG_CHINESE SUBLANG_CHINESE_TRADITIONAL [Strings.0404] ;; In shell32.dll @@ -1122,6 +1130,7 @@ UNINSTALL="解除安裝" REPAIR="修復" TEST="測試" +;------------------------------------------------------------------------ ; LANG_TURKISH SUBLANG_DEFAULT [Strings.041F] ;; In shell32.dll @@ -1162,6 +1171,7 @@ CPLFILE_OPENWITH="Denetim Masası'yla Aç" ;REPAIR="Onar" ;TEST="Dene" +;------------------------------------------------------------------------ ; LANG_CHINESE SUBLANG_CHINESE_HONGKONG [Strings.0C04] ;; In shell32.dll @@ -1202,4 +1212,46 @@ UNINSTALL="解除安裝" REPAIR="修復" TEST="測試" +;------------------------------------------------------------------------ +; LANG_JAPANESE SUBLANG_DEFAULT +[Strings.0411] + +;; In shell32.dll +CPLFILE_OPENWITH="コントロールパネルで開く" + +;; In hhctrl.ocx +CHMFILE="コンパイル済み HTML ヘルプファイル" + +;; In msxml3r.dll +XMLFILE="XML 文書" +XSLFILE="XSL スタイルシート" + +;; In msi.dll +MSIPACK="ReactOS インストーラパッケージ" + +;; In themeui.dll +MSSTYLESFILE="視覚スタイルファイル" +THEMEFILE="テーマファイル" + +;; In some multimedia exe/dll +WAVFILE="Wave 音声" +MIDFILE="MIDI シーケンス" +CDAFILE="CD 音声トラック" +AVIFILE="ビデオクリップ" + +;; Misc file types without friendly (localized in .dll resources) name +CSSFILE="カスケードスタイルシート" +SCFFILE="ReactOS エクスプローラコマンド" +WMZFILE="圧縮済み拡張メタファイル" + +;; For .reg files, right-click menu +MERGE="結合" + +;; For screensaver (*.scr) and MSI install package (*.msi) files, right-click menu +CONFIGURE="設定" +INSTALL="インストール" +UNINSTALL="アンインストール" +REPAIR="修復" +TEST="テスト" + ; EOF

1 year, 11 months

[reactos] 01/01: [EVENTVWR] Improve Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e320346e9e0b924bd2fa8… commit e320346e9e0b924bd2fa8bdbf4de562f31a92faf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 16 12:42:58 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 16 12:42:58 2023 +0900 [EVENTVWR] Improve Japanese (ja-JP) translation CORE-18706 --- base/applications/mscutils/eventvwr/lang/ja-JP.rc | 149 +++++++++++----------- 1 file changed, 75 insertions(+), 74 deletions(-) diff --git a/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/base/applications/mscutils/eventvwr/lang/ja-JP.rc index ade749976dc..ef1dd0c2d41 100644 --- a/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Japanese resource file * TRANSLATORS: Copyright 2009 Tomoya Kitagawa <jptomoya(a)yahoo.co.jp> + * Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT @@ -11,31 +12,31 @@ IDM_EVENTVWR MENU BEGIN POPUP "ログ(&L)" BEGIN - MENUITEM "Open...(&O)", IDM_OPEN_EVENTLOG - MENUITEM "Save Event Log as...(&E)", IDM_SAVE_EVENTLOG - MENUITEM "&Close", IDM_CLOSE_EVENTLOG + MENUITEM "開く(&O)...", IDM_OPEN_EVENTLOG + MENUITEM "イベントログに名前を付けて保存(&E)...", IDM_SAVE_EVENTLOG + MENUITEM "閉じる(&C)", IDM_CLOSE_EVENTLOG MENUITEM SEPARATOR - MENUITEM "Clear all Events (&L)", IDM_CLEAR_EVENTS - MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG - MENUITEM "Log Settings...(&T)", IDM_EVENTLOG_SETTINGS + MENUITEM "すべてのイベントをクリア(&L)", IDM_CLEAR_EVENTS + MENUITEM "名前の変更(&R)\tF2", IDM_RENAME_EVENTLOG + MENUITEM "ログ設定(&T)...", IDM_EVENTLOG_SETTINGS MENUITEM SEPARATOR MENUITEM "終了(&X)", IDM_EXIT END POPUP "表示(&V)" BEGIN - MENUITEM "Newest first (&N)", IDM_LIST_NEWEST - MENUITEM "Oldest first (&O)", IDM_LIST_OLDEST + MENUITEM "新しい順(&N)", IDM_LIST_NEWEST + MENUITEM "古い順(&O)", IDM_LIST_OLDEST MENUITEM SEPARATOR - MENUITEM "Details... (&D)\tEnter", IDM_EVENT_DETAILS + MENUITEM "詳細(&D)...\tEnter", IDM_EVENT_DETAILS MENUITEM SEPARATOR MENUITEM "更新(&R)\tF5", IDM_REFRESH END POPUP "オプション(&O)" BEGIN - MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW - MENUITEM "&Grid lines", IDM_LIST_GRID_LINES + MENUITEM "イベントの詳細表示(&V)", IDM_EVENT_DETAILS_VIEW + MENUITEM "グリッド線(&G)", IDM_LIST_GRID_LINES MENUITEM SEPARATOR - MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS + MENUITEM "終了時に設定を保存(&S)", IDM_SAVE_SETTINGS END POPUP "ヘルプ(&H)" BEGIN @@ -49,12 +50,12 @@ IDM_EVENTWR_CTX MENU BEGIN POPUP "" BEGIN - MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG - MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM "イベントログを開く(&O)...", IDM_OPEN_EVENTLOG + MENUITEM "イベントログに名前を付けて保存(&S)...", IDM_SAVE_EVENTLOG MENUITEM SEPARATOR - MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS - MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG - MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + MENUITEM "すべてのイベントをクリア(&C)", IDM_CLEAR_EVENTS + MENUITEM "名前の変更(&R)\tF2", IDM_RENAME_EVENTLOG + MENUITEM "ログ設定(&T)...", IDM_EVENTLOG_SETTINGS END END @@ -113,40 +114,40 @@ END IDD_LOGPROPERTIES_GENERAL DIALOGEX 0, 0, 252, 234 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "General" +CAPTION "一般設定" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Display name:", IDC_STATIC, 7, 9, 60, 8 + LTEXT "表示名(&D):", IDC_STATIC, 7, 9, 60, 8 EDITTEXT IDC_DISPLAYNAME, 67, 7, 178, 12, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "&Log name:", IDC_STATIC, 7, 25, 60, 8 + LTEXT "ログ名(&L):", IDC_STATIC, 7, 25, 60, 8 EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 + LTEXT "ログファイル(&F):", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 + LTEXT "サイズ(&S):", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "作成日時(&C):", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "変更日時(&M):", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "アクセス日時(&A):", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 - LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 + GROUPBOX "ログサイズ", IDC_STATIC, 7, 106, 238, 99 + LTEXT "最大ログサイズ(&M):", IDC_STATIC, 17, 122, 58, 8 EDITTEXT IDC_EDIT_MAXLOGSIZE, 80, 119, 40, 14, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_MAXLOGSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 119, 10, 14 LTEXT "KB", IDC_STATIC, 130, 122, 20, 8 - LTEXT "When maximum log size is reached:", IDC_STATIC, 17, 140, 219, 8 - CONTROL "&Overwrite events as needed", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10 - CONTROL "O&verwrite events older than", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10 + LTEXT "最大ログサイズに達したとき:", IDC_STATIC, 17, 140, 219, 8 + CONTROL "必要に応じてイベントを上書きする(&O)", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10 + CONTROL "次のものより古いイベントを上書き(&V)", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10 EDITTEXT IDC_EDIT_EVENTS_AGE, 122, 165, 35, 14, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_EVENTS_AGE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 157, 165, 10, 14 - LTEXT "days", IDC_STATIC, 162, 168, 20, 8 - CONTROL "Do &not overwrite events\n(clear log manually)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20 - PUSHBUTTON "&Restore Defaults", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 - AUTOCHECKBOX "Using a lo&w-speed connection", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 - PUSHBUTTON "&Clear Log", ID_CLEARLOG, 195, 213, 50, 14 + LTEXT "日", IDC_STATIC, 162, 168, 20, 8 + CONTROL "イベントを上書きしない(&N)\n(手動でログをクリアする)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20 + PUSHBUTTON "デフォルトに戻す(&R)", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 + AUTOCHECKBOX "低速の接続を使用する(&W)", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 + PUSHBUTTON "ログをクリア(&C)", ID_CLEARLOG, 195, 213, 50, 14 END STRINGTABLE @@ -154,35 +155,35 @@ BEGIN IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)" IDS_APP_TITLE "イベントビューア" IDS_APP_TITLE_EX "%s - %s Log on \\\\" - IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)" - IDS_LOADING_WAIT "イベントログを読み込んでいます。お待ちください..." - IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." - IDS_EVENTLOG_SYSTEM "System Logs" - IDS_EVENTLOG_APP "Application Logs" - IDS_EVENTLOG_USER "User Logs" - IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" - IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" - IDS_EVENTSTRINGIDNOTFOUND "イベント ID (%lu) (ソース %s 内) に関する説明が見つかりませんでした。リモートコンピュータからメッセージを表示するために必要なレジストリ情報またはメッセージ DLL ファイルがローカルコンピュータにない可能性があります。\n\nThe following information is part of the event:\n\n" + IDS_STATUS_MSG "%s には %lu 個のイベントがあります (総数: %lu)" + IDS_LOADING_WAIT "イベントログを読み込んでいます。お待ちください..." + IDS_NO_ITEMS "このビューで表示する項目がありません。" // "No events in this log." + IDS_EVENTLOG_SYSTEM "システムログ" + IDS_EVENTLOG_APP "アプリログ" + IDS_EVENTLOG_USER "ユーザーログ" + IDS_SAVE_FILTER "イベントログ (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "このイベントをクリアする前に保存したいですか？" + IDS_RESTOREDEFAULTS "すべての設定をデフォルトに戻しますか？" + IDS_EVENTSTRINGIDNOTFOUND "イベント ID (%lu) (ソース %s 内) に関する説明が見つかりませんでした。リモートコンピュータからメッセージを表示するために必要なレジストリ情報またはメッセージ DLL ファイルがローカルコンピュータにない可能性があります。\n\n次の情報はイベントの一部です:\n\n" END STRINGTABLE BEGIN /* Please note that explicit TAB characters '\t' are used to fix the alignment of the message in the MessageBox */ - IDS_USAGE "ReactOS Event Viewer\n\ + IDS_USAGE "ReactOS イベントビュア\n\ \n\ -EventVwr [computer name] [/L:<event log file>] [/?]\n\ +EventVwr [コンピューター名] [/L:<イベントログファイル>] [/?]\n\ \n\ -""computer name"" : Specifies the remote computer where to connect\n\ -\tto retrieve the events to display. If no name is specified, the\n\ -\tlocal computer is used.\n\ +""コンピューター名"" : 表示するイベントを取得するために接続する\n\ +\tリモートコンピューターを指定します。名前が未指定の場合は\n\ +\tローカルコンピューターが使われます。\n\ \n\ -/L:<event log file> : Specifies which event log file to open.\n\ -\tOnly files in the .evt format (NT ≤ 5.2) are supported.\n\ +/L:<イベントログファイル> : 開きたいイベントログファイルを指定\n\ +\tします。.evt 形式（≦NT 5.2）のファイルのみをサポートしています。\n\ \n\ -/? : Displays this help message.\n\ +/? : このヘルプメッセージを表示します。\n\ " - IDS_EVENTLOGFILE "Event Log File" + IDS_EVENTLOGFILE "イベントログファイル" END STRINGTABLE @@ -198,37 +199,37 @@ END STRINGTABLE BEGIN - IDS_BYTES_FORMAT "bytes" // "%s bytes" + IDS_BYTES_FORMAT "バイト" // "%s bytes" // "%1!ls! (%2!ls! bytes)" END STRINGTABLE BEGIN - IDS_COLUMNTYPE "Type" - IDS_COLUMNDATE "Date" - IDS_COLUMNTIME "Time" - IDS_COLUMNSOURCE "Source" - IDS_COLUMNCATEGORY "Category" - IDS_COLUMNEVENT "Event" - IDS_COLUMNUSER "User" - IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNTYPE "タイプ" + IDS_COLUMNDATE "日付" + IDS_COLUMNTIME "時間" + IDS_COLUMNSOURCE "ソース" + IDS_COLUMNCATEGORY "カテゴリ" + IDS_COLUMNEVENT "イベント" + IDS_COLUMNUSER "ユーザー" + IDS_COLUMNCOMPUTER "コンピューター" END STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\r\n\ -Event Source: %s\r\n\ -Event Category: %s\r\n\ -Event ID: %s\r\n\ -Date: %s\r\n\ -Time: %s\r\n\ -User: %s\r\n\ -Computer: %s\r\n\ -Description:\r\n%s" + IDS_COPY "イベントの種類: %s\r\n\ +イベントのソース: %s\r\n\ +イベントのカテゴリ: %s\r\n\ +イベント ID: %s\r\n\ +日付: %s\r\n\ +時刻: %s\r\n\ +ユーザー: %s\r\n\ +コンピューター: %s\r\n\ +説明:\r\n%s" END STRINGTABLE BEGIN - IDS_NONE "None" - IDS_NOT_AVAILABLE "N/A" + IDS_NONE "なし" + IDS_NOT_AVAILABLE "利用不可" END

1 year, 11 months

[reactos] 01/01: [CHARMAP] BM_CLICK's wParam must be zero

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98b2451dfe31aa4b8b0f6… commit 98b2451dfe31aa4b8b0f6f985182a93ecc2879a0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 16 10:33:03 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 16 10:33:03 2023 +0900 [CHARMAP] BM_CLICK's wParam must be zero --- base/applications/charmap/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/charmap/settings.c b/base/applications/charmap/settings.c index 5a30f6d0943..ff1ea3100cc 100644 --- a/base/applications/charmap/settings.c +++ b/base/applications/charmap/settings.c @@ -93,7 +93,7 @@ extern void LoadSettings(void) lstatus = RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size); if (lstatus == ERROR_SUCCESS && type == REG_DWORD && dwAdvancedChecked != FALSE) { - SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0); + SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, 0, 0); } RegCloseKey(hKey);

1 year, 11 months

[reactos] 01/01: [COMCTL32][USER32] Button: Fix DLGC_... handling (#6168)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d55add359cc96b38ce4e9… commit d55add359cc96b38ce4e9ebf4eee845dfd64ba69 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 16 09:29:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 16 09:29:13 2023 +0900 [COMCTL32][USER32] Button: Fix DLGC_... handling (#6168) Based on KRosUser's button.patch. - Fix DLGC_... handling by using & operator in BUTTON_CheckAutoRadioButton in button.c. - Fix DLGC_... handling by using & operator in IsDialogMessageW in dialog.c. - BM_CLICK's wParam must be zero. CORE-17210 --- dll/win32/comctl32/button.c | 2 +- win32ss/user/user32/controls/button.c | 4 ++++ win32ss/user/user32/windows/dialog.c | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index 095515c2775..d187ca4f1f2 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -1667,7 +1667,7 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) { if (!sibling) break; #ifdef __REACTOS__ - if (SendMessageW( sibling, WM_GETDLGCODE, 0, 0 ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + if ((SendMessageW(sibling, WM_GETDLGCODE, 0, 0) & (DLGC_BUTTON | DLGC_RADIOBUTTON)) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) SendMessageW( sibling, BM_SETCHECK, sibling == hwnd ? BST_CHECKED : BST_UNCHECKED, 0 ); #else if ((hwnd != sibling) && diff --git a/win32ss/user/user32/controls/button.c b/win32ss/user/user32/controls/button.c index 69377a96b2d..7f220ed450a 100644 --- a/win32ss/user/user32/controls/button.c +++ b/win32ss/user/user32/controls/button.c @@ -1196,7 +1196,11 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) do { if (!sibling) break; +#ifdef __REACTOS__ + if ((SendMessageW(sibling, WM_GETDLGCODE, 0, 0) & (DLGC_BUTTON | DLGC_RADIOBUTTON)) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) +#else if (SendMessageW( sibling, WM_GETDLGCODE, 0, 0 ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) +#endif SendMessageW( sibling, BM_SETCHECK, sibling == hwnd ? BST_CHECKED : BST_UNCHECKED, 0 ); sibling = GetNextDlgGroupItem( parent, sibling, FALSE ); } while (sibling != start); diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 0fb12e55e28..784b43b9493 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -2628,12 +2628,14 @@ IsDialogMessageW( break; } - if (hwndNext && SendMessageW( hwndNext, WM_GETDLGCODE, lpMsg->wParam, (LPARAM)lpMsg ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + if (hwndNext && + ((SendMessageW(hwndNext, WM_GETDLGCODE, lpMsg->wParam, (LPARAM)lpMsg) & + (DLGC_BUTTON | DLGC_RADIOBUTTON)) == (DLGC_BUTTON | DLGC_RADIOBUTTON))) { SetFocus( hwndNext ); if ((GetWindowLongW( hwndNext, GWL_STYLE ) & BS_TYPEMASK) == BS_AUTORADIOBUTTON && SendMessageW( hwndNext, BM_GETCHECK, 0, 0 ) != BST_CHECKED) - SendMessageW( hwndNext, BM_CLICK, 1, 0 ); + SendMessageW(hwndNext, BM_CLICK, 0, 0); } else SendMessageW( hDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 );

1 year, 11 months

[reactos] 01/01: [REG] Update Romanian (ro-RO) translation (#6137)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ab2e5a28ae9666d5fd8d… commit 8ab2e5a28ae9666d5fd8d7af7f9626075155e163 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Dec 15 12:39:56 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 15 11:39:56 2023 +0100 [REG] Update Romanian (ro-RO) translation (#6137) --- base/applications/cmdutils/reg/lang/ro-RO.rc | 208 ++++++++++++++------------- 1 file changed, 106 insertions(+), 102 deletions(-) diff --git a/base/applications/cmdutils/reg/lang/ro-RO.rc b/base/applications/cmdutils/reg/lang/ro-RO.rc index d0972749ccf..e83e9388f26 100644 --- a/base/applications/cmdutils/reg/lang/ro-RO.rc +++ b/base/applications/cmdutils/reg/lang/ro-RO.rc @@ -1,100 +1,104 @@ /* - * Translators: Claudia Cotună - * Michael Stefaniuc - * Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Registry Console Tool + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2010 Claudia Cotună <special4ti(a)gmail.com> + * Copyright 2010 Michael Stefaniuc <mstefani(a)redhat.com> + * Copyright 2014-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Usage:\n\ - REG [operation] [parameters]\n\n\ -Supported operations:\n\ + STRING_USAGE, "Utilizare:\n\ + REG [operațiune] [parametri]\n\n\ +Operațiuni suportate:\n\ ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n\n\ -For help on a specific operation, type:\n\ - REG [operation] /?\n\n" +Pentru ajutor la o operațiune specifică, tastați:\n\ + REG [operațiune] /?\n\n" - STRING_ADD_USAGE, "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n\n\ - Adds a key to the registry or adds a new value to a given registry key.\n\n\ - <key>\n\ - The registry key to add or, if either [/v] or [/ve] is specified,\n\ - the key in which to add the new registry data.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_ADD_USAGE, "REG ADD <cheie> [/v numele_valorii | /ve] [/t tip] [/s separator] [/d date] [/f]\n\n\ + Adaugă o cheie la registru sau adaugă o valoare nouă la o cheie dată a registrului.\n\n\ + <cheie>\n\ + Cheia registrului de adăugat sau dacă e specificat fie [/v], fie [/ve],\n\ + cheia în care urmează să fie adăugate noile date de registru.\n\n\ + Format: ROOT\\Subcheie\n\n\ + ROOT: O cheie de registru predefinită. Aceasta trebuie să fie una dintre următoarele:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ - /v <value_name>\n\ - The name of the registry value to add.\n\n\ + Subcheie: Calea completă către o cheie de registru de sub o anumită cheie dată ROOT.\n\n\ + /v <numele_valorii>\n\ + Numele valorii registrului de adăugat.\n\n\ /ve\n\ - Add an unnamed registry value. This option modifies the (Default)\n\ - registry value.\n\n\ - /t <type>\n\ - The type of data to add to the registry. If [/t] is specified,\n\ - <type> must be one of the following:\n\n\ + Adaugă o valoare de registru fără nume. Această opțiune modifică valoarea\n\ + (Implicită) a registrului.\n\n\ + /t <tip>\n\ + Tipul de date ce urmează să fie adăugate în registru. Dacă [/t] e specificat,\n\ + <tip> trebuie să fie una din următoarele:\n\n\ REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n\ REG_DWORD | REG_BINARY | REG_NONE\n\n\ - If [/t] is not specified, the default data type is REG_SZ.\n\n\ + Dacă [/t] nu e specificat, tipul implicit de date este REG_SZ.\n\n\ /s <separator>\n\ - The character used to separate strings in REG_MULTI_SZ data.\n\ - If [/s] is not specified, the default separator is \\0.\n\n\ - /d <data>\n\ - The data to add to the new registry value.\n\n\ + Caracterul folosit ca să separe șiruri în datele REG_MULTI_SZ.\n\ + Dacă [/s] nu e specificat, separatorul implicit este \\0.\n\n\ + /d <date>\n\ + Datele ce urmează să fie adăugate la noua valoare a registrului.\n\n\ /f\n\ - Modify the registry without prompting for confirmation.\n\n" + Modifică regiștrul fără să fie cerută vreo confirmare.\n\n" - STRING_DELETE_USAGE, "REG DELETE <key> [/v value_name | /ve | /va] [/f]\n\n\ - Deletes a registry key (including all subkeys and values), or deletes\n\ - one or more values from a given registry key.\n\n\ - <key>\n\ - The registry key to delete or, if one of [/v], [/ve] or [/va] is\n\ - specified, the registry key in which to delete one or more values.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_DELETE_USAGE, "REG DELETE <cheie> [/v numele_valorii | /ve | /va] [/f]\n\n\ + Șterge o cheie de registru (incluzând toate subcheile și valorile) sau șterge\n\ + una sau mai multe valori dintr-o cheie de registru dată.\n\n\ + <cheie>\n\ + Cheia de registru ce urmează să fie ștearsă sau dacă una din [/v], [/ve] sau [/va] e\n\ + specificată, cheia de registru în care urmează să fie ștearsă/șterse una sau mai multe valori.\n\n\ + Format: ROOT\\Subcheie\n\n\ + ROOT: O cheie de registru predefinită. Aceasta trebuie să fie una dintre următoarele:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ + Subcheie: Calea completă a cheii de registru cu o cheie ROOT dată.\n\n\ /v <value_name>\n\ - The name of the registry value to delete.\n\n\ + Numele valorii de registru ce urmează să fie ștearsă\n\n\ /ve\n\ - Delete an unnamed registry value. This option deletes the (Default)\n\ - registry value.\n\n\ + Șterge o valoare de registru nedenumită. Această opțiune șterge\n\ + valoarea (Implicită) a registrului.\n\n\ /va\n\ - Delete all values from a registry key.\n\n\ + Șterge toate valorile dintr-o cheie de registru.\n\n\ /f\n\ - Delete a registry key (including all subkeys and values) without\n\ - prompting for confirmation.\n\n" + Șterge o cheie de registru (incluzând toate subcheile și valorile) fără\n\ + să necesite confirmare.\n\n" - STRING_QUERY_USAGE, "REG QUERY <key> [/v value_name | /ve] [/s]\n\n\ - Queries a specified registry key and lists all immediate subkeys, values\n\ - and data within that key. Use [/s] to recursively query each subkey.\n\n\ - <key>\n\ - The registry key to query.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_QUERY_USAGE, "REG QUERY <cheie> [/v numele_valorii | /ve] [/s]\n\n\ + Interoghează o cheie de registru specificată și listează toate subcheile, valorile și datele\n\ + ce urmează imediat în acea cheie. Folosiți [/s] pentru a interoga recursiv fiecare subcheie.\n\n\ + <cheie>\n\ + Cheia de registru de interogat.\n\n\ + Format: ROOT\\Subcheie\n\n\ + ROOT: O cheie de registru predefinită. Aceasta trebuie să aibă una dintre următoarele:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ - /v <value_name>\n\ - The name of the registry value to query. If neither [/v] nor [/ve] is\n\ - specified, all values under <key> are listed.\n\n\ + Subcheie: Calea completă către o cheie de registru de sub o anumită cheie dată ROOT.\n\n\ + /v <numele_valorii>\n\ + Numele valorii de registru ce urmează să fie interogată. Dacă nu se specifică nici [/v],\n\ + nici [/ve], toate valorile de sub <cheie> sunt listate.\n\n\ /ve\n\ - Query an unnamed registry value. This option queries the (Default)\n\ - registry value.\n\n\ + Interoghează o valoare de registru nedenumită. Această opțiune interoghează\n\ + valoarea (Implicită) a registrului.\n\n\ /s\n\ - List all registry entries under <key> and its subkeys.\n\n" + Listează toate intrările registrului de sub <cheie> și subcheile sale.\n\n" - STRING_SUCCESS, "Operația a fost îndeplinită cu succes\n" + STRING_SUCCESS, "Operațiunea a fost îndeplinită cu succes\n" STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n" STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comandă\n" STRING_NO_REMOTE, "Eroare: Nu pot fi adăugate chei într-un calculator la distanță\n" @@ -104,18 +108,18 @@ For help on a specific operation, type:\n\ STRING_MISSING_HEXDATA, "reg: Opțiunea [/d] trebuie să fie urmată de o valoare hexezecimală\n" STRING_UNHANDLED_TYPE, "reg: Tip de dată nerecunoscut [/t 0x%1!x!, /d %2]\n" STRING_OVERWRITE_VALUE, "Valoarea de registru «%1» deja există. Doriți s-o suprascrieți?" - STRING_YES, "Y" + STRING_YES, "D" STRING_NO, "N" - STRING_ALL, "A" - STRING_YESNO, " (Yes|No)" - STRING_YESNOALL, " (Yes|No|All)" - STRING_CANCELLED, "Operația de registru a fost anulată\n" + STRING_ALL, "T" + STRING_YESNO, " (Da|Nu)" + STRING_YESNOALL, " (Da|Nu|Toate)" + STRING_CANCELLED, "Operațiunea de registru a fost anulată\n" STRING_DEFAULT_VALUE, "(Implicită)" STRING_DELETE_VALUE, "Sigur doriți ștergerea valorii de registru «%1»?" STRING_DELETE_VALUEALL, "Sigur doriți ștergerea tuturor valorilor de registru din «%1»?" STRING_DELETE_SUBKEY, "Sigur doriți ștergerea cheii de registru «%1»?" STRING_INVALID_STRING, "reg: Opțiunea [/d] trebuie urmată de un șir valid\n" - STRING_VALUEALL_FAILED, "reg: Nu au putut fi șterse toate valorile de registru din «%1». A survenit o eroare neașteptată.\n" + STRING_VALUEALL_FAILED, "reg: Nu au putut fi șterse toate valorile de registru din «%1». A apărut o eroare neașteptată.\n" STRING_MATCHES_FOUND, "Căutare efectuată. Numărul de potriviri găsite: %1!d!\n" STRING_INVALID_SYNTAX, "reg: Sintaxă nerespectată. " STRING_INVALID_OPTION, "reg: Opțiune nevalidă [%1]. " @@ -123,65 +127,65 @@ For help on a specific operation, type:\n\ STRING_FUNC_HELP, "Tastați «REG %1 /?» pentru mai multe informații.\n" STRING_VALUE_NOT_SET, "(valoare nealocată)" - STRING_IMPORT_USAGE, "REG IMPORT <file>\n\n\ - Imports keys, values and data from a given file into the registry.\n\n\ - <file>\n\ - The name and path of the registry file to import.\n\n" + STRING_IMPORT_USAGE, "REG IMPORT <fișier>\n\n\ + Importă chei, valori și date dintr-un fișier dat în regiștri.\n\n\ + <fișier>\n\ + Numele și calea fișierului de regiștri de importat.\n\n" STRING_FILE_NOT_FOUND, "reg: Fișierul «%1» nu a putut fi găsit.\n" - STRING_ESCAPE_SEQUENCE, "reg: Secvența de sustracție [\\%1!c!] nu este recunoscută.\n" + STRING_ESCAPE_SEQUENCE, "reg: Secvența de ieșire [\\%1!c!] nu este recunoscută.\n" - STRING_EXPORT_USAGE, "REG EXPORT <key> <file> [/y]\n\n\ - Exports a specified registry key (including all subkeys and values)\n\ - to a file.\n\n\ - <key>\n\ - The registry key to export.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_EXPORT_USAGE, "REG EXPORT <cheie> <fișier> [/y]\n\n\ + Exportă o cheie de registru specificată (incluzând toate subcheile și valorile)\n\ + într-un fișier.\n\n\ + <cheie>\n\ + Cheia de registru ce urmează să fie exportată.\n\n\ + Format: ROOT\\Subcheie\n\n\ + ROOT: O cheie de registru predefinită. Aceasta trebuie să aibă una dintre următoarele:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ - <file>\n\ - The name and path of the registry file that will be created.\n\ - This file must have a .reg extension.\n\n\ + Subcheie: Calea completă către o cheie de registru de sub o anumită cheie dată ROOT.\n\n\ + <fișier>\n\ + Numele și calea fișierului de regiștri ce urmează să fie creat.\n\ + Fișierul trebuie să aibă extensia .reg.\n\n\ /y\n\ - Overwrite <file> without prompting for confirmation.\n\n" + Suprascrieți <fișierul> fără să se necesite confirmarea.\n\n" STRING_INVALID_SYSTEM_KEY, "reg: Cheia de sistem [%1] nu este una validă.\n" STRING_OVERWRITE_FILE, "Fișierul «%1» deja există. Doriți suprascrierea lui?" - STRING_KEY_NONEXIST, "reg: Unable to find the specified registry key\n" - STRING_KEY_IMPORT_FAILED, "reg: Unable to import the registry key '%1'\n" + STRING_KEY_NONEXIST, "reg: Nu a putut fi găsită cheia de registru specificată\n" + STRING_KEY_IMPORT_FAILED, "reg: Nu a putut fi importată cheia de registru '%1'\n" STRING_REG_VIEW_USAGE, " /reg:32\n\ - Access the registry using the 32-bit view.\n\n\ + Accesează regiștrii folosind vizualizatorul de 32 de biți.\n\n\ /reg:64\n\ - Access the registry using the 64-bit view.\n\n" - STRING_ACCESS_DENIED, "reg: Unable to access or create the specified registry key\n" + Accesează regiștrii folosind vizualizatorul de 64 de biți.\n\n" + STRING_ACCESS_DENIED, "reg: Cheia de registru specificată nu a putut fi accesată sau creată\n" - STRING_COPY_USAGE, "REG COPY <key1> <key2> [/s] [/f]\n\n\ - Copies the contents of a specified registry key to another location.\n\ - By default, this operation only copies registry values. Use [/s] to\n\ - recursively copy all subkeys and values.\n\n\ - <key1>, <key2>\n\ - Registry keys specifying the source (<key1>) and destination (<key2>)\n\ - of the data. If <key2> does not exist, it is created.\n\n\ - Format: ROOT\\Subkey\n\n\ - ROOT: A predefined registry key. This must be one of the following:\n\n\ + STRING_COPY_USAGE, "REG COPY <cheia1> <cheia2> [/s] [/f]\n\n\ + Copiază conținutul unei chei de registru specificată în altă locație.\n\ + Implicit, această operațiune copiază numai valorile de registru. Folosiți [/s] pentru\n\ + a copia în mod recursiv toate subcheile și valorile.\n\n\ + <cheia1>, <cheia2>\n\ + Cheile de registru care specifică sursa (<cheia1>) și destinația (<cheia2>)\n\ + a datelor. Dacă <cheia2> nu există, este creată.\n\n\ + Format: ROOT\\Subcheie\n\n\ + ROOT: O cheie de registru predefinită. Aceasta trebuie să aibă una dintre următoarele:\n\n\ HKEY_LOCAL_MACHINE | HKLM\n\ HKEY_CURRENT_USER | HKCU\n\ HKEY_CLASSES_ROOT | HKCR\n\ HKEY_USERS | HKU\n\ HKEY_CURRENT_CONFIG | HKCC\n\n\ - Subkey: The full path to a registry key under a given ROOT key.\n\n\ + Subcheie: Calea completă către o cheie de registru de sub o anumită cheie dată ROOT.\n\n\ /s\n\ - Copy all subkeys and values from <key1> to <key2>.\n\n\ + Copiază toate subcheile și valorile din <cheia1> în <cheia2>.\n\n\ /f\n\ - Overwrite all registry data in <key2> without prompting for confirmation.\n\ - This option does not modify subkeys and values that only exist in <key2>.\n\n" + Suprascrie toate datele registrului în <cheia2> fără să se necesite confirmare.\n\ + Această opțiune nu modifică subcheile și valorile ce există doar în <cheia2>.\n\n" - STRING_COPY_SRC_DEST_SAME, "reg: The source and destination keys cannot be the same\n" - STRING_COPY_CONFIRM, "The value '%1\\%2' already exists in the destination key. Do you want to overwrite it?" + STRING_COPY_SRC_DEST_SAME, "reg: Cheile sursă și destinație nu pot fi aceleași\n" + STRING_COPY_CONFIRM, "Valoarea '%1\\%2' există deja în cheia de destinație. Doriți să o suprascrieți?" }

1 year, 11 months

[reactos] 01/01: [HDWWIZ] Update Romanian (ro-RO) translation (#6080)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40f17bc9f26560295ad46… commit 40f17bc9f26560295ad46f76e287ea2ec6c49ad9 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Dec 15 12:38:38 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 15 11:38:38 2023 +0100 [HDWWIZ] Update Romanian (ro-RO) translation (#6080) --- dll/cpl/hdwwiz/lang/ro-RO.rc | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/dll/cpl/hdwwiz/lang/ro-RO.rc b/dll/cpl/hdwwiz/lang/ro-RO.rc index 71711116125..4aaa099b39b 100644 --- a/dll/cpl/hdwwiz/lang/ro-RO.rc +++ b/dll/cpl/hdwwiz/lang/ro-RO.rc @@ -11,13 +11,13 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_STARTPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bun venit la adăugarea de dispozitive", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Bun venit la Expertul de Adăugare de dispozitive", IDC_FINISHTITLE, 114, 8, 203, 24 LTEXT "Acest expert vă va ajuta la:", -1, 114, 40, 182, 8 - LTEXT "1) Instalarea software-ului aferente dispozitivelor pe care le adăugați calculatorului.", -1, 121, 56, 184, 16 - LTEXT "2) Depanarea problemelor pe care le-ați putea întâmpina la instalarea dispozitivelor.", -1, 121, 78, 185, 19 + LTEXT "1) Instalarea componentelor logice aferente dispozitivului pe care le adăugați calculatorului.", -1, 121, 56, 184, 16 + LTEXT "2) Depanarea problemelor pe care le-ați putea întâmpina la instalarea dispozitivului.", -1, 121, 78, 185, 19 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 LTEXT "În cazul în care dispozitivul este însoțit de un CD de instalare, este recomandată închiderea acestui expert și utilizarea CD-ului de instalare.", 503, 150, 106, 155, 50 LTEXT "Pentru a continua, apăsați „Înainte”.", -1, 114, 166, 193, 8 @@ -25,7 +25,7 @@ END IDD_SEARCHPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -34,7 +34,7 @@ END IDD_ISCONNECTEDPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Dispozitivul este conectat la calculator?", -1, 20, 11, 275, 8 @@ -44,49 +44,49 @@ END IDD_PROBELISTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Alegeți din lista de mai jos un dispozitiv instalat, apoi apăsați „Înainte” pentru a-i inspecta proprietățile sau pentru a depana o posibilă problemă.", -1, 21, 8, 275, 22 - LTEXT "Pentru a adăuga un dispozitiv neinclus în listă, alegeți „adaugă un nou dispozitiv”", -1, 21, 32, 275, 24 + LTEXT "Pentru a adăuga un dispozitiv neinclus în listă, alegeți „Adaugă un nou dispozitiv”", -1, 21, 32, 275, 24 LTEXT "&Dispozitive instalate:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Expertul poate încerca detectarea și instalarea automată a dispozitivelor. Altfel, dacă știți exact modelul dispozitivului, îl veți putea manual alege dintr-o listă.", -1, 21, 8, 280, 24 - LTEXT "Ce preferați să facă expertul?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "Să &caute și automat să instaleze driverul necesar (Recomandat)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + LTEXT "Asistentul poate încerca detectarea și instalarea automată a dispozitivului. Altfel, dacă știți exact modelul dispozitivului, îl veți putea manual alege dintr-o listă.", -1, 21, 8, 280, 24 + LTEXT "Ce preferați să facă asistentul?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "Să &caute și automat să instaleze driverului necesar (Recomandat)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "Să instaleze driverul pe care îl voi specifica &manual (Avansat)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "dispozitive detectate:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Dispozitive detectate:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Dacă nu regăsiți categoria pe care o căutați, specificați „afișează toate”.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "Dacă nu regăsiți categoria pe care o căutați, apăsați pe Afișează toate dispozitivele.", IDC_STATUSTEXT, 21, 9, 275, 18 LTEXT "Tip&uri obișnuite de dispozitive:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Căutarea dispozitivului poate dura câteva minute.", -1, 21, 8, 275, 15 @@ -98,18 +98,18 @@ END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Încheiere proces de instalare", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "Ați încheiat cu succes adăugarea dispozitivului.", -1, 114, 32, 193, 19 + LTEXT "Ați încheiat cu succes adăugarea dispozitivul.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 LTEXT "Pentru a închide fereastra expertului, apăsați „Sfârșit”.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Încheiere proces de instalare", IDC_FINISHTITLE, 114, 8, 203, 24 @@ -120,10 +120,10 @@ END IDD_HWSTATUSPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Încheire proces de instalare", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Încheiere proces de instalare", IDC_FINISHTITLE, 114, 8, 195, 28 LTEXT "Starea curentă a dispozitivului selectat:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP LTEXT "Pentru a porni un program de depanare pentru rezolvarea posibilelor probleme de instalare, apăsați „Sfârșit”.", -1, 114, 136, 193, 16 @@ -132,25 +132,25 @@ END IDD_NOTCONNECTEDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Expert de adăugare a dispozitivelor" +CAPTION "Expert de adăugare de dispozitive" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Adăugarea dispozitivelor nu poate continua", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "Pentru a continua, conectați dispozitivul la calculator.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "În&chide calculatorul când apăs „Sfârșit” pentru a putea deschide calculatorul și conecta dispozitivul.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "De obicei ReactOS poate instala dispozitive în mod automat, imediat după conectarea lor. Dacă ReactOS nu va detecta în mod automat noul dispozitiv, redeschideți acest expert de adăugare a dispozitivelor.", -1, 114, 98, 193, 32 + LTEXT "Adăugarea dispozitivului nu poate continua", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Pentru a continua, conectați dispozitivului la calculator.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "În&chide calculatorul când apăs „Sfârșit” pentru a putea deschide calculatorul și conecta hardware-ul.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "De obicei ReactOS poate instala dispozitive în mod automat, imediat după conectarea lor. Dacă ReactOS nu va detecta în mod automat noul dispozitiv, redeschideți acest expert de adăugare a dispozitivului.", -1, 114, 98, 193, 32 LTEXT "Pentru a închide acest expert, apăsați „Sfârșit”.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN - IDS_CPLNAME "Adăugare dispozitive" + IDS_CPLNAME "Adăugare de dispozitive" IDS_CPLDESCRIPTION "Adaugarea de dispozitive la calculator." - IDS_SEARCHTITLE "Așteptați căutarea de dispozitive…" - IDS_SEARCHTEXT "Expertul caută dispozitive recent conectate, care nu au fost încă instalate." + IDS_SEARCHTITLE "Poate dura ceva timp până când expertul caută…" + IDS_SEARCHTEXT "Asistentul caută dispozitive recent conectate, care nu au fost încă instalate." IDS_ISCONNECTED "Dispozitivul este conectat?" - IDS_PROBELISTTITLE "dispozitive deja instalate în calculator." - IDS_ADDNEWDEVICE "adăugă un nou dispozitiv" - IDS_SELECTWAYTITLE "Acest expert vă poate ajuta la instalarea noilor dispozitive." + IDS_PROBELISTTITLE "Următoarele dispozitive sunt deja instalate în calculator." + IDS_ADDNEWDEVICE "Adăugă un nou dispozitiv hardware" + IDS_SELECTWAYTITLE "Acest expert vă poate ajuta la instalarea altor dispozitive hardware." IDS_HDTYPESTITLE "Alegeți categoria dispozitivului pe care doriți să o instalați." END

1 year, 11 months

[reactos] 01/01: [SHIMGVW] Fix and improve zooming (#6167)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0179741d1a5aa67ee62a… commit f0179741d1a5aa67ee62a0f33b07962b63a5fad1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 15 15:16:50 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 15 15:16:50 2023 +0900 [SHIMGVW] Fix and improve zooming (#6167) - Add WC_ZOOM window class and use it for zooming. - Add ZoomWnd_OnDraw function and use it in ZoomWnd_OnPaint. - Use memory bitmap to reduce flickering. - Make rendering pixel-perfect. CORE-19220 --- dll/win32/shimgvw/shimgvw.c | 360 ++++++++++++++++++++++++-------------------- dll/win32/shimgvw/shimgvw.h | 1 + 2 files changed, 200 insertions(+), 161 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 17dfc369e38..c84314b1828 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -21,16 +21,16 @@ #define SLIDESHOW_TIMER_ID 0xFACE #define SLIDESHOW_TIMER_INTERVAL 5000 /* 5 seconds */ -HINSTANCE g_hInstance = NULL; -HWND g_hMainWnd = NULL; -HWND g_hwndFullscreen = NULL; -SHIMGVW_SETTINGS g_Settings; -SHIMGVW_FILENODE *g_pCurrentFile; -GpImage *g_pImage = NULL; +HINSTANCE g_hInstance = NULL; +HWND g_hMainWnd = NULL; +HWND g_hwndFullscreen = NULL; +SHIMGVW_FILENODE * g_pCurrentFile = NULL; +GpImage * g_pImage = NULL; +SHIMGVW_SETTINGS g_Settings; static const UINT s_ZoomSteps[] = { - 5, 10, 25, 50, 100, 125, 200, 300, 500, 1000 + 5, 10, 25, 50, 100, 200, 300, 500, 1000, 2000, 4000 }; #define MIN_ZOOM s_ZoomSteps[0] @@ -100,7 +100,6 @@ typedef struct tagPREVIEW_DATA HWND m_hwndZoom; HWND m_hwndToolBar; INT m_nZoomPercents; - WNDPROC m_fnPrevProc; ANIME m_Anime; /* Animation */ } PREVIEW_DATA, *PPREVIEW_DATA; @@ -116,30 +115,39 @@ Preview_IsMainWnd(HWND hwnd) return hwnd == g_hMainWnd; } +static VOID +Preview_RestartTimer(HWND hwnd) +{ + if (!Preview_IsMainWnd(hwnd)) + { + KillTimer(hwnd, SLIDESHOW_TIMER_ID); + SetTimer(hwnd, SLIDESHOW_TIMER_ID, SLIDESHOW_TIMER_INTERVAL, NULL); + } +} + static VOID Preview_UpdateZoom(PPREVIEW_DATA pData, UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) { BOOL bEnableZoomIn, bEnableZoomOut; HWND hToolBar = pData->m_hwndToolBar; - /* If zoom has not been changed, ignore it */ - if (pData->m_nZoomPercents == NewZoom) - return; - pData->m_nZoomPercents = NewZoom; /* Check if a zoom button of the toolbar must be grayed */ - bEnableZoomIn = (NewZoom < MAX_ZOOM); + bEnableZoomIn = (NewZoom < MAX_ZOOM); bEnableZoomOut = (NewZoom > MIN_ZOOM); /* Update toolbar buttons */ - SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_OUT, bEnableZoomOut); - SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_IN, bEnableZoomIn); - SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); - SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); + PostMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_OUT, bEnableZoomOut); + PostMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_IN, bEnableZoomIn); + PostMessageW(hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); + PostMessageW(hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); /* Redraw the display window */ - InvalidateRect(pData->m_hwndZoom, NULL, FALSE); + InvalidateRect(pData->m_hwndZoom, NULL, TRUE); + + /* Restart timer if necessary */ + Preview_RestartTimer(pData->m_hwnd); } static VOID @@ -389,8 +397,8 @@ static VOID Preview_UpdateUI(PPREVIEW_DATA pData) { BOOL bEnable = (g_pImage != NULL); - SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); - SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); + PostMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); + PostMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); if (!Preview_IsMainWnd(pData->m_hwnd)) Preview_ResetZoom(pData); @@ -530,7 +538,7 @@ pFreeFileList(SHIMGVW_FILENODE *root) } } -static HBRUSH CreateCheckerBoardBrush(HDC hdc) +static HBRUSH CreateCheckerBoardBrush(VOID) { static const CHAR pattern[] = "\x28\x00\x00\x00\x10\x00\x00\x00\x10\x00\x00\x00\x01\x00\x04\x00\x00\x00" @@ -551,59 +559,63 @@ static HBRUSH CreateCheckerBoardBrush(HDC hdc) } static VOID -ZoomWnd_OnPaint(PPREVIEW_DATA pData, HWND hwnd) +ZoomWnd_OnDraw( + PPREVIEW_DATA pData, + HDC hdc, + LPRECT prcPaint, + LPRECT prcClient) { GpGraphics *graphics; - INT ZoomedWidth, ZoomedHeight, x, y; - PAINTSTRUCT ps; - RECT rect, margin; - HDC hdc; + INT ZoomedWidth, ZoomedHeight; + RECT rect, rcClient = *prcClient; + HDC hdcMem; HBRUSH hBrush; HPEN hPen; - HGDIOBJ hbrOld, hPenOld, hFontOld; + HGDIOBJ hbrOld, hbmOld, hPenOld; UINT uFlags; + HBITMAP hbmMem; + SIZE paintSize = { prcPaint->right - prcPaint->left, prcPaint->bottom - prcPaint->top }; + COLORREF color0, color1; + GpImageAttributes *imageAttributes; - hdc = BeginPaint(hwnd, &ps); - if (!hdc) - { - DPRINT1("BeginPaint() failed\n"); - return; - } - - GdipCreateFromHDC(hdc, &graphics); - if (!graphics) - { - DPRINT1("GdipCreateFromHDC() failed\n"); - return; - } - - GetClientRect(hwnd, &rect); + /* We use a memory bitmap to reduce flickering */ + hdcMem = CreateCompatibleDC(hdc); + hbmMem = CreateCompatibleBitmap(hdc, paintSize.cx, paintSize.cy); + hbmOld = SelectObject(hdcMem, hbmMem); + /* Choose colors */ if (Preview_IsMainWnd(pData->m_hwnd)) { - hPen = (HPEN)GetStockObject(BLACK_PEN); - hBrush = (HBRUSH)GetStockObject(WHITE_BRUSH); - SetTextColor(hdc, RGB(0, 0, 0)); /* Black text */ + color0 = GetSysColor(COLOR_WINDOW); + color1 = GetSysColor(COLOR_WINDOWTEXT); } else { - hPen = (HPEN)GetStockObject(WHITE_PEN); - hBrush = (HBRUSH)GetStockObject(BLACK_BRUSH); - SetTextColor(hdc, RGB(255, 255, 255)); /* White text */ + color0 = RGB(0, 0, 0); + color1 = RGB(255, 255, 255); } + hBrush = CreateSolidBrush(color0); + SetBkColor(hdcMem, color0); + + hPen = CreatePen(PS_SOLID, 1, color1); + SetTextColor(hdcMem, color1); + + /* Fill background */ + SetRect(&rect, 0, 0, paintSize.cx, paintSize.cy); + FillRect(hdcMem, &rect, hBrush); + + DeleteObject(hBrush); + if (g_pImage == NULL) { WCHAR szText[128]; LoadStringW(g_hInstance, IDS_NOPREVIEW, szText, _countof(szText)); - FillRect(hdc, &rect, hBrush); - - hFontOld = SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); - SetBkMode(hdc, TRANSPARENT); - DrawTextW(hdc, szText, -1, &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER | - DT_NOPREFIX); - SelectObject(hdc, hFontOld); + SelectObject(hdcMem, GetStockFont(DEFAULT_GUI_FONT)); + OffsetRect(&rcClient, -prcPaint->left, -prcPaint->top); + DrawTextW(hdcMem, szText, -1, &rcClient, DT_SINGLELINE | DT_CENTER | DT_VCENTER | + DT_NOPREFIX); } else { @@ -612,34 +624,17 @@ ZoomWnd_OnPaint(PPREVIEW_DATA pData, HWND hwnd) GdipGetImageWidth(g_pImage, &ImageWidth); GdipGetImageHeight(g_pImage, &ImageHeight); - ZoomedWidth = (ImageWidth * pData->m_nZoomPercents) / 100; + ZoomedWidth = (ImageWidth * pData->m_nZoomPercents) / 100; ZoomedHeight = (ImageHeight * pData->m_nZoomPercents) / 100; - x = (rect.right - ZoomedWidth) / 2; - y = (rect.bottom - ZoomedHeight) / 2; - - // Fill top part - margin = rect; - margin.bottom = y - 1; - FillRect(hdc, &margin, hBrush); - // Fill bottom part - margin.top = y + ZoomedHeight + 1; - margin.bottom = rect.bottom; - FillRect(hdc, &margin, hBrush); - // Fill left part - margin.top = y - 1; - margin.bottom = y + ZoomedHeight + 1; - margin.right = x - 1; - FillRect(hdc, &margin, hBrush); - // Fill right part - margin.left = x + ZoomedWidth + 1; - margin.right = rect.right; - FillRect(hdc, &margin, hBrush); - - DPRINT("x = %d, y = %d, ImageWidth = %u, ImageHeight = %u\n"); - DPRINT("rect.right = %ld, rect.bottom = %ld\n", rect.right, rect.bottom); - DPRINT("m_nZoomPercents = %d, ZoomedWidth = %d, ZoomedHeight = %d\n", - pData->m_nZoomPercents, ZoomedWidth, ZoomedWidth); + GdipCreateFromHDC(hdcMem, &graphics); + if (!graphics) + { + DPRINT1("error: GdipCreateFromHDC\n"); + return; + } + + GdipGetImageFlags(g_pImage, &uFlags); if (pData->m_nZoomPercents % 100 == 0) { @@ -652,30 +647,61 @@ ZoomWnd_OnPaint(PPREVIEW_DATA pData, HWND hwnd) GdipSetSmoothingMode(graphics, SmoothingModeHighQuality); } - uFlags = 0; - GdipGetImageFlags(g_pImage, &uFlags); + rect.left = (rcClient.right - ZoomedWidth ) / 2; + rect.top = (rcClient.bottom - ZoomedHeight) / 2; + rect.right = rect.left + ZoomedWidth; + rect.bottom = rect.top + ZoomedHeight; + OffsetRect(&rect, -prcPaint->left, -prcPaint->top); - hPenOld = SelectObject(hdc, hPen); + InflateRect(&rect, +1, +1); /* Add Rectangle() pen width */ + + /* Draw a rectangle. Fill by checker board if necessary */ if (uFlags & (ImageFlagsHasAlpha | ImageFlagsHasTranslucent)) - { - HBRUSH hbr = CreateCheckerBoardBrush(hdc); - hbrOld = SelectObject(hdc, hbr); - Rectangle(hdc, x - 1, y - 1, x + ZoomedWidth + 1, y + ZoomedHeight + 1); - SelectObject(hdc, hbrOld); - DeleteObject(hbr); - } + hbrOld = SelectObject(hdcMem, CreateCheckerBoardBrush()); else - { - hbrOld = SelectObject(hdc, GetStockObject(NULL_BRUSH)); - Rectangle(hdc, x - 1, y - 1, x + ZoomedWidth + 1, y + ZoomedHeight + 1); - SelectObject(hdc, hbrOld); - } - SelectObject(hdc, hPenOld); + hbrOld = SelectObject(hdcMem, GetStockBrush(NULL_BRUSH)); + hPenOld = SelectObject(hdcMem, hPen); + Rectangle(hdcMem, rect.left, rect.top, rect.right, rect.bottom); + DeleteObject(SelectObject(hdcMem, hbrOld)); + DeleteObject(SelectObject(hdcMem, hPenOld)); + + InflateRect(&rect, -1, -1); /* Subtract Rectangle() pen width */ + + /* Image attributes are required to draw image correctly */ + GdipCreateImageAttributes(&imageAttributes); + GdipSetImageAttributesWrapMode(imageAttributes, WrapModeTile, + GetBkColor(hdcMem) | 0xFF000000, TRUE); + + /* Draw image. -0.5f is used for interpolation */ + GdipDrawImageRectRect(graphics, g_pImage, + rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + -0.5f, -0.5f, ImageWidth, ImageHeight, + UnitPixel, imageAttributes, NULL, NULL); + + GdipDisposeImageAttributes(imageAttributes); + GdipDeleteGraphics(graphics); + } - GdipDrawImageRectI(graphics, g_pImage, x, y, ZoomedWidth, ZoomedHeight); + BitBlt(hdc, prcPaint->left, prcPaint->top, paintSize.cx, paintSize.cy, hdcMem, 0, 0, SRCCOPY); + DeleteObject(SelectObject(hdcMem, hbmOld)); + DeleteDC(hdcMem); +} + +static VOID +ZoomWnd_OnPaint(PPREVIEW_DATA pData, HWND hwnd) +{ + PAINTSTRUCT ps; + HDC hDC; + RECT rcClient; + + hDC = BeginPaint(hwnd, &ps); + if (hDC) + { + GetClientRect(hwnd, &rcClient); + ZoomWnd_OnDraw(pData, hDC, &ps.rcPaint, &rcClient); + EndPaint(hwnd, &ps); } - GdipDeleteGraphics(graphics); - EndPaint(hwnd, &ps); } static VOID @@ -727,13 +753,12 @@ Preview_CreateToolBar(PPREVIEW_DATA pData) HWND hwndToolBar; HIMAGELIST hImageList, hOldImageList; DWORD style = WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS; - DWORD exstyle = 0; if (!Preview_IsMainWnd(pData->m_hwnd)) return TRUE; /* FIXME */ style |= CCS_BOTTOM; - hwndToolBar = CreateWindowExW(exstyle, TOOLBARCLASSNAMEW, NULL, style, + hwndToolBar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style, 0, 0, 0, 0, pData->m_hwnd, NULL, g_hInstance, NULL); if (!hwndToolBar) return FALSE; @@ -762,12 +787,39 @@ Preview_CreateToolBar(PPREVIEW_DATA pData) return TRUE; } +static VOID +Preview_EndSlideShow(HWND hwnd) +{ + if (Preview_IsMainWnd(hwnd)) + return; + + KillTimer(hwnd, SLIDESHOW_TIMER_ID); + ShowWindow(hwnd, SW_HIDE); + ShowWindow(g_hMainWnd, SW_SHOWNORMAL); + Preview_ResetZoom(Preview_GetData(g_hMainWnd)); +} + +static VOID +ZoomWnd_OnButtonDown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HWND hParent = GetParent(hwnd); + if (!Preview_IsMainWnd(hParent)) + Preview_EndSlideShow(hParent); +} + LRESULT CALLBACK ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PPREVIEW_DATA pData = Preview_GetData(hwnd); switch (uMsg) { + case WM_LBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_RBUTTONDOWN: + { + ZoomWnd_OnButtonDown(hwnd, uMsg, wParam, lParam); + break; + } case WM_PAINT: { ZoomWnd_OnPaint(pData, hwnd); @@ -781,7 +833,7 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } default: { - return CallWindowProcW(pData->m_fnPrevProc, hwnd, uMsg, wParam, lParam); + return DefWindowProcW(hwnd, uMsg, wParam, lParam); } } return 0; @@ -790,21 +842,29 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static BOOL Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) { + DWORD exstyle = 0; HWND hwndZoom; PPREVIEW_DATA pData = QuickAlloc(sizeof(PREVIEW_DATA), TRUE); pData->m_hwnd = hwnd; SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + DragAcceptFiles(hwnd, TRUE); + if (g_hMainWnd == NULL) + { g_hMainWnd = hwnd; + exstyle |= WS_EX_CLIENTEDGE; + } else if (g_hwndFullscreen == NULL) + { g_hwndFullscreen = hwnd; + } else + { return FALSE; + } - DragAcceptFiles(hwnd, TRUE); - - hwndZoom = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, NULL, WS_CHILD | WS_VISIBLE, + hwndZoom = CreateWindowExW(exstyle, WC_ZOOM, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); if (!hwndZoom) { @@ -814,10 +874,7 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) pData->m_hwndZoom = hwndZoom; SetWindowLongPtrW(hwndZoom, GWLP_USERDATA, (LONG_PTR)pData); - - SetClassLongPtr(pData->m_hwndZoom, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); - pData->m_fnPrevProc = (WNDPROC)SetWindowLongPtrW(pData->m_hwndZoom, - GWLP_WNDPROC, (LPARAM)ZoomWndProc); + Anime_SetTimerWnd(&pData->m_Anime, pData->m_hwndZoom); if (!Preview_CreateToolBar(pData)) { @@ -825,8 +882,6 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) return FALSE; } - Anime_SetTimerWnd(&pData->m_Anime, pData->m_hwndZoom); - if (pCS && pCS->lpCreateParams) { LPCWSTR pszFileName = (LPCWSTR)pCS->lpCreateParams; @@ -867,6 +922,7 @@ Preview_OnMoveSize(HWND hwnd) wp.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(hwnd, &wp); + /* Remember window position and size */ prc = &wp.rcNormalPosition; g_Settings.X = prc->left; g_Settings.Y = prc->top; @@ -906,18 +962,6 @@ Preview_OnSize(HWND hwnd) } } -static VOID -Preview_EndSlideShow(HWND hwnd) -{ - if (Preview_IsMainWnd(hwnd)) - return; - - KillTimer(hwnd, SLIDESHOW_TIMER_ID); - ShowWindow(hwnd, SW_HIDE); - ShowWindow(g_hMainWnd, SW_SHOWNORMAL); - Preview_ResetZoom(Preview_GetData(g_hMainWnd)); -} - static VOID Preview_Delete(PPREVIEW_DATA pData) { @@ -995,37 +1039,35 @@ Preview_Edit(HWND hwnd) } static VOID -Preview_StartSlideShow(PPREVIEW_DATA pData) +Preview_ToggleSlideShow(PPREVIEW_DATA pData) { - HWND hwnd = g_hwndFullscreen; - DWORD style = WS_POPUP | WS_CLIPSIBLINGS, exstyle = WS_EX_TOPMOST; - - ShowWindow(pData->m_hwnd, SW_HIDE); - - if (!IsWindow(hwnd)) + if (!IsWindow(g_hwndFullscreen)) { + DWORD style = WS_POPUP | WS_CLIPSIBLINGS, exstyle = WS_EX_TOPMOST; WCHAR szTitle[256]; LoadStringW(g_hInstance, IDS_APPTITLE, szTitle, _countof(szTitle)); - hwnd = CreateWindowExW(exstyle, WC_PREVIEW, szTitle, style, - 0, 0, 0, 0, NULL, NULL, g_hInstance, NULL); + g_hwndFullscreen = CreateWindowExW(exstyle, WC_PREVIEW, szTitle, style, + 0, 0, 0, 0, NULL, NULL, g_hInstance, NULL); } - ShowWindow(hwnd, SW_SHOWMAXIMIZED); - UpdateWindow(hwnd); - - SetTimer(hwnd, SLIDESHOW_TIMER_ID, SLIDESHOW_TIMER_INTERVAL, NULL); + if (IsWindowVisible(g_hwndFullscreen)) + { + ShowWindow(g_hwndFullscreen, SW_HIDE); + ShowWindow(g_hMainWnd, SW_SHOWNORMAL); + KillTimer(g_hwndFullscreen, SLIDESHOW_TIMER_ID); + } + else + { + ShowWindow(g_hMainWnd, SW_HIDE); + ShowWindow(g_hwndFullscreen, SW_SHOWMAXIMIZED); + Preview_RestartTimer(g_hwndFullscreen); + } } static VOID Preview_GoNextPic(PPREVIEW_DATA pData, BOOL bNext) { - HWND hwnd = pData->m_hwnd; - if (!Preview_IsMainWnd(hwnd)) - { - KillTimer(hwnd, SLIDESHOW_TIMER_ID); - SetTimer(hwnd, SLIDESHOW_TIMER_ID, SLIDESHOW_TIMER_INTERVAL, NULL); - } - + Preview_RestartTimer(pData->m_hwnd); if (g_pCurrentFile) { if (bNext) @@ -1061,10 +1103,7 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) break; case IDC_SLIDE_SHOW: - if (Preview_IsMainWnd(hwnd)) - Preview_StartSlideShow(pData); - else - Preview_EndSlideShow(hwnd); + Preview_ToggleSlideShow(pData); break; case IDC_ZOOM_IN: @@ -1162,7 +1201,6 @@ Preview_OnDestroy(HWND hwnd) Anime_FreeInfo(&pData->m_Anime); - SetWindowLongPtrW(pData->m_hwndZoom, GWLP_WNDPROC, (LPARAM)pData->m_fnPrevProc); SetWindowLongPtrW(pData->m_hwndZoom, GWLP_USERDATA, 0); DestroyWindow(pData->m_hwndZoom); pData->m_hwndZoom = NULL; @@ -1170,6 +1208,7 @@ Preview_OnDestroy(HWND hwnd) DestroyWindow(pData->m_hwndToolBar); pData->m_hwndToolBar = NULL; + SetWindowLongPtrW(pData->m_hwnd, GWLP_USERDATA, 0); QuickFree(pData); PostQuitMessage(0); @@ -1190,13 +1229,6 @@ Preview_OnDropFiles(HWND hwnd, HDROP hDrop) DragFinish(hDrop); } -static VOID -Preview_OnButtonDown(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - if (!Preview_IsMainWnd(hwnd)) - Preview_EndSlideShow(hwnd); -} - LRESULT CALLBACK PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1245,11 +1277,11 @@ PreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Preview_OnDropFiles(hwnd, (HDROP)wParam); break; } - case WM_LBUTTONDOWN: - case WM_MBUTTONDOWN: - case WM_RBUTTONDOWN: + case WM_SYSCOLORCHANGE: { - Preview_OnButtonDown(hwnd, uMsg, wParam, lParam); + PPREVIEW_DATA pData = Preview_GetData(hwnd); + InvalidateRect(pData->m_hwnd, NULL, TRUE); + InvalidateRect(pData->m_hwndZoom, NULL, TRUE); break; } case WM_DESTROY: @@ -1311,7 +1343,13 @@ ImageView_Main(HWND hwnd, LPCWSTR szFileName) WndClass.style = CS_HREDRAW | CS_VREDRAW; WndClass.hIcon = LoadIconW(g_hInstance, MAKEINTRESOURCEW(IDI_APP_ICON)); WndClass.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); - WndClass.hbrBackground = NULL; /* less flicker */ + WndClass.hbrBackground = (HBRUSH)UlongToHandle(COLOR_3DFACE + 1); + if (!RegisterClassW(&WndClass)) + return -1; + WndClass.lpszClassName = WC_ZOOM; + WndClass.lpfnWndProc = ZoomWndProc; + WndClass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + WndClass.hbrBackground = GetStockBrush(NULL_BRUSH); /* less flicker */ if (!RegisterClassW(&WndClass)) return -1; diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index cebbaea06b3..0506c2a6af2 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -49,6 +49,7 @@ typedef struct tagSHIMGVW_FILENODE } SHIMGVW_FILENODE; #define WC_PREVIEW L"ShImgVw:CPreviewWnd" +#define WC_ZOOM L"ShImgVw:CZoomWnd" /* Animation */ typedef struct tagANIME

1 year, 11 months

[reactos] 01/01: [USER32] GetNextDlgGroupItem(): Remove WineSync copy-pasta (#6162)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae534e8cee73c1b938c69… commit ae534e8cee73c1b938c69f129d455dd77bfc55f8 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Dec 14 15:41:58 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 14 14:41:58 2023 +0000 [USER32] GetNextDlgGroupItem(): Remove WineSync copy-pasta (#6162) Improve WineSync. Addendum to 61fb8a2 (r19831). --- win32ss/user/user32/windows/dialog.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 842aeb5b0a3..0fb12e55e28 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -2296,25 +2296,18 @@ GetNextDlgGroupItem( { if (!IsChild (hDlg, hCtl)) return 0; /* Make sure hwndCtrl is a top-level child */ - } else { /* No ctrl specified -> start from the beginning */ if (!(hCtl = GetWindow( hDlg, GW_CHILD ))) return 0; - /* MSDN is wrong. fPrevious does not result in the last child */ - - /* No ctrl specified -> start from the beginning */ - if (!(hCtl = GetWindow( hDlg, GW_CHILD ))) return 0; - - /* MSDN is wrong. fPrevious does not result in the last child */ + /* MSDN is wrong. bPrevious does not result in the last child */ /* Maybe that first one is valid. If so then we don't want to skip it*/ if ((GetWindowLongPtrW( hCtl, GWL_STYLE ) & (WS_VISIBLE|WS_DISABLED)) == WS_VISIBLE) { return hCtl; } - } /* Always go forward around the group and list of controls; for the

1 year, 11 months

[reactos] 01/01: [NTUSER] window.c: Don't use RETURN() macro (#6150)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f5fd1d09e1fe5f7a5319… commit 3f5fd1d09e1fe5f7a5319d78b9bfcc16a08eaf0b Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Thu Dec 14 21:36:38 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 14 14:36:38 2023 +0000 [NTUSER] window.c: Don't use RETURN() macro (#6150) --- win32ss/user/ntuser/window.c | 245 +++++++++++++++++++------------------------ 1 file changed, 110 insertions(+), 135 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 27881a1cdf9..9472a67af23 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -1168,7 +1168,7 @@ co_IntSetParent(PWND Wnd, PWND WndNewParent) if (Wnd == Wnd->head.rpdesk->spwndMessage) { EngSetLastError(ERROR_ACCESS_DENIED); - return( NULL); + return NULL; } /* Some applications try to set a child as a parent */ @@ -1300,14 +1300,14 @@ co_UserSetParent(HWND hWndChild, HWND hWndNewParent) if (IntIsBroadcastHwnd(hWndChild) || IntIsBroadcastHwnd(hWndNewParent)) { EngSetLastError(ERROR_INVALID_PARAMETER); - return( NULL); + return NULL; } if (hWndChild == IntGetDesktopWindow()) { ERR("UserSetParent Access Denied!\n"); EngSetLastError(ERROR_ACCESS_DENIED); - return( NULL); + return NULL; } if (hWndNewParent) @@ -1315,21 +1315,21 @@ co_UserSetParent(HWND hWndChild, HWND hWndNewParent) if (!(WndParent = UserGetWindowObject(hWndNewParent))) { ERR("UserSetParent Bad New Parent!\n"); - return( NULL); + return NULL; } } else { if (!(WndParent = UserGetWindowObject(IntGetDesktopWindow()))) { - return( NULL); + return NULL; } } if (!(Wnd = UserGetWindowObject(hWndChild))) { ERR("UserSetParent Bad Child!\n"); - return( NULL); + return NULL; } UserRefObjectCo(Wnd, &Ref); @@ -1346,7 +1346,7 @@ co_UserSetParent(HWND hWndChild, HWND hWndNewParent) UserDereferenceObject(WndOldParent); } - return( hWndOldParent); + return hWndOldParent; } /* Unlink the window from siblings. Children and parent are kept in place. */ @@ -3037,28 +3037,23 @@ BOOLEAN APIENTRY NtUserDestroyWindow(HWND Wnd) { PWND Window; - DECLARE_RETURN(BOOLEAN); - BOOLEAN ret; + BOOLEAN ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserDestroyWindow\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(Wnd))) + Window = UserGetWindowObject(Wnd); + if (Window) { - RETURN(FALSE); + UserRefObjectCo(Window, &Ref); // FIXME: Dunno if win should be reffed during destroy... + ret = co_UserDestroyWindow(Window); + UserDerefObjectCo(Window); // FIXME: Dunno if win should be reffed during destroy... } - UserRefObjectCo(Window, &Ref); // FIXME: Dunno if win should be reffed during destroy... - ret = co_UserDestroyWindow(Window); - UserDerefObjectCo(Window); // FIXME: Dunno if win should be reffed during destroy... - - RETURN(ret); - -CLEANUP: - TRACE("Leave NtUserDestroyWindow, ret=%u\n", _ret_); + TRACE("Leave NtUserDestroyWindow, ret=%u\n", ret); UserLeave(); - END_CLEANUP; + return ret; } @@ -3156,7 +3151,6 @@ NtUserFindWindowEx(HWND hwndParent, HWND Desktop, Ret = NULL; BOOL DoMessageWnd = FALSE; RTL_ATOM ClassAtom = (RTL_ATOM)0; - DECLARE_RETURN(HWND); TRACE("Enter NtUserFindWindowEx\n"); UserEnterShared(); @@ -3202,7 +3196,7 @@ NtUserFindWindowEx(HWND hwndParent, _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN(NULL)); + _SEH2_YIELD(goto Exit); } _SEH2_END; @@ -3212,12 +3206,12 @@ NtUserFindWindowEx(HWND hwndParent, !IS_ATOM(ClassName.Buffer)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN(NULL); + goto Exit; } else if (ClassAtom == (RTL_ATOM)0) { /* LastError code was set by IntGetAtomFromStringOrAtom */ - RETURN(NULL); + goto Exit; } } } @@ -3236,13 +3230,13 @@ NtUserFindWindowEx(HWND hwndParent, if(!(Parent = UserGetWindowObject(hwndParent))) { - RETURN( NULL); + goto Exit; } ChildAfter = NULL; if(hwndChildAfter && !(ChildAfter = UserGetWindowObject(hwndChildAfter))) { - RETURN( NULL); + goto Exit; } _SEH2_TRY @@ -3334,12 +3328,10 @@ NtUserFindWindowEx(HWND hwndParent, } _SEH2_END; - RETURN( Ret); - -CLEANUP: - TRACE("Leave NtUserFindWindowEx, ret %p\n", _ret_); +Exit: + TRACE("Leave NtUserFindWindowEx, ret %p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } @@ -3418,25 +3410,23 @@ HWND APIENTRY NtUserGetAncestor(HWND hWnd, UINT Type) { PWND Window, Ancestor; - DECLARE_RETURN(HWND); + HWND Ret = NULL; TRACE("Enter NtUserGetAncestor\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd))) + Window = UserGetWindowObject(hWnd); + if (Window) { - RETURN(NULL); - } + Ancestor = UserGetAncestor(Window, Type); + /* fixme: can UserGetAncestor ever return NULL for a valid window? */ - Ancestor = UserGetAncestor(Window, Type); - /* faxme: can UserGetAncestor ever return NULL for a valid window? */ - - RETURN(Ancestor ? Ancestor->head.h : NULL); + Ret = (Ancestor ? UserHMGetHandle(Ancestor) : NULL); + } -CLEANUP: - TRACE("Leave NtUserGetAncestor, ret=%p\n", _ret_); + TRACE("Leave NtUserGetAncestor, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } //// @@ -3483,14 +3473,14 @@ NtUserGetComboBoxInfo( PPROCESSINFO ppi; BOOL NotSameppi = FALSE; BOOL Ret = TRUE; - DECLARE_RETURN(BOOL); TRACE("Enter NtUserGetComboBoxInfo\n"); UserEnterShared(); if (!(Wnd = UserGetWindowObject(hWnd))) { - RETURN( FALSE ); + Ret = FALSE; + goto Exit; } _SEH2_TRY { @@ -3499,20 +3489,23 @@ NtUserGetComboBoxInfo( _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN(FALSE)); + Ret = FALSE; + _SEH2_YIELD(goto Exit); } _SEH2_END; if (pcbi->cbSize < sizeof(COMBOBOXINFO)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN(FALSE); + Ret = FALSE; + goto Exit; } // Pass the user pointer, it was already probed. if ((Wnd->pcls->atomClassName != gpsi->atomSysClass[ICLS_COMBOBOX]) && Wnd->fnid != FNID_COMBOBOX) { - RETURN( (BOOL) co_IntSendMessage( Wnd->head.h, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi)); + Ret = (BOOL)co_IntSendMessage(UserHMGetHandle(Wnd), CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi); + goto Exit; } ppi = PsGetCurrentProcessWin32Process(); @@ -3543,13 +3536,11 @@ NtUserGetComboBoxInfo( } _SEH2_END; - RETURN( Ret); - -CLEANUP: +Exit: if (NotSameppi) KeDetachProcess(); - TRACE("Leave NtUserGetComboBoxInfo, ret=%i\n",_ret_); + TRACE("Leave NtUserGetComboBoxInfo, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } //// @@ -3592,19 +3583,19 @@ NtUserGetListBoxInfo( PPROCESSINFO ppi; BOOL NotSameppi = FALSE; DWORD Ret = 0; - DECLARE_RETURN(DWORD); TRACE("Enter NtUserGetListBoxInfo\n"); UserEnterShared(); if (!(Wnd = UserGetWindowObject(hWnd))) { - RETURN( 0 ); + goto Exit; } if ((Wnd->pcls->atomClassName != gpsi->atomSysClass[ICLS_LISTBOX]) && Wnd->fnid != FNID_LISTBOX) { - RETURN( (DWORD) co_IntSendMessage( Wnd->head.h, LB_GETLISTBOXINFO, 0, 0 )); + Ret = (DWORD)co_IntSendMessage(UserHMGetHandle(Wnd), LB_GETLISTBOXINFO, 0, 0); + goto Exit; } // wine lisbox:test_GetListBoxInfo lb_getlistboxinfo = 0, should not send a message! @@ -3628,13 +3619,11 @@ NtUserGetListBoxInfo( } _SEH2_END; - RETURN( Ret); - -CLEANUP: +Exit: if (NotSameppi) KeDetachProcess(); - TRACE("Leave NtUserGetListBoxInfo, ret=%lu\n", _ret_); + TRACE("Leave NtUserGetListBoxInfo, ret=%lu\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -3657,7 +3646,7 @@ CLEANUP: HWND APIENTRY NtUserSetParent(HWND hWndChild, HWND hWndNewParent) { - DECLARE_RETURN(HWND); + HWND Ret; TRACE("Enter NtUserSetParent\n"); UserEnterExclusive(); @@ -3674,12 +3663,11 @@ NtUserSetParent(HWND hWndChild, HWND hWndNewParent) hWndNewParent = IntGetMessageWindow(); } - RETURN( co_UserSetParent(hWndChild, hWndNewParent)); + Ret = co_UserSetParent(hWndChild, hWndNewParent); -CLEANUP: - TRACE("Leave NtUserSetParent, ret=%p\n", _ret_); + TRACE("Leave NtUserSetParent, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -3704,13 +3692,13 @@ HWND FASTCALL UserGetShellWindow(VOID) if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - return( (HWND)0); + return NULL; } Ret = (HWND)WinStaObject->ShellWindow; ObDereferenceObject(WinStaObject); - return( Ret); + return Ret; } /* @@ -3727,7 +3715,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) { PWINSTATION_OBJECT WinStaObject; PWND WndShell, WndListView; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; USER_REFERENCE_ENTRY Ref; NTSTATUS Status; PTHREADINFO ti; @@ -3737,12 +3725,12 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) if (!(WndShell = UserGetWindowObject(hwndShell))) { - RETURN(FALSE); + goto Exit; } if (!(WndListView = UserGetWindowObject(hwndListView))) { - RETURN(FALSE); + goto Exit; } Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, @@ -3754,7 +3742,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); + goto Exit; } /* @@ -3763,7 +3751,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) if (WinStaObject->ShellWindow) { ObDereferenceObject(WinStaObject); - RETURN( FALSE); + goto Exit; } /* @@ -3782,14 +3770,14 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) if (WndListView->ExStyle & WS_EX_TOPMOST) { ObDereferenceObject(WinStaObject); - RETURN( FALSE); + goto Exit; } } if (WndShell->ExStyle & WS_EX_TOPMOST) { ObDereferenceObject(WinStaObject); - RETURN( FALSE); + goto Exit; } UserRefObjectCo(WndShell, &Ref); @@ -3813,12 +3801,12 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) UserDerefObjectCo(WndShell); ObDereferenceObject(WinStaObject); - RETURN( TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserSetShellWindowEx, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserSetShellWindowEx, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } // Fixes wine Win test_window_styles and todo tests... @@ -3843,7 +3831,7 @@ co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULO if (!(Window = UserGetWindowObject(hWnd))) { - return( 0); + return 0; } if ((INT)Index >= 0) @@ -3851,7 +3839,7 @@ co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULO if ((Index + Size) > Window->cbwndExtra) { EngSetLastError(ERROR_INVALID_INDEX); - return( 0); + return 0; } #ifdef _WIN64 @@ -3986,7 +3974,7 @@ co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULO Window->fnid & FNID_FREED) { EngSetLastError(ERROR_ACCESS_DENIED); - return( 0); + return 0; } OldValue = (LONG_PTR)IntSetWindowProc(Window, (WNDPROC)NewValue, @@ -4025,7 +4013,7 @@ co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULO } } - return( OldValue); + return OldValue; } LONG FASTCALL @@ -4131,7 +4119,7 @@ NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewValue) { PWND Window; WORD OldValue; - DECLARE_RETURN(WORD); + WORD Ret = 0; TRACE("Enter NtUserSetWindowWord\n"); UserEnterExclusive(); @@ -4139,12 +4127,12 @@ NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewValue) if (hWnd == IntGetDesktopWindow()) { EngSetLastError(STATUS_ACCESS_DENIED); - RETURN( 0); + goto Exit; } if (!(Window = UserGetWindowObject(hWnd))) { - RETURN( 0); + goto Exit; } switch (Index) @@ -4152,30 +4140,32 @@ NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewValue) case GWL_ID: case GWL_HINSTANCE: case GWL_HWNDPARENT: - RETURN( (WORD)co_UserSetWindowLong(UserHMGetHandle(Window), Index, (UINT)NewValue, TRUE)); + Ret = (WORD)co_UserSetWindowLong(UserHMGetHandle(Window), Index, (UINT)NewValue, TRUE); + goto Exit; + default: if (Index < 0) { EngSetLastError(ERROR_INVALID_INDEX); - RETURN( 0); + goto Exit; } } if ((ULONG)Index > (Window->cbwndExtra - sizeof(WORD))) { EngSetLastError(ERROR_INVALID_INDEX); - RETURN( 0); + goto Exit; } OldValue = *((WORD *)((PCHAR)(Window + 1) + Index)); *((WORD *)((PCHAR)(Window + 1) + Index)) = NewValue; - RETURN( OldValue); + Ret = OldValue; -CLEANUP: - TRACE("Leave NtUserSetWindowWord, ret=%u\n", _ret_); +Exit: + TRACE("Leave NtUserSetWindowWord, ret=%u\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -4202,17 +4192,16 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) #define GWLP_CONSOLE_LEADER_PID 0 #define GWLP_CONSOLE_LEADER_TID 4 - DWORD_PTR Result; + DWORD_PTR Result = 0; PWND pWnd, pwndActive; PTHREADINFO pti, ptiActive; - DECLARE_RETURN(UINT); TRACE("Enter NtUserQueryWindow\n"); UserEnterShared(); if (!(pWnd = UserGetWindowObject(hWnd))) { - RETURN( 0); + goto Exit; } switch(Index) @@ -4270,19 +4259,14 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) case QUERY_WINDOW_DEFAULT_IME: /* default IME window */ if (pWnd->head.pti->spwndDefaultIme) Result = (DWORD_PTR)UserHMGetHandle(pWnd->head.pti->spwndDefaultIme); - else - Result = 0; break; case QUERY_WINDOW_DEFAULT_ICONTEXT: /* default input context handle */ if (pWnd->head.pti->spDefaultImc) Result = (DWORD_PTR)UserHMGetHandle(pWnd->head.pti->spDefaultImc); - else - Result = 0; break; case QUERY_WINDOW_ACTIVE_IME: - Result = 0; if (gpqForeground && gpqForeground->spwndActive) { pwndActive = gpqForeground->spwndActive; @@ -4295,18 +4279,12 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) } } break; - - default: - Result = 0; - break; } - RETURN( Result); - -CLEANUP: - TRACE("Leave NtUserQueryWindow, ret=%u\n", _ret_); +Exit: + TRACE("Leave NtUserQueryWindow, ret=%u\n", Result); UserLeave(); - END_CLEANUP; + return Result; } /* @@ -4317,8 +4295,7 @@ NtUserRegisterWindowMessage(PUNICODE_STRING MessageNameUnsafe) { UNICODE_STRING SafeMessageName; NTSTATUS Status; - UINT Ret; - DECLARE_RETURN(UINT); + UINT Ret = 0; TRACE("Enter NtUserRegisterWindowMessage\n"); UserEnterExclusive(); @@ -4326,25 +4303,24 @@ NtUserRegisterWindowMessage(PUNICODE_STRING MessageNameUnsafe) if(MessageNameUnsafe == NULL) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( 0); + goto Exit; } Status = IntSafeCopyUnicodeStringTerminateNULL(&SafeMessageName, MessageNameUnsafe); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( 0); + goto Exit; } Ret = (UINT)IntAddAtom(SafeMessageName.Buffer); if (SafeMessageName.Buffer) ExFreePoolWithTag(SafeMessageName.Buffer, TAG_STRING); - RETURN( Ret); -CLEANUP: - TRACE("Leave NtUserRegisterWindowMessage, ret=%u\n", _ret_); +Exit: + TRACE("Leave NtUserRegisterWindowMessage, ret=%u\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -4355,20 +4331,20 @@ NtUserSetWindowFNID(HWND hWnd, WORD fnID) { PWND Wnd; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("Enter NtUserSetWindowFNID\n"); UserEnterExclusive(); if (!(Wnd = UserGetWindowObject(hWnd))) { - RETURN( FALSE); + goto Exit; } if (Wnd->head.pti->ppi != PsGetCurrentProcessWin32Process()) { EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( FALSE); + goto Exit; } // From user land we only set these. @@ -4379,17 +4355,17 @@ NtUserSetWindowFNID(HWND hWnd, Wnd->fnid != 0) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( FALSE); + goto Exit; } } Wnd->fnid |= fnID; - RETURN( TRUE); + Ret = TRUE; -CLEANUP: +Exit: TRACE("Leave NtUserSetWindowFNID\n"); UserLeave(); - END_CLEANUP; + return Ret; } BOOL APIENTRY @@ -4612,8 +4588,7 @@ NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) { PWND Wnd; NTSTATUS Status; - INT Result; - DECLARE_RETURN(INT); + INT Result = 0; TRACE("Enter NtUserInternalGetWindowText\n"); UserEnterShared(); @@ -4621,12 +4596,12 @@ NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) if(lpString && (nMaxCount <= 1)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( 0); + goto Exit; } if(!(Wnd = UserGetWindowObject(hWnd))) { - RETURN( 0); + goto Exit; } Result = Wnd->strName.Length / sizeof(WCHAR); @@ -4643,7 +4618,8 @@ NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( 0); + Result = 0; + goto Exit; } Buffer += Copy; } @@ -4652,18 +4628,17 @@ NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( 0); + Result = 0; + goto Exit; } Result = Copy; } - RETURN( Result); - -CLEANUP: - TRACE("Leave NtUserInternalGetWindowText, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserInternalGetWindowText, ret=%i\n", Result); UserLeave(); - END_CLEANUP; + return Result; } /*

1 year, 11 months

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