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

Henri Verbeet : usp10: Introduce a helper function to lookup a language in a LoadedScript structure.
by Alexandre Julliard March 28, 2017

March 28, 2017

Module: wine Branch: master Commit: 9a15753d40f7dbd90eadb270b03bb0ddb8411ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a15753d40f7dbd90eadb270b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:00 2017 +0200 usp10: Introduce a helper function to lookup a language in a LoadedScript structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e5e7ece..b58731a 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2610,6 +2610,19 @@ HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, return rc; } +static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_TAG tag) +{ + size_t i; + + for (i = 0; i < script->language_count; ++i) + { + if (script->languages[i].tag == tag) + return &script->languages[i]; + } + + return NULL; +} + static void GSUB_initialize_language_cache(LoadedScript *script) { int i; @@ -2646,6 +2659,7 @@ static void GPOS_expand_language_cache(LoadedScript *script) { int count; const OT_Script* table = script->gpos_table; + LoadedLanguage *language; DWORD offset; if (!table) @@ -2678,27 +2692,21 @@ static void GPOS_expand_language_cache(LoadedScript *script) } else if (count) { - int i,j; + int i; for (i = 0; i < count; i++) { int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); OPENTYPE_TAG tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - for (j = 0; j < script->language_count; j++) - { - if (script->languages[j].tag == tag) - { - script->languages[j].gpos_table = ((const BYTE*)table + offset); - break; - } - } - if (j == script->language_count) + if (!(language = usp10_script_get_language(script, tag))) { script->language_count++; - script->languages = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,script->languages, sizeof(LoadedLanguage) * script->language_count); - script->languages[j].tag = tag; - script->languages[j].gpos_table = ((const BYTE*)table + offset); + script->languages = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + script->languages, script->language_count * sizeof(*script->languages)); + language = &script->languages[script->language_count - 1]; + language->tag = tag; } + language->gpos_table = (const BYTE *)table + offset; } } } @@ -2919,16 +2927,7 @@ HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, O if ((script->default_language.gsub_table || script->default_language.gpos_table) && script->default_language.tag == language_tag) language = &script->default_language; else - { - for (i = 0; i < script->language_count; i++) - { - if (script->languages[i].tag == language_tag) - { - language = &script->languages[i]; - break; - } - } - } + language = usp10_script_get_language(script, language_tag); if (!language) {

1 0

Alistair Leslie-Hughes : include/lmserver.h: Add missing SV_TYPE_* defines.
by Alexandre Julliard March 27, 2017

March 27, 2017

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

Viktor Semykin : shlwapi: Add SHCreateMemStream shlwapi.h.
by Alexandre Julliard March 27, 2017

March 27, 2017

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 : oledb32/tests: Add convert to DBTYPE_NUMERIC tests.
by Alexandre Julliard March 27, 2017

March 27, 2017

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: Use WINED3D_BLT_SRC_CKEY to present the logo texture.
by Alexandre Julliard March 27, 2017

March 27, 2017

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

Henri Verbeet : wined3d: Get rid of blit_shader.set_shader() and blit_shader.unset_shader().
by Alexandre Julliard March 27, 2017

March 27, 2017

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

Nikolay Sivov : oleaut32: Implement GetAltMonthNames().
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 7fb4809347faa8285c5c67bfc950d4fffeee86d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb4809347faa8285c5c67bfc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 26 10:06:00 2017 +0300 oleaut32: Implement GetAltMonthNames(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 109 ++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/oleaut32.spec | 2 +- dlls/oleaut32/tests/varformat.c | 37 ++++++++++++++ 3 files changed, 147 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index f9734e6..d03893a 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -935,3 +935,112 @@ HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hIcon) /* FIXME: make an extended conversation from HICON to HCURSOR */ return CopyCursor(hIcon); } + +/*********************************************************************** + * GetAltMonthNames (OLEAUT32.@) + */ +HRESULT WINAPI GetAltMonthNames(LCID lcid, LPOLESTR **str) +{ + static const WCHAR ar_month1W[] = {0x645,0x62d,0x631,0x645,0}; + static const WCHAR ar_month2W[] = {0x635,0x641,0x631,0}; + static const WCHAR ar_month3W[] = {0x631,0x628,0x64a,0x639,' ',0x627,0x644,0x627,0x648,0x644,0}; + static const WCHAR ar_month4W[] = {0x631,0x628,0x64a,0x639,' ',0x627,0x644,0x62b,0x627,0x646,0x64a,0}; + static const WCHAR ar_month5W[] = {0x62c,0x645,0x627,0x62f,0x649,' ',0x627,0x644,0x627,0x648,0x644,0x649,0}; + static const WCHAR ar_month6W[] = {0x62c,0x645,0x627,0x62f,0x649,' ',0x627,0x644,0x62b,0x627,0x646,0x64a,0x629,0}; + static const WCHAR ar_month7W[] = {0x631,0x62c,0x628,0}; + static const WCHAR ar_month8W[] = {0x634,0x639,0x628,0x627,0x646,0}; + static const WCHAR ar_month9W[] = {0x631,0x645,0x636,0x627,0x646,0}; + static const WCHAR ar_month10W[] = {0x634,0x648,0x627,0x643,0}; + static const WCHAR ar_month11W[] = {0x630,0x648,' ',0x627,0x644,0x642,0x639,0x62f,0x629,0}; + static const WCHAR ar_month12W[] = {0x630,0x648,' ',0x627,0x644,0x62d,0x62c,0x629,0}; + + static const WCHAR *arabic_hijri[] = + { + ar_month1W, + ar_month2W, + ar_month3W, + ar_month4W, + ar_month5W, + ar_month6W, + ar_month7W, + ar_month8W, + ar_month9W, + ar_month10W, + ar_month11W, + ar_month12W, + NULL + }; + + static const WCHAR pl_month1W[] = {'s','t','y','c','z','n','i','a',0}; + static const WCHAR pl_month2W[] = {'l','u','t','e','g','o',0}; + static const WCHAR pl_month3W[] = {'m','a','r','c','a',0}; + static const WCHAR pl_month4W[] = {'k','w','i','e','t','n','i','a',0}; + static const WCHAR pl_month5W[] = {'m','a','j','a',0}; + static const WCHAR pl_month6W[] = {'c','z','e','r','w','c','a',0}; + static const WCHAR pl_month7W[] = {'l','i','p','c','a',0}; + static const WCHAR pl_month8W[] = {'s','i','e','r','p','n','i','a',0}; + static const WCHAR pl_month9W[] = {'w','r','z','e',0x15b,'n','i','a',0}; + static const WCHAR pl_month10W[] = {'p','a',0x17a,'d','z','i','e','r','n','i','k','a',0}; + static const WCHAR pl_month11W[] = {'l','i','s','t','o','p','a','d','a',0}; + static const WCHAR pl_month12W[] = {'g','r','u','d','n','i','a',0}; + + static const WCHAR *polish_genitive_names[] = + { + pl_month1W, + pl_month2W, + pl_month3W, + pl_month4W, + pl_month5W, + pl_month6W, + pl_month7W, + pl_month8W, + pl_month9W, + pl_month10W, + pl_month11W, + pl_month12W, + NULL + }; + + static const WCHAR ru_month1W[] = {0x44f,0x43d,0x432,0x430,0x440,0x44f,0}; + static const WCHAR ru_month2W[] = {0x444,0x435,0x432,0x440,0x430,0x43b,0x44f,0}; + static const WCHAR ru_month3W[] = {0x43c,0x430,0x440,0x442,0x430,0}; + static const WCHAR ru_month4W[] = {0x430,0x43f,0x440,0x435,0x43b,0x44f,0}; + static const WCHAR ru_month5W[] = {0x43c,0x430,0x44f,0}; + static const WCHAR ru_month6W[] = {0x438,0x44e,0x43d,0x44f,0}; + static const WCHAR ru_month7W[] = {0x438,0x44e,0x43b,0x44f,0}; + static const WCHAR ru_month8W[] = {0x430,0x432,0x433,0x443,0x441,0x442,0x430,0}; + static const WCHAR ru_month9W[] = {0x441,0x435,0x43d,0x442,0x44f,0x431,0x440,0x44f,0}; + static const WCHAR ru_month10W[] = {0x43e,0x43a,0x442,0x44f,0x431,0x440,0x44f,0}; + static const WCHAR ru_month11W[] = {0x43d,0x43e,0x44f,0x431,0x440,0x44f,0}; + static const WCHAR ru_month12W[] = {0x434,0x435,0x43a,0x430,0x431,0x440,0x44f,0}; + + static const WCHAR *russian_genitive_names[] = + { + ru_month1W, + ru_month2W, + ru_month3W, + ru_month4W, + ru_month5W, + ru_month6W, + ru_month7W, + ru_month8W, + ru_month9W, + ru_month10W, + ru_month11W, + ru_month12W, + NULL + }; + + TRACE("%#x, %p\n", lcid, str); + + if (PRIMARYLANGID(LANGIDFROMLCID(lcid)) == LANG_ARABIC) + *str = (LPOLESTR *)arabic_hijri; + else if (PRIMARYLANGID(LANGIDFROMLCID(lcid)) == LANG_POLISH) + *str = (LPOLESTR *)polish_genitive_names; + else if (PRIMARYLANGID(LANGIDFROMLCID(lcid)) == LANG_RUSSIAN) + *str = (LPOLESTR *)russian_genitive_names; + else + *str = NULL; + + return S_OK; +} diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index dccdb5f..cc18a04 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -319,7 +319,7 @@ 329 stdcall VarCyMulI8(int64 int64 ptr) 330 stdcall VarDateFromUdate(ptr long ptr) 331 stdcall VarUdateFromDate(double long ptr) -332 stub GetAltMonthNames +332 stdcall GetAltMonthNames(long ptr) 333 stdcall VarI8FromUI1(long long) 334 stdcall VarI8FromI2(long long) 335 stdcall VarI8FromR4(float long) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 9547c89..69476aa 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -640,6 +640,42 @@ static void test_VarFormatFromTokens(void) SysFreeString(bstr); } +static void test_GetAltMonthNames(void) +{ + LPOLESTR *str, *str2; + HRESULT hr; + + str = (void *)0xdeadbeef; + hr = GetAltMonthNames(0, &str); + ok(hr == S_OK, "Unexpected return value %08x\n", hr); + ok(str == NULL, "Got %p\n", str); + + str = (void *)0xdeadbeef; + hr = GetAltMonthNames(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), &str); + ok(hr == S_OK, "Unexpected return value %08x\n", hr); + ok(str == NULL, "Got %p\n", str); + + str = NULL; + hr = GetAltMonthNames(MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_EGYPT), SORT_DEFAULT), &str); + ok(hr == S_OK, "Unexpected return value %08x\n", hr); + ok(str != NULL, "Got %p\n", str); + + str2 = NULL; + hr = GetAltMonthNames(MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_EGYPT), SORT_DEFAULT), &str2); + ok(hr == S_OK, "Unexpected return value %08x\n", hr); + ok(str2 == str, "Got %p\n", str2); + + str = NULL; + hr = GetAltMonthNames(MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_DEFAULT), SORT_DEFAULT), &str); + ok(hr == S_OK, "Unexpected return value %08x\n", hr); + ok(str != NULL, "Got %p\n", str); + + str = NULL; + hr = GetAltMonthNames(MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT), &str); + ok(hr == S_OK, "Unexpected return value %08x\n", hr); + ok(str != NULL, "Got %p\n", str); +} + START_TEST(varformat) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -650,4 +686,5 @@ START_TEST(varformat) test_VarFormat(); test_VarWeekdayName(); test_VarFormatFromTokens(); + test_GetAltMonthNames(); }

