March 2017 - Wine-Commits - list.winehq.org

Alex Henrie : winecfg: Paint text on About tab with the right background color.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 127bb951e17a934a6d64b4e8554292256edeee7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=127bb951e17a934a6d64b4e85… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Mar 26 21:26:16 2017 -0600 winecfg: Paint text on About tab with the right background color. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/about.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index 09cc015..a2b4022 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -171,6 +171,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ABT_PANEL_TEXT: case IDC_ABT_LICENSE_TEXT: case IDC_ABT_WEB_LINK: + SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); return (INT_PTR)CreateSolidBrush(GetSysColor(COLOR_WINDOW)); } break;

1 0

Piotr Caban : msvcrt: Add SchedulerPolicy class implementation.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: e71edd0a1e2578ac50e26668372e49e4808adb25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71edd0a1e2578ac50e266683… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 27 10:28:19 2017 +0200 msvcrt: Add SchedulerPolicy class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/scheduler.c | 120 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 108 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 04c97a8..e24f500 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1411,4 +1411,6 @@ static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); } + +#define INHERIT_THREAD_PRIORITY 0xF000 #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 9551810..23220b8 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -330,6 +330,7 @@ typedef enum { ContextPriority, SchedulingProtocol, DynamicProgressFeedback, + WinRTInitialization, last_policy_id } PolicyElementKey; @@ -345,8 +346,47 @@ DEFINE_THISCALL_WRAPPER(SchedulerPolicy_SetPolicyValue, 12) unsigned int __thiscall SchedulerPolicy_SetPolicyValue(SchedulerPolicy *this, PolicyElementKey policy, unsigned int val) { - FIXME("(%p %d %d) stub\n", this, policy, val); - return 0; + unsigned int ret; + + TRACE("(%p %d %d)\n", this, policy, val); + + if (policy == MinConcurrency) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, 0, "MinConcurrency"); + if (policy == MaxConcurrency) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, 0, "MaxConcurrency"); + if (policy < SchedulerKind || policy >= last_policy_id) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, 0, "Invalid policy"); + + switch(policy) { + case SchedulerKind: + if (val) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_VALUE, 0, "SchedulerKind"); + break; + case TargetOversubscriptionFactor: + if (!val) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_VALUE, + 0, "TargetOversubscriptionFactor"); + break; + case ContextPriority: + if (((int)val < -7 /* THREAD_PRIORITY_REALTIME_LOWEST */ + || val > 6 /* THREAD_PRIORITY_REALTIME_HIGHEST */) + && val != THREAD_PRIORITY_IDLE && val != THREAD_PRIORITY_TIME_CRITICAL + && val != INHERIT_THREAD_PRIORITY) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_VALUE, 0, "ContextPriority"); + break; + case SchedulingProtocol: + case DynamicProgressFeedback: + case WinRTInitialization: + if (val != 0 && val != 1) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_VALUE, 0, "SchedulingProtocol"); + break; + default: + break; + } + + ret = this->policy_container->policies[policy]; + this->policy_container->policies[policy] = val; + return ret; } /* ?SetConcurrencyLimits(a)SchedulerPolicy@Concurrency@@QAEXII(a)Z */ @@ -355,7 +395,15 @@ DEFINE_THISCALL_WRAPPER(SchedulerPolicy_SetConcurrencyLimits, 12) void __thiscall SchedulerPolicy_SetConcurrencyLimits(SchedulerPolicy *this, unsigned int min_concurrency, unsigned int max_concurrency) { - FIXME("(%p %d %d) stub\n", this, min_concurrency, max_concurrency); + TRACE("(%p %d %d)\n", this, min_concurrency, max_concurrency); + + if (min_concurrency > max_concurrency) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_THREAD_SPECIFICATION, 0, NULL); + if (!max_concurrency) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_VALUE, 0, "MaxConcurrency"); + + this->policy_container->policies[MinConcurrency] = min_concurrency; + this->policy_container->policies[MaxConcurrency] = max_concurrency; } /* ?GetPolicyValue(a)SchedulerPolicy@Concurrency@@QBEIW4PolicyElementKey(a)2@@Z */ @@ -364,8 +412,11 @@ DEFINE_THISCALL_WRAPPER(SchedulerPolicy_GetPolicyValue, 8) unsigned int __thiscall SchedulerPolicy_GetPolicyValue( const SchedulerPolicy *this, PolicyElementKey policy) { - FIXME("(%p %d) stub\n", this, policy); - return 0; + TRACE("(%p %d)\n", this, policy); + + if (policy < SchedulerKind || policy >= last_policy_id) + throw_exception(EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, 0, "Invalid policy"); + return this->policy_container->policies[policy]; } /* ??0SchedulerPolicy(a)Concurrency@@QAE(a)XZ */ @@ -373,17 +424,54 @@ unsigned int __thiscall SchedulerPolicy_GetPolicyValue( DEFINE_THISCALL_WRAPPER(SchedulerPolicy_ctor, 4) SchedulerPolicy* __thiscall SchedulerPolicy_ctor(SchedulerPolicy *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + + this->policy_container = MSVCRT_operator_new(sizeof(*this->policy_container)); + /* TODO: default values can probably be affected by CurrentScheduler */ + this->policy_container->policies[SchedulerKind] = 0; + this->policy_container->policies[MaxConcurrency] = -1; + this->policy_container->policies[MinConcurrency] = 1; + this->policy_container->policies[TargetOversubscriptionFactor] = 1; + this->policy_container->policies[LocalContextCacheSize] = 8; + this->policy_container->policies[ContextStackSize] = 0; + this->policy_container->policies[ContextPriority] = THREAD_PRIORITY_NORMAL; + this->policy_container->policies[SchedulingProtocol] = 0; + this->policy_container->policies[DynamicProgressFeedback] = 1; + return this; } /* ??0SchedulerPolicy(a)Concurrency@@QAA(a)IZZ */ /* ??0SchedulerPolicy(a)Concurrency@@QEAA(a)_KZZ */ +/* TODO: don't leak policy_container on exception */ SchedulerPolicy* __cdecl SchedulerPolicy_ctor_policies( SchedulerPolicy *this, MSVCRT_size_t n, ...) { - FIXME("(%p %ld) stub\n", this, n); - return NULL; + unsigned int min_concurrency, max_concurrency; + __ms_va_list valist; + MSVCRT_size_t i; + + TRACE("(%p %ld)\n", this, n); + + SchedulerPolicy_ctor(this); + min_concurrency = this->policy_container->policies[MinConcurrency]; + max_concurrency = this->policy_container->policies[MaxConcurrency]; + + __ms_va_start(valist, n); + for(i=0; i<n; i++) { + PolicyElementKey policy = va_arg(valist, PolicyElementKey); + unsigned int val = va_arg(valist, unsigned int); + + if(policy == MinConcurrency) + min_concurrency = val; + else if(policy == MaxConcurrency) + max_concurrency = val; + else + SchedulerPolicy_SetPolicyValue(this, policy, val); + } + __ms_va_end(valist); + + SchedulerPolicy_SetConcurrencyLimits(this, min_concurrency, max_concurrency); + return this; } /* ??4SchedulerPolicy(a)Concurrency@@QAEAAV01(a)ABV01@@Z */ @@ -392,8 +480,10 @@ DEFINE_THISCALL_WRAPPER(SchedulerPolicy_op_assign, 8) SchedulerPolicy* __thiscall SchedulerPolicy_op_assign( SchedulerPolicy *this, const SchedulerPolicy *rhs) { - FIXME("(%p %p) stub\n", this, rhs); - return NULL; + TRACE("(%p %p)\n", this, rhs); + memcpy(this->policy_container->policies, rhs->policy_container->policies, + sizeof(this->policy_container->policies)); + return this; } /* ??0SchedulerPolicy(a)Concurrency@@QAE(a)ABV01@@Z */ @@ -402,8 +492,9 @@ DEFINE_THISCALL_WRAPPER(SchedulerPolicy_copy_ctor, 8) SchedulerPolicy* __thiscall SchedulerPolicy_copy_ctor( SchedulerPolicy *this, const SchedulerPolicy *rhs) { - FIXME("(%p %p) stub\n", this, rhs); - return NULL; + TRACE("(%p %p)\n", this, rhs); + SchedulerPolicy_ctor(this); + return SchedulerPolicy_op_assign(this, rhs); } /* ??1SchedulerPolicy(a)Concurrency@@QAE(a)XZ */ @@ -411,7 +502,8 @@ SchedulerPolicy* __thiscall SchedulerPolicy_copy_ctor( DEFINE_THISCALL_WRAPPER(SchedulerPolicy_dtor, 4) void __thiscall SchedulerPolicy_dtor(SchedulerPolicy *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + MSVCRT_operator_delete(this->policy_container); } extern const vtable_ptr MSVCRT_type_info_vtable;

