October 2020 - Wine-devel - list.winehq.org

[PATCH 2/3] ntdll: Implement ProcessCookie for NtQueryInformationProcess.
by Myah Caron 15 Oct '20

15 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Due to some of the fields being currently unimplemented by wine, the entropy isn't great. I've opted to not include the rdtsc instruction for the moment, as I believe it'd make the function significantly more complex (through apparently separate inline assembly for i386/x86-64 according to https://stackoverflow.com/a/9887899/13255485) or require compiler-specific intrinsics. dlls/ntdll/unix/process.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 5ccf435e9ff..258ddc1c79d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -62,6 +62,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "unix_private.h" #include "wine/exception.h" #include "wine/server.h" @@ -1166,6 +1167,30 @@ void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) #endif +static ULONG get_process_cookie( void ) +{ + static ULONG process_cookie; + + if (!process_cookie) + { + /* http://blogs.msdn.com/b/michael_howard/archive/2006/08/16/702707.aspx */ + SYSTEM_PERFORMANCE_INFORMATION spi; + ULONG cookie = user_shared_data->TickCount.High1Time; + cookie ^= user_shared_data->TickCount.LowPart; + cookie ^= user_shared_data->InterruptTime.LowPart; + + NtQuerySystemInformation( SystemPerformanceInformation, &spi, sizeof( spi ), NULL ); + cookie ^= spi.SystemCalls; + cookie ^= spi.PageFaults; + + /* todo: cookie ^= (ULONG)rdtsc */ + + InterlockedExchange( (LONG*)&process_cookie, cookie ); + } + + return process_cookie; +} + #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ FIXME( "(process=%p) Unimplemented information class: " #c "\n", handle); \ @@ -1541,11 +1566,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class break; case ProcessCookie: - FIXME( "ProcessCookie (%p,%p,0x%08x,%p) stub\n", handle, info, size, ret_len ); if (handle == NtCurrentProcess()) { len = sizeof(ULONG); - if (size == len) *(ULONG *)info = 0; + if (size == len) *(ULONG *)info = get_process_cookie(); else ret = STATUS_INFO_LENGTH_MISMATCH; } else ret = STATUS_INVALID_PARAMETER; -- 2.28.0

2 1

[PATCH v2] ntdll/tests: Add tests for RtlEncode(System)Pointer.
by Myah Caron 15 Oct '20