1 0

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

March 27, 2017

Module: wine Branch: master Commit: a3ab54707fb8d4343b5e3af5ead89160d37cc10f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ab54707fb8d4343b5e3af5e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Mar 27 13:50:58 2017 +0300 api-ms-win-core-registry-l2-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-registry-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-registry-l2-1-0.spec | 33 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 38 insertions(+) diff --git a/configure b/configure index e13e629..051b9c9 100755 --- a/configure +++ b/configure @@ -948,6 +948,7 @@ enable_api_ms_win_core_psapi_obsolete_l1_1_0 enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 +enable_api_ms_win_core_registry_l2_1_0 enable_api_ms_win_core_registryuserspecific_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 @@ -17685,6 +17686,7 @@ wine_fn_config_dll api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 wine_fn_config_dll api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 +wine_fn_config_dll api-ms-win-core-registry-l2-1-0 enable_api_ms_win_core_registry_l2_1_0 wine_fn_config_dll api-ms-win-core-registryuserspecific-l1-1-0 enable_api_ms_win_core_registryuserspecific_l1_1_0 wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtlsupport_l1_1_0 wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 diff --git a/configure.ac b/configure.ac index 7feeec5..97e0811 100644 --- a/configure.ac +++ b/configure.ac @@ -2736,6 +2736,7 @@ WINE_CONFIG_DLL(api-ms-win-core-psapi-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-registry-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) diff --git a/dlls/api-ms-win-core-registry-l2-1-0/Makefile.in b/dlls/api-ms-win-core-registry-l2-1-0/Makefile.in new file mode 100644 index 0000000..eca16d7 --- /dev/null +++ b/dlls/api-ms-win-core-registry-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-registry-l2-1-0.dll diff --git a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec new file mode 100644 index 0000000..6d63dd9 --- /dev/null +++ b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec @@ -0,0 +1,33 @@ +@ stdcall RegConnectRegistryA(str long ptr) advapi32.RegConnectRegistryA +@ stdcall RegConnectRegistryW(wstr long ptr) advapi32.RegConnectRegistryW +@ stdcall RegCopyTreeA(long str long) advapi32.RegCopyTreeA +@ stdcall RegCreateKeyA(long str ptr) advapi32.RegCreateKeyA +@ stdcall RegCreateKeyTransactedA(long str long ptr long long ptr ptr ptr long ptr) advapi32.RegCreateKeyTransactedA +@ stdcall RegCreateKeyTransactedW(long wstr long ptr long long ptr ptr ptr long ptr) advapi32.RegCreateKeyTransactedW +@ stdcall RegCreateKeyW(long wstr ptr) advapi32.RegCreateKeyW +@ stdcall RegDeleteKeyA(long str) advapi32.RegDeleteKeyA +@ stub RegDeleteKeyTransactedA +@ stub RegDeleteKeyTransactedW +@ stdcall RegDeleteKeyValueA(long str str) advapi32.RegDeleteKeyValueA +@ stdcall RegDeleteKeyValueW(long wstr wstr) advapi32.RegDeleteKeyValueW +@ stdcall RegDeleteKeyW(long wstr) advapi32.RegDeleteKeyW +@ stdcall RegDisablePredefinedCache() advapi32.RegDisablePredefinedCache +@ stdcall RegEnumKeyA(long long ptr long) advapi32.RegEnumKeyA +@ stdcall RegEnumKeyW(long long ptr long) advapi32.RegEnumKeyW +@ stdcall RegOpenKeyA(long str ptr) advapi32.RegOpenKeyA +@ stub RegOpenKeyTransactedA +@ stub RegOpenKeyTransactedW +@ stdcall RegOpenKeyW(long wstr ptr) advapi32.RegOpenKeyW +@ stdcall RegOverridePredefKey(long long) advapi32.RegOverridePredefKey +@ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) advapi32.RegQueryMultipleValuesA +@ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr) advapi32.RegQueryMultipleValuesW +@ stdcall RegQueryValueA(long str ptr ptr) advapi32.RegQueryValueA +@ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW +@ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA +@ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW +@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW +@ stdcall RegSetKeyValueA(long str str long ptr long) advapi32.RegSetKeyValueA +@ stdcall RegSetKeyValueW(long wstr wstr long ptr long) advapi32.RegSetKeyValueW +@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index 99cd5c0..e1fdb0c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -115,6 +115,7 @@ my @dll_groups = "api-ms-win-downlevel-advapi32-l2-1-0", "api-ms-win-security-base-l1-1-0", "api-ms-win-core-registry-l1-1-0", + "api-ms-win-core-registry-l2-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-consumer-l1-1-0", "api-ms-win-eventing-controller-l1-1-0",

1 0

Huw Davies : user32: Explicitly set last error to ERROR_SUCCESS.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: 0a36078ee1016053d746e77d1f636b018c537ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a36078ee1016053d746e77d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 27 10:18:32 2017 +0100 user32: Explicitly set last error to ERROR_SUCCESS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 827bee7..93b39b4 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3288,6 +3288,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if( menu ) menu->bTimeToHide = FALSE; } + SetLastError( ERROR_SUCCESS ); /* The return value is only used by TrackPopupMenu */ if (!(wFlags & TPM_RETURNCMD)) return TRUE; if (executedMenuId == -1) executedMenuId = 0;

1 0

Jacek Caban : server: Added support for message mode named pipe reads.
by Alexandre Julliard March 27, 2017

March 27, 2017

Module: wine Branch: master Commit: aa472f5eb50009c7f7e31526918119ed3f202de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa472f5eb50009c7f7e315269… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 26 12:52:39 2017 +0200 server: Added support for message mode named pipe reads. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 45 ++++++--------------------------------------- server/named_pipe.c | 26 +++++++++++++++++--------- 2 files changed, 23 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa472f5eb50009c7f7e31…

1 0