Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [USERENV] Improve Japanese translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f06516bc664c359c54da4… commit f06516bc664c359c54da41ab3cb5e89afb87ea56 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 28 13:44:50 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 28 13:44:50 2019 +0900 [USERENV] Improve Japanese translation --- dll/win32/userenv/lang/ja-JP.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/userenv/lang/ja-JP.rc b/dll/win32/userenv/lang/ja-JP.rc index 733e0716e24..d726075c611 100644 --- a/dll/win32/userenv/lang/ja-JP.rc +++ b/dll/win32/userenv/lang/ja-JP.rc @@ -5,13 +5,13 @@ BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" IDS_APPDATA "Application Data" IDS_DESKTOP "デスクトップ" - IDS_FAVORITES "Favorites" - IDS_MYDOCUMENTS "My Documents" + IDS_FAVORITES "お気に入り" + IDS_MYDOCUMENTS "マイドキュメント" IDS_NETHOOD "NetHood" IDS_PRINTHOOD "PrintHood" - IDS_RECENT "Recent" - IDS_SENDTO "SendTo" - IDS_TEMPLATES "Templates" + IDS_RECENT "最近使った項目" + IDS_SENDTO "送る" + IDS_TEMPLATES "テンプレート" IDS_STARTMENU "スタートメニュー" IDS_PROGRAMS "スタートメニュー\\プログラム" IDS_STARTUP "スタートメニュー\\プログラム\\スタートアップ"

5 years

