- Wine-Commits - list.winehq.org

Alexandre Julliard : sane.ds: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: ca7684f3eb8ea72ea3d5aa76decbea319b43546a URL: https://gitlab.winehq.org/wine/wine/-/commit/ca7684f3eb8ea72ea3d5aa76decbea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:39:21 2023 +0100 sane.ds: Remove DECLSPEC_HIDDEN usage. --- dlls/sane.ds/sane_i.h | 170 +++++++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 85 deletions(-)

1 0

Alexandre Julliard : wineoss.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: e9bf73872cc0cf8525a488678687f43469aea2de URL: https://gitlab.winehq.org/wine/wine/-/commit/e9bf73872cc0cf8525a488678687f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:38:45 2023 +0100 wineoss.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/wineoss.drv/unixlib.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index f921b00e0a2..54482a1feae 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -18,15 +18,15 @@ #include "../mmdevapi/unixlib.h" -NTSTATUS oss_midi_release(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS oss_midi_release(void *args); +NTSTATUS oss_midi_out_message(void *args); +NTSTATUS oss_midi_in_message(void *args); +NTSTATUS oss_midi_notify_wait(void *args); #ifdef _WIN64 -NTSTATUS oss_wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS oss_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS oss_wow64_midi_out_message(void *args); +NTSTATUS oss_wow64_midi_in_message(void *args); +NTSTATUS oss_wow64_midi_notify_wait(void *args); #endif #define OSS_CALL(func, params) WINE_UNIX_CALL(func, params)

1 0

Alexandre Julliard : winealsa.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: feb9b9c7d50c37ccb1e604b3b63e5366acd7a0d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/feb9b9c7d50c37ccb1e604b3b63e53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:38:09 2023 +0100 winealsa.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/winealsa.drv/unixlib.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index de6ce71571c..5784d5f7ade 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -18,15 +18,15 @@ #include "../mmdevapi/unixlib.h" -NTSTATUS alsa_midi_release(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS alsa_midi_release(void *args); +NTSTATUS alsa_midi_out_message(void *args); +NTSTATUS alsa_midi_in_message(void *args); +NTSTATUS alsa_midi_notify_wait(void *args); #ifdef _WIN64 -NTSTATUS alsa_wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS alsa_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS alsa_wow64_midi_out_message(void *args); +NTSTATUS alsa_wow64_midi_in_message(void *args); +NTSTATUS alsa_wow64_midi_notify_wait(void *args); #endif #define ALSA_CALL(func, params) WINE_UNIX_CALL(func, params)

1 0

Alexandre Julliard : ntdll: Still use LdrGetProcedureAddress for CtrlRoutine.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: a60d6f3ec967e9b114985e5dbb6ec7a22b0d0000 URL: https://gitlab.winehq.org/wine/wine/-/commit/a60d6f3ec967e9b114985e5dbb6ec7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 12:55:26 2023 +0100 ntdll: Still use LdrGetProcedureAddress for CtrlRoutine. Fixes d57c41990acde38f085da1c8dd6051e5fd287fb7. --- dlls/ntdll/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5b0d3f6b6ee..df8324e0b6b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4268,6 +4268,7 @@ void loader_init( CONTEXT *context, void **entry ) if (!imports_fixup_done) { MEMORY_BASIC_INFORMATION meminfo; + ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" ); WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb; @@ -4304,7 +4305,7 @@ void loader_init( CONTEXT *context, void **entry ) } node_kernel32 = kernel32->ldr.DdagNode; pBaseThreadInitThunk = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "BaseThreadInitThunk" ); - pCtrlRoutine = RtlFindExportedRoutineByName( kernel32->ldr.DllBase, "CtrlRoutine" ); + LdrGetProcedureAddress( kernel32->ldr.DllBase, &ctrl_routine, 0, (void **)&pCtrlRoutine ); actctx_init(); locale_init();

1 0

Alexandre Julliard : winecoreaudio.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 21c5affdb5acc65dd97c1327fbb9c20e056f3d13 URL: https://gitlab.winehq.org/wine/wine/-/commit/21c5affdb5acc65dd97c1327fbb9c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 22:38:27 2023 +0100 winecoreaudio.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/winecoreaudio.drv/unixlib.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 1ff4a0bac24..932a7726b38 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -20,17 +20,17 @@ #include "../mmdevapi/unixlib.h" -NTSTATUS unix_midi_init( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_midi_release( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_midi_out_message( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_midi_in_message( void * ) DECLSPEC_HIDDEN; -NTSTATUS unix_midi_notify_wait( void * ) DECLSPEC_HIDDEN; +NTSTATUS unix_midi_init( void * ); +NTSTATUS unix_midi_release( void * ); +NTSTATUS unix_midi_out_message( void * ); +NTSTATUS unix_midi_in_message( void * ); +NTSTATUS unix_midi_notify_wait( void * ); #ifdef _WIN64 -NTSTATUS unix_wow64_midi_init(void *args) DECLSPEC_HIDDEN; -NTSTATUS unix_wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS unix_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; -NTSTATUS unix_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +NTSTATUS unix_wow64_midi_init(void *args); +NTSTATUS unix_wow64_midi_out_message(void *args); +NTSTATUS unix_wow64_midi_in_message(void *args); +NTSTATUS unix_wow64_midi_notify_wait(void *args); #endif #define UNIX_CALL( func, params ) WINE_UNIX_CALL( func, params )