1 0

Piotr Caban : msvcrt: Add invalid_scheduler_policy_key class implementation.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 11fbb1023d34f36d202869d23f9b6ba850cd0ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fbb1023d34f36d202869d23… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 27 10:27:08 2017 +0200 msvcrt: Add invalid_scheduler_policy_key class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 +++--- dlls/msvcr100/msvcr100.spec | 8 +++--- dlls/msvcr110/msvcr110.spec | 12 ++++---- dlls/msvcr120/msvcr120.spec | 12 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 12 ++++---- dlls/msvcrt/cpp.c | 55 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + 7 files changed, 82 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11fbb1023d34f36d20286…

1 0

Piotr Caban : msvcrt: Add helper for exception throwing.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 90307e067f985f5963b62829993b320537578333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90307e067f985f5963b628299… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 27 10:26:54 2017 +0200 msvcrt: Add helper for exception throwing. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 38 +++++++++++++++++++------------------- dlls/msvcrt/heap.c | 2 +- dlls/msvcrt/lock.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 11 +++++++---- dlls/msvcrt/scheduler.c | 4 ++-- 5 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 70f5cb5..b69ff9a 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -880,27 +880,27 @@ void msvcrt_init_exception(void *base) } #if _MSVCR_VER >= 80 -void throw_bad_alloc(const char *str) +void throw_exception(exception_type et, HRESULT hr, const char *str) { - bad_alloc e; - bad_alloc_ctor(&e, &str); - _CxxThrowException(&e, &bad_alloc_exception_type); -} -#endif - + switch(et) { + case EXCEPTION_BAD_ALLOC: { + bad_alloc e; + bad_alloc_ctor(&e, &str); + _CxxThrowException(&e, &bad_alloc_exception_type); + } #if _MSVCR_VER >= 100 -void throw_scheduler_resource_allocation_error(const char *str, HRESULT hr) -{ - scheduler_resource_allocation_error e; - scheduler_resource_allocation_error_ctor_name(&e, str, hr); - _CxxThrowException(&e.e, &scheduler_resource_allocation_error_exception_type); -} - -void throw_improper_lock(const char *str) -{ - improper_lock e; - improper_lock_ctor_str(&e, str); - _CxxThrowException(&e, &improper_lock_exception_type); + case EXCEPTION_SCHEDULER_RESOURCE_ALLOCATION_ERROR: { + scheduler_resource_allocation_error e; + scheduler_resource_allocation_error_ctor_name(&e, str, hr); + _CxxThrowException(&e.e, &scheduler_resource_allocation_error_exception_type); + } + case EXCEPTION_IMPROPER_LOCK: { + improper_lock e; + improper_lock_ctor_str(&e, str); + _CxxThrowException(&e, &improper_lock_exception_type); + } +#endif + } } #endif diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 3ae2599..ed41253 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -151,7 +151,7 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) TRACE("(%ld) out of memory\n", size); #if _MSVCR_VER >= 80 - throw_bad_alloc("bad allocation"); + throw_exception(EXCEPTION_BAD_ALLOC, 0, "bad allocation"); #endif return NULL; } diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index c2efae1..f4cf558 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -763,7 +763,7 @@ int __cdecl event_wait_for_multiple(event **events, MSVCRT_size_t count, MSVCRT_ wait = heap_alloc(FIELD_OFFSET(thread_wait, entries[count])); if(!wait) - throw_bad_alloc("bad allocation"); + throw_exception(EXCEPTION_BAD_ALLOC, 0, "bad allocation"); ret = evt_wait(wait, events, count, wait_all, timeout); heap_free(wait); @@ -846,7 +846,7 @@ MSVCRT_bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, TRACE("(%p %p %d)\n", this, cs, timeout); if(!(q = HeapAlloc(GetProcessHeap(), 0, sizeof(cv_queue)))) { - throw_bad_alloc("bad allocation"); + throw_exception(EXCEPTION_BAD_ALLOC, 0, "bad allocation"); } critical_section_lock(&this->lock); @@ -1026,7 +1026,7 @@ void __thiscall reader_writer_lock_lock(reader_writer_lock *this) TRACE("(%p)\n", this); if (this->thread_id == GetCurrentThreadId()) - throw_improper_lock("Already locked"); + throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); last = InterlockedExchangePointer((void**)&this->writer_tail, &q); if (last) { @@ -1057,7 +1057,7 @@ void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) TRACE("(%p)\n", this); if (this->thread_id == GetCurrentThreadId()) - throw_improper_lock("Already locked as writer"); + throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked as writer"); do { q.next = this->reader_head; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 775ee0c..2b9d229 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,11 +283,14 @@ extern WORD MSVCRT__ctype [257]; void msvcrt_set_errno(int) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 80 -void throw_bad_alloc(const char*) DECLSPEC_HIDDEN; -#endif +typedef enum { + EXCEPTION_BAD_ALLOC, #if _MSVCR_VER >= 100 -void throw_scheduler_resource_allocation_error(const char*, HRESULT) DECLSPEC_HIDDEN; -void throw_improper_lock(const char*) DECLSPEC_HIDDEN; + EXCEPTION_SCHEDULER_RESOURCE_ALLOCATION_ERROR, + EXCEPTION_IMPROPER_LOCK, +#endif +} exception_type; +void throw_exception(exception_type, HRESULT, const char*) DECLSPEC_HIDDEN; #endif void __cdecl _purecall(void); diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 5d31d58..9551810 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -99,8 +99,8 @@ static Context* get_current_context(void) if (context_tls_index == TLS_OUT_OF_INDEXES) { int tls_index = TlsAlloc(); if (tls_index == TLS_OUT_OF_INDEXES) { - throw_scheduler_resource_allocation_error(NULL, - HRESULT_FROM_WIN32(GetLastError())); + throw_exception(EXCEPTION_SCHEDULER_RESOURCE_ALLOCATION_ERROR, + HRESULT_FROM_WIN32(GetLastError()), NULL); return NULL; }

