Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [FRAMEBUF] Implement required DirectDraw functions
by Hervé Poussineau 26 Sep '22

26 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22d8c0fd541eaf92b3462… commit 22d8c0fd541eaf92b3462ae1d252cdbba16e30db Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Sep 26 23:41:47 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Sep 26 23:45:56 2022 +0200 [FRAMEBUF] Implement required DirectDraw functions However, do not support any optional callback. dxdiag now accepts to run DirectDraw tests. --- win32ss/drivers/displays/framebuf/enable.c | 38 +++++++++++++++++++++++++++- win32ss/drivers/displays/framebuf/framebuf.h | 11 ++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/win32ss/drivers/displays/framebuf/enable.c b/win32ss/drivers/displays/framebuf/enable.c index 3bd273bf916..04fc1b71c6e 100644 --- a/win32ss/drivers/displays/framebuf/enable.c +++ b/win32ss/drivers/displays/framebuf/enable.c @@ -31,10 +31,46 @@ static DRVFN DrvFunctionTable[] = {INDEX_DrvGetModes, (PFN)DrvGetModes}, {INDEX_DrvSetPalette, (PFN)DrvSetPalette}, {INDEX_DrvSetPointerShape, (PFN)DrvSetPointerShape}, - {INDEX_DrvMovePointer, (PFN)DrvMovePointer} + {INDEX_DrvMovePointer, (PFN)DrvMovePointer}, + {INDEX_DrvEnableDirectDraw, (PFN)DrvEnableDirectDraw}, + {INDEX_DrvDisableDirectDraw, (PFN)DrvDisableDirectDraw}, }; +/* + * DrvEnableDirectDraw + */ + +BOOL APIENTRY +DrvEnableDirectDraw( + DHPDEV dhpdev, + DD_CALLBACKS *pCallbacks, + DD_SURFACECALLBACKS *pSurfaceCallbacks, + DD_PALETTECALLBACKS *pPaletteCallbacks) +{ + RtlZeroMemory(pCallbacks, sizeof(*pCallbacks)); + RtlZeroMemory(pSurfaceCallbacks, sizeof(*pSurfaceCallbacks)); + RtlZeroMemory(pPaletteCallbacks, sizeof(*pPaletteCallbacks)); + + pCallbacks->dwSize = sizeof(*pCallbacks); + pSurfaceCallbacks->dwSize = sizeof(*pSurfaceCallbacks); + pPaletteCallbacks->dwSize = sizeof(*pPaletteCallbacks); + + /* We don't support any optional callback */ + + return TRUE; +} + +/* + * DrvDisableDirectDraw + */ + +VOID APIENTRY +DrvDisableDirectDraw( + DHPDEV dhpdev) +{ +} + /* * DrvEnableDriver * diff --git a/win32ss/drivers/displays/framebuf/framebuf.h b/win32ss/drivers/displays/framebuf/framebuf.h index 9d01f49d047..8a8046f7302 100644 --- a/win32ss/drivers/displays/framebuf/framebuf.h +++ b/win32ss/drivers/displays/framebuf/framebuf.h @@ -71,6 +71,17 @@ typedef struct _PDEV #define ALLOC_TAG 'FUBF' +BOOL APIENTRY +DrvEnableDirectDraw( + DHPDEV dhpdev, + DD_CALLBACKS *pCallbacks, + DD_SURFACECALLBACKS *pSurfaceCallbacks, + DD_PALETTECALLBACKS *pPaletteCallbacks); + +VOID APIENTRY +DrvDisableDirectDraw( + DHPDEV dhpdev); + DHPDEV APIENTRY DrvEnablePDEV( IN DEVMODEW *pdm,

1 0

[reactos] 02/02: [NTOS:PNP] Partially implement NtPlugPlayControl(PlugPlayControlQueryAndRemoveDevice)
by Hervé Poussineau 26 Sep '22

26 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06b3ee43c24dd93f607cd… commit 06b3ee43c24dd93f607cd3d749d309aa5ad4bf1b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Sep 26 23:35:09 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Sep 26 23:35:09 2022 +0200 [NTOS:PNP] Partially implement NtPlugPlayControl(PlugPlayControlQueryAndRemoveDevice) CORE-12307 --- ntoskrnl/io/pnpmgr/plugplay.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index e3412c4cfa3..c35aa58fd5f 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -1147,6 +1147,39 @@ PiControlSyncDeviceAction( return Status; } +static +NTSTATUS +PiControlQueryRemoveDevice( + _In_ PPLUGPLAY_CONTROL_QUERY_REMOVE_DATA ControlData) +{ + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; + UNICODE_STRING DeviceInstance; + + Status = IopCaptureUnicodeString(&DeviceInstance, &ControlData->DeviceInstance); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); + if (DeviceInstance.Buffer != NULL) + { + ExFreePool(DeviceInstance.Buffer); + } + if (DeviceObject == NULL) + { + return STATUS_NO_SUCH_DEVICE; + } + + UNIMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; + + ObDereferenceObject(DeviceObject); + + return Status; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -1400,7 +1433,10 @@ NtPlugPlayControl(IN PLUGPLAY_CONTROL_CLASS PlugPlayControlClass, PlugPlayControlClass); // case PlugPlayControlUnlockDevice: -// case PlugPlayControlQueryAndRemoveDevice: + case PlugPlayControlQueryAndRemoveDevice: + if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_QUERY_REMOVE_DATA)) + return STATUS_INVALID_PARAMETER; + return PiControlQueryRemoveDevice((PPLUGPLAY_CONTROL_QUERY_REMOVE_DATA)Buffer); case PlugPlayControlUserResponse: if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_USER_RESPONSE_DATA))

1 0

[reactos] 01/02: [NETSHELL] Return error if disconnection failed
by Hervé Poussineau 26 Sep '22

26 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5eeeb1c23541b0eaf5edc… commit 5eeeb1c23541b0eaf5edcc356ec35578d43b5da8 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Sep 26 23:33:16 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Sep 26 23:33:57 2022 +0200 [NETSHELL] Return error if disconnection failed CORE-12307 --- dll/shellext/netshell/connectmanager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/shellext/netshell/connectmanager.cpp b/dll/shellext/netshell/connectmanager.cpp index 78e2059df51..fd934b09b09 100644 --- a/dll/shellext/netshell/connectmanager.cpp +++ b/dll/shellext/netshell/connectmanager.cpp @@ -135,9 +135,10 @@ CNetConnection::Disconnect() PropChangeParams.Scope = DICS_FLAG_CONFIGSPECIFIC; PropChangeParams.HwProfile = 0; - if (SetupDiSetClassInstallParams(hInfo, &DevInfo, &PropChangeParams.ClassInstallHeader, sizeof(SP_PROPCHANGE_PARAMS))) + if (!SetupDiSetClassInstallParams(hInfo, &DevInfo, &PropChangeParams.ClassInstallHeader, sizeof(SP_PROPCHANGE_PARAMS)) || + !SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, hInfo, &DevInfo)) { - SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, hInfo, &DevInfo); + hr = HRESULT_FROM_WIN32(GetLastError()); } } SetupDiDestroyDeviceInfoList(hInfo); @@ -145,6 +146,9 @@ CNetConnection::Disconnect() swprintf(szPath, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pDisplayName); CoTaskMemFree(pDisplayName); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) return E_FAIL;

1 0

[reactos] 01/01: [NTUSER][KBSWITCH] Realize Alt+Shift keyboard switch (retry) (#4721)
by Katayama Hirofumi MZ 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2469ce2c317ba8c8ab0f4… commit 2469ce2c317ba8c8ab0f49feeb3fecad15cca19e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 26 08:07:50 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 26 08:07:50 2022 +0900 [NTUSER][KBSWITCH] Realize Alt+Shift keyboard switch (retry) (#4721) Alt+Shift is a useful key combination to switch the current keyboard layout. CORE-11737 - Add ID_NEXTLAYOUT command to kbswitch. - Send command ID_NEXTLAYOUT to kbswitch on Alt+Shift key combination in WM_SYSKEYDOWN handling of IntDefWindowProc function. - Make IntFindWindow a non-static function. --- base/applications/kbswitch/kbswitch.c | 6 ++++++ base/applications/kbswitch/resource.h | 1 + win32ss/user/ntuser/defwnd.c | 18 ++++++++++++++++++ win32ss/user/ntuser/window.c | 2 +- win32ss/user/ntuser/window.h | 2 ++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index d1b39320561..187661e7d1b 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -546,6 +546,12 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) break; } + case ID_NEXTLAYOUT: + { + ActivateLayout(hwnd, GetNextLayout()); + break; + } + default: { ActivateLayout(hwnd, LOWORD(wParam)); diff --git a/base/applications/kbswitch/resource.h b/base/applications/kbswitch/resource.h index b7410bd20e0..ef71d848be4 100644 --- a/base/applications/kbswitch/resource.h +++ b/base/applications/kbswitch/resource.h @@ -9,3 +9,4 @@ /* Menu items */ #define ID_EXIT 10001 #define ID_PREFERENCES 10002 +#define ID_NEXTLAYOUT 10003 diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 846a131cfb3..9d2021a70eb 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -945,6 +945,24 @@ IntDefWindowProc( wParamTmp = UserGetKeyState(VK_SHIFT) & 0x8000 ? SC_PREVWINDOW : SC_NEXTWINDOW; co_IntSendMessage( Active, WM_SYSCOMMAND, wParamTmp, wParam ); } + else if (wParam == VK_SHIFT) // Alt+Shift + { + RTL_ATOM ClassAtom = 0; + UNICODE_STRING ustrClass, ustrWindow; + HWND hwndSwitch; + + RtlInitUnicodeString(&ustrClass, L"kbswitcher"); + RtlInitUnicodeString(&ustrWindow, L""); + + IntGetAtomFromStringOrAtom(&ustrClass, &ClassAtom); + + hwndSwitch = IntFindWindow(UserGetDesktopWindow(), NULL, ClassAtom, &ustrWindow); + if (hwndSwitch) + { +#define ID_NEXTLAYOUT 10003 + UserPostMessage(hwndSwitch, WM_COMMAND, ID_NEXTLAYOUT, 0); + } + } } else if( wParam == VK_F10 ) { diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index a2b9e24b6d8..c880ddcc173 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -3040,7 +3040,7 @@ CLEANUP: } -static HWND FASTCALL +HWND FASTCALL IntFindWindow(PWND Parent, PWND ChildAfter, RTL_ATOM ClassAtom, diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index b68c1657c5d..0efbd4987a3 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -98,6 +98,8 @@ extern PWINDOWLIST gpwlCache; PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti); VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget); +HWND FASTCALL IntFindWindow(PWND Parent, PWND ChildAfter, RTL_ATOM ClassAtom, + PUNICODE_STRING WindowName); /* Undocumented dwFlags for IntBuildHwndList */ #define IACE_LIST 0x0002