15 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: - Fix the algorithm according to the linked MSDN post - Don't require _rotr(64) dlls/ntdll/tests/rtl.c | 88 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7a62670ea05..fef7103d677 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -82,6 +82,11 @@ static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, U static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); +static VOID* (WINAPI *pRtlEncodePointer)(void *); +static VOID* (WINAPI *pRtlDecodePointer)(void *); +static VOID* (WINAPI *pRtlEncodeSystemPointer)(void *); +static VOID* (WINAPI *pRtlDecodeSystemPointer)(void *); +static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -122,6 +127,11 @@ static void InitFunctionPtrs(void) pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); + pRtlEncodePointer = (void *)GetProcAddress(hntdll, "RtlEncodePointer"); + pRtlDecodePointer = (void *)GetProcAddress(hntdll, "RtlDecodePointer"); + pRtlEncodeSystemPointer = (void *)GetProcAddress(hntdll, "RtlEncodeSystemPointer"); + pRtlDecodeSystemPointer = (void *)GetProcAddress(hntdll, "RtlDecodeSystemPointer"); + pNtQueryInformationProcess = (void *)GetProcAddress(hntdll, "NtQueryInformationProcess"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -3483,6 +3493,83 @@ static void test_LdrRegisterDllNotification(void) pLdrUnregisterDllNotification(cookie); } +static DWORD_PTR rotr_ptr( DWORD_PTR num, int shift ) +{ +#ifdef _WIN64 +#define ROT_BITS 64 +#else +#define ROT_BITS 32 +#endif + + shift &= ROT_BITS - 1; + return (num >> shift) | (num << (ROT_BITS-shift)); + +#undef ROT_BITS +} + +static PVOID our_encode_pointer( PVOID ptr, ULONG cookie ) +{ + DWORD_PTR ptrval = (DWORD_PTR) ptr; + DWORD_PTR cookieval = (DWORD_PTR) cookie; + + /* http://blogs.msdn.com/b/michael_howard/archive/2006/08/16/702707.aspx */ + + ptrval = (ptrval ^ cookieval); + return (PVOID)rotr_ptr(ptrval, cookie); +} + +static void test_RtlEncodePointer(void) +{ + void *addr = (void*)0xdeadbeef0123abcd; + void *encoded, *encoded1, *decoded; + void *our_encoded; + ULONG process_cookie = 0xdeadbeef; + ULONG system_cookie = *(ULONG*)(0x7ffe0000 + 0x330); /* user_shared_data.Cookie */ + NTSTATUS status; + + if (!pRtlEncodePointer || !pRtlDecodePointer) + { + win_skip("RtlEn/DecodePointer not available\n"); + return; + } + + encoded = pRtlEncodePointer(addr); + ok(encoded != addr, "got %p\n", encoded); + + decoded = pRtlDecodePointer(encoded); + ok(decoded == addr, "got %p\n", decoded); + + if (!pNtQueryInformationProcess) + { + win_skip("NtQueryInformationProcess not available\n"); + } + else + { + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessCookie, &process_cookie, sizeof(process_cookie), NULL); + ok(status == S_OK, "got %08x\n", status); + ok(process_cookie != 0xdeadbeef, "got %08x\n", process_cookie); + + our_encoded = our_encode_pointer(addr, process_cookie); + todo_wine ok(encoded == our_encoded || broken(encoded == (void*)((uintptr_t)addr ^ (uintptr_t)process_cookie)), "got %p (ours %p)\n", encoded, our_encoded); + } + + if (!pRtlEncodeSystemPointer || !pRtlDecodeSystemPointer) + { + win_skip("RtlEn/DecodeSystemPointer not available\n"); + return; + } + + encoded1 = pRtlEncodeSystemPointer(addr); + ok(encoded != addr, "got %p\n", encoded); + todo_wine ok(encoded1 != encoded, "got %p\n", encoded1); + + decoded = pRtlDecodeSystemPointer(encoded1); + ok(decoded == addr, "got %p\n", decoded); + + our_encoded = our_encode_pointer(addr, system_cookie); + todo_wine ok(encoded1 == our_encoded || broken(encoded1 == (void*)((uintptr_t)addr ^ (uintptr_t)system_cookie)), "got %p (ours %p)\n", encoded1, our_encoded); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3523,4 +3610,5 @@ START_TEST(rtl) test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); + test_RtlEncodePointer(); } -- 2.28.0

1 0

[PATCH 1/3] ntdll: Use Vista's algorithm for RtlEncode/DecodePointer.
by Myah Caron 15 Oct '20

15 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- The algorithm is an implementation of https://web.archive.org/web/20100603042315/http://blogs.msdn.com/b/michael_… I'm sending in this patchset without the tests as I realize the tests are non-deterministic, and therefore probably not acceptable. However, in case it is acceptable I will also send a separate v2 patch for the tests (v1 is 194268), fixing the algorithm according to the linked MSDN post. dlls/ntdll/rtl.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index ca4fea84209..154de807501 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1542,19 +1542,54 @@ static DWORD_PTR get_pointer_obfuscator( void ) return pointer_obfuscator; } +/*********************************************************************** + * rotl_ptr (internal) + */ +#ifdef _WIN64 +#define ROT_BITS 64 +#else +#define ROT_BITS 32 +#endif + +static DWORD_PTR rotl_ptr( DWORD_PTR num, int shift ) +{ + shift &= ROT_BITS - 1; + return (num << shift) | (num >> (ROT_BITS-shift)); +} + +/*********************************************************************** + * rotr_ptr (internal) + */ +static DWORD_PTR rotr_ptr( DWORD_PTR num, int shift ) +{ + shift &= ROT_BITS - 1; + return (num >> shift) | (num << (ROT_BITS-shift)); +} + +#undef ROT_BITS + /************************************************************************* * RtlEncodePointer [NTDLL.@] */ PVOID WINAPI RtlEncodePointer( PVOID ptr ) { + DWORD_PTR ptrval = (DWORD_PTR) ptr; - return (PVOID)(ptrval ^ get_pointer_obfuscator()); + DWORD_PTR cookie = get_pointer_obfuscator(); + + /* http://blogs.msdn.com/b/michael_howard/archive/2006/08/16/702707.aspx */ + + ptrval = (ptrval ^ cookie); + return (PVOID)rotr_ptr(ptrval, cookie); } PVOID WINAPI RtlDecodePointer( PVOID ptr ) { DWORD_PTR ptrval = (DWORD_PTR) ptr; - return (PVOID)(ptrval ^ get_pointer_obfuscator()); + DWORD_PTR cookie = get_pointer_obfuscator(); + + ptrval = rotl_ptr(ptrval, cookie); + return (PVOID)(ptrval ^ cookie); } /************************************************************************* -- 2.28.0