1 0

Henri Verbeet : wined3d: Rename struct blit_shader to struct wined3d_blitter_ops.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: a6862f917031357a61902a49548049be9481d13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6862f917031357a61902a495… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 26 20:56:02 2017 +0200 wined3d: Rename struct blit_shader to struct wined3d_blitter_ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 16 +++++++--------- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ca1d294..90e0a66 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7885,7 +7885,7 @@ static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined return WINED3DERR_INVALIDCALL; } -const struct blit_shader arbfp_blit = +const struct wined3d_blitter_ops arbfp_blit = { arbfp_blit_alloc, arbfp_blit_free, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e8b0515..b058d45 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4158,7 +4158,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; struct wined3d_resource *resource; enum wined3d_blit_op blit_op; RECT r; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9a67794..da6ff59 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2597,7 +2597,7 @@ static const struct wined3d_shader_backend_ops *select_shader_backend(const stru return &none_shader_backend; } -static const struct blit_shader *select_blit_implementation(const struct wined3d_gl_info *gl_info, +static const struct wined3d_blitter_ops *select_blit_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops) { if ((shader_backend_ops == &glsl_shader_backend diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 51fdcbb..135e02d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -547,9 +547,9 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const { struct wined3d_resource *resource = &surface->container->resource; struct wined3d_device *device = resource->device; + const struct wined3d_blitter_ops *blitter; struct wined3d_rendertarget_view *view; struct wined3d_view_desc view_desc; - const struct blit_shader *blitter; HRESULT hr; if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, @@ -2105,9 +2105,9 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st { struct wined3d_resource *resource = &s->container->resource; struct wined3d_device *device = resource->device; + const struct wined3d_blitter_ops *blitter; struct wined3d_rendertarget_view *view; struct wined3d_view_desc view_desc; - const struct blit_shader *blitter; HRESULT hr; if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, @@ -2793,7 +2793,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); } -const struct blit_shader ffp_blit = +const struct wined3d_blitter_ops ffp_blit = { ffp_blit_alloc, ffp_blit_free, @@ -3434,7 +3434,7 @@ static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl ERR("Blit method not implemented by cpu_blit.\n"); } -const struct blit_shader cpu_blit = +const struct wined3d_blitter_ops cpu_blit = { cpu_blit_alloc, cpu_blit_free, @@ -3592,7 +3592,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst else { struct wined3d_texture_sub_resource *src_sub_resource, *dst_sub_resource; - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; dst_sub_resource = surface_get_sub_resource(dst_surface); src_sub_resource = src_texture ? &src_texture->sub_resources[src_sub_resource_idx] : NULL; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e78763f..1627752 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5851,12 +5851,12 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb return memcmp(ka, kb, sizeof(*ka)); } -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, +const struct wined3d_blitter_ops *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - static const struct blit_shader * const blitters[] = + static const struct wined3d_blitter_ops * const blitters[] = { &arbfp_blit, &ffp_blit, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c9b061..3f4696e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1862,9 +1862,7 @@ enum wined3d_blit_op WINED3D_BLIT_OP_DEPTH_BLIT, }; -/* Shaders for color conversions in blits. Do not do blit operations while - * already under the GL lock. */ -struct blit_shader +struct wined3d_blitter_ops { HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device); @@ -1882,12 +1880,12 @@ struct blit_shader const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter); }; -extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; -extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; -extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; +extern const struct wined3d_blitter_ops arbfp_blit DECLSPEC_HIDDEN; +extern const struct wined3d_blitter_ops ffp_blit DECLSPEC_HIDDEN; +extern const struct wined3d_blitter_ops cpu_blit DECLSPEC_HIDDEN; BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, +const struct wined3d_blitter_ops *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) @@ -2358,7 +2356,7 @@ struct wined3d_adapter const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct fragment_pipeline *fragment_pipe; const struct wined3d_shader_backend_ops *shader_backend; - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; }; struct wined3d_caps_gl_ctx @@ -2625,7 +2623,7 @@ struct wined3d_device struct StateEntry StateTable[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; BYTE vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ BYTE bCursorVisible : 1;

1 0

Austin English : kernelbase: Sync spec file to Windows 10.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 646117bf915e70e170a45cec5654148f8bb4713e URL: http://source.winehq.org/git/wine.git/?a=commit;h=646117bf915e70e170a45cec5… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 23 22:11:50 2017 -0500 kernelbase: Sync spec file to Windows 10. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 1140 +++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 3 + 2 files changed, 1143 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=646117bf915e70e170a45…

1 0

Andrey Gusev : api-ms-win-security-grouppolicy-l1-1-0: Add dll.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 1ed69efe83e066a8ee143344c71de4f0dd82a2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed69efe83e066a8ee143344c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Mar 26 14:43:04 2017 +0300 api-ms-win-security-grouppolicy-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-security-grouppolicy-l1-1-0.spec | 23 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 28 insertions(+) diff --git a/configure b/configure index 7a31b95..e13e629 100755 --- a/configure +++ b/configure @@ -1025,6 +1025,7 @@ enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_base_private_l1_1_1 +enable_api_ms_win_security_grouppolicy_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_lsalookup_l2_1_1 @@ -17761,6 +17762,7 @@ wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_a wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_dll api-ms-win-security-base-private-l1-1-1 enable_api_ms_win_security_base_private_l1_1_1 +wine_fn_config_dll api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-1 enable_api_ms_win_security_lsalookup_l2_1_1 diff --git a/configure.ac b/configure.ac index 33ac13f..7feeec5 100644 --- a/configure.ac +++ b/configure.ac @@ -2813,6 +2813,7 @@ WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(api-ms-win-security-base-private-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-security-grouppolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-1) diff --git a/dlls/api-ms-win-security-grouppolicy-l1-1-0/Makefile.in b/dlls/api-ms-win-security-grouppolicy-l1-1-0/Makefile.in new file mode 100644 index 0000000..80c3258 --- /dev/null +++ b/dlls/api-ms-win-security-grouppolicy-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-grouppolicy-l1-1-0.dll diff --git a/dlls/api-ms-win-security-grouppolicy-l1-1-0/api-ms-win-security-grouppolicy-l1-1-0.spec b/dlls/api-ms-win-security-grouppolicy-l1-1-0/api-ms-win-security-grouppolicy-l1-1-0.spec new file mode 100644 index 0000000..732bf94 --- /dev/null +++ b/dlls/api-ms-win-security-grouppolicy-l1-1-0/api-ms-win-security-grouppolicy-l1-1-0.spec @@ -0,0 +1,23 @@ +@ stub AreThereVisibleLogoffScriptsInternal +@ stub AreThereVisibleShutdownScriptsInternal +@ stub EnterCriticalPolicySectionInternal +@ stub ForceSyncFgPolicyInternal +@ stub FreeGPOListInternalA +@ stub FreeGPOListInternalW +@ stub GenerateGPNotificationInternal +@ stub GetAppliedGPOListInternalA +@ stub GetAppliedGPOListInternalW +@ stub GetGPOListInternalA +@ stub GetGPOListInternalW +@ stub GetNextFgPolicyRefreshInfoInternal +@ stub GetPreviousFgPolicyRefreshInfoInternal +@ stub HasPolicyForegroundProcessingCompletedInternal +@ stub IsSyncForegroundPolicyRefresh +@ stub LeaveCriticalPolicySectionInternal +@ stub RefreshPolicyExInternal +@ stub RefreshPolicyInternal +@ stub RegisterGPNotificationInternal +@ stub RsopLoggingEnabledInternal +@ stub UnregisterGPNotificationInternal +@ stub WaitForMachinePolicyForegroundProcessingInternal +@ stub WaitForUserPolicyForegroundProcessingInternal diff --git a/tools/make_specfiles b/tools/make_specfiles index 91ae02f..99cd5c0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -258,6 +258,7 @@ my @dll_groups = [ "kernelbase", "api-ms-win-core-quirks-l1-1-0", + "api-ms-win-security-grouppolicy-l1-1-0", ], [ "ole32",

1 0

Jacek Caban : server: Added support for flushing client pipe.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 975c5381ede8f797b6f60a3e8fded712804c1c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975c5381ede8f797b6f60a3e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 26 12:52:50 2017 +0200 server: Added support for flushing client pipe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 7 +++++++ server/named_pipe.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 58bad06..cf2a3a3 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2853,6 +2853,9 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) trace("testing %s, %s server->client writes...\n", msg_mode ? "message mode" : "byte mode", msg_read_mode ? "message read" : "byte read"); test_blocking_rw(server, client, 5000, msg_mode, msg_read_mode); + trace("testing %s, %s client->server writes...\n", + msg_mode ? "message mode" : "byte mode", msg_read_mode ? "message read" : "byte read"); + test_blocking_rw(client, server, 6000, msg_mode, msg_read_mode); CloseHandle(client); CloseHandle(server); @@ -2869,18 +2872,22 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) /* close server with pending writes */ create_overlapped_pipe(create_flags, &client, &server); overlapped_write_async(client, buf, 7000, &overlapped); + flush = test_flush_async(client, ERROR_BROKEN_PIPE); CloseHandle(server); test_overlapped_failure(client, &overlapped, ERROR_BROKEN_PIPE); + test_flush_done(flush); CloseHandle(client); /* disconnect with pending writes */ create_overlapped_pipe(create_flags, &client, &server); overlapped_write_async(client, buf, 7000, &overlapped); overlapped_write_async(server, buf, 7000, &overlapped2); + flush = test_flush_async(client, ERROR_PIPE_NOT_CONNECTED); res = DisconnectNamedPipe(server); ok(res, "DisconnectNamedPipe failed: %u\n", GetLastError()); test_overlapped_failure(client, &overlapped, ERROR_PIPE_NOT_CONNECTED); test_overlapped_failure(client, &overlapped2, ERROR_PIPE_NOT_CONNECTED); + test_flush_done(flush); CloseHandle(server); CloseHandle(client); } diff --git a/server/named_pipe.c b/server/named_pipe.c index e5b6dd1..bbdf3bc 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -656,6 +656,9 @@ static obj_handle_t pipe_end_flush( struct pipe_end *pipe_end, struct async *asy { obj_handle_t handle = 0; + if (use_server_io( pipe_end ) && (!pipe_end->connection || list_empty( &pipe_end->connection->message_queue ))) + return 0; + if (!fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT )) return 0; if (!blocking || (handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) @@ -682,8 +685,9 @@ static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int b static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int blocking ) { - /* FIXME: what do we have to do for this? */ - return 0; + struct pipe_end *pipe_end = get_fd_user( fd ); + /* FIXME: Support byte mode. */ + return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async, blocking ) : 0; } static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb )

