September 2020 - Ros-diffs

[reactos] 01/01: [MSPAINT] Improve Japanese (ja-JP) translation 3
by Katayama Hirofumi MZ 13 Sep '20

13 Sep '20

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

1 0

[reactos] 01/01: [MSPAINT] Improve Japanese (ja-JP) translation 2
by Katayama Hirofumi MZ 13 Sep '20

13 Sep '20

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 "自由選択"

1 0

[reactos] 01/01: [NTOBJSHEX] Improve Japanese (ja-JP) translation
by Katayama Hirofumi MZ 13 Sep '20

13 Sep '20

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

1 0

[reactos] 01/01: [MSPAINT] Improve Japanese (ja-JP) translation
by Katayama Hirofumi MZ 13 Sep '20

13 Sep '20

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

1 0

[reactos] 01/01: [CONSRV] Improve Japanese (ja-JP) translation
by Katayama Hirofumi MZ 13 Sep '20

13 Sep '20

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

1 0

[reactos] 01/01: [NTOBJSHEX] Add Japanese (ja-JP) translation
by Katayama Hirofumi MZ 13 Sep '20

13 Sep '20

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

1 0

[reactos] 01/01: [WDMAUD] Fix race condition bug with USE_MMIXER_LIB defined (#3148)
by Michael Stamper 12 Sep '20

12 Sep '20

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; }

1 0

[reactos] 01/01: [KERNEL32] GetPriorityClass(): Return explicit 0, not FALSE (match return type) (#3170)
by Serge Gautherie 12 Sep '20

12 Sep '20

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; } /*

1 0

[reactos] 01/01: [NTOBJSHEX] Update Russian (ru-RU) translation
by Stanislav Motylkov 12 Sep '20

12 Sep '20

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

1 0

[reactos] 01/01: [NTOBJSHEX] Localize the descriptions of the NT object and registry shell extension (#3167)
by Kyle Katarn 12 Sep '20

12 Sep '20

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

1 0

[reactos] 01/01: [CONSRV] Improve zh-CN translation (#3157)
by chirsz 12 Sep '20

12 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd2eaf1e51d9afd7a21c2… commit cd2eaf1e51d9afd7a21c2e4dfdd019174a7bc382 Author: chirsz <31474766+chirsz-ever(a)users.noreply.github.com> AuthorDate: Sun Sep 13 00:23:05 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 12 18:23:05 2020 +0200 [CONSRV] Improve zh-CN translation (#3157) The new word is more in line with PRC people's usage habits, and it is actually used in the Simplified Chinese translation of Windows. --- win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc b/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc index 3509f505fb3..4552ba0471a 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc +++ b/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc @@ -5,7 +5,7 @@ BEGIN IDS_EDIT "编辑" IDS_MARK "标记" IDS_COPY "复制\tEnter" - IDS_PASTE "黏贴" + IDS_PASTE "粘贴" IDS_SELECTALL "全部选择" IDS_SCROLL "滚动" IDS_FIND "查找..."

1 0

[reactos] 01/01: [SHELL32_APITEST] Strengthen ShellExecuteW testcase (#3165)
by Katayama Hirofumi MZ 12 Sep '20

12 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de9c32bfed29f76694073… commit de9c32bfed29f766940735e1fc851692b94d2b54 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 13 00:47:56 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 00:47:56 2020 +0900 [SHELL32_APITEST] Strengthen ShellExecuteW testcase (#3165) Add tests for special folders. CORE-16939 --- .../rostests/apitests/shell32/ShellExecuteW.cpp | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/rostests/apitests/shell32/ShellExecuteW.cpp b/modules/rostests/apitests/shell32/ShellExecuteW.cpp index 0111783d0e6..b722615df67 100644 --- a/modules/rostests/apitests/shell32/ShellExecuteW.cpp +++ b/modules/rostests/apitests/shell32/ShellExecuteW.cpp @@ -119,6 +119,32 @@ START_TEST(ShellExecuteW) hWnd = FindWindowW(L"CabinetWClass", L"Search Results"); PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); } + + // TEST #7: Open My Documents ("::{450d8fba-ad25-11d0-98a8-0800361b1103}") + hInstance = ShellExecuteW(NULL, NULL, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL, NULL, SW_SHOWNORMAL); + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #7: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #7 ret: %d.\n", ret); + if (hInstance) + { + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(L"CabinetWClass", NULL); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); + } + + // TEST #8: Open My Documents ("shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}") + hInstance = ShellExecuteW(NULL, L"open", L"shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL, NULL, SW_SHOWNORMAL); + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #8: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #8 ret: %d.\n", ret); + if (hInstance) + { + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(L"CabinetWClass", NULL); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); + } } // Windows Server 2003 and Windows XP SP3 return values (Win 7 returns 42 in all cases)

1 0

[reactos] 01/01: [KERNEL32_VISTA][NTDLL_VISTA][RTL_VISTA] Move Vista Rtl functions from kernel32_vista and ntdll_vista to rtl_vista (#3149)
by Timo Kreuzer 12 Sep '20

12 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61192390cf62f8a1806fc… commit 61192390cf62f8a1806fc6a6ecbc0b66e4e444ca Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 12 15:04:02 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 12 15:04:02 2020 +0200 [KERNEL32_VISTA][NTDLL_VISTA][RTL_VISTA] Move Vista Rtl functions from kernel32_vista and ntdll_vista to rtl_vista (#3149) * Move RtlRunOnce functions from kernel32_vista to rtl_vista and export them from ntdll_vista * Move condvar.c and srw.c from ntdll_vista to rtl_vista * Move ntdll_vista build script to a subfolder of ntdll The RtlRunOnce functions are taken from wine, completely unmodified. The code that was in kernel32_vista had change that used a global keyed_event handle, but was never initialized, so we were still passing NULL thus using the global ExpCritSecOutOfMemoryEvent. --- dll/ntdll/CMakeLists.txt | 2 + .../ntdll_vista => ntdll/nt_0600}/CMakeLists.txt | 14 +-- dll/{win32/ntdll_vista => ntdll/nt_0600}/DllMain.c | 0 .../ntdll_vista => ntdll/nt_0600}/ntdll_vista.spec | 4 + dll/win32/CMakeLists.txt | 1 - dll/win32/kernel32_vista/CMakeLists.txt | 2 +- dll/win32/kernel32_vista/InitOnceExecuteOnce.c | 105 +-------------------- sdk/lib/rtl/CMakeLists.txt | 10 ++ {dll/win32/ntdll_vista => sdk/lib/rtl}/condvar.c | 0 {dll/win32/ntdll_vista => sdk/lib/rtl}/rtl_vista.h | 11 ++- .../InitOnceExecuteOnce.c => sdk/lib/rtl/runonce.c | 49 +++++----- {dll/win32/ntdll_vista => sdk/lib/rtl}/srw.c | 0 12 files changed, 62 insertions(+), 136 deletions(-) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index 6ad60fd8404..09e077cb4e6 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -1,4 +1,6 @@ +add_subdirectory(nt_0600) + spec2def(ntdll.dll def/ntdll.spec ADD_IMPORTLIB) add_definitions( diff --git a/dll/win32/ntdll_vista/CMakeLists.txt b/dll/ntdll/nt_0600/CMakeLists.txt similarity index 74% rename from dll/win32/ntdll_vista/CMakeLists.txt rename to dll/ntdll/nt_0600/CMakeLists.txt index d0edd56c6c0..061502ac7f1 100644 --- a/dll/win32/ntdll_vista/CMakeLists.txt +++ b/dll/ntdll/nt_0600/CMakeLists.txt @@ -1,20 +1,22 @@ -remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) -add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600 +spec2def(ntdll_vista.dll ntdll_vista.spec ADD_IMPORTLIB) + +add_definitions( -D__NTDLL__ -D_NTOSKRNL_ - -D_NTSYSTEM_) + -DCRTDLL) -spec2def(ntdll_vista.dll ntdll_vista.spec ADD_IMPORTLIB) +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) list(APPEND SOURCE DllMain.c - condvar.c - srw.c ${CMAKE_CURRENT_BINARY_DIR}/ntdll_vista.def) add_library(ntdll_vista MODULE ${SOURCE}) set_module_type(ntdll_vista win32dll ENTRYPOINT DllMain 12) +target_link_libraries(ntdll_vista rtl_vista) if(ARCH STREQUAL "arm") target_link_libraries(ntdll_vista chkstk) endif() diff --git a/dll/win32/ntdll_vista/DllMain.c b/dll/ntdll/nt_0600/DllMain.c similarity index 100% rename from dll/win32/ntdll_vista/DllMain.c rename to dll/ntdll/nt_0600/DllMain.c diff --git a/dll/win32/ntdll_vista/ntdll_vista.spec b/dll/ntdll/nt_0600/ntdll_vista.spec similarity index 70% rename from dll/win32/ntdll_vista/ntdll_vista.spec rename to dll/ntdll/nt_0600/ntdll_vista.spec index 2bcde610d01..1a3098dde3f 100644 --- a/dll/win32/ntdll_vista/ntdll_vista.spec +++ b/dll/ntdll/nt_0600/ntdll_vista.spec @@ -8,3 +8,7 @@ @ stdcall RtlReleaseSRWLockShared(ptr) @ stdcall RtlAcquireSRWLockExclusive(ptr) @ stdcall RtlReleaseSRWLockExclusive(ptr) +@ stdcall RtlRunOnceInitialize(ptr) +@ stdcall RtlRunOnceBeginInitialize(ptr long ptr) +@ stdcall RtlRunOnceComplete(ptr long ptr) +@ stdcall RtlRunOnceExecuteOnce(ptr ptr ptr ptr) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 66a82d2d3b9..01e6dee240e 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -140,7 +140,6 @@ add_subdirectory(netid) add_subdirectory(netmsg) add_subdirectory(newdev) add_subdirectory(npptools) -add_subdirectory(ntdll_vista) add_subdirectory(ntdsapi) add_subdirectory(ntlanman) add_subdirectory(ntmarta) diff --git a/dll/win32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32_vista/CMakeLists.txt index 068297a4a03..915346689a1 100644 --- a/dll/win32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32_vista/CMakeLists.txt @@ -15,7 +15,7 @@ list(APPEND SOURCE add_library(kernel32_vista MODULE ${SOURCE}) set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12) -add_importlibs(kernel32_vista kernel32 ntdll) +add_importlibs(kernel32_vista kernel32 ntdll_vista ntdll) add_delay_importlibs(kernel32_vista ntdll_vista) add_dependencies(kernel32_vista psdk) add_cd_file(TARGET kernel32_vista DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c b/dll/win32/kernel32_vista/InitOnceExecuteOnce.c index b9073fd0fd3..1ef59160aef 100644 --- a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c +++ b/dll/win32/kernel32_vista/InitOnceExecuteOnce.c @@ -5,107 +5,8 @@ #include <wine/config.h> #include <wine/port.h> -/* Taken from Wine ntdll/sync.c */ - -HANDLE keyed_event = NULL; - -static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) -{ - if (flags & RTL_RUN_ONCE_CHECK_ONLY) - { - ULONG_PTR val = (ULONG_PTR)once->Ptr; - - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; - if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; - if (context) *context = (void *)(val & ~3); - return STATUS_SUCCESS; - } - - for (;;) - { - ULONG_PTR next, val = (ULONG_PTR)once->Ptr; - - switch (val & 3) - { - case 0: /* first time */ - if (!interlocked_cmpxchg_ptr( &once->Ptr, - (flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0 )) - return STATUS_PENDING; - break; - - case 1: /* in progress, wait */ - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; - next = val & ~3; - if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), - (void *)val ) == (void *)val) - NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); - break; - - case 2: /* done */ - if (context) *context = (void *)(val & ~3); - return STATUS_SUCCESS; - - case 3: /* in progress, async */ - if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; - return STATUS_PENDING; - } - } -} - -static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) -{ - if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; - - if (flags & RTL_RUN_ONCE_INIT_FAILED) - { - if (context) return STATUS_INVALID_PARAMETER; - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; - } - else context = (void *)((ULONG_PTR)context | 2); - - for (;;) - { - ULONG_PTR val = (ULONG_PTR)once->Ptr; - - switch (val & 3) - { - case 1: /* in progress */ - if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; - val &= ~3; - while (val) - { - ULONG_PTR next = *(ULONG_PTR *)val; - NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, NULL ); - val = next; - } - return STATUS_SUCCESS; - - case 3: /* in progress, async */ - if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; - if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; - return STATUS_SUCCESS; - - default: - return STATUS_UNSUCCESSFUL; - } - } -} - -static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, - void *param, void **context ) -{ - DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); - - if (ret != STATUS_PENDING) return ret; - - if (!func( once, param, context )) - { - RtlpRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); - return STATUS_UNSUCCESSFUL; - } - - return RtlpRunOnceComplete( once, 0, context ? *context : NULL ); -} +DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, + void *param, void **context ); /* Taken from Wine kernel32/sync.c */ @@ -114,5 +15,5 @@ static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_IN */ BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) { - return !RtlpRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); + return !RtlRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); } diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index 573e4c08026..65bf915b45d 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -114,3 +114,13 @@ add_asm_files(rtl_asm ${ASM_SOURCE}) add_library(rtl ${SOURCE} ${rtl_asm}) add_pch(rtl rtl.h SOURCE) add_dependencies(rtl psdk asm) + +list(APPEND SOURCE_VISTA + condvar.c + runonce.c + srw.c +) + +add_library(rtl_vista ${SOURCE_VISTA}) +add_pch(rtl rtl_vista.h SOURCE_VISTA) +add_dependencies(rtl_vista psdk) diff --git a/dll/win32/ntdll_vista/condvar.c b/sdk/lib/rtl/condvar.c similarity index 100% rename from dll/win32/ntdll_vista/condvar.c rename to sdk/lib/rtl/condvar.c diff --git a/dll/win32/ntdll_vista/rtl_vista.h b/sdk/lib/rtl/rtl_vista.h similarity index 90% rename from dll/win32/ntdll_vista/rtl_vista.h rename to sdk/lib/rtl/rtl_vista.h index 9f96f15b50d..ef887b77681 100644 --- a/dll/win32/ntdll_vista/rtl_vista.h +++ b/sdk/lib/rtl/rtl_vista.h @@ -6,8 +6,13 @@ * PROGRAMMER: Alex Ionescu */ -#ifndef RTL_H -#define RTL_H +#ifndef RTL_VISTA_H +#define RTL_VISTA_H + +#undef _WIN32_WINNT +#undef WINVER +#define _WIN32_WINNT 0x600 +#define WINVER 0x600 /* We're a core NT DLL, we don't import syscalls */ #define _INC_SWPRINTF_INL_ @@ -54,4 +59,4 @@ #define InterlockedBitTestAndSet64 _interlockedbittestandset64 #endif -#endif /* RTL_H */ +#endif /* RTL_VISTA_H */ diff --git a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c b/sdk/lib/rtl/runonce.c similarity index 69% copy from dll/win32/kernel32_vista/InitOnceExecuteOnce.c copy to sdk/lib/rtl/runonce.c index b9073fd0fd3..10401287983 100644 --- a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c +++ b/sdk/lib/rtl/runonce.c @@ -1,15 +1,22 @@ -#include "k32_vista.h" +/* Taken from Wine ntdll/sync.c */ -#include <ndk/exfuncs.h> +#include "rtl_vista.h" #include <wine/config.h> #include <wine/port.h> -/* Taken from Wine ntdll/sync.c */ - -HANDLE keyed_event = NULL; +/****************************************************************** + * RtlRunOnceInitialize (NTDLL.@) + */ +void WINAPI RtlRunOnceInitialize( RTL_RUN_ONCE *once ) +{ + once->Ptr = NULL; +} -static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) +/****************************************************************** + * RtlRunOnceBeginInitialize (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) { if (flags & RTL_RUN_ONCE_CHECK_ONLY) { @@ -38,7 +45,7 @@ static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, next = val & ~3; if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), (void *)val ) == (void *)val) - NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); + NtWaitForKeyedEvent( 0, &next, FALSE, NULL ); break; case 2: /* done */ @@ -52,7 +59,10 @@ static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, } } -static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) +/****************************************************************** + * RtlRunOnceComplete (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) { if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; @@ -75,7 +85,7 @@ static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void * while (val) { ULONG_PTR next = *(ULONG_PTR *)val; - NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, NULL ); + NtReleaseKeyedEvent( 0, (void *)val, FALSE, NULL ); val = next; } return STATUS_SUCCESS; @@ -91,8 +101,11 @@ static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void * } } -static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, - void *param, void **context ) +/****************************************************************** + * RtlRunOnceExecuteOnce (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, + void *param, void **context ) { DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); @@ -100,19 +113,9 @@ static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_IN if (!func( once, param, context )) { - RtlpRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); + RtlRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); return STATUS_UNSUCCESSFUL; } - return RtlpRunOnceComplete( once, 0, context ? *context : NULL ); -} - -/* Taken from Wine kernel32/sync.c */ - -/* - * @implemented - */ -BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) -{ - return !RtlpRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); + return RtlRunOnceComplete( once, 0, context ? *context : NULL ); } diff --git a/dll/win32/ntdll_vista/srw.c b/sdk/lib/rtl/srw.c similarity index 100% rename from dll/win32/ntdll_vista/srw.c rename to sdk/lib/rtl/srw.c

1 0

[reactos] 01/01: [ASM] Fix boot with VS 16.7.3 / MSVC 19.27
by Timo Kreuzer 12 Sep '20

12 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2aca4b279563ec536f013… commit 2aca4b279563ec536f013a4bd29f4b177e401ffe Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Sep 10 17:25:42 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 12 15:01:04 2020 +0200 [ASM] Fix boot with VS 16.7.3 / MSVC 19.27 See https://developercommunity.visualstudio.com/content/problem/1180800/ml-x86-… --- boot/environ/app/rosload/i386/osxfera.s | 1 - boot/environ/lib/arch/i386/transfer.s | 1 - boot/freeldr/freeldr/arch/i386/multiboot.S | 2 +- hal/halx86/generic/systimer.S | 5 ----- hal/halx86/up/pic.S | 5 ----- ntoskrnl/ke/i386/trap.s | 2 +- sdk/include/asm/asm.inc | 2 +- sdk/lib/crt/math/i386/alldiv_asm.s | 4 ---- sdk/lib/crt/math/i386/pow_asm.s | 2 +- 9 files changed, 4 insertions(+), 20 deletions(-) diff --git a/boot/environ/app/rosload/i386/osxfera.s b/boot/environ/app/rosload/i386/osxfera.s index 3a555b81462..1418f164b35 100644 --- a/boot/environ/app/rosload/i386/osxfera.s +++ b/boot/environ/app/rosload/i386/osxfera.s @@ -16,7 +16,6 @@ EXTERN _OslKernelIdt:FWORD /* FUNCTIONS ****************************************************************/ .code -ASSUME nothing PUBLIC _OslArchTransferToKernel _OslArchTransferToKernel: diff --git a/boot/environ/lib/arch/i386/transfer.s b/boot/environ/lib/arch/i386/transfer.s index f7c60b6abc5..d87938363fc 100644 --- a/boot/environ/lib/arch/i386/transfer.s +++ b/boot/environ/lib/arch/i386/transfer.s @@ -21,7 +21,6 @@ EXTERN _BootApp32Parameters:DWORD /* FUNCTIONS ****************************************************************/ .code -ASSUME nothing PUBLIC _Archx86TransferTo32BitApplicationAsm _Archx86TransferTo32BitApplicationAsm: diff --git a/boot/freeldr/freeldr/arch/i386/multiboot.S b/boot/freeldr/freeldr/arch/i386/multiboot.S index 296ce0de73f..e176a64d54c 100644 --- a/boot/freeldr/freeldr/arch/i386/multiboot.S +++ b/boot/freeldr/freeldr/arch/i386/multiboot.S @@ -55,7 +55,7 @@ EXTERN __bss_end__:DWORD #ifdef _USE_ML .MBDATA SEGMENT PUBLIC 'DATA' -ASSUME nothing +//ASSUME nothing #endif /* Align to 32 bits boundary */ diff --git a/hal/halx86/generic/systimer.S b/hal/halx86/generic/systimer.S index 57e29f3c21e..be41fe1f179 100644 --- a/hal/halx86/generic/systimer.S +++ b/hal/halx86/generic/systimer.S @@ -35,11 +35,6 @@ EXTERN _DbgBreakPoint@0:PROC #define PIT_MODE HEX(43) #define SYSTEM_CTRL_PORT_A HEX(92) -/* GLOBALS *******************************************************************/ - -.data -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING - /* FUNCTIONS *****************************************************************/ .code diff --git a/hal/halx86/up/pic.S b/hal/halx86/up/pic.S index 3f65a5545d8..f93bb972a01 100644 --- a/hal/halx86/up/pic.S +++ b/hal/halx86/up/pic.S @@ -11,11 +11,6 @@ #include <ks386.inc> -/* GLOBALS *******************************************************************/ - -.data -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING - /* FUNCTIONS *****************************************************************/ .code diff --git a/ntoskrnl/ke/i386/trap.s b/ntoskrnl/ke/i386/trap.s index f3496f0ebc3..2f8070725d5 100644 --- a/ntoskrnl/ke/i386/trap.s +++ b/ntoskrnl/ke/i386/trap.s @@ -30,7 +30,7 @@ ENDM /* GLOBALS *******************************************************************/ .data -ASSUME nothing +ASSUME CS:nothing .align 16 diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc index 458fce72f12..afbfdf24cd8 100644 --- a/sdk/include/asm/asm.inc +++ b/sdk/include/asm/asm.inc @@ -27,7 +27,7 @@ OPTION DOTNAME .686P .XMM .MODEL FLAT -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING +ASSUME FS:NOTHING, GS:NOTHING #endif /* Explicit radix in MASM syntax */ diff --git a/sdk/lib/crt/math/i386/alldiv_asm.s b/sdk/lib/crt/math/i386/alldiv_asm.s index 74f5fff9b79..27580bcfc20 100644 --- a/sdk/lib/crt/math/i386/alldiv_asm.s +++ b/sdk/lib/crt/math/i386/alldiv_asm.s @@ -38,10 +38,6 @@ PUBLIC __alldiv - /* DATA ********************************************************************/ -.data -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING - /* FUNCTIONS ***************************************************************/ .code diff --git a/sdk/lib/crt/math/i386/pow_asm.s b/sdk/lib/crt/math/i386/pow_asm.s index 2f33b2d0fbe..476430a8873 100644 --- a/sdk/lib/crt/math/i386/pow_asm.s +++ b/sdk/lib/crt/math/i386/pow_asm.s @@ -30,7 +30,7 @@ PUBLIC _pow .data -ASSUME nothing +ASSUME cs:nothing .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(infinity,@object)

1 0

[reactos] 01/01: [CABMAN] Replace linked lists with std::list CORE-17231
by Mark Jansen 12 Sep '20

12 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5d2da6d3565fcfce4f41… commit b5d2da6d3565fcfce4f414ad6f1a4cd3f80585f5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 3 18:12:25 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Sep 12 13:25:55 2020 +0200 [CABMAN] Replace linked lists with std::list CORE-17231 --- sdk/tools/cabman/cabinet.cxx | 293 +++++++++++-------------------------------- sdk/tools/cabman/cabinet.h | 23 +--- 2 files changed, 76 insertions(+), 240 deletions(-) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 1db3ce4e07a..175efef918a 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -83,13 +83,6 @@ CCabinet::CCabinet() CabinetReservedFileBuffer = NULL; CabinetReservedFileSize = 0; - FolderListHead = NULL; - FolderListTail = NULL; - FileListHead = NULL; - FileListTail = NULL; - CriteriaListHead = NULL; - CriteriaListTail = NULL; - Codec = NULL; CodecId = -1; CodecSelected = false; @@ -251,15 +244,7 @@ ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) return CAB_STATUS_NOMEMORY; } - Criteria->Prev = CriteriaListTail; - Criteria->Next = NULL; - - if(CriteriaListTail) - CriteriaListTail->Next = Criteria; - else - CriteriaListHead = Criteria; - - CriteriaListTail = Criteria; + CriteriaList.push_back(Criteria); // Set the actual criteria string Criteria->Search = SearchCriteria; @@ -272,22 +257,11 @@ void CCabinet::DestroySearchCriteria() * FUNCTION: Destroys the list with the search criteria */ { - PSEARCH_CRITERIA Criteria; - PSEARCH_CRITERIA NextCriteria; - - Criteria = CriteriaListHead; - - while(Criteria) + for (PSEARCH_CRITERIA Criteria : CriteriaList) { - NextCriteria = Criteria->Next; - delete Criteria; - - Criteria = NextCriteria; } - - CriteriaListHead = NULL; - CriteriaListTail = NULL; + CriteriaList.clear(); } bool CCabinet::HasSearchCriteria() @@ -297,7 +271,7 @@ bool CCabinet::HasSearchCriteria() * Whether we have search criteria or not. */ { - return (CriteriaListHead != NULL); + return !CriteriaList.empty(); } bool CCabinet::SetCompressionCodec(const char* CodecName) @@ -406,7 +380,6 @@ ULONG CCabinet::Open() * Status of operation */ { - PCFFOLDER_NODE FolderNode; ULONG Status; ULONG Index; @@ -508,7 +481,7 @@ ULONG CCabinet::Open() /* Read all folders */ for (Index = 0; Index < CABHeader.FolderCount; Index++) { - FolderNode = NewFolderNode(); + PCFFOLDER_NODE FolderNode = NewFolderNode(); if (!FolderNode) { DPRINT(MIN_TRACE, ("Insufficient resources.\n")); @@ -537,16 +510,14 @@ ULONG CCabinet::Open() } /* Read data blocks for all folders */ - FolderNode = FolderListHead; - while (FolderNode != NULL) + for (PCFFOLDER_NODE Node : FolderList) { - Status = ReadDataBlocks(FolderNode); + Status = ReadDataBlocks(Node); if (Status != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("ReadDataBlocks() failed (%u).\n", (UINT)Status)); return Status; } - FolderNode = FolderNode->Next; } } return CAB_STATUS_SUCCESS; @@ -576,7 +547,7 @@ ULONG CCabinet::FindFirst(PCAB_SEARCH Search) */ { RestartSearch = false; - Search->Next = FileListHead; + Search->Next = FileList.begin(); return FindNext(Search); } @@ -591,54 +562,49 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) */ { bool bFound = false; - PSEARCH_CRITERIA Criteria; ULONG Status; if (RestartSearch) { - Search->Next = FileListHead; + Search->Next = FileList.begin(); /* Skip split files already extracted */ - while ((Search->Next) && - (Search->Next->File.FileControlID > CAB_FILE_MAX_FOLDER) && - (Search->Next->File.FileOffset <= LastFileOffset)) + while ((Search->Next != FileList.end()) && + ((*Search->Next)->File.FileControlID > CAB_FILE_MAX_FOLDER) && + ((*Search->Next)->File.FileOffset <= LastFileOffset)) { DPRINT(MAX_TRACE, ("Skipping file (%s) FileOffset (0x%X) LastFileOffset (0x%X).\n", - Search->Next->FileName.c_str(), (UINT)Search->Next->File.FileOffset, (UINT)LastFileOffset)); - Search->Next = Search->Next->Next; + (*Search->Next)->FileName.c_str(), (UINT)(*Search->Next)->File.FileOffset, (UINT)LastFileOffset)); + Search->Next++; } RestartSearch = false; } /* Check each search criteria against each file */ - while(Search->Next) + while(Search->Next != FileList.end()) { // Some features (like displaying cabinets) don't require search criteria, so we can just break here. // If a feature requires it, handle this in the ParseCmdline() function in "main.cxx". - if(!CriteriaListHead) + if (CriteriaList.empty()) break; - Criteria = CriteriaListHead; - - while(Criteria) + for (PSEARCH_CRITERIA Criteria : CriteriaList) { - if(MatchFileNamePattern(Search->Next->FileName.c_str(), Criteria->Search.c_str())) + if (MatchFileNamePattern((*Search->Next)->FileName.c_str(), Criteria->Search.c_str())) { bFound = true; break; } - - Criteria = Criteria->Next; } if(bFound) break; - Search->Next = Search->Next->Next; + Search->Next++; } - if (!Search->Next) + if (Search->Next == FileList.end()) { if (strlen(DiskNext) > 0) { @@ -652,17 +618,17 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) if (Status != CAB_STATUS_SUCCESS) return Status; - Search->Next = FileListHead; - if (!Search->Next) + Search->Next = FileList.begin(); + if (Search->Next == FileList.end()) return CAB_STATUS_NOFILE; } else return CAB_STATUS_NOFILE; } - Search->File = &Search->Next->File; - Search->FileName = Search->Next->FileName; - Search->Next = Search->Next->Next; + Search->File = &(*Search->Next)->File; + Search->FileName = (*Search->Next)->FileName; + Search->Next++; return CAB_STATUS_SUCCESS; } @@ -901,7 +867,7 @@ ULONG CCabinet::ExtractFile(const char* FileName) } /* The file is continued in the first data block in the folder */ - File->DataBlock = CurrentFolderNode->DataListHead; + File->DataBlock = CurrentFolderNode->DataList.front(); /* Search to start of file */ if (fseek(FileHandle, (off_t)File->DataBlock->AbsoluteOffset, SEEK_SET) != 0) @@ -1339,14 +1305,12 @@ ULONG CCabinet::WriteDisk(ULONG MoreDisks) * Status of operation */ { - PCFFILE_NODE FileNode; ULONG Status; ContinueFile = false; - FileNode = FileListHead; - while (FileNode != NULL) + for (auto it = FileList.begin(); it != FileList.end();) { - Status = WriteFileToScratchStorage(FileNode); + Status = WriteFileToScratchStorage(*it); if (Status != CAB_STATUS_SUCCESS) return Status; @@ -1378,7 +1342,7 @@ ULONG CCabinet::WriteDisk(ULONG MoreDisks) else { ContinueFile = false; - FileNode = FileNode->Next; + it++; } } @@ -1398,8 +1362,6 @@ ULONG CCabinet::WriteDisk(ULONG MoreDisks) CloseDisk(); NewDisk(); CreateNewDisk = false; - - ASSERT(FileNode == FileListHead); } if ((CurrentIBufferSize > 0) || (CurrentOBufferSize > 0)) @@ -1425,7 +1387,6 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) * Status of operation */ { - PCFFOLDER_NODE FolderNode; ULONG Status; OnCabinetName(CurrentDiskNumber, CabinetName); @@ -1463,8 +1424,7 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) WriteFileEntries(); /* Write data blocks */ - FolderNode = FolderListHead; - while (FolderNode != NULL) + for (PCFFOLDER_NODE FolderNode : FolderList) { if (FolderNode->Commit) { @@ -1474,7 +1434,6 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) /* Remove data blocks for folder */ DestroyDataNodes(FolderNode); } - FolderNode = FolderNode->Next; } fclose(FileHandle); @@ -1613,7 +1572,6 @@ bool CCabinet::CreateSimpleCabinet() const char* pszFile; char szFilePath[PATH_MAX]; char szFile[PATH_MAX]; - PSEARCH_CRITERIA Criteria; ULONG Status; #if defined(_WIN32) @@ -1634,9 +1592,7 @@ bool CCabinet::CreateSimpleCabinet() } // Add each file in the criteria list - Criteria = CriteriaListHead; - - while(Criteria) + for (PSEARCH_CRITERIA Criteria : CriteriaList) { // Store the file path with a trailing slash in szFilePath ConvertPath(Criteria->Search); @@ -1730,8 +1686,6 @@ bool CCabinet::CreateSimpleCabinet() closedir(dirp); } #endif - - Criteria = Criteria->Next; } Status = WriteDisk(false); @@ -1862,24 +1816,20 @@ PCFFOLDER_NODE CCabinet::LocateFolderNode(ULONG Index) * Pointer to folder node or NULL if the folder node was not found */ { - PCFFOLDER_NODE Node; - switch (Index) { case CAB_FILE_SPLIT: - return FolderListTail; + return FolderList.back(); case CAB_FILE_CONTINUED: case CAB_FILE_PREV_NEXT: - return FolderListHead; + return FolderList.front(); } - Node = FolderListHead; - while (Node != NULL) + for (PCFFOLDER_NODE Node : FolderList) { if (Node->Index == Index) return Node; - Node = Node->Next; } return NULL; } @@ -1894,15 +1844,12 @@ ULONG CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) * Status of operation */ { - PCFDATA_NODE Node; - DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%X) FileSize (%u).\n", File->FileName.c_str(), (UINT)File->File.FileOffset, (UINT)File->File.FileSize)); - Node = CurrentFolderNode->DataListHead; - while (Node != NULL) + for (PCFDATA_NODE Node : CurrentFolderNode->DataList) { DPRINT(MAX_TRACE, ("GetAbsoluteOffset(): Comparing (0x%X, 0x%X) (%u).\n", (UINT)Node->UncompOffset, @@ -1919,8 +1866,6 @@ ULONG CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) File->DataBlock = Node; return CAB_STATUS_SUCCESS; } - - Node = Node->Next; } return CAB_STATUS_INVALID_CAB; } @@ -1939,13 +1884,11 @@ ULONG CCabinet::LocateFile(const char* FileName, * Current folder is set to the folder of the file */ { - PCFFILE_NODE Node; ULONG Status; DPRINT(MAX_TRACE, ("FileName '%s'\n", FileName)); - Node = FileListHead; - while (Node != NULL) + for (PCFFILE_NODE Node : FileList) { if (strcasecmp(FileName, Node->FileName.c_str()) == 0) { @@ -1965,7 +1908,6 @@ ULONG CCabinet::LocateFile(const char* FileName, *File = Node; return Status; } - Node = Node->Next; } return CAB_STATUS_NOFILE; } @@ -2162,14 +2104,7 @@ PCFFOLDER_NODE CCabinet::NewFolderNode() Node->Folder.CompressionType = CAB_COMP_NONE; - Node->Prev = FolderListTail; - - if (FolderListTail != NULL) - FolderListTail->Next = Node; - else - FolderListHead = Node; - - FolderListTail = Node; + FolderList.push_back(Node); return Node; } @@ -2190,14 +2125,7 @@ PCFFILE_NODE CCabinet::NewFileNode() if (!Node) return NULL; - Node->Prev = FileListTail; - - if (FileListTail != NULL) - FileListTail->Next = Node; - else - FileListHead = Node; - - FileListTail = Node; + FileList.push_back(Node); return Node; } @@ -2218,14 +2146,7 @@ PCFDATA_NODE CCabinet::NewDataNode(PCFFOLDER_NODE FolderNode) if (!Node) return NULL; - Node->Prev = FolderNode->DataListTail; - - if (FolderNode->DataListTail != NULL) - FolderNode->DataListTail->Next = Node; - else - FolderNode->DataListHead = Node; - - FolderNode->DataListTail = Node; + FolderNode->DataList.push_back(Node); return Node; } @@ -2238,18 +2159,11 @@ void CCabinet::DestroyDataNodes(PCFFOLDER_NODE FolderNode) * FolderNode = Pointer to folder node */ { - PCFDATA_NODE PrevNode; - PCFDATA_NODE NextNode; - - NextNode = FolderNode->DataListHead; - while (NextNode != NULL) + for (PCFDATA_NODE Node : FolderNode->DataList) { - PrevNode = NextNode->Next; - delete NextNode; - NextNode = PrevNode; + delete Node; } - FolderNode->DataListHead = NULL; - FolderNode->DataListTail = NULL; + FolderNode->DataList.clear(); } @@ -2258,18 +2172,11 @@ void CCabinet::DestroyFileNodes() * FUNCTION: Destroys file nodes */ { - PCFFILE_NODE PrevNode; - PCFFILE_NODE NextNode; - - NextNode = FileListHead; - while (NextNode != NULL) + for (PCFFILE_NODE Node : FileList) { - PrevNode = NextNode->Next; - delete NextNode; - NextNode = PrevNode; + delete Node; } - FileListHead = NULL; - FileListTail = NULL; + FileList.clear(); } @@ -2278,33 +2185,13 @@ void CCabinet::DestroyDeletedFileNodes() * FUNCTION: Destroys file nodes that are marked for deletion */ { - PCFFILE_NODE CurNode; - PCFFILE_NODE NextNode; - - CurNode = FileListHead; - while (CurNode != NULL) + for (auto it = FileList.begin(); it != FileList.end(); ) { - NextNode = CurNode->Next; + PCFFILE_NODE CurNode = *it; if (CurNode->Delete) { - if (CurNode->Prev != NULL) - CurNode->Prev->Next = CurNode->Next; - else - { - FileListHead = CurNode->Next; - if (FileListHead) - FileListHead->Prev = NULL; - } - - if (CurNode->Next != NULL) - CurNode->Next->Prev = CurNode->Prev; - else - { - FileListTail = CurNode->Prev; - if (FileListTail) - FileListTail->Next = NULL; - } + it = FileList.erase(it); DPRINT(MAX_TRACE, ("Deleting file node: '%s'\n", CurNode->FileName.c_str())); @@ -2312,7 +2199,10 @@ void CCabinet::DestroyDeletedFileNodes() delete CurNode; } - CurNode = NextNode; + else + { + it++; + } } } @@ -2322,19 +2212,12 @@ void CCabinet::DestroyFolderNodes() * FUNCTION: Destroys folder nodes */ { - PCFFOLDER_NODE PrevNode; - PCFFOLDER_NODE NextNode; - - NextNode = FolderListHead; - while (NextNode != NULL) + for (PCFFOLDER_NODE Node : FolderList) { - PrevNode = NextNode->Next; - DestroyDataNodes(NextNode); - delete NextNode; - NextNode = PrevNode; + DestroyDataNodes(Node); + delete Node; } - FolderListHead = NULL; - FolderListTail = NULL; + FolderList.clear(); } @@ -2343,40 +2226,23 @@ void CCabinet::DestroyDeletedFolderNodes() * FUNCTION: Destroys folder nodes that are marked for deletion */ { - PCFFOLDER_NODE CurNode; - PCFFOLDER_NODE NextNode; - - CurNode = FolderListHead; - while (CurNode != NULL) + for (auto it = FolderList.begin(); it != FolderList.end();) { - NextNode = CurNode->Next; + PCFFOLDER_NODE CurNode = *it; if (CurNode->Delete) { - if (CurNode->Prev != NULL) - CurNode->Prev->Next = CurNode->Next; - else - { - FolderListHead = CurNode->Next; - if (FolderListHead) - FolderListHead->Prev = NULL; - } - - if (CurNode->Next != NULL) - CurNode->Next->Prev = CurNode->Prev; - else - { - FolderListTail = CurNode->Prev; - if (FolderListTail) - FolderListTail->Next = NULL; - } + it = FolderList.erase(it); DestroyDataNodes(CurNode); delete CurNode; TotalFolderSize -= sizeof(CFFOLDER); } - CurNode = NextNode; + else + { + it++; + } } } @@ -2611,8 +2477,6 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) * Status of operation */ { - PCFFOLDER_NODE FolderNode; - PCFFILE_NODE FileNode; ULONG BytesWritten; ULONG Size; @@ -2631,16 +2495,13 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) /* Set absolute folder offsets */ BytesWritten = Size + TotalFolderSize + TotalFileSize; CABHeader.FolderCount = 0; - FolderNode = FolderListHead; - while (FolderNode != NULL) + for (PCFFOLDER_NODE FolderNode : FolderList) { FolderNode->Folder.DataOffset = BytesWritten; BytesWritten += FolderNode->TotalFolderSize; CABHeader.FolderCount++; - - FolderNode = FolderNode->Next; } /* Set absolute offset of file table */ @@ -2648,12 +2509,10 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) /* Count number of files to be committed */ CABHeader.FileCount = 0; - FileNode = FileListHead; - while (FileNode != NULL) + for (PCFFILE_NODE FileNode : FileList) { if (FileNode->Commit) CABHeader.FileCount++; - FileNode = FileNode->Next; } CABHeader.CabinetSize = DiskSize; @@ -2750,12 +2609,9 @@ ULONG CCabinet::WriteFolderEntries() * Status of operation */ { - PCFFOLDER_NODE FolderNode; - DPRINT(MAX_TRACE, ("Writing folder table.\n")); - FolderNode = FolderListHead; - while (FolderNode != NULL) + for (PCFFOLDER_NODE FolderNode : FolderList) { if (FolderNode->Commit) { @@ -2768,7 +2624,6 @@ ULONG CCabinet::WriteFolderEntries() return CAB_STATUS_CANNOT_WRITE; } } - FolderNode = FolderNode->Next; } return CAB_STATUS_SUCCESS; @@ -2782,13 +2637,11 @@ ULONG CCabinet::WriteFileEntries() * Status of operation */ { - PCFFILE_NODE File; bool SetCont = false; DPRINT(MAX_TRACE, ("Writing file table.\n")); - File = FileListHead; - while (File != NULL) + for (PCFFILE_NODE File : FileList) { if (File->Commit) { @@ -2829,8 +2682,6 @@ ULONG CCabinet::WriteFileEntries() SetCont = false; } } - - File = File->Next; } return CAB_STATUS_SUCCESS; } @@ -2845,15 +2696,13 @@ ULONG CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) * Status of operation */ { - PCFDATA_NODE DataNode; ULONG BytesRead; ULONG Status; - DataNode = FolderNode->DataListHead; - if (DataNode != NULL) - Status = ScratchFile->Seek(DataNode->ScratchFilePosition); + if (!FolderNode->DataList.empty()) + Status = ScratchFile->Seek(FolderNode->DataList.front()->ScratchFilePosition); - while (DataNode != NULL) + for (PCFDATA_NODE DataNode : FolderNode->DataList) { DPRINT(MAX_TRACE, ("Reading block at (0x%X) CompSize (%u) UncompSize (%u).\n", (UINT)DataNode->ScratchFilePosition, @@ -2881,8 +2730,6 @@ ULONG CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } - - DataNode = DataNode->Next; } return CAB_STATUS_SUCCESS; } diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index a78d3553d6d..0940436d975 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -26,6 +26,7 @@ #include <string.h> #include <limits.h> #include <string> +#include <list> #ifndef PATH_MAX #define PATH_MAX MAX_PATH @@ -204,8 +205,6 @@ C_ASSERT(sizeof(CFDATA) == 8); typedef struct _CFDATA_NODE { - struct _CFDATA_NODE *Next = nullptr; - struct _CFDATA_NODE *Prev = nullptr; ULONG ScratchFilePosition = 0; // Absolute offset in scratch file ULONG AbsoluteOffset = 0; // Absolute offset in cabinet ULONG UncompOffset = 0; // Uncompressed offset in folder @@ -214,13 +213,10 @@ typedef struct _CFDATA_NODE typedef struct _CFFOLDER_NODE { - struct _CFFOLDER_NODE *Next = nullptr; - struct _CFFOLDER_NODE *Prev = nullptr; ULONG UncompOffset = 0; // File size accumulator ULONG AbsoluteOffset = 0; ULONG TotalFolderSize = 0; // Total size of folder in current disk - PCFDATA_NODE DataListHead = nullptr; - PCFDATA_NODE DataListTail = nullptr; + std::list<PCFDATA_NODE> DataList; ULONG Index = 0; bool Commit = false; // true if the folder should be committed bool Delete = false; // true if marked for deletion @@ -229,8 +225,6 @@ typedef struct _CFFOLDER_NODE typedef struct _CFFILE_NODE { - struct _CFFILE_NODE *Next = nullptr; - struct _CFFILE_NODE *Prev = nullptr; CFFILE File = { 0 }; std::string FileName; PCFDATA_NODE DataBlock = nullptr; // First data block of file. NULL if not known @@ -241,14 +235,12 @@ typedef struct _CFFILE_NODE typedef struct _SEARCH_CRITERIA { - struct _SEARCH_CRITERIA *Next = nullptr; // Pointer to next search criteria - struct _SEARCH_CRITERIA *Prev = nullptr; // Pointer to previous search criteria std::string Search; // The actual search criteria } SEARCH_CRITERIA, *PSEARCH_CRITERIA; typedef struct _CAB_SEARCH { - PCFFILE_NODE Next = nullptr; // Pointer to next node + std::list<PCFFILE_NODE>::iterator Next; // Pointer to next node PCFFILE File = nullptr; // Pointer to current CFFILE std::string FileName; // Current filename } CAB_SEARCH, *PCAB_SEARCH; @@ -456,14 +448,11 @@ private: ULONG CabinetReserved; ULONG FolderReserved; ULONG DataReserved; - PCFFOLDER_NODE FolderListHead; - PCFFOLDER_NODE FolderListTail; + std::list<PCFFOLDER_NODE> FolderList; PCFFOLDER_NODE CurrentFolderNode; PCFDATA_NODE CurrentDataNode; - PCFFILE_NODE FileListHead; - PCFFILE_NODE FileListTail; - PSEARCH_CRITERIA CriteriaListHead; - PSEARCH_CRITERIA CriteriaListTail; + std::list<PCFFILE_NODE> FileList; + std::list<PSEARCH_CRITERIA> CriteriaList; CCABCodec *Codec; LONG CodecId; bool CodecSelected;

1 0

[reactos] 01/01: [FONTEXT] Initial implementation of CFontExt::DoGetFontTitle (#3127)
by Katayama Hirofumi MZ 12 Sep '20

12 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=183e1eb71bf4df393ecc8… commit 183e1eb71bf4df393ecc84d49e524cfa1ff05c4a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 12 09:40:48 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 12 09:40:48 2020 +0900 [FONTEXT] Initial implementation of CFontExt::DoGetFontTitle (#3127) This PR is a preparation of fonts folder implementation. CORE-12861 --- dll/shellext/fontext/CFontExt.cpp | 36 ++++++++++++++++++++++++++---------- dll/shellext/fontext/CFontExt.hpp | 2 +- sdk/include/reactos/undocgdi.h | 32 ++++++++++++++++++++++---------- 3 files changed, 49 insertions(+), 21 deletions(-) diff --git a/dll/shellext/fontext/CFontExt.cpp b/dll/shellext/fontext/CFontExt.cpp index c157104c7e9..03d03f420b1 100644 --- a/dll/shellext/fontext/CFontExt.cpp +++ b/dll/shellext/fontext/CFontExt.cpp @@ -7,6 +7,7 @@ */ #include "precomp.h" +#include "undocgdi.h" // for GetFontResourceInfoW WINE_DEFAULT_DEBUG_CHANNEL(fontext); @@ -454,12 +455,8 @@ STDMETHODIMP CFontExt::DragEnter(IDataObject* pDataObj, DWORD grfKeyState, POINT if (FAILED_UNEXPECTEDLY(hr)) return hr; -#if 1 // Please implement DoGetFontTitle - return DRAGDROP_S_CANCEL; -#else *pdwEffect = DROPEFFECT_COPY; return S_OK; -#endif } STDMETHODIMP CFontExt::DragOver(DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) @@ -567,8 +564,8 @@ HRESULT CFontExt::DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HK WCHAR szDestFile[MAX_PATH]; LPCWSTR pszFileTitle = PathFindFileName(pszFontPath); - WCHAR szFontName[512]; - if (!DoGetFontTitle(pszFontPath, szFontName)) + CStringW strFontName; + if (!DoGetFontTitle(pszFontPath, strFontName)) return E_FAIL; RemoveFontResourceW(pszFileTitle); @@ -581,7 +578,7 @@ HRESULT CFontExt::DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HK return E_FAIL; } - if (!AddFontResourceW(pszFileTitle)) + if (!AddFontResourceW(szDestFile)) { ERR("AddFontResourceW('%S') failed\n", pszFileTitle); DeleteFileW(szDestFile); @@ -589,7 +586,8 @@ HRESULT CFontExt::DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HK } DWORD cbData = (wcslen(pszFileTitle) + 1) * sizeof(WCHAR); - LONG nError = RegSetValueExW(hkeyFonts, szFontName, 0, REG_SZ, (const BYTE *)szFontName, cbData); + LONG nError = RegSetValueExW(hkeyFonts, strFontName, 0, REG_SZ, + (const BYTE *)pszFileTitle, cbData); if (nError) { ERR("RegSetValueExW failed with %ld\n", nError); @@ -601,8 +599,26 @@ HRESULT CFontExt::DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HK return S_OK; } -HRESULT CFontExt::DoGetFontTitle(LPCWSTR pszFontPath, LPCWSTR pszFontName) +HRESULT +CFontExt::DoGetFontTitle(IN LPCWSTR pszFontPath, OUT CStringW& strFontName) { - // TODO: + DWORD cbInfo = 0; + BOOL ret = GetFontResourceInfoW(pszFontPath, &cbInfo, NULL, 1); + if (!ret || !cbInfo) + { + ERR("GetFontResourceInfoW failed\n"); + return E_FAIL; + } + + LPWSTR pszBuffer = strFontName.GetBuffer(cbInfo / sizeof(WCHAR)); + ret = GetFontResourceInfoW(pszFontPath, &cbInfo, pszBuffer, 1); + strFontName.ReleaseBuffer(); + if (ret) + { + TRACE("pszFontName: %S\n", (LPCWSTR)strFontName); + return S_OK; + } + + ERR("GetFontResourceInfoW failed\n"); return E_FAIL; } diff --git a/dll/shellext/fontext/CFontExt.hpp b/dll/shellext/fontext/CFontExt.hpp index 6e3a178042d..ba868628957 100644 --- a/dll/shellext/fontext/CFontExt.hpp +++ b/dll/shellext/fontext/CFontExt.hpp @@ -93,5 +93,5 @@ public: END_COM_MAP() HRESULT DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HKEY hkeyFonts); - HRESULT DoGetFontTitle(LPCWSTR pszFontPath, LPCWSTR pszFontName); + HRESULT DoGetFontTitle(IN LPCWSTR pszFontPath, OUT CStringW& strFontName); }; diff --git a/sdk/include/reactos/undocgdi.h b/sdk/include/reactos/undocgdi.h index 9abdbef9443..5826d4e9540 100644 --- a/sdk/include/reactos/undocgdi.h +++ b/sdk/include/reactos/undocgdi.h @@ -2,6 +2,10 @@ #ifndef _UNDOCGDI_H #define _UNDOCGDI_H +#ifdef __cplusplus +extern "C" { +#endif + #define DS_TILE 0x2 #define DS_TRANSPARENTALPHA 0x4 #define DS_TRANSPARENTCLR 0x8 @@ -26,19 +30,27 @@ typedef struct GDI_DRAW_STREAM_TAG DWORD crTransparent; // transparent color. } GDI_DRAW_STREAM, *PGDI_DRAW_STREAM; -BOOL -WINAPI -GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS); +BOOL WINAPI GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS); -BOOL -WINAPI +BOOL WINAPI GetTextExtentExPointWPri( HDC hdc, - LPCWSTR lpwsz, + LPCWSTR lpwsz, INT cwc, - INT dxMax, - LPINT pcCh, - LPINT pdxOut, + INT dxMax, + LPINT pcCh, + LPINT pdxOut, LPSIZE psize); -#endif \ No newline at end of file +BOOL WINAPI +GetFontResourceInfoW( + _In_z_ LPCWSTR lpFileName, + _Inout_ DWORD *pdwBufSize, + _Out_writes_to_opt_(*pdwBufSize, 1) PVOID lpBuffer, + _In_ DWORD dwType); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif

1 0

[reactos] 01/01: [CERTUTIL] Add skeleton application with support for -hashfile
by Mark Jansen 11 Sep '20

11 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee69ca786af5e2d13c380… commit ee69ca786af5e2d13c380323d784909f92f80649 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 10 23:40:52 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Sep 11 15:29:28 2020 +0200 [CERTUTIL] Add skeleton application with support for -hashfile --- base/applications/cmdutils/CMakeLists.txt | 1 + base/applications/cmdutils/certutil/CMakeLists.txt | 13 ++ base/applications/cmdutils/certutil/certutil.c | 155 +++++++++++++++++++++ base/applications/cmdutils/certutil/precomp.h | 16 +++ 4 files changed, 185 insertions(+) diff --git a/base/applications/cmdutils/CMakeLists.txt b/base/applications/cmdutils/CMakeLists.txt index d2a800ca416..dd8a7ab2b06 100644 --- a/base/applications/cmdutils/CMakeLists.txt +++ b/base/applications/cmdutils/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(at) add_subdirectory(attrib) +add_subdirectory(certutil) add_subdirectory(chcp) add_subdirectory(clip) add_subdirectory(comp) diff --git a/base/applications/cmdutils/certutil/CMakeLists.txt b/base/applications/cmdutils/certutil/CMakeLists.txt new file mode 100644 index 00000000000..bb9cd3a2fde --- /dev/null +++ b/base/applications/cmdutils/certutil/CMakeLists.txt @@ -0,0 +1,13 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +list(APPEND SOURCE + certutil.c + precomp.h) + +add_executable(certutil ${SOURCE}) +set_module_type(certutil win32cui UNICODE) +target_link_libraries(certutil conutils ${PSEH_LIB}) +add_importlibs(certutil advapi32 msvcrt kernel32) +add_pch(certutil precomp.h SOURCE) +add_cd_file(TARGET certutil DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/certutil/certutil.c b/base/applications/cmdutils/certutil/certutil.c new file mode 100644 index 00000000000..7d6d2d68987 --- /dev/null +++ b/base/applications/cmdutils/certutil/certutil.c @@ -0,0 +1,155 @@ +/* + * PROJECT: ReactOS certutil + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CertUtil stub + * COPYRIGHT: Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) + * + * Note: Only -hashfile is implemented for now, the rest is not present! + */ + +#include "precomp.h" +#include <wincrypt.h> +#include <stdlib.h> + + +static BOOL hash_file(LPCWSTR Filename) +{ + HCRYPTPROV hProv; + BOOL bSuccess = FALSE; + + HANDLE hFile = CreateFileW(Filename, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + ConPrintf(StdOut, L"CertUtil: -hashfile command failed: %d\n", GetLastError()); + return bSuccess; + } + + if (CryptAcquireContextW(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + { + HCRYPTHASH hHash; + + if (CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash)) + { + BYTE Buffer[2048]; + DWORD cbRead; + + while ((bSuccess = ReadFile(hFile, Buffer, sizeof(Buffer), &cbRead, NULL))) + { + if (cbRead == 0) + break; + + if (!CryptHashData(hHash, Buffer, cbRead, 0)) + { + bSuccess = FALSE; + ConPrintf(StdOut, L"CertUtil: -hashfile command failed to hash: %d\n", GetLastError()); + break; + } + } + + if (bSuccess) + { + BYTE rgbHash[20]; + DWORD cbHash, n; + + if (CryptGetHashParam(hHash, HP_HASHVAL, rgbHash, &cbHash, 0)) + { + ConPrintf(StdOut, L"SHA1 hash of %s:\n", Filename); + for (n = 0; n < cbHash; ++n) + { + ConPrintf(StdOut, L"%02x", rgbHash[n]); + } + ConPuts(StdOut, L"\n"); + } + else + { + ConPrintf(StdOut, L"CertUtil: -hashfile command failed to extract hash: %d\n", GetLastError()); + bSuccess = FALSE; + } + } + + CryptDestroyHash(hHash); + } + else + { + ConPrintf(StdOut, L"CertUtil: -hashfile command no algorithm: %d\n", GetLastError()); + } + + CryptReleaseContext(hProv, 0); + } + else + { + ConPrintf(StdOut, L"CertUtil: -hashfile command no context: %d\n", GetLastError()); + } + + CloseHandle(hFile); + return bSuccess; +} + + +static void print_usage() +{ + ConPuts(StdOut, L"Verbs:\n"); + ConPuts(StdOut, L" -hashfile -- Display cryptographic hash over a file\n"); + ConPuts(StdOut, L"\n"); + ConPuts(StdOut, L"CertUtil -? -- Display a list of all verbs\n"); + ConPuts(StdOut, L"CertUtil -hashfile -? -- Display help text for the 'hashfile' verb\n"); +} + +int wmain(int argc, WCHAR *argv[]) +{ + int n; + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + + if (argc == 1) /* i.e. no commandline arguments given */ + { + print_usage(); + return EXIT_SUCCESS; + } + + for (n = 1; n < argc; ++n) + { + if (!_wcsicmp(argv[n], L"-?")) + { + print_usage(); + return EXIT_SUCCESS; + } + else if (!_wcsicmp(argv[n], L"-hashfile")) + { + if (argc == 3) + { + if (!_wcsicmp(argv[n+1], L"-?")) + { + print_usage(); + return EXIT_SUCCESS; + } + else + { + if (!hash_file(argv[n+1])) + { + /* hash_file prints the failure itself */ + return EXIT_FAILURE; + } + + ConPuts(StdOut, L"CertUtil: -hashfile command completed successfully\n"); + return EXIT_SUCCESS; + } + } + else + { + ConPrintf(StdOut, L"CertUtil: -hashfile expected 1 argument, got %d\n", argc - 2); + return EXIT_FAILURE; + } + } + else + { + ConPrintf(StdOut, L"CertUtil: Unknown verb: %s\n", argv[n]); + return EXIT_FAILURE; + } + } + + return EXIT_SUCCESS; +} diff --git a/base/applications/cmdutils/certutil/precomp.h b/base/applications/cmdutils/certutil/precomp.h new file mode 100644 index 00000000000..0c8e115bf5e --- /dev/null +++ b/base/applications/cmdutils/certutil/precomp.h @@ -0,0 +1,16 @@ +#ifndef __CERTUTIL_PRECOMP_H +#define __CERTUTIL_PRECOMP_H + +/* INCLUDES ******************************************************************/ + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> + +#include <conutils.h> + + +#endif /* __CERTUTIL_PRECOMP_H */

1 0

[reactos] 01/01: [FILESYSTEMS] Fix pool memory disclosure in filesystem drivers supporting FS_INFORMATION_CLASS.FileFsVolumeInformation (#2975)
by Nguyen Trung Khanh 11 Sep '20

11 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=166f815e7b66966e5703c… commit 166f815e7b66966e5703c15275e3620bbedcd8a4 Author: Nguyen Trung Khanh <nguyentrungkhanh97(a)gmail.com> AuthorDate: Fri Sep 11 19:51:35 2020 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 11 15:51:35 2020 +0300 [FILESYSTEMS] Fix pool memory disclosure in filesystem drivers supporting FS_INFORMATION_CLASS.FileFsVolumeInformation (#2975) * FileFsVolumeInformation-memory-disclosure * remove unnecessary assignment to 0 * fix --- drivers/filesystems/cdfs/volinfo.c | 4 ++++ drivers/filesystems/fastfat/volume.c | 3 ++- drivers/filesystems/nfs/nfs41_driver.c | 4 ++++ drivers/filesystems/npfs/volinfo.c | 8 ++------ drivers/filesystems/udfs/volinfo.cpp | 3 +++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/filesystems/cdfs/volinfo.c b/drivers/filesystems/cdfs/volinfo.c index f61c9758868..0a0ef10bd57 100644 --- a/drivers/filesystems/cdfs/volinfo.c +++ b/drivers/filesystems/cdfs/volinfo.c @@ -160,6 +160,10 @@ Return Value: // and false if it couldn't wait for any I/O to complete. // +#ifdef __REACTOS__ + RtlZeroMemory(Irp->AssociatedIrp.SystemBuffer, Length); +#endif // __REACTOS__ + switch (IrpSp->Parameters.QueryVolume.FsInformationClass) { case FileFsSizeInformation: diff --git a/drivers/filesystems/fastfat/volume.c b/drivers/filesystems/fastfat/volume.c index f4f8f738ebf..e1eba1fd2a7 100644 --- a/drivers/filesystems/fastfat/volume.c +++ b/drivers/filesystems/fastfat/volume.c @@ -48,7 +48,6 @@ FsdGetFsVolumeInformation( RtlCopyMemory(FsVolumeInfo->VolumeLabel, DeviceObject->Vpb->VolumeLabel, *BufferLength); - *BufferLength = 0; } else { @@ -457,6 +456,8 @@ VfatQueryVolumeInformation( DPRINT("FsInformationClass %d\n", FsInformationClass); DPRINT("SystemBuffer %p\n", SystemBuffer); + RtlZeroMemory(SystemBuffer, BufferLength); + switch (FsInformationClass) { case FileFsVolumeInformation: diff --git a/drivers/filesystems/nfs/nfs41_driver.c b/drivers/filesystems/nfs/nfs41_driver.c index 90b57c8f270..86e8b594a9b 100644 --- a/drivers/filesystems/nfs/nfs41_driver.c +++ b/drivers/filesystems/nfs/nfs41_driver.c @@ -4546,6 +4546,10 @@ NTSTATUS nfs41_QueryVolumeInformation( status = check_nfs41_dirquery_args(RxContext); if (status) goto out; +#ifdef __REACTOS__ + RtlZeroMemory(RxContext->Info.Buffer, RxContext->Info.LengthRemaining); +#endif // __REACTOS__ + switch (InfoClass) { case FileFsVolumeInformation: if ((ULONG)RxContext->Info.LengthRemaining >= DevExt->VolAttrsLen) { diff --git a/drivers/filesystems/npfs/volinfo.c b/drivers/filesystems/npfs/volinfo.c index 4e3cf9f9229..36fe75f349a 100644 --- a/drivers/filesystems/npfs/volinfo.c +++ b/drivers/filesystems/npfs/volinfo.c @@ -27,8 +27,6 @@ NpQueryFsVolumeInfo(IN PVOID Buffer, *Length -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel); - InfoBuffer->VolumeCreationTime.QuadPart = 0; - InfoBuffer->VolumeSerialNumber = 0; InfoBuffer->SupportsObjects = 0; NameLength = 18; @@ -61,8 +59,6 @@ NpQueryFsSizeInfo(IN PVOID Buffer, *Length -= sizeof(*InfoBuffer); - InfoBuffer->TotalAllocationUnits.QuadPart = 0; - InfoBuffer->AvailableAllocationUnits.QuadPart = 0; InfoBuffer->SectorsPerAllocationUnit = 1; InfoBuffer->BytesPerSector = 1; @@ -78,8 +74,6 @@ NpQueryFsDeviceInfo(IN PVOID Buffer, PFILE_FS_DEVICE_INFORMATION InfoBuffer = Buffer; TRACE("Entered\n"); - InfoBuffer->DeviceType = 0; - InfoBuffer->Characteristics = 0; InfoBuffer->DeviceType = FILE_DEVICE_NAMED_PIPE; *Length -= sizeof(*InfoBuffer); @@ -153,6 +147,8 @@ NpCommonQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, Length = IoStack->Parameters.QueryVolume.Length; InfoClass = IoStack->Parameters.QueryVolume.FsInformationClass; + RtlZeroMemory(Buffer, Length); + switch (InfoClass) { case FileFsVolumeInformation: diff --git a/drivers/filesystems/udfs/volinfo.cpp b/drivers/filesystems/udfs/volinfo.cpp index 2197fb29611..470e9113516 100644 --- a/drivers/filesystems/udfs/volinfo.cpp +++ b/drivers/filesystems/udfs/volinfo.cpp @@ -197,6 +197,9 @@ UDFCommonQueryVolInfo( try_return(RC); } #endif //UDF_ENABLE_SECURITY + + RtlZeroMemory(Irp->AssociatedIrp.SystemBuffer, Length); + switch (IrpSp->Parameters.QueryVolume.FsInformationClass) { case FileFsVolumeInformation:

1 0

[reactos] 01/01: [FILESYSTEMS] Fix pool memory disclosure in NtQueryAttributesFile handlers (#2926)
by Nguyen Trung Khanh 11 Sep '20

11 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ede7a20a17e59476a181b… commit ede7a20a17e59476a181b326d6050b12580f7813 Author: Nguyen Trung Khanh <nguyentrungkhanh97(a)gmail.com> AuthorDate: Fri Sep 11 19:47:43 2020 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 11 15:47:43 2020 +0300 [FILESYSTEMS] Fix pool memory disclosure in NtQueryAttributesFile handlers (#2926) Fix pool memory disclosure caused by alignment bytes at the end of the _FILE_BASIC_INFORMATION structure --- drivers/filesystems/cdfs/fileinfo.c | 2 ++ drivers/filesystems/fastfat/finfo.c | 2 ++ drivers/filesystems/ntfs/finfo.c | 2 ++ drivers/filesystems/reiserfs/src/fileinfo.c | 4 +++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/cdfs/fileinfo.c b/drivers/filesystems/cdfs/fileinfo.c index 62c929bac4a..40056c586f6 100644 --- a/drivers/filesystems/cdfs/fileinfo.c +++ b/drivers/filesystems/cdfs/fileinfo.c @@ -899,6 +899,8 @@ Return Value: // We only support creation, last modify and last write times on Cdfs. // + RtlZeroMemory(Buffer, sizeof(FILE_BASIC_INFORMATION)); + Buffer->LastWriteTime.QuadPart = Buffer->CreationTime.QuadPart = Buffer->ChangeTime.QuadPart = Fcb->CreationTime; diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index 576adb2e18d..755ba6a9917 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -293,6 +293,8 @@ VfatGetBasicInformation( if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_OVERFLOW; + RtlZeroMemory(BasicInfo, sizeof(FILE_BASIC_INFORMATION)); + if (vfatVolumeIsFatX(DeviceExt)) { FsdDosDateTimeToSystemTime(DeviceExt, diff --git a/drivers/filesystems/ntfs/finfo.c b/drivers/filesystems/ntfs/finfo.c index d7a55cbad39..757c971e159 100644 --- a/drivers/filesystems/ntfs/finfo.c +++ b/drivers/filesystems/ntfs/finfo.c @@ -107,6 +107,8 @@ NtfsGetBasicInformation(PFILE_OBJECT FileObject, if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; + RtlZeroMemory(BasicInfo, sizeof(FILE_BASIC_INFORMATION)); + BasicInfo->CreationTime.QuadPart = FileName->CreationTime; BasicInfo->LastAccessTime.QuadPart = FileName->LastAccessTime; BasicInfo->LastWriteTime.QuadPart = FileName->LastWriteTime; diff --git a/drivers/filesystems/reiserfs/src/fileinfo.c b/drivers/filesystems/reiserfs/src/fileinfo.c index 4e24380b68b..8e7c16b94d5 100644 --- a/drivers/filesystems/reiserfs/src/fileinfo.c +++ b/drivers/filesystems/reiserfs/src/fileinfo.c @@ -3,7 +3,7 @@ * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: fileinfo.c * PURPOSE: - * PROGRAMMER: Mark Piper, Matt Wu, Bo Brant�n. + * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. * HOMEPAGE: * UPDATE HISTORY: */ @@ -140,6 +140,8 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) } FileBasicInformation = (PFILE_BASIC_INFORMATION) Buffer; + + RtlZeroMemory(FileBasicInformation, sizeof(FILE_BASIC_INFORMATION)); FileBasicInformation->CreationTime = RfsdSysTime(Fcb->Inode->i_ctime);

1 0

[reactos] 01/01: [SHELL32] Fix regression CORE-12364
by Joachim Henze 11 Sep '20

11 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35dbdaaa0ee79f4fb064b… commit 35dbdaaa0ee79f4fb064bc10446b75961369168e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Sep 11 02:24:42 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Sep 11 02:24:42 2020 +0200 [SHELL32] Fix regression CORE-12364 The sorting in explorer broke by SVN r73128 == git 24fcf531e78423b314a2d6a4ac750df69e478e3a Thanks to Doug Lyons for providing this patch. I do intend to port it back into 0.4.14RC. --- dll/win32/shell32/folders/CRegFolder.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 6398109247d..6dc12770212 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -474,7 +474,15 @@ HRESULT WINAPI CRegFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, P } /* Guid folders come first compared to everything else */ - return MAKE_COMPARE_HRESULT(clsid1 ? -1 : 1); + /* And Drives come before folders in My Computer */ + if (_ILIsMyComputer(m_pidlRoot)) + { + return MAKE_COMPARE_HRESULT(clsid1 ? 1 : -1); + } + else + { + return MAKE_COMPARE_HRESULT(clsid1 ? -1 : 1); + } } HRESULT WINAPI CRegFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut)

1 0

[reactos] 01/01: [SHELL32] Show "size on disk" in file/folder properties (#3107)
by Kyle Katarn 10 Sep '20

10 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d44c1cb0729b37d76575… commit 7d44c1cb0729b37d7657585f3740c68030e755d8 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Thu Sep 10 20:48:40 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 10 20:48:40 2020 +0200 [SHELL32] Show "size on disk" in file/folder properties (#3107) Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> Co-authored-by: Adam Stachowicz <saibamenppl(a)gmail.com> --- dll/win32/shell32/dialogs/filedefext.cpp | 118 +++++++++++++++++++++++++------ dll/win32/shell32/dialogs/filedefext.h | 4 +- 2 files changed, 97 insertions(+), 25 deletions(-) diff --git a/dll/win32/shell32/dialogs/filedefext.cpp b/dll/win32/shell32/dialogs/filedefext.cpp index f4b587dae1e..edcb44ff1b4 100644 --- a/dll/win32/shell32/dialogs/filedefext.cpp +++ b/dll/win32/shell32/dialogs/filedefext.cpp @@ -21,10 +21,64 @@ #include "precomp.h" +#define NTOS_MODE_USER +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> + WINE_DEFAULT_DEBUG_CHANNEL(shell); EXTERN_C BOOL PathIsExeW(LPCWSTR lpszPath); +BOOL GetPhysicalFileSize(LPCWSTR PathBuffer, PULARGE_INTEGER Size) +{ + UNICODE_STRING FileName; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + FILE_STANDARD_INFORMATION FileInfo; + NTSTATUS Status; + + if (!RtlDosPathNameToNtPathName_U(PathBuffer, &FileName, NULL, NULL)) + { + ERR("RtlDosPathNameToNtPathName_U failed\n"); + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&FileHandle, + FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + RtlFreeUnicodeString(&FileName); + if (!NT_SUCCESS(Status)) + { + ERR("NtOpenFile failed for %S (Status 0x%08lx)\n", PathBuffer, Status); + return FALSE; + } + + /* Query the file size */ + Status = NtQueryInformationFile(FileHandle, + &IoStatusBlock, + &FileInfo, + sizeof(FileInfo), + FileStandardInformation); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + ERR("NtQueryInformationFile failed for %S (Status: %08lX)\n", PathBuffer, Status); + return FALSE; + } + + Size->QuadPart = FileInfo.AllocationSize.QuadPart; + return TRUE; +} + BOOL CFileVersionInfo::Load(LPCWSTR pwszPath) { ULONG cbInfo = GetFileVersionInfoSizeW(pwszPath, NULL); @@ -552,7 +606,17 @@ CFileDefExt::InitFileAttr(HWND hwndDlg) FileSize.u.LowPart = FileInfo.nFileSizeLow; FileSize.u.HighPart = FileInfo.nFileSizeHigh; if (SH_FormatFileSizeWithBytes(&FileSize, wszBuf, _countof(wszBuf))) + { SetDlgItemTextW(hwndDlg, 14011, wszBuf); + + // Compute file on disk. If fails, use logical size + if (GetPhysicalFileSize(m_wszPath, &FileSize)) + SH_FormatFileSizeWithBytes(&FileSize, wszBuf, _countof(wszBuf)); + else + ERR("Unreliable size on disk\n"); + + SetDlgItemTextW(hwndDlg, 14012, wszBuf); + } } } @@ -562,8 +626,7 @@ CFileDefExt::InitFileAttr(HWND hwndDlg) _CountFolderAndFilesData *data = static_cast<_CountFolderAndFilesData*>(HeapAlloc(GetProcessHeap(), 0, sizeof(_CountFolderAndFilesData))); data->This = this; - data->pwszBuf = static_cast<LPWSTR>(HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * MAX_PATH)); - data->cchBufMax = MAX_PATH; + data->pwszBuf = static_cast<LPWSTR>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR) * MAX_PATH)); data->hwndDlg = hwndDlg; this->AddRef(); StringCchCopyW(data->pwszBuf, MAX_PATH, m_wszPath); @@ -574,6 +637,9 @@ CFileDefExt::InitFileAttr(HWND hwndDlg) if (SH_FormatFileSizeWithBytes(&m_DirSize, wszBuf, _countof(wszBuf))) SetDlgItemTextW(hwndDlg, 14011, wszBuf); + if (SH_FormatFileSizeWithBytes(&m_DirSizeOnDisc, wszBuf, _countof(wszBuf))) + SetDlgItemTextW(hwndDlg, 14012, wszBuf); + /* Display files and folders count */ WCHAR wszFormat[256]; LoadStringW(shell32_hInstance, IDS_FILE_FOLDER, wszFormat, _countof(wszFormat)); @@ -1159,6 +1225,7 @@ CFileDefExt::CFileDefExt(): { m_wszPath[0] = L'\0'; m_DirSize.QuadPart = 0ull; + m_DirSizeOnDisc.QuadPart = 0ull; m_szFolderIconPath[0] = 0; m_nFolderIconIndex = 0; @@ -1293,7 +1360,7 @@ CFileDefExt::_CountFolderAndFilesThreadProc(LPVOID lpParameter) { _CountFolderAndFilesData *data = static_cast<_CountFolderAndFilesData*>(lpParameter); DWORD ticks = 0; - data->This->CountFolderAndFiles(data->hwndDlg, data->pwszBuf, data->cchBufMax, &ticks); + data->This->CountFolderAndFiles(data->hwndDlg, data->pwszBuf, &ticks); //Release the CFileDefExt and data object holds in the copying thread. data->This->Release(); @@ -1304,25 +1371,19 @@ CFileDefExt::_CountFolderAndFilesThreadProc(LPVOID lpParameter) } BOOL -CFileDefExt::CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, DWORD *ticks) +CFileDefExt::CountFolderAndFiles(HWND hwndDlg, LPCWSTR pwszBuf, DWORD *ticks) { - /* Find filename position */ - UINT cchBuf = wcslen(pwszBuf); - WCHAR *pwszFilename = pwszBuf + cchBuf; - size_t cchFilenameMax = cchBufMax - cchBuf; - if (!cchFilenameMax) - return FALSE; - *(pwszFilename++) = '\\'; - --cchFilenameMax; - - /* Find all files, FIXME: shouldn't be "*"? */ - StringCchCopyW(pwszFilename, cchFilenameMax, L"*"); + CString sBuf = pwszBuf; + sBuf += L"\\" ; + CString sSearch = sBuf; + sSearch += L"*" ; + CString sFileName; WIN32_FIND_DATAW wfd; - HANDLE hFind = FindFirstFileW(pwszBuf, &wfd); + HANDLE hFind = FindFirstFileW(sSearch, &wfd); if (hFind == INVALID_HANDLE_VALUE) { - ERR("FindFirstFileW %ls failed\n", pwszBuf); + ERR("FindFirstFileW %ls failed\n", sSearch.GetString()); return FALSE; } @@ -1334,6 +1395,8 @@ CFileDefExt::CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, D do { + sFileName = sBuf; + sFileName += wfd.cFileName; if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* Don't process "." and ".." items */ @@ -1342,8 +1405,7 @@ CFileDefExt::CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, D ++m_cFolders; - StringCchCopyW(pwszFilename, cchFilenameMax, wfd.cFileName); - CountFolderAndFiles(hwndDlg, pwszBuf, cchBufMax, ticks); + CountFolderAndFiles(hwndDlg, sFileName, ticks); } else { @@ -1353,19 +1415,26 @@ CFileDefExt::CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, D FileSize.u.LowPart = wfd.nFileSizeLow; FileSize.u.HighPart = wfd.nFileSizeHigh; m_DirSize.QuadPart += FileSize.QuadPart; + // Calculate size on disc + if (!GetPhysicalFileSize(sFileName.GetString(), &FileSize)) + ERR("GetPhysicalFileSize failed for %ls\n", sFileName.GetString()); + m_DirSizeOnDisc.QuadPart += FileSize.QuadPart; } if (GetTickCount() - *ticks > (DWORD) 300) { /* FIXME Using IsWindow is generally ill advised */ if (IsWindow(hwndDlg)) { - WCHAR wszBuf[MAX_PATH]; + WCHAR wszBuf[100]; if (SH_FormatFileSizeWithBytes(&m_DirSize, wszBuf, _countof(wszBuf))) SetDlgItemTextW(hwndDlg, 14011, wszBuf); + if (SH_FormatFileSizeWithBytes(&m_DirSizeOnDisc, wszBuf, _countof(wszBuf))) + SetDlgItemTextW(hwndDlg, 14012, wszBuf); + /* Display files and folders count */ - WCHAR wszFormat[256]; + WCHAR wszFormat[100]; LoadStringW(shell32_hInstance, IDS_FILE_FOLDER, wszFormat, _countof(wszFormat)); StringCchPrintfW(wszBuf, _countof(wszBuf), wszFormat, m_cFiles, m_cFolders); SetDlgItemTextW(hwndDlg, 14027, wszBuf); @@ -1378,13 +1447,16 @@ CFileDefExt::CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, D if (root && IsWindow(hwndDlg)) { - WCHAR wszBuf[MAX_PATH]; + WCHAR wszBuf[100]; if (SH_FormatFileSizeWithBytes(&m_DirSize, wszBuf, _countof(wszBuf))) SetDlgItemTextW(hwndDlg, 14011, wszBuf); + if (SH_FormatFileSizeWithBytes(&m_DirSizeOnDisc, wszBuf, _countof(wszBuf))) + SetDlgItemTextW(hwndDlg, 14012, wszBuf); + /* Display files and folders count */ - WCHAR wszFormat[256]; + WCHAR wszFormat[100]; LoadStringW(shell32_hInstance, IDS_FILE_FOLDER, wszFormat, _countof(wszFormat)); StringCchPrintfW(wszBuf, _countof(wszBuf), wszFormat, m_cFiles, m_cFolders); SetDlgItemTextW(hwndDlg, 14027, wszBuf); diff --git a/dll/win32/shell32/dialogs/filedefext.h b/dll/win32/shell32/dialogs/filedefext.h index ce56b84bff1..e093bec7689 100644 --- a/dll/win32/shell32/dialogs/filedefext.h +++ b/dll/win32/shell32/dialogs/filedefext.h @@ -75,7 +75,7 @@ private: static INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK VersionPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK FolderCustomizePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - BOOL CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, LPDWORD ticks); + BOOL CountFolderAndFiles(HWND hwndDlg, LPCWSTR pwszBuf, LPDWORD ticks); WCHAR m_wszPath[MAX_PATH]; CFileVersionInfo m_VerInfo; @@ -84,6 +84,7 @@ private: DWORD m_cFiles; DWORD m_cFolders; ULARGE_INTEGER m_DirSize; + ULARGE_INTEGER m_DirSizeOnDisc; static DWORD WINAPI _CountFolderAndFilesThreadProc(LPVOID lpParameter); @@ -136,7 +137,6 @@ struct _CountFolderAndFilesData { CFileDefExt *This; HWND hwndDlg; LPWSTR pwszBuf; - UINT cchBufMax; }; #endif /* _FILE_DEF_EXT_H_ */ \ No newline at end of file

1 0

[reactos] 02/02: [SHLWAPI] Fix SHLoadIndirectString executing code when loading a string
by Mark Jansen 10 Sep '20

10 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2ffd212323d615ea8eda… commit f2ffd212323d615ea8eda44dd3e78ed7e30c64da Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon May 18 21:39:34 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Sep 10 19:45:22 2020 +0200 [SHLWAPI] Fix SHLoadIndirectString executing code when loading a string --- dll/win32/shlwapi/string.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/shlwapi/string.c b/dll/win32/shlwapi/string.c index 18a1be3ddcd..cb6489b7030 100644 --- a/dll/win32/shlwapi/string.c +++ b/dll/win32/shlwapi/string.c @@ -2896,7 +2896,11 @@ HRESULT WINAPI SHLoadIndirectString(LPCWSTR src, LPWSTR dst, UINT dst_len, void index_str++; index = atoiW(index_str); +#ifdef __REACTOS__ + hmod = LoadLibraryExW(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); +#else hmod = LoadLibraryW(dllname); +#endif if(!hmod) goto end; if(index < 0)

1 0

[reactos] 01/02: [SHLWAPI_APITEST] Add test showing SHLoadIndirectString should load a dll as datafile
by Mark Jansen 10 Sep '20

10 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=922a956805ab41f26583f… commit 922a956805ab41f26583fbd6cc2c7120a01008e1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon May 18 21:38:56 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Sep 10 19:45:15 2020 +0200 [SHLWAPI_APITEST] Add test showing SHLoadIndirectString should load a dll as datafile --- modules/rostests/apitests/shlwapi/CMakeLists.txt | 10 ++ .../apitests/shlwapi/SHLoadIndirectString.c | 134 +++++++++++++++++++++ .../shlwapi/shlwapi_resource_dll/CMakeLists.txt | 5 + .../shlwapi_resource_dll/shlwapi_resource_dll.c | 27 +++++ .../shlwapi_resource_dll/shlwapi_resource_dll.rc | 9 ++ modules/rostests/apitests/shlwapi/testdata.rc | 3 + modules/rostests/apitests/shlwapi/testlist.c | 2 + 7 files changed, 190 insertions(+) diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt index a7d4e05d4fb..9712d77969b 100644 --- a/modules/rostests/apitests/shlwapi/CMakeLists.txt +++ b/modules/rostests/apitests/shlwapi/CMakeLists.txt @@ -1,4 +1,9 @@ +add_subdirectory(shlwapi_resource_dll) + +# Ensure the resource compiler can find the dll +include_directories($<TARGET_FILE_DIR:shlwapi_resource_dll>) + list(APPEND SOURCE PathFindOnPath.c PathIsUNC.c @@ -7,12 +12,17 @@ list(APPEND SOURCE PathUnExpandEnvStrings.c PathUnExpandEnvStringsForUser.c SHAreIconsEqual.c + SHLoadIndirectString.c StrFormatByteSizeW.c testdata.rc testlist.c) +# Add a dependency from the resource to the dll +add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_resource_dll/shlwapi_resource_dll.dll) + add_executable(shlwapi_apitest ${SOURCE}) set_module_type(shlwapi_apitest win32cui) target_link_libraries(shlwapi_apitest ${PSEH_LIB}) add_importlibs(shlwapi_apitest shlwapi user32 msvcrt kernel32) +add_dependencies(shlwapi_apitest shlwapi_resource_dll) add_rostests_file(TARGET shlwapi_apitest) diff --git a/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c b/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c new file mode 100644 index 00000000000..f086a7e2514 --- /dev/null +++ b/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c @@ -0,0 +1,134 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for SHLoadIndirectString + * COPYRIGHT: Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <apitest.h> +#include <shlwapi.h> +#include "resource.h" + +static void execute_test(LPCWSTR DllFile) +{ + WCHAR DllBuffer[MAX_PATH + 20]; + WCHAR Buffer[MAX_PATH * 2] = {0}; + HRESULT hr; + HANDLE hEvent; + DWORD dwRet; + + hEvent = CreateEventA(NULL, TRUE, FALSE, "Local\\shlwapi_apitest_evt"); + + // Show that it is not signaled + dwRet = WaitForSingleObject(hEvent, 1); + ok_hex(dwRet, WAIT_TIMEOUT); + + // Ensure the module is not loaded yet... + HMODULE mod = GetModuleHandleW(DllFile); + if (mod != NULL) + { + CloseHandle(hEvent); + skip("%S loaded, cannot continue\n", DllFile); + return; + } + + wsprintfW(DllBuffer, L"@%s,-3", DllFile); + + // Load a string from the dll + hr = SHLoadIndirectString(DllBuffer, Buffer, _countof(Buffer), NULL); + ok_hex(hr, S_OK); + if (SUCCEEDED(hr)) + { + // Module should still not be loaded + mod = GetModuleHandleW(DllFile); + ok_ptr(mod, 0); + + ok_wstr(Buffer, L"Test string one."); + + // DllMain not called.. + dwRet = WaitForSingleObject(hEvent, 1); + ok_hex(dwRet, WAIT_TIMEOUT); + + // Show that calling DllMain will set the event + mod = LoadLibraryW(DllFile); + ok(mod != NULL, "Failed to load %S\n", DllFile); + + if (mod) + { + dwRet = WaitForSingleObject(hEvent, 1); + ok_hex(dwRet, WAIT_OBJECT_0); + FreeLibrary(mod); + } + } + CloseHandle(hEvent); +} + + +BOOL extract_resource(const WCHAR* Filename, LPCWSTR ResourceName) +{ + BOOL Success; + DWORD dwWritten, Size; + HGLOBAL hGlobal; + LPVOID pData; + HANDLE Handle; + HRSRC hRsrc = FindResourceW(GetModuleHandleW(NULL), ResourceName, (LPCWSTR)10); + ok(!!hRsrc, "Unable to find %s\n", wine_dbgstr_w(ResourceName)); + if (!hRsrc) + return FALSE; + + hGlobal = LoadResource(GetModuleHandleW(NULL), hRsrc); + Size = SizeofResource(GetModuleHandleW(NULL), hRsrc); + pData = LockResource(hGlobal); + + ok(Size && !!pData, "Unable to load %s\n", wine_dbgstr_w(ResourceName)); + if (!Size || !pData) + return FALSE; + + Handle = CreateFileW(Filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + if (Handle == INVALID_HANDLE_VALUE) + { + skip("Failed to create temp file %ls, error %lu\n", Filename, GetLastError()); + return FALSE; + } + Success = WriteFile(Handle, pData, Size, &dwWritten, NULL); + ok(Success == TRUE, "WriteFile failed with %lu\n", GetLastError()); + ok(dwWritten == Size, "WriteFile wrote %lu bytes instead of %lu\n", dwWritten, Size); + CloseHandle(Handle); + Success = Success && (dwWritten == Size); + + UnlockResource(pData); + return Success; +} + +START_TEST(SHLoadIndirectString) +{ + WCHAR workdir[MAX_PATH], dllpath[MAX_PATH]; + BOOL ret; + UINT Length; + + ret = GetTempPathW(_countof(workdir), workdir); + ok(ret, "GetTempPathW error: %lu\n", GetLastError()); + + Length = GetTempFileNameW(workdir, L"ntdll", 0, dllpath); + ok(Length != 0, "GetTempFileNameW failed with %lu\n", GetLastError()); + + if (extract_resource(dllpath, (LPCWSTR)101)) + { + _SEH2_TRY + { + execute_test(dllpath); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Ldr didnt handle exception\n"); + } + _SEH2_END; + } + else + { + ok(0, "Failed to extract resource\n"); + } + + DeleteFileW(dllpath); +} diff --git a/modules/rostests/apitests/shlwapi/shlwapi_resource_dll/CMakeLists.txt b/modules/rostests/apitests/shlwapi/shlwapi_resource_dll/CMakeLists.txt new file mode 100644 index 00000000000..800dcb41fa8 --- /dev/null +++ b/modules/rostests/apitests/shlwapi/shlwapi_resource_dll/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_library(shlwapi_resource_dll MODULE shlwapi_resource_dll.c shlwapi_resource_dll.rc) +set_module_type(shlwapi_resource_dll win32dll ENTRYPOINT DllMain 12) +add_importlibs(shlwapi_resource_dll kernel32 ntdll) +add_dependencies(shlwapi_resource_dll psdk) diff --git a/modules/rostests/apitests/shlwapi/shlwapi_resource_dll/shlwapi_resource_dll.c b/modules/rostests/apitests/shlwapi/shlwapi_resource_dll/shlwapi_resource_dll.c new file mode 100644 index 00000000000..2b8ad67d993 --- /dev/null +++ b/modules/rostests/apitests/shlwapi/shlwapi_resource_dll/shlwapi_resource_dll.c @@ -0,0 +1,27 @@ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windows.h> + +BOOL WINAPI +DllMain(IN HINSTANCE hDllHandle, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + if (dwReason == DLL_PROCESS_ATTACH) + { + HANDLE hEvent = OpenEventA(EVENT_MODIFY_STATE, FALSE, "Local\\shlwapi_apitest_evt"); + if (hEvent != NULL) + { + SetEvent(hEvent); + CloseHandle(hEvent); + } + else + { + OutputDebugStringA("ERROR: NO EVENT FOUND!\n"); + } + } + + return TRUE; +} diff --git a/modules/rostests/apitests/shlwapi/shlwapi_resource_dll/shlwapi_resource_dll.rc b/modules/rostests/apitests/shlwapi/shlwapi_resource_dll/shlwapi_resource_dll.rc new file mode 100644 index 00000000000..ff9d09e6181 --- /dev/null +++ b/modules/rostests/apitests/shlwapi/shlwapi_resource_dll/shlwapi_resource_dll.rc @@ -0,0 +1,9 @@ +#include <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + 3 "Test string one." +END + diff --git a/modules/rostests/apitests/shlwapi/testdata.rc b/modules/rostests/apitests/shlwapi/testdata.rc index b6aa19173ef..c57a6dabc6f 100644 --- a/modules/rostests/apitests/shlwapi/testdata.rc +++ b/modules/rostests/apitests/shlwapi/testdata.rc @@ -8,3 +8,6 @@ ICON_16_32_RED ICON "16_32_red.ico" ICON_32_8 ICON "32_8.ico" ICON_32_32 ICON "32_32.ico" + +101 10 "shlwapi_resource_dll.dll" + diff --git a/modules/rostests/apitests/shlwapi/testlist.c b/modules/rostests/apitests/shlwapi/testlist.c index 1ad20a3bf8a..6bf3fe27892 100644 --- a/modules/rostests/apitests/shlwapi/testlist.c +++ b/modules/rostests/apitests/shlwapi/testlist.c @@ -8,6 +8,7 @@ extern void func_isuncpathservershare(void); extern void func_PathUnExpandEnvStrings(void); extern void func_PathUnExpandEnvStringsForUser(void); extern void func_SHAreIconsEqual(void); +extern void func_SHLoadIndirectString(void); extern void func_StrFormatByteSizeW(void); const struct test winetest_testlist[] = @@ -19,6 +20,7 @@ const struct test winetest_testlist[] = { "PathUnExpandEnvStrings", func_PathUnExpandEnvStrings }, { "PathUnExpandEnvStringsForUser", func_PathUnExpandEnvStringsForUser }, { "SHAreIconsEqual", func_SHAreIconsEqual }, + { "SHLoadIndirectString", func_SHLoadIndirectString }, { "StrFormatByteSizeW", func_StrFormatByteSizeW }, { 0, 0 } };

1 0

[reactos] 02/02: [DBGENG] Import dbgeng.dll from Wine Staging 4.18 CORE-17153.
by Oleg Dubinskiy 10 Sep '20

10 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07f98eb10ae7cabeeaec0… commit 07f98eb10ae7cabeeaec07bf2f3f940f29b892fc Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Tue Jun 30 20:42:29 2020 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Sep 10 18:19:28 2020 +0200 [DBGENG] Import dbgeng.dll from Wine Staging 4.18 CORE-17153. --- dll/win32/CMakeLists.txt | 1 + dll/win32/dbgeng/CMakeLists.txt | 16 + dll/win32/dbgeng/dbgeng.c | 4105 +++++++++++++++++++++++++++++++++++++++ dll/win32/dbgeng/dbgeng.spec | 5 + media/doc/README.WINE | 1 + 5 files changed, 4128 insertions(+) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 533d1dcf243..66a82d2d3b9 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -34,6 +34,7 @@ add_subdirectory(cryptdlg) add_subdirectory(cryptdll) add_subdirectory(cryptnet) add_subdirectory(cryptui) +add_subdirectory(dbgeng) add_subdirectory(dbghelp) add_subdirectory(dciman32) add_subdirectory(devmgr) diff --git a/dll/win32/dbgeng/CMakeLists.txt b/dll/win32/dbgeng/CMakeLists.txt new file mode 100644 index 00000000000..9270aead99f --- /dev/null +++ b/dll/win32/dbgeng/CMakeLists.txt @@ -0,0 +1,16 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +spec2def(dbgeng.dll dbgeng.spec) + +list(APPEND SOURCE + dbgeng.c + ${CMAKE_CURRENT_BINARY_DIR}/dbgeng_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/dbgeng.def) + +add_library(dbgeng MODULE ${SOURCE}) +set_module_type(dbgeng win32dll) +target_link_libraries(dbgeng wine) +add_importlibs(dbgeng psapi msvcrt ntdll) +add_delay_importlibs(dbgeng version) +add_cd_file(TARGET dbgeng DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/dbgeng/dbgeng.c b/dll/win32/dbgeng/dbgeng.c new file mode 100644 index 00000000000..f1fe3cfb071 --- /dev/null +++ b/dll/win32/dbgeng/dbgeng.c @@ -0,0 +1,4105 @@ +/* + * Support for Microsoft Debugging Extension API + * + * Copyright (C) 2010 Volodymyr Shcherbyna + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#ifdef __REACTOS__ +#include "wine/winternl.h" +#else +#include "winternl.h" +#endif +#include "psapi.h" + +#include "initguid.h" +#include "dbgeng.h" + +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbgeng); + +extern NTSTATUS WINAPI NtSuspendProcess(HANDLE handle); +extern NTSTATUS WINAPI NtResumeProcess(HANDLE handle); + +struct module_info +{ + DEBUG_MODULE_PARAMETERS params; + char image_name[MAX_PATH]; +}; + +struct target_process +{ + struct list entry; + unsigned int pid; + unsigned int attach_flags; + HANDLE handle; + struct + { + struct module_info *info; + unsigned int loaded; + unsigned int unloaded; + BOOL initialized; + } modules; + ULONG cpu_type; +}; + +struct debug_client +{ + IDebugClient7 IDebugClient_iface; + IDebugDataSpaces IDebugDataSpaces_iface; + IDebugSymbols3 IDebugSymbols3_iface; + IDebugControl2 IDebugControl2_iface; + IDebugAdvanced IDebugAdvanced_iface; + IDebugSystemObjects IDebugSystemObjects_iface; + LONG refcount; + ULONG engine_options; + struct list targets; + IDebugEventCallbacks *event_callbacks; +}; + +static struct target_process *debug_client_get_target(struct debug_client *debug_client) +{ + if (list_empty(&debug_client->targets)) + return NULL; + + return LIST_ENTRY(list_head(&debug_client->targets), struct target_process, entry); +} + +static HRESULT debug_target_return_string(const char *str, char *buffer, unsigned int buffer_size, + unsigned int *size) +{ + unsigned int len = strlen(str), dst_len; + + if (size) + *size = len + 1; + + if (buffer && buffer_size) + { + dst_len = min(len, buffer_size - 1); + if (dst_len) + memcpy(buffer, str, dst_len); + buffer[dst_len] = 0; + } + + return len < buffer_size ? S_OK : S_FALSE; +} + +static WORD debug_target_get_module_machine(struct target_process *target, HMODULE module) +{ + IMAGE_DOS_HEADER dos = { 0 }; + WORD machine = 0; + + ReadProcessMemory(target->handle, module, &dos, sizeof(dos), NULL); + if (dos.e_magic == IMAGE_DOS_SIGNATURE) + { + ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* PE signature */, &machine, + sizeof(machine), NULL); + } + + return machine; +} + +static DWORD debug_target_get_module_timestamp(struct target_process *target, HMODULE module) +{ + IMAGE_DOS_HEADER dos = { 0 }; + DWORD timestamp = 0; + + ReadProcessMemory(target->handle, module, &dos, sizeof(dos), NULL); + if (dos.e_magic == IMAGE_DOS_SIGNATURE) + { + ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* PE signature */ + + FIELD_OFFSET(IMAGE_FILE_HEADER, TimeDateStamp), &timestamp, sizeof(timestamp), NULL); + } + + return timestamp; +} + +static HRESULT debug_target_init_modules_info(struct target_process *target) +{ + unsigned int i, count; + HMODULE *modules; + MODULEINFO info; + DWORD needed; + + if (target->modules.initialized) + return S_OK; + + if (!target->handle) + return E_UNEXPECTED; + + needed = 0; + EnumProcessModules(target->handle, NULL, 0, &needed); + if (!needed) + return E_FAIL; + + count = needed / sizeof(HMODULE); + + if (!(modules = heap_alloc(count * sizeof(*modules)))) + return E_OUTOFMEMORY; + + if (!(target->modules.info = heap_alloc_zero(count * sizeof(*target->modules.info)))) + { + heap_free(modules); + return E_OUTOFMEMORY; + } + + if (EnumProcessModules(target->handle, modules, count * sizeof(*modules), &needed)) + { + for (i = 0; i < count; ++i) + { + if (!GetModuleInformation(target->handle, modules[i], &info, sizeof(info))) + { + WARN("Failed to get module information, error %d.\n", GetLastError()); + continue; + } + + target->modules.info[i].params.Base = (ULONG_PTR)info.lpBaseOfDll; + target->modules.info[i].params.Size = info.SizeOfImage; + target->modules.info[i].params.TimeDateStamp = debug_target_get_module_timestamp(target, modules[i]); + + GetModuleFileNameExA(target->handle, modules[i], target->modules.info[i].image_name, + ARRAY_SIZE(target->modules.info[i].image_name)); + } + } + + target->cpu_type = debug_target_get_module_machine(target, modules[0]); + + heap_free(modules); + + target->modules.loaded = count; + target->modules.unloaded = 0; /* FIXME */ + + target->modules.initialized = TRUE; + + return S_OK; +} + +static const struct module_info *debug_target_get_module_info(struct target_process *target, unsigned int i) +{ + if (FAILED(debug_target_init_modules_info(target))) + return NULL; + + if (i >= target->modules.loaded) + return NULL; + + return &target->modules.info[i]; +} + +static const struct module_info *debug_target_get_module_info_by_base(struct target_process *target, ULONG64 base) +{ + unsigned int i; + + if (FAILED(debug_target_init_modules_info(target))) + return NULL; + + for (i = 0; i < target->modules.loaded; ++i) + { + if (target->modules.info[i].params.Base == base) + return &target->modules.info[i]; + } + + return NULL; +} + +static void debug_client_detach_target(struct target_process *target) +{ + NTSTATUS status; + + if (!target->handle) + return; + + if (target->attach_flags & DEBUG_ATTACH_NONINVASIVE) + { + BOOL resume = !(target->attach_flags & DEBUG_ATTACH_NONINVASIVE_NO_SUSPEND); + + if (resume) + { + if ((status = NtResumeProcess(target->handle))) + WARN("Failed to resume process, status %#x.\n", status); + } + } + + CloseHandle(target->handle); + target->handle = NULL; +} + +static struct debug_client *impl_from_IDebugClient(IDebugClient7 *iface) +{ + return CONTAINING_RECORD(iface, struct debug_client, IDebugClient_iface); +} + +static struct debug_client *impl_from_IDebugDataSpaces(IDebugDataSpaces *iface) +{ + return CONTAINING_RECORD(iface, struct debug_client, IDebugDataSpaces_iface); +} + +static struct debug_client *impl_from_IDebugSymbols3(IDebugSymbols3 *iface) +{ + return CONTAINING_RECORD(iface, struct debug_client, IDebugSymbols3_iface); +} + +static struct debug_client *impl_from_IDebugControl2(IDebugControl2 *iface) +{ + return CONTAINING_RECORD(iface, struct debug_client, IDebugControl2_iface); +} + +static struct debug_client *impl_from_IDebugAdvanced(IDebugAdvanced *iface) +{ + return CONTAINING_RECORD(iface, struct debug_client, IDebugAdvanced_iface); +} + +static struct debug_client *impl_from_IDebugSystemObjects(IDebugSystemObjects *iface) +{ + return CONTAINING_RECORD(iface, struct debug_client, IDebugSystemObjects_iface); +} + +static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient7 *iface, REFIID riid, void **obj) +{ + struct debug_client *debug_client = impl_from_IDebugClient(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IDebugClient) || + IsEqualIID(riid, &IID_IDebugClient2) || + IsEqualIID(riid, &IID_IDebugClient3) || + IsEqualIID(riid, &IID_IDebugClient4) || + IsEqualIID(riid, &IID_IDebugClient5) || + IsEqualIID(riid, &IID_IDebugClient6) || + IsEqualIID(riid, &IID_IDebugClient7) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + } + else if (IsEqualIID(riid, &IID_IDebugDataSpaces)) + { + *obj = &debug_client->IDebugDataSpaces_iface; + } + else if (IsEqualIID(riid, &IID_IDebugSymbols) + || IsEqualIID(riid, &IID_IDebugSymbols2) + || IsEqualIID(riid, &IID_IDebugSymbols3)) + { + *obj = &debug_client->IDebugSymbols3_iface; + } + else if (IsEqualIID(riid, &IID_IDebugControl2) + || IsEqualIID(riid, &IID_IDebugControl)) + { + *obj = &debug_client->IDebugControl2_iface; + } + else if (IsEqualIID(riid, &IID_IDebugAdvanced)) + { + *obj = &debug_client->IDebugAdvanced_iface; + } + else if (IsEqualIID(riid, &IID_IDebugSystemObjects)) + { + *obj = &debug_client->IDebugSystemObjects_iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG STDMETHODCALLTYPE debugclient_AddRef(IDebugClient7 *iface) +{ + struct debug_client *debug_client = impl_from_IDebugClient(iface); + ULONG refcount = InterlockedIncrement(&debug_client->refcount); + + TRACE("%p, %d.\n", iface, refcount); + + return refcount; +} + +static void debug_target_free(struct target_process *target) +{ + heap_free(target->modules.info); + heap_free(target); +} + +static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient7 *iface) +{ + struct debug_client *debug_client = impl_from_IDebugClient(iface); + ULONG refcount = InterlockedDecrement(&debug_client->refcount); + struct target_process *cur, *cur2; + + TRACE("%p, %d.\n", debug_client, refcount); + + if (!refcount) + { + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &debug_client->targets, struct target_process, entry) + { + debug_client_detach_target(cur); + list_remove(&cur->entry); + debug_target_free(cur); + } + if (debug_client->event_callbacks) + debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); + heap_free(debug_client); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE debugclient_AttachKernel(IDebugClient7 *iface, ULONG flags, const char *options) +{ + FIXME("%p, %#x, %s stub.\n", iface, flags, debugstr_a(options)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetKernelConnectionOptions(IDebugClient7 *iface, char *buffer, + ULONG buffer_size, ULONG *options_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, options_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetKernelConnectionOptions(IDebugClient7 *iface, const char *options) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(options)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_StartProcessServer(IDebugClient7 *iface, ULONG flags, const char *options, + void *reserved) +{ + FIXME("%p, %#x, %s, %p stub.\n", iface, flags, debugstr_a(options), reserved); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_ConnectProcessServer(IDebugClient7 *iface, const char *remote_options, + ULONG64 *server) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_a(remote_options), server); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_DisconnectProcessServer(IDebugClient7 *iface, ULONG64 server) +{ + FIXME("%p, %s stub.\n", iface, wine_dbgstr_longlong(server)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIds(IDebugClient7 *iface, ULONG64 server, + ULONG *ids, ULONG count, ULONG *actual_count) +{ + FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(server), ids, count, actual_count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIdByExecutableName(IDebugClient7 *iface, + ULONG64 server, const char *exe_name, ULONG flags, ULONG *id) +{ + FIXME("%p, %s, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(exe_name), flags, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessDescription(IDebugClient7 *iface, ULONG64 server, + ULONG systemid, ULONG flags, char *exe_name, ULONG exe_name_size, ULONG *actual_exe_name_size, + char *description, ULONG description_size, ULONG *actual_description_size) +{ + FIXME("%p, %s, %u, %#x, %p, %u, %p, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(server), systemid, flags, + exe_name, exe_name_size, actual_exe_name_size, description, description_size, actual_description_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient7 *iface, ULONG64 server, ULONG pid, ULONG flags) +{ + struct debug_client *debug_client = impl_from_IDebugClient(iface); + struct target_process *process; + + TRACE("%p, %s, %u, %#x.\n", iface, wine_dbgstr_longlong(server), pid, flags); + + if (server) + { + FIXME("Remote debugging is not supported.\n"); + return E_NOTIMPL; + } + + if (!(process = heap_alloc_zero(sizeof(*process)))) + return E_OUTOFMEMORY; + + process->pid = pid; + process->attach_flags = flags; + + list_add_head(&debug_client->targets, &process->entry); + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess(IDebugClient7 *iface, ULONG64 server, char *cmdline, + ULONG flags) +{ + FIXME("%p, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach(IDebugClient7 *iface, ULONG64 server, char *cmdline, + ULONG create_flags, ULONG pid, ULONG attach_flags) +{ + FIXME("%p, %s, %s, %#x, %u, %#x stub.\n", iface, wine_dbgstr_longlong(server), debugstr_a(cmdline), create_flags, + pid, attach_flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetProcessOptions(IDebugClient7 *iface, ULONG *options) +{ + FIXME("%p, %p stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_AddProcessOptions(IDebugClient7 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_RemoveProcessOptions(IDebugClient7 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetProcessOptions(IDebugClient7 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_OpenDumpFile(IDebugClient7 *iface, const char *filename) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(filename)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFile(IDebugClient7 *iface, const char *filename, ULONG qualifier) +{ + FIXME("%p, %s, %u stub.\n", iface, debugstr_a(filename), qualifier); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_ConnectSession(IDebugClient7 *iface, ULONG flags, ULONG history_limit) +{ + FIXME("%p, %#x, %u stub.\n", iface, flags, history_limit); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_StartServer(IDebugClient7 *iface, const char *options) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(options)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_OutputServers(IDebugClient7 *iface, ULONG output_control, + const char *machine, ULONG flags) +{ + FIXME("%p, %u, %s, %#x stub.\n", iface, output_control, debugstr_a(machine), flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_TerminateProcesses(IDebugClient7 *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_DetachProcesses(IDebugClient7 *iface) +{ + struct debug_client *debug_client = impl_from_IDebugClient(iface); + struct target_process *target; + + TRACE("%p.\n", iface); + + LIST_FOR_EACH_ENTRY(target, &debug_client->targets, struct target_process, entry) + { + debug_client_detach_target(target); + } + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugclient_EndSession(IDebugClient7 *iface, ULONG flags) +{ + FIXME("%p, %#x stub.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetExitCode(IDebugClient7 *iface, ULONG *code) +{ + FIXME("%p, %p stub.\n", iface, code); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_DispatchCallbacks(IDebugClient7 *iface, ULONG timeout) +{ + FIXME("%p, %u stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_ExitDispatch(IDebugClient7 *iface, IDebugClient *client) +{ + FIXME("%p, %p stub.\n", iface, client); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_CreateClient(IDebugClient7 *iface, IDebugClient **client) +{ + FIXME("%p, %p stub.\n", iface, client); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetInputCallbacks(IDebugClient7 *iface, IDebugInputCallbacks **callbacks) +{ + FIXME("%p, %p stub.\n", iface, callbacks); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetInputCallbacks(IDebugClient7 *iface, IDebugInputCallbacks *callbacks) +{ + FIXME("%p, %p stub.\n", iface, callbacks); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetOutputCallbacks(IDebugClient7 *iface, IDebugOutputCallbacks **callbacks) +{ + FIXME("%p, %p stub.\n", iface, callbacks); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetOutputCallbacks(IDebugClient7 *iface, IDebugOutputCallbacks *callbacks) +{ + FIXME("%p, %p stub.\n", iface, callbacks); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetOutputMask(IDebugClient7 *iface, ULONG *mask) +{ + FIXME("%p, %p stub.\n", iface, mask); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetOutputMask(IDebugClient7 *iface, ULONG mask) +{ + FIXME("%p, %#x stub.\n", iface, mask); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetOtherOutputMask(IDebugClient7 *iface, IDebugClient *client, ULONG *mask) +{ + FIXME("%p, %p, %p stub.\n", iface, client, mask); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetOtherOutputMask(IDebugClient7 *iface, IDebugClient *client, ULONG mask) +{ + FIXME("%p, %p, %#x stub.\n", iface, client, mask); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetOutputWidth(IDebugClient7 *iface, ULONG *columns) +{ + FIXME("%p, %p stub.\n", iface, columns); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetOutputWidth(IDebugClient7 *iface, ULONG columns) +{ + FIXME("%p, %u stub.\n", iface, columns); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetOutputLinePrefix(IDebugClient7 *iface, char *buffer, ULONG buffer_size, + ULONG *prefix_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, prefix_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetOutputLinePrefix(IDebugClient7 *iface, const char *prefix) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(prefix)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetIdentity(IDebugClient7 *iface, char *buffer, ULONG buffer_size, + ULONG *identity_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, identity_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_OutputIdentity(IDebugClient7 *iface, ULONG output_control, ULONG flags, + const char *format) +{ + FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, flags, debugstr_a(format)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetEventCallbacks(IDebugClient7 *iface, IDebugEventCallbacks **callbacks) +{ + struct debug_client *debug_client = impl_from_IDebugClient(iface); + + TRACE("%p, %p.\n", iface, callbacks); + + if (debug_client->event_callbacks) + { + *callbacks = debug_client->event_callbacks; + (*callbacks)->lpVtbl->AddRef(*callbacks); + } + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetEventCallbacks(IDebugClient7 *iface, IDebugEventCallbacks *callbacks) +{ + struct debug_client *debug_client = impl_from_IDebugClient(iface); + + TRACE("%p, %p.\n", iface, callbacks); + + if (debug_client->event_callbacks) + debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); + if ((debug_client->event_callbacks = callbacks)) + debug_client->event_callbacks->lpVtbl->AddRef(debug_client->event_callbacks); + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugclient_FlushCallbacks(IDebugClient7 *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFile2(IDebugClient7 *iface, const char *dumpfile, ULONG qualifier, + ULONG flags, const char *comment) +{ + FIXME("%p, %s, %d, 0x%08x, %s.\n", iface, debugstr_a(dumpfile), qualifier, flags, debugstr_a(comment)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_AddDumpInformationFile(IDebugClient7 *iface, const char *infofile, ULONG type) +{ + FIXME("%p, %s, %d.\n", iface, debugstr_a(infofile), type); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_EndProcessServer(IDebugClient7 *iface, ULONG64 server) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(server)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_WaitForProcessServerEnd(IDebugClient7 *iface, ULONG timeout) +{ + FIXME("%p, %d.\n", iface, timeout); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_IsKernelDebuggerEnabled(IDebugClient7 *iface) +{ + FIXME("%p.\n", iface); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_TerminateCurrentProcess(IDebugClient7 *iface) +{ + FIXME("%p.\n", iface); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_DetachCurrentProcess(IDebugClient7 *iface) +{ + FIXME("%p.\n", iface); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_AbandonCurrentProcess(IDebugClient7 *iface) +{ + FIXME("%p.\n", iface); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessSystemIdByExecutableNameWide(IDebugClient7 *iface, ULONG64 server, + const WCHAR *exename, ULONG flags, ULONG *id) +{ + FIXME("%p, %s, %s, 0x%08x, %p.\n", iface, wine_dbgstr_longlong(server), debugstr_w(exename), flags, id); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetRunningProcessDescriptionWide(IDebugClient7 *iface, ULONG64 server, ULONG id, + ULONG flags, WCHAR *exename, ULONG size, ULONG *actualsize, WCHAR *description, ULONG desc_size, ULONG *actual_desc_size) +{ + FIXME("%p, %s, %d, 0x%08x, %s, %d, %p, %s, %d, %p.\n", iface, wine_dbgstr_longlong(server), id, flags, debugstr_w(exename), size, + actualsize, debugstr_w(description), desc_size, actual_desc_size ); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessWide(IDebugClient7 *iface, ULONG64 server, WCHAR *commandline, ULONG flags) +{ + FIXME("%p, %s, %s, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttachWide(IDebugClient7 *iface, ULONG64 server, WCHAR *commandline, + ULONG flags, ULONG processid, ULONG attachflags) +{ + FIXME("%p, %s, %s, 0x%08x, %d, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_w(commandline), flags, processid, attachflags); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_OpenDumpFileWide(IDebugClient7 *iface, const WCHAR *filename, ULONG64 handle) +{ + FIXME("%p, %s, %s.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_WriteDumpFileWide(IDebugClient7 *iface, const WCHAR *filename, ULONG64 handle, + ULONG qualifier, ULONG flags, const WCHAR *comment) +{ + FIXME("%p, %s, %s, %d, 0x%08x, %s.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle), + qualifier, flags, debugstr_w(comment)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_AddDumpInformationFileWide(IDebugClient7 *iface, const WCHAR *filename, + ULONG64 handle, ULONG type) +{ + FIXME("%p, %s, %s, %d.\n", iface, debugstr_w(filename), wine_dbgstr_longlong(handle), type); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetNumberDumpFiles(IDebugClient7 *iface, ULONG *count) +{ + FIXME("%p, %p.\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetDumpFile(IDebugClient7 *iface, ULONG index, char *buffer, ULONG buf_size, + ULONG *name_size, ULONG64 *handle, ULONG *type) +{ + FIXME("%p, %d, %p, %d, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetDumpFileWide(IDebugClient7 *iface, ULONG index, WCHAR *buffer, ULONG buf_size, + ULONG *name_size, ULONG64 *handle, ULONG *type) +{ + FIXME("%p, %d, %p, %d, %p, %p, %p.\n", iface, index, buffer, buf_size, name_size, handle, type); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_AttachKernelWide(IDebugClient7 *iface, ULONG flags, const WCHAR *options) +{ + FIXME("%p, 0x%08x, %s.\n", iface, flags, debugstr_w(options)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetKernelConnectionOptionsWide(IDebugClient7 *iface, WCHAR *buffer, + ULONG buf_size, ULONG *size) +{ + FIXME("%p, %p, %d, %p.\n", iface, buffer, buf_size, size); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetKernelConnectionOptionsWide(IDebugClient7 *iface, const WCHAR *options) +{ + FIXME("%p, %p.\n", iface, options); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_StartProcessServerWide(IDebugClient7 *iface, ULONG flags, const WCHAR *options, void *reserved) +{ + FIXME("%p, 0x%08x, %s, %p.\n", iface, flags, debugstr_w(options), reserved); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_ConnectProcessServerWide(IDebugClient7 *iface, const WCHAR *options, ULONG64 *server) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_w(options), server); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_StartServerWide(IDebugClient7 *iface, const WCHAR *options) +{ + FIXME("%p, %s.\n", iface, debugstr_w(options)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_OutputServersWide(IDebugClient7 *iface, ULONG control, const WCHAR *machine, ULONG flags) +{ + FIXME("%p, %d, %s, 0x%08x.\n", iface, control, debugstr_w(machine), flags); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetOutputCallbacksWide(IDebugClient7 *iface, IDebugOutputCallbacksWide **callbacks) +{ + FIXME("%p, %p.\n", iface, callbacks); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetOutputCallbacksWide(IDebugClient7 *iface, IDebugOutputCallbacksWide *callbacks) +{ + FIXME("%p, %p.\n", iface, callbacks); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetOutputLinePrefixWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *size) +{ + FIXME("%p, %p, %d, %p.\n", iface, buffer, buf_size, size); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetOutputLinePrefixWide(IDebugClient7 *iface, const WCHAR *prefix) +{ + FIXME("%p, %s.\n", iface, debugstr_w(prefix)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetIdentityWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *identity) +{ + FIXME("%p, %p, %d, %p.\n", iface, buffer, buf_size, identity); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_OutputIdentityWide(IDebugClient7 *iface, ULONG control, ULONG flags, const WCHAR *format) +{ + FIXME("%p, %d, 0x%08x, %s.\n", iface, control, flags, debugstr_w(format)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetEventCallbacksWide(IDebugClient7 *iface, IDebugEventCallbacksWide **callbacks) +{ + FIXME("%p, %p .\n", iface, callbacks); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetEventCallbacksWide(IDebugClient7 *iface, IDebugEventCallbacksWide *callbacks) +{ + FIXME("%p .\n", iface); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2(IDebugClient7 *iface, ULONG64 server, char *command, void *options, + ULONG buf_size, const char *initial, const char *environment) +{ + FIXME("%p %s, %s, %p, %d, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options, + buf_size, debugstr_a(initial), debugstr_a(environment)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_CreateProcess2Wide(IDebugClient7 *iface, ULONG64 server, WCHAR *command, void *options, + ULONG size, const WCHAR *initial, const WCHAR *environment) +{ + FIXME("%p %s, %s, %p, %d, %s, %s.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), options, + size, debugstr_w(initial), debugstr_w(environment)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach2(IDebugClient7 *iface, ULONG64 server, char *command, + void *options, ULONG buf_size, const char *initial, const char *environment, ULONG processid, ULONG flags) +{ + FIXME("%p %s, %s, %p, %d, %s, %s, %d, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_a(command), options, + buf_size, debugstr_a(initial), debugstr_a(environment), processid, flags); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_CreateProcessAndAttach2Wide(IDebugClient7 *iface, ULONG64 server, WCHAR *command, + void *buffer, ULONG buf_size, const WCHAR *initial, const WCHAR *environment, ULONG processid, ULONG flags) +{ + FIXME("%p %s, %s, %p, %d, %s, %s, %d, 0x%08x.\n", iface, wine_dbgstr_longlong(server), debugstr_w(command), buffer, + buf_size, debugstr_w(initial), debugstr_w(environment), processid, flags); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_PushOutputLinePrefix(IDebugClient7 *iface, const char *prefix, ULONG64 *handle) +{ + FIXME("%p, %p.\n", iface, handle); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_PushOutputLinePrefixWide(IDebugClient7 *iface, const WCHAR *prefix, ULONG64 *handle) +{ + FIXME("%p, %p.\n", iface, handle); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_PopOutputLinePrefix(IDebugClient7 *iface, ULONG64 handle) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(handle)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetNumberInputCallbacks(IDebugClient7 *iface, ULONG *count) +{ + FIXME("%p, %p.\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetNumberOutputCallbacks(IDebugClient7 *iface, ULONG *count) +{ + FIXME("%p, %p.\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetNumberEventCallbacks(IDebugClient7 *iface, ULONG flags, ULONG *count) +{ + FIXME("%p, 0x%08x, %p.\n", iface, flags, count); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetQuitLockString(IDebugClient7 *iface, char *buffer, ULONG buf_size, ULONG *size) +{ + FIXME("%p, %s, %d, %p.\n", iface, debugstr_a(buffer), buf_size, size); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetQuitLockString(IDebugClient7 *iface, char *string) +{ + FIXME("%p, %s.\n", iface, debugstr_a(string)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_GetQuitLockStringWide(IDebugClient7 *iface, WCHAR *buffer, ULONG buf_size, ULONG *size) +{ + FIXME("%p, %s, %d, %p.\n", iface, debugstr_w(buffer), buf_size, size); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetQuitLockStringWide(IDebugClient7 *iface, const WCHAR *string) +{ + FIXME("%p, %s.\n", iface, debugstr_w(string)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetEventContextCallbacks(IDebugClient7 *iface, IDebugEventContextCallbacks *callbacks) +{ + FIXME("%p, %p.\n", iface, callbacks); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugclient_SetClientContext(IDebugClient7 *iface, void *context, ULONG size) +{ + FIXME("%p, %p, %d.\n", iface, context, size); + return E_NOTIMPL; +} + +static const IDebugClient7Vtbl debugclientvtbl = +{ + debugclient_QueryInterface, + debugclient_AddRef, + debugclient_Release, + debugclient_AttachKernel, + debugclient_GetKernelConnectionOptions, + debugclient_SetKernelConnectionOptions, + debugclient_StartProcessServer, + debugclient_ConnectProcessServer, + debugclient_DisconnectProcessServer, + debugclient_GetRunningProcessSystemIds, + debugclient_GetRunningProcessSystemIdByExecutableName, + debugclient_GetRunningProcessDescription, + debugclient_AttachProcess, + debugclient_CreateProcess, + debugclient_CreateProcessAndAttach, + debugclient_GetProcessOptions, + debugclient_AddProcessOptions, + debugclient_RemoveProcessOptions, + debugclient_SetProcessOptions, + debugclient_OpenDumpFile, + debugclient_WriteDumpFile, + debugclient_ConnectSession, + debugclient_StartServer, + debugclient_OutputServers, + debugclient_TerminateProcesses, + debugclient_DetachProcesses, + debugclient_EndSession, + debugclient_GetExitCode, + debugclient_DispatchCallbacks, + debugclient_ExitDispatch, + debugclient_CreateClient, + debugclient_GetInputCallbacks, + debugclient_SetInputCallbacks, + debugclient_GetOutputCallbacks, + debugclient_SetOutputCallbacks, + debugclient_GetOutputMask, + debugclient_SetOutputMask, + debugclient_GetOtherOutputMask, + debugclient_SetOtherOutputMask, + debugclient_GetOutputWidth, + debugclient_SetOutputWidth, + debugclient_GetOutputLinePrefix, + debugclient_SetOutputLinePrefix, + debugclient_GetIdentity, + debugclient_OutputIdentity, + debugclient_GetEventCallbacks, + debugclient_SetEventCallbacks, + debugclient_FlushCallbacks, + /* IDebugClient2 */ + debugclient_WriteDumpFile2, + debugclient_AddDumpInformationFile, + debugclient_EndProcessServer, + debugclient_WaitForProcessServerEnd, + debugclient_IsKernelDebuggerEnabled, + debugclient_TerminateCurrentProcess, + debugclient_DetachCurrentProcess, + debugclient_AbandonCurrentProcess, + /* IDebugClient3 */ + debugclient_GetRunningProcessSystemIdByExecutableNameWide, + debugclient_GetRunningProcessDescriptionWide, + debugclient_CreateProcessWide, + debugclient_CreateProcessAndAttachWide, + /* IDebugClient4 */ + debugclient_OpenDumpFileWide, + debugclient_WriteDumpFileWide, + debugclient_AddDumpInformationFileWide, + debugclient_GetNumberDumpFiles, + debugclient_GetDumpFile, + debugclient_GetDumpFileWide, + /* IDebugClient5 */ + debugclient_AttachKernelWide, + debugclient_GetKernelConnectionOptionsWide, + debugclient_SetKernelConnectionOptionsWide, + debugclient_StartProcessServerWide, + debugclient_ConnectProcessServerWide, + debugclient_StartServerWide, + debugclient_OutputServersWide, + debugclient_GetOutputCallbacksWide, + debugclient_SetOutputCallbacksWide, + debugclient_GetOutputLinePrefixWide, + debugclient_SetOutputLinePrefixWide, + debugclient_GetIdentityWide, + debugclient_OutputIdentityWide, + debugclient_GetEventCallbacksWide, + debugclient_SetEventCallbacksWide, + debugclient_CreateProcess2, + debugclient_CreateProcess2Wide, + debugclient_CreateProcessAndAttach2, + debugclient_CreateProcessAndAttach2Wide, + debugclient_PushOutputLinePrefix, + debugclient_PushOutputLinePrefixWide, + debugclient_PopOutputLinePrefix, + debugclient_GetNumberInputCallbacks, + debugclient_GetNumberOutputCallbacks, + debugclient_GetNumberEventCallbacks, + debugclient_GetQuitLockString, + debugclient_SetQuitLockString, + debugclient_GetQuitLockStringWide, + debugclient_SetQuitLockStringWide, + /* IDebugClient6 */ + debugclient_SetEventContextCallbacks, + /* IDebugClient7 */ + debugclient_SetClientContext, +}; + +static HRESULT STDMETHODCALLTYPE debugdataspaces_QueryInterface(IDebugDataSpaces *iface, REFIID riid, void **obj) +{ + struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_QueryInterface(unk, riid, obj); +} + +static ULONG STDMETHODCALLTYPE debugdataspaces_AddRef(IDebugDataSpaces *iface) +{ + struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_AddRef(unk); +} + +static ULONG STDMETHODCALLTYPE debugdataspaces_Release(IDebugDataSpaces *iface) +{ + struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_Release(unk); +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, + ULONG buffer_size, ULONG *read_len) +{ + struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); + static struct target_process *target; + HRESULT hr = S_OK; + SIZE_T length; + + TRACE("%p, %s, %p, %u, %p.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (ReadProcessMemory(target->handle, (const void *)(ULONG_PTR)offset, buffer, buffer_size, &length)) + { + if (read_len) + *read_len = length; + } + else + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to read process memory %#x.\n", hr); + } + + return hr; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, + ULONG buffer_size, ULONG *written) +{ + FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_SearchVirtual(IDebugDataSpaces *iface, ULONG64 offset, ULONG64 length, + void *pattern, ULONG pattern_size, ULONG pattern_granularity, ULONG64 *ret_offset) +{ + FIXME("%p, %s, %s, %p, %u, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(length), + pattern, pattern_size, pattern_granularity, ret_offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtualUncached(IDebugDataSpaces *iface, ULONG64 offset, + void *buffer, ULONG buffer_size, ULONG *read_len) +{ + FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtualUncached(IDebugDataSpaces *iface, ULONG64 offset, + void *buffer, ULONG buffer_size, ULONG *written) +{ + FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPointersVirtual(IDebugDataSpaces *iface, ULONG count, + ULONG64 offset, ULONG64 *pointers) +{ + FIXME("%p, %u, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePointersVirtual(IDebugDataSpaces *iface, ULONG count, + ULONG64 offset, ULONG64 *pointers) +{ + FIXME("%p, %u, %s, %p stub.\n", iface, count, wine_dbgstr_longlong(offset), pointers); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadPhysical(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, + ULONG buffer_size, ULONG *read_len) +{ + FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_WritePhysical(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, + ULONG buffer_size, ULONG *written) +{ + FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, written); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadControl(IDebugDataSpaces *iface, ULONG processor, ULONG64 offset, + void *buffer, ULONG buffer_size, ULONG *read_len) +{ + FIXME("%p, %u, %s, %p, %u, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteControl(IDebugDataSpaces *iface, ULONG processor, ULONG64 offset, + void *buffer, ULONG buffer_size, ULONG *written) +{ + FIXME("%p, %u, %s, %p, %u, %p stub.\n", iface, processor, wine_dbgstr_longlong(offset), buffer, buffer_size, written); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadIo(IDebugDataSpaces *iface, ULONG type, ULONG bus_number, + ULONG address_space, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) +{ + FIXME("%p, %u, %u, %u, %s, %p, %u, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset), + buffer, buffer_size, read_len); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteIo(IDebugDataSpaces *iface, ULONG type, ULONG bus_number, + ULONG address_space, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *written) +{ + FIXME("%p, %u, %u, %u, %s, %p, %u, %p stub.\n", iface, type, bus_number, address_space, wine_dbgstr_longlong(offset), + buffer, buffer_size, written); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadMsr(IDebugDataSpaces *iface, ULONG msr, ULONG64 *value) +{ + FIXME("%p, %u, %p stub.\n", iface, msr, value); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteMsr(IDebugDataSpaces *iface, ULONG msr, ULONG64 value) +{ + FIXME("%p, %u, %s stub.\n", iface, msr, wine_dbgstr_longlong(value)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadBusData(IDebugDataSpaces *iface, ULONG data_type, + ULONG bus_number, ULONG slot_number, ULONG offset, void *buffer, ULONG buffer_size, ULONG *read_len) +{ + FIXME("%p, %u, %u, %u, %u, %p, %u, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer, + buffer_size, read_len); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteBusData(IDebugDataSpaces *iface, ULONG data_type, + ULONG bus_number, ULONG slot_number, ULONG offset, void *buffer, ULONG buffer_size, ULONG *written) +{ + FIXME("%p, %u, %u, %u, %u, %p, %u, %p stub.\n", iface, data_type, bus_number, slot_number, offset, buffer, + buffer_size, written); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_CheckLowMemory(IDebugDataSpaces *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadDebuggerData(IDebugDataSpaces *iface, ULONG index, void *buffer, + ULONG buffer_size, ULONG *data_size) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, data_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadProcessorSystemData(IDebugDataSpaces *iface, ULONG processor, + ULONG index, void *buffer, ULONG buffer_size, ULONG *data_size) +{ + FIXME("%p, %u, %u, %p, %u, %p stub.\n", iface, processor, index, buffer, buffer_size, data_size); + + return E_NOTIMPL; +} + +static const IDebugDataSpacesVtbl debugdataspacesvtbl = +{ + debugdataspaces_QueryInterface, + debugdataspaces_AddRef, + debugdataspaces_Release, + debugdataspaces_ReadVirtual, + debugdataspaces_WriteVirtual, + debugdataspaces_SearchVirtual, + debugdataspaces_ReadVirtualUncached, + debugdataspaces_WriteVirtualUncached, + debugdataspaces_ReadPointersVirtual, + debugdataspaces_WritePointersVirtual, + debugdataspaces_ReadPhysical, + debugdataspaces_WritePhysical, + debugdataspaces_ReadControl, + debugdataspaces_WriteControl, + debugdataspaces_ReadIo, + debugdataspaces_WriteIo, + debugdataspaces_ReadMsr, + debugdataspaces_WriteMsr, + debugdataspaces_ReadBusData, + debugdataspaces_WriteBusData, + debugdataspaces_CheckLowMemory, + debugdataspaces_ReadDebuggerData, + debugdataspaces_ReadProcessorSystemData, +}; + +static HRESULT STDMETHODCALLTYPE debugsymbols_QueryInterface(IDebugSymbols3 *iface, REFIID riid, void **obj) +{ + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_QueryInterface(unk, riid, obj); +} + +static ULONG STDMETHODCALLTYPE debugsymbols_AddRef(IDebugSymbols3 *iface) +{ + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_AddRef(unk); +} + +static ULONG STDMETHODCALLTYPE debugsymbols_Release(IDebugSymbols3 *iface) +{ + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_Release(unk); +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolOptions(IDebugSymbols3 *iface, ULONG *options) +{ + FIXME("%p, %p stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSymbolOptions(IDebugSymbols3 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSymbolOptions(IDebugSymbols3 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolOptions(IDebugSymbols3 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffset(IDebugSymbols3 *iface, ULONG64 offset, char *buffer, + ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) +{ + FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, + name_size, displacement); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByName(IDebugSymbols3 *iface, const char *symbol, + ULONG64 *offset) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_a(symbol), offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffset(IDebugSymbols3 *iface, ULONG64 offset, LONG delta, + char *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) +{ + FIXME("%p, %s, %d, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size, + name_size, displacement); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG *line, + char *buffer, ULONG buffer_size, ULONG *file_size, ULONG64 *displacement) +{ + FIXME("%p, %s, %p, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size, + file_size, displacement); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLine(IDebugSymbols3 *iface, ULONG line, const char *file, + ULONG64 *offset) +{ + FIXME("%p, %u, %s, %p stub.\n", iface, line, debugstr_a(file), offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNumberModules(IDebugSymbols3 *iface, ULONG *loaded, ULONG *unloaded) +{ + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + static struct target_process *target; + HRESULT hr; + + TRACE("%p, %p, %p.\n", iface, loaded, unloaded); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (FAILED(hr = debug_target_init_modules_info(target))) + return hr; + + *loaded = target->modules.loaded; + *unloaded = target->modules.unloaded; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByIndex(IDebugSymbols3 *iface, ULONG index, ULONG64 *base) +{ + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + const struct module_info *info; + struct target_process *target; + + TRACE("%p, %u, %p.\n", iface, index, base); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (!(info = debug_target_get_module_info(target, index))) + return E_INVALIDARG; + + *base = info->params.Base; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName(IDebugSymbols3 *iface, const char *name, + ULONG start_index, ULONG *index, ULONG64 *base) +{ + FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_a(name), start_index, index, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset(IDebugSymbols3 *iface, ULONG64 offset, + ULONG start_index, ULONG *index, ULONG64 *base) +{ + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + static struct target_process *target; + const struct module_info *info; + + TRACE("%p, %s, %u, %p, %p.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + while ((info = debug_target_get_module_info(target, start_index))) + { + if (offset >= info->params.Base && offset < info->params.Base + info->params.Size) + { + if (index) + *index = start_index; + if (base) + *base = info->params.Base; + return S_OK; + } + + start_index++; + } + + return E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNames(IDebugSymbols3 *iface, ULONG index, ULONG64 base, + char *image_name, ULONG image_name_buffer_size, ULONG *image_name_size, char *module_name, + ULONG module_name_buffer_size, ULONG *module_name_size, char *loaded_image_name, + ULONG loaded_image_name_buffer_size, ULONG *loaded_image_size) +{ + FIXME("%p, %u, %s, %p, %u, %p, %p, %u, %p, %p, %u, %p stub.\n", iface, index, wine_dbgstr_longlong(base), + image_name, image_name_buffer_size, image_name_size, module_name, module_name_buffer_size, + module_name_size, loaded_image_name, loaded_image_name_buffer_size, loaded_image_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleParameters(IDebugSymbols3 *iface, ULONG count, ULONG64 *bases, + ULONG start, DEBUG_MODULE_PARAMETERS *params) +{ + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + const struct module_info *info; + struct target_process *target; + unsigned int i; + + TRACE("%p, %u, %p, %u, %p.\n", iface, count, bases, start, params); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (bases) + { + for (i = 0; i < count; ++i) + { + if ((info = debug_target_get_module_info_by_base(target, bases[i]))) + { + params[i] = info->params; + } + else + { + memset(&params[i], 0, sizeof(*params)); + params[i].Base = DEBUG_INVALID_OFFSET; + } + } + } + else + { + for (i = start; i < start + count; ++i) + { + if (!(info = debug_target_get_module_info(target, i))) + return E_INVALIDARG; + params[i] = info->params; + } + } + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModule(IDebugSymbols3 *iface, const char *symbol, ULONG64 *base) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_a(symbol), base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeName(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id, + char *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, buffer, + buffer_size, name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeId(IDebugSymbols3 *iface, ULONG64 base, const char *name, + ULONG *type_id) +{ + FIXME("%p, %s, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), debugstr_a(name), type_id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeSize(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id, + ULONG *size) +{ + FIXME("%p, %s, %u, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffset(IDebugSymbols3 *iface, ULONG64 base, ULONG type_id, + const char *field, ULONG *offset) +{ + FIXME("%p, %s, %u, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), type_id, debugstr_a(field), offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolTypeId(IDebugSymbols3 *iface, const char *symbol, ULONG *type_id, + ULONG64 *base) +{ + FIXME("%p, %s, %p, %p stub.\n", iface, debugstr_a(symbol), type_id, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetTypeId(IDebugSymbols3 *iface, ULONG64 offset, ULONG *type_id, + ULONG64 *base) +{ + FIXME("%p, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), type_id, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataVirtual(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, + ULONG type_id, void *buffer, ULONG buffer_size, ULONG *read_len) +{ + FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), + type_id, buffer, buffer_size, read_len); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataVirtual(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, + ULONG type_id, void *buffer, ULONG buffer_size, ULONG *written) +{ + FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), + type_id, buffer, buffer_size, written); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataVirtual(IDebugSymbols3 *iface, ULONG output_control, + ULONG64 offset, ULONG64 base, ULONG type_id, ULONG flags) +{ + FIXME("%p, %#x, %s, %s, %u, %#x stub.\n", iface, output_control, wine_dbgstr_longlong(offset), + wine_dbgstr_longlong(base), type_id, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_ReadTypedDataPhysical(IDebugSymbols3 *iface, ULONG64 offset, ULONG64 base, + ULONG type_id, void *buffer, ULONG buffer_size, ULONG *read_len) +{ + FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), + type_id, buffer, buffer_size, read_len); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_WriteTypedDataPhysical(IDebugSymbols3 *iface, ULONG64 offset, + ULONG64 base, ULONG type_id, void *buffer, ULONG buffer_size, ULONG *written) +{ + FIXME("%p, %s, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(base), + type_id, buffer, buffer_size, written); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_OutputTypedDataPhysical(IDebugSymbols3 *iface, ULONG output_control, + ULONG64 offset, ULONG64 base, ULONG type_id, ULONG flags) +{ + FIXME("%p, %#x, %s, %s, %u, %#x stub.\n", iface, output_control, wine_dbgstr_longlong(offset), + wine_dbgstr_longlong(base), type_id, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetScope(IDebugSymbols3 *iface, ULONG64 *instr_offset, + DEBUG_STACK_FRAME *frame, void *scope_context, ULONG scope_context_size) +{ + FIXME("%p, %p, %p, %p, %u stub.\n", iface, instr_offset, frame, scope_context, scope_context_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetScope(IDebugSymbols3 *iface, ULONG64 instr_offset, + DEBUG_STACK_FRAME *frame, void *scope_context, ULONG scope_context_size) +{ + FIXME("%p, %s, %p, %p, %u stub.\n", iface, wine_dbgstr_longlong(instr_offset), frame, scope_context, + scope_context_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_ResetScope(IDebugSymbols3 *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup(IDebugSymbols3 *iface, ULONG flags, + IDebugSymbolGroup *update, IDebugSymbolGroup **symbols) +{ + FIXME("%p, %#x, %p, %p stub.\n", iface, flags, update, symbols); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_CreateSymbolGroup(IDebugSymbols3 *iface, IDebugSymbolGroup **group) +{ + FIXME("%p, %p stub.\n", iface, group); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatch(IDebugSymbols3 *iface, const char *pattern, + ULONG64 *handle) +{ + FIXME("%p, %s, %p stub.\n", iface, pattern, handle); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatch(IDebugSymbols3 *iface, ULONG64 handle, char *buffer, + ULONG buffer_size, ULONG *match_size, ULONG64 *offset) +{ + FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_EndSymbolMatch(IDebugSymbols3 *iface, ULONG64 handle) +{ + FIXME("%p, %s stub.\n", iface, wine_dbgstr_longlong(handle)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_Reload(IDebugSymbols3 *iface, const char *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size, + ULONG *path_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolPath(IDebugSymbols3 *iface, const char *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSymbolPath(IDebugSymbols3 *iface, const char *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size, + ULONG *path_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetImagePath(IDebugSymbols3 *iface, const char *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendImagePath(IDebugSymbols3 *iface, const char *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePath(IDebugSymbols3 *iface, char *buffer, ULONG buffer_size, + ULONG *path_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElement(IDebugSymbols3 *iface, ULONG index, char *buffer, + ULONG buffer_size, ULONG *element_size) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, element_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSourcePath(IDebugSymbols3 *iface, const char *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSourcePath(IDebugSymbols3 *iface, const char *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFile(IDebugSymbols3 *iface, ULONG start, const char *file, + ULONG flags, ULONG *found_element, char *buffer, ULONG buffer_size, ULONG *found_size) +{ + FIXME("%p, %u, %s, %#x, %p, %p, %u, %p stub.\n", iface, start, debugstr_a(file), flags, found_element, buffer, + buffer_size, found_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsets(IDebugSymbols3 *iface, const char *file, + ULONG64 *buffer, ULONG buffer_lines, ULONG *file_lines) +{ + FIXME("%p, %s, %p, %u, %p stub.\n", iface, debugstr_a(file), buffer, buffer_lines, file_lines); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebugSymbols3 *iface, ULONG index, + ULONG64 base, const char *item, void *buffer, ULONG buffer_size, ULONG *info_size) +{ + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + const struct module_info *info; + struct target_process *target; + void *version_info, *ptr; + HRESULT hr = E_FAIL; + DWORD handle, size; + + TRACE("%p, %u, %s, %s, %p, %u, %p.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer, + buffer_size, info_size); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (index == DEBUG_ANY_ID) + info = debug_target_get_module_info_by_base(target, base); + else + info = debug_target_get_module_info(target, index); + + if (!info) + { + WARN("Was unable to locate module.\n"); + return E_INVALIDARG; + } + + if (!(size = GetFileVersionInfoSizeA(info->image_name, &handle))) + return E_FAIL; + + if (!(version_info = heap_alloc(size))) + return E_OUTOFMEMORY; + + if (GetFileVersionInfoA(info->image_name, handle, size, version_info)) + { +#ifdef __REACTOS__ + if (VerQueryValueA(version_info, item, &ptr, (PUINT) &size)) +#else + if (VerQueryValueA(version_info, item, &ptr, &size)) +#endif + { + if (info_size) + *info_size = size; + + if (buffer && buffer_size) + { + unsigned int dst_len = min(size, buffer_size); + if (dst_len) + memcpy(buffer, ptr, dst_len); + } + + hr = buffer && buffer_size < size ? S_FALSE : S_OK; + } + } + + heap_free(version_info); + + return hr; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3 *iface, ULONG which, ULONG index, + ULONG64 base, char *buffer, ULONG buffer_size, ULONG *name_size) +{ + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + const struct module_info *info; + struct target_process *target; + HRESULT hr; + + TRACE("%p, %u, %u, %s, %p, %u, %p.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, + name_size); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (index == DEBUG_ANY_ID) + info = debug_target_get_module_info_by_base(target, base); + else + info = debug_target_get_module_info(target, index); + + if (!info) + { + WARN("Was unable to locate module.\n"); + return E_INVALIDARG; + } + + switch (which) + { + case DEBUG_MODNAME_IMAGE: +#ifdef __REACTOS__ + hr = debug_target_return_string(info->image_name, buffer, buffer_size, (UINT *) name_size); +#else + hr = debug_target_return_string(info->image_name, buffer, buffer_size, name_size); +#endif + break; + case DEBUG_MODNAME_MODULE: + case DEBUG_MODNAME_LOADED_IMAGE: + case DEBUG_MODNAME_SYMBOL_FILE: + case DEBUG_MODNAME_MAPPED_IMAGE: + FIXME("Unsupported name info %d.\n", which); + return E_NOTIMPL; + default: + WARN("Unknown name info %d.\n", which); + return E_INVALIDARG; + } + + return hr; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantName(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + ULONG64 value, char *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, + wine_dbgstr_longlong(value), buffer, buffer_size, name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldName(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + ULONG field_index, char *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer, + buffer_size, name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeOptions(IDebugSymbols3 *iface, ULONG *options) +{ + FIXME("%p, %p stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddTypeOptions(IDebugSymbols3 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveTypeOptions(IDebugSymbols3 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetTypeOptions(IDebugSymbols3 *iface, ULONG options) +{ + FIXME("%p, %#x stub.\n", iface, options); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNameByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, WCHAR *buffer, + ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) +{ + FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, name_size, + displacement); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByNameWide(IDebugSymbols3 *iface, const WCHAR *symbol, + ULONG64 *offset) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_w(symbol), offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNearNameByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, + LONG delta, WCHAR *buffer, ULONG buffer_size, ULONG *name_size, ULONG64 *displacement) +{ + FIXME("%p, %s, %d, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, buffer, buffer_size, + name_size, displacement); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetLineByOffsetWide(IDebugSymbols3 *iface, ULONG64 offset, ULONG *line, + WCHAR *buffer, ULONG buffer_size, ULONG *file_size, ULONG64 *displacement) +{ + FIXME("%p, %s, %p, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), line, buffer, buffer_size, + file_size, displacement); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLineWide(IDebugSymbols3 *iface, ULONG line, const WCHAR *file, + ULONG64 *offset) +{ + FIXME("%p, %u, %s, %p stub.\n", iface, line, debugstr_w(file), offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleNameWide(IDebugSymbols3 *iface, const WCHAR *name, + ULONG start_index, ULONG *index, ULONG64 *base) +{ + FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_w(name), start_index, index, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModuleWide(IDebugSymbols3 *iface, const WCHAR *symbol, + ULONG64 *base) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_w(symbol), base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + WCHAR *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, buffer, buffer_size, + name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetTypeIdWide(IDebugSymbols3 *iface, ULONG64 module, const WCHAR *name, + ULONG *type_id) +{ + FIXME("%p, %s, %s, %p stub.\n", iface, wine_dbgstr_longlong(module), debugstr_w(name), type_id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldOffsetWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + const WCHAR *field, ULONG *offset) +{ + FIXME("%p, %s, %u, %s, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, debugstr_w(field), offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolTypeIdWide(IDebugSymbols3 *iface, const WCHAR *symbol, + ULONG *type_id, ULONG64 *module) +{ + FIXME("%p, %s, %p, %p stub.\n", iface, debugstr_w(symbol), type_id, module); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetScopeSymbolGroup2(IDebugSymbols3 *iface, ULONG flags, + PDEBUG_SYMBOL_GROUP2 update, PDEBUG_SYMBOL_GROUP2 *symbols) +{ + FIXME("%p, %#x, %p, %p stub.\n", iface, flags, update, symbols); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_CreateSymbolGroup2(IDebugSymbols3 *iface, PDEBUG_SYMBOL_GROUP2 *group) +{ + FIXME("%p, %p stub.\n", iface, group); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_StartSymbolMatchWide(IDebugSymbols3 *iface, const WCHAR *pattern, + ULONG64 *handle) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_w(pattern), handle); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetNextSymbolMatchWide(IDebugSymbols3 *iface, ULONG64 handle, + WCHAR *buffer, ULONG buffer_size, ULONG *match_size, ULONG64 *offset) +{ + FIXME("%p, %s, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(handle), buffer, buffer_size, match_size, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_ReloadWide(IDebugSymbols3 *iface, const WCHAR *module) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(module)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolPathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size, + ULONG *path_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSymbolPathWide(IDebugSymbols3 *iface, const WCHAR *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSymbolPathWide(IDebugSymbols3 *iface, const WCHAR *addition) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(addition)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetImagePathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size, + ULONG *path_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetImagePathWide(IDebugSymbols3 *iface, const WCHAR *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendImagePathWide(IDebugSymbols3 *iface, const WCHAR *addition) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(addition)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathWide(IDebugSymbols3 *iface, WCHAR *buffer, ULONG buffer_size, + ULONG *path_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, path_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourcePathElementWide(IDebugSymbols3 *iface, ULONG index, + WCHAR *buffer, ULONG buffer_size, ULONG *element_size) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, element_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetSourcePathWide(IDebugSymbols3 *iface, const WCHAR *path) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(path)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AppendSourcePathWide(IDebugSymbols3 *iface, const WCHAR *addition) +{ + FIXME("%p, %s stub.\n", iface, debugstr_w(addition)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_FindSourceFileWide(IDebugSymbols3 *iface, ULONG start_element, + const WCHAR *file, ULONG flags, ULONG *found_element, WCHAR *buffer, ULONG buffer_size, ULONG *found_size) +{ + FIXME("%p, %u, %s, %#x, %p, %p, %u, %p stub.\n", iface, start_element, debugstr_w(file), flags, found_element, + buffer, buffer_size, found_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsetsWide(IDebugSymbols3 *iface, const WCHAR *file, + ULONG64 *buffer, ULONG buffer_lines, ULONG *file_lines) +{ + FIXME("%p, %s, %p, %u, %p stub.\n", iface, debugstr_w(file), buffer, buffer_lines, file_lines); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformationWide(IDebugSymbols3 *iface, ULONG index, + ULONG64 base, const WCHAR *item, void *buffer, ULONG buffer_size, ULONG *version_info_size) +{ + FIXME("%p, %u, %s, %s, %p, %u, %p stub.\n", iface, index, wine_dbgstr_longlong(base), debugstr_w(item), buffer, + buffer_size, version_info_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameStringWide(IDebugSymbols3 *iface, ULONG which, ULONG index, + ULONG64 base, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %u, %u, %s, %p, %u, %p stub.\n", iface, which, index, wine_dbgstr_longlong(base), buffer, buffer_size, + name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetConstantNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + ULONG64 value, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, + wine_dbgstr_longlong(value), buffer, buffer_size, name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldNameWide(IDebugSymbols3 *iface, ULONG64 module, ULONG type_id, + ULONG field_index, WCHAR *buffer, ULONG buffer_size, ULONG *name_size) +{ + FIXME("%p, %s, %u, %u, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(module), type_id, field_index, buffer, + buffer_size, name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_IsManagedModule(IDebugSymbols3 *iface, ULONG index, ULONG64 base) +{ + FIXME("%p, %u, %s stub.\n", iface, index, wine_dbgstr_longlong(base)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2(IDebugSymbols3 *iface, const char *name, + ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base) +{ + FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, debugstr_a(name), start_index, flags, index, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName2Wide(IDebugSymbols3 *iface, const WCHAR *name, + ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base) +{ + FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, debugstr_w(name), start_index, flags, index, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset2(IDebugSymbols3 *iface, ULONG64 offset, + ULONG start_index, ULONG flags, ULONG *index, ULONG64 *base) +{ + FIXME("%p, %s, %u, %#x, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), start_index, flags, index, base); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModule(IDebugSymbols3 *iface, ULONG64 base, ULONG size, + const char *image_path, const char *module_name, ULONG flags) +{ + FIXME("%p, %s, %u, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_a(image_path), + debugstr_a(module_name), flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticModuleWide(IDebugSymbols3 *iface, ULONG64 base, ULONG size, + const WCHAR *image_path, const WCHAR *module_name, ULONG flags) +{ + FIXME("%p, %s, %u, %s, %s, %#x stub.\n", iface, wine_dbgstr_longlong(base), size, debugstr_w(image_path), + debugstr_w(module_name), flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSyntheticModule(IDebugSymbols3 *iface, ULONG64 base) +{ + FIXME("%p, %s stub.\n", iface, wine_dbgstr_longlong(base)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetCurrentScopeFrameIndex(IDebugSymbols3 *iface, ULONG *index) +{ + FIXME("%p, %p stub.\n", iface, index); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFrameByIndex(IDebugSymbols3 *iface, ULONG index) +{ + FIXME("%p, %u stub.\n", iface, index); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFromJitDebugInfo(IDebugSymbols3 *iface, ULONG output_control, + ULONG64 info_offset) +{ + FIXME("%p, %u, %s stub.\n", iface, output_control, wine_dbgstr_longlong(info_offset)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_SetScopeFromStoredEvent(IDebugSymbols3 *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_OutputSymbolByOffset(IDebugSymbols3 *iface, ULONG output_control, + ULONG flags, ULONG64 offset) +{ + FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, flags, wine_dbgstr_longlong(offset)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFunctionEntryByOffset(IDebugSymbols3 *iface, ULONG64 offset, + ULONG flags, void *buffer, ULONG buffer_size, ULONG *needed_size) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size, + needed_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffset(IDebugSymbols3 *iface, ULONG64 module, + ULONG container_type_id, const char *field, ULONG *field_type_id, ULONG *offset) +{ + FIXME("%p, %s, %u, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_a(field), + field_type_id, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetFieldTypeAndOffsetWide(IDebugSymbols3 *iface, ULONG64 module, + ULONG container_type_id, const WCHAR *field, ULONG *field_type_id, ULONG *offset) +{ + FIXME("%p, %s, %u, %s, %p, %p stub.\n", iface, wine_dbgstr_longlong(module), container_type_id, debugstr_w(field), + field_type_id, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbol(IDebugSymbols3 *iface, ULONG64 offset, ULONG size, + const char *name, ULONG flags, DEBUG_MODULE_AND_ID *id) +{ + FIXME("%p, %s, %u, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_a(name), flags, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_AddSyntheticSymbolWide(IDebugSymbols3 *iface, ULONG64 offset, ULONG size, + const WCHAR *name, ULONG flags, DEBUG_MODULE_AND_ID *id) +{ + FIXME("%p, %s, %u, %s, %#x, %p stub.\n", iface, wine_dbgstr_longlong(offset), size, debugstr_w(name), flags, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_RemoveSyntheticSymbol(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id) +{ + FIXME("%p, %p stub.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByOffset(IDebugSymbols3 *iface, ULONG64 offset, + ULONG flags, DEBUG_MODULE_AND_ID *ids, LONG64 *displacements, ULONG count, ULONG *entries) +{ + FIXME("%p, %s, %#x, %p, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, ids, displacements, count, + entries); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByName(IDebugSymbols3 *iface, const char *symbol, + ULONG flags, DEBUG_MODULE_AND_ID *ids, ULONG count, ULONG *entries) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_a(symbol), flags, ids, count, entries); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntriesByNameWide(IDebugSymbols3 *iface, const WCHAR *symbol, + ULONG flags, DEBUG_MODULE_AND_ID *ids, ULONG count, ULONG *entries) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_w(symbol), flags, ids, count, entries); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryByToken(IDebugSymbols3 *iface, ULONG64 base, ULONG token, + DEBUG_MODULE_AND_ID *id) +{ + FIXME("%p, %s, %p stub.\n", iface, wine_dbgstr_longlong(base), id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryInformation(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, + DEBUG_SYMBOL_ENTRY *info) +{ + FIXME("%p, %p, %p stub.\n", iface, id, info); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryString(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, + ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size) +{ + FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, id, which, buffer, buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryStringWide(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, + ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size) +{ + FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, id, which, buffer, buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryOffsetRegions(IDebugSymbols3 *iface, DEBUG_MODULE_AND_ID *id, + ULONG flags, DEBUG_OFFSET_REGION *regions, ULONG regions_count, ULONG *regions_avail) +{ + FIXME("%p, %p, %#x, %p, %u, %p stub.\n", iface, id, flags, regions, regions_count, regions_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolEntryBySymbolEntry(IDebugSymbols3 *iface, + DEBUG_MODULE_AND_ID *from_id, ULONG flags, DEBUG_MODULE_AND_ID *to_id) +{ + FIXME("%p, %p, %#x, %p stub.\n", iface, from_id, flags, to_id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByOffset(IDebugSymbols3 *iface, ULONG64 offset, + ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, entries, count, entries_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLine(IDebugSymbols3 *iface, ULONG line, + const char *file, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_a(file), flags, entries, count, entries_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntriesByLineWide(IDebugSymbols3 *iface, ULONG line, + const WCHAR *file, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *entries, ULONG count, ULONG *entries_avail) +{ + FIXME("%p, %s, %#x, %p, %u, %p stub.\n", iface, debugstr_w(file), flags, entries, count, entries_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryString(IDebugSymbols3 *iface, + DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size) +{ + FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryStringWide(IDebugSymbols3 *iface, + DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size) +{ + FIXME("%p, %p, %u, %p, %u, %p stub.\n", iface, entry, which, buffer, buffer_size, string_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryOffsetRegions(IDebugSymbols3 *iface, + DEBUG_SYMBOL_SOURCE_ENTRY *entry, ULONG flags, DEBUG_OFFSET_REGION *regions, ULONG count, ULONG *regions_avail) +{ + FIXME("%p, %p, %#x, %p, %u, %p stub.\n", iface, entry, flags, regions, count, regions_avail); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceEntryBySourceEntry(IDebugSymbols3 *iface, + DEBUG_SYMBOL_SOURCE_ENTRY *from_entry, ULONG flags, DEBUG_SYMBOL_SOURCE_ENTRY *to_entry) +{ + FIXME("%p, %p, %#x, %p stub.\n", iface, from_entry, flags, to_entry); + + return E_NOTIMPL; +} + +static const IDebugSymbols3Vtbl debugsymbolsvtbl = +{ + debugsymbols_QueryInterface, + debugsymbols_AddRef, + debugsymbols_Release, + debugsymbols_GetSymbolOptions, + debugsymbols_AddSymbolOptions, + debugsymbols_RemoveSymbolOptions, + debugsymbols_SetSymbolOptions, + debugsymbols_GetNameByOffset, + debugsymbols_GetOffsetByName, + debugsymbols_GetNearNameByOffset, + debugsymbols_GetLineByOffset, + debugsymbols_GetOffsetByLine, + debugsymbols_GetNumberModules, + debugsymbols_GetModuleByIndex, + debugsymbols_GetModuleByModuleName, + debugsymbols_GetModuleByOffset, + debugsymbols_GetModuleNames, + debugsymbols_GetModuleParameters, + debugsymbols_GetSymbolModule, + debugsymbols_GetTypeName, + debugsymbols_GetTypeId, + debugsymbols_GetTypeSize, + debugsymbols_GetFieldOffset, + debugsymbols_GetSymbolTypeId, + debugsymbols_GetOffsetTypeId, + debugsymbols_ReadTypedDataVirtual, + debugsymbols_WriteTypedDataVirtual, + debugsymbols_OutputTypedDataVirtual, + debugsymbols_ReadTypedDataPhysical, + debugsymbols_WriteTypedDataPhysical, + debugsymbols_OutputTypedDataPhysical, + debugsymbols_GetScope, + debugsymbols_SetScope, + debugsymbols_ResetScope, + debugsymbols_GetScopeSymbolGroup, + debugsymbols_CreateSymbolGroup, + debugsymbols_StartSymbolMatch, + debugsymbols_GetNextSymbolMatch, + debugsymbols_EndSymbolMatch, + debugsymbols_Reload, + debugsymbols_GetSymbolPath, + debugsymbols_SetSymbolPath, + debugsymbols_AppendSymbolPath, + debugsymbols_GetImagePath, + debugsymbols_SetImagePath, + debugsymbols_AppendImagePath, + debugsymbols_GetSourcePath, + debugsymbols_GetSourcePathElement, + debugsymbols_SetSourcePath, + debugsymbols_AppendSourcePath, + debugsymbols_FindSourceFile, + debugsymbols_GetSourceFileLineOffsets, + /* IDebugSymbols2 */ + debugsymbols_GetModuleVersionInformation, + debugsymbols_GetModuleNameString, + debugsymbols_GetConstantName, + debugsymbols_GetFieldName, + debugsymbols_GetTypeOptions, + debugsymbols_AddTypeOptions, + debugsymbols_RemoveTypeOptions, + debugsymbols_SetTypeOptions, + /* IDebugSymbols3 */ + debugsymbols_GetNameByOffsetWide, + debugsymbols_GetOffsetByNameWide, + debugsymbols_GetNearNameByOffsetWide, + debugsymbols_GetLineByOffsetWide, + debugsymbols_GetOffsetByLineWide, + debugsymbols_GetModuleByModuleNameWide, + debugsymbols_GetSymbolModuleWide, + debugsymbols_GetTypeNameWide, + debugsymbols_GetTypeIdWide, + debugsymbols_GetFieldOffsetWide, + debugsymbols_GetSymbolTypeIdWide, + debugsymbols_GetScopeSymbolGroup2, + debugsymbols_CreateSymbolGroup2, + debugsymbols_StartSymbolMatchWide, + debugsymbols_GetNextSymbolMatchWide, + debugsymbols_ReloadWide, + debugsymbols_GetSymbolPathWide, + debugsymbols_SetSymbolPathWide, + debugsymbols_AppendSymbolPathWide, + debugsymbols_GetImagePathWide, + debugsymbols_SetImagePathWide, + debugsymbols_AppendImagePathWide, + debugsymbols_GetSourcePathWide, + debugsymbols_GetSourcePathElementWide, + debugsymbols_SetSourcePathWide, + debugsymbols_AppendSourcePathWide, + debugsymbols_FindSourceFileWide, + debugsymbols_GetSourceFileLineOffsetsWide, + debugsymbols_GetModuleVersionInformationWide, + debugsymbols_GetModuleNameStringWide, + debugsymbols_GetConstantNameWide, + debugsymbols_GetFieldNameWide, + debugsymbols_IsManagedModule, + debugsymbols_GetModuleByModuleName2, + debugsymbols_GetModuleByModuleName2Wide, + debugsymbols_GetModuleByOffset2, + debugsymbols_AddSyntheticModule, + debugsymbols_AddSyntheticModuleWide, + debugsymbols_RemoveSyntheticModule, + debugsymbols_GetCurrentScopeFrameIndex, + debugsymbols_SetScopeFrameByIndex, + debugsymbols_SetScopeFromJitDebugInfo, + debugsymbols_SetScopeFromStoredEvent, + debugsymbols_OutputSymbolByOffset, + debugsymbols_GetFunctionEntryByOffset, + debugsymbols_GetFieldTypeAndOffset, + debugsymbols_GetFieldTypeAndOffsetWide, + debugsymbols_AddSyntheticSymbol, + debugsymbols_AddSyntheticSymbolWide, + debugsymbols_RemoveSyntheticSymbol, + debugsymbols_GetSymbolEntriesByOffset, + debugsymbols_GetSymbolEntriesByName, + debugsymbols_GetSymbolEntriesByNameWide, + debugsymbols_GetSymbolEntryByToken, + debugsymbols_GetSymbolEntryInformation, + debugsymbols_GetSymbolEntryString, + debugsymbols_GetSymbolEntryStringWide, + debugsymbols_GetSymbolEntryOffsetRegions, + debugsymbols_GetSymbolEntryBySymbolEntry, + debugsymbols_GetSourceEntriesByOffset, + debugsymbols_GetSourceEntriesByLine, + debugsymbols_GetSourceEntriesByLineWide, + debugsymbols_GetSourceEntryString, + debugsymbols_GetSourceEntryStringWide, + debugsymbols_GetSourceEntryOffsetRegions, + debugsymbols_GetSourceEntryBySourceEntry, +}; + +static HRESULT STDMETHODCALLTYPE debugcontrol_QueryInterface(IDebugControl2 *iface, REFIID riid, void **obj) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_QueryInterface(unk, riid, obj); +} + +static ULONG STDMETHODCALLTYPE debugcontrol_AddRef(IDebugControl2 *iface) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_AddRef(unk); +} + +static ULONG STDMETHODCALLTYPE debugcontrol_Release(IDebugControl2 *iface) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_Release(unk); +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetInterrupt(IDebugControl2 *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetInterrupt(IDebugControl2 *iface, ULONG flags) +{ + FIXME("%p, %#x stub.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetInterruptTimeout(IDebugControl2 *iface, ULONG *timeout) +{ + FIXME("%p, %p stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetInterruptTimeout(IDebugControl2 *iface, ULONG timeout) +{ + FIXME("%p, %u stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetLogFile(IDebugControl2 *iface, char *buffer, ULONG buffer_size, + ULONG *file_size, BOOL *append) +{ + FIXME("%p, %p, %u, %p, %p stub.\n", iface, buffer, buffer_size, file_size, append); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_OpenLogFile(IDebugControl2 *iface, const char *file, BOOL append) +{ + FIXME("%p, %s, %d stub.\n", iface, debugstr_a(file), append); + + return E_NOTIMPL; +} +static HRESULT STDMETHODCALLTYPE debugcontrol_CloseLogFile(IDebugControl2 *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} +static HRESULT STDMETHODCALLTYPE debugcontrol_GetLogMask(IDebugControl2 *iface, ULONG *mask) +{ + FIXME("%p, %p stub.\n", iface, mask); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetLogMask(IDebugControl2 *iface, ULONG mask) +{ + FIXME("%p, %#x stub.\n", iface, mask); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_Input(IDebugControl2 *iface, char *buffer, ULONG buffer_size, + ULONG *input_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, input_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_ReturnInput(IDebugControl2 *iface, const char *buffer) +{ + FIXME("%p, %s stub.\n", iface, debugstr_a(buffer)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODVCALLTYPE debugcontrol_Output(IDebugControl2 *iface, ULONG mask, const char *format, ...) +{ + FIXME("%p, %#x, %s stub.\n", iface, mask, debugstr_a(format)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVaList(IDebugControl2 *iface, ULONG mask, const char *format, + __ms_va_list args) +{ + FIXME("%p, %#x, %s stub.\n", iface, mask, debugstr_a(format)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODVCALLTYPE debugcontrol_ControlledOutput(IDebugControl2 *iface, ULONG output_control, + ULONG mask, const char *format, ...) +{ + FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, mask, debugstr_a(format)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_ControlledOutputVaList(IDebugControl2 *iface, ULONG output_control, + ULONG mask, const char *format, __ms_va_list args) +{ + FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, mask, debugstr_a(format)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODVCALLTYPE debugcontrol_OutputPrompt(IDebugControl2 *iface, ULONG output_control, + const char *format, ...) +{ + FIXME("%p, %u, %s stub.\n", iface, output_control, debugstr_a(format)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_OutputPromptVaList(IDebugControl2 *iface, ULONG output_control, + const char *format, __ms_va_list args) +{ + FIXME("%p, %u, %s stub.\n", iface, output_control, debugstr_a(format)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetPromptText(IDebugControl2 *iface, char *buffer, ULONG buffer_size, + ULONG *text_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, text_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_OutputCurrentState(IDebugControl2 *iface, ULONG output_control, + ULONG flags) +{ + FIXME("%p, %u, %#x stub.\n", iface, output_control, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVersionInformation(IDebugControl2 *iface, ULONG output_control) +{ + FIXME("%p, %u stub.\n", iface, output_control); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetNotifyEventHandle(IDebugControl2 *iface, ULONG64 *handle) +{ + FIXME("%p, %p stub.\n", iface, handle); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetNotifyEventHandle(IDebugControl2 *iface, ULONG64 handle) +{ + FIXME("%p, %s stub.\n", iface, wine_dbgstr_longlong(handle)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_Assemble(IDebugControl2 *iface, ULONG64 offset, const char *code, + ULONG64 *end_offset) +{ + FIXME("%p, %s, %s, %p stub.\n", iface, wine_dbgstr_longlong(offset), debugstr_a(code), end_offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_Disassemble(IDebugControl2 *iface, ULONG64 offset, ULONG flags, + char *buffer, ULONG buffer_size, ULONG *disassm_size, ULONG64 *end_offset) +{ + FIXME("%p, %s, %#x, %p, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), flags, buffer, buffer_size, + disassm_size, end_offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetDisassembleEffectiveOffset(IDebugControl2 *iface, ULONG64 *offset) +{ + FIXME("%p, %p stub.\n", iface, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_OutputDisassembly(IDebugControl2 *iface, ULONG output_control, + ULONG64 offset, ULONG flags, ULONG64 *end_offset) +{ + FIXME("%p, %u, %s, %#x, %p stub.\n", iface, output_control, wine_dbgstr_longlong(offset), flags, end_offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_OutputDisassemblyLines(IDebugControl2 *iface, ULONG output_control, + ULONG prev_lines, ULONG total_lines, ULONG64 offset, ULONG flags, ULONG *offset_line, ULONG64 *start_offset, + ULONG64 *end_offset, ULONG64 *line_offsets) +{ + FIXME("%p, %u, %u, %u, %s, %#x, %p, %p, %p, %p stub.\n", iface, output_control, prev_lines, total_lines, + wine_dbgstr_longlong(offset), flags, offset_line, start_offset, end_offset, line_offsets); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetNearInstruction(IDebugControl2 *iface, ULONG64 offset, LONG delta, + ULONG64 *instr_offset) +{ + FIXME("%p, %s, %d, %p stub.\n", iface, wine_dbgstr_longlong(offset), delta, instr_offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetStackTrace(IDebugControl2 *iface, ULONG64 frame_offset, + ULONG64 stack_offset, ULONG64 instr_offset, DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG *frames_filled) +{ + FIXME("%p, %s, %s, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(frame_offset), + wine_dbgstr_longlong(stack_offset), wine_dbgstr_longlong(instr_offset), frames, frames_size, frames_filled); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetReturnOffset(IDebugControl2 *iface, ULONG64 *offset) +{ + FIXME("%p, %p stub.\n", iface, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_OutputStackTrace(IDebugControl2 *iface, ULONG output_control, + DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG flags) +{ + FIXME("%p, %u, %p, %u, %#x stub.\n", iface, output_control, frames, frames_size, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetDebuggeeType(IDebugControl2 *iface, ULONG *debug_class, + ULONG *qualifier) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + static struct target_process *target; + + FIXME("%p, %p, %p stub.\n", iface, debug_class, qualifier); + + *debug_class = DEBUG_CLASS_UNINITIALIZED; + *qualifier = 0; + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + *debug_class = DEBUG_CLASS_USER_WINDOWS; + *qualifier = DEBUG_USER_WINDOWS_PROCESS; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetActualProcessorType(IDebugControl2 *iface, ULONG *type) +{ + FIXME("%p, %p stub.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetExecutingProcessorType(IDebugControl2 *iface, ULONG *type) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + static struct target_process *target; + HRESULT hr; + + TRACE("%p, %p.\n", iface, type); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (FAILED(hr = debug_target_init_modules_info(target))) + return hr; + + *type = target->cpu_type; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberPossibleExecutingProcessorTypes(IDebugControl2 *iface, + ULONG *count) +{ + FIXME("%p, %p stub.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetPossibleExecutingProcessorTypes(IDebugControl2 *iface, ULONG start, + ULONG count, ULONG *types) +{ + FIXME("%p, %u, %u, %p stub.\n", iface, start, count, types); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberProcessors(IDebugControl2 *iface, ULONG *count) +{ + FIXME("%p, %p stub.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetSystemVersion(IDebugControl2 *iface, ULONG *platform_id, ULONG *major, + ULONG *minor, char *sp_string, ULONG sp_string_size, ULONG *sp_string_used, ULONG *sp_number, + char *build_string, ULONG build_string_size, ULONG *build_string_used) +{ + FIXME("%p, %p, %p, %p, %p, %u, %p, %p, %p, %u, %p stub.\n", iface, platform_id, major, minor, sp_string, + sp_string_size, sp_string_used, sp_number, build_string, build_string_size, build_string_used); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetPageSize(IDebugControl2 *iface, ULONG *size) +{ + FIXME("%p, %p stub.\n", iface, size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_IsPointer64Bit(IDebugControl2 *iface) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + static struct target_process *target; + HRESULT hr; + + TRACE("%p.\n", iface); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (FAILED(hr = debug_target_init_modules_info(target))) + return hr; + + switch (target->cpu_type) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARM: + hr = S_FALSE; + break; + case IMAGE_FILE_MACHINE_IA64: + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + hr = S_OK; + break; + default: + FIXME("Unexpected cpu type %#x.\n", target->cpu_type); + hr = E_UNEXPECTED; + } + + return hr; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_ReadBugCheckData(IDebugControl2 *iface, ULONG *code, ULONG64 *arg1, + ULONG64 *arg2, ULONG64 *arg3, ULONG64 *arg4) +{ + FIXME("%p, %p, %p, %p, %p, %p stub.\n", iface, code, arg1, arg2, arg3, arg4); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberSupportedProcessorTypes(IDebugControl2 *iface, ULONG *count) +{ + FIXME("%p, %p stub.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetSupportedProcessorTypes(IDebugControl2 *iface, ULONG start, + ULONG count, ULONG *types) +{ + FIXME("%p, %u, %u, %p stub.\n", iface, start, count, types); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetProcessorTypeNames(IDebugControl2 *iface, ULONG type, char *full_name, + ULONG full_name_buffer_size, ULONG *full_name_size, char *abbrev_name, ULONG abbrev_name_buffer_size, + ULONG *abbrev_name_size) +{ + FIXME("%p, %u, %p, %u, %p, %p, %u, %p stub.\n", iface, type, full_name, full_name_buffer_size, full_name_size, + abbrev_name, abbrev_name_buffer_size, abbrev_name_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetEffectiveProcessorType(IDebugControl2 *iface, ULONG *type) +{ + FIXME("%p, %p stub.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetEffectiveProcessorType(IDebugControl2 *iface, ULONG type) +{ + FIXME("%p, %u stub.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetExecutionStatus(IDebugControl2 *iface, ULONG *status) +{ + FIXME("%p, %p stub.\n", iface, status); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetExecutionStatus(IDebugControl2 *iface, ULONG status) +{ + FIXME("%p, %u stub.\n", iface, status); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetCodeLevel(IDebugControl2 *iface, ULONG *level) +{ + FIXME("%p, %p stub.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetCodeLevel(IDebugControl2 *iface, ULONG level) +{ + FIXME("%p, %u stub.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetEngineOptions(IDebugControl2 *iface, ULONG *options) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + + TRACE("%p, %p.\n", iface, options); + + *options = debug_client->engine_options; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_AddEngineOptions(IDebugControl2 *iface, ULONG options) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + + TRACE("%p, %#x.\n", iface, options); + + if (options & ~DEBUG_ENGOPT_ALL) + return E_INVALIDARG; + + debug_client->engine_options |= options; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveEngineOptions(IDebugControl2 *iface, ULONG options) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + + TRACE("%p, %#x.\n", iface, options); + + debug_client->engine_options &= ~options; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetEngineOptions(IDebugControl2 *iface, ULONG options) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + + TRACE("%p, %#x.\n", iface, options); + + if (options & ~DEBUG_ENGOPT_ALL) + return E_INVALIDARG; + + debug_client->engine_options = options; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetSystemErrorControl(IDebugControl2 *iface, ULONG *output_level, + ULONG *break_level) +{ + FIXME("%p, %p, %p stub.\n", iface, output_level, break_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetSystemErrorControl(IDebugControl2 *iface, ULONG output_level, + ULONG break_level) +{ + FIXME("%p, %u, %u stub.\n", iface, output_level, break_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetTextMacro(IDebugControl2 *iface, ULONG slot, char *buffer, + ULONG buffer_size, ULONG *macro_size) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, slot, buffer, buffer_size, macro_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetTextMacro(IDebugControl2 *iface, ULONG slot, const char *macro) +{ + FIXME("%p, %u, %s stub.\n", iface, slot, debugstr_a(macro)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetRadix(IDebugControl2 *iface, ULONG *radix) +{ + FIXME("%p, %p stub.\n", iface, radix); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetRadix(IDebugControl2 *iface, ULONG radix) +{ + FIXME("%p, %u stub.\n", iface, radix); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_Evaluate(IDebugControl2 *iface, const char *expression, + ULONG desired_type, DEBUG_VALUE *value, ULONG *remainder_index) +{ + FIXME("%p, %s, %u, %p, %p stub.\n", iface, debugstr_a(expression), desired_type, value, remainder_index); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValue(IDebugControl2 *iface, DEBUG_VALUE input, ULONG output_type, + DEBUG_VALUE *output) +{ + FIXME("%p, %u, %p stub.\n", iface, output_type, output); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_CoerceValues(IDebugControl2 *iface, ULONG count, DEBUG_VALUE *input, + ULONG *output_types, DEBUG_VALUE *output) +{ + FIXME("%p, %u, %p, %p, %p stub.\n", iface, count, input, output_types, output); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_Execute(IDebugControl2 *iface, ULONG output_control, const char *command, + ULONG flags) +{ + FIXME("%p, %u, %s, %#x stub.\n", iface, output_control, debugstr_a(command), flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_ExecuteCommandFile(IDebugControl2 *iface, ULONG output_control, + const char *command_file, ULONG flags) +{ + FIXME("%p, %u, %s, %#x stub.\n", iface, output_control, debugstr_a(command_file), flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberBreakpoints(IDebugControl2 *iface, ULONG *count) +{ + FIXME("%p, %p stub.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointByIndex(IDebugControl2 *iface, ULONG index, + IDebugBreakpoint **bp) +{ + FIXME("%p, %u, %p stub.\n", iface, index, bp); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointById(IDebugControl2 *iface, ULONG id, IDebugBreakpoint **bp) +{ + FIXME("%p, %u, %p stub.\n", iface, id, bp); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetBreakpointParameters(IDebugControl2 *iface, ULONG count, ULONG *ids, + ULONG start, DEBUG_BREAKPOINT_PARAMETERS *parameters) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, count, ids, start, parameters); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_AddBreakpoint(IDebugControl2 *iface, ULONG type, ULONG desired_id, + IDebugBreakpoint **bp) +{ + FIXME("%p, %u, %u, %p stub.\n", iface, type, desired_id, bp); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveBreakpoint(IDebugControl2 *iface, IDebugBreakpoint *bp) +{ + FIXME("%p, %p stub.\n", iface, bp); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_AddExtension(IDebugControl2 *iface, const char *path, ULONG flags, + ULONG64 *handle) +{ + FIXME("%p, %s, %#x, %p stub.\n", iface, debugstr_a(path), flags, handle); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveExtension(IDebugControl2 *iface, ULONG64 handle) +{ + FIXME("%p, %s stub.\n", iface, wine_dbgstr_longlong(handle)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetExtensionByPath(IDebugControl2 *iface, const char *path, + ULONG64 *handle) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_a(path), handle); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_CallExtension(IDebugControl2 *iface, ULONG64 handle, + const char *function, const char *args) +{ + FIXME("%p, %s, %s, %s stub.\n", iface, wine_dbgstr_longlong(handle), debugstr_a(function), debugstr_a(args)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetExtensionFunction(IDebugControl2 *iface, ULONG64 handle, + const char *name, void *function) +{ + FIXME("%p, %s, %s, %p stub.\n", iface, wine_dbgstr_longlong(handle), debugstr_a(name), function); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetWindbgExtensionApis32(IDebugControl2 *iface, + PWINDBG_EXTENSION_APIS32 api) +{ + FIXME("%p, %p stub.\n", iface, api); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetWindbgExtensionApis64(IDebugControl2 *iface, + PWINDBG_EXTENSION_APIS64 api) +{ + FIXME("%p, %p stub.\n", iface, api); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberEventFilters(IDebugControl2 *iface, ULONG *specific_events, + ULONG *specific_exceptions, ULONG *arbitrary_exceptions) +{ + FIXME("%p, %p, %p, %p stub.\n", iface, specific_events, specific_exceptions, arbitrary_exceptions); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterText(IDebugControl2 *iface, ULONG index, char *buffer, + ULONG buffer_size, ULONG *text_size) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, text_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetEventFilterCommand(IDebugControl2 *iface, ULONG index, char *buffer, + ULONG buffer_size, ULONG *command_size) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, command_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetEventFilterCommand(IDebugControl2 *iface, ULONG index, + const char *command) +{ + FIXME("%p, %u, %s stub.\n", iface, index, debugstr_a(command)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterParameters(IDebugControl2 *iface, ULONG start, + ULONG count, DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) +{ + FIXME("%p, %u, %u, %p stub.\n", iface, start, count, parameters); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterParameters(IDebugControl2 *iface, ULONG start, + ULONG count, DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) +{ + FIXME("%p, %u, %u, %p stub.\n", iface, start, count, parameters); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetSpecificFilterArgument(IDebugControl2 *iface, ULONG index, + char *buffer, ULONG buffer_size, ULONG *argument_size) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, argument_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetSpecificFilterArgument(IDebugControl2 *iface, ULONG index, + const char *argument) +{ + FIXME("%p, %u, %s stub.\n", iface, index, debugstr_a(argument)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterParameters(IDebugControl2 *iface, ULONG count, + ULONG *codes, ULONG start, DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, count, codes, start, parameters); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetExceptionFilterParameters(IDebugControl2 *iface, ULONG count, + DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) +{ + FIXME("%p, %u, %p stub.\n", iface, count, parameters); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetExceptionFilterSecondCommand(IDebugControl2 *iface, ULONG index, + char *buffer, ULONG buffer_size, ULONG *command_size) +{ + FIXME("%p, %u, %p, %u, %p stub.\n", iface, index, buffer, buffer_size, command_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetExceptionFilterSecondCommand(IDebugControl2 *iface, ULONG index, + const char *command) +{ + FIXME("%p, %u, %s stub.\n", iface, index, debugstr_a(command)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_WaitForEvent(IDebugControl2 *iface, ULONG flags, ULONG timeout) +{ + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + struct target_process *target; + + TRACE("%p, %#x, %u.\n", iface, flags, timeout); + + /* FIXME: only one target is used currently */ + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (target->attach_flags & DEBUG_ATTACH_NONINVASIVE) + { + BOOL suspend = !(target->attach_flags & DEBUG_ATTACH_NONINVASIVE_NO_SUSPEND); + DWORD access = PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_QUERY_LIMITED_INFORMATION; + NTSTATUS status; + + if (suspend) + access |= PROCESS_SUSPEND_RESUME; + + target->handle = OpenProcess(access, FALSE, target->pid); + if (!target->handle) + { + WARN("Failed to get process handle for pid %#x.\n", target->pid); + return E_UNEXPECTED; + } + + if (suspend) + { + status = NtSuspendProcess(target->handle); + if (status) + WARN("Failed to suspend a process, status %#x.\n", status); + } + + return S_OK; + } + else + { + FIXME("Unsupported attach flags %#x.\n", target->attach_flags); + } + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetLastEventInformation(IDebugControl2 *iface, ULONG *type, ULONG *pid, + ULONG *tid, void *extra_info, ULONG extra_info_size, ULONG *extra_info_used, char *description, + ULONG desc_size, ULONG *desc_used) +{ + FIXME("%p, %p, %p, %p, %p, %u, %p, %p, %u, %p stub.\n", iface, type, pid, tid, extra_info, extra_info_size, + extra_info_used, description, desc_size, desc_used); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetCurrentTimeDate(IDebugControl2 *iface, ULONG timedate) +{ + FIXME("%p, %u stub.\n", iface, timedate); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetCurrentSystemUpTime(IDebugControl2 *iface, ULONG uptime) +{ + FIXME("%p, %u stub.\n", iface, uptime); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetDumpFormatFlags(IDebugControl2 *iface, ULONG *flags) +{ + FIXME("%p, %p stub.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberTextPlacements(IDebugControl2 *iface, ULONG *count) +{ + FIXME("%p, %p stub.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_GetNumberTextReplacement(IDebugControl2 *iface, const char *src_text, + ULONG index, char *src_buffer, ULONG src_buffer_size, ULONG *src_size, char *dst_buffer, + ULONG dst_buffer_size, ULONG *dst_size) +{ + FIXME("%p, %s, %u, %p, %u, %p, %p, %u, %p stub.\n", iface, debugstr_a(src_text), index, src_buffer, + src_buffer_size, src_size, dst_buffer, dst_buffer_size, dst_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_SetTextReplacement(IDebugControl2 *iface, const char *src_text, + const char *dst_text) +{ + FIXME("%p, %s, %s stub.\n", iface, debugstr_a(src_text), debugstr_a(dst_text)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_RemoveTextReplacements(IDebugControl2 *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugcontrol_OutputTextReplacements(IDebugControl2 *iface, ULONG output_control, + ULONG flags) +{ + FIXME("%p, %u, %#x stub.\n", iface, output_control, flags); + + return E_NOTIMPL; +} + +static const IDebugControl2Vtbl debugcontrolvtbl = +{ + debugcontrol_QueryInterface, + debugcontrol_AddRef, + debugcontrol_Release, + debugcontrol_GetInterrupt, + debugcontrol_SetInterrupt, + debugcontrol_GetInterruptTimeout, + debugcontrol_SetInterruptTimeout, + debugcontrol_GetLogFile, + debugcontrol_OpenLogFile, + debugcontrol_CloseLogFile, + debugcontrol_GetLogMask, + debugcontrol_SetLogMask, + debugcontrol_Input, + debugcontrol_ReturnInput, + debugcontrol_Output, + debugcontrol_OutputVaList, + debugcontrol_ControlledOutput, + debugcontrol_ControlledOutputVaList, + debugcontrol_OutputPrompt, + debugcontrol_OutputPromptVaList, + debugcontrol_GetPromptText, + debugcontrol_OutputCurrentState, + debugcontrol_OutputVersionInformation, + debugcontrol_GetNotifyEventHandle, + debugcontrol_SetNotifyEventHandle, + debugcontrol_Assemble, + debugcontrol_Disassemble, + debugcontrol_GetDisassembleEffectiveOffset, + debugcontrol_OutputDisassembly, + debugcontrol_OutputDisassemblyLines, + debugcontrol_GetNearInstruction, + debugcontrol_GetStackTrace, + debugcontrol_GetReturnOffset, + debugcontrol_OutputStackTrace, + debugcontrol_GetDebuggeeType, + debugcontrol_GetActualProcessorType, + debugcontrol_GetExecutingProcessorType, + debugcontrol_GetNumberPossibleExecutingProcessorTypes, + debugcontrol_GetPossibleExecutingProcessorTypes, + debugcontrol_GetNumberProcessors, + debugcontrol_GetSystemVersion, + debugcontrol_GetPageSize, + debugcontrol_IsPointer64Bit, + debugcontrol_ReadBugCheckData, + debugcontrol_GetNumberSupportedProcessorTypes, + debugcontrol_GetSupportedProcessorTypes, + debugcontrol_GetProcessorTypeNames, + debugcontrol_GetEffectiveProcessorType, + debugcontrol_SetEffectiveProcessorType, + debugcontrol_GetExecutionStatus, + debugcontrol_SetExecutionStatus, + debugcontrol_GetCodeLevel, + debugcontrol_SetCodeLevel, + debugcontrol_GetEngineOptions, + debugcontrol_AddEngineOptions, + debugcontrol_RemoveEngineOptions, + debugcontrol_SetEngineOptions, + debugcontrol_GetSystemErrorControl, + debugcontrol_SetSystemErrorControl, + debugcontrol_GetTextMacro, + debugcontrol_SetTextMacro, + debugcontrol_GetRadix, + debugcontrol_SetRadix, + debugcontrol_Evaluate, + debugcontrol_CoerceValue, + debugcontrol_CoerceValues, + debugcontrol_Execute, + debugcontrol_ExecuteCommandFile, + debugcontrol_GetNumberBreakpoints, + debugcontrol_GetBreakpointByIndex, + debugcontrol_GetBreakpointById, + debugcontrol_GetBreakpointParameters, + debugcontrol_AddBreakpoint, + debugcontrol_RemoveBreakpoint, + debugcontrol_AddExtension, + debugcontrol_RemoveExtension, + debugcontrol_GetExtensionByPath, + debugcontrol_CallExtension, + debugcontrol_GetExtensionFunction, + debugcontrol_GetWindbgExtensionApis32, + debugcontrol_GetWindbgExtensionApis64, + debugcontrol_GetNumberEventFilters, + debugcontrol_GetEventFilterText, + debugcontrol_GetEventFilterCommand, + debugcontrol_SetEventFilterCommand, + debugcontrol_GetSpecificFilterParameters, + debugcontrol_SetSpecificFilterParameters, + debugcontrol_GetSpecificFilterArgument, + debugcontrol_SetSpecificFilterArgument, + debugcontrol_GetExceptionFilterParameters, + debugcontrol_SetExceptionFilterParameters, + debugcontrol_GetExceptionFilterSecondCommand, + debugcontrol_SetExceptionFilterSecondCommand, + debugcontrol_WaitForEvent, + debugcontrol_GetLastEventInformation, + debugcontrol_GetCurrentTimeDate, + debugcontrol_GetCurrentSystemUpTime, + debugcontrol_GetDumpFormatFlags, + debugcontrol_GetNumberTextPlacements, + debugcontrol_GetNumberTextReplacement, + debugcontrol_SetTextReplacement, + debugcontrol_RemoveTextReplacements, + debugcontrol_OutputTextReplacements, +}; + +static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced *iface, REFIID riid, void **obj) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_QueryInterface(unk, riid, obj); +} + +static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced *iface) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_AddRef(unk); +} + +static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced *iface) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_Release(unk); +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced *iface, void *context, + ULONG context_size) +{ + FIXME("%p, %p, %u stub.\n", iface, context, context_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced *iface, void *context, + ULONG context_size) +{ + FIXME("%p, %p, %u stub.\n", iface, context, context_size); + + return E_NOTIMPL; +} + +static const IDebugAdvancedVtbl debugadvancedvtbl = +{ + debugadvanced_QueryInterface, + debugadvanced_AddRef, + debugadvanced_Release, + /* IDebugAdvanced */ + debugadvanced_GetThreadContext, + debugadvanced_SetThreadContext, +}; + + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_QueryInterface(IDebugSystemObjects *iface, REFIID riid, void **obj) +{ + struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_QueryInterface(unk, riid, obj); +} + +static ULONG STDMETHODCALLTYPE debugsystemobjects_AddRef(IDebugSystemObjects *iface) +{ + struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_AddRef(unk); +} + +static ULONG STDMETHODCALLTYPE debugsystemobjects_Release(IDebugSystemObjects *iface) +{ + struct debug_client *debug_client = impl_from_IDebugSystemObjects(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_Release(unk); +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetEventThread(IDebugSystemObjects *iface, ULONG *id) +{ + FIXME("%p, %p stub.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetEventProcess(IDebugSystemObjects *iface, ULONG *id) +{ + FIXME("%p, %p stub.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentThreadId(IDebugSystemObjects *iface, ULONG *id) +{ + FIXME("%p, %p stub.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_SetCurrentThreadId(IDebugSystemObjects *iface, ULONG id) +{ + FIXME("%p, %u stub.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_SetCurrentProcessId(IDebugSystemObjects *iface, ULONG id) +{ + FIXME("%p, %u stub.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetNumberThreads(IDebugSystemObjects *iface, ULONG *number) +{ + FIXME("%p, %p stub.\n", iface, number); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetTotalNumberThreads(IDebugSystemObjects *iface, ULONG *total, + ULONG *largest_process) +{ + FIXME("%p, %p, %p stub.\n", iface, total, largest_process); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdsByIndex(IDebugSystemObjects *iface, ULONG start, + ULONG count, ULONG *ids, ULONG *sysids) +{ + FIXME("%p, %u, %u, %p, %p stub.\n", iface, start, count, ids, sysids); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdByProcessor(IDebugSystemObjects *iface, ULONG processor, + ULONG *id) +{ + FIXME("%p, %u, %p stub.\n", iface, processor, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentThreadDataOffset(IDebugSystemObjects *iface, + ULONG64 *offset) +{ + FIXME("%p, %p stub.\n", iface, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdByDataOffset(IDebugSystemObjects *iface, ULONG64 offset, + ULONG *id) +{ + FIXME("%p, %s, %p stub.\n", iface, wine_dbgstr_longlong(offset), id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentThreadTeb(IDebugSystemObjects *iface, ULONG64 *offset) +{ + FIXME("%p, %p stub.\n", iface, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdByTeb(IDebugSystemObjects *iface, ULONG64 offset, + ULONG *id) +{ + FIXME("%p, %s, %p stub.\n", iface, wine_dbgstr_longlong(offset), id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentThreadSystemId(IDebugSystemObjects *iface, ULONG *sysid) +{ + FIXME("%p, %p stub.\n", iface, sysid); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdBySystemId(IDebugSystemObjects *iface, ULONG sysid, + ULONG *id) +{ + FIXME("%p, %u, %p stub.\n", iface, sysid, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentThreadHandle(IDebugSystemObjects *iface, ULONG64 *handle) +{ + FIXME("%p, %p stub.\n", iface, handle); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetThreadIdByHandle(IDebugSystemObjects *iface, ULONG64 handle, + ULONG *id) +{ + FIXME("%p, %s, %p stub.\n", iface, wine_dbgstr_longlong(handle), id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetNumberProcesses(IDebugSystemObjects *iface, ULONG *number) +{ + FIXME("%p, %p stub.\n", iface, number); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdsByIndex(IDebugSystemObjects *iface, ULONG start, + ULONG count, ULONG *ids, ULONG *sysids) +{ + FIXME("%p, %u, %u, %p, %p stub.\n", iface, start, count, ids, sysids); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentProcessDataOffset(IDebugSystemObjects *iface, + ULONG64 *offset) +{ + FIXME("%p, %p stub.\n", iface, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdByDataOffset(IDebugSystemObjects *iface, + ULONG64 offset, ULONG *id) +{ + FIXME("%p, %s, %p stub.\n", iface, wine_dbgstr_longlong(offset), id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentProcessPeb(IDebugSystemObjects *iface, ULONG64 *offset) +{ + FIXME("%p, %p stub.\n", iface, offset); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdByPeb(IDebugSystemObjects *iface, ULONG64 offset, + ULONG *id) +{ + FIXME("%p, %s, %p stub.\n", iface, wine_dbgstr_longlong(offset), id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentProcessSystemId(IDebugSystemObjects *iface, ULONG *sysid) +{ + FIXME("%p, %p stub.\n", iface, sysid); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdBySystemId(IDebugSystemObjects *iface, ULONG sysid, + ULONG *id) +{ + FIXME("%p, %u, %p stub.\n", iface, sysid, id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentProcessHandle(IDebugSystemObjects *iface, + ULONG64 *handle) +{ + FIXME("%p, %p stub.\n", iface, handle); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetProcessIdByHandle(IDebugSystemObjects *iface, ULONG64 handle, + ULONG *id) +{ + FIXME("%p, %s, %p stub.\n", iface, wine_dbgstr_longlong(handle), id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugsystemobjects_GetCurrentProcessExecutableName(IDebugSystemObjects *iface, + char *buffer, ULONG buffer_size, ULONG *exe_size) +{ + FIXME("%p, %p, %u, %p stub.\n", iface, buffer, buffer_size, exe_size); + + return E_NOTIMPL; +} + +static const IDebugSystemObjectsVtbl debugsystemobjectsvtbl = +{ + debugsystemobjects_QueryInterface, + debugsystemobjects_AddRef, + debugsystemobjects_Release, + debugsystemobjects_GetEventThread, + debugsystemobjects_GetEventProcess, + debugsystemobjects_GetCurrentThreadId, + debugsystemobjects_SetCurrentThreadId, + debugsystemobjects_SetCurrentProcessId, + debugsystemobjects_GetNumberThreads, + debugsystemobjects_GetTotalNumberThreads, + debugsystemobjects_GetThreadIdsByIndex, + debugsystemobjects_GetThreadIdByProcessor, + debugsystemobjects_GetCurrentThreadDataOffset, + debugsystemobjects_GetThreadIdByDataOffset, + debugsystemobjects_GetCurrentThreadTeb, + debugsystemobjects_GetThreadIdByTeb, + debugsystemobjects_GetCurrentThreadSystemId, + debugsystemobjects_GetThreadIdBySystemId, + debugsystemobjects_GetCurrentThreadHandle, + debugsystemobjects_GetThreadIdByHandle, + debugsystemobjects_GetNumberProcesses, + debugsystemobjects_GetProcessIdsByIndex, + debugsystemobjects_GetCurrentProcessDataOffset, + debugsystemobjects_GetProcessIdByDataOffset, + debugsystemobjects_GetCurrentProcessPeb, + debugsystemobjects_GetProcessIdByPeb, + debugsystemobjects_GetCurrentProcessSystemId, + debugsystemobjects_GetProcessIdBySystemId, + debugsystemobjects_GetCurrentProcessHandle, + debugsystemobjects_GetProcessIdByHandle, + debugsystemobjects_GetCurrentProcessExecutableName, +}; + +/************************************************************ +* DebugExtensionInitialize (DBGENG.@) +* +* Initializing Debug Engine +* +* PARAMS +* pVersion [O] Receiving the version of extension +* pFlags [O] Reserved +* +* RETURNS +* Success: S_OK +* Failure: Anything other than S_OK +* +* BUGS +* Unimplemented +*/ +HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) +{ + FIXME("(%p,%p): stub\n", pVersion, pFlags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return E_NOTIMPL; +} + +/************************************************************ +* DebugCreate (dbgeng.@) +*/ +HRESULT WINAPI DebugCreate(REFIID riid, void **obj) +{ + struct debug_client *debug_client; + IUnknown *unk; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + debug_client = heap_alloc_zero(sizeof(*debug_client)); + if (!debug_client) + return E_OUTOFMEMORY; + + debug_client->IDebugClient_iface.lpVtbl = &debugclientvtbl; + debug_client->IDebugDataSpaces_iface.lpVtbl = &debugdataspacesvtbl; + debug_client->IDebugSymbols3_iface.lpVtbl = &debugsymbolsvtbl; + debug_client->IDebugControl2_iface.lpVtbl = &debugcontrolvtbl; + debug_client->IDebugAdvanced_iface.lpVtbl = &debugadvancedvtbl; + debug_client->IDebugSystemObjects_iface.lpVtbl = &debugsystemobjectsvtbl; + debug_client->refcount = 1; + list_init(&debug_client->targets); + + unk = (IUnknown *)&debug_client->IDebugClient_iface; + + hr = IUnknown_QueryInterface(unk, riid, obj); + IUnknown_Release(unk); + + return hr; +} + +/************************************************************ +* DebugCreateEx (DBGENG.@) +*/ +HRESULT WINAPI DebugCreateEx(REFIID riid, DWORD flags, void **obj) +{ + FIXME("(%s, %#x, %p): stub\n", debugstr_guid(riid), flags, obj); + + return E_NOTIMPL; +} + +/************************************************************ +* DebugConnect (DBGENG.@) +* +* Creating Debug Engine client object and connecting it to remote host +* +* PARAMS +* RemoteOptions [I] Options which define how debugger engine connects to remote host +* InterfaceId [I] Interface Id of debugger client +* pInterface [O] Pointer to interface as requested via InterfaceId +* +* RETURNS +* Success: S_OK +* Failure: Anything other than S_OK +* +* BUGS +* Unimplemented +*/ +HRESULT WINAPI DebugConnect(PCSTR RemoteOptions, REFIID InterfaceId, PVOID * pInterface) +{ + FIXME("(%p,%p,%p): stub\n", RemoteOptions, InterfaceId, pInterface); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return E_NOTIMPL; +} diff --git a/dll/win32/dbgeng/dbgeng.spec b/dll/win32/dbgeng/dbgeng.spec new file mode 100644 index 00000000000..e47211a4b92 --- /dev/null +++ b/dll/win32/dbgeng/dbgeng.spec @@ -0,0 +1,5 @@ +@ stdcall DebugConnect(str ptr ptr) +@ stub DebugConnectWide +@ stdcall DebugCreate(ptr ptr) +@ stdcall DebugCreateEx(ptr long ptr) +@ stdcall DebugExtensionInitialize(ptr ptr) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index b174c23d3cf..72af1000226 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -65,6 +65,7 @@ dll/win32/cryptdlg # Synced to WineStaging-4.18 dll/win32/cryptdll # Synced to WineStaging-4.18 dll/win32/cryptnet # Synced to WineStaging-4.18 dll/win32/cryptui # Synced to WineStaging-4.18 +dll/win32/dbgeng # Synced to WineStaging-4.18 dll/win32/dbghelp # Synced to WineStaging-3.9 dll/win32/dciman32 # Synced to WineStaging-3.3 dll/win32/faultrep # Synced to WineStaging-4.18

1 0

[reactos] 01/01: [CMAKE] Remove obsolete '_ROSBE_VERSION' checks
by Serge Gautherie 10 Sep '20

10 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6956dd3b13702773dced… commit e6956dd3b13702773dced7a9acbb8e04c1b18e4e Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jun 24 20:41:44 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Sep 10 18:16:36 2020 +0200 [CMAKE] Remove obsolete '_ROSBE_VERSION' checks following upgrade to RosBE (2.1 and now) 2.2. --- toolchain-clang.cmake | 6 +----- toolchain-gcc.cmake | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/toolchain-clang.cmake b/toolchain-clang.cmake index 1c9ad5d6ca8..af3caeccda4 100644 --- a/toolchain-clang.cmake +++ b/toolchain-clang.cmake @@ -10,11 +10,7 @@ if(NOT DEFINED MINGW_TOOLCHAIN_PREFIX) if(CMAKE_HOST_WIN32) set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix") else() - if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1) - set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix") - else() - set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix") - endif() + set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix") endif() elseif(ARCH STREQUAL "amd64") diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake index 1d2a3a2be6e..d2801733ec4 100644 --- a/toolchain-gcc.cmake +++ b/toolchain-gcc.cmake @@ -16,11 +16,7 @@ if(NOT DEFINED MINGW_TOOLCHAIN_PREFIX) if(CMAKE_HOST_WIN32) set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix") else() - if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1) - set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix") - else() - set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix") - endif() + set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix") endif() elseif(ARCH STREQUAL "amd64")

1 0

[reactos] 01/01: [GDI32_APITEST] Create StretchBlt Regression Test (#3109)
by Doug Lyons 10 Sep '20

10 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e06ec0a594ab413ca1699… commit e06ec0a594ab413ca1699edf6130bf24f55762ca Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Sep 10 11:15:12 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 10 18:15:12 2020 +0200 [GDI32_APITEST] Create StretchBlt Regression Test (#3109) * Add gdi32_apitest:StretchBlt regression test. * Give Wine proper credit for base code. --- modules/rostests/apitests/gdi32/CMakeLists.txt | 1 + modules/rostests/apitests/gdi32/StretchBlt.c | 108 +++++++++++++++++++++++++ modules/rostests/apitests/gdi32/testlist.c | 2 + 3 files changed, 111 insertions(+) diff --git a/modules/rostests/apitests/gdi32/CMakeLists.txt b/modules/rostests/apitests/gdi32/CMakeLists.txt index 432e7e719f0..27bd589e2b4 100644 --- a/modules/rostests/apitests/gdi32/CMakeLists.txt +++ b/modules/rostests/apitests/gdi32/CMakeLists.txt @@ -74,6 +74,7 @@ list(APPEND SOURCE SetSysColors.c SetWindowExtEx.c SetWorldTransform.c + StretchBlt.c TextTransform.c init.c) diff --git a/modules/rostests/apitests/gdi32/StretchBlt.c b/modules/rostests/apitests/gdi32/StretchBlt.c new file mode 100644 index 00000000000..c72f9e220f1 --- /dev/null +++ b/modules/rostests/apitests/gdi32/StretchBlt.c @@ -0,0 +1,108 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the StretchBlt API + * COPYRIGHT: Copyright 2020 Doug Lyons (douglyons at douglyons dot com) + * Most Code copied and modified from Wine gdi32:bitmap test. + */ + +#include <stdarg.h> +#include <assert.h> +#include <string.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/test.h" + +static void test_StretchBlt(void) +{ + HBITMAP bmpDst, bmpSrc; + HDC hdcDst, hdcSrc; + UINT32 *dstBuffer, *srcBuffer; + BITMAPINFO biDst, biSrc; + UINT32 expected[256]; + + memset(&biDst, 0, sizeof(BITMAPINFO)); + + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 2; + biDst.bmiHeader.biHeight = 2; // Set our Height to positive so we are bottom-up + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; // Set our BitCount to 32 which is Full Color + biDst.bmiHeader.biCompression = BI_RGB; + + memcpy(&biSrc, &biDst, sizeof(BITMAPINFO)); // Put same Destination params into the Source + + hdcDst = CreateCompatibleDC(0); + hdcSrc = CreateCompatibleDC(0); + + bmpSrc = CreateDIBSection(hdcSrc, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + SelectObject(hdcSrc, bmpSrc); + bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + SelectObject(hdcDst, bmpDst); + + srcBuffer[0] = 0x000000FF; // BLUE - stored beginning bottom left + srcBuffer[1] = 0x0000FF00; // GREEN + srcBuffer[2] = 0x00FF0000; // RED + srcBuffer[3] = 0xFF000000; // BLACK - 0xFF for alpha channel is easy to recognize when printed in hex format + + /* Flip Left to Right on Source */ + StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 1, 0, -2, 2, SRCCOPY); + expected[0] = 0x0000FF00; + expected[1] = 0x000000FF; + expected[2] = 0xFF000000; + expected[3] = 0x00FF0000; + + ok(expected[1] == dstBuffer[1], "StretchBlt expected { %08X } got { %08X }\n", + expected[1], dstBuffer[1]); + + ok(expected[3] == dstBuffer[3], "StretchBlt expected { %08X } got { %08X }\n", + expected[3], dstBuffer[3]); + + /* Flip Top to Bottom on Source */ + StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 1, 2, -2, SRCCOPY); + expected[0] = 0x00FF0000; + expected[1] = 0xFF000000; + expected[2] = 0x000000FF; + expected[3] = 0x0000FF00; + + ok(expected[0] == dstBuffer[0], "StretchBlt expected { %08X } got { %08X }\n", + expected[0], dstBuffer[0]); + + ok(expected[1] == dstBuffer[1], "StretchBlt expected { %08X } got { %08X }\n", + expected[1], dstBuffer[1]); + + /* Flip Left to Right and Top to Bottom on Source */ + StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 1, 1, -2, -2, SRCCOPY); + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x0000FF00; + expected[3] = 0x000000FF; + + ok(expected[1] == dstBuffer[1], "StretchBlt expected { %08X } got { %08X }\n", + expected[1], dstBuffer[1]); + + /* Flip Left to Right and Top to Bottom on both Source and Destination */ + StretchBlt(hdcDst, 1, 1, -2, -2, hdcSrc, 1, 1, -2, -2, SRCCOPY); + expected[0] = 0xFF000000; + expected[1] = 0x00FF0000; + expected[2] = 0x00FF0000; + expected[3] = 0x000000FF; + + ok(expected[1] == dstBuffer[1], "StretchBlt expected { %08X } got { %08X }\n", + expected[1], dstBuffer[1]); + + DeleteDC(hdcSrc); + DeleteDC(hdcDst); +} + + +START_TEST(StretchBlt) +{ + test_StretchBlt(); +} diff --git a/modules/rostests/apitests/gdi32/testlist.c b/modules/rostests/apitests/gdi32/testlist.c index 735621c3386..623f530c90c 100644 --- a/modules/rostests/apitests/gdi32/testlist.c +++ b/modules/rostests/apitests/gdi32/testlist.c @@ -75,6 +75,7 @@ extern void func_SetPixel(void); extern void func_SetSysColors(void); extern void func_SetWindowExtEx(void); extern void func_SetWorldTransform(void); +extern void func_StretchBlt(void); extern void func_TextTransform(void); const struct test winetest_testlist[] = @@ -151,6 +152,7 @@ const struct test winetest_testlist[] = { "SetSysColors", func_SetSysColors }, { "SetWindowExtEx", func_SetWindowExtEx }, { "SetWorldTransform", func_SetWorldTransform }, + { "StretchBlt", func_StretchBlt }, { "TextTransform", func_TextTransform }, { 0, 0 }

1 0

[reactos] 01/01: [SHELLFIND] Split encoding detection code (#3147)
by Katayama Hirofumi MZ 10 Sep '20

10 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8e3ef78943b37d1541c6… commit c8e3ef78943b37d1541c62154bb5cf3d50f3bbd3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 10 19:03:20 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 10 19:03:20 2020 +0900 [SHELLFIND] Split encoding detection code (#3147) Split encoding detection code to improve code quality. This is follow-up of #3134 (7376cde). CORE-17250 --- dll/win32/browseui/shellfind/CFindFolder.cpp | 176 +++++++++++++++++++++++---- 1 file changed, 155 insertions(+), 21 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index ec24b116c29..3517cc2e2ef 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -185,6 +185,137 @@ StrFindNIW(const WCHAR *lpFirst, const CStringW &lpSrch, UINT cchMax) return StrStrN<WCHAR, CStringW, _wcsnicmp>(lpFirst, lpSrch, cchMax) != NULL; } +/* + * The following code is borrowed from base/applications/cmdutils/more/more.c . + */ +typedef enum +{ + ENCODING_ANSI = 0, + ENCODING_UTF16LE = 1, + ENCODING_UTF16BE = 2, + ENCODING_UTF8 = 3 +} ENCODING; + +static BOOL +IsDataUnicode( + IN PVOID Buffer, + IN DWORD BufferSize, + OUT ENCODING* Encoding OPTIONAL, + OUT PDWORD SkipBytes OPTIONAL) +{ + PBYTE pBytes = (PBYTE)Buffer; + ENCODING encFile = ENCODING_ANSI; + DWORD dwPos = 0; + + /* + * See http://archives.miloush.net/michkap/archive/2007/04/22/2239345.html + * for more details about the algorithm and the pitfalls behind it. + * Of course it would be actually great to make a nice function that + * would work, once and for all, and put it into a library. + */ + + /* Look for Byte Order Marks */ + if ((BufferSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) + { + encFile = ENCODING_UTF16LE; + dwPos = 2; + } + else if ((BufferSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) + { + encFile = ENCODING_UTF16BE; + dwPos = 2; + } + else if ((BufferSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) + { + encFile = ENCODING_UTF8; + dwPos = 3; + } + else + { + /* + * Try using statistical analysis. Do not rely on the return value of + * IsTextUnicode as we can get FALSE even if the text is in UTF-16 BE + * (i.e. we have some of the IS_TEXT_UNICODE_REVERSE_MASK bits set). + * Instead, set all the tests we want to perform, then just check + * the passed tests and try to deduce the string properties. + */ + +/* + * This mask contains the 3 highest bits from IS_TEXT_UNICODE_NOT_ASCII_MASK + * and the 1st highest bit from IS_TEXT_UNICODE_NOT_UNICODE_MASK. + */ +#define IS_TEXT_UNKNOWN_FLAGS_MASK ((7 << 13) | (1 << 11)) + + /* Flag out the unknown flags here, the passed tests will not have them either */ + INT Tests = (IS_TEXT_UNICODE_NOT_ASCII_MASK | + IS_TEXT_UNICODE_NOT_UNICODE_MASK | + IS_TEXT_UNICODE_REVERSE_MASK | IS_TEXT_UNICODE_UNICODE_MASK) + & ~IS_TEXT_UNKNOWN_FLAGS_MASK; + INT Results; + + IsTextUnicode(Buffer, BufferSize, &Tests); + Results = Tests; + + /* + * As the IS_TEXT_UNICODE_NULL_BYTES or IS_TEXT_UNICODE_ILLEGAL_CHARS + * flags are expected to be potentially present in the result without + * modifying our expectations, filter them out now. + */ + Results &= ~(IS_TEXT_UNICODE_NULL_BYTES | IS_TEXT_UNICODE_ILLEGAL_CHARS); + + /* + * NOTE: The flags IS_TEXT_UNICODE_ASCII16 and + * IS_TEXT_UNICODE_REVERSE_ASCII16 are not reliable. + * + * NOTE2: Check for potential "bush hid the facts" effect by also + * checking the original results (in 'Tests') for the absence of + * the IS_TEXT_UNICODE_NULL_BYTES flag, as we may presumably expect + * that in UTF-16 text there will be at some point some NULL bytes. + * If not, fall back to ANSI. This shows the limitations of using the + * IsTextUnicode API to perform such tests, and the usage of a more + * improved encoding detection algorithm would be really welcome. + */ + if (!(Results & IS_TEXT_UNICODE_NOT_UNICODE_MASK) && + !(Results & IS_TEXT_UNICODE_REVERSE_MASK) && + (Results & IS_TEXT_UNICODE_UNICODE_MASK) && + (Tests & IS_TEXT_UNICODE_NULL_BYTES)) + { + encFile = ENCODING_UTF16LE; + dwPos = (Results & IS_TEXT_UNICODE_SIGNATURE) ? 2 : 0; + } + else + if (!(Results & IS_TEXT_UNICODE_NOT_UNICODE_MASK) && + !(Results & IS_TEXT_UNICODE_UNICODE_MASK) && + (Results & IS_TEXT_UNICODE_REVERSE_MASK) && + (Tests & IS_TEXT_UNICODE_NULL_BYTES)) + { + encFile = ENCODING_UTF16BE; + dwPos = (Results & IS_TEXT_UNICODE_REVERSE_SIGNATURE) ? 2 : 0; + } + else + { + /* + * Either 'Results' has neither of those masks set, as it can be + * the case for UTF-8 text (or ANSI), or it has both as can be the + * case when analysing pure binary data chunk. This is therefore + * invalid and we fall back to ANSI encoding. + * FIXME: In case of failure, assume ANSI (as long as we do not have + * correct tests for UTF8, otherwise we should do them, and at the + * very end, assume ANSI). + */ + encFile = ENCODING_ANSI; // ENCODING_UTF8; + dwPos = 0; + } + } + + if (Encoding) + *Encoding = encFile; + if (SkipBytes) + *SkipBytes = dwPos; + + return (encFile != ENCODING_ANSI); +} + static BOOL SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData) { HANDLE hFile = CreateFileW(lpFilePath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); @@ -209,28 +340,31 @@ static BOOL SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData) if (!pbContents) return FALSE; + ENCODING encoding; + IsDataUnicode(pbContents, size, &encoding, NULL); + BOOL bFound; - if (size >= 2 && - (memcmp(pbContents, "\xFF\xFE", 2) == 0 || (pbContents[0] && !pbContents[1]))) - { - // UTF-16 - bFound = StrFindNIW((LPCWSTR)pbContents, pSearchData->szQueryW, size / sizeof(WCHAR)); - } - else if (size >= 2 && - (memcmp(pbContents, "\xFE\xFF", 2) == 0 || (!pbContents[0] && pbContents[1]))) - { - // UTF-16 BE - bFound = StrFindNIW((LPCWSTR)pbContents, pSearchData->szQueryU16BE, size / sizeof(WCHAR)); - } - else if (size >= 3 && memcmp(pbContents, "\xEF\xBB\xBF", 3) == 0) - { - // UTF-8 - bFound = StrFindNIA((LPCSTR)pbContents, pSearchData->szQueryU8, size / sizeof(CHAR)); - } - else - { - // ANSI - bFound = StrFindNIA((LPCSTR)pbContents, pSearchData->szQueryA, size / sizeof(CHAR)); + switch (encoding) + { + case ENCODING_UTF16LE: + // UTF-16 + bFound = StrFindNIW((LPCWSTR)pbContents, pSearchData->szQueryW, size / sizeof(WCHAR)); + break; + case ENCODING_UTF16BE: + // UTF-16 BE + bFound = StrFindNIW((LPCWSTR)pbContents, pSearchData->szQueryU16BE, size / sizeof(WCHAR)); + break; + case ENCODING_UTF8: + // UTF-8 + bFound = StrFindNIA((LPCSTR)pbContents, pSearchData->szQueryU8, size / sizeof(CHAR)); + break; + case ENCODING_ANSI: + default: + // ANSI or UTF-8 without BOM + bFound = StrFindNIA((LPCSTR)pbContents, pSearchData->szQueryA, size / sizeof(CHAR)); + if (!bFound && pSearchData->szQueryA != pSearchData->szQueryU8) + bFound = StrFindNIA((LPCSTR)pbContents, pSearchData->szQueryU8, size / sizeof(CHAR)); + break; } UnmapViewOfFile(pbContents);

1 0

[reactos] 02/02: [NTDLL] Add Vista exports
by Timo Kreuzer 09 Sep '20

09 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92f4746845727e5f21e81… commit 92f4746845727e5f21e8184f56db580eceef1c6d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 21 19:51:56 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Sep 9 19:33:29 2020 +0200 [NTDLL] Add Vista exports --- dll/ntdll/def/ntdll.spec | 481 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 481 insertions(+) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 83bba18322d..6f3204ae897 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -10,6 +10,23 @@ @ stdcall -arch=i386 ExpInterlockedPopEntrySListEnd() @ stdcall -arch=i386 ExpInterlockedPopEntrySListFault() @ stdcall -arch=i386 ExpInterlockedPopEntrySListResume() +@ stdcall -stub -version=0x600+ A_SHAFinal(ptr ptr) +@ stdcall -stub -version=0x600+ A_SHAInit(ptr) +@ stdcall -stub -version=0x600+ A_SHAUpdate(ptr ptr long) +@ stdcall -stub -version=0x600+ AlpcAdjustCompletionListConcurrencyCount(ptr long) +@ stdcall -stub -version=0x600+ AlpcFreeCompletionListMessage(ptr ptr) +@ stdcall -stub -version=0x600+ AlpcGetCompletionListLastMessageInformation(ptr ptr ptr) +@ stdcall -stub -version=0x600+ AlpcGetCompletionListMessageAttributes(ptr ptr) +@ stdcall -stub -version=0x600+ AlpcGetHeaderSize(long) +@ stdcall -stub -version=0x600+ AlpcGetMessageAttribute(ptr long) +@ stdcall -stub -version=0x600+ AlpcGetMessageFromCompletionList(ptr ptr) +@ stdcall -stub -version=0x600+ AlpcGetOutstandingCompletionListMessageCount(ptr) +@ stdcall -stub -version=0x600+ AlpcInitializeMessageAttribute(long ptr long ptr) +@ stdcall -stub -version=0x600+ AlpcMaxAllowedMessageLength() +@ stdcall -stub -version=0x600+ AlpcRegisterCompletionList(ptr ptr long long long) +@ stdcall -stub -version=0x600+ AlpcRegisterCompletionListWorkerThread(ptr) +@ stdcall -stub -version=0x600+ AlpcUnregisterCompletionList(ptr) +@ stdcall -stub -version=0x600+ AlpcUnregisterCompletionListWorkerThread(ptr) @ stdcall CsrAllocateCaptureBuffer(long long) @ stdcall CsrAllocateMessagePointer(ptr long ptr) @ stdcall CsrCaptureMessageBuffer(ptr ptr long ptr) @@ -25,6 +42,7 @@ @ stdcall -version=0x502 CsrProbeForRead(ptr long long) @ stdcall -version=0x502 CsrProbeForWrite(ptr long long) @ stdcall CsrSetPriorityClass(ptr ptr) +@ stdcall -stub -version=0x600+ CsrVerifyRegion(ptr long) @ stdcall DbgBreakPoint() @ varargs DbgPrint(str) @ varargs DbgPrintEx(long long str) @@ -46,23 +64,44 @@ @ stdcall -version=0x502 EtwControlTraceA(double str ptr long) @ stdcall -version=0x502 EtwControlTraceW(double wstr ptr long) @ stdcall -stub EtwCreateTraceInstanceId(ptr ptr) +@ stub -version=0x600+ EtwDeliverDataBlock @ stdcall -version=0x502 EtwEnableTrace(long long long ptr double) +@ stub -version=0x600+ EtwEnumerateProcessRegGuids @ stdcall -stub -version=0x502 EtwEnumerateTraceGuids(ptr long ptr) +@ stub -version=0x600+ EtwEventActivityIdControl +@ stub -version=0x600+ EtwEventEnabled +@ stub -version=0x600+ EtwEventProviderEnabled +@ stub -version=0x600+ EtwEventRegister +@ stub -version=0x600+ EtwEventUnregister +@ stub -version=0x600+ EtwEventWrite +@ stub -version=0x600+ EtwEventWriteEndScenario +@ stub -version=0x600+ EtwEventWriteFull +@ stub -version=0x600+ EtwEventWriteStartScenario +@ stub -version=0x600+ EtwEventWriteString +@ stub -version=0x600+ EtwEventWriteTransfer @ stdcall -version=0x502 EtwFlushTraceA(double str ptr) @ stdcall -version=0x502 EtwFlushTraceW(double wstr ptr) @ stdcall EtwGetTraceEnableFlags(double) @ stdcall EtwGetTraceEnableLevel(double) @ stdcall EtwGetTraceLoggerHandle(ptr) +@ stub -version=0x600+ EtwLogTraceEvent +@ stub -version=0x600+ EtwNotificationRegister @ stdcall -stub -version=0x502 EtwNotificationRegistrationA(ptr long ptr long long) @ stdcall -stub -version=0x502 EtwNotificationRegistrationW(ptr long ptr long long) +@ stub -version=0x600+ EtwNotificationUnregister +@ stub -version=0x600+ EtwProcessPrivateLoggerRequest @ stdcall -version=0x502 EtwQueryAllTracesA(ptr long ptr) @ stdcall -version=0x502 EtwQueryAllTracesW(ptr long ptr) @ stdcall -version=0x502 EtwQueryTraceA(double str ptr) @ stdcall -version=0x502 EtwQueryTraceW(double wstr ptr) @ stdcall -stub -version=0x502 EtwReceiveNotificationsA(long long long long) @ stdcall -stub -version=0x502 EtwReceiveNotificationsW(long long long long) +@ stub -version=0x600+ EtwRegisterSecurityProvider @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stub -version=0x600+ EtwReplyNotification +@ stub -version=0x600+ EtwSendNotification +@ stub -version=0x600+ EtwSetMark @ stdcall -version=0x502 EtwStartTraceA(ptr str ptr) @ stdcall -version=0x502 EtwStartTraceW(ptr wstr ptr) @ stdcall -version=0x502 EtwStopTraceA(double str ptr) @@ -74,11 +113,18 @@ @ stdcall EtwUnregisterTraceGuids(double) @ stdcall -version=0x502 EtwUpdateTraceA(double str ptr) @ stdcall -version=0x502 EtwUpdateTraceW(double wstr ptr) +@ stub -version=0x600+ EtwWriteUMSecurityEvent +@ stub -version=0x600+ EtwpCreateEtwThread +@ stub -version=0x600+ EtwpGetCpuSpeed @ stdcall -stub -version=0x502 EtwpGetTraceBuffer(long long long long) +@ stub -version=0x600+ EtwpNotificationThread @ stdcall -stub -version=0x502 EtwpSetHWConfigFunction(ptr long) @ stdcall -arch=x86_64 ExpInterlockedPopEntrySListEnd() +@ stub -version=0x600+ -arch=x86_64 ExpInterlockedPopEntrySListEnd8 @ stdcall -arch=x86_64 ExpInterlockedPopEntrySListFault() +@ stub -version=0x600+ -arch=x86_64 ExpInterlockedPopEntrySListFault8 @ stdcall -arch=x86_64 ExpInterlockedPopEntrySListResume() +@ stub -version=0x600+ -arch=x86_64 ExpInterlockedPopEntrySListResume8 @ stdcall -arch=i386 KiFastSystemCall() @ stdcall -arch=i386 KiFastSystemCallRet() @ stdcall -arch=i386 KiIntSystemCall() @@ -88,6 +134,7 @@ @ stdcall KiUserExceptionDispatcher(ptr ptr) @ stdcall -version=0x502 LdrAccessOutOfProcessResource(ptr ptr ptr ptr ptr) @ stdcall LdrAccessResource(long ptr ptr ptr) +@ stdcall -stub -version=0x600+ LdrAddLoadAsDataTable(ptr wstr long ptr) @ stdcall LdrAddRefDll(long ptr) @ stdcall -version=0x502 LdrAlternateResourcesEnabled() @ stdcall -version=0x502 LdrCreateOutOfProcessImage(long ptr ptr ptr) @@ -103,27 +150,53 @@ @ stdcall LdrFlushAlternateResourceModules() @ stdcall LdrGetDllHandle(wstr long ptr ptr) @ stdcall LdrGetDllHandleEx(long wstr long ptr ptr) +@ stub -version=0x600+ LdrGetFailureData +@ stdcall -stub -version=0x600+ LdrGetFileNameFromLoadAsDataTable(ptr ptr) +@ stdcall -stub -version=0x600+ -arch=x86_64 LdrGetKnownDllSectionHandle(wstr long ptr) @ stdcall LdrGetProcedureAddress(ptr ptr long ptr) +@ stdcall -stub -version=0x600+ LdrGetProcedureAddressEx(ptr ptr long ptr long) @ stdcall -stub LdrHotPatchRoutine(ptr) @ stdcall -stub LdrInitShimEngineDynamic(ptr) @ stdcall LdrInitializeThunk(long long long long) @ stdcall LdrLoadAlternateResourceModule(ptr ptr) +@ stub -version=0x600+ LdrLoadAlternateResourceModuleEx @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) @ stdcall LdrOpenImageFileOptionsKey(ptr long ptr) ; 5.2 SP1 and higher +@ stub -version=0x600+ -arch=x86_64 LdrProcessInitializationComplete @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr str long ptr long ptr) @ stdcall LdrQueryImageFileExecutionOptionsEx(ptr ptr long ptr long ptr long) @ stdcall LdrQueryImageFileKeyOption(ptr ptr long ptr long ptr) +@ stdcall -stub -version=0x600+ LdrQueryModuleServiceTags(ptr ptr ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) +@ stdcall -stub -version=0x600+ LdrRegisterDllNotification(long ptr ptr ptr) +@ stdcall -stub -version=0x600+ LdrRemoveLoadAsDataTable(ptr ptr ptr long) +@ stub -version=0x600+ LdrResFindResource +@ stub -version=0x600+ LdrResFindResourceDirectory +@ stub -version=0x600+ LdrResRelease +@ stub -version=0x600+ LdrResSearchResource @ stdcall LdrSetAppCompatDllRedirectionCallback(long ptr ptr) @ stdcall LdrSetDllManifestProber(ptr) +@ stub -version=0x600+ LdrSetMUICacheType @ stdcall LdrShutdownProcess() @ stdcall LdrShutdownThread() @ stdcall LdrUnloadAlternateResourceModule(ptr) +@ stub -version=0x600+ LdrUnloadAlternateResourceModuleEx @ stdcall LdrUnloadDll(ptr) @ stdcall LdrUnlockLoaderLock(long long) +@ stdcall -stub -version=0x600+ LdrUnregisterDllNotification(ptr) @ stdcall LdrVerifyImageMatchesChecksum(ptr long long long) +@ stdcall -stub -version=0x600+ LdrVerifyImageMatchesChecksumEx(ptr ptr) +@ stub -version=0x600+ LdrpResGetMappingSize +@ stub -version=0x600+ LdrpResGetRCConfig +@ stub -version=0x600+ LdrpResGetResourceDirectory +@ stdcall -stub -version=0x600+ MD4Final(ptr) +@ stdcall -stub -version=0x600+ MD4Init(ptr) +@ stdcall -stub -version=0x600+ MD4Update(ptr ptr long) +@ stdcall -stub -version=0x600+ MD5Final(ptr) +@ stdcall -stub -version=0x600+ MD5Init(ptr) +@ stdcall -stub -version=0x600+ MD5Update(ptr ptr long) @ extern NlsAnsiCodePage @ extern NlsMbCodePageTag @ extern NlsMbOemCodePageTag @@ -135,6 +208,7 @@ @ stdcall NtAccessCheckByTypeResultList(ptr ptr ptr long ptr long ptr ptr long ptr ptr) @ stdcall NtAccessCheckByTypeResultListAndAuditAlarm(ptr ptr ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) @ stdcall NtAccessCheckByTypeResultListAndAuditAlarmByHandle(ptr ptr ptr ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) +@ stub -version=0x600+ NtAcquireCMFViewOwnership @ stdcall NtAddAtom(ptr long ptr) @ stdcall NtAddBootEntry(ptr long) @ stdcall NtAddDriverEntry(ptr long) ; 5.2 and higher @@ -146,16 +220,42 @@ @ stdcall NtAllocateUserPhysicalPages(ptr ptr ptr) @ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr ptr ptr long long) +@ stub -version=0x600+ NtAlpcAcceptConnectPort +@ stub -version=0x600+ NtAlpcCancelMessage +@ stub -version=0x600+ NtAlpcConnectPort +@ stub -version=0x600+ NtAlpcCreatePort +@ stub -version=0x600+ NtAlpcCreatePortSection +@ stub -version=0x600+ NtAlpcCreateResourceReserve +@ stub -version=0x600+ NtAlpcCreateSectionView +@ stub -version=0x600+ NtAlpcCreateSecurityContext +@ stub -version=0x600+ NtAlpcDeletePortSection +@ stub -version=0x600+ NtAlpcDeleteResourceReserve +@ stub -version=0x600+ NtAlpcDeleteSectionView +@ stub -version=0x600+ NtAlpcDeleteSecurityContext +@ stub -version=0x600+ NtAlpcDisconnectPort +@ stub -version=0x600+ NtAlpcImpersonateClientOfPort +@ stub -version=0x600+ NtAlpcOpenSenderProcess +@ stub -version=0x600+ NtAlpcOpenSenderThread +@ stub -version=0x600+ NtAlpcQueryInformation +@ stub -version=0x600+ NtAlpcQueryInformationMessage +@ stub -version=0x600+ NtAlpcRevokeSecurityContext +@ stub -version=0x600+ NtAlpcSendWaitReceivePort +@ stub -version=0x600+ NtAlpcSetInformation @ stdcall NtApphelpCacheControl(long ptr) @ stdcall NtAreMappedFilesTheSame(ptr ptr) @ stdcall NtAssignProcessToJobObject(long long) @ stdcall NtCallbackReturn(ptr long long) @ stdcall NtCancelDeviceWakeupRequest(ptr) @ stdcall NtCancelIoFile(long ptr) +@ stub -version=0x600+ NtCancelIoFileEx +@ stub -version=0x600+ NtCancelSynchronousIoFile @ stdcall NtCancelTimer(long ptr) @ stdcall NtClearEvent(long) @ stdcall NtClose(long) @ stdcall NtCloseObjectAuditAlarm(ptr ptr long) +@ stub -version=0x600+ NtCommitComplete +@ stub -version=0x600+ NtCommitEnlistment +@ stub -version=0x600+ NtCommitTransaction @ stdcall NtCompactKeys(long ptr) @ stdcall NtCompareTokens(ptr ptr ptr) @ stdcall NtCompleteConnectPort(ptr) @@ -164,6 +264,7 @@ @ stdcall NtContinue(ptr long) @ stdcall NtCreateDebugObject(ptr long ptr long) @ stdcall NtCreateDirectoryObject(long long long) +@ stub -version=0x600+ NtCreateEnlistment @ stdcall NtCreateEvent(long long long long long) @ stdcall NtCreateEventPair(ptr long ptr) @ stdcall NtCreateFile(ptr long ptr ptr long long long ptr long long ptr) @@ -171,22 +272,30 @@ @ stdcall NtCreateJobObject(ptr long ptr) @ stdcall NtCreateJobSet(long ptr long) @ stdcall NtCreateKey(ptr long ptr long ptr long long) +@ stub -version=0x600+ NtCreateKeyTransacted @ stdcall NtCreateKeyedEvent(ptr long ptr long) @ stdcall NtCreateMailslotFile(long long long long long long long long) @ stdcall NtCreateMutant(ptr long ptr long) @ stdcall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) @ stdcall NtCreatePagingFile(long long long long) @ stdcall NtCreatePort(ptr ptr long long ptr) +@ stub -version=0x600+ NtCreatePrivateNamespace @ stdcall NtCreateProcess(ptr long ptr ptr long ptr ptr ptr) @ stdcall NtCreateProcessEx(ptr long ptr ptr long ptr ptr ptr long) @ stdcall NtCreateProfile(ptr ptr ptr long long ptr long long long) ; CHECKME +@ stub -version=0x600+ NtCreateResourceManager @ stdcall NtCreateSection(ptr long ptr ptr long long long) @ stdcall NtCreateSemaphore(ptr long ptr long long) @ stdcall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stdcall NtCreateThread(ptr long ptr ptr ptr ptr ptr long) +@ stub -version=0x600+ NtCreateThreadEx @ stdcall NtCreateTimer(ptr long ptr long) @ stdcall NtCreateToken(ptr long ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub -version=0x600+ NtCreateTransaction +@ stub -version=0x600+ NtCreateTransactionManager +@ stub -version=0x600+ NtCreateUserProcess @ stdcall NtCreateWaitablePort(ptr ptr long long long) +@ stub -version=0x600+ NtCreateWorkerFactory @ stdcall -arch=win32 NtCurrentTeb() _NtCurrentTeb @ stdcall NtDebugActiveProcess(ptr ptr) @ stdcall NtDebugContinue(ptr ptr long) @@ -197,6 +306,7 @@ @ stdcall NtDeleteFile(ptr) @ stdcall NtDeleteKey(long) @ stdcall NtDeleteObjectAuditAlarm(ptr ptr long) +@ stub -version=0x600+ NtDeletePrivateNamespace @ stdcall NtDeleteValueKey(long ptr) @ stdcall NtDeviceIoControlFile(long long long long long long long long long long) @ stdcall NtDisplayString(ptr) @@ -206,31 +316,43 @@ @ stdcall NtEnumerateDriverEntries(ptr ptr) @ stdcall NtEnumerateKey (long long long long long long) @ stdcall NtEnumerateSystemEnvironmentValuesEx(long ptr long) +@ stub -version=0x600+ NtEnumerateTransactionObject @ stdcall NtEnumerateValueKey(long long long long long long) @ stdcall NtExtendSection(ptr ptr) @ stdcall NtFilterToken(ptr long ptr ptr ptr ptr) @ stdcall NtFindAtom(ptr long ptr) @ stdcall NtFlushBuffersFile(long ptr) +@ stub -version=0x600+ NtFlushInstallUILanguage @ stdcall NtFlushInstructionCache(long ptr long) @ stdcall NtFlushKey(long) +@ stub -version=0x600+ NtFlushProcessWriteBuffers @ stdcall NtFlushVirtualMemory(long ptr ptr long) @ stdcall NtFlushWriteBuffer() @ stdcall NtFreeUserPhysicalPages(ptr ptr ptr) @ stdcall NtFreeVirtualMemory(long ptr ptr long) +@ stub -version=0x600+ NtFreezeRegistry +@ stub -version=0x600+ NtFreezeTransactions @ stdcall NtFsControlFile(long long long long long long long long long long) @ stdcall NtGetContextThread(long ptr) @ stdcall NtGetCurrentProcessorNumber() ; 5.2 and higher @ stdcall NtGetDevicePowerState(ptr ptr) +@ stub -version=0x600+ NtGetMUIRegistryInfo +@ stub -version=0x600+ NtGetNextProcess +@ stub -version=0x600+ NtGetNextThread +@ stub -version=0x600+ NtGetNlsSectionPtr +@ stub -version=0x600+ NtGetNotificationResourceManager @ stdcall NtGetPlugPlayEvent(long long ptr long) @ stdcall NtGetTickCount() RtlGetTickCount @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall NtImpersonateAnonymousToken(ptr) @ stdcall NtImpersonateClientOfPort(ptr ptr) @ stdcall NtImpersonateThread(ptr ptr ptr) +@ stub -version=0x600+ NtInitializeNlsFiles @ stdcall NtInitializeRegistry(long) @ stdcall NtInitiatePowerAction (long long long long) @ stdcall NtIsProcessInJob(long long) @ stdcall NtIsSystemResumeAutomatic() +@ stub -version=0x600+ NtIsUILanguageComitted @ stdcall NtListenPort(ptr ptr) @ stdcall NtLoadDriver(ptr) @ stdcall NtLoadKey2(ptr ptr long) @@ -242,6 +364,7 @@ @ stdcall NtLockVirtualMemory(long ptr ptr long) @ stdcall NtMakePermanentObject(ptr) @ stdcall NtMakeTemporaryObject(long) +@ stub -version=0x600+ NtMapCMFModule @ stdcall NtMapUserPhysicalPages(ptr ptr ptr) @ stdcall NtMapUserPhysicalPagesScatter(ptr ptr ptr) @ stdcall NtMapViewOfSection(long long ptr long long ptr ptr long long long) @@ -251,30 +374,43 @@ @ stdcall NtNotifyChangeKey(long long ptr ptr ptr long long ptr long long) @ stdcall NtNotifyChangeMultipleKeys(ptr long ptr ptr ptr ptr ptr long long ptr long long) @ stdcall NtOpenDirectoryObject(long long long) +@ stub -version=0x600+ NtOpenEnlistment @ stdcall NtOpenEvent(long long long) @ stdcall NtOpenEventPair(ptr long ptr) @ stdcall NtOpenFile(ptr long ptr ptr long long) @ stdcall NtOpenIoCompletion(ptr long ptr) @ stdcall NtOpenJobObject(ptr long ptr) @ stdcall NtOpenKey(ptr long ptr) +@ stub -version=0x600+ NtOpenKeyTransacted @ stdcall NtOpenKeyedEvent(ptr long ptr) @ stdcall NtOpenMutant(ptr long ptr) @ stdcall NtOpenObjectAuditAlarm(ptr ptr ptr ptr ptr ptr long long ptr long long ptr) +@ stub -version=0x600+ NtOpenPrivateNamespace @ stdcall NtOpenProcess(ptr long ptr ptr) @ stdcall NtOpenProcessToken(long long ptr) @ stdcall NtOpenProcessTokenEx(long long long ptr) +@ stub -version=0x600+ NtOpenResourceManager @ stdcall NtOpenSection(ptr long ptr) @ stdcall NtOpenSemaphore(long long ptr) +@ stub -version=0x600+ NtOpenSession @ stdcall NtOpenSymbolicLinkObject (ptr long ptr) @ stdcall NtOpenThread(ptr long ptr ptr) @ stdcall NtOpenThreadToken(long long long ptr) @ stdcall NtOpenThreadTokenEx(long long long long ptr) @ stdcall NtOpenTimer(ptr long ptr) +@ stub -version=0x600+ NtOpenTransaction +@ stub -version=0x600+ NtOpenTransactionManager @ stdcall NtPlugPlayControl(ptr ptr long) @ stdcall NtPowerInformation(long ptr long ptr long) +@ stub -version=0x600+ NtPrePrepareComplete +@ stub -version=0x600+ NtPrePrepareEnlistment +@ stub -version=0x600+ NtPrepareComplete +@ stub -version=0x600+ NtPrepareEnlistment @ stdcall NtPrivilegeCheck(ptr ptr ptr) @ stdcall NtPrivilegeObjectAuditAlarm(ptr ptr ptr long ptr long) @ stdcall NtPrivilegedServiceAuditAlarm(ptr ptr ptr ptr long) +@ stub -version=0x600+ NtPropagationComplete +@ stub -version=0x600+ NtPropagationFailed @ stdcall NtProtectVirtualMemory(long ptr ptr long ptr) @ stdcall NtPulseEvent(long ptr) @ stdcall NtQueryAttributesFile(ptr ptr) @@ -290,16 +426,22 @@ @ stdcall NtQueryEvent(long long ptr long ptr) @ stdcall NtQueryFullAttributesFile(ptr ptr) @ stdcall NtQueryInformationAtom(long long ptr long ptr) +@ stub -version=0x600+ NtQueryInformationEnlistment @ stdcall NtQueryInformationFile(long ptr ptr long long) @ stdcall NtQueryInformationJobObject(long long ptr long ptr) @ stdcall NtQueryInformationPort(ptr long ptr long ptr) @ stdcall NtQueryInformationProcess(long long ptr long ptr) +@ stub -version=0x600+ NtQueryInformationResourceManager @ stdcall NtQueryInformationThread(long long ptr long ptr) @ stdcall NtQueryInformationToken(long long ptr long ptr) +@ stub -version=0x600+ NtQueryInformationTransaction +@ stub -version=0x600+ NtQueryInformationTransactionManager +@ stub -version=0x600+ NtQueryInformationWorkerFactory @ stdcall NtQueryInstallUILanguage(ptr) @ stdcall NtQueryIntervalProfile(long ptr) @ stdcall NtQueryIoCompletion(long long ptr long ptr) @ stdcall NtQueryKey (long long ptr long ptr) +@ stub -version=0x600+ NtQueryLicenseValue @ stdcall NtQueryMultipleValueKey(long ptr long ptr long ptr) @ stdcall NtQueryMutant(long long ptr long ptr) @ stdcall NtQueryObject(long long long long long) @@ -326,16 +468,26 @@ @ stdcall NtRaiseHardError(long long long ptr long ptr) @ stdcall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) +@ stub -version=0x600+ NtReadOnlyEnlistment @ stdcall NtReadRequestData(ptr ptr long ptr long ptr) @ stdcall NtReadVirtualMemory(long ptr ptr long ptr) +@ stub -version=0x600+ NtRecoverEnlistment +@ stub -version=0x600+ NtRecoverResourceManager +@ stub -version=0x600+ NtRecoverTransactionManager +@ stub -version=0x600+ NtRegisterProtocolAddressInformation @ stdcall NtRegisterThreadTerminatePort(ptr) +@ stub -version=0x600+ NtReleaseCMFViewOwnership @ stdcall NtReleaseKeyedEvent(ptr ptr long ptr) @ stdcall NtReleaseMutant(long ptr) @ stdcall NtReleaseSemaphore(long long ptr) +@ stub -version=0x600+ NtReleaseWorkerFactoryWorker @ stdcall NtRemoveIoCompletion(ptr ptr ptr ptr ptr) +@ stub -version=0x600+ NtRemoveIoCompletionEx @ stdcall NtRemoveProcessDebug(ptr ptr) @ stdcall NtRenameKey(ptr ptr) +@ stub -version=0x600+ NtRenameTransactionManager @ stdcall NtReplaceKey(ptr long ptr) +@ stub -version=0x600+ NtReplacePartitionUnit @ stdcall NtReplyPort(ptr ptr) @ stdcall NtReplyWaitReceivePort(ptr ptr ptr ptr) @ stdcall NtReplyWaitReceivePortEx(ptr ptr ptr ptr ptr) @@ -349,6 +501,10 @@ @ stdcall NtRestoreKey(long long long) @ stdcall NtResumeProcess(ptr) @ stdcall NtResumeThread(long long) +@ stub -version=0x600+ NtRollbackComplete +@ stub -version=0x600+ NtRollbackEnlistment +@ stub -version=0x600+ NtRollbackTransaction +@ stub -version=0x600+ NtRollforwardTransactionManager @ stdcall NtSaveKey(long long) @ stdcall NtSaveKeyEx(ptr ptr long) @ stdcall NtSaveMergedKeys(ptr ptr ptr) @@ -367,13 +523,18 @@ @ stdcall NtSetHighEventPair(ptr) @ stdcall NtSetHighWaitLowEventPair(ptr) @ stdcall NtSetInformationDebugObject(ptr long ptr long ptr) +@ stub -version=0x600+ NtSetInformationEnlistment @ stdcall NtSetInformationFile(long long long long long) @ stdcall NtSetInformationJobObject(long long ptr long) @ stdcall NtSetInformationKey(long long ptr long) @ stdcall NtSetInformationObject(long long ptr long) @ stdcall NtSetInformationProcess(long long long long) +@ stub -version=0x600+ NtSetInformationResourceManager @ stdcall NtSetInformationThread(long long ptr long) @ stdcall NtSetInformationToken(long long ptr long) +@ stub -version=0x600+ NtSetInformationTransaction +@ stub -version=0x600+ NtSetInformationTransactionManager +@ stub -version=0x600+ NtSetInformationWorkerFactory @ stdcall NtSetIntervalProfile(long long) @ stdcall NtSetIoCompletion(ptr long ptr long long) @ stdcall NtSetLdtEntries(long int64 long int64) @@ -393,7 +554,9 @@ @ stdcall NtSetValueKey(long long long long long long) @ stdcall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall NtShutdownSystem(long) +@ stub -version=0x600+ NtShutdownWorkerFactory @ stdcall NtSignalAndWaitForSingleObject(long long long ptr) +@ stub -version=0x600+ NtSinglePhaseReject @ stdcall NtStartProfile(ptr) @ stdcall NtStopProfile(ptr) @ stdcall NtSuspendProcess(ptr) @@ -403,6 +566,9 @@ @ stdcall NtTerminateProcess(long long) @ stdcall NtTerminateThread(long long) @ stdcall NtTestAlert() +@ stub -version=0x600+ NtThawRegistry +@ stub -version=0x600+ NtThawTransactions +@ stub -version=0x600+ NtTraceControl @ stdcall NtTraceEvent(long long long ptr) @ stdcall NtTranslateFilePath(ptr long ptr long) @ stdcall NtUnloadDriver(ptr) @@ -418,13 +584,19 @@ @ stdcall NtWaitForMultipleObjects32(long ptr long long ptr) @ stdcall NtWaitForMultipleObjects(long ptr long long ptr) @ stdcall NtWaitForSingleObject(long long long) +@ stub -version=0x600+ NtWaitForWorkViaWorkerFactory @ stdcall NtWaitHighEventPair(ptr) @ stdcall NtWaitLowEventPair(ptr) +@ stub -version=0x600+ NtWorkerFactoryWorkerReady @ stdcall NtWriteFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall NtWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) @ stdcall NtWriteRequestData(ptr ptr long ptr long ptr) @ stdcall NtWriteVirtualMemory(long ptr ptr long ptr) @ stdcall NtYieldExecution() +@ stub -version=0x600+ NtdllDefWindowProc_A +@ stub -version=0x600+ NtdllDefWindowProc_W +@ stub -version=0x600+ NtdllDialogWndProc_A +@ stub -version=0x600+ NtdllDialogWndProc_W @ stdcall PfxFindPrefix(ptr ptr) @ stdcall PfxInitialize(ptr) @ stdcall PfxInsertPrefix(ptr ptr ptr) @@ -435,6 +607,8 @@ @ stdcall RtlAcquirePrivilege(ptr long long ptr) @ stdcall RtlAcquireResourceExclusive(ptr long) @ stdcall RtlAcquireResourceShared(ptr long) +@ stdcall -stub -version=0x600+ RtlAcquireSRWLockExclusive(ptr) +@ stdcall -stub -version=0x600+ RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) @ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) @ stdcall -arch=x86_64 RtlActivateActivationContextUnsafeFast(ptr ptr) @@ -453,8 +627,10 @@ @ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) @ stdcall -stub RtlAddCompoundAce(ptr long long long ptr ptr) @ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long long) +@ stub -version=0x600+ RtlAddMandatoryAce @ stdcall RtlAddRefActivationContext(ptr) @ stdcall RtlAddRefMemoryStream(ptr) +@ stub -version=0x600+ RtlAddSIDToBoundaryDescriptor @ stdcall RtlAddVectoredContinueHandler(long ptr) @ stdcall RtlAddVectoredExceptionHandler(long ptr) @ stdcall -stub RtlAddressInSectionTable(ptr ptr long) @@ -463,6 +639,8 @@ @ stdcall RtlAllocateAndInitializeSid(ptr long long long long long long long long long ptr) @ stdcall RtlAllocateHandle(ptr ptr) @ stdcall RtlAllocateHeap(ptr long ptr) +@ stub -version=0x600+ RtlAllocateMemoryBlockLookaside +@ stub -version=0x600+ RtlAllocateMemoryZone @ stdcall RtlAnsiCharToUnicodeChar(ptr) @ stdcall RtlAnsiStringToUnicodeSize(ptr) RtlxAnsiStringToUnicodeSize @ stdcall RtlAnsiStringToUnicodeString(ptr ptr long) @@ -479,6 +657,8 @@ @ stdcall RtlAreBitsClear(ptr long long) @ stdcall RtlAreBitsSet(ptr long long) @ stdcall RtlAssert(ptr ptr long ptr) +@ stub -version=0x600+ RtlBarrier +@ stub -version=0x600+ RtlBarrierForDelete @ stdcall RtlCancelTimer(ptr ptr) @ stdcall -register RtlCaptureContext(ptr) @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) @@ -487,21 +667,31 @@ @ stdcall RtlCheckForOrphanedCriticalSections(ptr) @ stdcall -stub -version=0x502 RtlCheckProcessParameters(ptr ptr ptr ptr) @ stdcall RtlCheckRegistryKey(long ptr) +@ stub -version=0x600+ RtlCleanUpTEBLangLists @ stdcall RtlClearAllBits(ptr) @ stdcall RtlClearBits(ptr long long) @ stdcall RtlCloneMemoryStream(ptr ptr) +@ stub -version=0x600+ RtlCloneUserProcess +@ stub -version=0x600+ RtlCmDecodeMemIoResource +@ stub -version=0x600+ RtlCmEncodeMemIoResource +@ stub -version=0x600+ RtlCommitDebugInfo @ stdcall RtlCommitMemoryStream(ptr long) @ stdcall RtlCompactHeap(long long) +@ stub -version=0x600+ RtlCompareAltitudes @ stdcall RtlCompareMemory(ptr ptr long) @ stdcall RtlCompareMemoryUlong(ptr long long) @ stdcall RtlCompareString(ptr ptr long) @ stdcall RtlCompareUnicodeString (ptr ptr long) +@ stub -version=0x600+ RtlCompareUnicodeStrings +@ stub -version=0x600+ -arch=x86_64 RtlCompleteProcessCloning @ stdcall RtlCompressBuffer(long ptr long ptr long long ptr ptr) @ stdcall RtlComputeCrc32(long ptr long) @ stdcall RtlComputeImportTableHash(ptr ptr long) @ stdcall RtlComputePrivatizedDllName_U(ptr ptr ptr) +@ stub -version=0x600+ RtlConnectToSm @ stdcall RtlConsoleMultiByteToUnicodeN(ptr long ptr ptr long ptr) @ stdcall RtlConvertExclusiveToShared(ptr) +@ stub -version=0x600+ RtlConvertLCIDToString @ stdcall -arch=win32 -ret64 RtlConvertLongToLargeInteger(long) @ stdcall RtlConvertSharedToExclusive(ptr) @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) @@ -511,6 +701,8 @@ @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) @ stdcall RtlCopyMappedMemory(ptr ptr long) +@ cdecl -version=0x600+ -arch=x86_64 RtlCopyMemory(ptr ptr long) memmove +@ stub -version=0x600+ -arch=x86_64 RtlCopyMemoryNonTemporal @ stdcall RtlCopyMemoryStreamTo(ptr ptr int64 ptr ptr) @ stdcall RtlCopyOutOfProcessMemoryStreamTo(ptr ptr int64 ptr ptr) RtlCopyMemoryStreamTo @ stdcall RtlCopySecurityDescriptor(ptr ptr) @@ -523,9 +715,14 @@ @ stdcall RtlCreateAndSetSD(ptr long ptr ptr ptr) @ stdcall RtlCreateAtomTable(long ptr) @ stdcall RtlCreateBootStatusDataFile() +@ stub -version=0x600+ RtlCreateBoundaryDescriptor @ stdcall RtlCreateEnvironment(long ptr) +@ stub -version=0x600+ RtlCreateEnvironmentEx @ stdcall RtlCreateHeap(long ptr long long ptr ptr) +@ stub -version=0x600+ RtlCreateMemoryBlockLookaside +@ stub -version=0x600+ RtlCreateMemoryZone @ stdcall RtlCreateProcessParameters(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub -version=0x600+ RtlCreateProcessParametersEx @ stdcall RtlCreateQueryDebugBuffer(long long) @ stdcall RtlCreateRegistryKey(long wstr) @ stdcall RtlCreateSecurityDescriptor(ptr long) @@ -538,9 +735,12 @@ @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) @ stdcall RtlCreateUserProcess(ptr long ptr ptr ptr ptr long ptr ptr ptr) @ stdcall RtlCreateUserSecurityObject(ptr long ptr ptr long ptr ptr) +@ stub -version=0x600+ RtlCreateUserStack @ stdcall RtlCreateUserThread(long ptr long ptr long long ptr ptr ptr ptr) +@ stub -version=0x600+ RtlCultureNameToLCID @ stdcall RtlCustomCPToUnicodeN(ptr wstr long ptr str long) @ stdcall RtlCutoverTimeToSystemTime(ptr ptr ptr long) +@ stub -version=0x600+ RtlDeCommitDebugInfo @ stdcall RtlDeNormalizeProcessParams(ptr) @ stdcall RtlDeactivateActivationContext(long long) @ stdcall -arch=x86_64 RtlDeactivateActivationContextUnsafeFast(ptr) @@ -553,6 +753,8 @@ @ stdcall RtlDelete(ptr) @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) +@ stub -version=0x600+ RtlDeleteBarrier +@ stub -version=0x600+ RtlDeleteBoundaryDescriptor @ stdcall RtlDeleteCriticalSection(ptr) @ stdcall RtlDeleteElementGenericTable(ptr ptr) @ stdcall RtlDeleteElementGenericTableAvl(ptr ptr) @@ -564,12 +766,15 @@ @ stdcall RtlDeleteTimer(ptr ptr ptr) @ stdcall RtlDeleteTimerQueue(ptr) @ stdcall RtlDeleteTimerQueueEx(ptr ptr) +@ stub -version=0x600+ RtlDeregisterSecureMemoryCacheCallback @ stdcall RtlDeregisterWait(ptr) @ stdcall RtlDeregisterWaitEx(ptr ptr) @ stdcall RtlDestroyAtomTable(ptr) @ stdcall RtlDestroyEnvironment(ptr) @ stdcall RtlDestroyHandleTable(ptr) @ stdcall RtlDestroyHeap(long) +@ stub -version=0x600+ RtlDestroyMemoryBlockLookaside +@ stub -version=0x600+ RtlDestroyMemoryZone @ stdcall RtlDestroyProcessParameters(ptr) @ stdcall RtlDestroyQueryDebugBuffer(ptr) @ stdcall RtlDetermineDosPathNameType_U(wstr) @@ -609,21 +814,27 @@ @ stdcall RtlEqualString(ptr ptr long) @ stdcall RtlEqualUnicodeString(ptr ptr long) @ stdcall RtlEraseUnicodeString(ptr) +@ stub -version=0x600+ RtlExitUserProcess @ stdcall RtlExitUserThread(long) +@ stub -version=0x600+ RtlExpandEnvironmentStrings @ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr) @ stdcall -version=0x502 RtlExtendHeap(ptr long ptr ptr) +@ stub -version=0x600+ RtlExtendMemoryBlockLookaside +@ stub -version=0x600+ RtlExtendMemoryZone @ stdcall -arch=win32 -ret64 RtlExtendedIntegerMultiply(double long) @ stdcall -arch=win32 -ret64 RtlExtendedLargeIntegerDivide(double long ptr) @ stdcall -arch=win32 -ret64 RtlExtendedMagicDivide(double double long) @ stdcall RtlFillMemory(ptr long long) @ stdcall -arch=i386 RtlFillMemoryUlong(ptr long long) @ stdcall RtlFinalReleaseOutOfProcessMemoryStream(ptr) +@ stub -version=0x600+ RtlFindAceByType @ stdcall RtlFindActivationContextSectionGuid(long ptr long ptr ptr) @ stdcall RtlFindActivationContextSectionString(long ptr long ptr ptr) @ stdcall RtlFindCharInUnicodeString(long ptr ptr ptr) @ stdcall RtlFindClearBits(ptr long long) @ stdcall RtlFindClearBitsAndSet(ptr long long) @ stdcall RtlFindClearRuns(ptr ptr long long) +@ stub -version=0x600+ RtlFindClosestEncodableLength @ stdcall RtlFindLastBackwardRunClear(ptr long ptr) @ stdcall RtlFindLeastSignificantBit(double) @ stdcall RtlFindLongestRunClear(ptr long) @@ -634,6 +845,8 @@ @ stdcall RtlFindSetBitsAndClear(ptr long long) @ stdcall RtlFirstEntrySList(ptr) @ stdcall RtlFirstFreeAce(ptr ptr) +@ stub -version=0x600+ RtlFlsAlloc +@ stub -version=0x600+ RtlFlsFree @ stdcall RtlFlushSecureMemoryCache(ptr ptr) @ stdcall RtlFormatCurrentUserKeyPath(ptr) @ stdcall RtlFormatMessage(ptr long long long long ptr ptr long ptr) @@ -642,10 +855,12 @@ @ stdcall RtlFreeAnsiString(long) @ stdcall RtlFreeHandle(ptr ptr) @ stdcall RtlFreeHeap(long long long) +@ stub -version=0x600+ RtlFreeMemoryBlockLookaside @ stdcall RtlFreeOemString(ptr) @ stdcall RtlFreeSid(long) @ stdcall RtlFreeThreadActivationContextStack() @ stdcall RtlFreeUnicodeString(ptr) +@ stub -version=0x600+ RtlFreeUserStack @ stdcall -version=0x502 RtlFreeUserThreadStack(ptr ptr) @ stdcall RtlGUIDFromString(ptr ptr) @ stdcall RtlGenerate8dot3Name(ptr ptr long ptr) @@ -658,13 +873,17 @@ @ stdcall RtlGetCurrentDirectory_U(long ptr) @ stdcall RtlGetCurrentPeb() @ stdcall RtlGetCurrentProcessorNumber() ; 5.2 SP1 and higher +@ stub -version=0x600+ RtlGetCurrentTransaction @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) @ stdcall RtlGetElementGenericTableAvl(ptr long) +@ stub -version=0x600+ RtlGetFileMUIPath @ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) @ stdcall RtlGetFullPathName_UstrEx(ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub -version=0x600+ -arch=x86_64 RtlGetFunctionTableListHead @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) +@ stub -version=0x600+ RtlGetIntegerAtom @ stdcall RtlGetLastNtStatus() @ stdcall RtlGetLastWin32Error() @ stdcall RtlGetLengthWithoutLastFullDosOrNtPathElement(long ptr ptr) @@ -676,24 +895,38 @@ @ stdcall RtlGetNtProductType(ptr) @ stdcall RtlGetNtVersionNumbers(ptr ptr ptr) @ stdcall RtlGetOwnerSecurityDescriptor(ptr ptr ptr) +@ stub -version=0x600+ RtlGetParentLocaleName @ stdcall RtlGetProcessHeaps(long ptr) +@ stub -version=0x600+ RtlGetProductInfo @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) @ stdcall RtlGetSecurityDescriptorRMControl(ptr ptr) @ stdcall RtlGetSetBootStatusData(ptr long long ptr long long) +@ stub -version=0x600+ RtlGetSystemPreferredUILanguages @ stdcall RtlGetThreadErrorMode() +@ stub -version=0x600+ RtlGetThreadLangIdByIndex +@ stub -version=0x600+ RtlGetThreadPreferredUILanguages +@ stub -version=0x600+ RtlGetUILanguageInfo @ stdcall RtlGetUnloadEventTrace() +@ stub -version=0x600+ RtlGetUnloadEventTraceEx @ stdcall RtlGetUserInfoHeap(ptr long ptr ptr ptr) +@ stub -version=0x600+ RtlGetUserPreferredUILanguages @ stdcall RtlGetVersion(ptr) @ stdcall RtlHashUnicodeString(ptr long long ptr) +@ stub -version=0x600+ RtlHeapTrkInitialize @ stdcall RtlIdentifierAuthoritySid(ptr) +@ stub -version=0x600+ RtlIdnToAscii +@ stub -version=0x600+ RtlIdnToNameprepUnicode +@ stub -version=0x600+ RtlIdnToUnicode @ stdcall RtlImageDirectoryEntryToData(long long long ptr) @ stdcall RtlImageNtHeader(long) @ stdcall RtlImageNtHeaderEx(long ptr double ptr) @ stdcall RtlImageRvaToSection(ptr long long) @ stdcall RtlImageRvaToVa(ptr long long ptr) @ stdcall RtlImpersonateSelf(long) +@ stub -version=0x600+ RtlImpersonateSelfEx @ stdcall RtlInitAnsiString(ptr str) @ stdcall RtlInitAnsiStringEx(ptr str) +@ stub -version=0x600+ RtlInitBarrier @ stdcall RtlInitCodePageTable(ptr ptr) @ stdcall RtlInitMemoryStream(ptr) @ stdcall RtlInitNlsTables(ptr ptr ptr ptr) @@ -703,15 +936,20 @@ @ stdcall RtlInitUnicodeStringEx(ptr wstr) @ stdcall -stub RtlInitializeAtomPackage(ptr) @ stdcall RtlInitializeBitMap(ptr long long) +@ stdcall -stub -version=0x600+ RtlInitializeConditionVariable(ptr) @ stdcall RtlInitializeContext(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeCriticalSection(ptr) @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) +@ stub -version=0x600+ RtlInitializeCriticalSectionEx +@ stub -version=0x600+ -arch=i386 RtlInitializeExceptionChain @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeHandleTable(long long ptr) +@ stub -version=0x600+ RtlInitializeNtUserPfn @ stdcall RtlInitializeRXact(ptr long ptr) @ stdcall RtlInitializeResource(ptr) @ stdcall RtlInitializeSListHead(ptr) +@ stdcall -stub -version=0x600+ RtlInitializeSRWLock(ptr) @ stdcall RtlInitializeSid(ptr ptr long) @ stdcall RtlInsertElementGenericTable(ptr ptr long ptr) @ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) @@ -726,6 +964,8 @@ @ stdcall RtlInterlockedPopEntrySList(ptr) @ stdcall RtlInterlockedPushEntrySList(ptr ptr) @ stdcall -arch=x86_64 RtlInterlockedPushListSList(ptr ptr ptr long) +@ stub -version=0x600+ RtlIoDecodeMemIoResource +@ stub -version=0x600+ RtlIoEncodeMemIoResource @ stdcall RtlIpv4AddressToStringA(ptr ptr) @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) @@ -745,14 +985,18 @@ @ stdcall RtlIsActivationContextActive(ptr) @ stdcall RtlIsCriticalSectionLocked(ptr) @ stdcall RtlIsCriticalSectionLockedByThread(ptr) +@ stub -version=0x600+ RtlIsCurrentThreadAttachExempt @ stdcall RtlIsDosDeviceName_U(wstr) @ stdcall RtlIsGenericTableEmpty(ptr) @ stdcall RtlIsGenericTableEmptyAvl(ptr) @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) +@ stub -version=0x600+ RtlIsNormalizedString @ stdcall RtlIsTextUnicode(ptr long ptr) @ stdcall RtlIsThreadWithinLoaderCallout() @ stdcall RtlIsValidHandle(ptr ptr) @ stdcall RtlIsValidIndexHandle(ptr long ptr) +@ stub -version=0x600+ RtlIsValidLocaleName +@ stub -version=0x600+ RtlLCIDToCultureName @ stdcall -arch=win32 -ret64 RtlLargeIntegerAdd(double double) @ stdcall -arch=win32 -ret64 RtlLargeIntegerArithmeticShift(double long) @ stdcall -arch=win32 -ret64 RtlLargeIntegerDivide(double double ptr) @@ -761,14 +1005,20 @@ @ stdcall -arch=win32 -ret64 RtlLargeIntegerShiftRight(double long) @ stdcall -arch=win32 -ret64 RtlLargeIntegerSubtract(double double) @ stdcall RtlLargeIntegerToChar(ptr long long ptr) +@ stub -version=0x600+ RtlLcidToLocaleName @ stdcall RtlLeaveCriticalSection(ptr) @ stdcall RtlLengthRequiredSid(long) @ stdcall RtlLengthSecurityDescriptor(ptr) @ stdcall RtlLengthSid(ptr) @ stdcall RtlLocalTimeToSystemTime(ptr ptr) +@ stub -version=0x600+ RtlLocaleNameToLcid @ stdcall RtlLockBootStatusData(ptr) +@ stub -version=0x600+ RtlLockCurrentThread @ stdcall RtlLockHeap(long) +@ stub -version=0x600+ RtlLockMemoryBlockLookaside @ stdcall RtlLockMemoryStreamRegion(ptr int64 int64 long) +@ stub -version=0x600+ RtlLockMemoryZone +@ stub -version=0x600+ RtlLockModuleSection @ stdcall -stub RtlLogStackBackTrace() @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) @@ -792,32 +1042,44 @@ @ stdcall RtlNewSecurityObjectEx(ptr ptr ptr ptr long long ptr ptr) @ stdcall RtlNewSecurityObjectWithMultipleInheritance(ptr ptr ptr ptr long long long ptr ptr) @ stdcall RtlNormalizeProcessParams(ptr) +@ stub -version=0x600+ RtlNormalizeString @ stdcall RtlNtPathNameToDosPathName(long ptr ptr ptr) ; CHECKME (last arg) @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) +@ stub -version=0x600+ -arch=x86_64 RtlNtdllName @ stdcall RtlNumberGenericTableElements(ptr) @ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) +@ stub -version=0x600+ RtlNumberOfSetBitsUlongPtr @ stdcall RtlOemStringToUnicodeSize(ptr) RtlxOemStringToUnicodeSize @ stdcall RtlOemStringToUnicodeString(ptr ptr long) @ stdcall RtlOemToUnicodeN(ptr long ptr ptr long) @ stdcall RtlOpenCurrentUser(long ptr) +@ stub -version=0x600+ RtlOwnerAcesPresent @ stdcall RtlPcToFileHeader(ptr ptr) @ stdcall RtlPinAtomInAtomTable(ptr long) @ stdcall RtlPopFrame(ptr) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) +@ stub -version=0x600+ -arch=x86_64 RtlPrepareForProcessCloning +@ stub -version=0x600+ RtlProcessFlsData @ stdcall RtlProtectHeap(ptr long) @ stdcall RtlPushFrame(ptr) +@ stub -version=0x600+ RtlQueryActivationContextApplicationSettings @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) +@ stub -version=0x600+ RtlQueryCriticalSectionOwner @ stdcall RtlQueryDepthSList(ptr) +@ stub -version=0x600+ RtlQueryDynamicTimeZoneInformation +@ stub -version=0x600+ RtlQueryElevationFlags +@ stub -version=0x600+ RtlQueryEnvironmentVariable @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) @ stdcall RtlQueryInformationActiveActivationContext(long ptr long ptr) @ stdcall RtlQueryInterfaceMemoryStream(ptr ptr ptr) +@ stub -version=0x600+ RtlQueryModuleInformation @ stdcall -stub RtlQueryProcessBackTraceInformation(ptr) @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stdcall RtlQueryProcessHeapInformation(ptr) @@ -838,6 +1100,7 @@ @ stdcall RtlRealPredecessor(ptr) @ stdcall RtlRealSuccessor(ptr) @ stdcall RtlRegisterSecureMemoryCacheCallback(ptr) +@ stub -version=0x600+ RtlRegisterThreadWithCsrss @ stdcall RtlRegisterWait(ptr ptr ptr ptr long long) @ stdcall RtlReleaseActivationContext(ptr) @ stdcall RtlReleaseMemoryStream(ptr) @@ -845,20 +1108,32 @@ @ stdcall RtlReleasePrivilege(ptr) @ stdcall RtlReleaseRelativeName(ptr) @ stdcall RtlReleaseResource(ptr) +@ stdcall -stub -version=0x600+ RtlReleaseSRWLockExclusive(ptr) +@ stdcall -stub -version=0x600+ RtlReleaseSRWLockShared(ptr) @ stdcall RtlRemoteCall(ptr ptr ptr long ptr long long) +@ stub -version=0x600+ RtlRemovePrivileges @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) +@ stub -version=0x600+ RtlReportException +@ stub -version=0x600+ RtlResetMemoryBlockLookaside +@ stub -version=0x600+ RtlResetMemoryZone @ stdcall RtlResetRtlTranslations(ptr) @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error +@ stub -version=0x600+ RtlRetrieveNtUserPfn @ stdcall RtlRevertMemoryStream(ptr) @ stdcall RtlRunDecodeUnicodeString(long ptr) @ stdcall RtlRunEncodeUnicodeString(long ptr) +@ stdcall -stub -version=0x600+ RtlRunOnceBeginInitialize(ptr long ptr) +@ stdcall -stub -version=0x600+ RtlRunOnceComplete(ptr long ptr) +@ stdcall -stub -version=0x600+ RtlRunOnceExecuteOnce(ptr ptr ptr ptr) +@ stdcall -stub -version=0x600+ RtlRunOnceInitialize(ptr) @ stdcall RtlSecondsSince1970ToTime(long ptr) @ stdcall RtlSecondsSince1980ToTime(long ptr) @ stdcall RtlSeekMemoryStream(ptr int64 long ptr) @ stdcall RtlSelfRelativeToAbsoluteSD2(ptr ptr) @ stdcall RtlSelfRelativeToAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub -version=0x600+ RtlSendMsgToSm @ stdcall RtlSetAllBits(ptr) @ stdcall RtlSetAttributesSecurityDescriptor(ptr long ptr) @ stdcall RtlSetBits(ptr long long) @@ -866,8 +1141,11 @@ @ stdcall RtlSetCriticalSectionSpinCount(ptr long) @ stdcall RtlSetCurrentDirectory_U(ptr) @ stdcall RtlSetCurrentEnvironment(wstr ptr) +@ stub -version=0x600+ RtlSetCurrentTransaction @ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long) +@ stub -version=0x600+ RtlSetDynamicTimeZoneInformation @ stdcall RtlSetEnvironmentStrings(wstr long) +@ stub -version=0x600+ RtlSetEnvironmentVar @ stdcall RtlSetEnvironmentVariable(ptr ptr ptr) @ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long) @ stdcall RtlSetHeapInformation(ptr long ptr ptr) @@ -877,6 +1155,7 @@ @ stdcall RtlSetLastWin32ErrorAndNtStatusFromNtStatus(long) @ stdcall RtlSetMemoryStreamSize(ptr int64) @ stdcall RtlSetOwnerSecurityDescriptor(ptr ptr long) +@ stub -version=0x600+ RtlSetProcessDebugInformation @ cdecl RtlSetProcessIsCritical(long ptr long) @ stdcall RtlSetSaclSecurityDescriptor(ptr long ptr long) @ stdcall RtlSetSecurityDescriptorRMControl(ptr ptr) @@ -885,13 +1164,21 @@ @ stdcall RtlSetThreadErrorMode(long ptr) @ cdecl RtlSetThreadIsCritical(long ptr long) @ stdcall RtlSetThreadPoolStartFunc(ptr ptr) +@ stub -version=0x600+ RtlSetThreadPreferredUILanguages @ stdcall RtlSetTimeZoneInformation(ptr) @ stdcall RtlSetTimer(ptr ptr ptr ptr long long long) @ stdcall RtlSetUnhandledExceptionFilter(ptr) @ stdcall -stub -version=0x502 RtlSetUnicodeCallouts(ptr) @ stdcall RtlSetUserFlagsHeap(ptr long ptr long long) @ stdcall RtlSetUserValueHeap(ptr long ptr ptr) +@ stub -version=0x600+ RtlSidDominates +@ stub -version=0x600+ RtlSidEqualLevel +@ stub -version=0x600+ RtlSidHashInitialize +@ stub -version=0x600+ RtlSidHashLookup +@ stub -version=0x600+ RtlSidIsHigherLevel @ stdcall RtlSizeHeap(long long ptr) +@ stdcall -stub -version=0x600+ RtlSleepConditionVariableCS(ptr ptr ptr) +@ stdcall -stub -version=0x600+ RtlSleepConditionVariableSRW(ptr ptr ptr long) @ stdcall RtlSplay(ptr) @ stdcall RtlStartRXact(ptr) @ stdcall RtlStatMemoryStream(ptr ptr long) @@ -901,6 +1188,7 @@ @ stdcall RtlSubtreePredecessor(ptr) @ stdcall RtlSubtreeSuccessor(ptr) @ stdcall RtlSystemTimeToLocalTime(ptr ptr) +@ stdcall -version=0x600+ RtlTestBit(ptr long) @ stdcall RtlTimeFieldsToTime(ptr ptr) @ stdcall RtlTimeToElapsedTimeFields(long long) @ stdcall RtlTimeToSecondsSince1970(ptr ptr) @@ -914,6 +1202,7 @@ @ stdcall RtlTraceDatabaseLock(ptr) @ stdcall RtlTraceDatabaseUnlock(ptr) @ stdcall RtlTraceDatabaseValidate(ptr) +@ stub -version=0x600+ RtlTryAcquirePebLock @ stdcall RtlTryEnterCriticalSection(ptr) @ stdcall RtlUnhandledExceptionFilter2(ptr long) @ stdcall RtlUnhandledExceptionFilter(ptr) @@ -929,8 +1218,12 @@ @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) @ stdcall RtlUniform(ptr) @ stdcall RtlUnlockBootStatusData(ptr) +@ stub -version=0x600+ RtlUnlockCurrentThread @ stdcall RtlUnlockHeap(long) +@ stub -version=0x600+ RtlUnlockMemoryBlockLookaside @ stdcall RtlUnlockMemoryStreamRegion(ptr int64 int64 long) +@ stub -version=0x600+ RtlUnlockMemoryZone +@ stub -version=0x600+ RtlUnlockModuleSection @ stdcall -register RtlUnwind(ptr ptr ptr ptr) @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) @ stdcall RtlUpcaseUnicodeChar(long) @@ -941,10 +1234,13 @@ @ stdcall RtlUpcaseUnicodeToCustomCPN(ptr ptr long ptr wstr long) @ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUpcaseUnicodeToOemN(ptr long ptr ptr long) +@ stub -version=0x600+ RtlUpdateClonedCriticalSection +@ stub -version=0x600+ RtlUpdateClonedSRWLock @ stdcall RtlUpdateTimer(ptr ptr long long) @ stdcall RtlUpperChar(long) @ stdcall RtlUpperString(ptr ptr) @ stdcall -version=0x502 RtlUsageHeap(ptr long ptr) +@ stub -version=0x600+ RtlUserThreadStart @ stdcall RtlValidAcl(ptr) @ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) @ stdcall RtlValidSecurityDescriptor(ptr) @@ -954,17 +1250,42 @@ @ stdcall RtlValidateUnicodeString(long ptr) @ stdcall RtlVerifyVersionInfo(ptr long double) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall -stub -version=0x600+ RtlWakeAllConditionVariable(ptr) +@ stdcall -stub -version=0x600+ RtlWakeConditionVariable(ptr) @ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWalkHeap(long ptr) +@ stub -version=0x600+ RtlWerpReportException +@ stub -version=0x600+ RtlWow64CallFunction64 @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) +@ stub -version=0x600+ -arch=x86_64 RtlWow64GetThreadContext +@ stub -version=0x600+ -arch=x86_64 RtlWow64LogMessageInEventLogger +@ stub -version=0x600+ -arch=x86_64 RtlWow64SetThreadContext +@ stub -version=0x600+ -arch=x86_64 RtlWow64SuspendThread @ stdcall RtlWriteMemoryStream(ptr ptr long ptr) @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stdcall RtlZeroHeap(ptr long) @ stdcall RtlZeroMemory(ptr long) @ stdcall RtlZombifyActivationContext(ptr) @ stdcall RtlpApplyLengthFunction(long long ptr ptr) +@ stub -version=0x600+ RtlpCheckDynamicTimeZoneInformation +@ stub -version=0x600+ RtlpCleanupRegistryKeys +@ stub -version=0x600+ RtlpConvertCultureNamesToLCIDs +@ stub -version=0x600+ RtlpConvertLCIDsToCultureNames +@ stub -version=0x600+ RtlpCreateProcessRegistryInfo @ stdcall RtlpEnsureBufferSize(long ptr long) +@ stub -version=0x600+ RtlpGetLCIDFromLangInfoNode +@ stub -version=0x600+ RtlpGetNameFromLangInfoNode +@ stub -version=0x600+ RtlpGetSystemDefaultUILanguage +@ stub -version=0x600+ RtlpGetUserOrMachineUILanguage4NLS +@ stub -version=0x600+ RtlpInitializeLangRegistryInfo +@ stub -version=0x600+ RtlpIsQualifiedLanguage +@ stub -version=0x600+ RtlpLoadMachineUIByPolicy +@ stub -version=0x600+ RtlpLoadUserUIByPolicy +@ stub -version=0x600+ RtlpMuiFreeLangRegistryInfo +@ stub -version=0x600+ RtlpMuiRegCreateRegistryInfo +@ stub -version=0x600+ RtlpMuiRegFreeRegistryInfo +@ stub -version=0x600+ RtlpMuiRegLoadRegistryInfo @ stdcall RtlpNotOwnerCriticalSection(ptr) @ stdcall RtlpNtCreateKey(ptr long ptr long ptr ptr) @ stdcall RtlpNtEnumerateSubKey(ptr ptr long long) @@ -972,13 +1293,74 @@ @ stdcall RtlpNtOpenKey(ptr long ptr long) @ stdcall RtlpNtQueryValueKey(ptr ptr ptr ptr long) @ stdcall RtlpNtSetValueKey(ptr long ptr long) +@ stub -version=0x600+ RtlpQueryDefaultUILanguage +@ stub -version=0x600+ -arch=x86_64 RtlpQueryProcessDebugInformationFromWow64 +@ stub -version=0x600+ RtlpRefreshCachedUILanguage +@ stub -version=0x600+ RtlpSetInstallLanguage +@ stub -version=0x600+ RtlpSetPreferredUILanguages +@ stub -version=0x600+ RtlpSetUserPreferredUILanguages @ stdcall RtlpUnWaitCriticalSection(ptr) +@ stub -version=0x600+ RtlpVerifyAndCommitUILanguageSettings @ stdcall RtlpWaitForCriticalSection(ptr) @ stdcall RtlxAnsiStringToUnicodeSize(ptr) @ stdcall RtlxOemStringToUnicodeSize(ptr) @ stdcall RtlxUnicodeStringToAnsiSize(ptr) @ stdcall RtlxUnicodeStringToOemSize(ptr) +@ stub -version=0x600+ ShipAssert +@ stub -version=0x600+ ShipAssertGetBufferInfo +@ stub -version=0x600+ ShipAssertMsgA +@ stub -version=0x600+ ShipAssertMsgW +@ stub -version=0x600+ TpAllocAlpcCompletion +@ stub -version=0x600+ TpAllocCleanupGroup +@ stub -version=0x600+ TpAllocIoCompletion +@ stub -version=0x600+ TpAllocPool +@ stub -version=0x600+ TpAllocTimer +@ stub -version=0x600+ TpAllocWait +@ stub -version=0x600+ TpAllocWork +@ stub -version=0x600+ TpCallbackLeaveCriticalSectionOnCompletion +@ stub -version=0x600+ TpCallbackMayRunLong +@ stub -version=0x600+ TpCallbackReleaseMutexOnCompletion +@ stub -version=0x600+ TpCallbackReleaseSemaphoreOnCompletion +@ stub -version=0x600+ TpCallbackSetEventOnCompletion +@ stub -version=0x600+ TpCallbackUnloadDllOnCompletion +@ stub -version=0x600+ TpCancelAsyncIoOperation +@ stub -version=0x600+ TpCaptureCaller +@ stub -version=0x600+ TpCheckTerminateWorker +@ stub -version=0x600+ TpDbgDumpHeapUsage +@ stub -version=0x600+ TpDbgSetLogRoutine +@ stub -version=0x600+ TpDisassociateCallback +@ stub -version=0x600+ TpIsTimerSet +@ stub -version=0x600+ TpPostWork +@ stub -version=0x600+ TpReleaseAlpcCompletion +@ stub -version=0x600+ TpReleaseCleanupGroup +@ stub -version=0x600+ TpReleaseCleanupGroupMembers +@ stub -version=0x600+ TpReleaseIoCompletion +@ stub -version=0x600+ TpReleasePool +@ stub -version=0x600+ TpReleaseTimer +@ stub -version=0x600+ TpReleaseWait +@ stub -version=0x600+ TpReleaseWork +@ stub -version=0x600+ TpSetPoolMaxThreads +@ stub -version=0x600+ TpSetPoolMinThreads +@ stub -version=0x600+ TpSetTimer +@ stub -version=0x600+ TpSetWait +@ stub -version=0x600+ TpSimpleTryPost +@ stub -version=0x600+ TpStartAsyncIoOperation +@ stub -version=0x600+ TpWaitForAlpcCompletion +@ stub -version=0x600+ TpWaitForIoCompletion +@ stub -version=0x600+ TpWaitForTimer +@ stub -version=0x600+ TpWaitForWait +@ stub -version=0x600+ TpWaitForWork @ stdcall -ret64 VerSetConditionMask(double long long) +@ stub -version=0x600+ WerCheckEventEscalation +@ stub -version=0x600+ WerReportSQMEvent +@ stub -version=0x600+ WerReportWatsonEvent +@ stub -version=0x600+ WinSqmAddToStream +@ stub -version=0x600+ WinSqmEndSession +@ stub -version=0x600+ WinSqmEventEnabled +@ stub -version=0x600+ WinSqmEventWrite +@ stub -version=0x600+ WinSqmIsOptedIn +@ stub -version=0x600+ WinSqmSetString +@ stub -version=0x600+ WinSqmStartSession @ stdcall ZwAcceptConnectPort(ptr long ptr long long ptr) @ stdcall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) @ stdcall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) @@ -987,6 +1369,7 @@ @ stdcall ZwAccessCheckByTypeResultList(ptr ptr ptr long ptr long ptr ptr long ptr ptr) @ stdcall ZwAccessCheckByTypeResultListAndAuditAlarm(ptr ptr ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) @ stdcall ZwAccessCheckByTypeResultListAndAuditAlarmByHandle(ptr ptr ptr ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) +@ stub -version=0x600+ ZwAcquireCMFViewOwnership @ stdcall ZwAddAtom(ptr long ptr) @ stdcall ZwAddBootEntry(ptr long) @ stdcall ZwAddDriverEntry(ptr long) @@ -998,16 +1381,42 @@ @ stdcall ZwAllocateUserPhysicalPages(ptr ptr ptr) @ stdcall ZwAllocateUuids(ptr ptr ptr ptr) @ stdcall ZwAllocateVirtualMemory(long ptr ptr ptr long long) +@ stub -version=0x600+ ZwAlpcAcceptConnectPort +@ stub -version=0x600+ ZwAlpcCancelMessage +@ stub -version=0x600+ ZwAlpcConnectPort +@ stub -version=0x600+ ZwAlpcCreatePort +@ stub -version=0x600+ ZwAlpcCreatePortSection +@ stub -version=0x600+ ZwAlpcCreateResourceReserve +@ stub -version=0x600+ ZwAlpcCreateSectionView +@ stub -version=0x600+ ZwAlpcCreateSecurityContext +@ stub -version=0x600+ ZwAlpcDeletePortSection +@ stub -version=0x600+ ZwAlpcDeleteResourceReserve +@ stub -version=0x600+ ZwAlpcDeleteSectionView +@ stub -version=0x600+ ZwAlpcDeleteSecurityContext +@ stub -version=0x600+ ZwAlpcDisconnectPort +@ stub -version=0x600+ ZwAlpcImpersonateClientOfPort +@ stub -version=0x600+ ZwAlpcOpenSenderProcess +@ stub -version=0x600+ ZwAlpcOpenSenderThread +@ stub -version=0x600+ ZwAlpcQueryInformation +@ stub -version=0x600+ ZwAlpcQueryInformationMessage +@ stub -version=0x600+ ZwAlpcRevokeSecurityContext +@ stub -version=0x600+ ZwAlpcSendWaitReceivePort +@ stub -version=0x600+ ZwAlpcSetInformation @ stdcall ZwApphelpCacheControl(long ptr) @ stdcall ZwAreMappedFilesTheSame(ptr ptr) @ stdcall ZwAssignProcessToJobObject(long long) @ stdcall ZwCallbackReturn(ptr long long) @ stdcall ZwCancelDeviceWakeupRequest(ptr) @ stdcall ZwCancelIoFile(long ptr) +@ stub -version=0x600+ ZwCancelIoFileEx +@ stub -version=0x600+ ZwCancelSynchronousIoFile @ stdcall ZwCancelTimer(long ptr) @ stdcall ZwClearEvent(long) @ stdcall ZwClose(long) @ stdcall ZwCloseObjectAuditAlarm(ptr ptr long) +@ stub -version=0x600+ ZwCommitComplete +@ stub -version=0x600+ ZwCommitEnlistment +@ stub -version=0x600+ ZwCommitTransaction @ stdcall ZwCompactKeys(long ptr) @ stdcall ZwCompareTokens(ptr ptr ptr) @ stdcall ZwCompleteConnectPort(ptr) @@ -1016,6 +1425,7 @@ @ stdcall ZwContinue(ptr long) @ stdcall ZwCreateDebugObject(ptr long ptr long) @ stdcall ZwCreateDirectoryObject(long long long) +@ stub -version=0x600+ ZwCreateEnlistment @ stdcall ZwCreateEvent(long long long long long) @ stdcall ZwCreateEventPair(ptr long ptr) @ stdcall ZwCreateFile(ptr long ptr ptr long long long ptr long long ptr) @@ -1023,6 +1433,7 @@ @ stdcall ZwCreateJobObject(ptr long ptr) @ stdcall ZwCreateJobSet(long ptr long) @ stdcall ZwCreateKey(ptr long ptr long ptr long long) +@ stub -version=0x600+ ZwCreateKeyTransacted @ stdcall ZwCreateKeyedEvent(ptr long ptr long) @ stdcall ZwCreateMailslotFile(long long long long long long long long) @ stdcall ZwCreateMutant(ptr long ptr long) @@ -1032,13 +1443,19 @@ @ stdcall ZwCreateProcess(ptr long ptr ptr long ptr ptr ptr) @ stdcall ZwCreateProcessEx(ptr long ptr ptr long ptr ptr ptr long) @ stdcall ZwCreateProfile(ptr ptr ptr long long ptr long long long) ; CHECKME +@ stub -version=0x600+ ZwCreateResourceManager @ stdcall ZwCreateSection(ptr long ptr ptr long long long) @ stdcall ZwCreateSemaphore(ptr long ptr long long) @ stdcall ZwCreateSymbolicLinkObject(ptr long ptr ptr) @ stdcall ZwCreateThread(ptr long ptr ptr ptr ptr ptr long) +@ stub -version=0x600+ ZwCreateThreadEx @ stdcall ZwCreateTimer(ptr long ptr long) @ stdcall ZwCreateToken(ptr long ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub -version=0x600+ ZwCreateTransaction +@ stub -version=0x600+ ZwCreateTransactionManager +@ stub -version=0x600+ ZwCreateUserProcess @ stdcall ZwCreateWaitablePort(ptr ptr long long long) +@ stub -version=0x600+ ZwCreateWorkerFactory @ stdcall ZwDebugActiveProcess(ptr ptr) @ stdcall ZwDebugContinue(ptr ptr long) @ stdcall ZwDelayExecution(long ptr) @@ -1048,6 +1465,7 @@ @ stdcall ZwDeleteFile(ptr) @ stdcall ZwDeleteKey(long) @ stdcall ZwDeleteObjectAuditAlarm(ptr ptr long) +@ stub -version=0x600+ ZwDeletePrivateNamespace @ stdcall ZwDeleteValueKey(long ptr) @ stdcall ZwDeviceIoControlFile(long long long long long long long long long long) @ stdcall ZwDisplayString(ptr) @@ -1057,30 +1475,42 @@ @ stdcall ZwEnumerateDriverEntries(ptr ptr) @ stdcall ZwEnumerateKey(long long long ptr long ptr) @ stdcall ZwEnumerateSystemEnvironmentValuesEx(long ptr long) +@ stub -version=0x600+ ZwEnumerateTransactionObject @ stdcall ZwEnumerateValueKey(long long long ptr long ptr) @ stdcall ZwExtendSection(ptr ptr) @ stdcall ZwFilterToken(ptr long ptr ptr ptr ptr) @ stdcall ZwFindAtom(ptr long ptr) @ stdcall ZwFlushBuffersFile(long ptr) +@ stub -version=0x600+ ZwFlushInstallUILanguage @ stdcall ZwFlushInstructionCache(long ptr long) @ stdcall ZwFlushKey(long) +@ stub -version=0x600+ ZwFlushProcessWriteBuffers @ stdcall ZwFlushVirtualMemory(long ptr ptr long) @ stdcall ZwFlushWriteBuffer() @ stdcall ZwFreeUserPhysicalPages(ptr ptr ptr) @ stdcall ZwFreeVirtualMemory(long ptr ptr long) +@ stub -version=0x600+ ZwFreezeRegistry +@ stub -version=0x600+ ZwFreezeTransactions @ stdcall ZwFsControlFile(long long long long long long long long long long) @ stdcall ZwGetContextThread(long ptr) @ stdcall ZwGetCurrentProcessorNumber() @ stdcall ZwGetDevicePowerState(ptr ptr) +@ stub -version=0x600+ ZwGetMUIRegistryInfo +@ stub -version=0x600+ ZwGetNextProcess +@ stub -version=0x600+ ZwGetNextThread +@ stub -version=0x600+ ZwGetNlsSectionPtr +@ stub -version=0x600+ ZwGetNotificationResourceManager @ stdcall ZwGetPlugPlayEvent(long long ptr long) @ stdcall ZwGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall ZwImpersonateAnonymousToken(ptr) @ stdcall ZwImpersonateClientOfPort(ptr ptr) @ stdcall ZwImpersonateThread(ptr ptr ptr) +@ stub -version=0x600+ ZwInitializeNlsFiles @ stdcall ZwInitializeRegistry(long) @ stdcall ZwInitiatePowerAction(long long long long) @ stdcall ZwIsProcessInJob(long long) @ stdcall ZwIsSystemResumeAutomatic() +@ stub -version=0x600+ ZwIsUILanguageComitted @ stdcall ZwListenPort(ptr ptr) @ stdcall ZwLoadDriver(ptr) @ stdcall ZwLoadKey2(ptr ptr long) @@ -1092,6 +1522,7 @@ @ stdcall ZwLockVirtualMemory(long ptr ptr long) @ stdcall ZwMakePermanentObject(ptr) @ stdcall ZwMakeTemporaryObject(long) +@ stub -version=0x600+ ZwMapCMFModule @ stdcall ZwMapUserPhysicalPages(ptr ptr ptr) @ stdcall ZwMapUserPhysicalPagesScatter(ptr ptr ptr) @ stdcall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) @@ -1101,30 +1532,43 @@ @ stdcall ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) @ stdcall ZwNotifyChangeMultipleKeys(ptr long ptr ptr ptr ptr ptr long long ptr long long) @ stdcall ZwOpenDirectoryObject(long long long) +@ stub -version=0x600+ ZwOpenEnlistment @ stdcall ZwOpenEvent(long long long) @ stdcall ZwOpenEventPair(ptr long ptr) @ stdcall ZwOpenFile(ptr long ptr ptr long long) @ stdcall ZwOpenIoCompletion(ptr long ptr) @ stdcall ZwOpenJobObject(ptr long ptr) @ stdcall ZwOpenKey(ptr long ptr) +@ stub -version=0x600+ ZwOpenKeyTransacted @ stdcall ZwOpenKeyedEvent(ptr long ptr) @ stdcall ZwOpenMutant(ptr long ptr) @ stdcall ZwOpenObjectAuditAlarm(ptr ptr ptr ptr ptr ptr long long ptr long long ptr) +@ stub -version=0x600+ ZwOpenPrivateNamespace @ stdcall ZwOpenProcess(ptr long ptr ptr) @ stdcall ZwOpenProcessToken(long long ptr) @ stdcall ZwOpenProcessTokenEx(long long long ptr) +@ stub -version=0x600+ ZwOpenResourceManager @ stdcall ZwOpenSection(ptr long ptr) @ stdcall ZwOpenSemaphore(long long ptr) +@ stub -version=0x600+ ZwOpenSession @ stdcall ZwOpenSymbolicLinkObject (ptr long ptr) @ stdcall ZwOpenThread(ptr long ptr ptr) @ stdcall ZwOpenThreadToken(long long long ptr) @ stdcall ZwOpenThreadTokenEx(long long long long ptr) @ stdcall ZwOpenTimer(ptr long ptr) +@ stub -version=0x600+ ZwOpenTransaction +@ stub -version=0x600+ ZwOpenTransactionManager @ stdcall ZwPlugPlayControl(ptr ptr long) @ stdcall ZwPowerInformation(long ptr long ptr long) +@ stub -version=0x600+ ZwPrePrepareComplete +@ stub -version=0x600+ ZwPrePrepareEnlistment +@ stub -version=0x600+ ZwPrepareComplete +@ stub -version=0x600+ ZwPrepareEnlistment @ stdcall ZwPrivilegeCheck(ptr ptr ptr) @ stdcall ZwPrivilegeObjectAuditAlarm(ptr ptr ptr long ptr long) @ stdcall ZwPrivilegedServiceAuditAlarm(ptr ptr ptr ptr long) +@ stub -version=0x600+ ZwPropagationComplete +@ stub -version=0x600+ ZwPropagationFailed @ stdcall ZwProtectVirtualMemory(long ptr ptr long ptr) @ stdcall ZwPulseEvent(long ptr) @ stdcall ZwQueryAttributesFile(ptr ptr) @@ -1140,16 +1584,22 @@ @ stdcall ZwQueryEvent(long long ptr long ptr) @ stdcall ZwQueryFullAttributesFile(ptr ptr) @ stdcall ZwQueryInformationAtom(long long ptr long ptr) +@ stub -version=0x600+ ZwQueryInformationEnlistment @ stdcall ZwQueryInformationFile(long ptr ptr long long) @ stdcall ZwQueryInformationJobObject(long long ptr long ptr) @ stdcall ZwQueryInformationPort(ptr long ptr long ptr) @ stdcall ZwQueryInformationProcess(long long ptr long ptr) +@ stub -version=0x600+ ZwQueryInformationResourceManager @ stdcall ZwQueryInformationThread(long long ptr long ptr) @ stdcall ZwQueryInformationToken(long long ptr long ptr) +@ stub -version=0x600+ ZwQueryInformationTransaction +@ stub -version=0x600+ ZwQueryInformationTransactionManager +@ stub -version=0x600+ ZwQueryInformationWorkerFactory @ stdcall ZwQueryInstallUILanguage(ptr) @ stdcall ZwQueryIntervalProfile(long ptr) @ stdcall ZwQueryIoCompletion(long long ptr long ptr) @ stdcall ZwQueryKey(long long ptr long ptr) +@ stub -version=0x600+ ZwQueryLicenseValue @ stdcall ZwQueryMultipleValueKey(long ptr long ptr long ptr) @ stdcall ZwQueryMutant(long long ptr long ptr) @ stdcall ZwQueryObject(long long long long long) @@ -1176,16 +1626,26 @@ @ stdcall ZwRaiseHardError(long long long ptr long ptr) @ stdcall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) +@ stub -version=0x600+ ZwReadOnlyEnlistment @ stdcall ZwReadRequestData(ptr ptr long ptr long ptr) @ stdcall ZwReadVirtualMemory(long ptr ptr long ptr) +@ stub -version=0x600+ ZwRecoverEnlistment +@ stub -version=0x600+ ZwRecoverResourceManager +@ stub -version=0x600+ ZwRecoverTransactionManager +@ stub -version=0x600+ ZwRegisterProtocolAddressInformation @ stdcall ZwRegisterThreadTerminatePort(ptr) +@ stub -version=0x600+ ZwReleaseCMFViewOwnership @ stdcall ZwReleaseKeyedEvent(ptr ptr long ptr) @ stdcall ZwReleaseMutant(long ptr) @ stdcall ZwReleaseSemaphore(long long ptr) +@ stub -version=0x600+ ZwReleaseWorkerFactoryWorker @ stdcall ZwRemoveIoCompletion(ptr ptr ptr ptr ptr) +@ stub -version=0x600+ ZwRemoveIoCompletionEx @ stdcall ZwRemoveProcessDebug(ptr ptr) @ stdcall ZwRenameKey(ptr ptr) +@ stub -version=0x600+ ZwRenameTransactionManager @ stdcall ZwReplaceKey(ptr long ptr) +@ stub -version=0x600+ ZwReplacePartitionUnit @ stdcall ZwReplyPort(ptr ptr) @ stdcall ZwReplyWaitReceivePort(ptr ptr ptr ptr) @ stdcall ZwReplyWaitReceivePortEx(ptr ptr ptr ptr ptr) @@ -1199,6 +1659,10 @@ @ stdcall ZwRestoreKey(long long long) @ stdcall ZwResumeProcess(ptr) @ stdcall ZwResumeThread(long long) +@ stub -version=0x600+ ZwRollbackComplete +@ stub -version=0x600+ ZwRollbackEnlistment +@ stub -version=0x600+ ZwRollbackTransaction +@ stub -version=0x600+ ZwRollforwardTransactionManager @ stdcall ZwSaveKey(long long) @ stdcall ZwSaveKeyEx(ptr ptr long) @ stdcall ZwSaveMergedKeys(ptr ptr ptr) @@ -1217,13 +1681,18 @@ @ stdcall ZwSetHighEventPair(ptr) @ stdcall ZwSetHighWaitLowEventPair(ptr) @ stdcall ZwSetInformationDebugObject(ptr long ptr long ptr) +@ stub -version=0x600+ ZwSetInformationEnlistment @ stdcall ZwSetInformationFile(long long long long long) @ stdcall ZwSetInformationJobObject(long long ptr long) @ stdcall ZwSetInformationKey(long long ptr long) @ stdcall ZwSetInformationObject(long long ptr long) @ stdcall ZwSetInformationProcess(long long long long) +@ stub -version=0x600+ ZwSetInformationResourceManager @ stdcall ZwSetInformationThread(long long ptr long) @ stdcall ZwSetInformationToken(long long ptr long) +@ stub -version=0x600+ ZwSetInformationTransaction +@ stub -version=0x600+ ZwSetInformationTransactionManager +@ stub -version=0x600+ ZwSetInformationWorkerFactory @ stdcall ZwSetIntervalProfile(long long) @ stdcall ZwSetIoCompletion(ptr long ptr long long) @ stdcall ZwSetLdtEntries(long int64 long int64) @@ -1243,7 +1712,9 @@ @ stdcall ZwSetValueKey(long long long long long long) @ stdcall ZwSetVolumeInformationFile(long ptr ptr long long) @ stdcall ZwShutdownSystem(long) +@ stub -version=0x600+ ZwShutdownWorkerFactory @ stdcall ZwSignalAndWaitForSingleObject(long long long ptr) +@ stub -version=0x600+ ZwSinglePhaseReject @ stdcall ZwStartProfile(ptr) @ stdcall ZwStopProfile(ptr) @ stdcall ZwSuspendProcess(ptr) @@ -1253,6 +1724,9 @@ @ stdcall ZwTerminateProcess(long long) @ stdcall ZwTerminateThread(long long) @ stdcall ZwTestAlert() +@ stub -version=0x600+ ZwThawRegistry +@ stub -version=0x600+ ZwThawTransactions +@ stub -version=0x600+ ZwTraceControl @ stdcall ZwTraceEvent(long long long ptr) @ stdcall ZwTranslateFilePath(ptr long ptr long) @ stdcall ZwUnloadDriver(ptr) @@ -1268,8 +1742,10 @@ @ stdcall ZwWaitForMultipleObjects32(long ptr long long ptr) @ stdcall ZwWaitForMultipleObjects(long ptr long long ptr) @ stdcall ZwWaitForSingleObject(long long long) +@ stub -version=0x600+ ZwWaitForWorkViaWorkerFactory @ stdcall ZwWaitHighEventPair(ptr) @ stdcall ZwWaitLowEventPair(ptr) +@ stub -version=0x600+ ZwWorkerFactoryWorkerReady @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall ZwWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) @ stdcall ZwWriteRequestData(ptr ptr long ptr long ptr) @@ -1286,11 +1762,14 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl -arch=arm __jump_unwind() +@ cdecl -stub -version=0x600+ -arch=x86_64 __misaligned_access() @ cdecl __toascii(long) @ cdecl -arch=i386 -ret64 _alldiv(double double) @ cdecl -arch=i386 _alldvrm() @ cdecl -arch=i386 -ret64 _allmul(double double) @ cdecl -arch=i386 -norelay _alloca_probe() +@ cdecl -version=0x600+ -arch=i386 _alloca_probe_16() +@ stub -version=0x600+ -arch=i386 _alloca_probe_8 @ cdecl -arch=i386 -ret64 _allrem(double double) @ cdecl -arch=i386 _allshl() @ cdecl -arch=i386 _allshr() @@ -1322,6 +1801,7 @@ @ cdecl _strlwr(str) @ cdecl _strnicmp(str str long) @ cdecl _strupr(str) +@ stub -version=0x600+ _swprintf @ cdecl -version=0x502 _tolower(long) @ cdecl -version=0x502 _toupper(long) @ cdecl _ui64toa(double ptr long) @@ -1331,6 +1811,7 @@ @ cdecl _vscwprintf(wstr ptr) @ cdecl _vsnprintf(ptr long str ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) +@ stub -version=0x600+ _vswprintf @ cdecl _wcsicmp(wstr wstr) @ cdecl _wcslwr(wstr) @ cdecl _wcsnicmp(wstr wstr long)

1 0

[reactos] 01/02: [NTDLL] Mark 2k3 only functions and improve some arch specific definitions
by Timo Kreuzer 09 Sep '20

09 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aaa7dda94565083c50074… commit aaa7dda94565083c500746452395a7e34612e467 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 21 19:31:40 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Sep 9 19:33:29 2020 +0200 [NTDLL] Mark 2k3 only functions and improve some arch specific definitions --- dll/ntdll/def/ntdll.spec | 96 +++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 00e2ee107ad..83bba18322d 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -1,11 +1,11 @@ -@ stdcall PropertyLengthAsVariant(ptr long long long) -@ stdcall RtlConvertPropertyToVariant(ptr long ptr ptr) -@ stdcall RtlConvertVariantToProperty(ptr long ptr ptr ptr long ptr) -@ fastcall RtlActivateActivationContextUnsafeFast(ptr ptr) -@ fastcall RtlDeactivateActivationContextUnsafeFast(ptr) -@ fastcall RtlInterlockedPushListSList(ptr ptr ptr long) +@ stdcall -version=0x502 PropertyLengthAsVariant(ptr long long long) +@ stdcall -version=0x502 RtlConvertPropertyToVariant(ptr long ptr ptr) +@ stdcall -version=0x502 RtlConvertVariantToProperty(ptr long ptr ptr ptr long ptr) +@ fastcall -arch=i386 RtlActivateActivationContextUnsafeFast(ptr ptr) +@ fastcall -arch=i386 RtlDeactivateActivationContextUnsafeFast(ptr) +@ fastcall -arch=i386 RtlInterlockedPushListSList(ptr ptr ptr long) @ fastcall -arch=i386 RtlUlongByteSwap(long) -@ fastcall -ret64 RtlUlonglongByteSwap(double) +@ fastcall -arch=i386 -ret64 RtlUlonglongByteSwap(double) @ fastcall -arch=i386 RtlUshortByteSwap(long) @ stdcall -arch=i386 ExpInterlockedPopEntrySListEnd() @ stdcall -arch=i386 ExpInterlockedPopEntrySListFault() @@ -21,9 +21,9 @@ @ stdcall CsrFreeCaptureBuffer(ptr) @ stdcall CsrGetProcessId() @ stdcall CsrIdentifyAlertableThread() -@ stdcall CsrNewThread() -@ stdcall CsrProbeForRead(ptr long long) -@ stdcall CsrProbeForWrite(ptr long long) +@ stdcall -version=0x502 CsrNewThread() +@ stdcall -version=0x502 CsrProbeForRead(ptr long long) +@ stdcall -version=0x502 CsrProbeForWrite(ptr long long) @ stdcall CsrSetPriorityClass(ptr ptr) @ stdcall DbgBreakPoint() @ varargs DbgPrint(str) @@ -43,39 +43,39 @@ @ stdcall DbgUiStopDebugging(ptr) @ stdcall DbgUiWaitStateChange(ptr ptr) @ stdcall DbgUserBreakPoint() -@ stdcall EtwControlTraceA(double str ptr long) -@ stdcall EtwControlTraceW(double wstr ptr long) +@ stdcall -version=0x502 EtwControlTraceA(double str ptr long) +@ stdcall -version=0x502 EtwControlTraceW(double wstr ptr long) @ stdcall -stub EtwCreateTraceInstanceId(ptr ptr) -@ stdcall EtwEnableTrace(long long long ptr double) -@ stdcall -stub EtwEnumerateTraceGuids(ptr long ptr) -@ stdcall EtwFlushTraceA(double str ptr) -@ stdcall EtwFlushTraceW(double wstr ptr) +@ stdcall -version=0x502 EtwEnableTrace(long long long ptr double) +@ stdcall -stub -version=0x502 EtwEnumerateTraceGuids(ptr long ptr) +@ stdcall -version=0x502 EtwFlushTraceA(double str ptr) +@ stdcall -version=0x502 EtwFlushTraceW(double wstr ptr) @ stdcall EtwGetTraceEnableFlags(double) @ stdcall EtwGetTraceEnableLevel(double) @ stdcall EtwGetTraceLoggerHandle(ptr) -@ stdcall -stub EtwNotificationRegistrationA(ptr long ptr long long) -@ stdcall -stub EtwNotificationRegistrationW(ptr long ptr long long) -@ stdcall EtwQueryAllTracesA(ptr long ptr) -@ stdcall EtwQueryAllTracesW(ptr long ptr) -@ stdcall EtwQueryTraceA(double str ptr) -@ stdcall EtwQueryTraceW(double wstr ptr) -@ stdcall -stub EtwReceiveNotificationsA(long long long long) -@ stdcall -stub EtwReceiveNotificationsW(long long long long) +@ stdcall -stub -version=0x502 EtwNotificationRegistrationA(ptr long ptr long long) +@ stdcall -stub -version=0x502 EtwNotificationRegistrationW(ptr long ptr long long) +@ stdcall -version=0x502 EtwQueryAllTracesA(ptr long ptr) +@ stdcall -version=0x502 EtwQueryAllTracesW(ptr long ptr) +@ stdcall -version=0x502 EtwQueryTraceA(double str ptr) +@ stdcall -version=0x502 EtwQueryTraceW(double wstr ptr) +@ stdcall -stub -version=0x502 EtwReceiveNotificationsA(long long long long) +@ stdcall -stub -version=0x502 EtwReceiveNotificationsW(long long long long) @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) -@ stdcall EtwStartTraceA(ptr str ptr) -@ stdcall EtwStartTraceW(ptr wstr ptr) -@ stdcall EtwStopTraceA(double str ptr) -@ stdcall EtwStopTraceW(double wstr ptr) -@ stdcall EtwTraceEvent(double ptr) +@ stdcall -version=0x502 EtwStartTraceA(ptr str ptr) +@ stdcall -version=0x502 EtwStartTraceW(ptr wstr ptr) +@ stdcall -version=0x502 EtwStopTraceA(double str ptr) +@ stdcall -version=0x502 EtwStopTraceW(double wstr ptr) +@ stdcall -version=0x502 EtwTraceEvent(double ptr) @ stdcall -stub EtwTraceEventInstance(double ptr ptr ptr) @ varargs EtwTraceMessage(ptr long ptr long) @ stdcall -stub EtwTraceMessageVa(double long ptr long ptr) @ stdcall EtwUnregisterTraceGuids(double) -@ stdcall EtwUpdateTraceA(double str ptr) -@ stdcall EtwUpdateTraceW(double wstr ptr) -@ stdcall -stub EtwpGetTraceBuffer(long long long long) -@ stdcall -stub EtwpSetHWConfigFunction(ptr long) +@ stdcall -version=0x502 EtwUpdateTraceA(double str ptr) +@ stdcall -version=0x502 EtwUpdateTraceW(double wstr ptr) +@ stdcall -stub -version=0x502 EtwpGetTraceBuffer(long long long long) +@ stdcall -stub -version=0x502 EtwpSetHWConfigFunction(ptr long) @ stdcall -arch=x86_64 ExpInterlockedPopEntrySListEnd() @ stdcall -arch=x86_64 ExpInterlockedPopEntrySListFault() @ stdcall -arch=x86_64 ExpInterlockedPopEntrySListResume() @@ -86,16 +86,16 @@ @ stdcall KiUserApcDispatcher(ptr ptr ptr ptr) @ stdcall KiUserCallbackDispatcher(ptr ptr long) ; CHECKME @ stdcall KiUserExceptionDispatcher(ptr ptr) -@ stdcall LdrAccessOutOfProcessResource(ptr ptr ptr ptr ptr) +@ stdcall -version=0x502 LdrAccessOutOfProcessResource(ptr ptr ptr ptr ptr) @ stdcall LdrAccessResource(long ptr ptr ptr) @ stdcall LdrAddRefDll(long ptr) -@ stdcall LdrAlternateResourcesEnabled() -@ stdcall LdrCreateOutOfProcessImage(long ptr ptr ptr) -@ stdcall LdrDestroyOutOfProcessImage(ptr) +@ stdcall -version=0x502 LdrAlternateResourcesEnabled() +@ stdcall -version=0x502 LdrCreateOutOfProcessImage(long ptr ptr ptr) +@ stdcall -version=0x502 LdrDestroyOutOfProcessImage(ptr) @ stdcall LdrDisableThreadCalloutsForDll(long) @ stdcall LdrEnumResources(ptr ptr long ptr ptr) @ stdcall LdrEnumerateLoadedModules(long ptr long) -@ stdcall LdrFindCreateProcessManifest(long ptr ptr long ptr) ; 5.1 and 5.2 only +@ stdcall -version=0x501-0x502 LdrFindCreateProcessManifest(long ptr ptr long ptr) @ stdcall LdrFindEntryForAddress(ptr ptr) @ stdcall LdrFindResourceDirectory_U(long ptr long ptr) @ stdcall -stub LdrFindResourceEx_U(ptr ptr ptr ptr ptr) ; 5.1 and higher @@ -437,6 +437,7 @@ @ stdcall RtlAcquireResourceShared(ptr long) @ stdcall RtlActivateActivationContext(long ptr ptr) @ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) +@ stdcall -arch=x86_64 RtlActivateActivationContextUnsafeFast(ptr ptr) @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) @ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @@ -484,7 +485,7 @@ @ stdcall -stub -arch=i386 RtlCaptureStackContext(ptr ptr ptr) @ stdcall RtlCharToInteger(ptr long ptr) @ stdcall RtlCheckForOrphanedCriticalSections(ptr) -@ stdcall -stub RtlCheckProcessParameters(ptr ptr ptr ptr) +@ stdcall -stub -version=0x502 RtlCheckProcessParameters(ptr ptr ptr ptr) @ stdcall RtlCheckRegistryKey(long ptr) @ stdcall RtlClearAllBits(ptr) @ stdcall RtlClearBits(ptr long long) @@ -528,7 +529,7 @@ @ stdcall RtlCreateQueryDebugBuffer(long long) @ stdcall RtlCreateRegistryKey(long wstr) @ stdcall RtlCreateSecurityDescriptor(ptr long) -@ stdcall RtlCreateServiceSid(ptr ptr ptr) +@ stdcall RtlCreateServiceSid(ptr ptr ptr) # Exists in Windows 2003 SP 2 @ stdcall RtlCreateSystemVolumeInformationFolder(ptr) @ stdcall RtlCreateTagHeap(ptr long str str) @ stdcall RtlCreateTimer(ptr ptr ptr ptr long long long) @@ -542,6 +543,7 @@ @ stdcall RtlCutoverTimeToSystemTime(ptr ptr ptr long) @ stdcall RtlDeNormalizeProcessParams(ptr) @ stdcall RtlDeactivateActivationContext(long long) +@ stdcall -arch=x86_64 RtlDeactivateActivationContextUnsafeFast(ptr) @ stdcall -stub RtlDebugPrintTimes() @ stdcall RtlDecodePointer(ptr) @ stdcall RtlDecodeSystemPointer(ptr) @@ -609,7 +611,7 @@ @ stdcall RtlEraseUnicodeString(ptr) @ stdcall RtlExitUserThread(long) @ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr) -@ stdcall RtlExtendHeap(ptr long ptr ptr) +@ stdcall -version=0x502 RtlExtendHeap(ptr long ptr ptr) @ stdcall -arch=win32 -ret64 RtlExtendedIntegerMultiply(double long) @ stdcall -arch=win32 -ret64 RtlExtendedLargeIntegerDivide(double long ptr) @ stdcall -arch=win32 -ret64 RtlExtendedMagicDivide(double double long) @@ -644,7 +646,7 @@ @ stdcall RtlFreeSid(long) @ stdcall RtlFreeThreadActivationContextStack() @ stdcall RtlFreeUnicodeString(ptr) -@ stdcall RtlFreeUserThreadStack(ptr ptr) ; 4.0 to 5.2 only +@ stdcall -version=0x502 RtlFreeUserThreadStack(ptr ptr) @ stdcall RtlGUIDFromString(ptr ptr) @ stdcall RtlGenerate8dot3Name(ptr ptr long ptr) @ stdcall RtlGetAce(ptr long ptr) @@ -723,6 +725,7 @@ @ stdcall RtlInterlockedFlushSList(ptr) @ stdcall RtlInterlockedPopEntrySList(ptr) @ stdcall RtlInterlockedPushEntrySList(ptr ptr) +@ stdcall -arch=x86_64 RtlInterlockedPushListSList(ptr ptr ptr long) @ stdcall RtlIpv4AddressToStringA(ptr ptr) @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) @@ -773,6 +776,7 @@ @ stdcall RtlLookupElementGenericTableFull(ptr ptr ptr long) @ stdcall RtlLookupElementGenericTableFullAvl(ptr ptr ptr long) @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) +@ stdcall -arch=x86_64 RtlLookupFunctionTable(int64 ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) @ stdcall RtlMapGenericMask(long ptr) @ stdcall RtlMapSecurityErrorToNtStatus(long) @@ -884,7 +888,7 @@ @ stdcall RtlSetTimeZoneInformation(ptr) @ stdcall RtlSetTimer(ptr ptr ptr ptr long long long) @ stdcall RtlSetUnhandledExceptionFilter(ptr) -@ stdcall -stub RtlSetUnicodeCallouts(ptr) +@ stdcall -stub -version=0x502 RtlSetUnicodeCallouts(ptr) @ stdcall RtlSetUserFlagsHeap(ptr long ptr long long) @ stdcall RtlSetUserValueHeap(ptr long ptr ptr) @ stdcall RtlSizeHeap(long long ptr) @@ -940,7 +944,7 @@ @ stdcall RtlUpdateTimer(ptr ptr long long) @ stdcall RtlUpperChar(long) @ stdcall RtlUpperString(ptr ptr) -@ stdcall RtlUsageHeap(ptr long ptr) +@ stdcall -version=0x502 RtlUsageHeap(ptr long ptr) @ stdcall RtlValidAcl(ptr) @ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) @ stdcall RtlValidSecurityDescriptor(ptr) @@ -1318,8 +1322,8 @@ @ cdecl _strlwr(str) @ cdecl _strnicmp(str str long) @ cdecl _strupr(str) -@ cdecl _tolower(long) -@ cdecl _toupper(long) +@ cdecl -version=0x502 _tolower(long) +@ cdecl -version=0x502 _toupper(long) @ cdecl _ui64toa(double ptr long) @ cdecl _ui64tow(double ptr long) @ cdecl _ultoa(long ptr long)

1 0

[reactos] 01/01: [BOOT][DIRECTX][SHELL32] Unneeded semicolons (trivial) (#3133)
by Kyle Katarn 08 Sep '20

08 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7fd62d4786725a95e804… commit d7fd62d4786725a95e804b6e210fb310593fd1a2 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue Sep 8 21:57:13 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 8 21:57:13 2020 +0200 [BOOT][DIRECTX][SHELL32] Unneeded semicolons (trivial) (#3133) Except in 3rd-party code. CORE-13162 --- boot/environ/lib/mm/pagealloc.c | 2 +- dll/directx/msvidctl/tuningspace_container.cpp | 2 +- dll/win32/shell32/COpenWithMenu.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/environ/lib/mm/pagealloc.c b/boot/environ/lib/mm/pagealloc.c index 4642552f88e..62e2175cafc 100644 --- a/boot/environ/lib/mm/pagealloc.c +++ b/boot/environ/lib/mm/pagealloc.c @@ -1589,7 +1589,7 @@ MmPaReserveSelfMapPages ( Request.Pages = PageCount; Request.Alignment = Alignment; Request.Type = BL_MM_REQUEST_DEFAULT_TYPE; - Request.Flags = 0;; + Request.Flags = 0; Status = MmPaAllocatePages(&MmMdlUnmappedUnallocated, &Descriptor, &MmMdlUnmappedUnallocated, diff --git a/dll/directx/msvidctl/tuningspace_container.cpp b/dll/directx/msvidctl/tuningspace_container.cpp index 59451f8fa73..1733e2fc8f7 100644 --- a/dll/directx/msvidctl/tuningspace_container.cpp +++ b/dll/directx/msvidctl/tuningspace_container.cpp @@ -205,7 +205,7 @@ CTuningSpaceContainer::Add(ITuningSpace *TuningSpace, VARIANT *NewIndex) TuningSpace->AddRef(); NewIndex->vt = VT_BSTR; InterlockedIncrement(&m_Ref); - return TuningSpace->get_FriendlyName(&NewIndex->bstrVal);; + return TuningSpace->get_FriendlyName(&NewIndex->bstrVal); } HRESULT STDMETHODCALLTYPE diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index 2ad593bc559..3afb60c65f1 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -111,7 +111,7 @@ COpenWithList::~COpenWithList() BOOL COpenWithList::Load() { HKEY hKey; - WCHAR wszName[256], wszBuf[100];; + WCHAR wszName[256], wszBuf[100]; DWORD i = 0, cchName, dwSize; SApp *pApp;

1 0

[reactos] 01/01: [EXPLORER] Registry key not closed on error (#3136)
by Kyle Katarn 08 Sep '20

08 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d54e50f3dcfd89604504c… commit d54e50f3dcfd89604504cdebb072c6be6d5b1a78 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue Sep 8 21:55:45 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 8 21:55:45 2020 +0200 [EXPLORER] Registry key not closed on error (#3136) CORE-14519 --- base/shell/explorer/shellservice.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/shellservice.cpp b/base/shell/explorer/shellservice.cpp index 2aded3050a0..459e9084cef 100644 --- a/base/shell/explorer/shellservice.cpp +++ b/base/shell/explorer/shellservice.cpp @@ -115,17 +115,18 @@ HRESULT InitShellServices(HDPA * phdpa) goto cleanup; } - RegCloseKey(hkey); - /* Initialize */ DPA_EnumCallback(hdpa, InitializeAllCallback, &hr); if (FAILED_UNEXPECTEDLY(hr)) goto cleanup; + RegCloseKey(hkey); + *phdpa = hdpa; return count > 0 ? S_OK : S_FALSE; cleanup: + RegCloseKey(hkey); *phdpa = NULL; ShutdownShellServices(hdpa); return hr;

1 0

[reactos] 01/01: [SOLITAIRE] French translation update (#3138)
by Kyle Katarn 08 Sep '20

08 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c7ccf4bc9b1808590a8a… commit 2c7ccf4bc9b1808590a8a0a1fe28912893dbe590 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue Sep 8 21:52:24 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 8 21:52:24 2020 +0200 [SOLITAIRE] French translation update (#3138) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/applications/games/solitaire/lang/fr-FR.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/games/solitaire/lang/fr-FR.rc b/base/applications/games/solitaire/lang/fr-FR.rc index 9f83c7268b8..f1f874719cd 100644 --- a/base/applications/games/solitaire/lang/fr-FR.rc +++ b/base/applications/games/solitaire/lang/fr-FR.rc @@ -18,13 +18,13 @@ BEGIN GROUPBOX "Cartes", -1, 7, 7, 90, 40 AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "En tirer trois", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 - GROUPBOX "Scoring", -1, 100, 7, 75, 53 + GROUPBOX "Score", -1, 100, 7, 75, 53 AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10 - AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10 + AUTORADIOBUTTON "&Aucun", IDC_OPT_NOSCORE, 107, 45, 60, 10 AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP AUTOCHECKBOX "Barre de s&tatut", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP - AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP + AUTOCHECKBOX "&Score cumulatif", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 END @@ -59,8 +59,8 @@ BEGIN IDS_SOL_QUIT "Quitter le jeu actuel ?" IDS_SOL_WIN "Félicitations ! Vous avez gagné !" IDS_SOL_DEAL "Redistribuer ?" - IDS_SOL_SCORE "Score: %d" - IDS_SOL_TIME "Time: %d" + IDS_SOL_SCORE "Score : %d" + IDS_SOL_TIME "Temps : %d" END /* Menus */

1 0

[reactos] 01/01: [Printing] Fix Typos and Test Regressions
by James Tabor 08 Sep '20

08 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ca217621dc88cc9c584f… commit 3ca217621dc88cc9c584f9da9ba47f34622c40f9 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Sep 8 13:15:16 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Sep 8 13:15:16 2020 -0500 [Printing] Fix Typos and Test Regressions Fix WinSpool API regressions. Fix typos and debug prints. --- win32ss/printing/base/winspool/printers.c | 4 +++- win32ss/printing/monitors/localmon/xcv.c | 4 ++-- win32ss/printing/providers/localspl/main.c | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index dfff8223a87..31865fd7afc 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -582,7 +582,7 @@ DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pO { if (!IsValidDevmodeNoSizeW( (PDEVMODEW)pDevMode ) ) { - ERR("DeviceCapabilitiesW : Devode Invalid"); + ERR("DeviceCapabilitiesW : Devode Invalid\n"); return -1; } } @@ -916,7 +916,9 @@ DocumentPropertySheets( PPROPSHEETUI_INFO pCPSUIInfo, LPARAM lparam ) if ( fpDocumentPropertySheets ) { + FIXME("DPS : fpDocumentPropertySheets(%p, 0x%lx) pdmOut %p\n", pCPSUIInfo, lparam, pdphdr->pdmOut); Result = fpDocumentPropertySheets( pCPSUIInfo, lparam ); + FIXME("DPS : fpDocumentPropertySheets result %d cbOut %d\n",Result, pdphdr->cbOut); } else { diff --git a/win32ss/printing/monitors/localmon/xcv.c b/win32ss/printing/monitors/localmon/xcv.c index 25635c37e7d..1aeb4abe466 100644 --- a/win32ss/printing/monitors/localmon/xcv.c +++ b/win32ss/printing/monitors/localmon/xcv.c @@ -513,7 +513,7 @@ LocalmonXcvClosePort(HANDLE hXcv) } // Remove it from the list and free the memory. - LeaveCriticalSection(&pXcv->pLocalmon->Section); + EnterCriticalSection(&pXcv->pLocalmon->Section); RemoveEntryList(&pXcv->Entry); LeaveCriticalSection(&pXcv->pLocalmon->Section); DllFreeSplMem(pXcv); @@ -570,7 +570,7 @@ LocalmonXcvOpenPort(HANDLE hMonitor, PCWSTR pwszObject, ACCESS_MASK GrantedAcces PLOCALMON_HANDLE pLocalmon = (PLOCALMON_HANDLE)hMonitor; PLOCALMON_XCV pXcv; - TRACE("LocalmonXcvOpenPort(%p, %S, %lu, %p)\n", hMonitor, pwszObject, GrantedAccess, phXcv); + FIXME("LocalmonXcvOpenPort(%p, %S, %lu, %p)\n", hMonitor, pwszObject, GrantedAccess, phXcv); // Sanity checks if (!pLocalmon || !phXcv) diff --git a/win32ss/printing/providers/localspl/main.c b/win32ss/printing/providers/localspl/main.c index ba563a7c511..a8d6118e1bc 100644 --- a/win32ss/printing/providers/localspl/main.c +++ b/win32ss/printing/providers/localspl/main.c @@ -25,9 +25,9 @@ const DWORD dwSpoolerMinorVersion = 0; const WCHAR wszDefaultDocumentName[] = L"Local Downlevel Document"; PCWSTR wszPrintProviderInfo[3] = { - L"Windows NT Local Printers", // Description L"Windows NT Local Print Providor", // Name - L"Locally connected Printers" // Comment + L"Locally connected Printers", // Comment + L"Windows NT Local Printers" // Description }; // Local Constants

1 0

[reactos] 01/01: [GDI32] Force Return if other Type of Device Requested
by James Tabor 08 Sep '20

08 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8313483202b2fc89a6888… commit 8313483202b2fc89a6888cd067eb0f10d36e99c8 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Sep 8 12:52:28 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Sep 8 12:52:28 2020 -0500 [GDI32] Force Return if other Type of Device Requested Fix CORE-17241 assert. --- win32ss/gdi/gdi32/objects/dc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/objects/dc.c b/win32ss/gdi/gdi32/objects/dc.c index bde7f2377a4..91df2a90984 100644 --- a/win32ss/gdi/gdi32/objects/dc.c +++ b/win32ss/gdi/gdi32/objects/dc.c @@ -53,10 +53,12 @@ IntCreateDICW( if (lpwszOutput) RtlInitUnicodeString(&Output, lpwszOutput); + // Handle Print device or something else. if (!Display) { - //Handle Print device or something else. + // WIP - GDI Print Commit coming in soon. DPRINT1("Not a DISPLAY device! %wZ\n", &Device); + return NULL; // Return NULL until then..... } hdc = NtGdiOpenDCW((Default ? NULL : &Device),

1 0

[reactos] 01/01: [NTOS:IO] Fix a reference leak in IopSynchronousCall on failure case
by Victor Perevertkin 08 Sep '20

08 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32c7c1157d64edd0f2e51… commit 32c7c1157d64edd0f2e512644e518abfcc372542 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Sep 8 14:51:20 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Sep 8 14:51:20 2020 +0300 [NTOS:IO] Fix a reference leak in IopSynchronousCall on failure case Co-authored-by: Vadim Galyant <vgal(a)rambler.ru> --- ntoskrnl/io/pnpmgr/pnpmgr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 7ed3eee62a0..ac9d71a9b99 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -563,7 +563,11 @@ IopSynchronousCall(IN PDEVICE_OBJECT DeviceObject, /* Allocate an IRP */ Irp = IoAllocateIrp(TopDeviceObject->StackSize, FALSE); - if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; + if (!Irp) + { + ObDereferenceObject(TopDeviceObject); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Initialize to failure */ Irp->IoStatus.Status = IoStatusBlock.Status = STATUS_NOT_SUPPORTED;

1 0

[reactos] 03/03: [CABMAN] Ensure we are minimally building with c++11
by Mark Jansen 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bd9c9d5a4348c884b7a9… commit 9bd9c9d5a4348c884b7a980f929bb2f68aa442cb Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 3 18:13:21 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 7 22:16:42 2020 +0200 [CABMAN] Ensure we are minimally building with c++11 --- sdk/tools/cabman/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/tools/cabman/CMakeLists.txt b/sdk/tools/cabman/CMakeLists.txt index 2f6f05ca5da..807c2990451 100644 --- a/sdk/tools/cabman/CMakeLists.txt +++ b/sdk/tools/cabman/CMakeLists.txt @@ -17,3 +17,4 @@ list(APPEND SOURCE add_host_tool(cabman ${SOURCE}) target_link_libraries(cabman PRIVATE host_includes zlibhost) +set_property(TARGET cabman PROPERTY CXX_STANDARD 11)

1 0

[reactos] 02/03: [CABMAN] Move CCFDATAStorage to a separate header
by Mark Jansen 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63f3275d154e7a91d74ad… commit 63f3275d154e7a91d74adcbf3cdba7210257b528 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 30 20:38:43 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 7 22:16:42 2020 +0200 [CABMAN] Move CCFDATAStorage to a separate header --- sdk/tools/cabman/CCFDATAStorage.cxx | 6 +++--- sdk/tools/cabman/CCFDATAStorage.h | 34 ++++++++++++++++++++++++++++++++++ sdk/tools/cabman/CMakeLists.txt | 3 ++- sdk/tools/cabman/cabinet.cxx | 1 + sdk/tools/cabman/cabinet.h | 25 +------------------------ 5 files changed, 41 insertions(+), 28 deletions(-) diff --git a/sdk/tools/cabman/CCFDATAStorage.cxx b/sdk/tools/cabman/CCFDATAStorage.cxx index b1790791c0b..c120af09f4a 100644 --- a/sdk/tools/cabman/CCFDATAStorage.cxx +++ b/sdk/tools/cabman/CCFDATAStorage.cxx @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS cabinet manager * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: CCFDATAStorage class implementation for Linux/Unix + * PURPOSE: CCFDATAStorage class implementation * COPYRIGHT: Copyright 2017 Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Copyright 2017 Colin Finck <mail(a)colinfinck.de> - * Copyright 2018 Dmitry Bagdanov <dimbo_job(a)mail.ru> + * Copyright 2018 Dmitry Bagdanov <dimbo_job(a)mail.ru> */ #include <stdio.h> #include <stdlib.h> @@ -16,7 +16,7 @@ #include <dirent.h> #endif -#include "cabinet.h" +#include "CCFDATAStorage.h" #include "raw.h" #include "mszip.h" diff --git a/sdk/tools/cabman/CCFDATAStorage.h b/sdk/tools/cabman/CCFDATAStorage.h new file mode 100644 index 00000000000..2382469636c --- /dev/null +++ b/sdk/tools/cabman/CCFDATAStorage.h @@ -0,0 +1,34 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS cabinet manager + * FILE: tools/cabman/cabman.h + * PURPOSE: Cabinet manager header + */ + +#pragma once + +#include "cabinet.h" + +#ifndef CAB_READ_ONLY + +class CCFDATAStorage +{ +public: + /* Default constructor */ + CCFDATAStorage(); + /* Default destructor */ + virtual ~CCFDATAStorage(); + ULONG Create(); + ULONG Destroy(); + ULONG Truncate(); + ULONG Position(); + ULONG Seek(LONG Position); + ULONG ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead); + ULONG WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten); +private: + char FullName[PATH_MAX]; + FILE* FileHandle; +}; + +#endif /* CAB_READ_ONLY */ + diff --git a/sdk/tools/cabman/CMakeLists.txt b/sdk/tools/cabman/CMakeLists.txt index 16464fb9ab2..2f6f05ca5da 100644 --- a/sdk/tools/cabman/CMakeLists.txt +++ b/sdk/tools/cabman/CMakeLists.txt @@ -12,7 +12,8 @@ list(APPEND SOURCE mszip.h raw.cxx raw.h - CCFDATAStorage.cxx) + CCFDATAStorage.cxx + CCFDATAStorage.h) add_host_tool(cabman ${SOURCE}) target_link_libraries(cabman PRIVATE host_includes zlibhost) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 1f0d2766a12..1db3ce4e07a 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -24,6 +24,7 @@ # include <sys/types.h> #endif #include "cabinet.h" +#include "CCFDATAStorage.h" #include "raw.h" #include "mszip.h" diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index d47f87893cd..a78d3553d6d 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -308,29 +308,6 @@ public: /* Classes */ -#ifndef CAB_READ_ONLY - -class CCFDATAStorage -{ -public: - /* Default constructor */ - CCFDATAStorage(); - /* Default destructor */ - virtual ~CCFDATAStorage(); - ULONG Create(); - ULONG Destroy(); - ULONG Truncate(); - ULONG Position(); - ULONG Seek(LONG Position); - ULONG ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead); - ULONG WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten); -private: - char FullName[PATH_MAX]; - FILE* FileHandle; -}; - -#endif /* CAB_READ_ONLY */ - class CCabinet { public: @@ -508,7 +485,7 @@ private: bool CreateNewDisk; bool CreateNewFolder; - CCFDATAStorage *ScratchFile; + class CCFDATAStorage *ScratchFile; FILE* SourceFile; bool ContinueFile; ULONG TotalBytesLeft;

1 0

[reactos] 01/03: [CABMAN] Replace some dynamically allocated strings with std::string CORE-17231
by Mark Jansen 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7394d12f7e3c0ecdc4ff3… commit 7394d12f7e3c0ecdc4ff3a0e853fd71723f5fb81 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 30 15:31:04 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 7 22:16:28 2020 +0200 [CABMAN] Replace some dynamically allocated strings with std::string CORE-17231 --- sdk/tools/cabman/CMakeLists.txt | 9 +- sdk/tools/cabman/cabinet.cxx | 264 ++++++++++-------------------- sdk/tools/cabman/cabinet.h | 116 +++++++------ sdk/tools/cabman/{main.cxx => cabman.cxx} | 31 ++-- sdk/tools/cabman/cabman.h | 12 +- sdk/tools/cabman/dfp.cxx | 33 ++-- sdk/tools/cabman/dfp.h | 6 +- sdk/tools/cabman/mszip.h | 4 +- sdk/tools/cabman/raw.h | 4 +- 9 files changed, 204 insertions(+), 275 deletions(-) diff --git a/sdk/tools/cabman/CMakeLists.txt b/sdk/tools/cabman/CMakeLists.txt index 938478b57bb..16464fb9ab2 100644 --- a/sdk/tools/cabman/CMakeLists.txt +++ b/sdk/tools/cabman/CMakeLists.txt @@ -1,10 +1,17 @@ +#add_definitions(-DDBG) + list(APPEND SOURCE cabinet.cxx + cabinet.h dfp.cxx - main.cxx + dfp.h + cabman.cxx + cabman.h mszip.cxx + mszip.h raw.cxx + raw.h CCFDATAStorage.cxx) add_host_tool(cabman ${SOURCE}) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 64888daea2b..1f0d2766a12 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -77,8 +77,6 @@ CCabinet::CCabinet() *DiskPrev = '\0'; *CabinetNext = '\0'; *DiskNext = '\0'; - *DestPath = '\0'; - *CabinetReservedFile = '\0'; FileOpen = false; CabinetReservedFileBuffer = NULL; @@ -139,7 +137,7 @@ bool CCabinet::IsSeparator(char Char) return false; } -char* CCabinet::ConvertPath(char* Path, bool Allocate) +void CCabinet::ConvertPath(std::string& Path) /* * FUNCTION: Replaces \ or / with the one used by the host environment * ARGUMENTS: @@ -150,37 +148,20 @@ char* CCabinet::ConvertPath(char* Path, bool Allocate) * Pointer to new path */ { - char *newpath; - int i; - - if (Allocate) - newpath = strdup(Path); - else - newpath = Path; - - i = 0; - while (Path[i] != 0) + for (size_t i = 0; i < Path.size(); ++i) { #if defined(_WIN32) if (Path[i] == '/') - newpath[i] = '\\'; - else + Path[i] = '\\'; #else if (Path[i] == '\\') - newpath[i] = '/'; - else + Path[i] = '/'; #endif - newpath[i] = Path[i]; - - i++; } - newpath[i] = 0; - - return(newpath); } -char* CCabinet::GetFileName(char* Path) +const char* CCabinet::GetFileName(const char* Path) /* * FUNCTION: Returns a pointer to file name * ARGUMENTS: @@ -201,49 +182,18 @@ char* CCabinet::GetFileName(char* Path) } -void CCabinet::RemoveFileName(char* Path) -/* - * FUNCTION: Removes a file name from a path - * ARGUMENTS: - * Path = Pointer to string with path - */ -{ - char* FileName; - ULONG i; - - i = (Path [0] ? (Path[1] == ':' ? 2 : 0) : 0); - FileName = GetFileName(Path + i); - - if ((FileName != (Path + i)) && (IsSeparator(FileName [-1]))) - FileName--; - if ((FileName == (Path + i)) && (IsSeparator(FileName [0]))) - FileName++; - FileName[0] = 0; -} - - -bool CCabinet::NormalizePath(char* Path, - ULONG Length) +void CCabinet::NormalizePath(std::string& Path) /* * FUNCTION: Normalizes a path * ARGUMENTS: - * Path = Pointer to string with pathname - * Length = Number of bytes in Path - * RETURNS: - * true if there was enough room in Path, or false + * Path = string with pathname */ { - ULONG n; - bool OK = true; - - if ((n = (ULONG)strlen(Path)) && - (!IsSeparator(Path[n - 1])) && - (OK = ((n + 1) < Length))) + if (Path.length() > 0) { - Path[n] = DIR_SEPARATOR_CHAR; - Path[n + 1] = 0; + if (!IsSeparator(Path[Path.length() - 1])) + Path += DIR_SEPARATOR_CHAR; } - return OK; } @@ -258,7 +208,7 @@ char* CCabinet::GetCabinetName() } -void CCabinet::SetCabinetName(char* FileName) +void CCabinet::SetCabinetName(const char* FileName) /* * FUNCTION: Sets cabinet file name * ARGUMENTS: @@ -269,20 +219,19 @@ void CCabinet::SetCabinetName(char* FileName) } -void CCabinet::SetDestinationPath(char* DestinationPath) +void CCabinet::SetDestinationPath(const char* DestinationPath) /* * FUNCTION: Sets destination path * ARGUMENTS: * DestinationPath = Pointer to string with name of destination path */ { - strcpy(DestPath, DestinationPath); - ConvertPath(DestPath, false); - if (strlen(DestPath) > 0) - NormalizePath(DestPath, PATH_MAX); + DestPath = DestinationPath; + ConvertPath(DestPath); + NormalizePath(DestPath); } -ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) +ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) /* * FUNCTION: Adds a criteria to the search criteria list * ARGUMENTS: @@ -294,7 +243,7 @@ ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) PSEARCH_CRITERIA Criteria; // Add the criteria to the list of search criteria - Criteria = (PSEARCH_CRITERIA)malloc(sizeof(SEARCH_CRITERIA)); + Criteria = new SEARCH_CRITERIA; if(!Criteria) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -312,14 +261,7 @@ ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) CriteriaListTail = Criteria; // Set the actual criteria string - Criteria->Search = (char*)malloc(strlen(SearchCriteria) + 1); - if (!Criteria->Search) - { - DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - return CAB_STATUS_NOMEMORY; - } - - strcpy(Criteria->Search, SearchCriteria); + Criteria->Search = SearchCriteria; return CAB_STATUS_SUCCESS; } @@ -338,8 +280,7 @@ void CCabinet::DestroySearchCriteria() { NextCriteria = Criteria->Next; - free(Criteria->Search); - free(Criteria); + delete Criteria; Criteria = NextCriteria; } @@ -358,7 +299,7 @@ bool CCabinet::HasSearchCriteria() return (CriteriaListHead != NULL); } -bool CCabinet::SetCompressionCodec(char* CodecName) +bool CCabinet::SetCompressionCodec(const char* CodecName) /* * FUNCTION: Selects the codec to use for compression * ARGUMENTS: @@ -378,18 +319,18 @@ bool CCabinet::SetCompressionCodec(char* CodecName) return true; } -char* CCabinet::GetDestinationPath() +const char* CCabinet::GetDestinationPath() /* * FUNCTION: Returns destination path * RETURNS: * Pointer to string with name of destination path */ { - return DestPath; + return DestPath.c_str(); } -bool CCabinet::SetCabinetReservedFile(char* FileName) +bool CCabinet::SetCabinetReservedFile(const char* FileName) /* * FUNCTION: Sets cabinet reserved file * ARGUMENTS: @@ -398,12 +339,12 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) { FILE* FileHandle; ULONG BytesRead; - char* ConvertedFileName; + std::string ConvertedFileName; - ConvertedFileName = ConvertPath(FileName, true); + ConvertedFileName = FileName; + ConvertPath(ConvertedFileName); - FileHandle = fopen(ConvertedFileName, "rb"); - free(ConvertedFileName); + FileHandle = fopen(ConvertedFileName.c_str(), "rb"); if (FileHandle == NULL) { DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); @@ -440,23 +381,12 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) fclose(FileHandle); - strcpy(CabinetReservedFile, FileName); + CabinetReservedFile = FileName; return true; } -char* CCabinet::GetCabinetReservedFile() -/* - * FUNCTION: Returns cabionet reserved file - * RETURNS: - * Pointer to string with name of cabinet reserved file - */ -{ - return CabinetReservedFile; -} - - ULONG CCabinet::GetCurrentDiskNumber() /* * FUNCTION: Returns current disk number @@ -673,7 +603,7 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) (Search->Next->File.FileOffset <= LastFileOffset)) { DPRINT(MAX_TRACE, ("Skipping file (%s) FileOffset (0x%X) LastFileOffset (0x%X).\n", - Search->Next->FileName, (UINT)Search->Next->File.FileOffset, (UINT)LastFileOffset)); + Search->Next->FileName.c_str(), (UINT)Search->Next->File.FileOffset, (UINT)LastFileOffset)); Search->Next = Search->Next->Next; } @@ -692,7 +622,7 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) while(Criteria) { - if(MatchFileNamePattern(Search->Next->FileName, Criteria->Search)) + if(MatchFileNamePattern(Search->Next->FileName.c_str(), Criteria->Search.c_str())) { bFound = true; break; @@ -736,7 +666,7 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) } -ULONG CCabinet::ExtractFile(char* FileName) +ULONG CCabinet::ExtractFile(const char* FileName) /* * FUNCTION: Extracts a file from the cabinet * ARGUMENTS: @@ -796,7 +726,7 @@ ULONG CCabinet::ExtractFile(char* FileName) (UINT)File->DataBlock->AbsoluteOffset, (UINT)File->DataBlock->UncompOffset)); - strcpy(DestName, DestPath); + strcpy(DestName, DestPath.c_str()); strcat(DestName, FileName); /* Create destination file, fail if it already exists */ @@ -1302,10 +1232,10 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) if (!ContinueFile) { /* Try to open file */ - SourceFile = fopen(FileNode->FileName, "rb"); + SourceFile = fopen(FileNode->FileName.c_str(), "rb"); if (SourceFile == NULL) { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); + DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName.c_str())); return CAB_STATUS_NOFILE; } @@ -1320,7 +1250,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) } /* Call OnAdd event handler */ - OnAdd(&FileNode->File, FileNode->FileName); + OnAdd(&FileNode->File, FileNode->FileName.c_str()); TotalBytesLeft = FileNode->File.FileSize; @@ -1330,7 +1260,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) CurrentFolderNode->Commit = true; PrevCabinetNumber = CurrentDiskNumber; - Size = sizeof(CFFILE) + (ULONG)strlen(GetFileName(FileNode->FileName)) + 1; + Size = sizeof(CFFILE) + (ULONG)strlen(GetFileName(FileNode->FileName.c_str())) + 1; CABHeader.FileTableOffset += Size; TotalFileSize += Size; DiskSize += Size; @@ -1621,23 +1551,16 @@ ULONG CCabinet::AddFile(char* FileName) { FILE* SrcFile; PCFFILE_NODE FileNode; - char* NewFileName; + std::string NewFileName; - NewFileName = (char*)malloc(strlen(FileName) + 1); - if (!NewFileName) - { - DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - return CAB_STATUS_NOMEMORY; - } - strcpy(NewFileName, FileName); - ConvertPath(NewFileName, false); + NewFileName = FileName; + ConvertPath(NewFileName); /* Try to open file */ - SrcFile = fopen(NewFileName, "rb"); + SrcFile = fopen(NewFileName.c_str(), "rb"); if (SrcFile == NULL) { - DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); - free(NewFileName); + DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName.c_str())); return CAB_STATUS_CANNOT_OPEN; } @@ -1645,7 +1568,6 @@ ULONG CCabinet::AddFile(char* FileName) if (!FileNode) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - free(NewFileName); fclose(SrcFile); return CAB_STATUS_NOMEMORY; } @@ -1687,7 +1609,7 @@ bool CCabinet::CreateSimpleCabinet() */ { bool bRet = false; - char* pszFile; + const char* pszFile; char szFilePath[PATH_MAX]; char szFile[PATH_MAX]; PSEARCH_CRITERIA Criteria; @@ -1716,20 +1638,20 @@ bool CCabinet::CreateSimpleCabinet() while(Criteria) { // Store the file path with a trailing slash in szFilePath - ConvertPath(Criteria->Search, false); - pszFile = strrchr(Criteria->Search, DIR_SEPARATOR_CHAR); + ConvertPath(Criteria->Search); + pszFile = strrchr(Criteria->Search.c_str(), DIR_SEPARATOR_CHAR); if(pszFile) { // Set the pointer to the start of the file name, not the slash pszFile++; - strncpy(szFilePath, Criteria->Search, pszFile - Criteria->Search); - szFilePath[pszFile - Criteria->Search] = 0; + strncpy(szFilePath, Criteria->Search.c_str(), pszFile - Criteria->Search.c_str()); + szFilePath[pszFile - Criteria->Search.c_str()] = 0; } else { - pszFile = Criteria->Search; + pszFile = Criteria->Search.c_str(); #if defined(_WIN32) szFilePath[0] = 0; @@ -1741,12 +1663,12 @@ bool CCabinet::CreateSimpleCabinet() #if defined(_WIN32) // Windows: Use the easy FindFirstFile/FindNextFile API for getting all files and checking them against the pattern - hFind = FindFirstFile(Criteria->Search, &FindFileData); + hFind = FindFirstFile(Criteria->Search.c_str(), &FindFileData); // Don't stop if a search criteria is not found if(hFind == INVALID_HANDLE_VALUE && GetLastError() != ERROR_FILE_NOT_FOUND) { - DPRINT(MIN_TRACE, ("FindFirstFile failed, Criteria: %s, error code is %u\n", Criteria->Search, (UINT)GetLastError())); + DPRINT(MIN_TRACE, ("FindFirstFile failed, Criteria: %s, error code is %u\n", Criteria->Search.c_str(), (UINT)GetLastError())); goto cleanup; } @@ -1845,7 +1767,7 @@ void CCabinet::SetMaxDiskSize(ULONG Size) /* Default event handlers */ bool CCabinet::OnOverwrite(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called when extracting a file and it already exists * ARGUMENTS: @@ -1860,7 +1782,7 @@ bool CCabinet::OnOverwrite(PCFFILE File, void CCabinet::OnExtract(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called just before extracting a file * ARGUMENTS: @@ -1871,8 +1793,8 @@ void CCabinet::OnExtract(PCFFILE File, } -void CCabinet::OnDiskChange(char* CabinetName, - char* DiskLabel) +void CCabinet::OnDiskChange(const char* CabinetName, + const char* DiskLabel) /* * FUNCTION: Called when a new disk is to be processed * ARGUMENTS: @@ -1882,11 +1804,15 @@ void CCabinet::OnDiskChange(char* CabinetName, { } +void CCabinet::OnVerboseMessage(const char* Message) +{ + +} #ifndef CAB_READ_ONLY void CCabinet::OnAdd(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called just before adding a file to a cabinet * ARGUMENTS: @@ -1970,7 +1896,7 @@ ULONG CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) PCFDATA_NODE Node; DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%X) FileSize (%u).\n", - File->FileName, + File->FileName.c_str(), (UINT)File->File.FileOffset, (UINT)File->File.FileSize)); @@ -1999,7 +1925,7 @@ ULONG CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) } -ULONG CCabinet::LocateFile(char* FileName, +ULONG CCabinet::LocateFile(const char* FileName, PCFFILE_NODE *File) /* * FUNCTION: Locates a file in the cabinet @@ -2020,7 +1946,7 @@ ULONG CCabinet::LocateFile(char* FileName, Node = FileListHead; while (Node != NULL) { - if (strcasecmp(FileName, Node->FileName) == 0) + if (strcasecmp(FileName, Node->FileName.c_str()) == 0) { CurrentFolderNode = LocateFolderNode(Node->File.FileControlID); if (!CurrentFolderNode) @@ -2137,20 +2063,15 @@ ULONG CCabinet::ReadFileTable() return CAB_STATUS_INVALID_CAB; } - File->FileName = (char*)malloc(PATH_MAX); - if (!File->FileName) - { - DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - return CAB_STATUS_NOMEMORY; - } - /* Read file name */ - Status = ReadString(File->FileName, PATH_MAX); + char Buf[PATH_MAX]; + Status = ReadString(Buf, PATH_MAX); if (Status != CAB_STATUS_SUCCESS) return Status; + File->FileName = Buf; DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%X). Size (%u bytes) ControlId (0x%X).\n", - File->FileName, + File->FileName.c_str(), (UINT)File->File.FileOffset, (UINT)File->File.FileSize, File->File.FileControlID)); @@ -2234,12 +2155,10 @@ PCFFOLDER_NODE CCabinet::NewFolderNode() { PCFFOLDER_NODE Node; - Node = (PCFFOLDER_NODE)malloc(sizeof(CFFOLDER_NODE)); + Node = new CFFOLDER_NODE; if (!Node) return NULL; - memset(Node, 0, sizeof(CFFOLDER_NODE)); - Node->Folder.CompressionType = CAB_COMP_NONE; Node->Prev = FolderListTail; @@ -2266,12 +2185,10 @@ PCFFILE_NODE CCabinet::NewFileNode() { PCFFILE_NODE Node; - Node = (PCFFILE_NODE)malloc(sizeof(CFFILE_NODE)); + Node = new CFFILE_NODE; if (!Node) return NULL; - memset(Node, 0, sizeof(CFFILE_NODE)); - Node->Prev = FileListTail; if (FileListTail != NULL) @@ -2296,12 +2213,10 @@ PCFDATA_NODE CCabinet::NewDataNode(PCFFOLDER_NODE FolderNode) { PCFDATA_NODE Node; - Node = (PCFDATA_NODE)malloc(sizeof(CFDATA_NODE)); + Node = new CFDATA_NODE; if (!Node) return NULL; - memset(Node, 0, sizeof(CFDATA_NODE)); - Node->Prev = FolderNode->DataListTail; if (FolderNode->DataListTail != NULL) @@ -2329,7 +2244,7 @@ void CCabinet::DestroyDataNodes(PCFFOLDER_NODE FolderNode) while (NextNode != NULL) { PrevNode = NextNode->Next; - free(NextNode); + delete NextNode; NextNode = PrevNode; } FolderNode->DataListHead = NULL; @@ -2349,9 +2264,7 @@ void CCabinet::DestroyFileNodes() while (NextNode != NULL) { PrevNode = NextNode->Next; - if (NextNode->FileName) - free(NextNode->FileName); - free(NextNode); + delete NextNode; NextNode = PrevNode; } FileListHead = NULL; @@ -2392,13 +2305,11 @@ void CCabinet::DestroyDeletedFileNodes() FileListTail->Next = NULL; } - DPRINT(MAX_TRACE, ("Deleting file: '%s'\n", CurNode->FileName)); + DPRINT(MAX_TRACE, ("Deleting file node: '%s'\n", CurNode->FileName.c_str())); - TotalFileSize -= (sizeof(CFFILE) + (ULONG)strlen(GetFileName(CurNode->FileName)) + 1); + TotalFileSize -= (sizeof(CFFILE) + (ULONG)strlen(GetFileName(CurNode->FileName.c_str())) + 1); - if (CurNode->FileName) - free(CurNode->FileName); - free(CurNode); + delete CurNode; } CurNode = NextNode; } @@ -2418,7 +2329,7 @@ void CCabinet::DestroyFolderNodes() { PrevNode = NextNode->Next; DestroyDataNodes(NextNode); - free(NextNode); + delete NextNode; NextNode = PrevNode; } FolderListHead = NULL; @@ -2460,7 +2371,7 @@ void CCabinet::DestroyDeletedFolderNodes() } DestroyDataNodes(CurNode); - free(CurNode); + delete CurNode; TotalFolderSize -= sizeof(CFFOLDER); } @@ -2548,7 +2459,7 @@ ULONG CCabinet::ReadBlock(void* Buffer, return CAB_STATUS_SUCCESS; } -bool CCabinet::MatchFileNamePattern(char* FileName, char* Pattern) +bool CCabinet::MatchFileNamePattern(const char* FileName, const char* Pattern) /* * FUNCTION: Matches a wildcard character pattern against a file * ARGUMENTS: @@ -2563,8 +2474,8 @@ bool CCabinet::MatchFileNamePattern(char* FileName, char* Pattern) * Original location: http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/utility.c?rev=5&vi… */ { - char* retryPattern = NULL; - char* retryFileName = NULL; + const char* retryPattern = NULL; + const char* retryFileName = NULL; char ch; while (*FileName || *Pattern) @@ -2896,7 +2807,7 @@ ULONG CCabinet::WriteFileEntries() } DPRINT(MAX_TRACE, ("Writing file entry. FileControlID (0x%X) FileOffset (0x%X) FileSize (%u) FileName (%s).\n", - File->File.FileControlID, (UINT)File->File.FileOffset, (UINT)File->File.FileSize, File->FileName)); + File->File.FileControlID, (UINT)File->File.FileOffset, (UINT)File->File.FileSize, File->FileName.c_str())); if (fwrite(&File->File, sizeof(CFFILE), 1, FileHandle) < 1) { @@ -2904,7 +2815,8 @@ ULONG CCabinet::WriteFileEntries() return CAB_STATUS_CANNOT_WRITE; } - if (fwrite(GetFileName(File->FileName), strlen(GetFileName(File->FileName)) + 1, 1, FileHandle) < 1) + std::string fname = GetFileName(File->FileName.c_str()); + if (fwrite(fname.c_str(), fname.length() + 1, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -3119,14 +3031,14 @@ ULONG CCabinet::GetFileTimes(FILE* FileHandle, PCFFILE_NODE File) char buf[PATH_MAX]; // Check for an absolute path - if (IsSeparator(File->FileName[0])) - strcpy(buf, File->FileName); + if (File->FileName.length() > 0 && IsSeparator(File->FileName[0])) + strcpy(buf, File->FileName.c_str()); else { if (!getcwd(buf, sizeof(buf))) return CAB_STATUS_CANNOT_READ; strcat(buf, DIR_SEPARATOR_STRING); - strcat(buf, File->FileName); + strcat(buf, File->FileName.c_str()); } if (stat(buf, &stbuf) == -1) @@ -3150,7 +3062,7 @@ ULONG CCabinet::GetAttributesOnFile(PCFFILE_NODE File) #if defined(_WIN32) LONG Attributes; - Attributes = GetFileAttributes(File->FileName); + Attributes = GetFileAttributes(File->FileName.c_str()); if (Attributes == -1) return CAB_STATUS_CANNOT_READ; @@ -3163,14 +3075,14 @@ ULONG CCabinet::GetAttributesOnFile(PCFFILE_NODE File) char buf[PATH_MAX]; // Check for an absolute path - if (IsSeparator(File->FileName[0])) - strcpy(buf, File->FileName); + if (File->FileName.length() > 0 && IsSeparator(File->FileName[0])) + strcpy(buf, File->FileName.c_str()); else { if (!getcwd(buf, sizeof(buf))) return CAB_STATUS_CANNOT_READ; strcat(buf, DIR_SEPARATOR_STRING); - strcat(buf, File->FileName); + strcat(buf, File->FileName.c_str()); } if (stat(buf, &stbuf) == -1) diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index 3bf6ba6edad..d47f87893cd 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -25,11 +25,16 @@ #include <stdio.h> #include <string.h> #include <limits.h> +#include <string> #ifndef PATH_MAX #define PATH_MAX MAX_PATH #endif +#if !defined(C_ASSERT) +#define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] +#endif + #if defined(_WIN32) #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" @@ -167,6 +172,8 @@ typedef struct _CFFOLDER */ } CFFOLDER, *PCFFOLDER; +C_ASSERT(sizeof(CFFOLDER) == 8); + typedef struct _CFFILE { @@ -179,6 +186,7 @@ typedef struct _CFFILE /* After this is the NULL terminated filename */ } CFFILE, *PCFFILE; +C_ASSERT(sizeof(CFFILE) == 16); typedef struct _CFDATA { @@ -190,55 +198,59 @@ typedef struct _CFDATA */ } CFDATA, *PCFDATA; +C_ASSERT(sizeof(CFDATA) == 8); + +/* Application structures */ + typedef struct _CFDATA_NODE { - struct _CFDATA_NODE *Next; - struct _CFDATA_NODE *Prev; - ULONG ScratchFilePosition; // Absolute offset in scratch file - ULONG AbsoluteOffset; // Absolute offset in cabinet - ULONG UncompOffset; // Uncompressed offset in folder - CFDATA Data; + struct _CFDATA_NODE *Next = nullptr; + struct _CFDATA_NODE *Prev = nullptr; + ULONG ScratchFilePosition = 0; // Absolute offset in scratch file + ULONG AbsoluteOffset = 0; // Absolute offset in cabinet + ULONG UncompOffset = 0; // Uncompressed offset in folder + CFDATA Data = { 0 }; } CFDATA_NODE, *PCFDATA_NODE; typedef struct _CFFOLDER_NODE { - struct _CFFOLDER_NODE *Next; - struct _CFFOLDER_NODE *Prev; - ULONG UncompOffset; // File size accumulator - ULONG AbsoluteOffset; - ULONG TotalFolderSize; // Total size of folder in current disk - PCFDATA_NODE DataListHead; - PCFDATA_NODE DataListTail; - ULONG Index; - bool Commit; // true if the folder should be committed - bool Delete; // true if marked for deletion - CFFOLDER Folder; + struct _CFFOLDER_NODE *Next = nullptr; + struct _CFFOLDER_NODE *Prev = nullptr; + ULONG UncompOffset = 0; // File size accumulator + ULONG AbsoluteOffset = 0; + ULONG TotalFolderSize = 0; // Total size of folder in current disk + PCFDATA_NODE DataListHead = nullptr; + PCFDATA_NODE DataListTail = nullptr; + ULONG Index = 0; + bool Commit = false; // true if the folder should be committed + bool Delete = false; // true if marked for deletion + CFFOLDER Folder = { 0 }; } CFFOLDER_NODE, *PCFFOLDER_NODE; typedef struct _CFFILE_NODE { - struct _CFFILE_NODE *Next; - struct _CFFILE_NODE *Prev; - CFFILE File; - char* FileName; - PCFDATA_NODE DataBlock; // First data block of file. NULL if not known - bool Commit; // true if the file data should be committed - bool Delete; // true if marked for deletion - PCFFOLDER_NODE FolderNode; // Folder this file belong to + struct _CFFILE_NODE *Next = nullptr; + struct _CFFILE_NODE *Prev = nullptr; + CFFILE File = { 0 }; + std::string FileName; + PCFDATA_NODE DataBlock = nullptr; // First data block of file. NULL if not known + bool Commit = false; // true if the file data should be committed + bool Delete = false; // true if marked for deletion + PCFFOLDER_NODE FolderNode = nullptr; // Folder this file belong to } CFFILE_NODE, *PCFFILE_NODE; typedef struct _SEARCH_CRITERIA { - struct _SEARCH_CRITERIA *Next; // Pointer to next search criteria - struct _SEARCH_CRITERIA *Prev; // Pointer to previous search criteria - char* Search; // The actual search criteria + struct _SEARCH_CRITERIA *Next = nullptr; // Pointer to next search criteria + struct _SEARCH_CRITERIA *Prev = nullptr; // Pointer to previous search criteria + std::string Search; // The actual search criteria } SEARCH_CRITERIA, *PSEARCH_CRITERIA; typedef struct _CAB_SEARCH { - PCFFILE_NODE Next; // Pointer to next node - PCFFILE File; // Pointer to current CFFILE - char* FileName; // Current filename + PCFFILE_NODE Next = nullptr; // Pointer to next node + PCFFILE File = nullptr; // Pointer to current CFFILE + std::string FileName; // Current filename } CAB_SEARCH, *PCAB_SEARCH; @@ -329,25 +341,21 @@ public: /* Determines if a character is a separator */ bool IsSeparator(char Char); /* Replaces \ or / with the one used be the host environment */ - char* ConvertPath(char* Path, bool Allocate); + void ConvertPath(std::string& Path); /* Returns a pointer to the filename part of a fully qualified filename */ - char* GetFileName(char* Path); - /* Removes a filename from a fully qualified filename */ - void RemoveFileName(char* Path); + const char* GetFileName(const char* Path); /* Normalizes a path */ - bool NormalizePath(char* Path, ULONG Length); + void NormalizePath(std::string& Path); /* Returns name of cabinet file */ char* GetCabinetName(); /* Sets the name of the cabinet file */ - void SetCabinetName(char* FileName); + void SetCabinetName(const char* FileName); /* Sets destination path for extracted files */ - void SetDestinationPath(char* DestinationPath); + void SetDestinationPath(const char* DestinationPath); /* Sets cabinet reserved file */ - bool SetCabinetReservedFile(char* FileName); - /* Returns cabinet reserved file */ - char* GetCabinetReservedFile(); + bool SetCabinetReservedFile(const char* FileName); /* Returns destination path */ - char* GetDestinationPath(); + const char* GetDestinationPath(); /* Returns zero-based current disk number */ ULONG GetCurrentDiskNumber(); /* Opens the current cabinet file */ @@ -359,13 +367,13 @@ public: /* Locates the next file in the current cabinet file */ ULONG FindNext(PCAB_SEARCH Search); /* Extracts a file from the current cabinet file */ - ULONG ExtractFile(char* FileName); + ULONG ExtractFile(const char* FileName); /* Select codec engine to use */ void SelectCodec(LONG Id); /* Returns whether a codec engine is selected */ bool IsCodecSelected(); /* Adds a search criteria for adding files to a simple cabinet, displaying files in a cabinet or extracting them */ - ULONG AddSearchCriteria(char* SearchCriteria); + ULONG AddSearchCriteria(const char* SearchCriteria); /* Destroys the search criteria list */ void DestroySearchCriteria(); /* Returns whether we have search criteria */ @@ -375,7 +383,7 @@ public: /* Creates a simple cabinet based on the search criteria data */ bool CreateSimpleCabinet(); /* Sets the codec to use for compression (based on a string value) */ - bool SetCompressionCodec(char* CodecName); + bool SetCompressionCodec(const char* CodecName); /* Creates a new cabinet file */ ULONG NewCabinet(); /* Forces a new disk to be created */ @@ -401,14 +409,16 @@ public: /* Default event handlers */ /* Handler called when a file is about to be overridden */ - virtual bool OnOverwrite(PCFFILE Entry, char* FileName); + virtual bool OnOverwrite(PCFFILE Entry, const char* FileName); /* Handler called when a file is about to be extracted */ - virtual void OnExtract(PCFFILE Entry, char* FileName); + virtual void OnExtract(PCFFILE Entry, const char* FileName); /* Handler called when a new disk is to be processed */ - virtual void OnDiskChange(char* CabinetName, char* DiskLabel); + virtual void OnDiskChange(const char* CabinetName, const char* DiskLabel); + + virtual void OnVerboseMessage(const char* Message); #ifndef CAB_READ_ONLY /* Handler called when a file is about to be added */ - virtual void OnAdd(PCFFILE Entry, char* FileName); + virtual void OnAdd(PCFFILE Entry, const char* FileName); /* Handler called when a cabinet need a name */ virtual bool OnCabinetName(ULONG Number, char* Name); /* Handler called when a disk needs a label */ @@ -417,7 +427,7 @@ public: private: PCFFOLDER_NODE LocateFolderNode(ULONG Index); ULONG GetAbsoluteOffset(PCFFILE_NODE File); - ULONG LocateFile(char* FileName, PCFFILE_NODE *File); + ULONG LocateFile(const char* FileName, PCFFILE_NODE *File); ULONG ReadString(char* String, LONG MaxLength); ULONG ReadFileTable(); ULONG ReadDataBlocks(PCFFOLDER_NODE FolderNode); @@ -431,7 +441,7 @@ private: void DestroyDeletedFolderNodes(); ULONG ComputeChecksum(void* Buffer, ULONG Size, ULONG Seed); ULONG ReadBlock(void* Buffer, ULONG Size, PULONG BytesRead); - bool MatchFileNamePattern(char* FileName, char* Pattern); + bool MatchFileNamePattern(const char* FileName, const char* Pattern); #ifndef CAB_READ_ONLY ULONG InitCabinetHeader(); ULONG WriteCabinetHeader(bool MoreDisks); @@ -459,8 +469,8 @@ private: ULONG FolderUncompSize; // Uncompressed size of folder ULONG BytesLeftInBlock; // Number of bytes left in current block bool ReuseBlock; - char DestPath[PATH_MAX]; - char CabinetReservedFile[PATH_MAX]; + std::string DestPath; + std::string CabinetReservedFile; void* CabinetReservedFileBuffer; ULONG CabinetReservedFileSize; FILE* FileHandle; diff --git a/sdk/tools/cabman/main.cxx b/sdk/tools/cabman/cabman.cxx similarity index 96% rename from sdk/tools/cabman/main.cxx rename to sdk/tools/cabman/cabman.cxx index ab7b7c77a53..0dd0ceaab1d 100644 --- a/sdk/tools/cabman/main.cxx +++ b/sdk/tools/cabman/cabman.cxx @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS cabinet manager - * FILE: tools/cabman/main.cxx + * FILE: tools/cabman/cabman.cxx * PURPOSE: Main program * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> @@ -452,7 +452,7 @@ bool CCABManager::DisplayCabinet() printf("%s ", Attr2Str(Str, Search.File->Attributes)); sprintf(Str, "%u", (UINT)Search.File->FileSize); printf("%s ", Pad(Str, ' ', 13)); - printf("%s\n", Search.FileName); + printf("%s\n", Search.FileName.c_str()); FileCount++; ByteCount += Search.File->FileSize; @@ -513,7 +513,7 @@ bool CCABManager::ExtractFromCabinet() { do { - switch (Status = ExtractFile(Search.FileName)) + switch (Status = ExtractFile(Search.FileName.c_str())) { case CAB_STATUS_SUCCESS: break; @@ -589,7 +589,7 @@ bool CCABManager::Run() /* Event handlers */ bool CCABManager::OnOverwrite(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called when extracting a file and it already exists * ARGUMENTS: @@ -608,7 +608,7 @@ bool CCABManager::OnOverwrite(PCFFILE File, void CCABManager::OnExtract(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called just before extracting a file * ARGUMENTS: @@ -624,8 +624,8 @@ void CCABManager::OnExtract(PCFFILE File, -void CCABManager::OnDiskChange(char* CabinetName, - char* DiskLabel) +void CCABManager::OnDiskChange(const char* CabinetName, + const char* DiskLabel) /* * FUNCTION: Called when a new disk is to be processed * ARGUMENTS: @@ -641,7 +641,7 @@ void CCABManager::OnDiskChange(char* CabinetName, void CCABManager::OnAdd(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called just before adding a file to a cabinet * ARGUMENTS: @@ -655,7 +655,13 @@ void CCABManager::OnAdd(PCFFILE File, } } -CCABManager CABMgr; +void CCABManager::OnVerboseMessage(const char* Message) +{ + if (Verbose) + { + printf("%s", Message); + } +} int main(int argc, char * argv[]) /* @@ -665,11 +671,12 @@ int main(int argc, char * argv[]) * argv = Pointer to list of command line arguments */ { - bool status = false; + CCABManager CABMgr; - if (CABMgr.ParseCmdline(argc, argv)) status = CABMgr.Run(); + if (!CABMgr.ParseCmdline(argc, argv)) + return false; - return (status ? 0 : 1); + return CABMgr.Run() ? 0 : 1; } /* EOF */ diff --git a/sdk/tools/cabman/cabman.h b/sdk/tools/cabman/cabman.h index a4160275a71..fa1478e13a9 100644 --- a/sdk/tools/cabman/cabman.h +++ b/sdk/tools/cabman/cabman.h @@ -31,11 +31,14 @@ private: bool CreateCabinet(); bool DisplayCabinet(); bool ExtractFromCabinet(); + /* Event handlers */ - virtual bool OnOverwrite(PCFFILE File, char* FileName); - virtual void OnExtract(PCFFILE File, char* FileName); - virtual void OnDiskChange(char* CabinetName, char* DiskLabel); - virtual void OnAdd(PCFFILE Entry, char* FileName); + virtual bool OnOverwrite(PCFFILE File, const char* FileName) override; + virtual void OnExtract(PCFFILE File, const char* FileName) override; + virtual void OnDiskChange(const char* CabinetName, const char* DiskLabel) override; + virtual void OnAdd(PCFFILE Entry, const char* FileName) override; + virtual void OnVerboseMessage(const char* Message) override; + /* Configuration */ bool ProcessAll; ULONG Mode; @@ -44,6 +47,5 @@ private: bool Verbose; }; -extern CCABManager CABMgr; /* EOF */ diff --git a/sdk/tools/cabman/dfp.cxx b/sdk/tools/cabman/dfp.cxx index e78211a06c6..b6b4335e59a 100644 --- a/sdk/tools/cabman/dfp.cxx +++ b/sdk/tools/cabman/dfp.cxx @@ -45,8 +45,6 @@ CDFParser::CDFParser() InfModeEnabled = false; InfFileHandle = NULL; - - strcpy(FileRelativePath, ""); } CDFParser::~CDFParser() @@ -65,21 +63,21 @@ CDFParser::~CDFParser() while (CNNext != NULL) { CNPrev = CNNext->Next; - free(CNNext); + delete CNNext; CNNext = CNPrev; } CNNext = DiskLabel; while (CNNext != NULL) { CNPrev = CNNext->Next; - free(CNNext); + delete CNNext; CNNext = CNPrev; } DNNext = MaxDiskSize; while (DNNext != NULL) { DNPrev = DNNext->Next; - free(DNNext); + delete DNNext; DNNext = DNPrev; } @@ -91,7 +89,7 @@ void CDFParser::WriteInfLine(char* InfLine) { char buf[PATH_MAX]; char eolbuf[2]; - char* destpath; + const char* destpath; if (DontGenerateInf) return; @@ -316,10 +314,7 @@ ULONG CDFParser::Parse() if (!InfFileOnly) { - if (CABMgr.IsVerbose()) - { - printf("Writing cabinet. This may take a while...\n"); - } + OnVerboseMessage("Writing cabinet. This may take a while...\n"); if (DiskCreated) { @@ -343,10 +338,7 @@ ULONG CDFParser::Parse() } } - if (CABMgr.IsVerbose()) - { - printf("Done.\n"); - } + OnVerboseMessage("Done.\n"); } return CAB_STATUS_SUCCESS; @@ -360,10 +352,9 @@ void CDFParser::SetFileRelativePath(char* Path) * Path = Pointer to string with path */ { - strcpy(FileRelativePath, Path); - ConvertPath(FileRelativePath, false); - if (strlen(FileRelativePath) > 0) - NormalizePath(FileRelativePath, PATH_MAX); + FileRelativePath = Path; + ConvertPath(FileRelativePath); + NormalizePath(FileRelativePath); } @@ -498,7 +489,7 @@ bool CDFParser::SetDiskName(PCABINET_NAME *List, ULONG Number, char* String) CN = CN->Next; } - CN = (PCABINET_NAME)malloc(sizeof(CABINET_NAME)); + CN = new CABINET_NAME; if (!CN) return false; @@ -564,7 +555,7 @@ bool CDFParser::SetDiskNumber(PDISK_NUMBER *List, ULONG Number, ULONG Value) DN = DN->Next; } - DN = (PDISK_NUMBER)malloc(sizeof(DISK_NUMBER)); + DN = new DISK_NUMBER; if (!DN) return false; @@ -1135,7 +1126,7 @@ ULONG CDFParser::PerformFileCopy() Status = AddFile(SrcName); if (Status == CAB_STATUS_CANNOT_OPEN) { - strcpy(SrcName, FileRelativePath); + strcpy(SrcName, FileRelativePath.c_str()); strcat(SrcName, BaseFilename); Status = AddFile(SrcName); } diff --git a/sdk/tools/cabman/dfp.h b/sdk/tools/cabman/dfp.h index 1c509715fbc..226bb89996c 100644 --- a/sdk/tools/cabman/dfp.h +++ b/sdk/tools/cabman/dfp.h @@ -69,11 +69,11 @@ public: void SetFileRelativePath(char* Path); bool InfFileOnly; bool DontGenerateInf; - char FileRelativePath[300]; + std::string FileRelativePath; private: /* Event handlers */ - virtual bool OnDiskLabel(ULONG Number, char* Label); - virtual bool OnCabinetName(ULONG Number, char* Name); + virtual bool OnDiskLabel(ULONG Number, char* Label) override; + virtual bool OnCabinetName(ULONG Number, char* Name) override; void WriteInfLine(char* InfLine); bool SetDiskName(PCABINET_NAME *List, ULONG Number, char* String); diff --git a/sdk/tools/cabman/mszip.h b/sdk/tools/cabman/mszip.h index 5b43d8170e5..2fffed7bfc0 100644 --- a/sdk/tools/cabman/mszip.h +++ b/sdk/tools/cabman/mszip.h @@ -26,12 +26,12 @@ public: virtual ULONG Compress(void* OutputBuffer, void* InputBuffer, ULONG InputLength, - PULONG OutputLength); + PULONG OutputLength) override; /* Uncompresses a data block */ virtual ULONG Uncompress(void* OutputBuffer, void* InputBuffer, ULONG InputLength, - PULONG OutputLength); + PULONG OutputLength) override; private: int Status; z_stream ZStream; /* Zlib stream */ diff --git a/sdk/tools/cabman/raw.h b/sdk/tools/cabman/raw.h index dfbc2ae2eb2..082431177f8 100644 --- a/sdk/tools/cabman/raw.h +++ b/sdk/tools/cabman/raw.h @@ -23,12 +23,12 @@ public: virtual ULONG Compress(void* OutputBuffer, void* InputBuffer, ULONG InputLength, - PULONG OutputLength); + PULONG OutputLength) override; /* Uncompresses a data block */ virtual ULONG Uncompress(void* OutputBuffer, void* InputBuffer, ULONG InputLength, - PULONG OutputLength); + PULONG OutputLength) override; }; /* EOF */

1 0

[reactos] 01/01: [ATL][ATL_APITEST] Add CString::Tokenize + testcase
by Mark Jansen 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58092fb4da352491e2f87… commit 58092fb4da352491e2f87fecc52ff5a652ab6669 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 6 21:30:23 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 7 22:13:43 2020 +0200 [ATL][ATL_APITEST] Add CString::Tokenize + testcase --- modules/rostests/apitests/atl/CString.cpp | 3 ++ modules/rostests/apitests/atl/CString.inl | 87 +++++++++++++++++++++++++++++++ sdk/lib/atl/cstringt.h | 64 +++++++++++++++++++++++ 3 files changed, 154 insertions(+) diff --git a/modules/rostests/apitests/atl/CString.cpp b/modules/rostests/apitests/atl/CString.cpp index 89782499521..fdb9d55020f 100644 --- a/modules/rostests/apitests/atl/CString.cpp +++ b/modules/rostests/apitests/atl/CString.cpp @@ -190,4 +190,7 @@ START_TEST(CString) test_bstrW(); test_bstrA(); + + test_tokenizeW(); + test_tokenizeA(); } diff --git a/modules/rostests/apitests/atl/CString.inl b/modules/rostests/apitests/atl/CString.inl index 193d8d40ba7..c0d661cfb8e 100644 --- a/modules/rostests/apitests/atl/CString.inl +++ b/modules/rostests/apitests/atl/CString.inl @@ -439,3 +439,90 @@ TEST_NAMEX(bstr) ::SysFreeString(bstr); } } + +TEST_NAMEX(tokenize) +{ + CStringX str(_X("%#First Second#Third")); + const XCHAR* Tokens = _X("% #"); + CStringX res; + + int nCurPos = 0; + + // All 'current' tokens are skipped + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X("First"), "Expected str to be 'First', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 8); + + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X("Second"), "Expected str to be 'Second', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 15); + + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X("Third"), "Expected str to be 'Third', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 21); + + // The final 'token' is empty, and nCurPos is set to -1 + // (Calling with nCurPos=-1 will assert) + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + str =_X("StartWithToken#%#"); + nCurPos = 0; + + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X("StartWithToken"), "Expected str to be 'StartWithToken', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 15); + + // Ending with tokens acts as if there were no tokens at the end + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + + str = _X(""); + nCurPos = 0; + + // Calling with an empty string returns 'no tokens' + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + str = _X(""); + nCurPos = 20; + + // Calling with a current position outside the strings acts the same as 'no tokens left' + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + + str = _X("test"); + nCurPos = 2; + + // Calling with a NULL pszTokens returns a substring starting at 'nCurPos', but not updating nCurPos! + res = str.Tokenize(NULL, nCurPos); + ok(res == _X("st"), "Expected str to be 'st', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 2); + + + // Calling with an empty pszTokens behaves exactly the same + res = str.Tokenize(_X(""), nCurPos); + ok(res == _X("st"), "Expected str to be 'st', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 2); + + nCurPos = 8; + + // Calling with a NULL pszTokens and an nCurPos out of bounds returns 'no tokens left' + res = str.Tokenize(NULL, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + nCurPos = 8; + + // Calling with an empty pszTokens behaves exactly the same + res = str.Tokenize(_X(""), nCurPos); + ok(res == _X(""), "Expected str to be 'st', was: %s\n", dbgstrx(res)); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); +} diff --git a/sdk/lib/atl/cstringt.h b/sdk/lib/atl/cstringt.h index ad89dc6270a..0afe3f4763f 100644 --- a/sdk/lib/atl/cstringt.h +++ b/sdk/lib/atl/cstringt.h @@ -140,6 +140,20 @@ public: return ::_wcsicmp(psz1, psz2); } + static int __cdecl StringSpanIncluding( + _In_z_ LPCWSTR pszBlock, + _In_z_ LPCWSTR pszSet) + { + return (int)::wcsspn(pszBlock, pszSet); + } + + static int __cdecl StringSpanExcluding( + _In_z_ LPCWSTR pszBlock, + _In_z_ LPCWSTR pszSet) + { + return (int)::wcscspn(pszBlock, pszSet); + } + static int __cdecl FormatV( _In_opt_z_ LPWSTR pszDest, _In_z_ LPCWSTR pszFormat, @@ -289,6 +303,20 @@ public: return ::_stricmp(psz1, psz2); } + static int __cdecl StringSpanIncluding( + _In_z_ LPCSTR pszBlock, + _In_z_ LPCSTR pszSet) + { + return (int)::strspn(pszBlock, pszSet); + } + + static int __cdecl StringSpanExcluding( + _In_z_ LPCSTR pszBlock, + _In_z_ LPCSTR pszSet) + { + return (int)::strcspn(pszBlock, pszSet); + } + static int __cdecl FormatV( _In_opt_z_ LPSTR pszDest, _In_z_ LPCSTR pszFormat, @@ -804,6 +832,42 @@ public: } + CStringT Tokenize(_In_z_ PCXSTR pszTokens, _Inout_ int& iStart) const + { + ATLASSERT(iStart >= 0); + + if (iStart < 0) + AtlThrow(E_INVALIDARG); + + if (!pszTokens || !pszTokens[0]) + { + if (iStart < CThisSimpleString::GetLength()) + { + return Mid(iStart); + } + iStart = -1; + return CStringT(); + } + + if (iStart < CThisSimpleString::GetLength()) + { + int iRangeOffset = StringTraits::StringSpanIncluding(CThisSimpleString::GetString() + iStart, pszTokens); + + if (iRangeOffset + iStart < CThisSimpleString::GetLength()) + { + int iNewStart = iStart + iRangeOffset; + int nCount = StringTraits::StringSpanExcluding(CThisSimpleString::GetString() + iNewStart, pszTokens); + + iStart = iNewStart + nCount + 1; + + return Mid(iNewStart, nCount); + } + } + + iStart = -1; + return CStringT(); + } + static PCXSTR DefaultTrimChars() { static XCHAR str[] = { ' ', '\t', '\r', '\n', 0 };

1 0

[reactos] 01/01: [SDK][NDK][PSTYPES] Fix regressions CORE-17247 & CORE-17248
by Joachim Henze 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abbe656407b7ff56d902c… commit abbe656407b7ff56d902c3f970d618eb269b9753 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Sep 7 20:32:00 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Sep 7 20:32:00 2020 +0200 [SDK][NDK][PSTYPES] Fix regressions CORE-17247 & CORE-17248 By reverting the guilty rev 0.4.14-dev-1239-g 7481bda679eccdf1eba3666e500074dcb966e748 and placing a C_ASSERT() to protect us from doing the same fault again in the future. (proposed by Mark Jansen) This will allow again to use kernel32.dll from 2k3sp2 to reach desktop and it will allow Google Earth to run again. Unfortunately it will break CORE-16757 again, but we did not ship that improvement yet and we believe that revert to be correct. When approaching CORE-16757 later, make sure to double-check also CORE-17247 & CORE-17248 with your fix. We did excessive testing here, see https://jira.reactos.org/browse/CORE-17247?focusedCommentId=125166&page=com… --- sdk/include/ndk/pstypes.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/include/ndk/pstypes.h b/sdk/include/ndk/pstypes.h index 55839aca37a..d10199097a3 100644 --- a/sdk/include/ndk/pstypes.h +++ b/sdk/include/ndk/pstypes.h @@ -910,12 +910,15 @@ typedef struct _PROCESS_SESSION_INFORMATION #endif -typedef struct DECLSPEC_ALIGN(4) _PROCESS_PRIORITY_CLASS +typedef struct _PROCESS_PRIORITY_CLASS { BOOLEAN Foreground; UCHAR PriorityClass; } PROCESS_PRIORITY_CLASS, *PPROCESS_PRIORITY_CLASS; +// Compatibility with windows, see CORE-16757, CORE-17106, CORE-17247 +C_ASSERT(sizeof(PROCESS_PRIORITY_CLASS) == 2); + typedef struct _PROCESS_FOREGROUND_BACKGROUND { BOOLEAN Foreground;

1 0

[reactos] 01/01: [SHELLFIND] Encoding-aware file search (#3134)
by Katayama Hirofumi MZ 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7376cdebb6fc945798b29… commit 7376cdebb6fc945798b29212c9f3239ea52cf89f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 22:30:47 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 7 22:30:47 2020 +0900 [SHELLFIND] Encoding-aware file search (#3134) Consider UTF-8/UTF-16/UTF-16BE encodings in file search. Recognize UTF-8/UTF-16/UTF-16BE BOM and NULs at the beginning of the file contents. Optimize for speed. CORE-17250 --- dll/win32/browseui/shellfind/CFindFolder.cpp | 110 ++++++++++++++++++--------- 1 file changed, 75 insertions(+), 35 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index d3c2b6f3c5c..ec24b116c29 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -152,6 +152,8 @@ struct _SearchData CStringW szFileName; CStringA szQueryA; CStringW szQueryW; + CStringW szQueryU16BE; + CStringA szQueryU8; BOOL SearchHidden; CComPtr<CFindFolder> pFindFolder; }; @@ -171,61 +173,68 @@ static const TChar* StrStrN(const TChar *lpFirst, const TString &lpSrch, UINT cc return NULL; } -template<typename TChar, typename TString, int (&StrNCmp)(const TChar *, const TChar *, size_t)> -static UINT StrStrNCount(const TChar *lpFirst, const TString &lpSrch, UINT cchMax) -{ - const TChar *lpSearchEnd = lpFirst + cchMax; - UINT uCount = 0; - while (lpFirst < lpSearchEnd && (lpFirst = StrStrN<TChar, TString, StrNCmp>(lpFirst, lpSrch, cchMax))) - { - uCount++; - lpFirst += lpSrch.GetLength(); - cchMax = lpSearchEnd - lpFirst; - } - return uCount; -} - -static UINT StrStrCountNIA(const CHAR *lpFirst, const CStringA &lpSrch, UINT cchMax) +static inline BOOL +StrFindNIA(const CHAR *lpFirst, const CStringA &lpSrch, UINT cchMax) { - return StrStrNCount<CHAR, CStringA, _strnicmp>(lpFirst, lpSrch, cchMax); + return StrStrN<CHAR, CStringA, _strnicmp>(lpFirst, lpSrch, cchMax) != NULL; } -static UINT StrStrCountNIW(const WCHAR *lpFirst, const CStringW &lpSrch, UINT cchMax) +static inline BOOL +StrFindNIW(const WCHAR *lpFirst, const CStringW &lpSrch, UINT cchMax) { - return StrStrNCount<WCHAR, CStringW, _wcsnicmp>(lpFirst, lpSrch, cchMax); + return StrStrN<WCHAR, CStringW, _wcsnicmp>(lpFirst, lpSrch, cchMax) != NULL; } -static UINT SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData) +static BOOL SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData) { HANDLE hFile = CreateFileW(lpFilePath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); if (hFile == INVALID_HANDLE_VALUE) - return 0; + return FALSE; + // FIXME: support large file DWORD size = GetFileSize(hFile, NULL); - HANDLE hFileMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); + if (size == 0 || size == INVALID_FILE_SIZE) + { + CloseHandle(hFile); + return FALSE; + } + + HANDLE hFileMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, size, NULL); CloseHandle(hFile); if (hFileMap == INVALID_HANDLE_VALUE) - return 0; + return FALSE; - LPBYTE lpFileContent = (LPBYTE) MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, 0); + LPBYTE pbContents = (LPBYTE)MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, size); CloseHandle(hFileMap); - if (!lpFileContent) - return 0; + if (!pbContents) + return FALSE; - UINT uMatches = 0; - // Check for UTF-16 BOM - if (size >= 2 && lpFileContent[0] == 0xFF && lpFileContent[1] == 0xFE) + BOOL bFound; + if (size >= 2 && + (memcmp(pbContents, "\xFF\xFE", 2) == 0 || (pbContents[0] && !pbContents[1]))) + { + // UTF-16 + bFound = StrFindNIW((LPCWSTR)pbContents, pSearchData->szQueryW, size / sizeof(WCHAR)); + } + else if (size >= 2 && + (memcmp(pbContents, "\xFE\xFF", 2) == 0 || (!pbContents[0] && pbContents[1]))) + { + // UTF-16 BE + bFound = StrFindNIW((LPCWSTR)pbContents, pSearchData->szQueryU16BE, size / sizeof(WCHAR)); + } + else if (size >= 3 && memcmp(pbContents, "\xEF\xBB\xBF", 3) == 0) { - uMatches = StrStrCountNIW((LPCWSTR) lpFileContent, pSearchData->szQueryW, size / sizeof(WCHAR)); + // UTF-8 + bFound = StrFindNIA((LPCSTR)pbContents, pSearchData->szQueryU8, size / sizeof(CHAR)); } else { - uMatches = StrStrCountNIA((LPCSTR) lpFileContent, pSearchData->szQueryA, size / sizeof(CHAR)); + // ANSI + bFound = StrFindNIA((LPCSTR)pbContents, pSearchData->szQueryA, size / sizeof(CHAR)); } - UnmapViewOfFile(lpFileContent); - - return uMatches; + UnmapViewOfFile(pbContents); + return bFound; } static BOOL FileNameMatch(LPCWSTR FindDataFileName, _SearchData *pSearchData) @@ -266,13 +275,14 @@ static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData) BOOL bMoreFiles = TRUE; UINT uTotalFound = 0; - PathCombineW(szPath, lpPath, L"*.*"); + PathCombineW(szPath, lpPath, L"*"); for (hFindFile = FindFirstFileW(szPath, &FindData); bMoreFiles && hFindFile != INVALID_HANDLE_VALUE; bMoreFiles = FindNextFileW(hFindFile, &FindData)) { - if (!wcscmp(FindData.cFileName, L".") || !wcscmp(FindData.cFileName, L"..")) +#define IS_DOTS(psz) ((psz)[0] == L'.' && ((psz)[1] == 0 || ((psz)[1] == L'.' && (psz)[2] == 0))) + if (IS_DOTS(FindData.cFileName)) continue; PathCombineW(szPath, lpPath, FindData.cFileName); @@ -368,6 +378,36 @@ LRESULT CFindFolder::StartSearch(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL & pSearchData->szFileName = pSearchParams->szFileName; pSearchData->szQueryA = pSearchParams->szQuery; pSearchData->szQueryW = pSearchParams->szQuery; + + // UTF-16 BE + { + CStringW utf16 = pSearchData->szQueryW; + LPWSTR psz = utf16.GetBuffer(); + for (SIZE_T i = 0; psz[i]; ++i) + { + psz[i] = MAKEWORD(HIBYTE(psz[i]), LOBYTE(psz[i])); + } + utf16.ReleaseBuffer(); + pSearchData->szQueryU16BE = utf16; + } + + // UTF-8 + { + CStringA utf8; + INT cch = WideCharToMultiByte(CP_UTF8, 0, pSearchData->szQueryW, -1, NULL, 0, NULL, NULL); + if (cch > 0) + { + LPSTR psz = utf8.GetBuffer(cch); + WideCharToMultiByte(CP_UTF8, 0, pSearchData->szQueryW, -1, psz, cch, NULL, NULL); + utf8.ReleaseBuffer(); + pSearchData->szQueryU8 = utf8; + } + else + { + pSearchData->szQueryU8 = pSearchData->szQueryA; + } + } + pSearchData->SearchHidden = pSearchParams->SearchHidden; SHFree(pSearchParams);

1 0

[reactos] 01/01: [BROWSEUI] Improve Japanese translation
by Katayama Hirofumi MZ 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ea54062b07fb5ed255a8… commit 7ea54062b07fb5ed255a858ae4182c7756114d78 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 17:11:31 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 7 17:11:31 2020 +0900 [BROWSEUI] Improve Japanese translation --- dll/win32/browseui/lang/ja-JP.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index aac4a1e3105..569fd619fef 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -1,4 +1,4 @@ -/* + /* * Copyright 2016-2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or @@ -156,10 +156,10 @@ FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN LTEXT "以下に指定した検索条件で検索します。", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "ファイル名の一部または全部の(&O):", -1, 10, 25, 500, 10 + LTEXT "ファイル名の一部または全部(&O):", -1, 10, 25, 500, 10 EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "ファイル内部の単語またはフレーズ(&W):", -1, 10, 50, 500, 10 + LTEXT "ファイル内部の単語または句(&W):", -1, 10, 50, 500, 10 EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP LTEXT "次のフォルダ内部(&L):", -1, 10, 75, 500, 10 @@ -345,7 +345,7 @@ END STRINGTABLE BEGIN - IDS_SEARCH_RESULTS "Search Results" + IDS_SEARCH_RESULTS "検索結果" IDS_SEARCHINVALID "'%1' は有効なフォルダではありません。" IDS_SEARCH_FOLDER "%s を検索中" IDS_SEARCH_FILES_FOUND "%u 個のファイルが見つかりました" @@ -357,6 +357,6 @@ END STRINGTABLE BEGIN - IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" - IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." + IDS_PARSE_ADDR_ERR_TITLE "ReactOS エクスプローラ" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS エクスプローラは '%1' を見つけられませんでした。スペルを確認してやり直して下さい。" END

1 0

[reactos] 01/01: [SHELLFIND] Fix directory search upon non-empty word/phrase query (#3130)
by Katayama Hirofumi MZ 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dd4f8714d72cebeaca3b… commit 2dd4f8714d72cebeaca3b50ba4d48df7e91e7375 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 15:48:25 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 7 15:48:25 2020 +0900 [SHELLFIND] Fix directory search upon non-empty word/phrase query (#3130) If the search phrase was not empty, it must not match the directory. CORE-17244 --- dll/win32/browseui/shellfind/CFindFolder.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index fb6ba371dda..d3c2b6f3c5c 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -280,8 +280,9 @@ static UINT RecursiveFind(LPCWSTR lpPath, _SearchData *pSearchData) if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { CStringW status; - if (FileNameMatch(FindData.cFileName, pSearchData) - && AttribHiddenMatch(FindData.dwFileAttributes, pSearchData)) + if (pSearchData->szQueryW.IsEmpty() && + FileNameMatch(FindData.cFileName, pSearchData) && + AttribHiddenMatch(FindData.dwFileAttributes, pSearchData)) { PostMessageW(pSearchData->hwnd, WM_SEARCH_ADD_RESULT, 0, (LPARAM) StrDupW(szPath)); uTotalFound++;

1 0

[reactos] 01/01: [NTOS:IO] Fix IRP stack location check in IoForwardIrpSynchronously We are doing IoCallDriver here, so the valid stack location should be CurrentLocation <= Irp->StackCount (just a check for a completly incorrect value) && CurrentLocation > 1 (ensure that we have a place for another call)
by Victor Perevertkin 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f562f9c5c629cba3f370f… commit f562f9c5c629cba3f370f078d12c2f13a997c8f2 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Sep 7 04:57:17 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Sep 7 04:57:17 2020 +0300 [NTOS:IO] Fix IRP stack location check in IoForwardIrpSynchronously We are doing IoCallDriver here, so the valid stack location should be CurrentLocation <= Irp->StackCount (just a check for a completly incorrect value) && CurrentLocation > 1 (ensure that we have a place for another call) CORE-17189 Co-authored-by: Thomas Faber <thomas.faber(a)reactos.org> --- ntoskrnl/io/iomgr/irp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/irp.c b/ntoskrnl/io/iomgr/irp.c index 1b19d49e9a4..2de843975e0 100644 --- a/ntoskrnl/io/iomgr/irp.c +++ b/ntoskrnl/io/iomgr/irp.c @@ -1629,7 +1629,7 @@ IoForwardIrpSynchronously(IN PDEVICE_OBJECT DeviceObject, NTSTATUS Status; /* Check if next stack location is available */ - if (Irp->CurrentLocation < Irp->StackCount) + if (Irp->CurrentLocation > Irp->StackCount || Irp->CurrentLocation <= 1) { /* No more stack location */ return FALSE;

1 0

[reactos] 01/01: [BROWSEUI][SHELL32] Implement MoveTo/CopyTo buttons (#3128)
by Katayama Hirofumi MZ 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8fa3c147b6d15eca9e081… commit 8fa3c147b6d15eca9e081df9dfcb487f723dbd0a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 09:42:43 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 7 09:42:43 2020 +0900 [BROWSEUI][SHELL32] Implement MoveTo/CopyTo buttons (#3128) Implement the actions of the MoveTo/CopyTo/Delete buttons. CORE-11132 --- dll/win32/browseui/internettoolbar.cpp | 4 ++++ dll/win32/shell32/CDefaultContextMenu.cpp | 11 +++++++++++ dll/win32/shell32/shresdef.h | 1 + 3 files changed, 16 insertions(+) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index d6f6145553d..ea67bd576d5 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -1539,6 +1539,10 @@ LRESULT CInternetToolbar::OnForwardToCommandTarget(WORD wNotifyCode, WORD wID, H if (fCommandTarget.p != NULL) { hResult = fCommandTarget->Exec(&fCommandCategory, wID, 0, NULL, NULL); + if (FAILED(hResult)) + { + ::SendMessageW(::GetParent(m_hWnd), WM_COMMAND, wID, 0); + } } return 1; } diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 30d1433df65..d6b0d98d7a8 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -95,6 +95,7 @@ class CDefaultContextMenu : HRESULT DoCopyOrCut(LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy); HRESULT DoRename(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoProperties(LPCMINVOKECOMMANDINFO lpcmi); + HRESULT DoUndo(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateNewFolder(LPCMINVOKECOMMANDINFO lpici); HRESULT DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFO lpici, BOOL bCopy); HRESULT InvokeShellExt(LPCMINVOKECOMMANDINFO lpcmi); @@ -895,6 +896,13 @@ CDefaultContextMenu::DoProperties( return S_OK; } +HRESULT +CDefaultContextMenu::DoUndo(LPCMINVOKECOMMANDINFO lpcmi) +{ + ERR("TODO: Undo"); + return E_NOTIMPL; +} + HRESULT CDefaultContextMenu::DoCopyToMoveToFolder(LPCMINVOKECOMMANDINFO lpici, BOOL bCopy) { @@ -1293,6 +1301,9 @@ CDefaultContextMenu::InvokeCommand( case FCIDM_SHVIEW_MOVETO: Result = DoCopyToMoveToFolder(&LocalInvokeInfo, FALSE); break; + case FCIDM_SHVIEW_UNDO: + Result = DoUndo(&LocalInvokeInfo); + break; default: Result = E_INVALIDARG; ERR("Unhandled Verb %xl\n", LOWORD(LocalInvokeInfo.lpVerb)); diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index e3be5f4f255..391b8330b2b 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -797,6 +797,7 @@ #define FCIDM_TB_REPORTVIEW 0xA004 #define FCIDM_TB_DESKTOP 0xA005 /* FIXME */ +#define IDM_UNDO (FCIDM_SHVIEW_UNDO - 0x7000) #define IDM_CUT (FCIDM_SHVIEW_CUT - 0x7000) #define IDM_COPY (FCIDM_SHVIEW_COPY - 0x7000) #define IDM_INSERT (FCIDM_SHVIEW_INSERT - 0x7000)

1 0

[reactos] 01/01: [BROWSEUI] Set DT_VCENTER to Explorer bars (#3135)
by Katayama Hirofumi MZ 07 Sep '20

07 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=828cf19a2905331e2ea27… commit 828cf19a2905331e2ea27d2210a3be5ea23c6404 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 7 09:33:21 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 7 09:33:21 2020 +0900 [BROWSEUI] Set DT_VCENTER to Explorer bars (#3135) Make the captions of the explorer bars vertically centered. --- dll/win32/browseui/basebarsite.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/basebarsite.cpp b/dll/win32/browseui/basebarsite.cpp index 292d897e879..0677e2a9e4f 100644 --- a/dll/win32/browseui/basebarsite.cpp +++ b/dll/win32/browseui/basebarsite.cpp @@ -729,12 +729,13 @@ LRESULT CBaseBarSite::OnCustomDraw(LPNMCUSTOMDRAW pnmcd) rt = pnmcd->rc; rt.right -= 24; rt.left += 2; + rt.bottom -= 1; if (FAILED_UNEXPECTEDLY(GetInternalBandInfo(index, &info, RBBIM_TEXT))) return CDRF_SKIPDEFAULT; newFont = GetTitleFont(); if (newFont) oldFont = (HFONT)SelectObject(pnmcd->hdc, newFont); - DrawText(pnmcd->hdc, info.lpText, -1, &rt, DT_SINGLELINE | DT_LEFT); + DrawText(pnmcd->hdc, info.lpText, -1, &rt, DT_SINGLELINE | DT_LEFT | DT_VCENTER); SelectObject(pnmcd->hdc, oldFont); DeleteObject(newFont); return CDRF_SKIPDEFAULT;

1 0

[reactos] 01/01: [GDI32] Fix double cx's in call to HANDLE_METADC in win32ss painting.c (#3137)
by Doug Lyons 06 Sep '20

06 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7624a987063888e275c18… commit 7624a987063888e275c18a9e8c10c01a19b971a1 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Sep 6 11:08:03 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 6 18:08:03 2020 +0200 [GDI32] Fix double cx's in call to HANDLE_METADC in win32ss painting.c (#3137) Fix copy-paste error. --- win32ss/gdi/gdi32/objects/painting.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/painting.c b/win32ss/gdi/gdi32/objects/painting.c index 2f9564ceb22..17f64b8b384 100644 --- a/win32ss/gdi/gdi32/objects/painting.c +++ b/win32ss/gdi/gdi32/objects/painting.c @@ -469,12 +469,12 @@ BitBlt( xDest, yDest, cx, - cx, + cy, hdcSrc, xSrc, ySrc, cx, - cx, + cy, dwRop); if ( GdiConvertAndCheckDC(hdcDest) == NULL ) return FALSE;

1 0

[reactos] 19/19: [RAPPS] settings read/write refactor (#3101)
by He Yang 06 Sep '20

06 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1974d21dc591615968c9… commit e1974d21dc591615968c995b054e96d80d6229f8 Author: He Yang <1160386205(a)qq.com> AuthorDate: Sat Aug 29 20:32:59 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:18 2020 +0200 [RAPPS] settings read/write refactor (#3101) * [RAPPS] move settings-related stuff to a separate file * [RAPPS] refactor reg read/write * [RAPPS] add params for Load/SaveSettings, no longer use global vars --- base/applications/rapps/CMakeLists.txt | 2 + base/applications/rapps/gui.cpp | 2 +- .../rapps/include/{winmain.h => settings.h} | 13 +- base/applications/rapps/include/winmain.h | 30 +-- base/applications/rapps/settings.cpp | 243 +++++++++++++++++++++ base/applications/rapps/settingsdlg.cpp | 2 +- base/applications/rapps/winmain.cpp | 86 +------- 7 files changed, 254 insertions(+), 124 deletions(-) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index 4a0dfabfd7f..62a61d24b95 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND SOURCE integrity.cpp loaddlg.cpp misc.cpp + settings.cpp settingsdlg.cpp winmain.cpp unattended.cpp @@ -30,6 +31,7 @@ list(APPEND SOURCE include/crichedit.h include/defines.h include/misc.h + include/settings.h include/resource.h include/rosui.h include/winmain.h diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 50f4b14f810..fb414504fc7 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -316,7 +316,7 @@ BOOL CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARA case WM_DESTROY: { ShowWindow(SW_HIDE); - SaveSettings(hwnd); + SaveSettings(hwnd, &SettingsInfo); FreeLogs(); m_AvailableApps.FreeCachedEntries(); diff --git a/base/applications/rapps/include/winmain.h b/base/applications/rapps/include/settings.h similarity index 73% copy from base/applications/rapps/include/winmain.h copy to base/applications/rapps/include/settings.h index 3b9397a0eda..a3b4b867ffd 100644 --- a/base/applications/rapps/include/winmain.h +++ b/base/applications/rapps/include/settings.h @@ -2,9 +2,6 @@ #include <windef.h> #include <wininet.h> -extern LPCWSTR szWindowClass; - -//TODO: Separate main and settings related definitions struct SETTINGS_INFO { BOOL bSaveWndPos; @@ -29,12 +26,8 @@ struct SETTINGS_INFO typedef SETTINGS_INFO *PSETTINGS_INFO; -extern HWND hMainWnd; -extern HINSTANCE hInst; -extern SETTINGS_INFO SettingsInfo; - -VOID SaveSettings(HWND hwnd); +BOOL LoadSettings(PSETTINGS_INFO pSettingsInfo); +BOOL SaveSettings(HWND hwnd, PSETTINGS_INFO pSettingsInfo); VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); -// integrity.cpp -BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); +extern SETTINGS_INFO SettingsInfo; diff --git a/base/applications/rapps/include/winmain.h b/base/applications/rapps/include/winmain.h index 3b9397a0eda..d6a214298a6 100644 --- a/base/applications/rapps/include/winmain.h +++ b/base/applications/rapps/include/winmain.h @@ -1,40 +1,12 @@ #pragma once #include <windef.h> #include <wininet.h> +#include "settings.h" extern LPCWSTR szWindowClass; -//TODO: Separate main and settings related definitions -struct SETTINGS_INFO -{ - BOOL bSaveWndPos; - BOOL bUpdateAtStart; - BOOL bLogEnabled; - WCHAR szDownloadDir[MAX_PATH]; - BOOL bDelInstaller; - /* Window Pos */ - BOOL Maximized; - INT Left; - INT Top; - INT Width; - INT Height; - /* Proxy settings */ - INT Proxy; - WCHAR szProxyServer[MAX_PATH]; - WCHAR szNoProxyFor[MAX_PATH]; - /* Software source settings */ - BOOL bUseSource; - WCHAR szSourceURL[INTERNET_MAX_URL_LENGTH]; -}; - -typedef SETTINGS_INFO *PSETTINGS_INFO; - extern HWND hMainWnd; extern HINSTANCE hInst; -extern SETTINGS_INFO SettingsInfo; - -VOID SaveSettings(HWND hwnd); -VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); // integrity.cpp BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); diff --git a/base/applications/rapps/settings.cpp b/base/applications/rapps/settings.cpp new file mode 100644 index 00000000000..57c7b55ba06 --- /dev/null +++ b/base/applications/rapps/settings.cpp @@ -0,0 +1,243 @@ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Functions to load / save settings from reg. + * COPYRIGHT: Copyright 2020 He Yang (1160386205(a)qq.com) + */ + +#include "rapps.h" +#include "settings.h" + + +class SettingsField +{ +public: + virtual ~SettingsField() { ; } + virtual BOOL Save(CRegKey &key) = 0; + virtual BOOL Load(CRegKey &key) = 0; +}; + +class SettingsFieldBool : public SettingsField +{ +public: + SettingsFieldBool(BOOL *pValue, LPCWSTR szRegName) + : m_pValueStore(pValue), m_RegName(szRegName) + { + } + + virtual BOOL Save(CRegKey &key) override + { + return key.SetDWORDValue(m_RegName, (DWORD)(*m_pValueStore)) == ERROR_SUCCESS; + } + virtual BOOL Load(CRegKey &key) override + { + DWORD dwField; + LONG lResult = key.QueryDWORDValue(m_RegName, dwField); + if (lResult != ERROR_SUCCESS) + { + return FALSE; + } + *m_pValueStore = (BOOL)dwField; + return TRUE; + } + +private: + BOOL *m_pValueStore; // where to read/store the value + LPCWSTR m_RegName; // key name in registery +}; + +class SettingsFieldInt : public SettingsField +{ +public: + SettingsFieldInt(INT *pValue, LPCWSTR szRegName) + : m_pValueStore(pValue), m_RegName(szRegName) + { + } + + virtual BOOL Save(CRegKey &key) override + { + return key.SetDWORDValue(m_RegName, (DWORD)(*m_pValueStore)) == ERROR_SUCCESS; + } + virtual BOOL Load(CRegKey &key) override + { + DWORD dwField; + LONG lResult = key.QueryDWORDValue(m_RegName, dwField); + if (lResult != ERROR_SUCCESS) + { + return FALSE; + } + *m_pValueStore = (INT)dwField; + return TRUE; + } + +private: + INT *m_pValueStore; // where to read/store the value + LPCWSTR m_RegName; // key name in registery +}; + +class SettingsFieldString : public SettingsField +{ +public: + SettingsFieldString(WCHAR *pString, ULONG cchLen, LPCWSTR szRegName) + : m_pStringStore(pString), m_StringLen(cchLen), m_RegName(szRegName) + { + } + + virtual BOOL Save(CRegKey &key) override + { + return key.SetStringValue(m_RegName, m_pStringStore) == ERROR_SUCCESS; + } + virtual BOOL Load(CRegKey &key) override + { + ULONG nChar = m_StringLen - 1; // make sure the terminating L'\0' + LONG lResult = key.QueryStringValue(m_RegName, m_pStringStore, &nChar); + return lResult == ERROR_SUCCESS; + } + +private: + WCHAR *m_pStringStore; // where to read/store the value + ULONG m_StringLen; // string length, in chars + LPCWSTR m_RegName; // key name in registery +}; + + +void AddInfoFields(ATL::CAtlList<SettingsField *> &infoFields, SETTINGS_INFO &settings) +{ + infoFields.AddTail(new SettingsFieldBool(&(settings.bSaveWndPos), L"bSaveWndPos")); + infoFields.AddTail(new SettingsFieldBool(&(settings.bUpdateAtStart), L"bUpdateAtStart")); + infoFields.AddTail(new SettingsFieldBool(&(settings.bLogEnabled), L"bLogEnabled")); + infoFields.AddTail(new SettingsFieldString(settings.szDownloadDir, MAX_PATH, L"szDownloadDir")); + infoFields.AddTail(new SettingsFieldBool(&(settings.bDelInstaller), L"bDelInstaller")); + infoFields.AddTail(new SettingsFieldBool(&(settings.Maximized), L"WindowPosMaximized")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Left), L"WindowPosLeft")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Top), L"WindowPosTop")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Width), L"WindowPosWidth")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Height), L"WindowPosHeight")); + infoFields.AddTail(new SettingsFieldInt(&(settings.Proxy), L"ProxyMode")); + infoFields.AddTail(new SettingsFieldString((settings.szProxyServer), MAX_PATH, L"ProxyServer")); + infoFields.AddTail(new SettingsFieldString((settings.szNoProxyFor), MAX_PATH, L"NoProxyFor")); + infoFields.AddTail(new SettingsFieldBool(&(settings.bUseSource), L"bUseSource")); + infoFields.AddTail(new SettingsFieldString((settings.szSourceURL), INTERNET_MAX_URL_LENGTH, L"SourceURL")); + + return; +} + +BOOL SaveAllSettings(CRegKey &key, SETTINGS_INFO &settings) +{ + BOOL bAllSuccess = TRUE; + ATL::CAtlList<SettingsField *> infoFields; + + AddInfoFields(infoFields, settings); + + POSITION InfoListPosition = infoFields.GetHeadPosition(); + while (InfoListPosition) + { + SettingsField *Info = infoFields.GetNext(InfoListPosition); + if (!Info->Save(key)) + { + bAllSuccess = FALSE; + // TODO: error log + } + delete Info; + } + return bAllSuccess; +} + +BOOL LoadAllSettings(CRegKey &key, SETTINGS_INFO &settings) +{ + BOOL bAllSuccess = TRUE; + ATL::CAtlList<SettingsField *> infoFields; + + AddInfoFields(infoFields, settings); + + POSITION InfoListPosition = infoFields.GetHeadPosition(); + while (InfoListPosition) + { + SettingsField *Info = infoFields.GetNext(InfoListPosition); + if (!Info->Load(key)) + { + bAllSuccess = FALSE; + // TODO: error log + } + delete Info; + } + return bAllSuccess; +} + +VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) +{ + ATL::CStringW szDownloadDir; + ZeroMemory(pSettingsInfo, sizeof(SETTINGS_INFO)); + + pSettingsInfo->bSaveWndPos = TRUE; + pSettingsInfo->bUpdateAtStart = FALSE; + pSettingsInfo->bLogEnabled = TRUE; + pSettingsInfo->bUseSource = FALSE; + + if (FAILED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, szDownloadDir.GetBuffer(MAX_PATH)))) + { + szDownloadDir.ReleaseBuffer(); + if (!szDownloadDir.GetEnvironmentVariableW(L"SystemDrive")) + { + szDownloadDir = L"C:"; + } + } + else + { + szDownloadDir.ReleaseBuffer(); + } + + PathAppendW(szDownloadDir.GetBuffer(MAX_PATH), L"\\RAPPS Downloads"); + szDownloadDir.ReleaseBuffer(); + + ATL::CStringW::CopyChars(pSettingsInfo->szDownloadDir, + _countof(pSettingsInfo->szDownloadDir), + szDownloadDir.GetString(), + szDownloadDir.GetLength() + 1); + + pSettingsInfo->bDelInstaller = FALSE; + pSettingsInfo->Maximized = FALSE; + pSettingsInfo->Left = CW_USEDEFAULT; + pSettingsInfo->Top = CW_USEDEFAULT; + pSettingsInfo->Width = 680; + pSettingsInfo->Height = 450; +} + +BOOL LoadSettings(PSETTINGS_INFO pSettingsInfo) +{ + ATL::CRegKey RegKey; + if (RegKey.Open(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", KEY_READ) != ERROR_SUCCESS) + { + return FALSE; + } + + return LoadAllSettings(RegKey, *pSettingsInfo); +} + +BOOL SaveSettings(HWND hwnd, PSETTINGS_INFO pSettingsInfo) +{ + WINDOWPLACEMENT wp; + ATL::CRegKey RegKey; + + if (pSettingsInfo->bSaveWndPos) + { + wp.length = sizeof(wp); + GetWindowPlacement(hwnd, &wp); + + pSettingsInfo->Left = wp.rcNormalPosition.left; + pSettingsInfo->Top = wp.rcNormalPosition.top; + pSettingsInfo->Width = wp.rcNormalPosition.right - wp.rcNormalPosition.left; + pSettingsInfo->Height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top; + pSettingsInfo->Maximized = (wp.showCmd == SW_MAXIMIZE + || (wp.showCmd == SW_SHOWMINIMIZED + && (wp.flags & WPF_RESTORETOMAXIMIZED))); + } + + if (RegKey.Create(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL) != ERROR_SUCCESS) + { + return FALSE; + } + + return SaveAllSettings(RegKey, *pSettingsInfo); +} diff --git a/base/applications/rapps/settingsdlg.cpp b/base/applications/rapps/settingsdlg.cpp index 8943c1ac98e..d1f36519d9a 100644 --- a/base/applications/rapps/settingsdlg.cpp +++ b/base/applications/rapps/settingsdlg.cpp @@ -260,7 +260,7 @@ namespace } SettingsInfo = NewSettingsInfo; - SaveSettings(GetParent(hDlg)); + SaveSettings(GetParent(hDlg), &SettingsInfo); EndDialog(hDlg, LOWORD(wParam)); } break; diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 253c802ad61..9d36df598eb 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -10,6 +10,8 @@ #include "unattended.h" +#include "winmain.h" + #include <atlcom.h> #include <gdiplus.h> @@ -61,88 +63,6 @@ VOID InitializeGDIPlus(BOOL bInitialize) } } -VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) -{ - ATL::CStringW szDownloadDir; - ZeroMemory(pSettingsInfo, sizeof(SETTINGS_INFO)); - - pSettingsInfo->bSaveWndPos = TRUE; - pSettingsInfo->bUpdateAtStart = FALSE; - pSettingsInfo->bLogEnabled = TRUE; - pSettingsInfo->bUseSource = FALSE; - - if (FAILED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, szDownloadDir.GetBuffer(MAX_PATH)))) - { - szDownloadDir.ReleaseBuffer(); - if (!szDownloadDir.GetEnvironmentVariableW(L"SystemDrive")) - { - szDownloadDir = L"C:"; - } - } - else - { - szDownloadDir.ReleaseBuffer(); - } - - PathAppendW(szDownloadDir.GetBuffer(MAX_PATH), L"\\RAPPS Downloads"); - szDownloadDir.ReleaseBuffer(); - - ATL::CStringW::CopyChars(pSettingsInfo->szDownloadDir, - _countof(pSettingsInfo->szDownloadDir), - szDownloadDir.GetString(), - szDownloadDir.GetLength() + 1); - - pSettingsInfo->bDelInstaller = FALSE; - pSettingsInfo->Maximized = FALSE; - pSettingsInfo->Left = CW_USEDEFAULT; - pSettingsInfo->Top = CW_USEDEFAULT; - pSettingsInfo->Width = 680; - pSettingsInfo->Height = 450; -} - -static BOOL LoadSettings() -{ - ATL::CRegKey RegKey; - DWORD dwSize; - BOOL bResult = FALSE; - if (RegKey.Open(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", KEY_READ) == ERROR_SUCCESS) - { - dwSize = sizeof(SettingsInfo); - bResult = (RegKey.QueryBinaryValue(L"Settings", (PVOID) &SettingsInfo, &dwSize) == ERROR_SUCCESS); - - RegKey.Close(); - } - - return bResult; -} - -VOID SaveSettings(HWND hwnd) -{ - WINDOWPLACEMENT wp; - ATL::CRegKey RegKey; - - if (SettingsInfo.bSaveWndPos) - { - wp.length = sizeof(wp); - GetWindowPlacement(hwnd, &wp); - - SettingsInfo.Left = wp.rcNormalPosition.left; - SettingsInfo.Top = wp.rcNormalPosition.top; - SettingsInfo.Width = wp.rcNormalPosition.right - wp.rcNormalPosition.left; - SettingsInfo.Height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top; - SettingsInfo.Maximized = (wp.showCmd == SW_MAXIMIZE - || (wp.showCmd == SW_SHOWMINIMIZED - && (wp.flags & WPF_RESTORETOMAXIMIZED))); - } - - if (RegKey.Create(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL) == ERROR_SUCCESS) - { - RegKey.SetBinaryValue(L"Settings", (const PVOID) &SettingsInfo, sizeof(SettingsInfo)); - RegKey.Close(); - } -} - int wmain(int argc, wchar_t *argv[]) { BOOL bIsFirstLaunch; @@ -157,7 +77,7 @@ int wmain(int argc, wchar_t *argv[]) hInst = GetModuleHandle(NULL); - bIsFirstLaunch = !LoadSettings(); + bIsFirstLaunch = !LoadSettings(&SettingsInfo); if (bIsFirstLaunch) { FillDefaultSettings(&SettingsInfo);

1 0

[reactos] 18/19: [RAPPS] improve ConInitStdStreams initialization logic (#3098)
by He Yang 06 Sep '20

06 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce0110195bad5df47b8ec… commit ce0110195bad5df47b8ec2c87ac539c81297409f Author: He Yang <1160386205(a)qq.com> AuthorDate: Wed Aug 26 17:10:51 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:18 2020 +0200 [RAPPS] improve ConInitStdStreams initialization logic (#3098) --- base/applications/rapps/unattended.cpp | 14 ++++++++++---- base/applications/rapps/winmain.cpp | 2 -- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 839d8a53dcf..d20ef8aa3f2 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -40,6 +40,7 @@ BOOL HandleInstallCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) { if (argcLeft == 0) { + ConInitStdStreams(); // Initialize the Console Standard Streams ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_PACKAGE_NAME, szCommand); return FALSE; } @@ -72,9 +73,11 @@ BOOL HandleSetupCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) { if (argcLeft != 1) { + ConInitStdStreams(); // Initialize the Console Standard Streams ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_FILE_NAME, szCommand); return FALSE; } + FreeConsole(); ATL::CSimpleArray<ATL::CStringW> PkgNameList; HINF InfHandle = SetupOpenInfFileW(argvLeft[0], NULL, INF_STYLE_WIN4, NULL); @@ -272,6 +275,8 @@ BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) if (hMutex) CloseHandle(hMutex); + + return TRUE; } else if (MatchCmdOption(argv[1], CMD_KEY_INSTALL)) { @@ -281,7 +286,11 @@ BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) { return HandleSetupCommand(argv[1], argc - 2, argv + 2); } - else if (MatchCmdOption(argv[1], CMD_KEY_FIND)) + + + ConInitStdStreams(); // Initialize the Console Standard Streams + + if (MatchCmdOption(argv[1], CMD_KEY_FIND)) { return HandleFindCommand(argv[1], argc - 2, argv + 2); } @@ -299,7 +308,4 @@ BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) ConResPuts(StdOut, IDS_CMD_INVALID_OPTION); return FALSE; } - - - return TRUE; } diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 740e4fa828f..253c802ad61 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -145,8 +145,6 @@ VOID SaveSettings(HWND hwnd) int wmain(int argc, wchar_t *argv[]) { - ConInitStdStreams(); // Initialize the Console Standard Streams - BOOL bIsFirstLaunch; InitializeAtlModule(GetModuleHandle(NULL), TRUE);

1 0

[reactos] 17/19: [RAPPS] cmdline enhancement (#3087)
by He Yang 06 Sep '20

06 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a11c65561d224c688ba3… commit 7a11c65561d224c688ba371044e52b17e1a70b6d Author: He Yang <1160386205(a)qq.com> AuthorDate: Tue Aug 25 17:06:30 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:18 2020 +0200 [RAPPS] cmdline enhancement (#3087) * [RAPPS] now command-line option supports begin with both / and - * [RAPPS] Add help command with /? * [RAPPS] add /find command * [RAPPS] add /info option * [RAPPS] add copyright and contact e-mail --- base/applications/rapps/CMakeLists.txt | 5 +- base/applications/rapps/gui.cpp | 15 +- base/applications/rapps/include/dialogs.h | 2 +- base/applications/rapps/include/gui.h | 4 +- base/applications/rapps/include/misc.h | 2 + base/applications/rapps/include/resource.h | 10 + base/applications/rapps/include/unattended.h | 12 +- base/applications/rapps/include/winmain.h | 2 + base/applications/rapps/lang/bg-BG.rc | 12 ++ base/applications/rapps/lang/cs-CZ.rc | 12 ++ base/applications/rapps/lang/de-DE.rc | 12 ++ base/applications/rapps/lang/en-US.rc | 12 ++ base/applications/rapps/lang/es-ES.rc | 12 ++ base/applications/rapps/lang/et-EE.rc | 12 ++ base/applications/rapps/lang/fr-FR.rc | 12 ++ base/applications/rapps/lang/he-IL.rc | 12 ++ base/applications/rapps/lang/id-ID.rc | 12 ++ base/applications/rapps/lang/it-IT.rc | 12 ++ base/applications/rapps/lang/ja-JP.rc | 12 ++ base/applications/rapps/lang/no-NO.rc | 12 ++ base/applications/rapps/lang/pl-PL.rc | 12 ++ base/applications/rapps/lang/pt-BR.rc | 12 ++ base/applications/rapps/lang/pt-PT.rc | 12 ++ base/applications/rapps/lang/ro-RO.rc | 12 ++ base/applications/rapps/lang/ru-RU.rc | 12 ++ base/applications/rapps/lang/sk-SK.rc | 12 ++ base/applications/rapps/lang/sq-AL.rc | 12 ++ base/applications/rapps/lang/sv-SE.rc | 12 ++ base/applications/rapps/lang/tr-TR.rc | 12 ++ base/applications/rapps/lang/uk-UA.rc | 12 ++ base/applications/rapps/lang/zh-CN.rc | 12 ++ base/applications/rapps/lang/zh-TW.rc | 12 ++ base/applications/rapps/misc.cpp | 8 + base/applications/rapps/unattended.cpp | 294 ++++++++++++++++++++++++--- base/applications/rapps/winmain.cpp | 46 ++--- 35 files changed, 605 insertions(+), 83 deletions(-) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index 4be7ed458bf..4a0dfabfd7f 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -4,6 +4,7 @@ set_cpp(WITH_RUNTIME) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cryptlib) +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) include_directories(include) list(APPEND SOURCE @@ -42,8 +43,8 @@ add_definitions( file(GLOB_RECURSE rapps_rc_deps res/*.*) add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) -set_module_type(rapps win32gui UNICODE) -target_link_libraries(rapps uuid wine) +set_module_type(rapps win32cui UNICODE) +target_link_libraries(rapps conutils ${PSEH_LIB} uuid wine) add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 setupapi gdiplus msvcrt kernel32 ntdll) add_pch(rapps include/rapps.h SOURCE) add_dependencies(rapps rappsmsg) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 7732d18e501..50f4b14f810 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -15,6 +15,7 @@ #include "misc.h" #include "gui.h" #include "appview.h" +#include "winmain.h" #include <shlobj_undoc.h> #include <shlguid_undoc.h> @@ -51,7 +52,7 @@ HTREEITEM CSideTreeView::AddItem(HTREEITEM hParent, ATL::CStringW &Text, INT Ima HTREEITEM CSideTreeView::AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex) { ATL::CStringW szText; - INT Index; + INT Index = 0; HICON hIcon; hIcon = (HICON)LoadImageW(hInst, @@ -613,14 +614,6 @@ VOID CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) } } -BOOL CMainWindow::SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle) -{ - if (!*szNeedle) - return TRUE; - /* TODO: Improve pattern search beyond a simple case-insensitive substring search. */ - return StrStrIW(szHaystack, szNeedle) != NULL; -} - BOOL CALLBACK CMainWindow::EnumInstalledAppProc(CInstalledApplicationInfo *Info) { if (!SearchPatternMatch(Info->szDisplayName.GetString(), szSearchPattern)) @@ -723,7 +716,7 @@ ATL::CWndClassInfo &CMainWindow::GetWndClassInfo() LoadCursorW(NULL, IDC_ARROW), (HBRUSH)(COLOR_BTNFACE + 1), MAKEINTRESOURCEW(IDR_MAINMENU), - L"RAppsWnd", + szWindowClass, NULL }, NULL, NULL, IDC_ARROW, TRUE, 0, _T("") @@ -861,7 +854,7 @@ void CMainWindow::HandleTabOrder(int direction) -VOID ShowMainWindow(INT nShowCmd) +VOID MainWindowLoop(INT nShowCmd) { HACCEL KeyBrd; MSG Msg; diff --git a/base/applications/rapps/include/dialogs.h b/base/applications/rapps/include/dialogs.h index aa5afa6ce7c..917effd8c6e 100644 --- a/base/applications/rapps/include/dialogs.h +++ b/base/applications/rapps/include/dialogs.h @@ -9,7 +9,7 @@ VOID CreateSettingsDlg(HWND hwnd); //Main window -VOID ShowMainWindow(INT nShowCmd); +VOID MainWindowLoop(INT nShowCmd); // Download dialogs VOID DownloadApplicationsDB(LPCWSTR lpUrl, BOOL IsOfficial); diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h index 772bd2f71cb..1d8b6141ece 100644 --- a/base/applications/rapps/include/gui.h +++ b/base/applications/rapps/include/gui.h @@ -98,8 +98,6 @@ private: VOID OnCommand(WPARAM wParam, LPARAM lParam); - static BOOL SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle); - BOOL CALLBACK EnumInstalledAppProc(CInstalledApplicationInfo *Info); BOOL CALLBACK EnumAvailableAppProc(CAvailableApplicationInfo *Info, BOOL bInitialCheckState); @@ -134,4 +132,4 @@ public: }; -VOID ShowMainWindow(INT nShowCmd); +VOID MainWindowLoop(INT nShowCmd); diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 9f28f267033..58890958f3d 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -56,3 +56,5 @@ BOOL IsSystem64Bit(); INT GetSystemColorDepth(); void UnixTimeToFileTime(DWORD dwUnixTime, LPFILETIME pFileTime); + +BOOL SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle); diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 6ea0ca1a321..023fcdda882 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -218,6 +218,16 @@ #define IDS_DL_DIALOG_DB_DOWNLOAD_DISP 951 #define IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP 952 +/* Command-line related strings */ +#define IDS_CMD_USAGE 953 +#define IDS_CMD_NEED_PACKAGE_NAME 954 +#define IDS_CMD_NEED_FILE_NAME 955 +#define IDS_CMD_NEED_PARAMS 956 +#define IDS_CMD_INVALID_OPTION 957 +#define IDS_CMD_FIND_RESULT_FOR 958 +#define IDS_CMD_PACKAGE_NOT_FOUND 959 +#define IDS_CMD_PACKAGE_INFO 960 + /* Accelerators */ #define HOTKEYS 715 diff --git a/base/applications/rapps/include/unattended.h b/base/applications/rapps/include/unattended.h index 93d19344260..c5bc8797b01 100644 --- a/base/applications/rapps/include/unattended.h +++ b/base/applications/rapps/include/unattended.h @@ -1,7 +1,11 @@ #pragma once -#define CMD_KEY_INSTALL L"/INSTALL" -#define CMD_KEY_SETUP L"/SETUP" +#define CMD_KEY_INSTALL L"INSTALL" +#define CMD_KEY_SETUP L"SETUP" +#define CMD_KEY_FIND L"FIND" +#define CMD_KEY_INFO L"INFO" +#define CMD_KEY_HELP L"?" -// return TRUE if the SETUP key was valid -BOOL UseCmdParameters(LPWSTR lpCmdLine); +const WCHAR UsageString[] = L"RAPPS [/" CMD_KEY_HELP "] [/" CMD_KEY_INSTALL " packagename] [/" CMD_KEY_SETUP " filename]"; + +BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow); diff --git a/base/applications/rapps/include/winmain.h b/base/applications/rapps/include/winmain.h index cbd9f3727f7..3b9397a0eda 100644 --- a/base/applications/rapps/include/winmain.h +++ b/base/applications/rapps/include/winmain.h @@ -2,6 +2,8 @@ #include <windef.h> #include <wininet.h> +extern LPCWSTR szWindowClass; + //TODO: Separate main and settings related definitions struct SETTINGS_INFO { diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 4ac81b14652..02cd569901c 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -255,3 +255,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 965c5b31380..4d1c6d6f20b 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -256,3 +256,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 8bd0a0bc36a..8e6a9e60374 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Datenbank-Aktualisierung…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 869868fd255..876d6675dcc 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index c9f224c17c3..634e868c375 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -254,3 +254,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizando listado…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Actualizando listado… (Origen no oficial)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 95f2f57a6f9..e1cea69039d 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -259,3 +259,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Andmebaasi uuendamine…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 22077326c2e..996ffa5c212 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Mise à jour de la base de données…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Mise à jour de la base de données… (Non officielle)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 79a272acb1c..b8054551e94 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -257,3 +257,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "מעדכן את מסד הנתונים..." IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index 0a65bcc1605..6da2e240587 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Memperbarui database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 6321268e6b1..b8567c41293 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aggiornamento Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 384eec172de..056c3f83086 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "データベースを更新中..." IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 8ce8f1915b3..75d6cd9228d 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index ca5b2615153..78ff3c3fc1a 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -259,3 +259,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aktualizowanie bazy programów…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index f60e57c4557..93bebf7c027 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -253,3 +253,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 31d968a260a..e41033d6904 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -253,3 +253,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizar base de dados…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "A actualizar Base de dados… (Fonte não oficial)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 7e28b9e41d1..2492348948b 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -260,3 +260,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizare baza de date…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 1ff0dd8651b..75095bb8148 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -251,3 +251,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Обновление базы данных…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 293028d37d6..9c2adf6c5d5 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -256,3 +256,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 51be3ed3eca..0dda1a8d984 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -255,3 +255,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index d4715ed0b35..5e5bfb233b3 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -258,3 +258,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index a612fc9b503..597055cd0dc 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -253,3 +253,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Veri Tabanı güncelleniyor…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 29067f4871f..54a7d402d51 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -259,3 +259,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Оновлення списку програм…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 25a12c4fb1f..a0e025ab3c9 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -254,3 +254,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "正在更新数据库…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "正在更新数据库… (非官方源)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 49f7dfb2c9f..82d2393d634 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -253,3 +253,15 @@ BEGIN IDS_DL_DIALOG_DB_DOWNLOAD_DISP "更新資料庫…" IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "正在更新資料庫… (非官方源)" END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Usage: " + IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" + IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" + IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" + IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" + IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" + IDS_CMD_PACKAGE_INFO "Information about package %1:\n" +END diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index 086adfcfb68..54a965bce13 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -522,3 +522,11 @@ void UnixTimeToFileTime(DWORD dwUnixTime, LPFILETIME pFileTime) pFileTime->dwLowDateTime = (DWORD)ll; pFileTime->dwHighDateTime = ll >> 32; } + +BOOL SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle) +{ + if (!*szNeedle) + return TRUE; + /* TODO: Improve pattern search beyond a simple case-insensitive substring search. */ + return StrStrIW(szHaystack, szNeedle) != NULL; +} diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index b37610c4149..839d8a53dcf 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -3,61 +3,100 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Functions to parse command-line flags and process them * COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + * Copyright 2020 He Yang (1160386205(a)qq.com) */ #include "rapps.h" #include "unattended.h" +#include "winmain.h" + #include <setupapi.h> -#define MIN_ARGS 3 +#include <conutils.h> -BOOL UseCmdParameters(LPWSTR lpCmdLine) +BOOL MatchCmdOption(LPWSTR argvOption, LPCWSTR szOptToMacth) { - INT argc; - LPWSTR* argv = CommandLineToArgvW(lpCmdLine, &argc); + WCHAR FirstCharList[] = { L'-', L'/' }; - if (!argv || argc < MIN_ARGS) + for (UINT i = 0; i < _countof(FirstCharList); i++) { + if (argvOption[0] == FirstCharList[i]) + { + if (StrCmpIW(argvOption + 1, szOptToMacth) == 0) + { + return TRUE; + } + else + { + return FALSE; + } + } + } + return FALSE; +} + +BOOL HandleInstallCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) +{ + if (argcLeft == 0) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_PACKAGE_NAME, szCommand); return FALSE; } + FreeConsole(); ATL::CSimpleArray<ATL::CStringW> PkgNameList; - if (!StrCmpIW(argv[1], CMD_KEY_INSTALL)) + + for (int i = 0; i < argcLeft; i++) { - for (INT i = 2; i < argc; ++i) - { - PkgNameList.Add(argv[i]); - } + PkgNameList.Add(argvLeft[i]); + } + + CAvailableApps apps; + apps.UpdateAppsDB(); + apps.Enum(ENUM_ALL_AVAILABLE, NULL, NULL); + + ATL::CSimpleArray<CAvailableApplicationInfo> arrAppInfo = apps.FindAppsByPkgNameList(PkgNameList); + if (arrAppInfo.GetSize() > 0) + { + DownloadListOfApplications(arrAppInfo, TRUE); + return TRUE; } else - if (!StrCmpIW(argv[1], CMD_KEY_SETUP)) { - HINF InfHandle = SetupOpenInfFileW(argv[2], NULL, INF_STYLE_WIN4, NULL); - if (InfHandle == INVALID_HANDLE_VALUE) - { - return FALSE; - } + return FALSE; + } +} - INFCONTEXT Context; - if (SetupFindFirstLineW(InfHandle, L"RAPPS", L"Install", &Context)) - { - WCHAR szPkgName[MAX_PATH]; - do - { - if (SetupGetStringFieldW(&Context, 1, szPkgName, _countof(szPkgName), NULL)) - { - PkgNameList.Add(szPkgName); - } - } while (SetupFindNextLine(&Context, &Context)); - } - SetupCloseInfFile(InfHandle); +BOOL HandleSetupCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) +{ + if (argcLeft != 1) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_FILE_NAME, szCommand); + return FALSE; } - else + + ATL::CSimpleArray<ATL::CStringW> PkgNameList; + HINF InfHandle = SetupOpenInfFileW(argvLeft[0], NULL, INF_STYLE_WIN4, NULL); + if (InfHandle == INVALID_HANDLE_VALUE) { return FALSE; } + INFCONTEXT Context; + if (SetupFindFirstLineW(InfHandle, L"RAPPS", L"Install", &Context)) + { + WCHAR szPkgName[MAX_PATH]; + do + { + if (SetupGetStringFieldW(&Context, 1, szPkgName, _countof(szPkgName), NULL)) + { + PkgNameList.Add(szPkgName); + } + } while (SetupFindNextLine(&Context, &Context)); + } + SetupCloseInfFile(InfHandle); + CAvailableApps apps; apps.UpdateAppsDB(); apps.Enum(ENUM_ALL_AVAILABLE, NULL, NULL); @@ -68,6 +107,199 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) DownloadListOfApplications(arrAppInfo, TRUE); return TRUE; } + else + { + return FALSE; + } +} - return FALSE; +BOOL CALLBACK CmdFindAppEnum(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param) +{ + LPCWSTR lpszSearch = (LPCWSTR)param; + if (!SearchPatternMatch(Info->m_szName.GetString(), lpszSearch) && + !SearchPatternMatch(Info->m_szDesc.GetString(), lpszSearch)) + { + return TRUE; + } + + ConPrintf(StdOut, (LPWSTR)L"%s (%s)\n", (LPCWSTR)(Info->m_szName), (LPCWSTR)(Info->m_szPkgName)); + return TRUE; +} + +BOOL HandleFindCommand(LPWSTR szCommand, int argcLeft, LPWSTR *argvLeft) +{ + if (argcLeft < 1) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_PARAMS, szCommand); + return FALSE; + } + + CAvailableApps apps; + apps.UpdateAppsDB(); + + for (int i = 0; i < argcLeft; i++) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_FIND_RESULT_FOR, argvLeft[i]); + apps.Enum(ENUM_ALL_AVAILABLE, CmdFindAppEnum, argvLeft[i]); + ConPrintf(StdOut, (LPWSTR)L"\n"); + } + + return TRUE; +} + +BOOL HandleInfoCommand(LPWSTR szCommand, int argcLeft, LPWSTR *argvLeft) +{ + if (argcLeft < 1) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_NEED_PARAMS, szCommand); + return FALSE; + } + + CAvailableApps apps; + apps.UpdateAppsDB(); + apps.Enum(ENUM_ALL_AVAILABLE, NULL, NULL); + + for (int i = 0; i < argcLeft; i++) + { + CAvailableApplicationInfo *AppInfo = apps.FindAppByPkgName(argvLeft[i]); + if (!AppInfo) + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_PACKAGE_NOT_FOUND, argvLeft[i]); + } + else + { + ConResMsgPrintf(StdOut, NULL, IDS_CMD_PACKAGE_INFO, argvLeft[i]); + // TODO: code about extracting information from CAvailableApplicationInfo (in appview.cpp, class CAppRichEdit) + // is in a mess. It should be refactored, and should not placed in class CAppRichEdit. + // and the code here should reused that code after refactor. + + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szName); + + if (AppInfo->m_szVersion) + { + ConResPrintf(StdOut, IDS_AINFO_VERSION); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szVersion); + } + + if (AppInfo->m_szLicense) + { + ConResPrintf(StdOut, IDS_AINFO_LICENSE); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szLicense); + } + + if (AppInfo->m_szSize) + { + ConResPrintf(StdOut, IDS_AINFO_SIZE); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szSize); + } + + if (AppInfo->m_szUrlSite) + { + ConResPrintf(StdOut, IDS_AINFO_URLSITE); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szUrlSite); + } + + if (AppInfo->m_szDesc) + { + ConResPrintf(StdOut, IDS_AINFO_DESCRIPTION); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szDesc); + } + + if (AppInfo->m_szUrlDownload) + { + ConResPrintf(StdOut, IDS_AINFO_URLDOWNLOAD); + ConPuts(StdOut, (LPWSTR)(LPCWSTR)AppInfo->m_szUrlDownload); + } + + ConPrintf(StdOut, (LPWSTR)L"\n"); + } + ConPrintf(StdOut, (LPWSTR)L"\n"); + } + return TRUE; +} + +BOOL HandleHelpCommand(LPWSTR szCommand, int argcLeft, LPWSTR * argvLeft) +{ + if (argcLeft != 0) + { + return FALSE; + } + + ConPrintf(StdOut, (LPWSTR)L"\n"); + ConResPuts(StdOut, IDS_APPTITLE); + ConPrintf(StdOut, (LPWSTR)L"\n\n"); + + ConResPuts(StdOut, IDS_CMD_USAGE); + ConPrintf(StdOut, (LPWSTR)L"%ls\n", UsageString); + return TRUE; +} + +BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) +{ + INT argc; + LPWSTR *argv = CommandLineToArgvW(lpCmdLine, &argc); + + if (!argv) + { + return FALSE; + } + + if (argc == 1) // RAPPS is launched without options + { + // Close the console, and open MainWindow + FreeConsole(); + + + // Check for if rapps MainWindow is already launched in another process + HANDLE hMutex; + + hMutex = CreateMutexW(NULL, FALSE, szWindowClass); + if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) + { + /* If already started, it is found its window */ + HWND hWindow = FindWindowW(szWindowClass, NULL); + + /* Activate window */ + ShowWindow(hWindow, SW_SHOWNORMAL); + SetForegroundWindow(hWindow); + return FALSE; + } + + if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) + CAvailableApps::ForceUpdateAppsDB(); + + MainWindowLoop(nCmdShow); + + if (hMutex) + CloseHandle(hMutex); + } + else if (MatchCmdOption(argv[1], CMD_KEY_INSTALL)) + { + return HandleInstallCommand(argv[1], argc - 2, argv + 2); + } + else if (MatchCmdOption(argv[1], CMD_KEY_SETUP)) + { + return HandleSetupCommand(argv[1], argc - 2, argv + 2); + } + else if (MatchCmdOption(argv[1], CMD_KEY_FIND)) + { + return HandleFindCommand(argv[1], argc - 2, argv + 2); + } + else if (MatchCmdOption(argv[1], CMD_KEY_INFO)) + { + return HandleInfoCommand(argv[1], argc - 2, argv + 2); + } + else if (MatchCmdOption(argv[1], CMD_KEY_HELP)) + { + return HandleHelpCommand(argv[1], argc - 2, argv + 2); + } + else + { + // unrecognized/invalid options + ConResPuts(StdOut, IDS_CMD_INVALID_OPTION); + return FALSE; + } + + + return TRUE; } diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 2f462459113..740e4fa828f 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -14,6 +14,10 @@ #include <gdiplus.h> +#include <conutils.h> + +LPCWSTR szWindowClass = L"ROSAPPMGR"; + HWND hMainWnd; HINSTANCE hInst; SETTINGS_INFO SettingsInfo; @@ -139,13 +143,13 @@ VOID SaveSettings(HWND hwnd) } } -INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nShowCmd) +int wmain(int argc, wchar_t *argv[]) { - LPCWSTR szWindowClass = L"ROSAPPMGR"; - HANDLE hMutex; - BOOL bIsFirstLaunch; + ConInitStdStreams(); // Initialize the Console Standard Streams - InitializeAtlModule(hInstance, TRUE); + BOOL bIsFirstLaunch; + + InitializeAtlModule(GetModuleHandle(NULL), TRUE); InitializeGDIPlus(TRUE); if (GetUserDefaultUILanguage() == MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT)) @@ -153,19 +157,8 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi SetProcessDefaultLayout(LAYOUT_RTL); } - hInst = hInstance; - - hMutex = CreateMutexW(NULL, FALSE, szWindowClass); - if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) - { - /* If already started, it is found its window */ - HWND hWindow = FindWindowW(szWindowClass, NULL); + hInst = GetModuleHandle(NULL); - /* Activate window */ - ShowWindow(hWindow, SW_SHOWNORMAL); - SetForegroundWindow(hWindow); - return 1; - } bIsFirstLaunch = !LoadSettings(); if (bIsFirstLaunch) { @@ -175,20 +168,11 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi InitLogs(); InitCommonControls(); - // skip window creation if there were some keys - if (!UseCmdParameters(GetCommandLineW())) - { - if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) - CAvailableApps::ForceUpdateAppsDB(); - - ShowMainWindow(nShowCmd); - } - - if (hMutex) - CloseHandle(hMutex); - + // parse cmd-line and perform the corresponding operation + BOOL bSuccess = ParseCmdAndExecute(GetCommandLineW(), bIsFirstLaunch, SW_SHOWNORMAL); + InitializeGDIPlus(FALSE); - InitializeAtlModule(hInstance, FALSE); + InitializeAtlModule(GetModuleHandle(NULL), FALSE); - return 0; + return bSuccess ? 0 : 1; }

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020