1 0

[reactos] 01/01: [CMD] Fix build. Addendum to 67ac583b5.
by Hermès Bélusca-Maïto 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38870875ba5d9ddcf381a… commit 38870875ba5d9ddcf381aaf41f8b8ad2cc9d668f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 25 23:59:07 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 25 23:59:18 2022 +0200 [CMD] Fix build. Addendum to 67ac583b5. --- base/shell/cmd/copy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/copy.c b/base/shell/cmd/copy.c index 73901d7cd91..907222148f9 100644 --- a/base/shell/cmd/copy.c +++ b/base/shell/cmd/copy.c @@ -259,7 +259,7 @@ copy(TCHAR source[MAX_PATH], TRACE ("setting mode\n"); /* For MS-DOS backwards-compatibility, always remove the read-only attribute */ - SetFileAttributes (dest, dwAttribs & ~FILE_ATTRIBUTE_READONLY); + SetFileAttributes (dest, dwAttrib & ~FILE_ATTRIBUTE_READONLY); /* Now finish off the copy if needed with CopyFileEx */ if (lpdwFlags & COPY_RESTART)

1 0

[reactos] 01/01: [CMD] COPY: Always remove the read-only attribute, for MS-DOS backwards-compatibility.
by Hermès Bélusca-Maïto 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67ac583b5bfb5c72fd1cd… commit 67ac583b5bfb5c72fd1cd88ee7c211979d6e190b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 25 23:50:25 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 25 23:55:27 2022 +0200 [CMD] COPY: Always remove the read-only attribute, for MS-DOS backwards-compatibility. Tested and compared with MS CMD.EXE when copying files within the same directory, across directories and across drives. This is not done for the MOVE, REN and REPLACE commands however. CORE-18090 --- base/shell/cmd/copy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/shell/cmd/copy.c b/base/shell/cmd/copy.c index 40bf43eda0d..73901d7cd91 100644 --- a/base/shell/cmd/copy.c +++ b/base/shell/cmd/copy.c @@ -258,7 +258,8 @@ copy(TCHAR source[MAX_PATH], CloseHandle (hFileSrc); TRACE ("setting mode\n"); - SetFileAttributes (dest, dwAttrib); + /* For MS-DOS backwards-compatibility, always remove the read-only attribute */ + SetFileAttributes (dest, dwAttribs & ~FILE_ATTRIBUTE_READONLY); /* Now finish off the copy if needed with CopyFileEx */ if (lpdwFlags & COPY_RESTART)

1 0

[reactos] 01/01: [BCRYPT_WINETEST] Wine Sync to 8d8936cbb6fea3cac862e059e814527f5361f48b (#208)
by Serge Gautherie 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66d50537f464dbc76bc05… commit 66d50537f464dbc76bc05b7aa73d8846aef194be Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Sep 25 20:35:23 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 25 20:35:23 2022 +0200 [BCRYPT_WINETEST] Wine Sync to 8d8936cbb6fea3cac862e059e814527f5361f48b (#208) Import, as is, the next 2 commits from Wine: 8d8936cbb6fea3cac862e059e814527f5361f48b 2016-12-06 Bruno Jesus bcrypt/tests: Normalize all tests to use function pointers. b5e5be13d20adff5d7b784e71c7a48fb95fde2c8 2016-12-06 Bruno Jesus bcrypt/tests: Workaround RegGetValueW not being present in XP. These let this test load on WS03 and even WXP, too. Notice though, that even after the change, the test does not manage to load bcrypt.dll yet on Windows XPSP3 yet, even when copying it next the test. No functional changes. ROSTESTS-296 --- media/doc/WINESYNC.txt | 2 +- modules/rostests/winetests/bcrypt/CMakeLists.txt | 2 +- modules/rostests/winetests/bcrypt/bcrypt.c | 277 ++++++++++++----------- 3 files changed, 153 insertions(+), 128 deletions(-) diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index 07549edfc64..105e3ef18b1 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -51,7 +51,7 @@ dll/win32/atl # Synced to WineStaging-4.18 dll/win32/atl80 # Synced to WineStaging-4.18 dll/win32/atl100 # Synced to WineStaging-3.3 dll/win32/avifil32 # Synced to WineStaging-4.18 -dll/win32/bcrypt # Synced to WineStaging-1.9.23 +dll/win32/bcrypt # Synced to WineStaging-1.9.23 (+ winetest synced to 8d8936cbb6fea3cac862e059e814527f5361f48b, a.k.a 20161206-BJ) dll/win32/browseui # Out of sync dll/win32/cabinet # Synced to WineStaging-4.18 dll/win32/clusapi # Synced to WineStaging-3.3 diff --git a/modules/rostests/winetests/bcrypt/CMakeLists.txt b/modules/rostests/winetests/bcrypt/CMakeLists.txt index 2daa27cdb16..5a3d2e17aa2 100644 --- a/modules/rostests/winetests/bcrypt/CMakeLists.txt +++ b/modules/rostests/winetests/bcrypt/CMakeLists.txt @@ -2,5 +2,5 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_executable(bcrypt_winetest bcrypt.c testlist.c) set_module_type(bcrypt_winetest win32cui) -add_importlibs(bcrypt_winetest bcrypt advapi32 user32 msvcrt kernel32) +add_importlibs(bcrypt_winetest advapi32 user32 msvcrt kernel32) add_rostests_file(TARGET bcrypt_winetest) diff --git a/modules/rostests/winetests/bcrypt/bcrypt.c b/modules/rostests/winetests/bcrypt/bcrypt.c index 5cdb0650400..42a20be4b85 100644 --- a/modules/rostests/winetests/bcrypt/bcrypt.c +++ b/modules/rostests/winetests/bcrypt/bcrypt.c @@ -26,35 +26,43 @@ #include "wine/test.h" -static NTSTATUS (WINAPI *pBCryptHash)( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secretlen, - UCHAR *input, ULONG inputlen, UCHAR *output, ULONG outputlen ); +static NTSTATUS (WINAPI *pBCryptOpenAlgorithmProvider)(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); +static NTSTATUS (WINAPI *pBCryptCloseAlgorithmProvider)(BCRYPT_ALG_HANDLE, ULONG); +static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *); +static NTSTATUS (WINAPI *pBCryptCreateHash)(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptHash)(BCRYPT_ALG_HANDLE, UCHAR *, ULONG, UCHAR *, ULONG, UCHAR *, ULONG); +static NTSTATUS (WINAPI *pBCryptHashData)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptFinishHash)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptDestroyHash)(BCRYPT_HASH_HANDLE); +static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptGetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); static void test_BCryptGenRandom(void) { NTSTATUS ret; UCHAR buffer[256]; - ret = BCryptGenRandom(NULL, NULL, 0, 0); + ret = pBCryptGenRandom(NULL, NULL, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = BCryptGenRandom(NULL, buffer, 0, 0); + ret = pBCryptGenRandom(NULL, buffer, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), 0); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); - ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), + ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG|BCRYPT_RNG_USE_ENTROPY_IN_BUFFER); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); - ret = BCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = pBCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); /* Zero sized buffer should work too */ - ret = BCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = pBCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); /* Test random number generation - It's impossible for a sane RNG to return 8 zeros */ memset(buffer, 0, 16); - ret = BCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = pBCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } @@ -75,18 +83,19 @@ static void test_BCryptGetFipsAlgorithmMode(void) 'L','s','a',0}; static const WCHAR policyValueXPW[] = { 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; + HKEY hkey = NULL; BOOLEAN expected; BOOLEAN enabled; DWORD value, count[2] = {sizeof(value), sizeof(value)}; NTSTATUS ret; - if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyVistaW, policyValueVistaW, - RRF_RT_REG_DWORD, NULL, &value, &count[0])) + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyVistaW, &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, policyValueVistaW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } - else if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyXPW, policyValueXPW, - RRF_RT_REG_DWORD, NULL, &value, &count[1])) + else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyXPW, &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, policyValueXPW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } @@ -96,12 +105,13 @@ static void test_BCryptGetFipsAlgorithmMode(void) todo_wine ok(0, "Neither XP or Vista key is present\n"); } + RegCloseKey(hkey); - ret = BCryptGetFipsAlgorithmMode(&enabled); + ret = pBCryptGetFipsAlgorithmMode(&enabled); ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); ok(enabled == expected, "expected result %d, got %d\n", expected, enabled); - ret = BCryptGetFipsAlgorithmMode(NULL); + ret = pBCryptGetFipsAlgorithmMode(NULL); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); } @@ -129,7 +139,7 @@ static void _test_hash_length(unsigned line, void *handle, ULONG exlen) ULONG len = 0xdeadbeef, size = 0xdeadbeef; NTSTATUS status; - status = BCryptGetProperty(handle, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + status = pBCryptGetProperty(handle, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); ok_(__FILE__,line)(size == sizeof(len), "got %u\n", size); ok_(__FILE__,line)(len == exlen, "len = %u, expected %u\n", len, exlen); @@ -143,7 +153,7 @@ static void _test_alg_name(unsigned line, void *handle, const char *exname) const WCHAR *name = (const WCHAR*)buf; NTSTATUS status; - status = BCryptGetProperty(handle, BCRYPT_ALGORITHM_NAME, buf, sizeof(buf), &size, 0); + status = pBCryptGetProperty(handle, BCRYPT_ALGORITHM_NAME, buf, sizeof(buf), &size, 0); ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); ok_(__FILE__,line)(size == (strlen(exname)+1)*sizeof(WCHAR), "got %u\n", size); ok_(__FILE__,line)(!strcmp_wa(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), exname); @@ -161,35 +171,35 @@ static void test_sha1(void) NTSTATUS ret; alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; - ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); ok(len == 0xdeadbeef, "got %u\n", len); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); @@ -199,58 +209,58 @@ static void test_sha1(void) hash = NULL; len = sizeof(buf); - ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, NULL, 0, 0); + ret = pBCryptHashData(hash, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 20); test_alg_name(hash, "SHA1"); memset(sha1, 0, sizeof(sha1)); - ret = BCryptFinishHash(hash, sha1, sizeof(sha1), 0); + ret = pBCryptFinishHash(hash, sha1, sizeof(sha1), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( sha1, sizeof(sha1), str ); ok(!strcmp(str, expected), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); hash = NULL; len = sizeof(buf_hmac); - ret = BCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); + ret = pBCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 20); test_alg_name(hash, "SHA1"); memset(sha1_hmac, 0, sizeof(sha1_hmac)); - ret = BCryptFinishHash(hash, sha1_hmac, sizeof(sha1_hmac), 0); + ret = pBCryptFinishHash(hash, sha1_hmac, sizeof(sha1_hmac), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( sha1_hmac, sizeof(sha1_hmac), str ); ok(!strcmp(str, expected_hmac), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -268,35 +278,35 @@ static void test_sha256(void) NTSTATUS ret; alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; - ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); ok(len == 0xdeadbeef, "got %u\n", len); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); @@ -306,58 +316,58 @@ static void test_sha256(void) hash = NULL; len = sizeof(buf); - ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, NULL, 0, 0); + ret = pBCryptHashData(hash, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 32); test_alg_name(hash, "SHA256"); memset(sha256, 0, sizeof(sha256)); - ret = BCryptFinishHash(hash, sha256, sizeof(sha256), 0); + ret = pBCryptFinishHash(hash, sha256, sizeof(sha256), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( sha256, sizeof(sha256), str ); ok(!strcmp(str, expected), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); hash = NULL; len = sizeof(buf_hmac); - ret = BCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); + ret = pBCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 32); test_alg_name(hash, "SHA256"); memset(sha256_hmac, 0, sizeof(sha256_hmac)); - ret = BCryptFinishHash(hash, sha256_hmac, sizeof(sha256_hmac), 0); + ret = pBCryptFinishHash(hash, sha256_hmac, sizeof(sha256_hmac), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( sha256_hmac, sizeof(sha256_hmac), str ); ok(!strcmp(str, expected_hmac), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -375,35 +385,35 @@ static void test_sha384(void) NTSTATUS ret; alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA384_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA384_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; - ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); ok(len == 0xdeadbeef, "got %u\n", len); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); @@ -413,58 +423,58 @@ static void test_sha384(void) hash = NULL; len = sizeof(buf); - ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, NULL, 0, 0); + ret = pBCryptHashData(hash, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 48); test_alg_name(hash, "SHA384"); memset(sha384, 0, sizeof(sha384)); - ret = BCryptFinishHash(hash, sha384, sizeof(sha384), 0); + ret = pBCryptFinishHash(hash, sha384, sizeof(sha384), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( sha384, sizeof(sha384), str ); ok(!strcmp(str, expected), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA384_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA384_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); hash = NULL; len = sizeof(buf_hmac); - ret = BCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); + ret = pBCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 48); test_alg_name(hash, "SHA384"); memset(sha384_hmac, 0, sizeof(sha384_hmac)); - ret = BCryptFinishHash(hash, sha384_hmac, sizeof(sha384_hmac), 0); + ret = pBCryptFinishHash(hash, sha384_hmac, sizeof(sha384_hmac), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( sha384_hmac, sizeof(sha384_hmac), str ); ok(!strcmp(str, expected_hmac), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -484,35 +494,35 @@ static void test_sha512(void) NTSTATUS ret; alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA512_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA512_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; - ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); ok(len == 0xdeadbeef, "got %u\n", len); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); @@ -522,58 +532,58 @@ static void test_sha512(void) hash = NULL; len = sizeof(buf); - ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, NULL, 0, 0); + ret = pBCryptHashData(hash, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 64); test_alg_name(hash, "SHA512"); memset(sha512, 0, sizeof(sha512)); - ret = BCryptFinishHash(hash, sha512, sizeof(sha512), 0); + ret = pBCryptFinishHash(hash, sha512, sizeof(sha512), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( sha512, sizeof(sha512), str ); ok(!strcmp(str, expected), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA512_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA512_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); hash = NULL; len = sizeof(buf_hmac); - ret = BCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); + ret = pBCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 64); test_alg_name(hash, "SHA512"); memset(sha512_hmac, 0, sizeof(sha512_hmac)); - ret = BCryptFinishHash(hash, sha512_hmac, sizeof(sha512_hmac), 0); + ret = pBCryptFinishHash(hash, sha512_hmac, sizeof(sha512_hmac), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( sha512_hmac, sizeof(sha512_hmac), str ); ok(!strcmp(str, expected_hmac), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -592,35 +602,35 @@ static void test_md5(void) NTSTATUS ret; alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; - ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); ok(len == 0xdeadbeef, "got %u\n", len); ok(size == sizeof(len), "got %u\n", size); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); @@ -630,58 +640,58 @@ static void test_md5(void) hash = NULL; len = sizeof(buf); - ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, NULL, 0, 0); + ret = pBCryptHashData(hash, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 16); test_alg_name(hash, "MD5"); memset(md5, 0, sizeof(md5)); - ret = BCryptFinishHash(hash, md5, sizeof(md5), 0); + ret = pBCryptFinishHash(hash, md5, sizeof(md5), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( md5, sizeof(md5), str ); ok(!strcmp(str, expected), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); hash = NULL; len = sizeof(buf_hmac); - ret = BCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); + ret = pBCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); - ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 16); test_alg_name(hash, "MD5"); memset(md5_hmac, 0, sizeof(md5_hmac)); - ret = BCryptFinishHash(hash, md5_hmac, sizeof(md5_hmac), 0); + ret = pBCryptFinishHash(hash, md5_hmac, sizeof(md5_hmac), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); format_hash( md5_hmac, sizeof(md5_hmac), str ); ok(!strcmp(str, expected_hmac), "got %s\n", str); - ret = BCryptDestroyHash(hash); + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -697,7 +707,7 @@ static void test_BcryptHash(void) NTSTATUS ret; alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -710,12 +720,12 @@ static void test_BcryptHash(void) format_hash( md5, sizeof(md5), str ); ok(!strcmp(str, expected), "got %s\n", str); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; memset(md5_hmac, 0, sizeof(md5_hmac)); - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -724,7 +734,7 @@ static void test_BcryptHash(void) format_hash( md5_hmac, sizeof(md5_hmac), str ); ok(!strcmp(str, expected_hmac), "got %s\n", str); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -736,31 +746,46 @@ static void test_rng(void) NTSTATUS ret; alg = NULL; - ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RNG_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RNG_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); test_alg_name(alg, "RNG"); memset(buf, 0, 16); - ret = BCryptGenRandom(alg, buf, 8, 0); + ret = pBCryptGenRandom(alg, buf, 8, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(memcmp(buf, buf + 8, 8), "got zeroes\n"); - ret = BCryptCloseAlgorithmProvider(alg, 0); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } - START_TEST(bcrypt) { HMODULE module; - module = GetModuleHandleA( "bcrypt.dll" ); + module = LoadLibraryA("bcrypt.dll"); + if (!module) + { + win_skip("bcrypt.dll not found\n"); + return; + } + + pBCryptOpenAlgorithmProvider = (void *)GetProcAddress(module, "BCryptOpenAlgorithmProvider"); + pBCryptCloseAlgorithmProvider = (void *)GetProcAddress(module, "BCryptCloseAlgorithmProvider"); + pBCryptGetFipsAlgorithmMode = (void *)GetProcAddress(module, "BCryptGetFipsAlgorithmMode"); + pBCryptCreateHash = (void *)GetProcAddress(module, "BCryptCreateHash"); + pBCryptHash = (void *)GetProcAddress(module, "BCryptHash"); + pBCryptHashData = (void *)GetProcAddress(module, "BCryptHashData"); + pBCryptFinishHash = (void *)GetProcAddress(module, "BCryptFinishHash"); + pBCryptDestroyHash = (void *)GetProcAddress(module, "BCryptDestroyHash"); + pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom"); + pBCryptGetProperty = (void *)GetProcAddress(module, "BCryptGetProperty"); test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); @@ -771,10 +796,10 @@ START_TEST(bcrypt) test_md5(); test_rng(); - pBCryptHash = (void *)GetProcAddress( module, "BCryptHash" ); - - if (pBCryptHash) + if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); else win_skip("BCryptHash is not available\n"); + + FreeLibrary(module); }

1 0

[reactos] 03/03: [ACLAYERS] Fix RtlGetVersion
by Mark Jansen 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=815dd140c77b7af9cde82… commit 815dd140c77b7af9cde824e497bf04544ff8e8f0 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Sep 13 21:35:23 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 25 19:33:51 2022 +0200 [ACLAYERS] Fix RtlGetVersion --- dll/appcompat/shims/layer/versionlie.inl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dll/appcompat/shims/layer/versionlie.inl b/dll/appcompat/shims/layer/versionlie.inl index 2b3576b398a..7eb4f5c6794 100644 --- a/dll/appcompat/shims/layer/versionlie.inl +++ b/dll/appcompat/shims/layer/versionlie.inl @@ -31,14 +31,19 @@ BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExW)(LPOSVERSIONINFOEXA lpOsVersionI return FALSE; } +#ifndef STATUS_INVALID_PARAMETER +#define STATUS_INVALID_PARAMETER 0xC000000DL +#define STATUS_SUCCESS 0 +#endif + /* We do not care about the actual type, FakeVersion will correctly handle it either way */ -BOOL WINAPI SHIM_OBJ_NAME(APIHook_RtlGetVersion)(LPOSVERSIONINFOEXA lpOsVersionInfo) +DWORD WINAPI SHIM_OBJ_NAME(APIHook_RtlGetVersion)(LPOSVERSIONINFOEXA lpOsVersionInfo) { - if (CALL_SHIM(3, GETVERSIONEXAPROC)(lpOsVersionInfo)) + if (CALL_SHIM(3, GETVERSIONEXAPROC)(lpOsVersionInfo) == STATUS_SUCCESS) { - return FakeVersion(lpOsVersionInfo, &VERSION_INFO); + return FakeVersion(lpOsVersionInfo, &VERSION_INFO) ? STATUS_SUCCESS : STATUS_INVALID_PARAMETER; } - return FALSE; + return STATUS_INVALID_PARAMETER; } BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason, PVOID ptr)

1 0

[reactos] 02/03: [MSI] Abuse SE_DynamicShim until we have proper shims integration
by Mark Jansen 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05637a5e3d83d355962c4… commit 05637a5e3d83d355962c434eeeb2e0333054a898 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Sep 13 20:46:51 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 25 19:33:51 2022 +0200 [MSI] Abuse SE_DynamicShim until we have proper shims integration CORE-18362 --- dll/win32/msi/CMakeLists.txt | 2 +- dll/win32/msi/package.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index 56fcc80cb25..82874b70b46 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -86,7 +86,7 @@ set_source_files_properties(msi.rc PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BI set_module_type(msi win32dll) target_link_libraries(msi uuid ${PSEH_LIB} wine_dll_register oldnames) add_dependencies(msi msi_idlheader) -add_delay_importlibs(msi odbccp32 crypt32 wintrust) +add_delay_importlibs(msi odbccp32 crypt32 wintrust apphelp) add_importlibs(msi advapi32 advapi32_vista cabinet comctl32 gdi32 ole32 oleaut32 shell32 shlwapi rpcrt4 urlmon user32 version wininet sxs #FIXME : imagehlp, mspatcha should be in delayed imports imagehlp diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 3095026003e..b87132494bd 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -1330,6 +1330,58 @@ UINT msi_set_original_database_property( MSIDATABASE *db, const WCHAR *package ) return r; } +#ifdef __REACTOS__ +BOOL WINAPI ApphelpCheckRunAppEx(HANDLE FileHandle, PVOID Unk1, PVOID Unk2, PCWSTR ApplicationName, PVOID Environment, USHORT ExeType, PULONG Reason, PVOID *SdbQueryAppCompatData, PULONG SdbQueryAppCompatDataSize, + PVOID *SxsData, PULONG SxsDataSize, PULONG FusionFlags, PULONG64 SomeFlag1, PULONG SomeFlag2); +BOOL WINAPI SE_DynamicShim(LPCWSTR ProcessImage, PVOID hsdb, PVOID pQueryResult, LPCSTR Module, LPDWORD lpdwDynamicToken); +PVOID WINAPI SdbInitDatabase(DWORD flags, LPCWSTR path); +PVOID WINAPI SdbReleaseDatabase(PVOID hsdb); + +#define HID_DOS_PATHS 0x1 +#define SDB_DATABASE_MAIN_SHIM 0x80030000 + +#define APPHELP_VALID_RESULT 0x10000 +#define APPHELP_RESULT_FOUND 0x40000 + +static void +AppHelpCheckPackage(LPCWSTR szPackage) +{ + USHORT ExeType = 0; + ULONG Reason = 0; + + PVOID QueryResult = NULL; + ULONG QueryResultSize = 0; + + HANDLE Handle = NULL; + BOOL Continue = ApphelpCheckRunAppEx( + Handle, NULL, NULL, szPackage, NULL, ExeType, &Reason, &QueryResult, &QueryResultSize, NULL, + NULL, NULL, NULL, NULL); + + if (Continue) + { + if ((Reason & (APPHELP_VALID_RESULT | APPHELP_RESULT_FOUND)) == (APPHELP_VALID_RESULT | APPHELP_RESULT_FOUND)) + { + DWORD dwToken; + PVOID hsdb = SdbInitDatabase(HID_DOS_PATHS | SDB_DATABASE_MAIN_SHIM, NULL); + if (hsdb) + { + BOOL bShim = SE_DynamicShim(szPackage, hsdb, QueryResult, "msi.dll", &dwToken); + ERR("ReactOS HACK: Used SE_DynamicShim %d!\n", bShim); + + SdbReleaseDatabase(hsdb); + } + else + { + ERR("Unable to open SDB_DATABASE_MAIN_SHIM\n"); + } + } + } + + if (QueryResult) + RtlFreeHeap(RtlGetProcessHeap(), 0, QueryResult); +} +#endif + UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) { MSIDATABASE *db; @@ -1368,6 +1420,10 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) file = cachefile; } +#ifdef __REACTOS__ + AppHelpCheckPackage(file); +#endif + r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db ); if (r != ERROR_SUCCESS) {

1 0

[reactos] 01/03: [APPHELP] Implement SE_DynamicShim
by Mark Jansen 25 Sep '22

25 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93e88edbb68460acf5548… commit 93e88edbb68460acf55481b0b3d666104a2fdb83 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Nov 18 23:18:13 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 25 19:33:36 2022 +0200 [APPHELP] Implement SE_DynamicShim --- dll/appcompat/apphelp/apphelp.c | 2 +- dll/appcompat/apphelp/apphelp.spec | 2 +- dll/appcompat/apphelp/shimeng.c | 45 +++++++++++++++++++++++++++++++------- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dll/appcompat/apphelp/apphelp.c b/dll/appcompat/apphelp/apphelp.c index bca880c35e7..fd7a069468a 100644 --- a/dll/appcompat/apphelp/apphelp.c +++ b/dll/appcompat/apphelp/apphelp.c @@ -185,7 +185,7 @@ ApphelpCheckRunAppEx( _In_ HANDLE FileHandle, _In_opt_ PVOID Unk1, _In_opt_ PVOID Unk2, - _In_opt_z_ PWCHAR ApplicationName, + _In_opt_z_ PCWSTR ApplicationName, _In_opt_ PVOID Environment, _In_opt_ USHORT ExeType, _Inout_opt_ PULONG Reason, diff --git a/dll/appcompat/apphelp/apphelp.spec b/dll/appcompat/apphelp/apphelp.spec index b2f7ba27fa0..898fb9c836e 100644 --- a/dll/appcompat/apphelp/apphelp.spec +++ b/dll/appcompat/apphelp/apphelp.spec @@ -160,7 +160,7 @@ @ stdcall SdbWriteWORDTag(ptr long long) @ stdcall SE_DllLoaded(ptr) @ stdcall SE_DllUnloaded(ptr) -@ stub SE_DynamicShim +@ stdcall SE_DynamicShim(wstr ptr ptr str ptr) @ stub SE_DynamicUnshim @ stdcall SE_InstallAfterInit(ptr ptr) @ stdcall SE_InstallBeforeInit(ptr ptr) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index 190e17c2a72..c470ff3d8d6 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -878,7 +878,13 @@ VOID SeiAppendInExclude(PARRAY dest, PCWSTR ModuleName, BOOL IsInclude) } } -/* Read the INEXCLUD tags from a given parent tag */ +/* Read the INEXCLUD tags from a given parent tag +FIXME: + Some observed tags: + '*' with include + '$' with include, followed by '*' without include + Include list logging, referring to: (MODE: EA) +*/ VOID SeiReadInExclude(PDB pdb, TAGID parent, PARRAY dest) { TAGID InExcludeTag; @@ -1175,7 +1181,7 @@ VOID SeiResetEntryProcessed(PPEB Peb) } } -VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) +VOID SeiInit(LPCWSTR ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery, BOOLEAN ProcessInit) { DWORD n; ARRAY ShimRefArray; @@ -1197,15 +1203,18 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) SeiCheckComPlusImage(Peb->ImageBaseAddress); - /* Mark all modules loaded until now as 'LDRP_ENTRY_PROCESSED' so that their entrypoint is not called while we are loading shims */ - SeiSetEntryProcessed(Peb); + if (ProcessInit) + { + /* Mark all modules loaded until now as 'LDRP_ENTRY_PROCESSED' so that their entrypoint is not called while we are loading shims */ + SeiSetEntryProcessed(Peb); + } /* TODO: if (pQuery->trApphelp) SeiDisplayAppHelp(?pQuery->trApphelp?); */ - SeiDbgPrint(SEI_MSG, NULL, "ShimInfo(ExePath(%wZ))\n", ProcessImage); + SeiDbgPrint(SEI_MSG, NULL, "ShimInfo(ExePath(%S))\n", ProcessImage); SeiBuildShimRefArray(hsdb, pQuery, &ShimRefArray, &ShimFlags); if (ShimFlags.AppCompatFlags.QuadPart) { @@ -1344,8 +1353,11 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) SeiResolveAPIs(); PatchNewModules(Peb); - /* Remove the 'LDRP_ENTRY_PROCESSED' flag from entries we modified, so that the loader can continue to process them */ - SeiResetEntryProcessed(Peb); + if (ProcessInit) + { + /* Remove the 'LDRP_ENTRY_PROCESSED' flag from entries we modified, so that the loader can continue to process them */ + SeiResetEntryProcessed(Peb); + } } @@ -1413,7 +1425,7 @@ VOID NTAPI SE_InstallBeforeInit(PUNICODE_STRING ProcessImage, PVOID pShimData) } g_bShimDuringInit = TRUE; - SeiInit(ProcessImage, hsdb, &QueryResult); + SeiInit(ProcessImage->Buffer, hsdb, &QueryResult, TRUE); g_bShimDuringInit = FALSE; SdbReleaseDatabase(hsdb); @@ -1464,3 +1476,20 @@ BOOL WINAPI SE_IsShimDll(PVOID BaseAddress) return SeiGetShimModuleInfo(BaseAddress) != NULL; } +/* 'Private' ntdll function */ +BOOLEAN +NTAPI +LdrInitShimEngineDynamic(IN PVOID BaseAddress); + + +BOOL WINAPI SE_DynamicShim(LPCWSTR ProcessImage, HSDB hsdb, PVOID pQueryResult, LPCSTR Module, LPDWORD lpdwDynamicToken) +{ + g_bShimDuringInit = TRUE; + SeiInit(ProcessImage, hsdb, pQueryResult, FALSE); + g_bShimDuringInit = FALSE; + + LdrInitShimEngineDynamic(g_hInstance); + + return TRUE; +} +

1 0

Jump to page:

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