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

Piotr Caban : msvcrt: Add ThreadScheduler::Release implementation.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: d9dcdb0d51daf2eef915520f43ad4af04a74a0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9dcdb0d51daf2eef915520f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 10:50:49 2017 +0200 msvcrt: Add ThreadScheduler::Release implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index f8afed0..48a9d1b 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -110,6 +110,7 @@ typedef struct { typedef struct { Scheduler scheduler; + LONG ref; unsigned int id; unsigned int virt_proc_no; SchedulerPolicy policy; @@ -519,6 +520,12 @@ void __thiscall SchedulerPolicy_dtor(SchedulerPolicy *this) MSVCRT_operator_delete(this->policy_container); } +static void ThreadScheduler_dtor(ThreadScheduler *this) +{ + if(this->ref != 0) WARN("ref = %d\n", this->ref); + SchedulerPolicy_dtor(&this->policy); +} + DEFINE_THISCALL_WRAPPER(ThreadScheduler_Id, 4) unsigned int __thiscall ThreadScheduler_Id(const ThreadScheduler *this) { @@ -544,15 +551,22 @@ SchedulerPolicy* __thiscall ThreadScheduler_GetPolicy( DEFINE_THISCALL_WRAPPER(ThreadScheduler_Reference, 4) unsigned int __thiscall ThreadScheduler_Reference(ThreadScheduler *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return InterlockedIncrement(&this->ref); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_Release, 4) unsigned int __thiscall ThreadScheduler_Release(ThreadScheduler *this) { - FIXME("(%p) stub\n", this); - return 0; + unsigned int ret = InterlockedDecrement(&this->ref); + + TRACE("(%p)\n", this); + + if(!ret) { + ThreadScheduler_dtor(this); + MSVCRT_operator_delete(this); + } + return ret; } DEFINE_THISCALL_WRAPPER(ThreadScheduler_RegisterShutdownEvent, 8) @@ -604,11 +618,6 @@ MSVCRT_bool __thiscall ThreadScheduler_IsAvailableLocation( return FALSE; } -static void ThreadScheduler_dtor(ThreadScheduler *this) -{ - SchedulerPolicy_dtor(&this->policy); -} - DEFINE_THISCALL_WRAPPER(ThreadScheduler_vector_dtor, 8) Scheduler* __thiscall ThreadScheduler_vector_dtor(ThreadScheduler *this, unsigned int flags) { @@ -637,6 +646,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, TRACE("(%p)->()\n", this); this->scheduler.vtable = &MSVCRT_ThreadScheduler_vtable; + this->ref = 1; this->id = InterlockedIncrement(&scheduler_id); SchedulerPolicy_copy_ctor(&this->policy, policy);

1 0

Viktor Semykin : shlwapi: Add SHCreateMemStream shlwapi.h.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: b1bb7c17dba0a24b64cdbe8473d873aa393ac92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1bb7c17dba0a24b64cdbe847… Author: Viktor Semykin <thesame.ml(a)gmail.com> Date: Sun Mar 26 16:28:44 2017 -0300 shlwapi: Add SHCreateMemStream shlwapi.h. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlwapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index 2c68b7f..138fcd9 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -978,8 +978,8 @@ HRESULT WINAPI SHCreateStreamOnFileA(LPCSTR,DWORD,struct IStream**); HRESULT WINAPI SHCreateStreamOnFileW(LPCWSTR,DWORD,struct IStream**); #define SHCreateStreamOnFile WINELIB_NAME_AW(SHCreateStreamOnFile) +struct IStream * WINAPI SHCreateMemStream(const BYTE*,UINT); HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR,DWORD,DWORD,BOOL,struct IStream*,struct IStream**); - HRESULT WINAPI SHCreateStreamWrapper(LPBYTE,DWORD,DWORD,struct IStream**); #endif /* NO_SHLWAPI_STREAM */

1 0

Alistair Leslie-Hughes : include/lmserver.h: Add missing SV_TYPE_* defines.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 08d6ebc1dcd4059d7137918cd8e67fdfdb25d90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d6ebc1dcd4059d7137918cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 24 05:18:26 2017 +0000 include/lmserver.h: Add missing SV_TYPE_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/lmserver.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/lmserver.h b/include/lmserver.h index 785cae3..08b09a7 100644 --- a/include/lmserver.h +++ b/include/lmserver.h @@ -69,6 +69,10 @@ BOOL WINAPI SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL); #define SV_TYPE_SERVER_VMS 0x00200000 #define SV_TYPE_WINDOWS 0x00400000 #define SV_TYPE_DFS 0x00800000 +#define SV_TYPE_CLUSTER_NT 0x01000000 +#define SV_TYPE_TERMINALSERVER 0x02000000 +#define SV_TYPE_CLUSTER_VS_NT 0x04000000 +#define SV_TYPE_DCE 0x10000000 #define SV_TYPE_ALTERNATE_XPORT 0x20000000 #define SV_TYPE_LOCAL_LIST_ONLY 0x40000000 #define SV_TYPE_DOMAIN_ENUM 0x80000000

1 0

Alistair Leslie-Hughes : oledb32/tests: Add convert to DBTYPE_NUMERIC tests.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 39935fe5ad889d537d828cc82771bdb969cdb2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39935fe5ad889d537d828cc82… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 27 12:01:57 2017 +0100 oledb32/tests: Add convert to DBTYPE_NUMERIC tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 121 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b8b3c6f..116ca16 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3264,6 +3264,126 @@ static void test_converttoiunknown(void) ok(dst_len == 44, "got %ld\n", dst_len); } +#define test_numeric_val(current, expected) _test_numeric_val(__LINE__, current, expected); +static inline void _test_numeric_val(unsigned line, DB_NUMERIC *current, DB_NUMERIC *expected) +{ + int same = !memcmp(current, expected, sizeof(DB_NUMERIC)); + ok_(__FILE__,line) (same, "Invalid byte array\n"); + if(!same) + { + int i; + for(i=0; i < sizeof(current->val); i++) + ok_(__FILE__,line) (current->val[i] == expected->val[i], " byte %d got 0x%02x expected 0x%02x\n", i, current->val[i], expected->val[i]); + } +} + +static void test_converttonumeric(void) +{ + HRESULT hr; + DBSTATUS dst_status; + DBLENGTH dst_len; + DB_NUMERIC dst; + static WCHAR strW[] = {'1','2','3','.','4','5',0}; + static WCHAR largeW[] = {'1','2','3','4','5','6','7','8','9','0',0}; + INT i; + BSTR bstr; + FLOAT fvalue = 543.21f; + VARIANT_BOOL boolean = VARIANT_TRUE; + VARIANT var; + LARGE_INTEGER i8; + DB_NUMERIC result1 = { 10, 0, 1, {0x02, 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; /* 4098 */ + DB_NUMERIC result2 = { 10, 0, 1, {0x39, 0x30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; /* 12345 */ + DB_NUMERIC result3 = { 10, 0, 0, {0x01, 0x00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; /* -1 */ + DB_NUMERIC result4 = { 10, 0, 1, {0x1f, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; /* 543.21 */ + DB_NUMERIC result5 = { 10, 0, 1, {0x7b, 0x00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; /* 123.45 */ + DB_NUMERIC result6 = { 10, 0, 1, {0xd2, 0x02, 0x96, 0x49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; /* 123456789 */ + + VariantInit(&var); + + i = 4098; + dst_len = 0x1234; + dst.scale = 30; + memset(dst.val, 0xfe, sizeof(dst.val)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_NUMERIC, 0, &dst_len, &i, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + todo_wine test_numeric_val(&dst, &result1); + + i8.QuadPart = 12345; + dst_len = 0x1234; + dst.scale = 30; + memset(dst.val, 0xfe, sizeof(dst.val)); + hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_NUMERIC, sizeof(i8), &dst_len, &i8, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + todo_wine test_numeric_val(&dst, &result2); + + dst_len = 0x1234; + dst.scale = 30; + dst.sign = 1; + memset(dst.val, 0xfe, sizeof(dst.val)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BOOL, DBTYPE_NUMERIC, sizeof(boolean), &dst_len, &boolean, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + todo_wine test_numeric_val(&dst, &result3); + + dst_len = 0x1234; + dst.scale = 30; + dst.sign = 0; + memset(dst.val, 0xfe, sizeof(dst.val)); + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, DBTYPE_NUMERIC, sizeof(fvalue), &dst_len, &fvalue, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + todo_wine test_numeric_val(&dst, &result4); + + dst_len = 0x1234; + dst.scale = 30; + dst.sign = 0; + memset(dst.val, 0xfe, sizeof(dst.val)); + V_VT(&var) = VT_NULL; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_NUMERIC, sizeof(var), &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + + dst_len = 0x1234; + dst.scale = 30; + dst.sign = 0; + memset(dst.val, 0xfe, sizeof(dst.val)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_NUMERIC, sizeof(strW), &dst_len, strW, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + todo_wine test_numeric_val(&dst, &result5); + + bstr = SysAllocString(strW); + dst_status = 0; + dst.scale = 30; + dst.sign = 0; + dst_len = sizeof(strW); + memset(dst.val, 0xfe, sizeof(dst.val)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_NUMERIC, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + todo_wine test_numeric_val(&dst, &result5); + + bstr = SysAllocString(largeW); + dst_status = 0; + dst.scale = 30; + dst.sign = 0; + dst_len = sizeof(largeW); + memset(dst.val, 0xfe, sizeof(dst.val)); + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_NUMERIC, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + todo_wine test_numeric_val(&dst, &result6); +} + START_TEST(convert) { HRESULT hr; @@ -3304,6 +3424,7 @@ START_TEST(convert) test_getconversionsize(); test_converttotimestamp(); test_converttoiunknown(); + test_converttonumeric(); IDataConvert_Release(convert);

1 0

Henri Verbeet : wined3d: Get rid of blit_shader.set_shader() and blit_shader.unset_shader().
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: df6b402026a82e9c55e70c8eb393112e47a6fea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6b402026a82e9c55e70c8eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 26 20:56:01 2017 +0200 wined3d: Get rid of blit_shader.set_shader() and blit_shader.unset_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++- dlls/wined3d/surface.c | 67 +++++++++++---------------------------- dlls/wined3d/wined3d_private.h | 3 -- 3 files changed, 20 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8d1ca8a..ca1d294 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7885,11 +7885,10 @@ static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined return WINED3DERR_INVALIDCALL; } -const struct blit_shader arbfp_blit = { +const struct blit_shader arbfp_blit = +{ arbfp_blit_alloc, arbfp_blit_free, - arbfp_blit_set, - arbfp_blit_unset, arbfp_blit_supported, arbfp_blit_color_fill, arbfp_blit_depth_fill, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4829e84..51fdcbb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2591,35 +2591,6 @@ static HRESULT ffp_blit_alloc(struct wined3d_device *device) { return WINED3D_OK /* Context activation is done by the caller. */ static void ffp_blit_free(struct wined3d_device *device) { } -/* Context activation is done by the caller. */ -static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, - const struct wined3d_color_key *color_key) -{ - const struct wined3d_gl_info *gl_info = context->gl_info; - - gl_info->gl_ops.gl.p_glEnable(surface->container->target); - checkGLcall("glEnable(target)"); - - return WINED3D_OK; -} - -/* Context activation is done by the caller. */ -static void ffp_blit_unset(const struct wined3d_gl_info *gl_info) -{ - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); - checkGLcall("glDisable(GL_TEXTURE_2D)"); - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); - } - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); - checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); - } -} - static BOOL ffp_blit_supported(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, @@ -2769,7 +2740,8 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl context_invalidate_state(context, STATE_FRAMEBUFFER); } - ffp_blit_set(device->blit_priv, context, src_surface, NULL); + gl_info->gl_ops.gl.p_glEnable(src_texture->target); + checkGLcall("glEnable(target)"); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) { @@ -2799,7 +2771,18 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl } /* Leave the OpenGL state valid for blitting. */ - ffp_blit_unset(gl_info); + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable(GL_TEXTURE_2D)"); + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) + { + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } + if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) + { + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); + checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); + } if (wined3d_settings.strict_draw_ordering || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) @@ -2810,11 +2793,10 @@ 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 blit_shader ffp_blit = +{ ffp_blit_alloc, ffp_blit_free, - ffp_blit_set, - ffp_blit_unset, ffp_blit_supported, ffp_blit_color_fill, ffp_blit_depth_fill, @@ -2831,18 +2813,6 @@ static void cpu_blit_free(struct wined3d_device *device) { } -/* Context activation is done by the caller. */ -static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, - const struct wined3d_color_key *color_key) -{ - return WINED3D_OK; -} - -/* Context activation is done by the caller. */ -static void cpu_blit_unset(const struct wined3d_gl_info *gl_info) -{ -} - static BOOL cpu_blit_supported(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, @@ -3464,11 +3434,10 @@ 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 blit_shader cpu_blit = +{ cpu_blit_alloc, cpu_blit_free, - cpu_blit_set, - cpu_blit_unset, cpu_blit_supported, cpu_blit_color_fill, cpu_blit_depth_fill, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f154db3..7c9b061 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1868,9 +1868,6 @@ struct blit_shader { HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device); - HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, - const struct wined3d_color_key *color_key); - void (*unset_shader)(const struct wined3d_gl_info *gl_info); BOOL (*blit_supported)(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,