1 0

Piotr Caban : msvcrt: Add SchedulerPolicy class stub.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 895928860dd8ec08d67ad11c644f74d46c75e909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895928860dd8ec08d67ad11c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 27 10:26:39 2017 +0200 msvcrt: Add SchedulerPolicy class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 32 ++++++------- dlls/msvcr100/msvcr100.spec | 32 ++++++------- dlls/msvcr110/msvcr110.spec | 46 +++++++++--------- dlls/msvcr120/msvcr120.spec | 46 +++++++++--------- dlls/msvcr120_app/msvcr120_app.spec | 46 +++++++++--------- dlls/msvcrt/scheduler.c | 94 +++++++++++++++++++++++++++++++++++++ 6 files changed, 195 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=895928860dd8ec08d67ad…

1 0

Andrey Gusev : api-ms-win-core-threadpool-private-l1-1-0: Add dll.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 603da6e14ef3f838f7643782935c37f84e63ebdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=603da6e14ef3f838f76437829… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Mar 26 14:41:12 2017 +0300 api-ms-win-core-threadpool-private-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-threadpool-private-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-threadpool-private-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 2c94936..7a31b95 100755 --- a/configure +++ b/configure @@ -966,6 +966,7 @@ enable_api_ms_win_core_sysinfo_l1_2_1 enable_api_ms_win_core_threadpool_l1_1_0 enable_api_ms_win_core_threadpool_l1_2_0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 +enable_api_ms_win_core_threadpool_private_l1_1_0 enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_toolhelp_l1_1_0 enable_api_ms_win_core_url_l1_1_0 @@ -17701,6 +17702,7 @@ wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo wine_fn_config_dll api-ms-win-core-threadpool-l1-1-0 enable_api_ms_win_core_threadpool_l1_1_0 wine_fn_config_dll api-ms-win-core-threadpool-l1-2-0 enable_api_ms_win_core_threadpool_l1_2_0 wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 +wine_fn_config_dll api-ms-win-core-threadpool-private-l1-1-0 enable_api_ms_win_core_threadpool_private_l1_1_0 wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezone_l1_1_0 wine_fn_config_dll api-ms-win-core-toolhelp-l1-1-0 enable_api_ms_win_core_toolhelp_l1_1_0 wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 diff --git a/configure.ac b/configure.ac index bd3f876..33ac13f 100644 --- a/configure.ac +++ b/configure.ac @@ -2754,6 +2754,7 @@ WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-threadpool-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-threadpool-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-threadpool-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-toolhelp-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) diff --git a/dlls/api-ms-win-core-threadpool-private-l1-1-0/Makefile.in b/dlls/api-ms-win-core-threadpool-private-l1-1-0/Makefile.in new file mode 100644 index 0000000..7159f6b --- /dev/null +++ b/dlls/api-ms-win-core-threadpool-private-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-threadpool-private-l1-1-0.dll diff --git a/dlls/api-ms-win-core-threadpool-private-l1-1-0/api-ms-win-core-threadpool-private-l1-1-0.spec b/dlls/api-ms-win-core-threadpool-private-l1-1-0/api-ms-win-core-threadpool-private-l1-1-0.spec new file mode 100644 index 0000000..fc447d7 --- /dev/null +++ b/dlls/api-ms-win-core-threadpool-private-l1-1-0/api-ms-win-core-threadpool-private-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall RegisterWaitForSingleObjectEx(long ptr ptr long long) kernel32.RegisterWaitForSingleObjectEx diff --git a/tools/make_specfiles b/tools/make_specfiles index bd0314f..91ae02f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -216,6 +216,7 @@ my @dll_groups = "api-ms-win-core-threadpool-l1-1-0", "api-ms-win-core-threadpool-l1-2-0", "api-ms-win-core-threadpool-legacy-l1-1-0", + "api-ms-win-core-threadpool-private-l1-1-0", "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-toolhelp-l1-1-0", "api-ms-win-core-sysinfo-l1-2-1",

1 0