[reactos] 01/01: [SHELL32] Add SendTo DeskLink (Retry) (#2099)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5538facfdd0edd11038f9… commit 5538facfdd0edd11038f9dd00bb4a6afec440403 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 27 20:09:19 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 27 20:09:19 2019 +0900 [SHELL32] Add SendTo DeskLink (Retry) (#2099) CORE-12562 --- dll/win32/shell32/lang/bg-BG.rc | 1 + dll/win32/shell32/lang/ca-ES.rc | 1 + dll/win32/shell32/lang/cs-CZ.rc | 1 + dll/win32/shell32/lang/da-DK.rc | 1 + dll/win32/shell32/lang/de-DE.rc | 1 + dll/win32/shell32/lang/el-GR.rc | 1 + dll/win32/shell32/lang/en-GB.rc | 1 + dll/win32/shell32/lang/en-US.rc | 1 + dll/win32/shell32/lang/es-ES.rc | 1 + dll/win32/shell32/lang/et-EE.rc | 1 + dll/win32/shell32/lang/fi-FI.rc | 1 + dll/win32/shell32/lang/fr-FR.rc | 1 + dll/win32/shell32/lang/he-IL.rc | 1 + dll/win32/shell32/lang/hi-IN.rc | 1 + dll/win32/shell32/lang/hu-HU.rc | 1 + dll/win32/shell32/lang/id-ID.rc | 1 + dll/win32/shell32/lang/it-IT.rc | 1 + dll/win32/shell32/lang/ja-JP.rc | 1 + dll/win32/shell32/lang/ko-KR.rc | 1 + dll/win32/shell32/lang/nl-NL.rc | 1 + dll/win32/shell32/lang/no-NO.rc | 1 + dll/win32/shell32/lang/pl-PL.rc | 1 + dll/win32/shell32/lang/pt-BR.rc | 1 + dll/win32/shell32/lang/pt-PT.rc | 1 + dll/win32/shell32/lang/ro-RO.rc | 1 + dll/win32/shell32/lang/ru-RU.rc | 1 + dll/win32/shell32/lang/sk-SK.rc | 1 + dll/win32/shell32/lang/sl-SI.rc | 1 + dll/win32/shell32/lang/sq-AL.rc | 1 + dll/win32/shell32/lang/sv-SE.rc | 1 + dll/win32/shell32/lang/tr-TR.rc | 1 + dll/win32/shell32/lang/uk-UA.rc | 1 + dll/win32/shell32/lang/zh-CN.rc | 1 + dll/win32/shell32/lang/zh-TW.rc | 1 + dll/win32/shell32/shresdef.h | 1 + dll/win32/shell32/wine/shellpath.c | 12 +++++++++++- 36 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 42d1fb138bf..9a9d63989bc 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -771,6 +771,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 5f01647f972..f442d13a2a4 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index c668b7b14d8..e593800de32 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -776,6 +776,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit" IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 30172aed75d..d9605986d8c 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -776,6 +776,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 1f6b2cc673d..0351e32a5c3 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -771,6 +771,7 @@ BEGIN IDS_EJECT "Auswerfen" IDS_DISCONNECT "Trennen" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 5196614198a..497dafe7ab5 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 5d4cf6bc4a9..b7c7f4517bc 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index f50562a6982..c13b373e50c 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 12e5e17d7d8..dac44bafc0a 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -778,6 +778,7 @@ BEGIN IDS_EJECT "Extraer" IDS_DISCONNECT "Desconectar" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "No se pudo crear la carpeta '%1'" IDS_CREATEFOLDER_CAPTION "No se pudo crear la carpeta" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 63b137c76df..1e376de4dcb 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -777,6 +777,7 @@ BEGIN IDS_EJECT "Väljuta" IDS_DISCONNECT "Katkesta ühendus" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Ei saa luua kausta '%1'" IDS_CREATEFOLDER_CAPTION "Ei saa kausta luua" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 5fc6ddfadf4..854d836a4e2 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index e5d0e25e44f..0d32521b8c0 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Éjecter" IDS_DISCONNECT "Déconnecter" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'" IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index e9e64d7eafe..603132672c2 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -772,6 +772,7 @@ BEGIN IDS_EJECT "הוצא" IDS_DISCONNECT "נתק" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 7e637bad1c5..8f359fb58d0 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "इजेक्ट" IDS_DISCONNECT "डिस्कनेक्ट" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "फ़ोल्डर '%1' बनाने में असमर्थ" IDS_CREATEFOLDER_CAPTION "फ़ोल्डर बनाने में असमर्थ" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 1c9f001830e..34857dfb04a 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index c9736262764..5aeb4d1ae99 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Keluarkan" IDS_DISCONNECT "Putuskan" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Tidak bisa membuat folder folder '%1'" IDS_CREATEFOLDER_CAPTION "Tidak bisa membuat folder" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 7a854349b50..da8b5cbb46e 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 9c2732f4a09..1c6ceba915f 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -767,6 +767,7 @@ BEGIN IDS_EJECT "取り出し" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 3b33cefd7fe..e22bff38c38 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index e7a697f12da..fc734cac927 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 51d999b495b..2b8662a8db1 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 7c0cc733c22..46ec68d8480 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -775,6 +775,7 @@ BEGIN IDS_EJECT "Wysuń" IDS_DISCONNECT "Odłącz" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Nie można utworzyć folderu '%1'" IDS_CREATEFOLDER_CAPTION "Nie można utworzyć folderu" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index c34ae71fc0d..26eaad64d1a 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 6560b089148..7e9d91f3ede 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Desligar" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Impossivel de criar pasta '%1'" IDS_CREATEFOLDER_CAPTION "Impossivel de criar pasta" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index a3dfce4391b..655ed748ee5 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -772,6 +772,7 @@ BEGIN IDS_EJECT "S&coate" IDS_DISCONNECT "Deconectea&ză" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Nu poate fi creat un dosar cu numele „%1”" IDS_CREATEFOLDER_CAPTION "Nu poate fi creat dosar" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 46b397572aa..19e432ddef6 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -777,6 +777,7 @@ BEGIN IDS_EJECT "Извлечь" IDS_DISCONNECT "Отсоединить" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'" IDS_CREATEFOLDER_CAPTION "Невозможно создать папку" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 01000ca3e98..26723a857e4 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 640f4cb7e5b..e4fba05e92a 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index fe6992e9834..e1cef58e5cb 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -774,6 +774,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 06749268ad7..ae0836d3bd4 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'" IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 88449402f00..946d1784f93 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -772,6 +772,7 @@ BEGIN IDS_EJECT "Eject" IDS_DISCONNECT "Disconnect" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED """%1"" dizini oluşturulamıyor." IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index faa2254e158..d8c5fd58361 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -770,6 +770,7 @@ BEGIN IDS_EJECT "Витягнути" IDS_DISCONNECT "Відключити" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "Не вдалося створити папку '%1'" IDS_CREATEFOLDER_CAPTION "Не вдалося створити папку" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index af8f3c41076..8f08b218125 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -778,6 +778,7 @@ BEGIN IDS_EJECT "弹出" IDS_DISCONNECT "断开" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "无法创建文件夹 '%1'" IDS_CREATEFOLDER_CAPTION "无法创建文件夹" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index a9cf8074ce1..ce149f33525 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -779,6 +779,7 @@ BEGIN IDS_EJECT "退出" IDS_DISCONNECT "中斷" IDS_OPENFILELOCATION "Open f&ile location" + IDS_DESKLINK "Desktop (Create shortcut)" IDS_CREATEFOLDER_DENIED "無法建立資料夾 '%1'" IDS_CREATEFOLDER_CAPTION "無法建立資料夾" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 3e425eac704..d80365f94a2 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -229,6 +229,7 @@ #define IDS_DISCONNECT 340 #define IDS_OPENFILELOCATION 341 +#define IDS_DESKLINK 342 #define IDS_MENU_EMPTY 34561 diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 99c78c8554d..1fe931f50e7 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -2200,7 +2200,9 @@ HRESULT DoCreateSendToFiles(LPCWSTR pszSendTo) WCHAR szSendToFile[MAX_PATH]; WCHAR szShell32[MAX_PATH]; HRESULT hr; + HANDLE hFile; + /* create my documents */ SHGetSpecialFolderPathW(NULL, szTarget, CSIDL_MYDOCUMENTS, TRUE); StringCbCopyW(szSendToFile, sizeof(szSendToFile), pszSendTo); @@ -2209,12 +2211,20 @@ HRESULT DoCreateSendToFiles(LPCWSTR pszSendTo) GetSystemDirectoryW(szShell32, ARRAY_SIZE(szShell32)); PathAppendW(szShell32, L"shell32.dll"); - hr = CreateShellLink(szSendToFile, szTarget, NULL, NULL, szShell32, -IDI_SHELL_MY_DOCUMENTS, NULL); if (FAILED_UNEXPECTEDLY(hr)) return hr; + /* create desklink */ + StringCbCopyW(szSendToFile, sizeof(szSendToFile), pszSendTo); + LoadStringW(shell32_hInstance, IDS_DESKLINK, szTarget, _countof(szTarget)); + StringCbCatW(szTarget, sizeof(szTarget), L".DeskLink"); + PathAppendW(szSendToFile, szTarget); + hFile = CreateFileW(szSendToFile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + CloseHandle(hFile); + return hr; }

5 years

[reactos] 01/01: [SENDMAIL][INCLUDE][INF] Add sendmail.dll for DeskLink (#2092)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=004e08383a056db81703f… commit 004e08383a056db81703f15fa0bb354685509e62 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 27 19:26:49 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 27 19:26:49 2019 +0900 [SENDMAIL][INCLUDE][INF] Add sendmail.dll for DeskLink (#2092) *.DeskLink file realizes SendTo Desktop (Create shortcut) in Windows. DeskLink is implemented in the sendmail.dll module. CORE-12562 --- dll/shellext/CMakeLists.txt | 1 + dll/shellext/sendmail/CDeskLinkDropHandler.cpp | 190 +++++++++++++++++++++++++ dll/shellext/sendmail/CDeskLinkDropHandler.hpp | 53 +++++++ dll/shellext/sendmail/CMakeLists.txt | 35 +++++ dll/shellext/sendmail/lang/en-US.rc | 6 + dll/shellext/sendmail/precomp.hpp | 40 ++++++ dll/shellext/sendmail/res/desklink.rgs | 24 ++++ dll/shellext/sendmail/resource.h | 14 ++ dll/shellext/sendmail/sendmail.cpp | 128 +++++++++++++++++ dll/shellext/sendmail/sendmail.rc | 23 +++ dll/shellext/sendmail/sendmail.spec | 4 + dll/shellext/sendmail/sendmail_version.h | 15 ++ dll/shellext/sendmail/sendmail_version.rc | 14 ++ media/inf/syssetup.inf | 1 + sdk/include/reactos/shlguid_undoc.h | 3 +- 15 files changed, 550 insertions(+), 1 deletion(-) diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index 89980c3f5fa..4baed6eb048 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -8,6 +8,7 @@ add_subdirectory(fontext) add_subdirectory(netplwiz) add_subdirectory(netshell) add_subdirectory(ntobjshex) +add_subdirectory(sendmail) add_subdirectory(shellbtrfs) add_subdirectory(stobject) add_subdirectory(zipfldr) diff --git a/dll/shellext/sendmail/CDeskLinkDropHandler.cpp b/dll/shellext/sendmail/CDeskLinkDropHandler.cpp new file mode 100644 index 00000000000..28f01a414a6 --- /dev/null +++ b/dll/shellext/sendmail/CDeskLinkDropHandler.cpp @@ -0,0 +1,190 @@ +/* + * PROJECT: sendmail + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: DeskLink implementation + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.hpp" + +WINE_DEFAULT_DEBUG_CHANNEL(sendmail); + +CDeskLinkDropHandler::CDeskLinkDropHandler() +{ + InterlockedIncrement(&g_ModuleRefCnt); +} + +CDeskLinkDropHandler::~CDeskLinkDropHandler() +{ + InterlockedDecrement(&g_ModuleRefCnt); +} + +// IDropTarget +STDMETHODIMP +CDeskLinkDropHandler::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, + POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + + *pdwEffect &= DROPEFFECT_LINK; + + return S_OK; +} + +STDMETHODIMP +CDeskLinkDropHandler::DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + + *pdwEffect &= DROPEFFECT_LINK; + + return S_OK; +} + +STDMETHODIMP CDeskLinkDropHandler::DragLeave() +{ + TRACE("(%p)\n", this); + return S_OK; +} + +STDMETHODIMP +CDeskLinkDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, + POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + + if (!pDataObject) + { + ERR("pDataObject is NULL\n"); + return E_POINTER; + } + + FORMATETC fmt; + fmt.cfFormat = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_HGLOBAL; + + WCHAR szDir[MAX_PATH], szDest[MAX_PATH], szSrc[MAX_PATH]; + SHGetSpecialFolderPathW(NULL, szDir, CSIDL_DESKTOPDIRECTORY, FALSE); + + CComPtr<IShellFolder> pDesktop; + HRESULT hr = SHGetDesktopFolder(&pDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + STGMEDIUM medium; + hr = pDataObject->GetData(&fmt, &medium); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + LPIDA pida = reinterpret_cast<LPIDA>(GlobalLock(medium.hGlobal)); + if (!pida) + { + ERR("Error locking global\n"); + ReleaseStgMedium(&medium); + return E_FAIL; + } + + LPBYTE pb = reinterpret_cast<LPBYTE>(pida); + LPCITEMIDLIST pidlParent = reinterpret_cast<LPCITEMIDLIST>(pb + pida->aoffset[0]); + for (UINT i = 1; i <= pida->cidl; ++i) + { + LPCITEMIDLIST pidlChild = reinterpret_cast<LPCITEMIDLIST>(pb + pida->aoffset[i]); + + CComHeapPtr<ITEMIDLIST> pidl(ILCombine(pidlParent, pidlChild)); + if (!pidl) + { + ERR("Out of memory\n"); + break; + } + + StringCbCopyW(szDest, sizeof(szDest), szDir); + if (SHGetPathFromIDListW(pidl, szSrc)) + { + CStringW strTitle; + strTitle.Format(IDS_SHORTCUT, PathFindFileNameW(szSrc)); + + PathAppendW(szDest, strTitle); + PathRemoveExtensionW(szDest); + StringCbCatW(szDest, sizeof(szDest), L".lnk"); + + hr = CreateShellLink(szDest, szSrc, NULL, NULL, NULL, NULL, -1, NULL); + } + else + { + STRRET strret; + hr = pDesktop->GetDisplayNameOf(pidl, SHGDN_INFOLDER, &strret); + if (FAILED_UNEXPECTEDLY(hr)) + break; + + hr = StrRetToBufW(&strret, pidl, szSrc, _countof(szSrc)); + if (FAILED_UNEXPECTEDLY(hr)) + break; + + CStringW strTitle; + strTitle.Format(IDS_SHORTCUT, szSrc); + + PathAppendW(szDest, strTitle); + PathRemoveExtensionW(szDest); + StringCbCatW(szDest, sizeof(szDest), L".lnk"); + + hr = CreateShellLink(szDest, NULL, pidl, NULL, NULL, NULL, -1, NULL); + } + + if (FAILED_UNEXPECTEDLY(hr)) + break; + } + + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); + + return hr; +} + +// IPersistFile +STDMETHODIMP CDeskLinkDropHandler::GetCurFile(LPOLESTR *ppszFileName) +{ + FIXME("(%p)\n", this); + return E_NOTIMPL; +} + +STDMETHODIMP CDeskLinkDropHandler::IsDirty() +{ + FIXME("(%p)\n", this); + return E_NOTIMPL; +} + +STDMETHODIMP CDeskLinkDropHandler::Load(LPCOLESTR pszFileName, DWORD dwMode) +{ + return S_OK; +} + +STDMETHODIMP CDeskLinkDropHandler::Save(LPCOLESTR pszFileName, BOOL fRemember) +{ + FIXME("(%p)\n", this); + return E_NOTIMPL; +} + +STDMETHODIMP CDeskLinkDropHandler::SaveCompleted(LPCOLESTR pszFileName) +{ + FIXME("(%p)\n", this); + return E_NOTIMPL; +} + +// IPersist +STDMETHODIMP CDeskLinkDropHandler::GetClassID(CLSID * lpClassId) +{ + TRACE("(%p)\n", this); + + if (!lpClassId) + { + ERR("lpClassId is NULL\n"); + return E_POINTER; + } + + *lpClassId = CLSID_DeskLinkDropHandler; + + return S_OK; +} diff --git a/dll/shellext/sendmail/CDeskLinkDropHandler.hpp b/dll/shellext/sendmail/CDeskLinkDropHandler.hpp new file mode 100644 index 00000000000..914f6ecdefb --- /dev/null +++ b/dll/shellext/sendmail/CDeskLinkDropHandler.hpp @@ -0,0 +1,53 @@ +/* + * PROJECT: sendmail + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: DeskLink implementation + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#ifndef _CDESKLINKDROPHANDLER_HPP_ +#define _CDESKLINKDROPHANDLER_HPP_ + +#include "resource.h" + +class CDeskLinkDropHandler : + public CComCoClass<CDeskLinkDropHandler, &CLSID_DeskLinkDropHandler>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDropTarget, + public IPersistFile +{ +public: + CDeskLinkDropHandler(); + ~CDeskLinkDropHandler(); + + // IDropTarget + STDMETHODIMP DragEnter(IDataObject *pDataObject, DWORD dwKeyState, + POINTL pt, DWORD *pdwEffect); + STDMETHODIMP DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + STDMETHODIMP DragLeave(); + STDMETHODIMP Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, + DWORD *pdwEffect); + + // IPersist + STDMETHODIMP GetClassID(CLSID *lpClassId); + + // IPersistFile + STDMETHODIMP GetCurFile(LPOLESTR *ppszFileName); + STDMETHODIMP IsDirty(); + STDMETHODIMP Load(LPCOLESTR pszFileName, DWORD dwMode); + STDMETHODIMP Save(LPCOLESTR pszFileName, BOOL fRemember); + STDMETHODIMP SaveCompleted(LPCOLESTR pszFileName); + + DECLARE_REGISTRY_RESOURCEID(IDR_DESKLINK) + DECLARE_NOT_AGGREGATABLE(CDeskLinkDropHandler) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CDeskLinkDropHandler) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + END_COM_MAP() +}; + +#endif /* _CDESKLINKDROPHANDLER_HPP_ */ diff --git a/dll/shellext/sendmail/CMakeLists.txt b/dll/shellext/sendmail/CMakeLists.txt new file mode 100644 index 00000000000..51128933c18 --- /dev/null +++ b/dll/shellext/sendmail/CMakeLists.txt @@ -0,0 +1,35 @@ +set_cpp(WITH_RUNTIME) +spec2def(sendmail.dll sendmail.spec) + +add_definitions( + -D_WINE + -D_ATL_NO_EXCEPTIONS) + +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() + +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/atl + ${REACTOS_SOURCE_DIR}) + +file(GLOB_RECURSE sendmail_rc_deps res/*.*) +add_rc_deps(sendmail.rc ${sendmail_rc_deps}) + +list(APPEND SOURCE + CDeskLinkDropHandler.cpp + sendmail.cpp + precomp.hpp) + +add_library(sendmail MODULE + ${SOURCE} + sendmail.rc + ${CMAKE_CURRENT_BINARY_DIR}/sendmail.def) + +set_module_type(sendmail win32dll UNICODE) +target_link_libraries(sendmail uuid wine) +add_delay_importlibs(sendmail ole32 oleaut32) +add_importlibs(sendmail advapi32 shell32 user32 comctl32 shlwapi msvcrt kernel32 ntdll) +add_pch(sendmail precomp.hpp SOURCE) +add_cd_file(TARGET sendmail DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/sendmail/lang/en-US.rc b/dll/shellext/sendmail/lang/en-US.rc new file mode 100644 index 00000000000..20ec90700cb --- /dev/null +++ b/dll/shellext/sendmail/lang/en-US.rc @@ -0,0 +1,6 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +{ + IDS_SHORTCUT, "Shortcut to %s" +} diff --git a/dll/shellext/sendmail/precomp.hpp b/dll/shellext/sendmail/precomp.hpp new file mode 100644 index 00000000000..6b50041cac4 --- /dev/null +++ b/dll/shellext/sendmail/precomp.hpp @@ -0,0 +1,40 @@ +/* + * PROJECT: sendmail + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: DeskLink implementation + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#define COBJMACROS +#define WIN32_NO_STATUS +#include <windows.h> +#include <shlwapi.h> +#include <shlobj.h> +#include <shobjidl.h> +#include <atlbase.h> +#include <atlcom.h> +#include <atlwin.h> +#include <atlstr.h> +#include <shlguid_undoc.h> +#include <shellapi.h> +#include <shellutils.h> +#include <strsafe.h> +#include <wine/debug.h> + +#include "CDeskLinkDropHandler.hpp" + +#include "sendmail_version.h" +#include "resource.h" + +extern LONG g_ModuleRefCnt; + +HRESULT +CreateShellLink( + LPCWSTR pszLinkPath, + LPCWSTR pszTargetPath OPTIONAL, + LPCITEMIDLIST pidlTarget OPTIONAL, + LPCWSTR pszArg OPTIONAL, + LPCWSTR pszDir OPTIONAL, + LPCWSTR pszIconPath OPTIONAL, + INT iIconNr OPTIONAL, + LPCWSTR pszComment OPTIONAL); diff --git a/dll/shellext/sendmail/res/desklink.rgs b/dll/shellext/sendmail/res/desklink.rgs new file mode 100644 index 00000000000..a23e4265f30 --- /dev/null +++ b/dll/shellext/sendmail/res/desklink.rgs @@ -0,0 +1,24 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {9E56BE61-C50F-11CF-9A2C-00A0C90A90CE} = s 'DeskLink' + { + val 'NeverShowExt' = s '' + DefaultIcon = e '%%SystemRoot%%\explorer.exe,-103' + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + 'shellex' + { + 'DropHandler' = s '{9E56BE61-C50F-11CF-9A2C-00A0C90A90CE}' + { + } + } + } + } + ForceRemove .DeskLink = s 'CLSID\{9E56BE61-C50F-11CF-9A2C-00A0C90A90CE}' + { + } +} diff --git a/dll/shellext/sendmail/resource.h b/dll/shellext/sendmail/resource.h new file mode 100644 index 00000000000..72b69650f76 --- /dev/null +++ b/dll/shellext/sendmail/resource.h @@ -0,0 +1,14 @@ +/* + * PROJECT: sendmail + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: DeskLink implementation + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#ifndef RESOURCE_H_ +#define RESOURCE_H_ + +#define IDR_DESKLINK 100 +#define IDS_SHORTCUT 1000 + +#endif diff --git a/dll/shellext/sendmail/sendmail.cpp b/dll/shellext/sendmail/sendmail.cpp new file mode 100644 index 00000000000..6cdaae92032 --- /dev/null +++ b/dll/shellext/sendmail/sendmail.cpp @@ -0,0 +1,128 @@ +/* + * PROJECT: sendmail + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: DeskLink implementation + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.hpp" + +WINE_DEFAULT_DEBUG_CHANNEL(sendmail); + +BEGIN_OBJECT_MAP(ObjectMap) + OBJECT_ENTRY(CLSID_DeskLinkDropHandler, CDeskLinkDropHandler) +END_OBJECT_MAP() + +CComModule gModule; +LONG g_ModuleRefCnt = 0; + +STDAPI DllCanUnloadNow(void) +{ + if (g_ModuleRefCnt) + return S_FALSE; + return gModule.DllCanUnloadNow(); +} + +STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + TRACE("CLSID:%s,IID:%s\n", wine_dbgstr_guid(&rclsid), wine_dbgstr_guid(&riid)); + + HRESULT hr = gModule.DllGetClassObject(rclsid, riid, ppv); + + TRACE("-- pointer to class factory: %p\n", *ppv); + + return hr; +} + +STDAPI DllRegisterServer(void) +{ + HRESULT hr = gModule.DllRegisterServer(FALSE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +STDAPI DllUnregisterServer(void) +{ + HRESULT hr = gModule.DllUnregisterServer(FALSE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +HRESULT +CreateShellLink( + LPCWSTR pszLinkPath, + LPCWSTR pszTargetPath OPTIONAL, + LPCITEMIDLIST pidlTarget OPTIONAL, + LPCWSTR pszArg OPTIONAL, + LPCWSTR pszDir OPTIONAL, + LPCWSTR pszIconPath OPTIONAL, + INT iIconNr OPTIONAL, + LPCWSTR pszComment OPTIONAL) +{ + CComPtr<IShellLinkW> psl; + HRESULT hr = CoCreateInstance(CLSID_ShellLink, NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellLinkW, &psl)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (pszTargetPath) + { + hr = psl->SetPath(pszTargetPath); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } + else if (pidlTarget) + { + hr = psl->SetIDList(pidlTarget); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } + else + { + ERR("invalid argument\n"); + return E_INVALIDARG; + } + + if (pszArg) + hr = psl->SetArguments(pszArg); + + if (pszDir) + hr = psl->SetWorkingDirectory(pszDir); + + if (pszIconPath) + hr = psl->SetIconLocation(pszIconPath, iIconNr); + + if (pszComment) + hr = psl->SetDescription(pszComment); + + CComPtr<IPersistFile> ppf; + hr = psl->QueryInterface(IID_PPV_ARG(IPersistFile, &ppf)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = ppf->Save(pszLinkPath, TRUE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return hr; +} + +STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) +{ + TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); + if (dwReason == DLL_PROCESS_ATTACH) + { + gModule.Init(ObjectMap, hInstance, NULL); + DisableThreadLibraryCalls(hInstance); + } + else if (dwReason == DLL_PROCESS_DETACH) + { + gModule.Term(); + } + return TRUE; +} diff --git a/dll/shellext/sendmail/sendmail.rc b/dll/shellext/sendmail/sendmail.rc new file mode 100644 index 00000000000..8b4d4f7eb38 --- /dev/null +++ b/dll/shellext/sendmail/sendmail.rc @@ -0,0 +1,23 @@ +/* + * PROJECT: sendmail + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: DeskLink implementation + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include <windef.h> +#include <winuser.h> +#include "resource.h" + +#include "sendmail_version.rc" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDR_DESKLINK REGISTRY "res/desklink.rgs" + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/dll/shellext/sendmail/sendmail.spec b/dll/shellext/sendmail/sendmail.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dll/shellext/sendmail/sendmail.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dll/shellext/sendmail/sendmail_version.h b/dll/shellext/sendmail/sendmail_version.h new file mode 100644 index 00000000000..01d5dbfec4f --- /dev/null +++ b/dll/shellext/sendmail/sendmail_version.h @@ -0,0 +1,15 @@ +/* + * PROJECT: sendmail + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: DeskLink implementation + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#pragma once + +#define WINE_FILEVERSION_MAJOR 6 +#define WINE_FILEVERSION_MINOR 0 +#define WINE_FILEVERSION_BUILD 3790 +#define WINE_FILEVERSION_PLATFORMID 3959 + +#define WINE_FILEVERSION_STR "6.0.3790.3959" diff --git a/dll/shellext/sendmail/sendmail_version.rc b/dll/shellext/sendmail/sendmail_version.rc new file mode 100644 index 00000000000..d625edf6ee7 --- /dev/null +++ b/dll/shellext/sendmail/sendmail_version.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: sendmail + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: DeskLink implementation + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "sendmail_version.h" + +#define WINE_OLESELFREGISTER +#define WINE_FILEVERSION WINE_FILEVERSION_MAJOR,WINE_FILEVERSION_MINOR,WINE_FILEVERSION_BUILD,WINE_FILEVERSION_PLATFORMID +#define WINE_FILENAME_STR "sendmail.dll" + +#include <wine/wine_common_ver.rc> diff --git a/media/inf/syssetup.inf b/media/inf/syssetup.inf index ead39397203..d70d83c7d13 100644 --- a/media/inf/syssetup.inf +++ b/media/inf/syssetup.inf @@ -102,6 +102,7 @@ AddReg=Classes 11,,rsabase.dll,1 11,,rsaenh.dll,1 11,,scrrun.dll,1 +11,,sendmail.dll,1 11,,shdocvw.dll,3 11,,shell32.dll,3 11,,softpub.dll,1 diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h index 07b2c5f36f3..7360ab57460 100644 --- a/sdk/include/reactos/shlguid_undoc.h +++ b/sdk/include/reactos/shlguid_undoc.h @@ -110,7 +110,8 @@ DEFINE_GUID(CLSID_ShellFileDefExt, 0x21B22460, 0x3AEA, 0x1069, 0xA2, 0xD DEFINE_GUID(CLSID_ShellDrvDefExt, 0x5F5295E0, 0x429F, 0x1069, 0xA2, 0xE2, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_ShellNetDefExt, 0x86422020, 0x42A0, 0x1069, 0xA2, 0xE5, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); -DEFINE_GUID(CLSID_ExeDropHandler, 0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); +DEFINE_GUID(CLSID_ExeDropHandler, 0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); +DEFINE_GUID(CLSID_DeskLinkDropHandler, 0x9E56BE61, 0xC50F, 0x11CF, 0x9A, 0x2C, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xCE); DEFINE_GUID(CLSID_MergedFolder, 0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E); DEFINE_GUID(IID_IAugmentedShellFolder, 0x91EA3F8C, 0xC99B, 0x11D0, 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72);

5 years

[reactos] 01/01: [SHELL32] Disable all controls during format and re-enable after format is complete. (#2098)

by Jared Smudde

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30e0c2430dfdfc3673aa6… commit 30e0c2430dfdfc3673aa626fe32ff8fc27dc7352 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Wed Nov 27 02:18:50 2019 -0600 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Wed Nov 27 09:18:50 2019 +0100 [SHELL32] Disable all controls during format and re-enable after format is complete. (#2098) --- dll/win32/shell32/dialogs/drive.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp index 674e81cb21b..60243d44a02 100644 --- a/dll/win32/shell32/dialogs/drive.cpp +++ b/dll/win32/shell32/dialogs/drive.cpp @@ -591,17 +591,27 @@ static unsigned __stdcall DoFormatDrive(void *args) HWND hwndDlg = pParams->hwndDlg; PFORMAT_DRIVE_CONTEXT pContext = pParams->pContext; + /* Disable controls during format */ HMENU hSysMenu = GetSystemMenu(hwndDlg, FALSE); EnableMenuItem(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_GRAYED); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); + EnableWindow(GetDlgItem(hwndDlg, 28673), FALSE); EnableWindow(GetDlgItem(hwndDlg, 28677), FALSE); + EnableWindow(GetDlgItem(hwndDlg, 28680), FALSE); + EnableWindow(GetDlgItem(hwndDlg, 28679), FALSE); + EnableWindow(GetDlgItem(hwndDlg, 28674), FALSE); FormatDrive(hwndDlg, pContext); + /* Re-enable controls after format */ EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), TRUE); + EnableWindow(GetDlgItem(hwndDlg, 28673), TRUE); EnableWindow(GetDlgItem(hwndDlg, 28677), TRUE); + EnableWindow(GetDlgItem(hwndDlg, 28680), TRUE); + EnableWindow(GetDlgItem(hwndDlg, 28679), TRUE); + EnableWindow(GetDlgItem(hwndDlg, 28674), TRUE); EnableMenuItem(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_ENABLED); pContext->bFormattingNow = FALSE;

5 years

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Latin and Punctuation) No.33

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b938a35bdf5a68773cf4… commit 0b938a35bdf5a68773cf425ba1f002426358667d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 27 16:51:58 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 27 16:53:05 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Latin and Punctuation) No.33 Tahoma Bold. Version 0.019 khmz. 13px COMMERCIAL AT. 13px LATIN CAPITAL LETTER V. 13px LATIN CAPITAL LETTER W. 13px LATIN CAPITAL LETTER W WITH CIRCUMFLEX. 13px LATIN SMALL LETTER V. 13px LATIN SMALL LETTER W. 13px LATIN SMALL LETTER W WITH CIRCUMFLEX. 13px LATIN SMALL LETTER ETH. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 145612 -> 145608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 6fe9d5c973f..418248f3da6 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

5 years

[reactos] 01/01: [DEVMGR] m_DisplayName: Some functions need bytes, not chars

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c82d16b1489a87d5d2a8… commit 9c82d16b1489a87d5d2a82cd5a9754b04b7b2dcd Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Nov 20 22:13:48 2019 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Wed Nov 27 10:22:46 2019 +0300 [DEVMGR] m_DisplayName: Some functions need bytes, not chars Also: Always use explicit _countof() and sizeof(). Add a missing 'Size' re-init. --- dll/win32/devmgr/devmgmt/ClassNode.cpp | 7 ++++--- dll/win32/devmgr/devmgmt/DeviceNode.cpp | 4 ++-- dll/win32/devmgr/devmgmt/Node.cpp | 2 +- dll/win32/devmgr/devmgmt/RootNode.cpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/ClassNode.cpp b/dll/win32/devmgr/devmgmt/ClassNode.cpp index f5d58b9a60a..bba78cf13e6 100644 --- a/dll/win32/devmgr/devmgmt/ClassNode.cpp +++ b/dll/win32/devmgr/devmgmt/ClassNode.cpp @@ -42,10 +42,10 @@ CClassNode::SetupNode() 0); if (hKey != INVALID_HANDLE_VALUE) { - Size = DISPLAY_NAME_LEN; Type = REG_SZ; // Lookup the class description (win7+) + Size = sizeof(m_DisplayName); Success = RegQueryValueExW(hKey, L"ClassDesc", NULL, @@ -58,12 +58,13 @@ CClassNode::SetupNode() if (m_DisplayName[0] == L'@') { // The description is located in a module resource - Success = ConvertResourceDescriptorToString(m_DisplayName, DISPLAY_NAME_LEN); + Success = ConvertResourceDescriptorToString(m_DisplayName, sizeof(m_DisplayName)); } } else if (Success == ERROR_FILE_NOT_FOUND) { // WinXP stores the description in the default value + Size = sizeof(m_DisplayName); Success = RegQueryValueExW(hKey, NULL, NULL, @@ -84,7 +85,7 @@ CClassNode::SetupNode() if (Success != ERROR_SUCCESS) { // Use the class name as the description - RequiredSize = DISPLAY_NAME_LEN; + RequiredSize = _countof(m_DisplayName); (VOID)SetupDiClassNameFromGuidW(&m_ClassGuid, m_DisplayName, RequiredSize, diff --git a/dll/win32/devmgr/devmgmt/DeviceNode.cpp b/dll/win32/devmgr/devmgmt/DeviceNode.cpp index 1ec1b8c1a5e..905fc61e759 100644 --- a/dll/win32/devmgr/devmgmt/DeviceNode.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceNode.cpp @@ -131,7 +131,7 @@ CDeviceNode::SetupNode() &m_ClassImage); // Get the description for the device - ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR); + ulLength = sizeof(m_DisplayName); cr = CM_Get_DevNode_Registry_PropertyW(m_DevInst, CM_DRP_FRIENDLYNAME, NULL, @@ -140,7 +140,7 @@ CDeviceNode::SetupNode() 0); if (cr != CR_SUCCESS) { - ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR); + ulLength = sizeof(m_DisplayName); cr = CM_Get_DevNode_Registry_PropertyW(m_DevInst, CM_DRP_DEVICEDESC, NULL, diff --git a/dll/win32/devmgr/devmgmt/Node.cpp b/dll/win32/devmgr/devmgmt/Node.cpp index 6e7d761894a..0d5e3e1eb29 100644 --- a/dll/win32/devmgr/devmgmt/Node.cpp +++ b/dll/win32/devmgr/devmgmt/Node.cpp @@ -32,7 +32,7 @@ CNode::CNode(const CNode &Node) m_DeviceId = Node.m_DeviceId; m_ClassImage = Node.m_ClassImage; - StringCbCopyW(m_DisplayName, DISPLAY_NAME_LEN, Node.m_DisplayName); + StringCbCopyW(m_DisplayName, sizeof(m_DisplayName), Node.m_DisplayName); CopyMemory(&m_ClassGuid, &Node.m_ClassGuid, sizeof(GUID)); } diff --git a/dll/win32/devmgr/devmgmt/RootNode.cpp b/dll/win32/devmgr/devmgmt/RootNode.cpp index 4892343672c..841001f0985 100644 --- a/dll/win32/devmgr/devmgmt/RootNode.cpp +++ b/dll/win32/devmgr/devmgmt/RootNode.cpp @@ -52,7 +52,7 @@ CRootNode::SetupNode() } // The root name is the computer name - DWORD Size = DISPLAY_NAME_LEN; + DWORD Size = _countof(m_DisplayName); GetComputerNameW(m_DisplayName, &Size); return true;

5 years

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Punctuations) No.32

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3da02701239ecc5e0c82… commit c3da02701239ecc5e0c829c151e4034e6e7f533c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 27 16:15:09 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 27 16:15:09 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Punctuations) No.32 Tahoma Bold. Version 0.018 khmz. NUMBER SIGN. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 145612 -> 145612 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 9156c6e1d36..6fe9d5c973f 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