1 0

Alexandre Julliard : ntdll: Store the syscall table in the TEB on ARM64.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 5b01bf79e634d03cd529f82af4b60bfa7ac8eaf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b01bf79e634d03cd529f82af4b60b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:39:04 2023 +0100 ntdll: Store the syscall table in the TEB on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 0208913010d..5128c052bd1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -149,10 +149,12 @@ C_ASSERT( sizeof( struct syscall_frame ) == 0x330 ); struct arm64_thread_data { struct syscall_frame *syscall_frame; /* 02f0 frame pointer on syscall entry */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 02f8 syscall table */ }; C_ASSERT( sizeof(struct arm64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, syscall_frame ) == 0x2f0 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, syscall_table ) == 0x2f8 ); static inline struct arm64_thread_data *arm64_thread_data(void) { @@ -1669,10 +1671,13 @@ void syscall_dispatcher_return_slowpath(void) void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb, struct syscall_frame *frame, void *syscall_cfa ) { + struct arm64_thread_data *thread_data = (struct arm64_thread_data *)&teb->GdiTebBatch; CONTEXT *ctx, context = { CONTEXT_ALL }; I386_CONTEXT *i386_context; ARM_CONTEXT *arm_context; + thread_data->syscall_table = KeServiceDescriptorTable; + context.X0 = (DWORD64)entry; context.X1 = (DWORD64)arg; context.X18 = (DWORD64)teb; @@ -1819,7 +1824,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_offset 28, -0x68\n\t") "and x20, x8, #0xfff\n\t" /* syscall number */ "ubfx x21, x8, #12, #2\n\t" /* syscall table number */ - "adr x16, " __ASM_NAME("KeServiceDescriptorTable") "\n\t" + "ldr x16, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_table */ "add x21, x16, x21, lsl #5\n\t" "ldr x16, [x21, #16]\n\t" /* table->ServiceLimit */ "cmp x20, x16\n\t"

1 0

Alexandre Julliard : ntdll: Store the syscall table in the TEB on x86-64.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: f2fa8ca29b4f3894daaafc7cf47260bc56ae5cb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2fa8ca29b4f3894daaafc7cf47260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:38:55 2023 +0100 ntdll: Store the syscall table in the TEB on x86-64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55935 --- dlls/ntdll/unix/signal_x86_64.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 851655a0b5a..17a558da74c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -420,13 +420,15 @@ struct amd64_thread_data DWORD_PTR dr7; /* 0318 */ void *pthread_teb; /* 0320 thread data for pthread */ struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */ - DWORD fs; /* 0330 WOW TEB selector */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 0330 syscall table */ + DWORD fs; /* 0338 WOW TEB selector */ }; C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, pthread_teb ) == 0x320 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_frame ) == 0x328 ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, fs ) == 0x330 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_table ) == 0x330 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, fs ) == 0x338 ); static inline struct amd64_thread_data *amd64_thread_data(void) { @@ -1585,7 +1587,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" - "movw 0x330(%r11),%fs\n" /* amd64_thread_data()->fs */ + "movw 0x338(%r11),%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "movq %rdi,%rcx\n\t" /* id */ @@ -2463,9 +2465,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB CONTEXT *ctx, context = { 0 }; I386_CONTEXT *wow_context; + thread_data->syscall_table = KeServiceDescriptorTable; + #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); - arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); + arch_prctl( ARCH_GET_FS, &thread_data->pthread_teb ); if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, get_wow_teb( teb )); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); @@ -2474,11 +2478,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB #elif defined (__APPLE__) __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self))); __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); - amd64_thread_data()->pthread_teb = mac_thread_gsbase(); + thread_data->pthread_teb = mac_thread_gsbase(); /* alloc_tls_slot() needs to poke a value to an address relative to each thread's gsbase. Have each thread record its gsbase pointer into its TEB so alloc_tls_slot() can find it. */ - teb->Instrumentation[0] = amd64_thread_data()->pthread_teb; + teb->Instrumentation[0] = thread_data->pthread_teb; #else # error Please define setting %gs for your architecture #endif @@ -2685,7 +2689,12 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" "andl $0x30,%ebx\n\t" /* syscall table number */ - "leaq " __ASM_NAME("KeServiceDescriptorTable") "(%rip),%rcx\n\t" +#ifdef __APPLE__ + "movq %gs:0x30,%rcx\n\t" + "movq 0x330(%rcx),%rcx\n\t" +#else + "movq %gs:0x330,%rcx\n\t" /* amd64_thread_data()->syscall_table */ +#endif "leaq (%rcx,%rbx,2),%rbx\n\t" "andl $0xfff,%eax\n\t" /* syscall number */ "cmpq 16(%rbx),%rax\n\t" /* table->ServiceLimit */ @@ -2714,7 +2723,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" - "movw %gs:0x330,%fs\n" /* amd64_thread_data()->fs */ + "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "testl $0x48,%edx\n\t" /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ @@ -2899,7 +2908,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" - "movw %gs:0x330,%fs\n" /* amd64_thread_data()->fs */ + "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "movq 0x60(%rcx),%r14\n\t"

1 0

Stefan Dösinger : vkd3d: Forward MakeResident to EnqueueMakeResident.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 2935ac5c7edfb19a5f601aa3cfe717c2fb3b872b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2935ac5c7edfb19a5f601aa3cfe71… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 22 20:03:45 2023 +0300 vkd3d: Forward MakeResident to EnqueueMakeResident. --- libs/vkd3d/device.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8efaab85..5c801ca4 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3736,10 +3736,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandleByName(ID3D12Devic static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device5 *iface, UINT object_count, ID3D12Pageable * const *objects) { - FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n", - iface, object_count, objects); + ID3D12Fence *fence; + HRESULT hr; - return S_OK; + TRACE("iface %p, object_count %u, objects %p.\n", iface, object_count, objects); + + if (FAILED(hr = ID3D12Device5_CreateFence(iface, 0, 0, &IID_ID3D12Fence, (void **)&fence))) + return hr; + + hr = ID3D12Device5_EnqueueMakeResident(iface, 0, object_count, objects, fence, 1); + if (SUCCEEDED(hr)) + ID3D12Fence_SetEventOnCompletion(fence, 1, NULL); + ID3D12Fence_Release(fence); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_device_Evict(ID3D12Device5 *iface,

1 0

Stefan Dösinger : vkd3d: Improve the EnqueueMakeResident stub.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: bd35c91227e3379b2839e35bae855176b5a1da62 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bd35c91227e3379b2839e35bae855… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 22 19:49:02 2023 +0300 vkd3d: Improve the EnqueueMakeResident stub. --- libs/vkd3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 79028fc3..8efaab85 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3994,10 +3994,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_EnqueueMakeResident(ID3D12Device5 D3D12_RESIDENCY_FLAGS flags, UINT num_objects, ID3D12Pageable *const *objects, ID3D12Fence *fence, UINT64 fence_value) { - FIXME("iface %p, flags %#x, num_objects %u, objects %p, fence %p, fence_value %#"PRIx64" stub!\n", + FIXME_ONCE("iface %p, flags %#x, num_objects %u, objects %p, fence %p, fence_value %#"PRIx64" stub!\n", iface, flags, num_objects, objects, fence, fence_value); - return E_NOTIMPL; + ID3D12Fence_Signal(fence, fence_value); + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList1(ID3D12Device5 *iface,

1 0

Nikolay Sivov : oleaut32: Remove some deadcode from VarMod().
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: bb96e264408002118217c38776195a9a729aa4bf URL: https://gitlab.winehq.org/wine/wine/-/commit/bb96e264408002118217c38776195a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 24 20:25:24 2023 +0100 oleaut32: Remove some deadcode from VarMod(). Always true/false conditions appear to exist since initial implementation was introduced in 2d1bccd0c478274c727de0a531df2da35039e136. --- dlls/oleaut32/variant.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index fa4492b968a..b3c96b18c2b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5401,7 +5401,6 @@ end: */ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) { - BOOL lOk = TRUE; HRESULT rc = E_FAIL; int resT = 0; VARIANT lv,rv; @@ -5429,7 +5428,6 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) } /* check for invalid inputs */ - lOk = TRUE; switch (V_VT(left) & VT_TYPEMASK) { case VT_BOOL : case VT_I1 : @@ -5531,15 +5529,10 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) { V_VT(result) = VT_EMPTY; rc = DISP_E_BADVARTYPE; - } else if((V_VT(left) == VT_NULL) || (V_VT(left) == VT_EMPTY) || (V_VT(left) == VT_ERROR) || - lOk) + } else { V_VT(result) = VT_NULL; rc = S_OK; - } else - { - V_VT(result) = VT_NULL; - rc = DISP_E_BADVARTYPE; } goto end; case VT_VARIANT: @@ -5551,7 +5544,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) rc = DISP_E_TYPEMISMATCH; goto end; case VT_RECORD: - if((V_VT(left) == 15) || ((V_VT(left) >= 24) && (V_VT(left) <= 35)) || !lOk) + if((V_VT(left) == 15) || ((V_VT(left) >= 24) && (V_VT(left) <= 35))) { V_VT(result) = VT_EMPTY; rc = DISP_E_BADVARTYPE;

1 0