wine-devel October 2020

wine-devel@winehq.org

82 participants
799 discussions

[PATCH] ntdll: Restore non-volatile registers in call_user_exception_dispatcher() on x86_64.
by Paul Gofman 22 Oct '20

22 Oct '20

Required to correctly restore non-volatile registers during unwind. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 56 +++++++++++++++++++++++++++---- dlls/ntdll/unix/signal_x86_64.c | 59 +++++++++++++++++++++++---------- 2 files changed, 91 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b2331b739ac..47b4c6a8918 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -56,6 +56,7 @@ static void * (WINAPI *pRtlLocateExtendedFeature)(CONTEXT_EX *context_ex, ULO static void * (WINAPI *pRtlLocateLegacyContext)(CONTEXT_EX *context_ex, ULONG *length); static void (WINAPI *pRtlSetExtendedFeaturesMask)(CONTEXT_EX *context_ex, ULONG64 feature_mask); static ULONG64 (WINAPI *pRtlGetExtendedFeaturesMask)(CONTEXT_EX *context_ex); +static NTSTATUS (WINAPI *pNtRaiseException)(EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -3716,6 +3717,8 @@ static struct } test_kiuserexceptiondispatcher_regs; +static ULONG64 test_kiuserexceptiondispatcher_saved_r12; + static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { @@ -3738,6 +3741,13 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE trace("dbg_except_continue_vectored_handler, code %#x, Rip %#lx.\n", rec->ExceptionCode, context->Rip); + if (rec->ExceptionCode == 0xceadbeef) + { + ok(context->P1Home == (ULONG64)0xdeadbeeffeedcafe, "Got unexpected context->P1Home %#lx.\n", context->P1Home); + context->R12 = test_kiuserexceptiondispatcher_saved_r12; + return EXCEPTION_CONTINUE_EXECUTION; + } + ok(rec->ExceptionCode == 0x80000003, "Got unexpected exception code %#x.\n", rec->ExceptionCode); got_exception = 1; @@ -3760,7 +3770,7 @@ void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *conte hook_called = TRUE; /* Broken on Win2008, probably rec offset in stack is different. */ - ok(rec->ExceptionCode == 0x80000003 || broken(!rec->ExceptionCode), + ok(rec->ExceptionCode == 0x80000003 || rec->ExceptionCode == 0xceadbeef || broken(!rec->ExceptionCode), "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); hook_KiUserExceptionDispatcher_rip = (void *)context->Rip; @@ -3769,7 +3779,7 @@ void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *conte sizeof(saved_KiUserExceptionDispatcher_bytes)); } -static void test_kiuserexceptiondispatcher(void) + void test_kiuserexceptiondispatcher(void) { LPVOID vectored_handler; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3810,15 +3820,15 @@ static void test_kiuserexceptiondispatcher(void) 0x48, 0x89, 0xe2, /* mov %rsp,%rdx */ 0x48, 0x8d, 0x8c, 0x24, 0xf0, 0x04, 0x00, 0x00, /* lea 0x4f0(%rsp),%rcx */ - + 0x4c, 0x89, 0x22, /* mov %r12,(%rdx) */ 0xff, 0x14, 0x25, - /* offset: 14 bytes */ + /* offset: 17 bytes */ 0x00, 0x00, 0x00, 0x00, /* callq *addr */ /* call hook implementation. */ 0x48, 0x31, 0xc9, /* xor %rcx, %rcx */ 0x48, 0x31, 0xd2, /* xor %rdx, %rdx */ 0xff, 0x24, 0x25, - /* offset: 27 bytes */ + /* offset: 30 bytes */ 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ }; @@ -3827,6 +3837,8 @@ static void test_kiuserexceptiondispatcher(void) DWORD old_protect1, old_protect2; EXCEPTION_RECORD record; void *bpt_address; + CONTEXT ctx; + LONG pass; BYTE *ptr; BOOL ret; @@ -3845,8 +3857,8 @@ static void test_kiuserexceptiondispatcher(void) ok(((ULONG64)&pKiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&pKiUserExceptionDispatcher), "Address is too long.\n"); - *(unsigned int *)(hook_trampoline + 14) = (unsigned int)(ULONG_PTR)&phook_KiUserExceptionDispatcher; - *(unsigned int *)(hook_trampoline + 27) = (unsigned int)(ULONG_PTR)&pKiUserExceptionDispatcher; + *(unsigned int *)(hook_trampoline + 17) = (unsigned int)(ULONG_PTR)&phook_KiUserExceptionDispatcher; + *(unsigned int *)(hook_trampoline + 30) = (unsigned int)(ULONG_PTR)&pKiUserExceptionDispatcher; ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); @@ -3954,6 +3966,35 @@ static void test_kiuserexceptiondispatcher(void) NtCurrentTeb()->Peb->BeingDebugged = 0; + vectored_handler = AddVectoredExceptionHandler(TRUE, dbg_except_continue_vectored_handler); + pass = 0; + InterlockedIncrement(&pass); + pRtlCaptureContext(&ctx); + if (InterlockedIncrement(&pass) == 2) /* interlocked to prevent compiler from moving before capture */ + { + memcpy(pKiUserExceptionDispatcher, patched_KiUserExceptionDispatcher_bytes, + sizeof(patched_KiUserExceptionDispatcher_bytes)); + got_exception = 0; + hook_called = FALSE; + + record.ExceptionCode = 0xceadbeef; + test_kiuserexceptiondispatcher_saved_r12 = ctx.R12; + ctx.R12 = (ULONG64)0xdeadbeeffeedcafe; + +#ifdef __GNUC__ + /* Spoil r12 value to make sure it doesn't come from the current userspace registers. */ + __asm__ volatile("movq $0xdeadcafe, %%r12" : : : "%r12"); +#endif + pNtRaiseException(&record, &ctx, TRUE); + ok(0, "Shouldn't be reached.\n"); + } + else + { + ok(pass == 3, "Got unexpected pass %d.\n", pass); + } + ok(hook_called, "Hook was not called.\n"); + RemoveVectoredExceptionHandler(vectored_handler); + ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), old_protect2, &old_protect2); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); @@ -8046,6 +8087,7 @@ START_TEST(exception) X(NtQueryInformationThread); X(NtSetInformationProcess); X(NtSuspendProcess); + X(NtRaiseException); X(NtResumeProcess); X(RtlGetUnloadEventTrace); X(RtlGetUnloadEventTraceEx); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 124032714c7..8cdf129f5cc 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1551,6 +1551,34 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon } +/*********************************************************************** + * set_nonvolatile_regs_from_context + * + * Set the non-volatile registers from CPU context. + */ +extern void set_nonvolatile_regs_from_context( const CONTEXT *context ); +__ASM_GLOBAL_FUNC( set_nonvolatile_regs_from_context, + "movq 0xa0(%rcx),%rbp\n\t" + "movq 0x90(%rcx),%rbx\n\t" + "movq 0xa8(%rcx),%rsi\n\t" + "movq 0xb0(%rcx),%rdi\n\t" + "movq 0xd8(%rcx),%r12\n\t" + "movq 0xe0(%rcx),%r13\n\t" + "movq 0xe8(%rcx),%r14\n\t" + "movq 0xf0(%rcx),%r15\n\t" + "movdqa 0x200(%rcx),%xmm6\n\t" + "movdqa 0x210(%rcx),%xmm7\n\t" + "movdqa 0x220(%rcx),%xmm8\n\t" + "movdqa 0x230(%rcx),%xmm9\n\t" + "movdqa 0x240(%rcx),%xmm10\n\t" + "movdqa 0x250(%rcx),%xmm11\n\t" + "movdqa 0x260(%rcx),%xmm12\n\t" + "movdqa 0x270(%rcx),%xmm13\n\t" + "movdqa 0x280(%rcx),%xmm14\n\t" + "movdqa 0x290(%rcx),%xmm15\n\t" + "ret" ); + + /*********************************************************************** * set_full_cpu_context * @@ -2081,19 +2109,7 @@ __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, /*********************************************************************** * call_user_exception_dispatcher */ - -extern void WINAPI user_exception_dispatcher_trampoline( struct stack_layout *stack, - void *pKiUserExceptionDispatcher ); - -__ASM_GLOBAL_FUNC( user_exception_dispatcher_trampoline, - "movq %rcx,%rsp\n\t" - "movq 0x98(%rsp),%rcx\n\t" /* context->Rsp */ - "movq 0xa0(%rsp),%rbp\n\t" - "movq 0xa8(%rsp),%rsi\n\t" - "movq 0xb0(%rsp),%rdi\n\t" - "jmpq *%rdx") - -void WINAPI do_call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, +struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RECORD *rec, CONTEXT *context, NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*), struct stack_layout *stack ) { @@ -2127,12 +2143,13 @@ void WINAPI do_call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *c /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) stack->context.Rip--; - amd64_thread_data()->syscall_frame = NULL; - user_exception_dispatcher_trampoline( stack, dispatcher ); + return stack; } __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, - "movq 0x98(%rdx),%r9\n\t" /* context->Rsp */ + "movq %gs:0x30,%rax\n\t" + "movq $0,0x328(%rax)\n\t" /* amd64_thread_data()->syscall_frame */ + "movq 0x98(%rdx),%r9\n\t" /* context->Rsp */ "andq $~0xf,%r9\n\t" "btl $6,0x30(%rdx)\n\t" /* context->ContextFlags, CONTEXT_XSTATE bit. */ "jnc 1f\n\t" @@ -2141,7 +2158,15 @@ __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "1:\tsubq $0x5b0,%r9\n\t" /* sizeof(struct stack_layout) */ "cmpq %rsp,%r9\n\t" "cmovbq %r9,%rsp\n\t" - "jmp " __ASM_NAME("do_call_user_exception_dispatcher") "\n\t") + "pushq %r8\n\t" + "subq $0x20,%rsp\n\t" + "call " __ASM_NAME("setup_user_exception_dispatcher_stack") "\n\t" + "mov %rax,%rcx\n\t" + "call " __ASM_NAME("set_nonvolatile_regs_from_context") "\n\t" + "addq $0x20,%rsp\n\t" + "popq %r8\n\t" + "mov %rcx,%rsp\n\t" + "jmpq *%r8") /*********************************************************************** * is_privileged_instr -- 2.26.2

1 0

[PATCH 1/5] evr/mixer: Implement GetInputStatus().
by Nikolay Sivov 22 Oct '20

22 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 24 +++++++++++++++++++++--- dlls/evr/tests/evr.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 55acf179bdc..b87b621835e 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -909,11 +909,29 @@ static HRESULT WINAPI video_mixer_transform_GetOutputCurrentType(IMFTransform *i return hr; } -static HRESULT WINAPI video_mixer_transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) +static HRESULT WINAPI video_mixer_transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *status) { - FIXME("%p, %u, %p.\n", iface, id, flags); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct input_stream *stream; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, id, status); + + if (!status) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + + if (!mixer->output.media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (SUCCEEDED(hr = video_mixer_get_input(mixer, id, &stream))) + { + *status = stream->sample ? 0 : MFT_INPUT_STATUS_ACCEPT_DATA; + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, DWORD *flags) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d71a63ff602..776f61bbbe7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2086,6 +2086,18 @@ static void test_mixer_samples(void) hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + hr = IMFTransform_GetInputStatus(mixer, 0, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputStatus(mixer, 1, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputStatus(mixer, 1, &status); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + /* Configure device and media types. */ hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2106,9 +2118,20 @@ static void test_mixer_samples(void) hr = IMFTransform_SetInputType(mixer, 0, video_type, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetOutputType(mixer, 0, video_type, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + status = 0; + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status); + + hr = IMFTransform_GetInputStatus(mixer, 1, &status); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + IMFMediaType_Release(video_type); memset(&buffer, 0, sizeof(buffer)); @@ -2162,9 +2185,19 @@ todo_wine hr = IMFTransform_ProcessInput(mixer, 5, NULL, 0); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + status = 0; + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + status = ~0u; + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); -- 2.28.0

2 5

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

22 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 43 ++++++++++------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 2e0ab21f89b..5243481ff28 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) -static const WCHAR cryptNet[] = { 'c','r','y','p','t','n','e','t','.', - 'd','l','l',0 }; /*********************************************************************** * DllRegisterServer (CRYPTNET.@) @@ -48,11 +46,11 @@ HRESULT WINAPI DllRegisterServer(void) { TRACE("\n"); CryptRegisterDefaultOIDFunction(X509_ASN_ENCODING, - CRYPT_OID_VERIFY_REVOCATION_FUNC, 0, cryptNet); + CRYPT_OID_VERIFY_REVOCATION_FUNC, 0, L"cryptnet.dll"); CryptRegisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, "Ldap", - cryptNet, "LdapProvOpenStore"); + L"cryptnet.dll", "LdapProvOpenStore"); CryptRegisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, - CERT_STORE_PROV_LDAP_W, cryptNet, "LdapProvOpenStore"); + CERT_STORE_PROV_LDAP_W, L"cryptnet.dll", "LdapProvOpenStore"); return S_OK; } @@ -63,7 +61,7 @@ HRESULT WINAPI DllUnregisterServer(void) { TRACE("\n"); CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, - CRYPT_OID_VERIFY_REVOCATION_FUNC, cryptNet); + CRYPT_OID_VERIFY_REVOCATION_FUNC, L"cryptnet.dll"); CryptUnregisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, "Ldap"); CryptUnregisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, CERT_STORE_PROV_LDAP_W); @@ -851,28 +849,6 @@ static BOOL WINAPI FTP_RetrieveEncodedObjectW(LPCWSTR pszURL, return FALSE; } -static const WCHAR x509cacert[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','x','5','0','9','-','c','a','-','c','e','r','t',0 }; -static const WCHAR x509emailcert[] = { 'a','p','p','l','i','c','a','t','i','o', - 'n','/','x','-','x','5','0','9','-','e','m','a','i','l','-','c','e','r','t', - 0 }; -static const WCHAR x509servercert[] = { 'a','p','p','l','i','c','a','t','i','o', - 'n','/','x','-','x','5','0','9','-','s','e','r','v','e','r','-','c','e','r', - 't',0 }; -static const WCHAR x509usercert[] = { 'a','p','p','l','i','c','a','t','i','o', - 'n','/','x','-','x','5','0','9','-','u','s','e','r','-','c','e','r','t',0 }; -static const WCHAR pkcs7cert[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','c','e','r','t','i','f','c','a','t','e', - 's',0 }; -static const WCHAR pkixCRL[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','p','k','i','x','-','c','r','l',0 }; -static const WCHAR pkcs7CRL[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','c','r','l',0 }; -static const WCHAR pkcs7sig[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','s','i','g','n','a','t','u','r','e',0 }; -static const WCHAR pkcs7mime[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','m','i','m','e',0 }; - static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, LPCSTR pszObjectOid, DWORD dwRetrievalFlags, DWORD dwTimeout, PCRYPT_BLOB_ARRAY pObject, PFN_FREE_ENCODED_OBJECT_FUNC *ppfnFreeObject, @@ -908,9 +884,14 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, &hHost); if (ret) { - static LPCWSTR types[] = { x509cacert, x509emailcert, - x509servercert, x509usercert, pkcs7cert, pkixCRL, pkcs7CRL, - pkcs7sig, pkcs7mime, NULL }; + static LPCWSTR types[] = + { + L"application/x-x509-ca-cert", L"application/x-x509-email-cert", + L"application/x-x509-server-cert", L"application/x-x509-user-cert", + L"application/x-pkcs7-certifcates", L"application/pkix-crl", + L"application/x-pkcs7-crl", L"application/x-pkcs7-signature", + L"application/x-pkcs7-mime", NULL + }; HINTERNET hHttp = HttpOpenRequestW(hHost, NULL, components.lpszUrlPath, NULL, NULL, types, INTERNET_FLAG_NO_COOKIES | INTERNET_FLAG_NO_UI, -- 2.26.2

1 0

[PATCH] cryptnet/tests: Change the scope of a variable from global to local.
by Michael Stefaniuc 22 Oct '20

22 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Avoids functions further down in the file to mask the global 'url' variable. And of course not const due to the API... dlls/cryptnet/tests/cryptnet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 0b017604c04..3eca9e43f2e 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -99,11 +99,10 @@ static void compareUrlArray(const CRYPT_URL_ARRAY *expected, } } -static WCHAR url[] = - { 'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0 }; static void test_getObjectUrl(void) { + static WCHAR url[] = L"http://winehq.org"; BOOL ret; DWORD urlArraySize = 0, infoSize = 0; PCCERT_CONTEXT cert; -- 2.26.2

1 0

[PATCH v2] wbemprox: Implement Win32_SoundDevice.Status.
by Hans Leidekker 22 Oct '20

22 Oct '20

From: Haoyang Chen <chenhaoyang(a)uniontech.com> v2: Keep properties sorted. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 590714b826b..e35aa069e1d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -379,6 +379,7 @@ static const struct column col_sounddevice[] = { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, { L"ProductName", CIM_STRING }, + { L"Status", CIM_STRING }, { L"StatusInfo", CIM_UINT16 }, }; static const struct column col_stdregprov[] = @@ -768,6 +769,7 @@ struct record_sounddevice const WCHAR *manufacturer; const WCHAR *name; const WCHAR *productname; + const WCHAR *status; UINT16 statusinfo; }; struct record_stdregprov @@ -886,7 +888,7 @@ static const struct record_quickfixengineering data_quickfixengineering[] = }; static const struct record_sounddevice data_sounddevice[] = { - { L"The Wine Project", L"Wine Audio Device", L"Wine Audio Device", 3 /* enabled */ } + { L"The Wine Project", L"Wine Audio Device", L"Wine Audio Device", L"OK", 3 /* enabled */ } }; static const struct record_stdregprov data_stdregprov[] = { -- 2.28.0

1 0

[PATCH] ncrypt: Add NCryptIsKeyHandle stub
by Vitaly Lipatov 22 Oct '20

22 Oct '20

--- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index c0cc05c43ca..a8dda3c54a0 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -132,6 +132,12 @@ SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const W return NTE_NOT_SUPPORTED; } +BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) +{ + FIXME("(0x%lx): stub\n", hKey); + return FALSE; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 2b5a4fca420..0e92609790c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -78,7 +78,7 @@ @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) @ stub NCryptIsAlgSupported(long wstr long) -@ stub NCryptIsKeyHandle +@ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey @ stdcall NCryptOpenKey(long ptr wstr long long) -- 2.25.4

2 2

[PATCH] msado15: Implement _Recordset get/put CursorType
by Alistair Leslie-Hughes 22 Oct '20

22 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 6 ++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a5096e5c4ff..134a6e68a42 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -44,6 +44,7 @@ struct recordset LONG index; VARIANT *data; CursorLocationEnum cursor_location; + CursorTypeEnum curosr_type; }; struct fields @@ -910,14 +911,20 @@ static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) { - FIXME( "%p, %p\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, cursor_type ); + + *cursor_type = recordset->curosr_type; + return S_OK; } static HRESULT WINAPI recordset_put_CursorType( _Recordset *iface, CursorTypeEnum cursor_type ) { - FIXME( "%p, %d\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %d\n", iface, cursor_type ); + + recordset->curosr_type = cursor_type; + return S_OK; } static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) @@ -1546,6 +1553,7 @@ HRESULT Recordset_create( void **obj ) recordset->refs = 1; recordset->index = -1; recordset->cursor_location = adUseServer; + recordset->curosr_type = adOpenForwardOnly; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index adf9fb30bc2..e95df49c2c2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -68,6 +68,7 @@ static void test_Recordset(void) LONG refs, count, state; VARIANT missing, val, index; CursorLocationEnum location; + CursorTypeEnum cursor; BSTR name; HRESULT hr; @@ -144,6 +145,11 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( location == adUseServer, "got %d\n", location ); + cursor = adOpenUnspecified; + hr = _Recordset_get_CursorType( recordset, &cursor ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.28.0

1 0

[PATCH] server: Stop compile error when irda.h is available
by Alistair Leslie-Hughes 22 Oct '20

22 Oct '20

Include "af_irda.h" so SOCKADDR_IRDA is defined. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- server/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/sock.c b/server/sock.c index 866a9351152..8f500adc68b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -86,6 +86,7 @@ #include "winsock2.h" #include "ws2tcpip.h" #include "wsipx.h" +#include "af_irda.h" #include "wine/afd.h" #include "process.h" -- 2.28.0

1 0

[PATCH 2/2] msi: Inline some very simple WCHAR strings.
by Michael Stefaniuc 22 Oct '20

22 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Empty strings, single WCHAR strings and szDotDot as it was in the way. Starting to nibble at msi else the change would be huge and unreviewable. dlls/msi/action.c | 44 ++++++++++++++--------------- dlls/msi/appsearch.c | 14 ++++----- dlls/msi/assembly.c | 3 +- dlls/msi/automation.c | 3 +- dlls/msi/classes.c | 7 ++--- dlls/msi/cond.y | 4 +-- dlls/msi/custom.c | 2 +- dlls/msi/database.c | 13 ++++----- dlls/msi/dialog.c | 24 +++++++--------- dlls/msi/files.c | 7 ++--- dlls/msi/install.c | 2 +- dlls/msi/msi.c | 25 ++++++++-------- dlls/msi/msipriv.h | 9 ------ dlls/msi/msiquery.c | 8 +++--- dlls/msi/package.c | 66 +++++++++++++++++++++---------------------- dlls/msi/registry.c | 4 +-- dlls/msi/select.c | 4 +-- dlls/msi/source.c | 6 ++-- dlls/msi/string.c | 2 +- dlls/msi/table.c | 4 +-- dlls/msi/upgrade.c | 2 +- 21 files changed, 115 insertions(+), 138 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d02860e4d71..6fcdf275415 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1467,9 +1467,9 @@ static UINT load_folder( MSIRECORD *row, LPVOID param ) src_long = folder_split_path( src_short, '|' ); /* check for no-op dirs */ - if (tgt_short && !wcscmp( szDot, tgt_short )) + if (tgt_short && !wcscmp( L".", tgt_short )) tgt_short = szEmpty; - if (src_short && !wcscmp( szDot, src_short )) + if (src_short && !wcscmp( L".", src_short )) src_short = szEmpty; if (!tgt_long) @@ -1553,7 +1553,7 @@ static UINT load_all_folders( MSIPACKAGE *package ) static UINT ACTION_CostInitialize(MSIPACKAGE *package) { - msi_set_property( package->db, szCostingComplete, szZero, -1 ); + msi_set_property( package->db, szCostingComplete, L"0", -1 ); msi_set_property( package->db, szRootDrive, szCRoot, -1 ); load_all_folders( package ); @@ -1772,7 +1772,7 @@ static BOOL process_overrides( MSIPACKAGE *package, int level ) ret |= process_state_property( package, level, szAdvertise, INSTALLSTATE_ADVERTISED ); if (ret) - msi_set_property( package->db, szPreselected, szOne, -1 ); + msi_set_property( package->db, szPreselected, L"1", -1 ); return ret; } @@ -2207,7 +2207,7 @@ WCHAR *msi_build_directory_name( DWORD count, ... ) const WCHAR *str = va_arg( va, const WCHAR * ); if (!str) continue; lstrcatW( dir, str ); - if ( i + 1 != count && dir[0] && dir[lstrlenW( dir ) - 1] != '\\') lstrcatW( dir, szBackSlash ); + if ( i + 1 != count && dir[0] && dir[lstrlenW( dir ) - 1] != '\\') lstrcatW( dir, L"\\" ); } va_end( va ); return dir; @@ -2474,10 +2474,10 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) TRACE("Calculating file cost\n"); calculate_file_cost( package ); - msi_set_property( package->db, szCostingComplete, szOne, -1 ); + msi_set_property( package->db, szCostingComplete, L"1", -1 ); /* set default run level if not set */ level = msi_dup_property( package->db, szInstallLevel ); - if (!level) msi_set_property( package->db, szInstallLevel, szOne, -1 ); + if (!level) msi_set_property( package->db, szInstallLevel, L"1", -1 ); msi_free(level); if ((rc = MSI_SetFeatureStates( package ))) return rc; @@ -2514,8 +2514,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) } /* FIXME: check volume disk space */ - msi_set_property( package->db, szOutOfDiskSpace, szZero, -1 ); - msi_set_property( package->db, szOutOfNoRbDiskSpace, szZero, -1 ); + msi_set_property( package->db, szOutOfDiskSpace, L"0", -1 ); + msi_set_property( package->db, szOutOfNoRbDiskSpace, L"0", -1 ); return ERROR_SUCCESS; } @@ -4244,13 +4244,13 @@ static UINT msi_publish_sourcelist(MSIPACKAGE *package, HKEY hkey) r = MsiSourceListSetInfoW(package->ProductCode, NULL, package->Context, MSICODE_PRODUCT, - INSTALLPROPERTY_MEDIAPACKAGEPATHW, szEmpty); + INSTALLPROPERTY_MEDIAPACKAGEPATHW, L""); if (r != ERROR_SUCCESS) return r; r = MsiSourceListSetInfoW(package->ProductCode, NULL, package->Context, MSICODE_PRODUCT, - INSTALLPROPERTY_DISKPROMPTW, szEmpty); + INSTALLPROPERTY_DISKPROMPTW, L""); if (r != ERROR_SUCCESS) return r; @@ -4285,7 +4285,6 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) {'A','d','v','e','r','t','i','s','e','F','l','a','g','s',0}; static const WCHAR szClients[] = {'C','l','i','e','n','t','s',0}; - static const WCHAR szColon[] = {':',0}; WCHAR *buffer, *ptr, *guids, packcode[SQUASHED_GUID_SIZE]; DWORD langid; @@ -4319,7 +4318,7 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) msi_reg_set_val_dword(hkey, szAssignment, 0); msi_reg_set_val_dword(hkey, szAdvertiseFlags, 0x184); msi_reg_set_val_dword(hkey, INSTALLPROPERTY_INSTANCETYPEW, 0); - msi_reg_set_val_str(hkey, szClients, szColon); + msi_reg_set_val_str(hkey, szClients, L":"); if (!(guids = msi_get_package_code(package->db))) return ERROR_OUTOFMEMORY; if ((ptr = wcschr(guids, ';'))) *ptr = 0; @@ -5064,8 +5063,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) if (feature->Feature_Parent) { - static const WCHAR sep[] = {'\2',0}; - lstrcatW(data,sep); + lstrcatW(data, L"\2"); lstrcatW(data,feature->Feature_Parent); } @@ -5078,8 +5076,8 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) if (!absent) { size += sizeof(WCHAR); - RegSetValueExW(hkey,feature->Feature,0,REG_SZ, - (const BYTE*)(feature->Feature_Parent ? feature->Feature_Parent : szEmpty),size); + RegSetValueExW(hkey, feature->Feature, 0, REG_SZ, + (const BYTE*)(feature->Feature_Parent ? feature->Feature_Parent : L""), size); } else { @@ -6156,7 +6154,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) } lstrcpyW(image_path, file->TargetPath); - lstrcatW(image_path, szSpace); + lstrcatW(image_path, L" "); lstrcatW(image_path, args); } service = CreateServiceW(hscm, name, disp, GENERIC_ALL, serv_type, @@ -7160,7 +7158,7 @@ static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) LPCWSTR ptr = *value; if (!wcsncmp(ptr, prefix, prefix_len)) { - if (ptr[prefix_len] == szSemiColon[0]) + if (ptr[prefix_len] == L';') { *flags |= ENV_MOD_APPEND; *value += lstrlenW(prefix); @@ -7175,7 +7173,7 @@ static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) ptr += lstrlenW(ptr) - prefix_len; if (!wcscmp( ptr, prefix )) { - if ((ptr-1) > *value && *(ptr-1) == szSemiColon[0]) + if ((ptr-1) > *value && *(ptr-1) == L';') { *flags |= ENV_MOD_PREFIX; /* the "[~]" will be removed by deformat_string */; @@ -7642,7 +7640,7 @@ static UINT ACTION_DisableRollback( MSIPACKAGE *package ) { TRACE("%p\n", package); - msi_set_property( package->db, szRollbackDisabled, szOne, -1 ); + msi_set_property( package->db, szRollbackDisabled, L"1", -1 ); return ERROR_SUCCESS; } @@ -8171,7 +8169,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_free(dir); dir = msi_alloc(MAX_PATH * sizeof(WCHAR)); GetCurrentDirectoryW(MAX_PATH, dir); - lstrcatW(dir, szBackSlash); + lstrcatW(dir, L"\\"); file = szPackagePath; } @@ -8219,7 +8217,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, if (msi_get_property_int( package->db, szDisableRollback, 0 )) { TRACE("disabling rollback\n"); - msi_set_property( package->db, szRollbackDisabled, szOne, -1 ); + msi_set_property( package->db, szRollbackDisabled, L"1", -1 ); } rc = ACTION_PerformAction(package, action); diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index dd58ccad702..f2f23a0663d 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -195,7 +195,7 @@ static WCHAR *search_file( MSIPACKAGE *package, WCHAR *path, MSISIGNATURE *sig ) if (!size) goto done; - if (!VerQueryValueW(buffer, szBackSlash, (LPVOID)&info, &size) || !info) + if (!VerQueryValueW(buffer, L"\\", (void *)&info, &size) || !info) goto done; if (sig->MinVersionLS || sig->MinVersionMS) @@ -694,7 +694,7 @@ static UINT file_version_matches( MSIPACKAGE *package, const MSISIGNATURE *sig, if (!(version = msi_alloc( size ))) return ERROR_OUTOFMEMORY; if (msi_get_file_version_info( package, filePath, size, version )) - VerQueryValueW( version, szBackSlash, (void **)&info, &len ); + VerQueryValueW( version, L"\\", (void **)&info, &len ); if (info) { @@ -843,8 +843,8 @@ static UINT recurse_search_directory( MSIPACKAGE *package, WCHAR **appValue, MSI if (hFind != INVALID_HANDLE_VALUE) { if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY && - wcscmp( findData.cFileName, szDot ) && - wcscmp( findData.cFileName, szDotDot )) + wcscmp( findData.cFileName, L"." ) && + wcscmp( findData.cFileName, L".." )) { lstrcpyW(subpath, dir); PathAppendW(subpath, findData.cFileName); @@ -853,8 +853,8 @@ static UINT recurse_search_directory( MSIPACKAGE *package, WCHAR **appValue, MSI while (rc == ERROR_SUCCESS && !*appValue && msi_find_next_file( package, hFind, &findData )) { - if (!wcscmp( findData.cFileName, szDot ) || - !wcscmp( findData.cFileName, szDotDot )) + if (!wcscmp( findData.cFileName, L"." ) || + !wcscmp( findData.cFileName, L".." )) continue; lstrcpyW(subpath, dir); @@ -1146,7 +1146,7 @@ static UINT ITERATE_CCPSearch(MSIRECORD *row, LPVOID param) if (value) { TRACE("Found signature %s\n", debugstr_w(signature)); - msi_set_property( package->db, success, szOne, -1 ); + msi_set_property( package->db, success, L"1", -1 ); msi_free(value); r = ERROR_NO_MORE_ITEMS; } diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bd694333d2a..fecb9a86008 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -187,7 +187,6 @@ static UINT get_assembly_name_attribute( MSIRECORD *rec, LPVOID param ) static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSIASSEMBLY *assembly ) { - static const WCHAR commaW[] = {',',0}; static const WCHAR queryW[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','M','s','i','A','s','s','e','m','b','l','y','N','a','m','e','`',' ', @@ -224,7 +223,7 @@ static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSI for (i = 0; i < name.count; i++) { lstrcatW( display_name, name.attrs[i] ); - if (i < name.count - 1) lstrcatW( display_name, commaW ); + if (i < name.count - 1) lstrcatW( display_name, L"," ); } } diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 87c7815094a..6a6a98e2aec 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -376,7 +376,6 @@ static HRESULT WINAPI AutomationObject_Invoke( else if (pExcepInfo && (hr == DISP_E_PARAMNOTFOUND || hr == DISP_E_EXCEPTION)) { - static const WCHAR szComma[] = { ',',0 }; static const WCHAR szExceptionSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0}; WCHAR szExceptionDescription[MAX_PATH]; BSTR bstrParamNames[MAX_FUNC_PARAMS]; @@ -395,7 +394,7 @@ static HRESULT WINAPI AutomationObject_Invoke( { if (bFirst) bFirst = FALSE; else { - lstrcpyW(&szExceptionDescription[lstrlenW(szExceptionDescription)], szComma); + lstrcpyW(&szExceptionDescription[lstrlenW(szExceptionDescription)], L","); } lstrcpyW(&szExceptionDescription[lstrlenW(szExceptionDescription)], bstrParamNames[i]); SysFreeString(bstrParamNames[i]); diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 4e0c1a68098..8a4c84adace 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -709,7 +709,6 @@ static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) {'D','l','l','S','u','r','r','o','g','a','t','e',0}; static const WCHAR szActivate[] = {'A','c','t','i','v','a','t','e','A','s','S','t','o','r','a','g','e',0}; - static const WCHAR szY[] = {'Y',0}; static const WCHAR szRunAs[] = {'R','u','n','A','s',0}; static const WCHAR szUser[] = {'I','n','t','e','r','a','c','t','i','v','e',' ','U','s','e','r',0}; @@ -734,7 +733,7 @@ static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) msi_reg_set_val_str( hkey3, szDLL, appid->DllSurrogate ); if (appid->ActivateAtStorage) - msi_reg_set_val_str( hkey3, szActivate, szY ); + msi_reg_set_val_str( hkey3, szActivate, L"Y" ); if (appid->RunAsInteractiveUser) msi_reg_set_val_str( hkey3, szRunAs, szUser ); @@ -830,7 +829,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) if (cls->Argument) { - lstrcatW( argument, szSpace ); + lstrcatW( argument, L" " ); lstrcatW( argument, cls->Argument ); } @@ -1225,7 +1224,7 @@ static UINT register_verb(MSIPACKAGE *package, LPCWSTR progid, lstrcpyW(command,advertise); if (verb->Argument) { - lstrcatW(command,szSpace); + lstrcatW(command, L" "); lstrcatW(command,verb->Argument); } diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 1a79de31bf8..607e22dba32 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -501,8 +501,8 @@ static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b, BOOL convert ) return compare_substring( a, operator, b ); /* null and empty string are equivalent */ - if (!a) a = szEmpty; - if (!b) b = szEmpty; + if (!a) a = L""; + if (!b) b = L""; if (convert && str_is_number(a) && str_is_number(b)) return compare_int( wcstol(a, NULL, 10), operator, wcstol(b, NULL, 10) ); diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index e2379424878..2e0aa78d11c 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1451,7 +1451,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) else if (actiondata) msi_set_property( package->db, szCustomActionData, actiondata, -1 ); else - msi_set_property( package->db, szCustomActionData, szEmpty, -1 ); + msi_set_property( package->db, szCustomActionData, L"", -1 ); msi_free(actiondata); } diff --git a/dlls/msi/database.c b/dlls/msi/database.c index f7c70aeead7..e3b498891bb 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -257,7 +257,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if (!wcschr( save_path, '\\' )) { GetCurrentDirectoryW( MAX_PATH, path ); - lstrcatW( path, szBackSlash ); + lstrcatW( path, L"\\" ); lstrcatW( path, save_path ); } else @@ -771,13 +771,13 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) if( folder == NULL || file == NULL ) return ERROR_INVALID_PARAMETER; - len = lstrlenW(folder) + lstrlenW(szBackSlash) + lstrlenW(file) + 1; + len = lstrlenW(folder) + lstrlenW(L"\\") + lstrlenW(file) + 1; path = msi_alloc( len * sizeof(WCHAR) ); if (!path) return ERROR_OUTOFMEMORY; lstrcpyW( path, folder ); - lstrcatW( path, szBackSlash ); + lstrcatW( path, L"\\" ); lstrcatW( path, file ); data = msi_read_text_archive( path, &len ); @@ -1102,7 +1102,7 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, return ERROR_OUTOFMEMORY; lstrcpyW( filename, folder ); - lstrcatW( filename, szBackSlash ); + lstrcatW( filename, L"\\" ); lstrcatW( filename, file ); handle = CreateFileW( filename, GENERIC_READ | GENERIC_WRITE, 0, @@ -1424,15 +1424,14 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) if (MSI_RecordGetString(rec, i)) /* check record field is a string */ { /* quote string record fields */ - static const WCHAR szQuote[] = {'\'', 0}; sz += 2; val = msi_alloc(sz*sizeof(WCHAR)); if (!val) return NULL; - lstrcpyW(val, szQuote); + lstrcpyW(val, L"'"); r = MSI_RecordGetStringW(rec, i, val+1, &sz); - lstrcpyW(val+1+sz, szQuote); + lstrcpyW(val+1+sz, L"'"); } else { diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 81b0d3dba02..206fedb61c9 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -627,7 +627,7 @@ static void dialog_handle_event( msi_dialog *dialog, const WCHAR *control, font = msi_dialog_get_style( font_text, &text ); deformat_string( dialog->package, text, &text_fmt ); if (text_fmt) text = text_fmt; - else text = szEmpty; + else text = L""; SetWindowTextW( ctrl->hwnd, text ); @@ -1179,7 +1179,6 @@ static UINT msi_dialog_get_checkbox_state( msi_dialog *dialog, msi_control *cont static void msi_dialog_set_checkbox_state( msi_dialog *dialog, msi_control *control, UINT state ) { - static const WCHAR szState[] = {'1',0}; LPCWSTR val; /* if uncheck then the property is set to NULL */ @@ -1193,7 +1192,7 @@ static void msi_dialog_set_checkbox_state( msi_dialog *dialog, msi_control *cont if (control->value && control->value[0]) val = control->value; else - val = szState; + val = L"1"; msi_dialog_set_property( dialog->package, control->property, val ); } @@ -2986,7 +2985,6 @@ static UINT msi_dialog_directory_combo( msi_dialog *dialog, MSIRECORD *rec ) static void msi_dialog_update_directory_list( msi_dialog *dialog, msi_control *control ) { - static const WCHAR asterisk[] = {'*',0}; WCHAR dir_spec[MAX_PATH], *path; WIN32_FIND_DATAW wfd; LVITEMW item; @@ -3000,7 +2998,7 @@ static void msi_dialog_update_directory_list( msi_dialog *dialog, msi_control *c if (!(path = get_path_property( dialog, control ))) return; lstrcpyW( dir_spec, path ); - lstrcatW( dir_spec, asterisk ); + lstrcatW( dir_spec, L"*" ); file = FindFirstFileW( dir_spec, &wfd ); if (file == INVALID_HANDLE_VALUE) @@ -3014,7 +3012,7 @@ static void msi_dialog_update_directory_list( msi_dialog *dialog, msi_control *c if ( wfd.dwFileAttributes != FILE_ATTRIBUTE_DIRECTORY ) continue; - if ( !wcscmp( wfd.cFileName, szDot ) || !wcscmp( wfd.cFileName, szDotDot ) ) + if ( !wcscmp( wfd.cFileName, L"." ) || !wcscmp( wfd.cFileName, L".." ) ) continue; item.mask = LVIF_TEXT; @@ -3162,7 +3160,7 @@ static UINT msi_dialog_dirlist_handler( msi_dialog *dialog, msi_control *control lstrcpyW( new_path, path ); lstrcatW( new_path, text ); if (nmhdr->code == LVN_ENDLABELEDITW) CreateDirectoryW( new_path, NULL ); - lstrcatW( new_path, szBackSlash ); + lstrcatW( new_path, L"\\" ); msi_dialog_set_property( dialog->package, prop, new_path ); @@ -3234,8 +3232,6 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control LVCOLUMNW lvc; DWORD count = 0; - static const WCHAR negative[] = {'-',0}; - if (!text) return; while ((begin = wcschr( begin, '{' )) && count < 5) @@ -3251,7 +3247,7 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control begin += end - begin + 1; /* empty braces or '0' hides the column */ - if ( !num[0] || !wcscmp( num, szZero ) ) + if ( !num[0] || !wcscmp( num, L"0" ) ) { count++; msi_free( num ); @@ -3261,7 +3257,7 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control /* the width must be a positive number * if a width is invalid, all remaining columns are hidden */ - if ( !wcsncmp( num, negative, 1 ) || !str_is_number( num ) ) { + if ( !wcsncmp( num, L"-", 1 ) || !str_is_number( num ) ) { msi_free( num ); return; } @@ -4573,7 +4569,7 @@ static UINT event_add_local( msi_dialog *dialog, const WCHAR *argument ) if (!wcscmp( argument, feature->Feature ) || !wcscmp( argument, szAll )) { if (feature->ActionRequest != INSTALLSTATE_LOCAL) - msi_set_property( dialog->package->db, szPreselected, szOne, -1 ); + msi_set_property( dialog->package->db, szPreselected, L"1", -1 ); MSI_SetFeatureStateW( dialog->package, feature->Feature, INSTALLSTATE_LOCAL ); } } @@ -4589,7 +4585,7 @@ static UINT event_remove( msi_dialog *dialog, const WCHAR *argument ) if (!wcscmp( argument, feature->Feature ) || !wcscmp( argument, szAll )) { if (feature->ActionRequest != INSTALLSTATE_ABSENT) - msi_set_property( dialog->package->db, szPreselected, szOne, -1 ); + msi_set_property( dialog->package->db, szPreselected, L"1", -1 ); MSI_SetFeatureStateW( dialog->package, feature->Feature, INSTALLSTATE_ABSENT ); } } @@ -4605,7 +4601,7 @@ static UINT event_add_source( msi_dialog *dialog, const WCHAR *argument ) if (!wcscmp( argument, feature->Feature ) || !wcscmp( argument, szAll )) { if (feature->ActionRequest != INSTALLSTATE_SOURCE) - msi_set_property( dialog->package->db, szPreselected, szOne, -1 ); + msi_set_property( dialog->package->db, szPreselected, L"1", -1 ); MSI_SetFeatureStateW( dialog->package, feature->Feature, INSTALLSTATE_SOURCE ); } } diff --git a/dlls/msi/files.c b/dlls/msi/files.c index aba714b317d..b88dfd04182 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -160,7 +160,6 @@ DWORD msi_get_file_version_info( MSIPACKAGE *package, const WCHAR *path, DWORD b VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *package, const WCHAR *filename ) { - static const WCHAR name[] = {'\\',0}; VS_FIXEDFILEINFO *ptr, *ret; DWORD version_size, size; void *version; @@ -170,7 +169,7 @@ VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *package, const WCHAR *f msi_get_file_version_info( package, filename, version_size, version ); - if (!VerQueryValueW( version, name, (void **)&ptr, &size )) + if (!VerQueryValueW( version, L"\\", (void **)&ptr, &size )) { msi_free( version ); return NULL; @@ -1129,7 +1128,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) lstrcpyW(source, sourcedir); if (source[lstrlenW(source) - 1] != '\\') - lstrcatW(source, szBackSlash); + lstrcatW(source, L"\\"); lstrcatW(source, sourcename); } @@ -1167,7 +1166,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) lstrcpyW(dest, destdir); if (dest[lstrlenW(dest) - 1] != '\\') - lstrcatW(dest, szBackSlash); + lstrcatW(dest, L"\\"); if (destname) lstrcatW(dest, destname); diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 4277b51804f..5369fc0072e 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1030,7 +1030,7 @@ UINT WINAPI MsiSetFeatureAttributesW( MSIHANDLE handle, LPCWSTR name, DWORD attr return ERROR_INVALID_HANDLE; costing = msi_dup_property( package->db, szCostingComplete ); - if (!costing || !wcscmp( costing, szOne )) + if (!costing || !wcscmp( costing, L"1" )) { msi_free( costing ); msiobj_release( &package->hdr ); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 6387b0a9372..1fbef93d87a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -377,7 +377,6 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS BOOL succeeded = FALSE; static const WCHAR fmt[] = {'%','s',' ','P','A','T','C','H','=','"','%','s','"',0}; - static const WCHAR empty[] = {0}; if (!szPatchPackage || !szPatchPackage[0]) return ERROR_INVALID_PARAMETER; @@ -386,7 +385,7 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS return r; if (!szCommandLine) - cmd_ptr = empty; + cmd_ptr = L""; size = lstrlenW(cmd_ptr) + lstrlenW(fmt) + lstrlenW(szPatchPackage) + 1; cmd = msi_alloc(size * sizeof(WCHAR)); @@ -1426,7 +1425,6 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCWSTR szProperty, LPWSTR szValue, LPDWORD pcchValue) { - static const WCHAR five[] = {'5',0}; static const WCHAR displayname[] = { 'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR displayversion[] = { @@ -1528,7 +1526,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, val = reg_get_value(props, szProperty, &type); if (!val) - val = strdupW(szEmpty); + val = strdupW(L""); r = msi_copy_outval(val, szValue, pcchValue); } @@ -1553,7 +1551,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, val = reg_get_value(hkey, szProperty, &type); if (!val) - val = strdupW(szEmpty); + val = strdupW(L""); r = msi_copy_outval(val, szValue, pcchValue); } @@ -1568,10 +1566,10 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, goto done; msi_free(val); - val = strdupW(five); + val = strdupW(L"5"); } else - val = strdupW(szOne); + val = strdupW(L"1"); r = msi_copy_outval(val, szValue, pcchValue); goto done; @@ -1579,13 +1577,13 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, else if (props && (val = reg_get_value(props, package, &type))) { msi_free(val); - val = strdupW(five); + val = strdupW(L"5"); r = msi_copy_outval(val, szValue, pcchValue); goto done; } if (prod || managed) - val = strdupW(szOne); + val = strdupW(L"1"); else goto done; @@ -1597,7 +1595,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, goto done; /* FIXME */ - val = strdupW(szEmpty); + val = strdupW(L""); r = msi_copy_outval(val, szValue, pcchValue); } else @@ -1802,7 +1800,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, val = reg_get_value(datakey, szProperty, &type); if (!val) - val = strdupW(szEmpty); + val = strdupW(L""); r = ERROR_SUCCESS; @@ -3214,7 +3212,6 @@ end: static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, WCHAR *langbuf, DWORD *langlen ) { - static const WCHAR szVersionResource[] = {'\\',0}; static const WCHAR szVersionFormat[] = {'%','d','.','%','d','.','%','d','.','%','d',0}; static const WCHAR szLangFormat[] = {'%','d',0}; UINT ret = ERROR_MORE_DATA; @@ -3244,7 +3241,7 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, } if (verlen) { - if (VerQueryValueW( version, szVersionResource, (LPVOID *)&ffi, &len ) && len > 0) + if (VerQueryValueW( version, L"\\", (void **)&ffi, &len ) && len > 0) { swprintf( tmp, ARRAY_SIZE(tmp), szVersionFormat, HIWORD(ffi->dwFileVersionMS), LOWORD(ffi->dwFileVersionMS), @@ -3658,7 +3655,7 @@ static USERINFOSTATE MSI_GetUserInfo(LPCWSTR szProduct, if (pcchOrgNameBuf) { orgptr = org; - if (!orgptr) orgptr = szEmpty; + if (!orgptr) orgptr = L""; r = msi_strcpy_to_awstring(orgptr, -1, lpOrgNameBuf, pcchOrgNameBuf); if (r == ERROR_MORE_DATA) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a1b7f033c37..c03f78a10d6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1144,16 +1144,7 @@ static const WCHAR szRootDrive[] = {'R','O','O','T','D','R','I','V','E',0}; static const WCHAR szTargetDir[] = {'T','A','R','G','E','T','D','I','R',0}; static const WCHAR szLocalSid[] = {'S','-','1','-','5','-','1','8',0}; static const WCHAR szAllSid[] = {'S','-','1','-','1','-','0',0}; -static const WCHAR szEmpty[] = {0}; static const WCHAR szAll[] = {'A','L','L',0}; -static const WCHAR szOne[] = {'1',0}; -static const WCHAR szZero[] = {'0',0}; -static const WCHAR szSpace[] = {' ',0}; -static const WCHAR szBackSlash[] = {'\\',0}; -static const WCHAR szForwardSlash[] = {'/',0}; -static const WCHAR szDot[] = {'.',0}; -static const WCHAR szDotDot[] = {'.','.',0}; -static const WCHAR szSemiColon[] = {';',0}; static const WCHAR szPreselected[] = {'P','r','e','s','e','l','e','c','t','e','d',0}; static const WCHAR szPatches[] = {'P','a','t','c','h','e','s',0}; static const WCHAR szState[] = {'S','t','a','t','e',0}; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 7791ee9b91a..1a2efbe0008 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -798,7 +798,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR buffer, LPDWORD buf } __ENDTRY; - if (msi_strncpyW(remote_column ? remote_column : szEmpty, -1, buffer, buflen) == ERROR_MORE_DATA) + if (msi_strncpyW(remote_column ? remote_column : L"", -1, buffer, buflen) == ERROR_MORE_DATA) r = MSIDBERROR_MOREDATA; if (remote_column) @@ -808,7 +808,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR buffer, LPDWORD buf } if ((r = query->view->error)) column = query->view->error_column; - else column = szEmpty; + else column = L""; if (msi_strncpyW(column, -1, buffer, buflen) == ERROR_MORE_DATA) r = MSIDBERROR_MOREDATA; @@ -849,7 +849,7 @@ MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR buffer, LPDWORD bufl } __ENDTRY; - if (msi_strncpyWtoA(remote_column ? remote_column : szEmpty, -1, buffer, buflen, FALSE) == ERROR_MORE_DATA) + if (msi_strncpyWtoA(remote_column ? remote_column : L"", -1, buffer, buflen, FALSE) == ERROR_MORE_DATA) r = MSIDBERROR_MOREDATA; if (remote_column) @@ -859,7 +859,7 @@ MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR buffer, LPDWORD bufl } if ((r = query->view->error)) column = query->view->error_column; - else column = szEmpty; + else column = L""; if (msi_strncpyWtoA(column, -1, buffer, buflen, FALSE) == ERROR_MORE_DATA) r = MSIDBERROR_MOREDATA; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7b64362b10d..d74b9977d7a 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -481,7 +481,7 @@ static UINT set_installed_prop( MSIPACKAGE *package ) if (r == ERROR_SUCCESS) { RegCloseKey( hkey ); - msi_set_property( package->db, szInstalled, szOne, -1 ); + msi_set_property( package->db, szInstalled, L"1", -1 ); } return r; } @@ -567,7 +567,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, path); - lstrcatW(filename, szBackSlash); + lstrcatW(filename, L"\\"); lstrcatW(filename, fusion); if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) { @@ -588,10 +588,10 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, windir); - lstrcatW(filename, szBackSlash); + lstrcatW(filename, L"\\"); lstrcatW(filename, subdir); lstrcatW(filename, v2050727); - lstrcatW(filename, szBackSlash); + lstrcatW(filename, L"\\"); lstrcatW(filename, fusion); if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) { @@ -765,81 +765,81 @@ static VOID set_installer_properties(MSIPACKAGE *package) */ SHGetFolderPathW(NULL, CSIDL_COMMON_APPDATA, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szCommonAppDataFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_FAVORITES, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szFavoritesFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szFontsFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_SENDTO, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szSendToFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szStartMenuFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_STARTUP, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szStartupFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_TEMPLATES, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szTemplateFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_DESKTOP, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szDesktopFolder, pth, -1 ); /* FIXME: set to AllUsers profile path if ALLUSERS is set */ SHGetFolderPathW(NULL, CSIDL_PROGRAMS, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szProgramMenuFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_ADMINTOOLS, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szAdminToolsFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szAppDataFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_SYSTEM, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szSystemFolder, pth, -1 ); msi_set_property( package->db, szSystem16Folder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szLocalAppDataFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_MYPICTURES, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szMyPicturesFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szPersonalFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_WINDOWS, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szWindowsFolder, pth, -1 ); - + SHGetFolderPathW(NULL, CSIDL_PRINTHOOD, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szPrintHoodFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_NETHOOD, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szNetHoodFolder, pth, -1 ); SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, 0, pth); - lstrcatW(pth, szBackSlash); + lstrcatW(pth, L"\\"); msi_set_property( package->db, szRecentFolder, pth, -1 ); /* Physical Memory is specified in MB. Using total amount. */ @@ -857,8 +857,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_set_property( package->db, szTempFolder, pth, len ); /* in a wine environment the user is always admin and privileged */ - msi_set_property( package->db, szAdminUser, szOne, -1 ); - msi_set_property( package->db, szPrivileged, szOne, -1 ); + msi_set_property( package->db, szAdminUser, L"1", -1 ); + msi_set_property( package->db, szPrivileged, L"1", -1 ); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); @@ -1084,9 +1084,9 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) if (msi_get_property_int( package->db, szAllUsers, 0 ) == 2) { TRACE("resetting ALLUSERS property from 2 to 1\n"); - msi_set_property( package->db, szAllUsers, szOne, -1 ); + msi_set_property( package->db, szAllUsers, L"1", -1 ); } - msi_set_property( package->db, szAdminUser, szOne, -1 ); + msi_set_property( package->db, szAdminUser, L"1", -1 ); } MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) @@ -1591,7 +1591,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) if (msi_locate_product( product_code, &context ) == ERROR_SUCCESS) { TRACE("product already registered\n"); - msi_set_property( package->db, szProductToBeRegistered, szOne, -1 ); + msi_set_property( package->db, szProductToBeRegistered, L"1", -1 ); } msi_free(product_code); @@ -2028,7 +2028,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC template_rec = msi_dup_record_field(record, 0); template_prefix = msi_get_error_message(package->db, eMessageType >> 24); - if (!template_prefix) template_prefix = strdupW(szEmpty); + if (!template_prefix) template_prefix = strdupW(L""); if (!template_rec) { @@ -2060,7 +2060,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC msi_free(package->LastAction); msi_free(package->LastActionTemplate); package->LastAction = msi_dup_record_field(record, 1); - if (!package->LastAction) package->LastAction = strdupW(szEmpty); + if (!package->LastAction) package->LastAction = strdupW(L""); package->LastActionTemplate = msi_dup_record_field(record, 3); break; } @@ -2408,7 +2408,7 @@ int msi_get_property_int( MSIDATABASE *db, LPCWSTR prop, int def ) UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD *sz) { - const WCHAR *value = szEmpty; + const WCHAR *value = L""; MSIPACKAGE *package; MSIRECORD *row; WCHAR *nameW; @@ -2480,7 +2480,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWORD *sz) { - const WCHAR *value = szEmpty; + const WCHAR *value = L""; MSIPACKAGE *package; MSIRECORD *row; int len = 0; diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 4d439d0b304..4c9288e315f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -354,7 +354,7 @@ DWORD msi_version_str_to_dword(LPCWSTR p) LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) { DWORD len; - if (!value) value = szEmpty; + if (!value) value = L""; len = (lstrlenW(value) + 1) * sizeof (WCHAR); return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, len ); } @@ -1990,7 +1990,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, } else if (context == MSIINSTALLCONTEXT_MACHINE) { - usersid = szEmpty; + usersid = L""; if (MSIREG_OpenUserDataProductKey(prodcode, context, NULL, &localprod, FALSE) == ERROR_SUCCESS && RegOpenKeyExW(localprod, szPatches, 0, KEY_READ, &localpatch) == ERROR_SUCCESS && diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 3c643f37239..213141679e9 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -236,10 +236,10 @@ static UINT SELECT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *na n = sv->cols[ n - 1 ]; if( !n ) { - if (name) *name = szEmpty; + if (name) *name = L""; if (type) *type = MSITYPE_UNKNOWN | MSITYPE_VALID; if (temporary) *temporary = FALSE; - if (table_name) *table_name = szEmpty; + if (table_name) *table_name = L""; return ERROR_SUCCESS; } return sv->table->ops->get_column_info( sv->table, n, name, diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 89c04d9f7dd..f0e680f9bc4 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1108,7 +1108,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, return rc; } - postfix = (dwOptions & MSISOURCETYPE_NETWORK) ? szBackSlash : szForwardSlash; + postfix = (dwOptions & MSISOURCETYPE_NETWORK) ? L"\\" : L"/"; if (szSource[lstrlenW(szSource) - 1] == *postfix) source = strdupW(szSource); else @@ -1128,7 +1128,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, if (count == 0) { - rc = RegSetValueExW(typekey, szOne, 0, REG_EXPAND_SZ, (LPBYTE)source, size); + rc = RegSetValueExW(typekey, L"1", 0, REG_EXPAND_SZ, (BYTE *)source, size); goto done; } else if (dwIndex > count || dwIndex == 0) @@ -1254,7 +1254,7 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, *buffer = '\0'; if (szVolumeLabel) lstrcpyW(buffer, szVolumeLabel); - lstrcatW(buffer, szSemiColon); + lstrcatW(buffer, L";"); if (szDiskPrompt) lstrcatW(buffer, szDiskPrompt); RegSetValueExW(mediakey, szIndex, 0, REG_SZ, (LPBYTE)buffer, size); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 5c6432ba1ed..e5eedec16c9 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -347,7 +347,7 @@ const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) if( id == 0 ) { if (len) *len = 0; - return szEmpty; + return L""; } if( id >= st->maxcount ) return NULL; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e9d6e8804e7..971b3c6d081 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1107,7 +1107,7 @@ static UINT get_stream_name( const MSITABLEVIEW *tv, UINT row, WCHAR **pstname ) sval = number; } - len += lstrlenW( szDot ) + lstrlenW( sval ); + len += lstrlenW( L"." ) + lstrlenW( sval ); p = msi_realloc ( stname, len*sizeof(WCHAR) ); if ( !p ) { @@ -1116,7 +1116,7 @@ static UINT get_stream_name( const MSITABLEVIEW *tv, UINT row, WCHAR **pstname ) } stname = p; - lstrcatW( stname, szDot ); + lstrcatW( stname, L"." ); lstrcatW( stname, sval ); } else diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 60b5c74f40b..452f04e7630 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -97,7 +97,7 @@ static void append_productcode( MSIPACKAGE *package, const WCHAR *action_prop, c if (prop) { lstrcpyW( newprop, prop ); - lstrcatW( newprop, szSemiColon ); + lstrcatW( newprop, L";" ); } else newprop[0] = 0; lstrcatW( newprop, product ); -- 2.26.2

2 1

[PATCH 1/2] msi: Use 0 terminated WCHAR strings in the SQL tokenizer
by Michael Stefaniuc 22 Oct '20

22 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/tokenize.c | 114 +++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 75 deletions(-) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 4ebc9b81fb4..3b9f98c6f17 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -38,87 +38,51 @@ struct Keyword { #define MAX_TOKEN_LEN 11 -static const WCHAR addW[] = {'A','D','D'}; -static const WCHAR alterW[] = {'A','L','T','E','R'}; -static const WCHAR andW[] = {'A','N','D'}; -static const WCHAR byW[] = {'B','Y'}; -static const WCHAR charW[] = {'C','H','A','R'}; -static const WCHAR characterW[] = {'C','H','A','R','A','C','T','E','R'}; -static const WCHAR createW[] = {'C','R','E','A','T','E'}; -static const WCHAR deleteW[] = {'D','E','L','E','T','E'}; -static const WCHAR distinctW[] = {'D','I','S','T','I','N','C','T'}; -static const WCHAR dropW[] = {'D','R','O','P'}; -static const WCHAR freeW[] = {'F','R','E','E'}; -static const WCHAR fromW[] = {'F','R','O','M'}; -static const WCHAR holdW[] = {'H','O','L','D'}; -static const WCHAR insertW[] = {'I','N','S','E','R','T'}; -static const WCHAR intW[] = {'I','N','T'}; -static const WCHAR integerW[] = {'I','N','T','E','G','E','R'}; -static const WCHAR intoW[] = {'I','N','T','O'}; -static const WCHAR isW[] = {'I','S'}; -static const WCHAR keyW[] = {'K','E','Y'}; -static const WCHAR likeW[] = {'L','I','K','E'}; -static const WCHAR localizableW[] = {'L','O','C','A','L','I','Z','A','B','L','E'}; -static const WCHAR longW[] = {'L','O','N','G'}; -static const WCHAR longcharW[] = {'L','O','N','G','C','H','A','R'}; -static const WCHAR notW[] = {'N','O','T'}; -static const WCHAR nullW[] = {'N','U','L','L'}; -static const WCHAR objectW[] = {'O','B','J','E','C','T'}; -static const WCHAR orW[] = {'O','R'}; -static const WCHAR orderW[] = {'O','R','D','E','R'}; -static const WCHAR primaryW[] = {'P','R','I','M','A','R','Y'}; -static const WCHAR selectW[] = {'S','E','L','E','C','T'}; -static const WCHAR setW[] = {'S','E','T'}; -static const WCHAR shortW[] = {'S','H','O','R','T'}; -static const WCHAR tableW[] = {'T','A','B','L','E'}; -static const WCHAR temporaryW[] = {'T','E','M','P','O','R','A','R','Y'}; -static const WCHAR updateW[] = {'U','P','D','A','T','E'}; -static const WCHAR valuesW[] = {'V','A','L','U','E','S'}; -static const WCHAR whereW[] = {'W','H','E','R','E'}; - /* ** These are the keywords ** They MUST be in alphabetical order */ +#define X(str) str, ARRAY_SIZE(str) - 1 static const Keyword aKeywordTable[] = { - { addW, ARRAY_SIZE(addW), TK_ADD }, - { alterW, ARRAY_SIZE(alterW), TK_ALTER }, - { andW, ARRAY_SIZE(andW), TK_AND }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { charW, ARRAY_SIZE(charW), TK_CHAR }, - { characterW, ARRAY_SIZE(characterW), TK_CHAR }, - { createW, ARRAY_SIZE(createW), TK_CREATE }, - { deleteW, ARRAY_SIZE(deleteW), TK_DELETE }, - { distinctW, ARRAY_SIZE(distinctW), TK_DISTINCT }, - { dropW, ARRAY_SIZE(dropW), TK_DROP }, - { freeW, ARRAY_SIZE(freeW), TK_FREE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { holdW, ARRAY_SIZE(holdW), TK_HOLD }, - { insertW, ARRAY_SIZE(insertW), TK_INSERT }, - { intW, ARRAY_SIZE(intW), TK_INT }, - { integerW, ARRAY_SIZE(integerW), TK_INT }, - { intoW, ARRAY_SIZE(intoW), TK_INTO }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { keyW, ARRAY_SIZE(keyW), TK_KEY }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { localizableW, ARRAY_SIZE(localizableW), TK_LOCALIZABLE }, - { longW, ARRAY_SIZE(longW), TK_LONG }, - { longcharW, ARRAY_SIZE(longcharW), TK_LONGCHAR }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { objectW, ARRAY_SIZE(objectW), TK_OBJECT }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { orderW, ARRAY_SIZE(orderW), TK_ORDER }, - { primaryW, ARRAY_SIZE(primaryW), TK_PRIMARY }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { setW, ARRAY_SIZE(setW), TK_SET }, - { shortW, ARRAY_SIZE(shortW), TK_SHORT }, - { tableW, ARRAY_SIZE(tableW), TK_TABLE }, - { temporaryW, ARRAY_SIZE(temporaryW), TK_TEMPORARY }, - { updateW, ARRAY_SIZE(updateW), TK_UPDATE }, - { valuesW, ARRAY_SIZE(valuesW), TK_VALUES }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE }, + { X(L"ADD"), TK_ADD }, + { X(L"ALTER"), TK_ALTER }, + { X(L"AND"), TK_AND }, + { X(L"BY"), TK_BY }, + { X(L"CHAR"), TK_CHAR }, + { X(L"CHARACTER"), TK_CHAR }, + { X(L"CREATE"), TK_CREATE }, + { X(L"DELETE"), TK_DELETE }, + { X(L"DISTINCT"), TK_DISTINCT }, + { X(L"DROP"), TK_DROP }, + { X(L"FREE"), TK_FREE }, + { X(L"FROM"), TK_FROM }, + { X(L"HOLD"), TK_HOLD }, + { X(L"INSERT"), TK_INSERT }, + { X(L"INT"), TK_INT }, + { X(L"INTEGER"), TK_INT }, + { X(L"INTO"), TK_INTO }, + { X(L"IS"), TK_IS }, + { X(L"KEY"), TK_KEY }, + { X(L"LIKE"), TK_LIKE }, + { X(L"LOCALIZABLE"), TK_LOCALIZABLE }, + { X(L"LONG"), TK_LONG }, + { X(L"LONGCHAR"), TK_LONGCHAR }, + { X(L"NOT"), TK_NOT }, + { X(L"NULL"), TK_NULL }, + { X(L"OBJECT"), TK_OBJECT }, + { X(L"OR"), TK_OR }, + { X(L"ORDER"), TK_ORDER }, + { X(L"PRIMARY"), TK_PRIMARY }, + { X(L"SELECT"), TK_SELECT }, + { X(L"SET"), TK_SET }, + { X(L"SHORT"), TK_SHORT }, + { X(L"TABLE"), TK_TABLE }, + { X(L"TEMPORARY"), TK_TEMPORARY }, + { X(L"UPDATE"), TK_UPDATE }, + { X(L"VALUES"), TK_VALUES }, + { X(L"WHERE"), TK_WHERE }, }; +#undef X /* ** Comparison function for binary search. -- 2.26.2

2 1

← Newer
1
...
19
20
21
22
23
24
25
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2020