- Wine-Commits - list.winehq.org

Eric Pouech : wined3d: Use long type for interlock variables/fields.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 767a715d47fdfae53c98cdcd267895031cbefece URL: https://gitlab.winehq.org/wine/wine/-/commit/767a715d47fdfae53c98cdcd267895… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 22 11:08:49 2022 +0100 wined3d: Use long type for interlock variables/fields. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/wined3d_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b7d3b579ed2..c460a6b1f8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4433,8 +4433,8 @@ struct wined3d_resource struct list resource_list_entry; - int32_t srv_bind_count_device; - int32_t rtv_bind_count_device; + LONG srv_bind_count_device; + LONG rtv_bind_count_device; }; static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource) @@ -5092,7 +5092,7 @@ struct wined3d_cs BOOL queries_flushed; HANDLE event; - BOOL waiting_for_event; + LONG waiting_for_event; LONG pending_presents; };

1 0

Eric Pouech : wined3d: Use pointer to non long integral type for some helpers.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: f7deca3ae65f9cc9a3d1ddc399617b4cd852bef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7deca3ae65f9cc9a3d1ddc399617b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 22 11:08:51 2022 +0100 wined3d: Use pointer to non long integral type for some helpers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 40b5442ed04..e9ada251749 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1945,7 +1945,7 @@ static const char *shader_glsl_interpolation_qualifiers(enum wined3d_shader_inte } static enum wined3d_shader_interpolation_mode wined3d_extract_interpolation_mode( - const DWORD *packed_interpolation_mode, unsigned int register_idx) + const uint32_t *packed_interpolation_mode, unsigned int register_idx) { return wined3d_extract_bits(packed_interpolation_mode, register_idx * WINED3D_PACKED_INTERPOLATION_BIT_COUNT, WINED3D_PACKED_INTERPOLATION_BIT_COUNT); @@ -1953,7 +1953,7 @@ static enum wined3d_shader_interpolation_mode wined3d_extract_interpolation_mode static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, - const DWORD *interpolation_mode, BOOL unroll) + const uint32_t *interpolation_mode, BOOL unroll) { enum wined3d_shader_interpolation_mode mode; unsigned int i; @@ -1991,7 +1991,7 @@ static BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL rasterizer_setup, - const DWORD *interpolation_mode) + const uint32_t *interpolation_mode) { enum wined3d_shader_interpolation_mode mode; unsigned int i; @@ -7335,7 +7335,7 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *shader, unsigned int input_count, - const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, const DWORD *interpolation_mode) + const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, const uint32_t *interpolation_mode) { const char *prefix = shader_glsl_get_prefix(shader->reg_maps.shader_version.type); struct wined3d_string_buffer *buffer = &priv->shader_buffer; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c2e77021bb3..91874898025 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -978,7 +978,7 @@ static HRESULT shader_calculate_clip_or_cull_distance_mask( return WINED3D_OK; } -static void wined3d_insert_interpolation_mode(DWORD *packed_interpolation_mode, +static void wined3d_insert_interpolation_mode(uint32_t *packed_interpolation_mode, unsigned int register_idx, enum wined3d_shader_interpolation_mode mode) { if (mode > WINED3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE) @@ -3516,7 +3516,7 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh return WINED3D_OK; } -static void init_interpolation_compile_args(DWORD *interpolation_args, +static void init_interpolation_compile_args(uint32_t *interpolation_args, const struct wined3d_shader *pixel_shader, const struct wined3d_d3d_info *d3d_info) { if (!d3d_info->shader_output_interpolation || !pixel_shader diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c460a6b1f8c..cf82bebb972 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1159,7 +1159,7 @@ struct wined3d_shader_reg_maps WORD labels; /* MAX_LABELS, 16 */ DWORD temporary; /* 32 */ unsigned int temporary_count; - DWORD *constf; /* pixel, vertex */ + uint32_t *constf; /* pixel, vertex */ struct list indexable_temps; const struct wined3d_shader_immediate_constant_buffer *icb; union @@ -1557,7 +1557,7 @@ struct vs_compile_args { DWORD swizzle_map; /* MAX_ATTRIBS, 32 */ unsigned int next_shader_input_count; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; + uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; BYTE fog_src; BYTE clip_enabled : 1; BYTE point_size : 1; @@ -1575,14 +1575,14 @@ struct ds_compile_args unsigned int next_shader_type : 3; unsigned int render_offscreen : 1; unsigned int padding : 12; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; + uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct gs_compile_args { unsigned int output_count; enum wined3d_primitive_type primitive_type; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; + uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct wined3d_shader_backend_ops @@ -5946,7 +5946,7 @@ struct wined3d_pixel_shader BOOL force_early_depth_stencil; enum wined3d_shader_register_type depth_output; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; + uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct wined3d_compute_shader @@ -6443,7 +6443,7 @@ static inline uint32_t wined3d_mask_from_size(unsigned int size) return size < 32 ? (1u << size) - 1 : ~0u; } -static inline DWORD wined3d_extract_bits(const DWORD *bitstream, +static inline DWORD wined3d_extract_bits(const uint32_t *bitstream, unsigned int offset, unsigned int count) { const unsigned int word_bit_count = sizeof(*bitstream) * CHAR_BIT; @@ -6463,7 +6463,7 @@ static inline DWORD wined3d_extract_bits(const DWORD *bitstream, return ret; } -static inline void wined3d_insert_bits(DWORD *bitstream, +static inline void wined3d_insert_bits(uint32_t *bitstream, unsigned int offset, unsigned int count, DWORD bits) { const unsigned int word_bit_count = sizeof(*bitstream) * CHAR_BIT; @@ -6816,7 +6816,7 @@ static inline unsigned int wined3d_bitmap_ffz(const uint32_t *bitmap, unsigned i return wined3d_bitmap_ffs_xor(bitmap, bit_count, start, ~0u); } -static inline BOOL wined3d_bitmap_get_range(const DWORD *bitmap, unsigned int bit_count, +static inline BOOL wined3d_bitmap_get_range(const uint32_t *bitmap, unsigned int bit_count, unsigned int start, struct wined3d_range *range) { unsigned int range_start, range_end;

1 0

Gerald Pfeifer : ntdll: Make init_builtin_dll return a value on FreeBSD.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 1d0383e2a41623d711a733899a80cb8fe1f6351a URL: https://gitlab.winehq.org/wine/wine/-/commit/1d0383e2a41623d711a733899a80cb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Nov 22 21:45:11 2022 +0100 ntdll: Make init_builtin_dll return a value on FreeBSD. With commit 1d1690782b167f3ea24990c260665f71a0e70d1c init_builtin_dll gained a return value, alas the FreeBSD-specific code (under #ifdef) was not adjusted and still returned void. --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f87e11f073c..deb25a8e35e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1919,7 +1919,7 @@ static NTSTATUS init_builtin_dll( void *module ) /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */ if (offsetof(struct link_map, l_addr) == 0) if (!get_relocbase(map->l_addr, &relocbase)) - return; + return STATUS_UNSUCCESSFUL; #endif switch (dyn->d_tag) {

1 0

Georg Lehmann : winevulkan: Convert unions when nessecary.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 3759dbd645f98b53376c59a4245e0614d265ba43 URL: https://gitlab.winehq.org/wine/wine/-/commit/3759dbd645f98b53376c59a4245e06… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Nov 21 20:40:31 2022 +0100 winevulkan: Convert unions when nessecary. --- dlls/winevulkan/make_vulkan | 44 ++++-- dlls/winevulkan/vulkan_thunks.c | 320 ++++++++++++++++++++++++++++++++++------ 2 files changed, 305 insertions(+), 59 deletions(-)

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.235.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 8ef4a31116d71cfc790569319a08b8a30e0917e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ef4a31116d71cfc790569319a08b8… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Nov 21 23:19:32 2022 +0100 winevulkan: Update to VK spec version 1.3.235. --- dlls/winevulkan/loader_thunks.c | 144 +++++++ dlls/winevulkan/loader_thunks.h | 100 +++++ dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 873 +++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 22 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 196 ++++++++- 7 files changed, 1336 insertions(+), 6 deletions(-)

1 0

Eric Pouech : dbghelp: Fix typos in codeview_is_type_forward().
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: fbf23011777e2ff308ccbc09a07b81917f08796d URL: https://gitlab.winehq.org/wine/wine/-/commit/fbf23011777e2ff308ccbc09a07b81… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 22 18:05:06 2022 +0100 dbghelp: Fix typos in codeview_is_type_forward(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 6eceaa41422..ebacfc49bfd 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -703,8 +703,8 @@ static BOOL codeview_type_is_forward(const union codeview_type* cvtype) case LF_UNION_V2: property = cvtype->union_v2.property; break; case LF_UNION_V3: property = cvtype->union_v3.property; break; case LF_ENUM_V1: property = cvtype->enumeration_v1.property; break; - case LF_ENUM_V2: property = cvtype->enumeration_v1.property; break; - case LF_ENUM_V3: property = cvtype->enumeration_v1.property; break; + case LF_ENUM_V2: property = cvtype->enumeration_v2.property; break; + case LF_ENUM_V3: property = cvtype->enumeration_v3.property; break; default: return FALSE; }

1 0

Nikolay Sivov : vbscript: Fix a typo in variable name in LBound().
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 9e5825ce812cc857e25b682b3243e68b23d04f30 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e5825ce812cc857e25b682b3243e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 19:15:54 2022 +0300 vbscript: Fix a typo in variable name in LBound(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d07d46415e6..98c705f4712 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1170,7 +1170,7 @@ static HRESULT Global_LBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, { SAFEARRAY *sa; HRESULT hres; - LONG ubound; + LONG lbound; int dim; assert(args_cnt == 1 || args_cnt == 2); @@ -1197,11 +1197,11 @@ static HRESULT Global_LBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, dim = 1; } - hres = SafeArrayGetLBound(sa, dim, &ubound); + hres = SafeArrayGetLBound(sa, dim, &lbound); if(FAILED(hres)) return hres; - return return_int(res, ubound); + return return_int(res, lbound); } static HRESULT Global_UBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)

1 0

Gabriel Ivăncescu : mshtml: Get rid of useless window check.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 6fa4c426086750d616d5da9c41b37fc714784d1a URL: https://gitlab.winehq.org/wine/wine/-/commit/6fa4c426086750d616d5da9c41b37f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:26:22 2022 +0200 mshtml: Get rid of useless window check. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsevents.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 6ae34321573..e35e4d7ae80 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -373,14 +373,10 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event WARN("no dom_document\n"); } - if(doc->window) { - hres = create_event_from_nsevent(event, dispex_compat_mode(&doc->node.event_target.dispex), &load_event); - if(SUCCEEDED(hres)) { - dispatch_event(&doc->window->event_target, load_event); - IDOMEvent_Release(&load_event->IDOMEvent_iface); - } - }else { - WARN("no window\n"); + hres = create_event_from_nsevent(event, dispex_compat_mode(&doc->node.event_target.dispex), &load_event); + if(SUCCEEDED(hres)) { + dispatch_event(&doc->window->event_target, load_event); + IDOMEvent_Release(&load_event->IDOMEvent_iface); } IHTMLDOMNode_Release(&doc->node.IHTMLDOMNode_iface);

1 0

Nikolay Sivov : kernelbase: Forward thread priority boost functions to ntdll.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: cf6705a8caba2cf7fc21d35b7593b291c26b1fd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf6705a8caba2cf7fc21d35b7593b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 21 07:19:24 2022 +0300 kernelbase: Forward thread priority boost functions to ntdll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/thread.c | 5 ++--- dlls/ntdll/unix/thread.c | 16 ++++++++++++++-- dlls/wow64/process.c | 2 ++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index a817609a385..be3d38c04ff 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -286,8 +286,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetThreadPriority( HANDLE thread ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetThreadPriorityBoost( HANDLE thread, BOOL *state ) { - if (state) *state = FALSE; - return TRUE; + return set_ntstatus( NtQueryInformationThread( thread, ThreadPriorityBoost, state, sizeof(*state), NULL )); } @@ -568,7 +567,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadPriority( HANDLE thread, INT priority ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadPriorityBoost( HANDLE thread, BOOL disable ) { - return TRUE; + return set_ntstatus( NtSetInformationThread( thread, ThreadPriorityBoost, &disable, sizeof(disable) )); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 05c575cfdaa..d56962e1721 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -2177,6 +2177,16 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, if (ret_len) *ret_len = sizeof(BOOLEAN); return STATUS_SUCCESS; + case ThreadPriorityBoost: + { + DWORD *value = data; + + if (length != sizeof(ULONG)) return STATUS_INFO_LENGTH_MISMATCH; + if (ret_len) *ret_len = sizeof(ULONG); + *value = 0; + return STATUS_SUCCESS; + } + case ThreadIdealProcessor: case ThreadEnableAlignmentFaultFixup: return STATUS_INVALID_INFO_CLASS; @@ -2187,7 +2197,6 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadEventPair_Reusable: case ThreadZeroTlsCell: case ThreadPerformanceCount: - case ThreadPriorityBoost: case ThreadSetTlsArrayAddress: default: FIXME( "info class %d not supported yet\n", class ); @@ -2389,6 +2398,10 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, return STATUS_SUCCESS; } + case ThreadPriorityBoost: + WARN("Unimplemented class ThreadPriorityBoost.\n"); + return STATUS_SUCCESS; + case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: @@ -2396,7 +2409,6 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadEventPair_Reusable: case ThreadPerformanceCount: case ThreadAmILastThread: - case ThreadPriorityBoost: case ThreadSetTlsArrayAddress: case ThreadIsIoPending: default: diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 61ecc68724c..97dbfdef761 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -899,6 +899,7 @@ NTSTATUS WINAPI wow64_NtQueryInformationThread( UINT *args ) case ThreadIsIoPending: /* ULONG */ case ThreadHideFromDebugger: /* BOOLEAN */ case ThreadSuspendCount: /* ULONG */ + case ThreadPriorityBoost: /* ULONG */ /* FIXME: check buffer alignment */ return NtQueryInformationThread( handle, class, ptr, len, retlen ); @@ -1163,6 +1164,7 @@ NTSTATUS WINAPI wow64_NtSetInformationThread( UINT *args ) case ThreadEnableAlignmentFaultFixup: /* BOOLEAN */ case ThreadPowerThrottlingState: /* THREAD_POWER_THROTTLING_STATE */ case ThreadIdealProcessor: /* ULONG */ + case ThreadPriorityBoost: /* ULONG */ return NtSetInformationThread( handle, class, ptr, len ); case ThreadImpersonationToken: /* HANDLE */

1 0

Nikolay Sivov : kernel32/tests: Remove workarounds for SetThreadIdealProcessor().
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 9c09288bf6601283ecdd722a29044d24ee59e99f URL: https://gitlab.winehq.org/wine/wine/-/commit/9c09288bf6601283ecdd722a29044d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 21 07:03:29 2022 +0300 kernel32/tests: Remove workarounds for SetThreadIdealProcessor(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/thread.c | 62 ++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 25e5a0dc1da..cabc747fdbd 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -79,7 +79,6 @@ static void (WINAPI *pGetCurrentThreadStackLimits)(PULONG_PTR,PULONG_PTR); static BOOL (WINAPI *pGetThreadPriorityBoost)(HANDLE,PBOOL); static HANDLE (WINAPI *pOpenThread)(DWORD,BOOL,DWORD); static BOOL (WINAPI *pQueueUserWorkItem)(LPTHREAD_START_ROUTINE,PVOID,ULONG); -static DWORD (WINAPI *pSetThreadIdealProcessor)(HANDLE,DWORD); static BOOL (WINAPI *pSetThreadPriorityBoost)(HANDLE,BOOL); static BOOL (WINAPI *pSetThreadStackGuarantee)(ULONG*); static BOOL (WINAPI *pRegisterWaitForSingleObject)(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,ULONG,ULONG); @@ -854,8 +853,8 @@ static VOID test_thread_processor(void) HANDLE curthread,curproc; DWORD_PTR processMask,systemMask,retMask; SYSTEM_INFO sysInfo; - int error=0; BOOL is_wow64; + DWORD ret; if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -896,44 +895,34 @@ static VOID test_thread_processor(void) retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)0 >> 3); ok(retMask == processMask, "SetThreadAffinityMask failed\n"); } -/* NOTE: This only works on WinNT/2000/XP) */ - if (pSetThreadIdealProcessor) + + SetLastError(0xdeadbeef); + ret = SetThreadIdealProcessor(GetCurrentThread(), 0); + ok(ret != ~0u, "Unexpected return value %lu.\n", ret); + + if (is_wow64) { SetLastError(0xdeadbeef); - error=pSetThreadIdealProcessor(curthread,0); - if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - { - ok(error!=-1, "SetThreadIdealProcessor failed\n"); - - if (is_wow64) - { - SetLastError(0xdeadbeef); - error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS+1); - todo_wine - ok(error!=-1, "SetThreadIdealProcessor failed for %u on Wow64\n", MAXIMUM_PROCESSORS+1); - - SetLastError(0xdeadbeef); - error=pSetThreadIdealProcessor(curthread,65); - ok(error==-1, "SetThreadIdealProcessor succeeded with an illegal processor #\n"); - ok(GetLastError()==ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); - } - else - { - SetLastError(0xdeadbeef); - error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS+1); - ok(error==-1, "SetThreadIdealProcessor succeeded with an illegal processor #\n"); - ok(GetLastError()==ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); - } - - error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS); - ok(error!=-1, "SetThreadIdealProcessor failed\n"); - } - else - win_skip("SetThreadIdealProcessor is not implemented\n"); + ret = SetThreadIdealProcessor(GetCurrentThread(), MAXIMUM_PROCESSORS + 1); + todo_wine + ok(ret != ~0u, "Unexpected return value %lu.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetThreadIdealProcessor(GetCurrentThread(), 65); + ok(ret == ~0u, "Unexpected return value %lu.\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected error %ld.\n", GetLastError()); + } + else + { + SetLastError(0xdeadbeef); + ret = SetThreadIdealProcessor(GetCurrentThread(), MAXIMUM_PROCESSORS+1); + ok(ret == ~0u, "Unexpected return value %lu.\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected error %ld.\n", GetLastError()); } + ret = SetThreadIdealProcessor(GetCurrentThread(), MAXIMUM_PROCESSORS); + ok(ret != ~0u, "Unexpected return value %lu.\n", ret); + if (pGetThreadGroupAffinity && pSetThreadGroupAffinity) { GROUP_AFFINITY affinity, affinity_new; @@ -2583,7 +2572,6 @@ static void init_funcs(void) X(GetThreadPriorityBoost); X(OpenThread); X(QueueUserWorkItem); - X(SetThreadIdealProcessor); X(SetThreadPriorityBoost); X(SetThreadStackGuarantee); X(RegisterWaitForSingleObject);

1 0