Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1e2c3f70e10b3fcc3e31… commit f1e2c3f70e10b3fcc3e3189c27e39f85cc4716aa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 13 17:33:57 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 13 17:33:57 2020 +0900 [MSPAINT] Improve Japanese (ja-JP) translation 3 --- base/applications/mspaint/lang/ja-JP.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index b529cf365c1..1d86c2bb915 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -76,7 +76,7 @@ BEGIN POPUP "画像(&I)" BEGIN MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "伸縮/ゆがめる(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "伸縮/傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "切り取り(&C)", IDM_IMAGECROP MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "画像の属性(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -167,7 +167,7 @@ END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "MS UI Gothic" -CAPTION "画像を伸縮またはゆがめる" +CAPTION "画像の伸縮と傾斜" BEGIN GROUPBOX "伸縮", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 @@ -178,7 +178,7 @@ BEGIN LTEXT "垂直方向:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "ゆがめる", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "傾斜", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 LTEXT "水平方向:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12

4 years

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b88717f5c4a110be2575a… commit b88717f5c4a110be2575a274559772d2a8a676f6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 13 17:15:05 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 13 17:15:05 2020 +0900 [MSPAINT] Improve Japanese (ja-JP) translation 2 --- base/applications/mspaint/lang/ja-JP.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index e4dea8e3d2d..b529cf365c1 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -149,9 +149,9 @@ BEGIN LTEXT "ファイルの日付(&D):", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "ファイルのサイズ(&S):", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 LTEXT "解像度(&R):", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "利用不可能", IDD_ATTRIBUTESTEXT6, 75, 5, 90, 10 - LTEXT "利用不可能", IDD_ATTRIBUTESTEXT7, 75, 15, 90, 10 - LTEXT "利用不可能", IDD_ATTRIBUTESTEXT8, 75, 25, 90, 10 + LTEXT "利用不可", IDD_ATTRIBUTESTEXT6, 75, 5, 90, 10 + LTEXT "利用不可", IDD_ATTRIBUTESTEXT7, 75, 15, 90, 10 + LTEXT "利用不可", IDD_ATTRIBUTESTEXT8, 75, 25, 90, 10 GROUPBOX "単位", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 AUTORADIOBUTTON "インチ(&I)", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 @@ -167,7 +167,7 @@ END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "MS UI Gothic" -CAPTION "伸縮またはゆがめる" +CAPTION "画像を伸縮またはゆがめる" BEGIN GROUPBOX "伸縮", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 @@ -197,7 +197,7 @@ BEGIN IDS_WINDOWTITLE "%s - ペイント" IDS_INFOTITLE "ReactOS ペイント" IDS_INFOTEXT "GNU Lesser General Public License (LGPL, 詳細は www.gnu.org) の下で利用可能です。" - IDS_SAVEPROMPTTEXT "%s の変更内容を保存しますか?" + IDS_SAVEPROMPTTEXT "%s の変更内容を保存しますか？" IDS_DEFAULTFILENAME "無題.bmp" IDS_MINIATURETITLE "縮小図" IDS_TOOLTIP1 "自由選択"

4 years

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e2ede3bd8658b39670e4… commit 6e2ede3bd8658b39670e4a2c275621d77d2687ea Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 13 17:15:57 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 13 17:16:12 2020 +0900 [NTOBJSHEX] Improve Japanese (ja-JP) translation --- dll/shellext/ntobjshex/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/ntobjshex/lang/ja-JP.rc b/dll/shellext/ntobjshex/lang/ja-JP.rc index 8d4b6700401..a7c1c36374d 100644 --- a/dll/shellext/ntobjshex/lang/ja-JP.rc +++ b/dll/shellext/ntobjshex/lang/ja-JP.rc @@ -4,6 +4,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "NT オブジェクト名前空間" IDS_REGISTRY_NAME "システムレジストリ" - IDS_NTOBJFLD_COMMENT "NT オブジェクト名前空間の閲覧を可能にする" - IDS_REGISTRY_COMMENT "システムレジストリの閲覧を可能にする" + IDS_NTOBJFLD_COMMENT "NT オブジェクト名前空間の閲覧を可能にします" + IDS_REGISTRY_COMMENT "システムレジストリの閲覧を可能にします" END

