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

Andrey Gusev : api-ms-win-core-registry-l2-1-0: Add dll.
by Alexandre Julliard 27 Mar '17

27 Mar '17

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

Nikolay Sivov : oleaut32: Implement GetAltMonthNames().
by Alexandre Julliard 27 Mar '17

27 Mar '17

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

Huw Davies : user32: Explicitly set last error to ERROR_SUCCESS.
by Alexandre Julliard 27 Mar '17

27 Mar '17

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

Austin English : kernelbase: Sync spec file to Windows 10.
by Alexandre Julliard 27 Mar '17

27 Mar '17

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

Józef Kucia : wined3d: Do not compute color/ NP2 fixup PS compile arguments for SM4+.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 99e9ce3e3e1bde622998925ecb218b913fb3d41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e9ce3e3e1bde622998925ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 24 17:14:42 2017 +0100 wined3d: Do not compute color/NP2 fixup PS compile arguments for SM4+. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 55 +++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 020e943..7ba6993 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3414,10 +3414,10 @@ void find_gs_compile_args(const struct wined3d_state *state, const struct wined3 void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_texture *texture; - UINT i; + unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, state->fb)) @@ -3520,34 +3520,41 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 } } - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + if (shader->reg_maps.shader_version.major >= 4) { - if (!shader->reg_maps.resource_info[i].type) - continue; - - texture = state->textures[i]; - if (!texture) - { - args->color_fixup[i] = COLOR_FIXUP_IDENTITY; - continue; - } - if (can_use_texture_swizzle(gl_info, texture->resource.format)) + /* In SM4+ we use dcl_sampler in order to determine if we should use shadow sampler. */ + args->shadow = 0; + for (i = 0 ; i < MAX_FRAGMENT_SAMPLERS; ++i) args->color_fixup[i] = COLOR_FIXUP_IDENTITY; - else - args->color_fixup[i] = texture->resource.format->color_fixup; + args->np2_fixup = 0; + } + else + { + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + if (!shader->reg_maps.resource_info[i].type) + continue; + + texture = state->textures[i]; + if (!texture) + { + args->color_fixup[i] = COLOR_FIXUP_IDENTITY; + continue; + } + if (can_use_texture_swizzle(gl_info, texture->resource.format)) + args->color_fixup[i] = COLOR_FIXUP_IDENTITY; + else + args->color_fixup[i] = texture->resource.format->color_fixup; - if (texture->resource.format_flags & WINED3DFMT_FLAG_SHADOW) - args->shadow |= 1u << i; + if (texture->resource.format_flags & WINED3DFMT_FLAG_SHADOW) + args->shadow |= 1u << i; - /* Flag samplers that need NP2 texcoord fixup. */ - if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) - args->np2_fixup |= (1u << i); + /* Flag samplers that need NP2 texcoord fixup. */ + if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) + args->np2_fixup |= (1u << i); + } } - /* In SM4+ we use dcl_sampler in order to determine if we should use shadow sampler. */ - if (shader->reg_maps.shader_version.major >= 4) - args->shadow = 0; - if (shader->reg_maps.shader_version.major >= 3) { if (position_transformed)

1 0

Józef Kucia : wined3d: Allow creating shader resource views for cube map and rectangle textures.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 16e22c8a6b4f207915c1a0ac517b0105fb48281b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e22c8a6b4f207915c1a0ac5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 24 17:14:44 2017 +0100 wined3d: Allow creating shader resource views for cube map and rectangle textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ac558a4..82fac25 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -44,13 +44,15 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, } view_types[] = { - {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY}, - {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, + {GL_TEXTURE_CUBE_MAP, 0, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_RECTANGLE, 0, GL_TEXTURE_RECTANGLE}, + {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY}, + {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, }; unsigned int i;

1 0

Józef Kucia : d3d10core/tests: Introduce get_resource_data() helper function.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 556f1dc85465e2d1889066cbb59f9b730112c20d URL: http://source.winehq.org/git/wine.git/?a=commit;h=556f1dc85465e2d1889066cbb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 24 17:14:46 2017 +0100 d3d10core/tests: Introduce get_resource_data() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 44f3fae..3e8a1e8 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -568,24 +568,29 @@ static void get_texture_readback(ID3D10Texture2D *texture, unsigned int sub_reso ID3D10Device_Release(device); } +static void *get_readback_data(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned byte_width) +{ + return (BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch + x * byte_width; +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((DWORD *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(DWORD) + x]; + return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); } static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((float *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(float) + x]; + return *(float *)get_readback_data(rb, x, y, sizeof(float)); } static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return &((const struct vec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct vec4) + x]; + return get_readback_data(rb, x, y, sizeof(struct vec4)); } static const struct uvec4 *get_readback_uvec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return &((const struct uvec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct uvec4) + x]; + return get_readback_data(rb, x, y, sizeof(struct uvec4)); } static void release_resource_readback(struct resource_readback *rb)

1 0

Józef Kucia : d3d11/tests: Introduce get_resource_data() helper function.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: f73340a9069563be4ee1f0767be5533bf427f07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73340a9069563be4ee1f0767… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 24 17:14:47 2017 +0100 d3d11/tests: Introduce get_resource_data() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 303f973..a22d4de 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -716,24 +716,29 @@ static void get_texture_readback(ID3D11Texture2D *texture, unsigned int sub_reso ID3D11Device_Release(device); } +static void *get_readback_data(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned byte_width) +{ + return (BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch + x * byte_width; +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((DWORD *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(DWORD) + x]; + return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); } static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((float *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(float) + x]; + return *(float *)get_readback_data(rb, x, y, sizeof(float)); } static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return &((const struct vec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct vec4) + x]; + return get_readback_data(rb, x, y, sizeof(struct vec4)); } static const struct uvec4 *get_readback_uvec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return &((const struct uvec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct uvec4) + x]; + return get_readback_data(rb, x, y, sizeof(struct uvec4)); } static void release_resource_readback(struct resource_readback *rb)

1 0

Józef Kucia : d3d11: Try to avoid spurious blend state FIXMEs().
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 7019347409d3cb18cf23de7b747e8aea0ca88fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7019347409d3cb18cf23de7b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 24 17:14:48 2017 +0100 d3d11: Try to avoid spurious blend state FIXMEs(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d9c3a5a..515da0e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -696,9 +696,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi if (!blend_factor) blend_factor = default_blend_factor; - if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) - FIXME("Ignoring blend factor %s.\n", debug_float4(blend_factor)); - wined3d_mutex_lock(); memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask); @@ -718,30 +715,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi } desc = &device->blend_state->desc; - /* glSampleCoverage() */ - if (desc->AlphaToCoverageEnable) - FIXME("Ignoring AlphaToCoverageEnable %#x.\n", desc->AlphaToCoverageEnable); - /* glEnableIndexedEXT(GL_BLEND, ...) */ - FIXME("Per-rendertarget blend not implemented.\n"); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, desc->RenderTarget[0].BlendEnable); if (desc->RenderTarget[0].BlendEnable) { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, - desc->RenderTarget[0].SrcBlend); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, - desc->RenderTarget[0].DestBlend); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, - desc->RenderTarget[0].BlendOp); + const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; + + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, d->SrcBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, d->DestBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, d->BlendOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, - desc->RenderTarget[0].SrcBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, - desc->RenderTarget[0].DestBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, - desc->RenderTarget[0].BlendOpAlpha); - } - FIXME("Color mask > 3 not implemented.\n"); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); + + if (memcmp(blend_factor, default_blend_factor, sizeof(default_blend_factor)) + && (d->SrcBlend == D3D11_BLEND_BLEND_FACTOR || d->SrcBlend == D3D11_BLEND_INV_BLEND_FACTOR + || d->DestBlend == D3D11_BLEND_BLEND_FACTOR || d->DestBlend == D3D11_BLEND_INV_BLEND_FACTOR + || d->SrcBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->SrcBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR + || d->DestBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->DestBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR)) + FIXME("Ignoring blend factor %s.\n", debug_float4(blend_factor)); + } wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask); wined3d_device_set_render_state(device->wined3d_device, @@ -2643,8 +2637,19 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *ifa tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; + + if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL) + FIXME("Color mask %#x not supported for render target %u.\n", + tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); } + /* glSampleCoverage() */ + if (tmp_desc.AlphaToCoverageEnable) + FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable); + /* glEnableIndexedEXT(GL_BLEND, ...) */ + if (tmp_desc.IndependentBlendEnable) + FIXME("Per-rendertarget blend not implemented.\n"); + wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) {

1 0

Nikolay Sivov : msxml3: Support IPersistStream* as IXSLProcessor output.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: ea9b79740954fa188e7178e6316a07a9f0b802fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9b79740954fa188e7178e63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 26 13:56:29 2017 +0300 msxml3: Support IPersistStream* as IXSLProcessor output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/msxml_private.h | 3 +- dlls/msxml3/node.c | 6 +-- dlls/msxml3/stylesheet.c | 105 ++++++++++++++++++++++++++++++++++---------- dlls/msxml3/tests/domdoc.c | 54 +++++++++++++++++++++-- 4 files changed, 138 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea9b79740954fa188e717…

1 0