1 0

[PATCH v2] riched20: implement ITextRange/ITextSelection Copy and Cut
by Damjan Jovanovic 15 Oct '20

15 Oct '20

Try 2 is rebased against the latest changes. Clipboard handling is unified with the previous code in editor.c. Manual tests show trying to cut from a read-only field beeps when using WM_CUT or Ctrl+X, but not when using these APIs. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 51 +++++++++++++++--------- dlls/riched20/editor.h | 3 +- dlls/riched20/richole.c | 46 ++++++++++++++++++---- dlls/riched20/tests/richole.c | 74 +++++++++++++++++++++++++++++++++++ 5 files changed, 148 insertions(+), 28 deletions(-)

2 1

[PATCH 2/2] winex11: Add ProviderName registry property to display adapters.
by Myah Caron 15 Oct '20

15 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/winex11.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index cedf18fe4f8..82fc80446cd 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -54,6 +54,7 @@ static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR driver_versionW[] = {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; +static const WCHAR provider_nameW[] = {'P','r','o','v','i','d','e','r','N','a','m','e',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -111,6 +112,7 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; static const WCHAR driver_version_valueW[] = {'1','.','0','.','0','.','1','0','0','0',0}; +static const WCHAR provider_name_valueW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -489,6 +491,10 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g (strlenW(driver_version_valueW) + 1) * sizeof(WCHAR))) goto done; + if (RegSetValueExW(hkey, provider_nameW, 0, REG_SZ, (BYTE *)provider_name_valueW, + (strlenW(provider_name_valueW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */ -- 2.28.0

1 1

[PATCH 1/2] winex11: Add DriverVersion registry property to display adapters.
by Myah Caron 14 Oct '20

14 Oct '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This is read by Minecraft Dungeons Launcher (https://bugs.winehq.org/show_bug.cgi?id=49990) The version format is based on Virtualbox's DriverVersion format (presumably major.minor.patch.commit) dlls/winex11.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 0f61f9f7b2e..cedf18fe4f8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -53,6 +53,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4ab static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR driver_versionW[] = {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -109,6 +110,7 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR driver_version_valueW[] = {'1','.','0','.','0','.','1','0','0','0',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -483,6 +485,10 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + if (RegSetValueExW(hkey, driver_versionW, 0, REG_SZ, (BYTE *)driver_version_valueW, + (strlenW(driver_version_valueW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */ -- 2.28.0

1 0

[PATCH] widl: Add the [allocate] acf attribute
by Eric Kohl 14 Oct '20

14 Oct '20

Signed-off-by: Eric Kohl <eric.kohl(a)reactos.org> --- tools/widl/parser.l | 3 +++ tools/widl/parser.y | 33 +++++++++++++++++++++++++++++---- tools/widl/typegen.c | 7 +++++++ tools/widl/widltypes.h | 1 + 4 files changed, 40 insertions(+), 4 deletions(-)

1 0

[PATCH] lz32/tests: Use wide-char string literals.
by Michael Stefaniuc 14 Oct '20

14 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Again, not const as that would produce compiler warnings. dlls/lz32/tests/lzexpand_main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index c37f3fa47e7..3c80bc09a6b 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -30,23 +30,23 @@ /* Compressed file names end with underscore. */ static char filename [] = "testfile.xxx"; static char filename_[] = "testfile.xx_"; -static WCHAR filenameW [] = {'t','e','s','t','f','i','l','e','.','x','x','x',0}; -static WCHAR filenameW_[] = {'t','e','s','t','f','i','l','e','.','x','x','_',0}; +static WCHAR filenameW [] = L"testfile.xxx"; +static WCHAR filenameW_[] = L"testfile.xx_"; static char dotless [] = "dotless"; static char dotless_[] = "dotless._"; -static WCHAR dotlessW [] = {'d','o','t','l','e','s','s', 0}; -static WCHAR dotlessW_[] = {'d','o','t','l','e','s','s','.','_', 0}; +static WCHAR dotlessW [] = L"dotless"; +static WCHAR dotlessW_[] = L"dotless._"; static char extless [] = "extless."; static char extless_[] = "extless._"; -static WCHAR extlessW [] = {'e','x','t','l','e','s','s','.', 0}; -static WCHAR extlessW_[] = {'e','x','t','l','e','s','s','.','_', 0}; +static WCHAR extlessW [] = L"extless."; +static WCHAR extlessW_[] = L"extless._"; static char _terminated [] = "_terminated.xxxx_"; static char _terminated_[] = "_terminated.xxxx_"; -static WCHAR _terminatedW [] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; -static WCHAR _terminatedW_[] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; +static WCHAR _terminatedW [] = L"_terminated.xxxx_"; +static WCHAR _terminatedW_[] = L"_terminated.xxxx_"; static char filename2[] = "testfile.yyy"; @@ -700,7 +700,7 @@ static void test_LZOpenFileW(void) OFSTRUCT test; DWORD retval; INT file; - static WCHAR badfilenameW[] = {'b','a','d','f','i','l','e','n','a','m','e','.','x','t','n',0}; + static WCHAR badfilenameW[] = L"badfilename.xtn"; char expected[MAX_PATH]; SetLastError(0xfaceabee); -- 2.26.2

1 0

[PATCH] spoolss: Use wide-char string literals.
by Michael Stefaniuc 14 Oct '20

14 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/spoolss/router.c | 2 +- dlls/spoolss/spoolss_main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 764721b202c..24314b1f23a 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -151,7 +151,7 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; /* ################################ */ -static WCHAR localsplW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; +static WCHAR localsplW[] = L"localspl.dll"; /****************************************************************** * strdupW [internal] diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 61c565d2faa..bee58755eee 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolss); static HMODULE hwinspool; -static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; - /****************************************************************************** * */ @@ -232,7 +230,7 @@ BOOL WINAPI SplInitializeWinSpoolDrv(LPVOID * table) TRACE("(%p)\n", table); - hwinspool = LoadLibraryW(winspooldrvW); + hwinspool = LoadLibraryW(L"winspool.drv"); if (!hwinspool) return FALSE; table[0] = (void *) GetProcAddress(hwinspool, "OpenPrinterW"); -- 2.26.2

1 0

[PATCH] msisip: Use wide-char string literals.
by Michael Stefaniuc 14 Oct '20

14 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- All those strings are really not const. dlls/msisip/main.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index aabea78ae62..11893f149c3 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -52,21 +52,13 @@ static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000, */ HRESULT WINAPI DllRegisterServer(void) { - static WCHAR msisip[] = { 'M','S','I','S','I','P','.','D','L','L',0 }; - static WCHAR getSignedDataMsg[] = { 'M','s','i','S','I','P','G','e','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR putSignedDataMsg[] = { 'M','s','i','S','I','P','P','u','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR createIndirectData[] = { 'M','s','i','S','I','P', - 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR verifyIndirectData[] = { 'M','s','i','S','I','P', - 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR removeSignedDataMsg[] = { 'M','s','i','S','I','P','R','e','m', - 'o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g', 0 }; - static WCHAR isMyTypeOfFile[] = { 'M','s','i','S','I','P', - 'I','s','M','y','T','y','p','e','O','f','F','i','l','e',0 }; + static WCHAR msisip[] = L"MSISIP.DLL"; + static WCHAR getSignedDataMsg[] = L"MsiSIPGetSignedDataMsg"; + static WCHAR putSignedDataMsg[] = L"MsiSIPPutSignedDataMsg"; + static WCHAR createIndirectData[] = L"MsiSIPCreateIndirectData"; + static WCHAR verifyIndirectData[] = L"MsiSIPVerifyIndirectData"; + static WCHAR removeSignedDataMsg[] = L"MsiSIPRemoveSignedDataMsg"; + static WCHAR isMyTypeOfFile[] = L"MsiSIPIsMyTypeOfFile"; SIP_ADD_NEWPROVIDER prov; @@ -100,8 +92,6 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, BYTE *pbSignedDataMsg) { - static const WCHAR digitalSig[] = { 5,'D','i','g','i','t','a','l', - 'S','i','g','n','a','t','u','r','e',0 }; BOOL ret = FALSE; IStorage *stg = NULL; HRESULT r; @@ -120,7 +110,7 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, goto end; } - r = IStorage_OpenStream(stg, digitalSig, 0, + r = IStorage_OpenStream(stg, L"\5DigitalSignature", 0, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stm); if (FAILED(r)) { -- 2.26.2

1 0