4 years

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd7ad59a486d51087f863… commit bd7ad59a486d51087f8635c169bc27b8bbc85776 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 13 17:01:49 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 13 17:01:49 2020 +0900 [MSPAINT] Improve Japanese (ja-JP) translation --- base/applications/mspaint/lang/ja-JP.rc | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index f5487657376..e4dea8e3d2d 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -17,19 +17,19 @@ BEGIN MENUITEM "上書き保存(&S)\tCtrl+S", IDM_FILESAVE MENUITEM "名前を付けて保存(&A)...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "From Scanner or Camera...", IDM_FILEFROMSCANNERORCAMERA + MENUITEM "スキャナまたはカメラから...", IDM_FILEFROMSCANNERORCAMERA MENUITEM SEPARATOR - MENUITEM "Page View", IDM_FILEPAGEVIEW - MENUITEM "Page Setup...", IDM_FILEPAGESETUP - MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT + MENUITEM "ページビュー", IDM_FILEPAGEVIEW + MENUITEM "ページ設定...", IDM_FILEPAGESETUP + MENUITEM "印刷...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Send...", IDM_FILESEND + MENUITEM "送信...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "背景に設定 (並べて表示)", IDM_FILEASWALLPAPERPLANE MENUITEM "背景に設定 (中央に表示)", IDM_FILEASWALLPAPERCENTERED MENUITEM "背景に設定 (拡大)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR - MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED + MENUITEM "最近使ったファイル", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED MENUITEM SEPARATOR MENUITEM "ペイントの終了(&Q)\tAlt+F4", IDM_FILEEXIT END @@ -76,7 +76,7 @@ BEGIN POPUP "画像(&I)" BEGIN MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "伸縮/ゆがめる(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "切り取り(&C)", IDM_IMAGECROP MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "画像の属性(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -87,10 +87,10 @@ BEGIN BEGIN MENUITEM "パレットの編集(&E)", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR - MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE - MENUITEM "Old palette", IDM_COLORSOLDPALETTE + MENUITEM "モダンなパレット", IDM_COLORSMODERNPALETTE + MENUITEM "古いパレット", IDM_COLORSOLDPALETTE END - POPUP "&Help" + POPUP "ヘルプ(&H)" BEGIN MENUITEM "ヘルプトピック(&H)", IDM_HELPHELPTOPICS MENUITEM SEPARATOR @@ -167,9 +167,9 @@ END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "MS UI Gothic" -CAPTION "Stretch and skew image" +CAPTION "伸縮またはゆがめる" BEGIN - GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 + GROUPBOX "伸縮", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 LTEXT "水平方向:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 @@ -178,15 +178,15 @@ BEGIN LTEXT "垂直方向:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "ゆがめる", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 LTEXT "水平方向:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + LTEXT "度", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 LTEXT "垂直方向:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + LTEXT "度", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "キャンセル", IDCANCEL, 170, 24, 48, 14 END @@ -217,12 +217,12 @@ BEGIN IDS_TOOLTIP15 "楕円" IDS_TOOLTIP16 "角丸四角形" IDS_ALLFILES "すべてのファイル" - IDS_ALLPICTUREFILES "All Picture Files" + IDS_ALLPICTUREFILES "すべての画像ファイル" IDS_FILESIZE "%d バイト" IDS_PRINTRES "%d x %d ピクセル/メートル" - IDS_INTNUMBERS "Please enter integral numbers only!" - IDS_PERCENTAGE "The percentage must be between 1 and 500." - IDS_ANGLE "The angle must be between -89 and 89." - IDS_LOADERRORTEXT "The file %s could not be loaded." - IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" + IDS_INTNUMBERS "整数だけを入力して下さい!" + IDS_PERCENTAGE "百分率は 1 から 500 の間でなければなりません。" + IDS_ANGLE "角度は -89 から 89 の間でなければなりません。" + IDS_LOADERRORTEXT "ファイル %s は読み込めませんでした。" + IDS_ENLARGEPROMPTTEXT "クリップボードの画像はビットマップよりも大きいです。\nビットマップを拡張しますか？" END

4 years

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8396cf8696074eba6938b… commit 8396cf8696074eba6938b27fd9cbc8d29f4b2c56 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 13 16:50:15 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 13 16:50:15 2020 +0900 [CONSRV] Improve Japanese (ja-JP) translation --- win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc b/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc index 701e292e90b..1416a89bd5f 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc +++ b/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc @@ -20,11 +20,11 @@ BEGIN IDS_SCROLLUP "上にスクロール" IDS_SCROLLDOWN "下にスクロール" */ - IDS_TERMINAL_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS コンソール" END STRINGTABLE BEGIN - IDS_MARK_TITLE "Mark" - IDS_SELECT_TITLE "Select" + IDS_MARK_TITLE "マーク" + IDS_SELECT_TITLE "選択" END

4 years

[reactos] 01/01: [NTOBJSHEX] Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ec021fdc4b99928d3722… commit 7ec021fdc4b99928d3722b0ad356e15b00efd7df Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 13 16:39:29 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 13 16:39:29 2020 +0900 [NTOBJSHEX] Add Japanese (ja-JP) translation --- dll/shellext/ntobjshex/lang/ja-JP.rc | 9 +++++++++ dll/shellext/ntobjshex/ntobjshex.rc | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/dll/shellext/ntobjshex/lang/ja-JP.rc b/dll/shellext/ntobjshex/lang/ja-JP.rc new file mode 100644 index 00000000000..8d4b6700401 --- /dev/null +++ b/dll/shellext/ntobjshex/lang/ja-JP.rc @@ -0,0 +1,9 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_NTOBJFLD_NAME "NT オブジェクト名前空間" + IDS_REGISTRY_NAME "システムレジストリ" + IDS_NTOBJFLD_COMMENT "NT オブジェクト名前空間の閲覧を可能にする" + IDS_REGISTRY_COMMENT "システムレジストリの閲覧を可能にする" +END diff --git a/dll/shellext/ntobjshex/ntobjshex.rc b/dll/shellext/ntobjshex/ntobjshex.rc index 8634eac1d59..ceed48c03ac 100644 --- a/dll/shellext/ntobjshex/ntobjshex.rc +++ b/dll/shellext/ntobjshex/ntobjshex.rc @@ -51,6 +51,10 @@ IDR_REGISTRYFOLDER REGISTRY "resources/rgs/regfolder.rgs" #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif + #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

4 years

[reactos] 01/01: [WDMAUD] Fix race condition bug with USE_MMIXER_LIB defined (#3148)

by Michael Stamper

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8e936a57b4770e133772… commit b8e936a57b4770e133772cf2dd66f30671a1524b Author: Michael Stamper <michaelstamper1(a)gmail.com> AuthorDate: Tue Sep 8 21:59:09 2020 +0000 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Sep 13 01:56:34 2020 +0300 [WDMAUD] Fix race condition bug with USE_MMIXER_LIB defined (#3148) Remove misuse of multithreading and use NtDeviceIoContol with completion apc callback instead (mirrors usage of WriteFileEx in WdmAudCommitWaveBufferByLegacy). This fixes a crash caused by race condition. Code was simulating completion callback using a thread, this resulted in single threaded code being executed simultaneously by multiple threads. CORE-17214 --- dll/win32/wdmaud.drv/mmixer.c | 93 ++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/dll/win32/wdmaud.drv/mmixer.c b/dll/win32/wdmaud.drv/mmixer.c index 9f5810628fe..0f2805f37c6 100644 --- a/dll/win32/wdmaud.drv/mmixer.c +++ b/dll/win32/wdmaud.drv/mmixer.c @@ -12,19 +12,14 @@ #include <winreg.h> #include <setupapi.h> #include <mmixer.h> +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> +#include <ndk/iofuncs.h> #define NDEBUG #include <debug.h> #include <mmebuddy_debug.h> -typedef struct -{ - KSSTREAM_HEADER Header; - HANDLE hDevice; - PSOUND_OVERLAPPED Overlap; - LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine; - DWORD IoCtl; -}IO_PACKET, *LPIO_PACKET; BOOL MMixerLibraryInitialized = FALSE; @@ -785,27 +780,25 @@ WdmAudGetWavePositionByMMixer( return MMSYSERR_NOTSUPPORTED; } -DWORD -WINAPI -IoStreamingThread( - LPVOID lpParameter) +static +VOID WINAPI +CommitWaveBufferApc(PVOID ApcContext, + PIO_STATUS_BLOCK IoStatusBlock, + ULONG Reserved) { - DWORD Length; - //MMRESULT Result; - LPIO_PACKET Packet = (LPIO_PACKET)lpParameter; - - /*Result = */ SyncOverlappedDeviceIoControl(Packet->hDevice, - Packet->IoCtl, - NULL, - 0, - &Packet->Header, - sizeof(KSSTREAM_HEADER), - &Length); + DWORD dwErrorCode; + PSOUND_OVERLAPPED Overlap; + KSSTREAM_HEADER* lpHeader; + + dwErrorCode = RtlNtStatusToDosError(IoStatusBlock->Status); + Overlap = (PSOUND_OVERLAPPED)IoStatusBlock; + lpHeader = Overlap->CompletionContext; - Packet->CompletionRoutine(ERROR_SUCCESS, Packet->Header.DataUsed, (LPOVERLAPPED)Packet->Overlap); + /* Call mmebuddy overlap routine */ + Overlap->OriginalCompletionRoutine(dwErrorCode, + lpHeader->DataUsed, &Overlap->Standard); - HeapFree(GetProcessHeap(), 0, Packet); - return 0; + HeapFree(GetProcessHeap(), 0, lpHeader); } MMRESULT @@ -819,8 +812,9 @@ WdmAudCommitWaveBufferByMMixer( PSOUND_DEVICE SoundDevice; MMDEVICE_TYPE DeviceType; MMRESULT Result; - LPIO_PACKET Packet; - HANDLE hThread; + ULONG IoCtl; + KSSTREAM_HEADER* lpHeader; + NTSTATUS Status; Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); @@ -832,37 +826,44 @@ WdmAudCommitWaveBufferByMMixer( Result = GetSoundDeviceType(SoundDevice, &DeviceType); SND_ASSERT( Result == MMSYSERR_NOERROR ); - Packet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IO_PACKET)); - if ( ! Packet ) + lpHeader = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KSSTREAM_HEADER)); + if ( ! lpHeader ) { /* no memory */ return MMSYSERR_NOMEM; } /* setup stream packet */ - Packet->Header.Size = sizeof(KSSTREAM_HEADER); - Packet->Header.PresentationTime.Numerator = 1; - Packet->Header.PresentationTime.Denominator = 1; - Packet->Header.Data = OffsetPtr; - Packet->Header.FrameExtent = Length; - Packet->hDevice = SoundDeviceInstance->Handle; - Packet->Overlap = Overlap; - Packet->CompletionRoutine = CompletionRoutine; - Packet->IoCtl = (DeviceType == WAVE_OUT_DEVICE_TYPE ? IOCTL_KS_WRITE_STREAM : IOCTL_KS_READ_STREAM); + lpHeader->Size = sizeof(KSSTREAM_HEADER); + lpHeader->PresentationTime.Numerator = 1; + lpHeader->PresentationTime.Denominator = 1; + lpHeader->Data = OffsetPtr; + lpHeader->FrameExtent = Length; + Overlap->CompletionContext = lpHeader; + Overlap->OriginalCompletionRoutine = CompletionRoutine; + IoCtl = (DeviceType == WAVE_OUT_DEVICE_TYPE ? IOCTL_KS_WRITE_STREAM : IOCTL_KS_READ_STREAM); if (DeviceType == WAVE_OUT_DEVICE_TYPE) { - Packet->Header.DataUsed = Length; + lpHeader->DataUsed = Length; } - hThread = CreateThread(NULL, 0, IoStreamingThread, (LPVOID)Packet, 0, NULL); - if (hThread == NULL) + Status = NtDeviceIoControlFile(SoundDeviceInstance->Handle, + NULL, + CommitWaveBufferApc, + NULL, + (PIO_STATUS_BLOCK)Overlap, + IoCtl, + NULL, + 0, + lpHeader, + sizeof(KSSTREAM_HEADER)); + + if (!NT_SUCCESS(Status)) { - /* error */ + DPRINT1("NtDeviceIoControlFile() failed with status %08lx\n", Status); return MMSYSERR_ERROR; } - - CloseHandle(hThread); - + return MMSYSERR_NOERROR; }

4 years

[reactos] 01/01: [KERNEL32] GetPriorityClass(): Return explicit 0, not FALSE (match return type) (#3170)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4aeb45ce0ce9d674bc40b… commit 4aeb45ce0ce9d674bc40b3ac3fc98bbf3eb7c157 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Sep 12 21:38:06 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 12 21:38:06 2020 +0200 [KERNEL32] GetPriorityClass(): Return explicit 0, not FALSE (match return type) (#3170) --- dll/win32/kernel32/client/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 9b680eb5330..cba4cf6a1e6 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -1683,7 +1683,7 @@ GetPriorityClass(IN HANDLE hProcess) /* Failure path */ BaseSetLastNTError(Status); - return FALSE; + return 0; } /*

4 years

[reactos] 01/01: [NTOBJSHEX] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25458c77752d85a9af34e… commit 25458c77752d85a9af34e24749a21ed734794f7e Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Sep 12 22:18:18 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 12 22:26:52 2020 +0300 [NTOBJSHEX] Update Russian (ru-RU) translation Addendum to e358d1d. CORE-17268 --- dll/shellext/ntobjshex/lang/ru-RU.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/shellext/ntobjshex/lang/ru-RU.rc b/dll/shellext/ntobjshex/lang/ru-RU.rc index 9d3c670773a..44c83d31338 100644 --- a/dll/shellext/ntobjshex/lang/ru-RU.rc +++ b/dll/shellext/ntobjshex/lang/ru-RU.rc @@ -4,8 +4,8 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NTOBJFLD_NAME "Пространство имен объектов NT" + IDS_NTOBJFLD_NAME "Пространство имён объектов NT" IDS_REGISTRY_NAME "Системный реестр" - IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" - IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" + IDS_NTOBJFLD_COMMENT "Позволяет просматривать пространство имён объектов NT" + IDS_REGISTRY_COMMENT "Позволяет просматривать системный реестр" END

4 years

[reactos] 01/01: [NTOBJSHEX] Localize the descriptions of the NT object and registry shell extension (#3167)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e358d1d2197906669e9d2… commit e358d1d2197906669e9d20fbba55d2383a0bfe70 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Sep 12 19:43:59 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 12 19:43:59 2020 +0200 [NTOBJSHEX] Localize the descriptions of the NT object and registry shell extension (#3167) CORE-17268 --- dll/shellext/ntobjshex/lang/cs-CZ.rc | 2 ++ dll/shellext/ntobjshex/lang/de-DE.rc | 2 ++ dll/shellext/ntobjshex/lang/en-US.rc | 2 ++ dll/shellext/ntobjshex/lang/es-ES.rc | 2 ++ dll/shellext/ntobjshex/lang/fr-FR.rc | 2 ++ dll/shellext/ntobjshex/lang/hi-IN.rc | 2 ++ dll/shellext/ntobjshex/lang/it-IT.rc | 2 ++ dll/shellext/ntobjshex/lang/pl-PL.rc | 2 ++ dll/shellext/ntobjshex/lang/pt-PT.rc | 2 ++ dll/shellext/ntobjshex/lang/ro-RO.rc | 2 ++ dll/shellext/ntobjshex/lang/ru-RU.rc | 2 ++ dll/shellext/ntobjshex/lang/tr-TR.rc | 2 ++ dll/shellext/ntobjshex/lang/zh-CN.rc | 2 ++ dll/shellext/ntobjshex/lang/zh-TW.rc | 2 ++ dll/shellext/ntobjshex/resource.h | 2 ++ dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs | 2 +- dll/shellext/ntobjshex/resources/rgs/regfolder.rgs | 2 +- 17 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dll/shellext/ntobjshex/lang/cs-CZ.rc b/dll/shellext/ntobjshex/lang/cs-CZ.rc index 5b052c31b0e..ff13875d9af 100644 --- a/dll/shellext/ntobjshex/lang/cs-CZ.rc +++ b/dll/shellext/ntobjshex/lang/cs-CZ.rc @@ -4,4 +4,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "Jmenný prostor NT objektů" IDS_REGISTRY_NAME "Systémový registr" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/de-DE.rc b/dll/shellext/ntobjshex/lang/de-DE.rc index 5fbdf00a7ee..89fdda86af2 100644 --- a/dll/shellext/ntobjshex/lang/de-DE.rc +++ b/dll/shellext/ntobjshex/lang/de-DE.rc @@ -4,4 +4,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "NT-Objekt-Namespace" IDS_REGISTRY_NAME "Systemregistry" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/en-US.rc b/dll/shellext/ntobjshex/lang/en-US.rc index e2a9234f633..6dbc206e776 100644 --- a/dll/shellext/ntobjshex/lang/en-US.rc +++ b/dll/shellext/ntobjshex/lang/en-US.rc @@ -4,4 +4,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "NT Object Namespace" IDS_REGISTRY_NAME "System Registry" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/es-ES.rc b/dll/shellext/ntobjshex/lang/es-ES.rc index d5700d4806c..d551323f7a3 100644 --- a/dll/shellext/ntobjshex/lang/es-ES.rc +++ b/dll/shellext/ntobjshex/lang/es-ES.rc @@ -4,4 +4,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "Espacio de nombres NT" IDS_REGISTRY_NAME "Registro del sistema" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/fr-FR.rc b/dll/shellext/ntobjshex/lang/fr-FR.rc index 96dc8e894c8..51e6e1dba43 100644 --- a/dll/shellext/ntobjshex/lang/fr-FR.rc +++ b/dll/shellext/ntobjshex/lang/fr-FR.rc @@ -4,4 +4,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "Espace de noms des objets NT" IDS_REGISTRY_NAME "Registre système" + IDS_NTOBJFLD_COMMENT "Permet de naviguer dans l'espace des objets NT" + IDS_REGISTRY_COMMENT "Permet de naviguer dans le registre système" END diff --git a/dll/shellext/ntobjshex/lang/hi-IN.rc b/dll/shellext/ntobjshex/lang/hi-IN.rc index 6847e398204..13497ca7cfc 100644 --- a/dll/shellext/ntobjshex/lang/hi-IN.rc +++ b/dll/shellext/ntobjshex/lang/hi-IN.rc @@ -11,4 +11,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "एनटी ऑब्जेक्ट नाम स्थान" IDS_REGISTRY_NAME "सिस्टम रजिस्ट्री" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/it-IT.rc b/dll/shellext/ntobjshex/lang/it-IT.rc index f26374f949e..627318286f1 100644 --- a/dll/shellext/ntobjshex/lang/it-IT.rc +++ b/dll/shellext/ntobjshex/lang/it-IT.rc @@ -4,4 +4,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "Oggetto Namespace NT" IDS_REGISTRY_NAME "Registro di Sistema" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/pl-PL.rc b/dll/shellext/ntobjshex/lang/pl-PL.rc index fadaf5641db..828b21d4fa5 100644 --- a/dll/shellext/ntobjshex/lang/pl-PL.rc +++ b/dll/shellext/ntobjshex/lang/pl-PL.rc @@ -4,4 +4,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "Przestrzeń nazw NT Object" IDS_REGISTRY_NAME "Rejestr systemu" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/pt-PT.rc b/dll/shellext/ntobjshex/lang/pt-PT.rc index c731e5d16e5..cd0f78e4b5e 100644 --- a/dll/shellext/ntobjshex/lang/pt-PT.rc +++ b/dll/shellext/ntobjshex/lang/pt-PT.rc @@ -4,4 +4,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "NT Espaço de nomes" IDS_REGISTRY_NAME "Registo do sistema" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/ro-RO.rc b/dll/shellext/ntobjshex/lang/ro-RO.rc index 864e4d6bb23..b90282b19a2 100644 --- a/dll/shellext/ntobjshex/lang/ro-RO.rc +++ b/dll/shellext/ntobjshex/lang/ro-RO.rc @@ -6,4 +6,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "Spațiul de nume Obiect NT" IDS_REGISTRY_NAME "Registrul de sistem" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/ru-RU.rc b/dll/shellext/ntobjshex/lang/ru-RU.rc index 68e7b010e1d..9d3c670773a 100644 --- a/dll/shellext/ntobjshex/lang/ru-RU.rc +++ b/dll/shellext/ntobjshex/lang/ru-RU.rc @@ -6,4 +6,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "Пространство имен объектов NT" IDS_REGISTRY_NAME "Системный реестр" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/tr-TR.rc b/dll/shellext/ntobjshex/lang/tr-TR.rc index ab48e10d00d..345d178f8e7 100644 --- a/dll/shellext/ntobjshex/lang/tr-TR.rc +++ b/dll/shellext/ntobjshex/lang/tr-TR.rc @@ -6,4 +6,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "NT Nesne Ad Alanı" IDS_REGISTRY_NAME "Sistem Kayıt Kütüğü" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/zh-CN.rc b/dll/shellext/ntobjshex/lang/zh-CN.rc index d805dbac18b..0babf22e87e 100644 --- a/dll/shellext/ntobjshex/lang/zh-CN.rc +++ b/dll/shellext/ntobjshex/lang/zh-CN.rc @@ -6,4 +6,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "NT 对象名称空间" IDS_REGISTRY_NAME "系统注册表" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/lang/zh-TW.rc b/dll/shellext/ntobjshex/lang/zh-TW.rc index 807de592099..2e8b6fd4a07 100644 --- a/dll/shellext/ntobjshex/lang/zh-TW.rc +++ b/dll/shellext/ntobjshex/lang/zh-TW.rc @@ -6,4 +6,6 @@ STRINGTABLE BEGIN IDS_NTOBJFLD_NAME "NT 物件名稱空間" IDS_REGISTRY_NAME "系統登錄" + IDS_NTOBJFLD_COMMENT "Allows browsing of the NT Object Namespace" + IDS_REGISTRY_COMMENT "Allows browsing of the System Registry" END diff --git a/dll/shellext/ntobjshex/resource.h b/dll/shellext/ntobjshex/resource.h index 876dd61177f..147803c1e3f 100644 --- a/dll/shellext/ntobjshex/resource.h +++ b/dll/shellext/ntobjshex/resource.h @@ -11,6 +11,8 @@ #define IDS_NTOBJFLD_NAME 101 #define IDS_REGISTRY_NAME 102 +#define IDS_NTOBJFLD_COMMENT 103 +#define IDS_REGISTRY_COMMENT 104 #define IDR_NTOBJECTFOLDER 1001 #define IDR_REGISTRYFOLDER 1002 diff --git a/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs b/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs index 74cc8ad1b44..84284d1039e 100644 --- a/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs +++ b/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs @@ -19,7 +19,7 @@ HKCR { val ThreadingModel = s 'Both' } - val InfoTip = s 'Allows browsing of the NT Object Namespace' + val InfoTip = s '@%MODULE%,-103' val LocalizedString = s '@%MODULE%,-101' DefaultIcon = s '%MODULE%,0' ShellFolder diff --git a/dll/shellext/ntobjshex/resources/rgs/regfolder.rgs b/dll/shellext/ntobjshex/resources/rgs/regfolder.rgs index 3e5ce4d0e8a..acad5822125 100644 --- a/dll/shellext/ntobjshex/resources/rgs/regfolder.rgs +++ b/dll/shellext/ntobjshex/resources/rgs/regfolder.rgs @@ -19,7 +19,7 @@ HKCR { val ThreadingModel = s 'Both' } - val InfoTip = s 'Allows browsing of the System Registry' + val InfoTip = s '@%MODULE%,-104' val LocalizedString = s '@%MODULE%,-102' DefaultIcon = s '%MODULE%,-7' ShellFolder

4 years

← Newer
1
...
28
29
30
31
32
33
34
...
39
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 September 2020