1 0

Henri Verbeet : wined3d: Rename struct blit_shader to struct wined3d_blitter_ops.
by Alexandre Julliard 27 Mar '17

27 Mar '17

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

Henri Verbeet : wined3d: Use WINED3D_BLT_SRC_CKEY to present the logo texture.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 0a1a6533b52273b840428e50ba256fbcf26eb562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a1a6533b52273b840428e50b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 26 20:56:03 2017 +0200 wined3d: Use WINED3D_BLT_SRC_CKEY to present the logo texture. WINED3D_BLT_ALPHA_TEST makes no sense, since the texture doesn't have an alpha channel. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a9eb997..8444437 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -450,7 +450,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, /* Blit the logo into the upper left corner of the drawable. */ wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, &rect, - WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); + WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); } if (swapchain->device->bCursorVisible && swapchain->device->cursor_texture

1 0

Piotr Caban : msvcrt: Add improper_lock class implementation.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: de600ada776b78ff1b5bab5cc239a7a0127da756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de600ada776b78ff1b5bab5cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 27 10:26:27 2017 +0200 msvcrt: Add improper_lock 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 | 52 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/lock.c | 6 ++--- dlls/msvcrt/msvcrt.h | 1 + 8 files changed, 82 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de600ada776b78ff1b5ba…

1 0

Piotr Caban : msvcrt: Add SchedulerPolicy class stub.
by Alexandre Julliard 27 Mar '17

27 Mar '17

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

Piotr Caban : msvcrt: Add helper for exception throwing.
by Alexandre Julliard 27 Mar '17

27 Mar '17

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