5 years

[reactos] 01/01: [CABMAN] Fix 2 handle leaks, in case of error (#2044)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5b10b4d0d857bdd2af9e… commit f5b10b4d0d857bdd2af9e09257b2b7e56f51709c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Nov 27 01:49:08 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 27 01:49:08 2019 +0100 [CABMAN] Fix 2 handle leaks, in case of error (#2044) CORE-11090 --- sdk/tools/cabman/cabinet.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 39400498c19..64888daea2b 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -414,6 +414,7 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) if (CabinetReservedFileSize == (ULONG)-1) { DPRINT(MIN_TRACE, ("Cannot read from cabinet reserved file.\n")); + fclose(FileHandle); return false; } @@ -1761,6 +1762,7 @@ bool CCabinet::CreateSimpleCabinet() if(Status != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot add file to cabinet (%u).\n", (UINT)Status)); + FindClose(hFind); goto cleanup; } }

5 years

[reactos] 01/01: [SETUPAPI] profile_items_callback(): Check LinkName (#2049)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c741b1c185def384fb432… commit c741b1c185def384fb432710960b6c486e58c597 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Nov 27 01:48:32 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 27 01:48:32 2019 +0100 [SETUPAPI] profile_items_callback(): Check LinkName (#2049) CORE-11612 --- dll/win32/setupapi/install.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/install.c b/dll/win32/setupapi/install.c index 9527ad32067..f8c4b53e46c 100644 --- a/dll/win32/setupapi/install.c +++ b/dll/win32/setupapi/install.c @@ -1110,8 +1110,11 @@ profile_items_callback( if (FullLinkName[wcslen(FullLinkName) - 1] != '\\') wcscat(FullLinkName, BackSlash); } - wcscat(FullLinkName, LinkName); - wcscat(FullLinkName, DotLnk); + if (LinkName) + { + wcscat(FullLinkName, LinkName); + wcscat(FullLinkName, DotLnk); + } hr = IPersistFile_Save(ppf, FullLinkName, TRUE); } else

5 years

[reactos] 01/01: [TRANSLATION] Update Indonesian translation (#2037)

by Mas4hmad

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d1ce7c35c9b881544639… commit 9d1ce7c35c9b881544639890942839bb05c00e83 Author: Mas4hmad <45534607+Mas4hmad(a)users.noreply.github.com> AuthorDate: Wed Nov 27 07:40:51 2019 +0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 27 01:40:51 2019 +0100 [TRANSLATION] Update Indonesian translation (#2037) Update Indonesian translation for AVIFILE, CLIPBRD and USERENV. --- base/applications/clipbrd/clipbrd.rc | 3 ++ base/applications/clipbrd/lang/id-ID.rc | 65 +++++++++++++++++++++++++++++++++ dll/win32/avifil32/lang/avifile_Id.rc | 51 ++++++++++++++++++++++++++ dll/win32/avifil32/rsrc.rc | 3 ++ dll/win32/userenv/lang/id-ID.rc | 32 ++++++++-------- 5 files changed, 138 insertions(+), 16 deletions(-) diff --git a/base/applications/clipbrd/clipbrd.rc b/base/applications/clipbrd/clipbrd.rc index 192246002b9..554d8d873ac 100644 --- a/base/applications/clipbrd/clipbrd.rc +++ b/base/applications/clipbrd/clipbrd.rc @@ -44,6 +44,9 @@ CLPFILE_ICON ICON "res/clpfile.ico" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_ID_ID + #include "lang/id-ID.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/base/applications/clipbrd/lang/id-ID.rc b/base/applications/clipbrd/lang/id-ID.rc new file mode 100644 index 00000000000..5c92116fa4d --- /dev/null +++ b/base/applications/clipbrd/lang/id-ID.rc @@ -0,0 +1,65 @@ +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + VK_DELETE, CMD_DELETE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "Be&rkas" + BEGIN + MENUITEM "&Buka...", CMD_OPEN + MENUITEM "&Simpan Sebagai...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Keluar", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Hapus\tDel", CMD_DELETE + END + POPUP "&Tampilan" + BEGIN + MENUITEM "&otomatis", CMD_AUTOMATIC + END + POPUP "&Bantuan" + BEGIN + MENUITEM "Topik &Bantuan", CMD_HELP + MENUITEM SEPARATOR + MENUITEM "&Tentang", CMD_ABOUT + END +END + +STRINGTABLE +BEGIN + STRING_CLIPBOARD "Penampil Papan Klip" + STRING_CLIPFILE "Elemen Papan Klip" + STRING_DELETE_MSG "Bersihkan isi papan klip?" + STRING_DELETE_TITLE "Bersihkan papan klip" + STRING_FORMAT_NT "Berkas papan klip untuk ReactOS (*.clp)" + STRING_FORMAT_GEN "Berkas papan klip (*.clp)" +END + +STRINGTABLE +BEGIN + STRING_CF_UNKNOWN "Format Tidak Diketahui" + STRING_CF_TEXT "Teks" + STRING_CF_BITMAP "Bitmap" + STRING_CF_OEMTEXT "Teks OEM" + STRING_CF_UNICODETEXT "Teks Unicode" + STRING_CF_DIB "Bitmap DIB" + STRING_CF_LOCALE "Data Lokal" + STRING_CF_ENHMETAFILE "Meta-berkas yang Ditingkatkan" + STRING_CF_METAFILEPICT "Meta-berkas" + STRING_CF_PALETTE "Palet Warna" + STRING_CF_DIBV5 "Bitmap DIB (Versi 5)" + STRING_CF_SYLK "Format Tautan Simbolik" + STRING_CF_DIF "Format Pertukaran Data" + STRING_CF_HDROP "Data yang Ditaruh" +END + +STRINGTABLE +BEGIN + ERROR_UNSUPPORTED_FORMAT "The Clipboard contains data in a format, sehingga tidak bisa ditampilkan." + ERROR_INVALID_FILE_FORMAT "Berkas yang dipilih bukan berkas papan klip yang sah." +END diff --git a/dll/win32/avifil32/lang/avifile_Id.rc b/dll/win32/avifil32/lang/avifile_Id.rc new file mode 100644 index 00000000000..277457756b1 --- /dev/null +++ b/dll/win32/avifil32/lang/avifile_Id.rc @@ -0,0 +1,51 @@ +/* + * Top level resource file for avifil32.dll + * + * Copyright 2002 Michael Günnewig + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_WAVESTREAMFORMAT "Waveform: %s" + IDS_WAVEFILETYPE "Waveform" + IDS_ALLMULTIMEDIA "Semua berkas multimedia" + IDS_ALLFILES "Semua berkas (*.*)" + IDS_VIDEO "video" + IDS_AUDIO "audio" + IDS_AVIFILETYPE "Wine AVI-default-filehandler" + IDS_UNCOMPRESSED "tidak dikompres" +} + +IDD_SAVEOPTIONS DIALOGEX 43, 37, 226, 82 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Opsi pengompresan" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Pilih Jalur:",-1,5,5,154,10 + COMBOBOX IDC_STREAM,5,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Opsi...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "&Sisip&kan setiap",IDC_INTERLEAVE,5,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "frame",-1,129,43,36,9 + LTEXT "Format saat ini:",-1,5,56,73,9 + LTEXT "",IDC_FORMATTEXT,80,56,88,26 + DEFPUSHBUTTON "OK",IDOK,170,42,50,14 + PUSHBUTTON "Batal",IDCANCEL,170,61,50,14 +END diff --git a/dll/win32/avifil32/rsrc.rc b/dll/win32/avifil32/rsrc.rc index b829739a8ea..a4f283bc23b 100644 --- a/dll/win32/avifil32/rsrc.rc +++ b/dll/win32/avifil32/rsrc.rc @@ -75,6 +75,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_HU_HU #include "lang/avifile_Hu.rc" #endif +#ifdef LANGUAGE_ID_ID + #include "lang/avifile_Id.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/avifile_It.rc" #endif diff --git a/dll/win32/userenv/lang/id-ID.rc b/dll/win32/userenv/lang/id-ID.rc index 4b13abecdb8..2a0653eed2a 100644 --- a/dll/win32/userenv/lang/id-ID.rc +++ b/dll/win32/userenv/lang/id-ID.rc @@ -2,23 +2,23 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" - IDS_APPDATA "Application Data" + IDS_PROFILEPATH "%SystemDrive%\\Dokumen dan Setelan" + IDS_APPDATA "Data Aplikasi" IDS_DESKTOP "Desktop" - IDS_FAVORITES "Favorites" - IDS_MYDOCUMENTS "My Documents" + IDS_FAVORITES "Favorit" + IDS_MYDOCUMENTS "Dokumen Saya" IDS_NETHOOD "NetHood" IDS_PRINTHOOD "PrintHood" - IDS_RECENT "Recent" - IDS_SENDTO "SendTo" - IDS_TEMPLATES "Templates" - IDS_STARTMENU "Start Menu" - IDS_PROGRAMS "Start Menu\\Programs" - IDS_STARTUP "Start Menu\\Programs\\Startup" - IDS_LOCALSETTINGS "Local Settings" - IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" - IDS_CACHE "Local Settings\\Temporary Internet Files" - IDS_HISTORY "Local Settings\\History" - IDS_COOKIES "Cookies" + IDS_RECENT "Baru-baru Ini" + IDS_SENDTO "Kirim Ke" + IDS_TEMPLATES "Template" + IDS_STARTMENU "Menu Mulai" + IDS_PROGRAMS "Menu Mulai\\Program" + IDS_STARTUP "Menu Mulai\\Program\\StartUp" + IDS_LOCALSETTINGS "Setelan Lokal" + IDS_LOCALAPPDATA "Setelan Lokal\\Data Aplikasi" + IDS_TEMP "Setelan Lokal\\Temp" + IDS_CACHE "Setelan Lokal\\Berkas Internet Sementara" + IDS_HISTORY "Setelan Lokal\\Riwayat" + IDS_COOKIES "Kuki" END

5 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019