December 2016 - Wine-Commits

Filip Frąckiewicz : wined3d: Add AMD Radeon HD 6480G IGP.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: af1a0634192bc0451e0e2cb5e39fad45efe26f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1a0634192bc0451e0e2cb5e… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Wed Sep 28 03:16:16 2016 +0200 wined3d: Add AMD Radeon HD 6480G IGP. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1fdfe82663e329a8138313888cd4d3f870d07061) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 095e3cb..6fe1cdb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1334,6 +1334,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6300, "AMD Radeon HD 6300 series Graphics", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6400, "AMD Radeon HD 6400 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6410D, "AMD Radeon HD 6410D", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6480G, "AMD Radeon HD 6480G", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600M, "AMD Radeon HD 6600M Series", DRIVER_AMD_R600, 512 }, @@ -1931,6 +1932,7 @@ cards_amd_binary[] = {"HD 6570", CARD_AMD_RADEON_HD6600}, {"HD 6500M", CARD_AMD_RADEON_HD6600M}, {"HD 6500", CARD_AMD_RADEON_HD6600}, + {"HD 6480G", CARD_AMD_RADEON_HD6480G}, {"HD 6400", CARD_AMD_RADEON_HD6400}, {"HD 6300", CARD_AMD_RADEON_HD6300}, {"HD 6200", CARD_AMD_RADEON_HD6300}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5203e4a..4e83cc6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1519,6 +1519,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6300 = 0x9803, CARD_AMD_RADEON_HD6400 = 0x6770, CARD_AMD_RADEON_HD6410D = 0x9644, + CARD_AMD_RADEON_HD6480G = 0x9648, CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6600M = 0x6741,

1 0

Filip Frąckiewicz : wined3d: Add NVIDIA GTX 690 ( GK104) to the GPU list.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 85f4168013b92f064a873ac58c37926d355fcbb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f4168013b92f064a873ac58… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Thu Sep 22 05:56:42 2016 +0200 wined3d: Add NVIDIA GTX 690 (GK104) to the GPU list. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c261059d4f676fd16f98275b3432e38089ed932) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3b0f32b..095e3cb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1272,6 +1272,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1787,6 +1788,7 @@ cards_nvidia_binary[] = {"GT 740M", CARD_NVIDIA_GEFORCE_GT740M}, /* Geforce 700 - midend mobile */ {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ + {"GTX 690", CARD_NVIDIA_GEFORCE_GTX690}, /* Geforce 600 - highend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ @@ -2149,7 +2151,7 @@ cards_nvidia_mesa[] = {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 */ /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVD7", CARD_NVIDIA_GEFORCE_820M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23d681b..5203e4a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1616,6 +1616,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT740M = 0x1292,

1 0

Nikolay Sivov : ucrtbase: Fix some spec file entries.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 4e2163b65ae19aab965c0049d3a46cff426981d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2163b65ae19aab965c0049d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 14:18:04 2016 +0300 ucrtbase: Fix some spec file entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0ca1093335dbe072e4ad52e3e39129b1213e0ff8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 16 ++++++++-------- dlls/ucrtbase/ucrtbase.spec | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 5acd7aa..10a2ab7 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -1,21 +1,21 @@ @ cdecl __acrt_iob_func(long) ucrtbase.__acrt_iob_func @ cdecl __p__commode() ucrtbase.__p__commode @ cdecl __p__fmode() ucrtbase.__p__fmode -@ cdecl __stdio_common_vfprintf(int64 ptr ptr ptr ptr) ucrtbase.__stdio_common_vfprintf +@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s @ stub __stdio_common_vfscanf -@ cdecl __stdio_common_vfwprintf(int64 ptr ptr ptr ptr) ucrtbase.__stdio_common_vfwprintf +@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf -@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnprintf_s -@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf +@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p -@ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf_s -@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf -@ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf +@ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_s +@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsscanf +@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3948de3..fde39e8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -146,21 +146,21 @@ @ stub __std_type_info_destroy_list @ stub __std_type_info_hash @ stub __std_type_info_name -@ cdecl __stdio_common_vfprintf(int64 ptr ptr ptr ptr) MSVCRT__stdio_common_vfprintf +@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s @ stub __stdio_common_vfscanf -@ cdecl __stdio_common_vfwprintf(int64 ptr ptr ptr ptr) MSVCRT__stdio_common_vfwprintf +@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf -@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnprintf_s -@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf +@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p -@ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf_s -@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf -@ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf +@ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s +@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf +@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf

1 0

Nikolay Sivov : rpcrt4: Added NdrAsyncServerCall stub.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: c7fa4757f3b9c72e702477ec6b02cb2fb0f95f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fa4757f3b9c72e702477ec6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 18:17:16 2016 +0300 rpcrt4: Added NdrAsyncServerCall stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 858064abf694877de6b6558e5074bcee508cdbe5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 5 +++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f5a6bab..92a3665 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1850,3 +1850,8 @@ RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall(struct IRpcStubBuffer* pThis, FIXME("unimplemented, expect crash!\n"); return 0; } + +void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) +{ + FIXME("unimplemented, %p\n", pRpcMsg); +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 244bc2a..01c5d32 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -117,7 +117,7 @@ @ stub NDRcopy @ stdcall NdrAllocate(ptr long) @ varargs NdrAsyncClientCall(ptr ptr) -@ stub NdrAsyncServerCall +@ stdcall NdrAsyncServerCall(ptr) @ stdcall NdrAsyncStubCall(ptr ptr ptr ptr) @ stdcall NdrByteCountPointerBufferSize(ptr ptr ptr) @ stdcall NdrByteCountPointerFree(ptr ptr ptr)

1 0

Ruslan Kabatsayev : wined3d: Initialise p_wglGetPixelFormat when USE_WIN32_OPENGL is defined.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 9732bcbcc0a06650d182e9701fe7e5aaac33e3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=9732bcbcc0a06650d182e9701… Author: Ruslan Kabatsayev <b7.10110111(a)gmail.com> Date: Fri Sep 2 12:40:19 2016 +0200 wined3d: Initialise p_wglGetPixelFormat when USE_WIN32_OPENGL is defined. This fixes a regression introduced by commit b53256b8b752855576252cc2290dfbc9cb0f1280. Signed-off-by: Ruslan Kabatsayev <b7.10110111(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c2e316a3e6afaf1eea05a9f86f9e5275cbfcf9e6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c07c7ff..3b0f32b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5931,6 +5931,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) ALL_WGL_FUNCS #undef USE_GL_FUNC gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers"); + gl_info->gl_ops.wgl.p_wglGetPixelFormat = (void *)GetProcAddress(mod_gl, "wglGetPixelFormat"); } #else /* To bypass the opengl32 thunks retrieve functions from the WGL driver instead of opengl32 */

1 0

Nikolay Sivov : dbghelp: Support CIE version 4 in parse_cie_details().
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: cc97cd5df2eb5d942057b8ac8163f2e660d28f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc97cd5df2eb5d942057b8ac8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 7 01:43:27 2016 +0300 dbghelp: Support CIE version 4 in parse_cie_details(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab27cb48fc6bc0a11bff05f0be49b8befc3718e4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dwarf.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index dcbcf0a..3fd1920 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2641,7 +2641,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* /* parse the CIE first */ version = dwarf2_parse_byte(ctx); - if (version != 1 && version != 3) + if (version != 1 && version != 3 && version != 4) { FIXME("unknown CIE version %u at %p\n", version, ctx->data - 1); return FALSE; @@ -2649,12 +2649,21 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* augmentation = (const char*)ctx->data; ctx->data += strlen(augmentation) + 1; - info->code_align = dwarf2_leb128_as_unsigned(ctx); - info->data_align = dwarf2_leb128_as_signed(ctx); - if (version == 1) - info->retaddr_reg = dwarf2_parse_byte(ctx); - else - info->retaddr_reg = dwarf2_leb128_as_unsigned(ctx); + switch (version) + { + case 4: + /* skip 'address_size' and 'segment_size' */ + ctx->data += 2; + /* fallthrough */ + case 1: + case 3: + info->code_align = dwarf2_leb128_as_unsigned(ctx); + info->data_align = dwarf2_leb128_as_signed(ctx); + info->retaddr_reg = version == 1 ? dwarf2_parse_byte(ctx) :dwarf2_leb128_as_unsigned(ctx); + break; + default: + ; + } info->state.cfa_rule = RULE_CFA_OFFSET; end = NULL;

1 0

Francois Gouget : testbot: Spelling fixes in a few comments.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: b2943cadb232d0766fbe397c1b15a93f0818e390 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b2943cadb232d0766fbe397c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 08:04:02 2016 +0100 testbot: Spelling fixes in a few comments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- testbot/src/testagentd/platform.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 24b2b28..6dcbf48 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -232,7 +232,7 @@ if (opendir(my $dh, "$DataDir/staging")) { if ($Age >= 1 and !unlink $FileName) { - # The user abandonned the submit procedure half-way + # The user abandoned the submit procedure half-way through LogMsg "Could not delete '$FileName': $!\n" if (!unlink($FileName)); } } diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 46e4d37..ea807fb 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -18,7 +18,7 @@ /* - * Compatiblity definitions. + * Compatibility definitions. */ #ifdef WIN32 @@ -53,7 +53,7 @@ typedef int SOCKET; /* - * Platform-specific unctions. + * Platform-specific functions. */ int platform_init(void);

1 0

Francois Gouget : transl: A couple of spelling fixes in comments.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: 314039343f920e50413e001fdaa903e7d2338c8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=314039343f920e50413e001f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 08:08:27 2016 +0100 transl: A couple of spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transl/style.css b/transl/style.css index 557de2c..d492393 100644 --- a/transl/style.css +++ b/transl/style.css @@ -78,7 +78,7 @@ table.index td { background-color: #fff4f4; } -/* used to mark resource parts that are not literaly in the string, like \0, \n etc*/ +/* used to mark resource parts that are not literally in the string, like \0, \n, etc */ .resmeta { color: #c34b4b; @@ -120,7 +120,7 @@ table.resource tr.subheader background-color: #f3dcdc; } -/* rows are different (in resource comparision mode) */ +/* rows are different (in resource comparison mode) */ table.resource tr.diff { background-color: #e3acac;

1 0

Francois Gouget : testbot: Fix a typo in an error message.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: 1a4018f612a45d4cc4a0702b984807faa1931a99 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1a4018f612a45d4cc4a0702b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 08:05:16 2016 +0100 testbot: Fix a typo in an error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index f36e74a..d410949 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -327,7 +327,7 @@ $Script .= " >>Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) { - FatalTAError($TA, "Coud not send the build script to the VM"); + FatalTAError($TA, "Could not send the build script to the VM"); } Debug(Elapsed($Start), " Starting the script\n");

1 0

Francois Gouget : testbot/testagentd: Mark a couple of variables static.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: 8cd87a57d5c82b39c9f64031bbb19b05d0d728ec URL: http://source.winehq.org/git/tools.git/?a=commit;h=8cd87a57d5c82b39c9f64031… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 07:58:26 2016 +0100 testbot/testagentd: Mark a couple of variables static. They are not used outside testagentd.c. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/testagentd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index e776cc7..bc3d32b 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -44,8 +44,8 @@ #define BLOCK_SIZE 65536 static char** server_argv; -const char *name0; -int opt_debug = 0; +static const char *name0; +static int opt_debug = 0; /*

1 0

Francois Gouget : testbot/testagentd: Disable buffering on stderr on Windows.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: 5ad327f290b87ec750ecd4ccdf7edb7a46af1866 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5ad327f290b87ec750ecd4cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 07:58:47 2016 +0100 testbot/testagentd: Disable buffering on stderr on Windows. This reduces the risk of losing part of the log in case testagentd or Windows crashes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 8e00f09..c72cf25 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -468,5 +468,11 @@ int platform_init(void) hdll = GetModuleHandle("ws2_32"); pgetaddrinfo = (void*)GetProcAddress(hdll, "getaddrinfo"); pfreeaddrinfo = (void*)GetProcAddress(hdll, "freeaddrinfo"); + + /* By default stderr is fully buffered and Windows does not support + * line buffering. So disable buffering altogether. + */ + setvbuf(stderr, NULL, _IONBF, 0); + return 1; }

1 0

Francois Gouget : testbot: A spelling and a case fix in the documentation.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: tools Branch: master Commit: 6c6f0c71d76b5ce565910ae229012a968888d5ae URL: http://source.winehq.org/git/tools.git/?a=commit;h=6c6f0c71d76b5ce565910ae2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 19 08:04:47 2016 +0100 testbot: A spelling and a case fix in the documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 2 +- testbot/lib/WineTestBot/Engine/Notify.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index b7b388f..07919a3 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -23,7 +23,7 @@ Apache setup: - If you want to enable SSL, make sure you have your certificate set up. If you don't want SSL, edit lib/WineTestBot/Config.pm and set UseSSL to "!1". -- On OpenSUSE, I had to add "perl" to APACHE_MODULES in +- On openSUSE, I had to add "perl" to APACHE_MODULES in /etc/sysconfig/apache2. - On Debian you may have to install libapache2-mod-perl2 and create a perl.load symbolic link in /etc/apache2/mods-enabled. diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 3063e99..eba1cb3 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -20,7 +20,7 @@ use strict; =head1 NAME -WineTestBot::Engine::Notify - Engine notifcation +WineTestBot::Engine::Notify - Engine notification =cut

1 0

Julian Rüger : German translation for release 2.0-rc1
by Jeremy Newman Dec. 19, 2016

Dec. 19, 2016

Module: website Branch: master Commit: 4143894d2330eabb2c57d16bf6b6eb3a383fbb54 URL: http://source.winehq.org/git/website.git/?a=commit;h=4143894d2330eabb2c57d1… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 16 14:36:28 2016 +0100 German translation for release 2.0-rc1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016120901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2016120901.xml b/news/de/2016120901.xml new file mode 100644 index 0000000..0dc4a63 --- /dev/null +++ b/news/de/2016120901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. Dezember 2016</date> +<title>Wine 2.0-rc1 freigegeben</title> +<body> + Die Entwicklungsversion 2.0-rc1 von Wine ist jetzt verfügbar. + Dies ist der erste Release Candidate der bevorstehenden stabilen Version Wine 2.0. Hiermit beginnt der Code-freeze. Bitte helfen Sie uns, dieses Release ausführlich zu testen, um 2.0 so gut wie möglich zu machen. + <a href="{$root}/announce/2.0-rc1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Fehlerkorrektur-Update der Mono-Engine.</li> + <li>Unterstützung von IDN-Namensauflösung.</li> + <li>Viele weitere Shader-Model-5-Operationen.</li> + <li>Weitere Korrekturen in den Regressionstests.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 2.0-rc2
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: website Branch: master Commit: ceb8bb0e99318688c9437452d491aed9e2ab8e14 URL: http://source.winehq.org/git/website.git/?a=commit;h=ceb8bb0e99318688c94374… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 21:01:30 2016 +0100 Wine release 2.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016121601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2016121601.xml b/news/en/2016121601.xml new file mode 100644 index 0000000..f06b742 --- /dev/null +++ b/news/en/2016121601.xml @@ -0,0 +1,12 @@ +<news> +<date>December 16, 2016</date> +<title>Wine 2.0-rc2 Released</title> +<body> + The Wine development release 2.0-rc2 is now available. + <a href="{$root}/announce/2.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Andrey Gusev : hlink: Add missing parameter to TRACE() message.
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: 47099023ba1f1fce3ff9a6231cc0f6693d99c329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47099023ba1f1fce3ff9a6231… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 12 13:15:42 2016 +0200 hlink: Add missing parameter to TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index dc965c2..e54a392 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -521,7 +521,7 @@ static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, { CFImpl *This = impl_from_IClassFactory(iface); - TRACE("(%p)->(%s)\n",This,debugstr_guid(riid)); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObj); *ppvObj = NULL;

1 0

Tag wine-2.0-rc2 : Alexandre Julliard : Release 2.0-rc2
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: refs/tags/wine-2.0-rc2 Tag: eeff72ee136303b79dec92402b9c011853ba4e7c URL: http://source.winehq.org/git/wine.git/?a=tag;h=eeff72ee136303b79dec92402b9c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 20:59:37 2016 +0100 Release 2.0-rc2

1 0

Alexandre Julliard : Release 2.0-rc2.
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: 56040acaa3f584150b3ab7fc644cd1a81e34fece URL: http://source.winehq.org/git/wine.git/?a=commit;h=56040acaa3f584150b3ab7fc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 20:59:36 2016 +0100 Release 2.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 431 ++++++++++++++------------------------------------------------ VERSION | 2 +- configure | 18 +-- 3 files changed, 107 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56040acaa3f584150b3ab…

1 0

Nikolay Sivov : scrrun: Remove unreachable code (Coverity).
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: d806a4773bfd896642194c1625adce1833cef6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d806a4773bfd896642194c162… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 08:13:50 2016 +0300 scrrun: Remove unreachable code (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/scrrun.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 42b62b6..5a0513f 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -200,10 +200,6 @@ static HRESULT WINAPI provideclassinfo_QueryInterface(IProvideClassInfo *iface, } else return IUnknown_QueryInterface(This->outer, riid, obj); - - *obj = NULL; - WARN("interface %s not supported\n", debugstr_guid(riid)); - return E_NOINTERFACE; } static ULONG WINAPI provideclassinfo_AddRef(IProvideClassInfo *iface)

1 0

Nikolay Sivov : secur32: Trace flags in hex in InitializeSecurityContextW( ).
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: 754013a84ad499d3559712bd8af1972b4d9fc024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=754013a84ad499d3559712bd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 10 23:21:20 2016 +0300 secur32: Trace flags in hex in InitializeSecurityContextW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index dabd90f..06a3674 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -315,7 +315,7 @@ SECURITY_STATUS WINAPI InitializeSecurityContextW( PCredHandle cred = NULL; PCredHandle ctxt = NULL; - TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);

1 0

Hugh McMaster : appwiz.cpl: Remove list entries left over from an earlier uninstall.
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: 537768b67520408d97ab032cd4bcc6c6d39105b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537768b67520408d97ab032cd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 16 12:20:40 2016 +0000 appwiz.cpl: Remove list entries left over from an earlier uninstall. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 9d53e79..dd84827 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -298,7 +298,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } /* registry key */ - info->regroot = root; + RegOpenKeyExW(root, NULL, 0, KEY_READ, &info->regroot); lstrcpyW(info->regkey, subKeyName); info->path = command; @@ -497,7 +497,6 @@ static void UninstallProgram(int id, DWORD button) PROCESS_INFORMATION info; WCHAR errormsg[MAX_STRING_LEN]; WCHAR sUninstallFailed[MAX_STRING_LEN]; - HKEY hkey; BOOL res; LoadStringW(hInst, IDS_UNINSTALL_FAILED, sUninstallFailed, @@ -533,9 +532,8 @@ static void UninstallProgram(int id, DWORD button) MB_ICONQUESTION) == IDYES) { /* delete the application's uninstall entry */ - RegOpenKeyExW(iter->regroot, PathUninstallW, 0, KEY_READ, &hkey); - RegDeleteKeyW(hkey, iter->regkey); - RegCloseKey(hkey); + RegDeleteKeyW(iter->regroot, iter->regkey); + RegCloseKey(iter->regroot); } }

1 0

Alexandre Julliard : ntdll: Check for invalid WINEARCH values.
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: df3b7958a731378d2a156d363bd9af36b34a9ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3b7958a731378d2a156d363… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 15:20:18 2016 +0100 ntdll: Check for invalid WINEARCH values. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 59b9ab9..ec517fc 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1375,7 +1375,15 @@ void server_init_process(void) fatal_perror( "Bad server socket %d", fd_socket ); unsetenv( "WINESERVERSOCKET" ); } - else fd_socket = server_connect(); + else + { + const char *arch = getenv( "WINEARCH" ); + + if (arch && strcmp( arch, "win32" ) && strcmp( arch, "win64" )) + fatal_error( "WINEARCH set to invalid value '%s', it must be either win32 or win64.\n", arch ); + + fd_socket = server_connect(); + } /* setup the signal mask */ sigemptyset( &server_block_set );

1 0

Józef Kucia : d3d11/tests: Improve trace() message about compute shader support via SM4.
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: c67a728c919cf956f2503df5ba49159e2e06c2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67a728c919cf956f2503df5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 15 13:45:09 2016 +0100 d3d11/tests: Improve trace() message about compute shader support via 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/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0edb5dc..98aaa4a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10054,7 +10054,7 @@ static void test_check_feature_support(void) hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &hwopts, sizeof(hwopts)); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - trace("Shader support %#x.\n", hwopts.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x); + trace("Compute shader support via SM4 %#x.\n", hwopts.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x); refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : wined3d: Remove depth/ stencil format flags from typeless formats.
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: f752c09791170f33acfa3929a716f1c6ec7f0d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f752c09791170f33acfa3929a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 15 13:45:05 2016 +0100 wined3d: Remove depth/stencil format flags from typeless formats. We have separate formats for depth/stencil typeless formats. This fixes blits for R32_TYPELESS and R16_TYPELESS formats. 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/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 623a462..0c79f90 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3443,7 +3443,10 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) typeless_ds_format->id = typeless_depth_stencil_formats[i].typeless_id; copy_format(typeless_ds_format, ds_format); for (j = 0; j < ARRAY_SIZE(typeless_ds_format->flags); ++j) + { typeless_ds_format->flags[j] = typeless_format->flags[j]; + typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + } if ((format_id = typeless_depth_stencil_formats[i].depth_view_id)) {

1 0

Józef Kucia : d3d11/tests: Use single typeless RT with multiple RTVs in test_uav_load().
by Alexandre Julliard Dec. 16, 2016

Dec. 16, 2016

Module: wine Branch: master Commit: 5d9711da77a96b4eabb570e979b2a1473e8de71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9711da77a96b4eabb570e97… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 15 13:45:06 2016 +0100 d3d11/tests: Use single typeless RT with multiple RTVs in test_uav_load(). 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 | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a55c074..0edb5dc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11754,18 +11754,17 @@ static void test_uav_load(void) D3D11_SUBRESOURCE_DATA data[3]; }; - /* FIXME: Use a single R32_TYPELESS RT with multiple RTVs. */ ID3D11RenderTargetView *rtv_float, *rtv_uint, *rtv_sint; - ID3D11Texture2D *rt_float, *rt_uint, *rt_sint; D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; struct d3d11_test_context test_context; const struct texture *current_texture; + ID3D11Texture2D *texture, *rt_texture; D3D11_TEXTURE2D_DESC texture_desc; const struct shader *current_ps; ID3D11UnorderedAccessView *uav; ID3D11DeviceContext *context; struct resource_readback rb; - ID3D11Texture2D *texture; ID3D11PixelShader *ps; ID3D11Device *device; unsigned int i, x, y; @@ -11973,29 +11972,29 @@ static void test_uav_load(void) texture_desc.Height = 480; texture_desc.MipLevels = 1; texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32_TYPELESS; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT; texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - - texture_desc.Format = DXGI_FORMAT_R32_FLOAT; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt_float); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt_texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_float, NULL, &rtv_float); + + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + + rtv_desc.Format = DXGI_FORMAT_R32_FLOAT; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_texture, &rtv_desc, &rtv_float); ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); - texture_desc.Format = DXGI_FORMAT_R32_UINT; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt_uint); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_uint, NULL, &rtv_uint); + rtv_desc.Format = DXGI_FORMAT_R32_UINT; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_texture, &rtv_desc, &rtv_uint); ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); - texture_desc.Format = DXGI_FORMAT_R32_SINT; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt_sint); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_sint, NULL, &rtv_sint); + rtv_desc.Format = DXGI_FORMAT_R32_SINT; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt_texture, &rtv_desc, &rtv_sint); ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; @@ -12012,7 +12011,6 @@ static void test_uav_load(void) { const struct test *test = &tests[i]; ID3D11RenderTargetView *current_rtv; - ID3D11Texture2D *current_rt; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &test->constant, 0, 0); @@ -12058,20 +12056,16 @@ static void test_uav_load(void) { case DXGI_FORMAT_R32_FLOAT: current_rtv = rtv_float; - current_rt = rt_float; break; case DXGI_FORMAT_R32_UINT: current_rtv = rtv_uint; - current_rt = rt_uint; break; case DXGI_FORMAT_R32_SINT: current_rtv = rtv_sint; - current_rt = rt_sint; break; default: trace("Unhandled format %#x.\n", uav_desc.Format); current_rtv = NULL; - current_rt = NULL; break; } @@ -12082,7 +12076,7 @@ static void test_uav_load(void) draw_quad(&test_context); - get_texture_readback(current_rt, 0, &rb); + get_texture_readback(rt_texture, 0, &rb); for (y = 0; y < 4; ++y) { for (x = 0; x < 4; ++x) @@ -12104,9 +12098,7 @@ static void test_uav_load(void) ID3D11RenderTargetView_Release(rtv_float); ID3D11RenderTargetView_Release(rtv_sint); ID3D11RenderTargetView_Release(rtv_uint); - ID3D11Texture2D_Release(rt_float); - ID3D11Texture2D_Release(rt_sint); - ID3D11Texture2D_Release(rt_uint); + ID3D11Texture2D_Release(rt_texture); release_test_context(&test_context); }

1 0

Jacek Caban : wininet: Get rid of no longer needed INTERNET_INVALID_PORT_NUMBER in get_server.
by Alexandre Julliard Dec. 15, 2016

Dec. 15, 2016

Module: wine Branch: master Commit: 725b55ded212c48670e9991cd76cbb85470262fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=725b55ded212c48670e9991cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 18:36:04 2016 +0100 wininet: Get rid of no longer needed INTERNET_INVALID_PORT_NUMBER in get_server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1dffbaa..635b7d6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -270,9 +270,6 @@ server_t *get_server(substr_t name, INTERNET_PORT port, BOOL is_https, BOOL do_c { server_t *iter, *server = NULL; - if(port == INTERNET_INVALID_PORT_NUMBER) - port = INTERNET_DEFAULT_HTTP_PORT; - EnterCriticalSection(&connection_pool_cs); LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) {

1 0

Nikolay Sivov : dwrite/tests: Run GetPanose() tests on all system fonts.
by Alexandre Julliard Dec. 15, 2016

Dec. 15, 2016

Module: wine Branch: master Commit: a7845c312eedb5889a38384e47601fc22a61da8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7845c312eedb5889a38384e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 15 06:48:58 2016 +0300 dwrite/tests: Run GetPanose() tests on all system fonts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 124 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 89 insertions(+), 35 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d5126ff..eb47a05 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5078,11 +5078,38 @@ static void test_GetGdiCompatibleMetrics(void) IDWriteFactory_Release(factory); } +static void get_expected_panose(IDWriteFont1 *font, DWRITE_PANOSE *panose) +{ + IDWriteFontFace *fontface; + const TT_OS2_V2 *tt_os2; + void *os2_context; + UINT32 size; + BOOL exists; + HRESULT hr; + + memset(panose, 0, sizeof(*panose)); + + hr = IDWriteFont1_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (tt_os2) { + memcpy(panose, &tt_os2->panose, sizeof(*panose)); + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + } + + IDWriteFontFace_Release(fontface); +} + static void test_GetPanose(void) { + IDWriteFontCollection *syscollection; IDWriteFactory *factory; IDWriteFont1 *font1; IDWriteFont *font; + UINT count, i; HRESULT hr; factory = create_factory(); @@ -5090,56 +5117,83 @@ static void test_GetPanose(void) hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void**)&font1); IDWriteFont_Release(font); - if (hr == S_OK) { + + if (FAILED(hr)) { + IDWriteFactory_Release(factory); + win_skip("GetPanose() is not supported.\n"); + return; + } + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + DWRITE_PANOSE panose, expected_panose; + IDWriteLocalizedStrings *names; IDWriteFontFace3 *fontface3; IDWriteFontFace *fontface; - DWRITE_PANOSE panose; + IDWriteFontFamily *family; + IDWriteFont1 *font1; + IDWriteFont *font; + WCHAR nameW[256]; - if (0) /* crashes on native */ - IDWriteFont1_GetPanose(font1, NULL); + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); - memset(&panose, 0, sizeof(panose)); - IDWriteFont1_GetPanose(font1, &panose); - ok(panose.familyKind == DWRITE_PANOSE_FAMILY_TEXT_DISPLAY, - "got %u\n", panose.familyKind); - ok(panose.text.serifStyle == DWRITE_PANOSE_SERIF_STYLE_NORMAL_SANS, - "got %u\n", panose.text.serifStyle); - ok(panose.text.weight == DWRITE_PANOSE_WEIGHT_MEDIUM, - "got %u\n", panose.text.weight); - ok(panose.text.proportion == DWRITE_PANOSE_PROPORTION_EVEN_WIDTH, - "got %u\n", panose.text.proportion); - ok(panose.text.contrast == DWRITE_PANOSE_CONTRAST_VERY_LOW, - "got %u\n", panose.text.contrast); - ok(panose.text.strokeVariation == DWRITE_PANOSE_STROKE_VARIATION_GRADUAL_VERTICAL, - "got %u\n", panose.text.strokeVariation); - ok(panose.text.armStyle == DWRITE_PANOSE_ARM_STYLE_STRAIGHT_ARMS_VERTICAL, - "got %u\n", panose.text.armStyle); - ok(panose.text.letterform == DWRITE_PANOSE_LETTERFORM_NORMAL_BOXED, - "got %u\n", panose.text.letterform); - ok(panose.text.midline == DWRITE_PANOSE_MIDLINE_STANDARD_TRIMMED, - "got %u\n", panose.text.midline); - ok(panose.text.xHeight == DWRITE_PANOSE_XHEIGHT_CONSTANT_LARGE, - "got %u\n", panose.text.xHeight); + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFont1_CreateFontFace(font1, &fontface); + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void **)&font1); ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void**)&fontface3); - IDWriteFontFace_Release(fontface); - if (hr == S_OK) { - DWRITE_PANOSE panose2; + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + IDWriteLocalizedStrings_Release(names); - IDWriteFontFace3_GetPanose(fontface3, &panose2); - ok(!memcmp(&panose, &panose2, sizeof(panose)), "wrong panose data\n"); + IDWriteFont1_GetPanose(font1, &panose); + get_expected_panose(font1, &expected_panose); + + ok(panose.values[0] == expected_panose.values[0], "%s: values[0] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[0], expected_panose.values[0]); + ok(panose.values[1] == expected_panose.values[1], "%s: values[1] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[1], expected_panose.values[1]); + ok(panose.values[2] == expected_panose.values[2], "%s: values[2] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[2], expected_panose.values[2]); + ok(panose.values[3] == expected_panose.values[3], "%s: values[3] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[3], expected_panose.values[3]); + ok(panose.values[4] == expected_panose.values[4], "%s: values[4] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[4], expected_panose.values[4]); + ok(panose.values[5] == expected_panose.values[5], "%s: values[5] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[5], expected_panose.values[5]); + ok(panose.values[6] == expected_panose.values[6], "%s: values[6] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[6], expected_panose.values[6]); + ok(panose.values[7] == expected_panose.values[7], "%s: values[7] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[7], expected_panose.values[7]); + ok(panose.values[8] == expected_panose.values[8], "%s: values[8] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[8], expected_panose.values[8]); + ok(panose.values[9] == expected_panose.values[9], "%s: values[9] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + panose.values[9], expected_panose.values[9]); + hr = IDWriteFont1_CreateFontFace(font1, &fontface); + ok(hr == S_OK, "Failed to create a font face, %#x.\n", hr); + if (IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void **)&fontface3) == S_OK) { + ok(!memcmp(&panose, &expected_panose, sizeof(panose)), "%s: Unexpected panose from font face.\n", + wine_dbgstr_w(nameW)); IDWriteFontFace3_Release(fontface3); } + IDWriteFontFace_Release(fontface); IDWriteFont1_Release(font1); + IDWriteFontFamily_Release(family); } - else - win_skip("GetPanose() is not supported.\n"); + IDWriteFontCollection_Release(syscollection); IDWriteFactory_Release(factory); }

1 0

Michael Müller : wininet: Handle INTERNET_INVALID_PORT_NUMBER in HttpOpenRequest.
by Alexandre Julliard Dec. 15, 2016

Dec. 15, 2016

Module: wine Branch: master Commit: 0d22e43f8c12fb6df92af2e05ac35cbdf1c3fe3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d22e43f8c12fb6df92af2e05… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Dec 15 18:35:53 2016 +0100 wininet: Handle INTERNET_INVALID_PORT_NUMBER in HttpOpenRequest. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 9 +++++++-- dlls/wininet/tests/http.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 658342b..1dffbaa 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3359,7 +3359,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { appinfo_t *hIC = session->appInfo; http_request_t *request; - DWORD len; + DWORD port, len; TRACE("-->\n"); @@ -3388,7 +3388,12 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); - request->server = get_server(substrz(session->hostName), session->hostPort, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); + port = session->hostPort; + if (port == INTERNET_INVALID_PORT_NUMBER) + port = (session->hdr.dwFlags & INTERNET_FLAG_SECURE) ? + INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + + request->server = get_server(substrz(session->hostName), port, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9cda9c5..fb64e3c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6212,13 +6212,13 @@ static void test_default_service_port(void) ok(request != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(request, NULL, 0, NULL, 0); - todo_wine ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = sizeof(buffer); memset(buffer, 0, sizeof(buffer)); ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "test.winehq.org"), "Expected test.winehg.org, got '%s'\n", buffer); + ok(!strcmp(buffer, "test.winehq.org"), "Expected test.winehg.org, got '%s'\n", buffer); InternetCloseHandle(request); InternetCloseHandle(connect); @@ -6237,7 +6237,7 @@ static void test_default_service_port(void) memset(buffer, 0, sizeof(buffer)); ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); + ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); InternetCloseHandle(request); InternetCloseHandle(connect);

1 0

Fabian Maurer : shlwapi: Changed UrlEscapeW error paths and add tests.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 101edb1f6dd96849de92f98297d450064b3cc0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101edb1f6dd96849de92f9829… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Dec 14 16:47:51 2016 +0100 shlwapi: Changed UrlEscapeW error paths and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/shlwapi/url.c | 2 +- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index f9fc79a..f1c0965 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -930,12 +930,14 @@ static void test_UrlEscapeA(void) static void test_UrlEscapeW(void) { + static const WCHAR path_test[] = {'/','t','e','s','t',0}; static const WCHAR naW[] = {'f','t','p',31,255,250,0x2122,'e','n','d','/',0}; static const WCHAR naescapedW[] = {'f','t','p','%','1','F','%','F','F','%','F','A',0x2122,'e','n','d','/',0}; static const WCHAR out[] = {'f','o','o','%','2','0','b','a','r',0}; WCHAR overwrite[] = {'f','o','o',' ','b','a','r',0,0,0}; WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; - DWORD size = 0; + WCHAR empty_string[] = {0}; + DWORD size; HRESULT ret; WCHAR wc; int i; @@ -945,6 +947,42 @@ static void test_UrlEscapeW(void) return; } + /* Check error paths */ + + ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 0; + ret = UrlEscapeW(path_test, NULL, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 0, "got %d, expected %d\n", size, 0); + + ret = UrlEscapeW(path_test, empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 0; + ret = UrlEscapeW(path_test, empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 0, "got %d, expected %d\n", size, 0); + + ret = UrlEscapeW(path_test, NULL, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 1; + ret = UrlEscapeW(path_test, NULL, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + ok(size == 1, "got %d, expected %d\n", size, 1); + + ret = UrlEscapeW(path_test, empty_string, NULL, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_INVALIDARG, "got %x, expected %x\n", ret, E_INVALIDARG); + + size = 1; + ret = UrlEscapeW(path_test, empty_string, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); + ok(size == 6, "got %d, expected %d\n", size, 6); + + /* Check actual escaping */ + size = sizeof(overwrite)/sizeof(WCHAR); ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == S_OK, "got %x, expected S_OK\n", ret); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 2caf998..89d5a5d 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1089,7 +1089,7 @@ HRESULT WINAPI UrlEscapeW( TRACE("(%p(%s) %p %p 0x%08x)\n", pszUrl, debugstr_w(pszUrl), pszEscaped, pcchEscaped, dwFlags); - if(!pszUrl || !pcchEscaped) + if(!pszUrl || !pcchEscaped || !pszEscaped || *pcchEscaped == 0) return E_INVALIDARG; if(dwFlags & ~(URL_ESCAPE_SPACES_ONLY |

1 0

Aric Stewart : ime: Do not send WM_IME_ENDCOMPOSITION on CPS_COMPLETE if there is no composition.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 333c5bd9dd314b1ce68a1518e85ceb80a3e9abd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333c5bd9dd314b1ce68a1518e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 12:30:23 2016 -0600 ime: Do not send WM_IME_ENDCOMPOSITION on CPS_COMPLETE if there is no composition. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 7 +++++-- dlls/winex11.drv/ime.c | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 7681e8e..846f9bd 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -839,6 +839,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) cpstr = (LPWSTR)&cdata[cs->dwCompStrOffset]; ImmUnlockIMCC(lpIMC->hCompStr); } + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (cplen > 0) { WCHAR param = cpstr[0]; @@ -855,11 +856,13 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, param, GCS_RESULTSTR | GCS_RESULTCLAUSE); + + GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); } + else if (myPrivate->bInComposition) + GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); - GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); - myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 06576dd..0f4d2b2 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -763,6 +763,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]); ImmUnlockIMCC(lpIMC->hCompStr); } + myPrivate = ImmLockIMCC(lpIMC->hPrivate); if (cplen > 0) { WCHAR param = cpstr[0]; @@ -779,11 +780,12 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, param, GCS_RESULTSTR|GCS_RESULTCLAUSE); - } - GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0); + GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0); + } + else if (myPrivate->bInComposition) + GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION, 0, 0); - myPrivate = ImmLockIMCC(lpIMC->hPrivate); myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate);

1 0

Bruno Jesus : xinput1_3/tests: Add interactive tests.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 6b88529b3c414fa62763f3240fa967ada82f103b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b88529b3c414fa62763f3240… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 13 23:21:59 2016 -0200 xinput1_3/tests: Add interactive tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 0deab26..87f9929 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -96,8 +96,7 @@ static void test_get_state(void) XINPUT_STATE state; XINPUT_STATE_EX state_ex; } xinput; - DWORD controllerNum, i; - DWORD result; + DWORD controllerNum, i, result, good = XUSER_MAX_COUNT; for (i = 0; i < (pXInputGetStateEx ? 2 : 1); i++) { @@ -120,7 +119,10 @@ static void test_get_state(void) trace("-- Results for controller %d --\n", controllerNum); if (i == 0) + { + good = controllerNum; trace("XInputGetState: %d\n", result); + } else trace("XInputGetStateEx: %d\n", result); trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); @@ -141,6 +143,28 @@ static void test_get_state(void) result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &xinput.state_ex); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); } + + if (winetest_interactive && good < XUSER_MAX_COUNT) + { + DWORD now = GetTickCount(), packet = 0; + XINPUT_GAMEPAD *game = &xinput.state.Gamepad; + + trace("You have 20 seconds to test the joystick freely\n"); + do + { + Sleep(100); + pXInputGetState(good, &xinput.state); + if (xinput.state.dwPacketNumber == packet) + continue; + + packet = xinput.state.dwPacketNumber; + trace("Buttons 0x%04X Triggers %3d/%3d LT %6d/%6d RT %6d/%6d\n", + game->wButtons, game->bLeftTrigger, game->bRightTrigger, + game->sThumbLX, game->sThumbLY, game->sThumbRX, game->sThumbRY); + } + while(GetTickCount() - now < 20000); + trace("Test over...\n"); + } } static void test_get_keystroke(void)

1 0

Józef Kucia : d3d9/tests: Add test showing WM_SIZE is not sent during fullscreen mode change.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 37daa3573760c7f4564830c4bfc808095c150357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37daa3573760c7f4564830c4b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 13 13:10:37 2016 +0100 d3d9/tests: Add test showing WM_SIZE is not sent during fullscreen mode change. 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/d3d9/tests/device.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 87dd9e7..cadd461 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3367,7 +3367,7 @@ struct message static const struct message *expect_messages; static HWND device_window, focus_window; -static LONG windowposchanged_received, syscommand_received; +static LONG windowposchanged_received, syscommand_received, wm_size_received; struct wndproc_thread_param { @@ -3423,6 +3423,8 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM InterlockedIncrement(&windowposchanged_received); else if (message == WM_SYSCOMMAND) InterlockedIncrement(&syscommand_received); + else if (message == WM_SIZE) + InterlockedIncrement(&wm_size_received); return DefWindowProcA(hwnd, message, wparam, lparam); } @@ -4224,11 +4226,14 @@ done: static void test_reset_fullscreen(void) { + struct device_desc device_desc; + D3DDISPLAYMODE d3ddm, d3ddm2; + unsigned int mode_count, i; + IDirect3DDevice9 *device; WNDCLASSEXA wc = {0}; - IDirect3DDevice9 *device = NULL; IDirect3D9 *d3d; + HRESULT hr; ATOM atom; - struct device_desc device_desc; static const struct message messages[] = { /* Windows usually sends wparam = TRUE, except on the testbot, @@ -4279,6 +4284,34 @@ static void test_reset_fullscreen(void) ok(expect_messages->message == 0, "Expected to receive message %#x.\n", expect_messages->message); expect_messages = NULL; + IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &d3ddm); + mode_count = IDirect3D9_GetAdapterModeCount(d3d, D3DADAPTER_DEFAULT, d3ddm.Format); + for (i = 0; i < mode_count; ++i) + { + hr = IDirect3D9_EnumAdapterModes(d3d, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); + + if (d3ddm2.Width != d3ddm.Width || d3ddm2.Height != d3ddm.Height) + break; + } + if (i == mode_count) + { + skip("Could not find a suitable display mode.\n"); + goto cleanup; + } + + wm_size_received = 0; + + /* Fullscreen mode change. */ + device_desc.width = d3ddm2.Width; + device_desc.height = d3ddm2.Height; + device_desc.device_window = device_window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + ok(SUCCEEDED(reset_device(device, &device_desc)), "Failed to reset device.\n"); + + flush_events(); + todo_wine ok(!wm_size_received, "Received unexpected WM_SIZE message.\n"); + cleanup: if (device) IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

Nikolay Sivov : shell32: Don't access uninitialized buffer (Coverity).
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 3c6cbc2f910ae1ee905e385ea06bb537cc3d901d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6cbc2f910ae1ee905e385ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 14 22:16:11 2016 +0300 shell32: Don't access uninitialized buffer (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 1fa5f23..9230623 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4735,6 +4735,7 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t hr = E_INVALIDARG; break; case CSIDL_Type_NonExistent: + *tempW = 0; hr = S_FALSE; break; case CSIDL_Type_WindowsPath: @@ -4785,15 +4786,19 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t break; } + if (FAILED(hr)) + goto failed; + /* Expand environment strings if necessary */ if (*tempW == '%') + { hr = _SHExpandEnvironmentStrings(tempW, pathW); + if (FAILED(hr)) + goto failed; + } else strcpyW(pathW, tempW); - if (FAILED(hr)) - goto failed; - /* if we don't care about existing directories we are ready */ if (flags & KF_FLAG_DONT_VERIFY) goto done;

1 0

Fabian Maurer : wininet: Changed usage of UrlEscapeW to fit winapi behavior.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 8c39694882537b86d5b54771c7e10f79c0ee58f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c39694882537b86d5b54771c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Dec 14 16:47:50 2016 +0100 wininet: Changed usage of UrlEscapeW to fit winapi behavior. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b3c8e66..658342b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4189,12 +4189,13 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) request->path = NULL; if (*path) { - DWORD needed = 0; + DWORD needed = 1; HRESULT rc; + WCHAR dummy = 0; - rc = UrlEscapeW(path, NULL, &needed, URL_ESCAPE_SPACES_ONLY); - if (rc == E_POINTER) - needed = strlenW(path)+1; + rc = UrlEscapeW(path, &dummy, &needed, URL_ESCAPE_SPACES_ONLY); + if (rc != E_POINTER) + ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, URL_ESCAPE_SPACES_ONLY);

1 0

Józef Kucia : wined3d: Filter messages for fullscreen mode changes.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: e2e0c747a82bd9f8c095366b4457dda5a0cbc1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e0c747a82bd9f8c095366b4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 13 13:10:38 2016 +0100 wined3d: Filter messages for fullscreen mode changes. This fixes a regression introduced by commit d9f8cba50f4c2fc9f138d35c73ba5afc30d15866. 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/d3d9/tests/device.c | 2 +- dlls/wined3d/swapchain.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cadd461..7513df6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4310,7 +4310,7 @@ static void test_reset_fullscreen(void) ok(SUCCEEDED(reset_device(device, &device_desc)), "Failed to reset device.\n"); flush_events(); - todo_wine ok(!wm_size_received, "Received unexpected WM_SIZE message.\n"); + ok(!wm_size_received, "Received unexpected WM_SIZE message.\n"); cleanup: if (device) IDirect3DDevice9_Release(device); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7bbcc86..06215fc 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1525,6 +1525,7 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha if (swapchain->desc.windowed) { + /* Switch from windowed to fullscreen */ HWND focus_window = device->create_parms.focus_window; if (!focus_window) focus_window = swapchain->device_window; @@ -1534,20 +1535,24 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha return hr; } - /* switch from windowed to fs */ wined3d_device_setup_fullscreen_window(device, swapchain->device_window, width, height); } else { /* Fullscreen -> fullscreen mode change */ + BOOL filter_messages = device->filter_messages; + device->filter_messages = TRUE; + MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); + + device->filter_messages = filter_messages; } swapchain->d3d_mode = actual_mode; } else if (!swapchain->desc.windowed) { - RECT *window_rect = NULL; /* Fullscreen -> windowed switch */ + RECT *window_rect = NULL; if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) window_rect = &swapchain->original_window_rect; wined3d_device_restore_fullscreen_window(device, swapchain->device_window, window_rect);

1 0

Józef Kucia : d3d10core/tests: Port test_primitive_restart() from d3d11.
by Alexandre Julliard Dec. 14, 2016

Dec. 14, 2016

Module: wine Branch: master Commit: 197966fe5f72e55372df423022f9263daf380a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=197966fe5f72e55372df42302… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 13 13:10:36 2016 +0100 d3d10core/tests: Port test_primitive_restart() from d3d11. 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 | 159 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 009442f..e3d170a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -10065,6 +10065,164 @@ static void test_sm4_ret_instruction(void) release_test_context(&test_context); } +static void test_primitive_restart(void) +{ + struct d3d10core_test_context test_context; + unsigned int stride, offset, x, y; + ID3D10Buffer *ib32, *ib16, *vb; + struct resource_readback rb; + ID3D10InputLayout *layout; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + struct vs_out + { + float4 position : SV_Position; + float4 color : color; + }; + + float4 main(vs_out input) : SV_TARGET + { + return input.color; + } +#endif + 0x43425844, 0x119e48d1, 0x468aecb3, 0x0a405be5, 0x4e203b82, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x6f6c6f63, 0xabab0072, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const DWORD vs_code[] = + { +#if 0 + struct vs_out + { + float4 position : SV_Position; + float4 color : color; + }; + + void main(float4 position : POSITION, uint vertex_id : SV_VertexID, out vs_out output) + { + output.position = position; + output.color = vertex_id < 4 ? float4(0.0, 1.0, 1.0, 1.0) : float4(1.0, 0.0, 0.0, 1.0); + } +#endif + 0x43425844, 0x2fa57573, 0xdb71c15f, 0x2641b028, 0xa8f87ccc, 0x00000001, 0x00000198, 0x00000003, + 0x0000002c, 0x00000084, 0x000000d8, 0x4e475349, 0x00000050, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000006, + 0x00000001, 0x00000001, 0x00000101, 0x49534f50, 0x4e4f4954, 0x5f565300, 0x74726556, 0x44497865, + 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x6f6c6f63, 0xabab0072, 0x52444853, 0x000000b8, + 0x00010040, 0x0000002e, 0x0300005f, 0x001010f2, 0x00000000, 0x04000060, 0x00101012, 0x00000001, + 0x00000006, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, + 0x02000068, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0700004f, + 0x00100012, 0x00000000, 0x0010100a, 0x00000001, 0x00004001, 0x00000004, 0x0f000037, 0x001020f2, + 0x00000001, 0x00100006, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"position", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const struct vec2 vertices[] = + { + {-1.00f, -1.0f}, + {-1.00f, 1.0f}, + {-0.25f, -1.0f}, + {-0.25f, 1.0f}, + { 0.25f, -1.0f}, + { 0.25f, 1.0f}, + { 1.00f, -1.0f}, + { 1.00f, 1.0f}, + }; + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + static const unsigned short indices16[] = + { + 0, 1, 2, 3, 0xffff, 4, 5, 6, 7 + }; + static const unsigned int indices32[] = + { + 0, 1, 2, 3, 0xffffffff, 4, 5, 6, 7 + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create return pixel shader, hr %#x.\n", hr); + + ib16 = create_buffer(device, D3D10_BIND_INDEX_BUFFER, sizeof(indices16), indices16); + ib32 = create_buffer(device, D3D10_BIND_INDEX_BUFFER, sizeof(indices32), indices32); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, + sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(vertices), vertices); + + ID3D10Device_VSSetShader(device, vs); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_IASetInputLayout(device, layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*vertices); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + + for (i = 0; i < 2; ++i) + { + if (!i) + ID3D10Device_IASetIndexBuffer(device, ib32, DXGI_FORMAT_R32_UINT, 0); + else + ID3D10Device_IASetIndexBuffer(device, ib16, DXGI_FORMAT_R16_UINT, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, black); + ID3D10Device_DrawIndexed(device, 9, 0, 0); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; ++x) + { + DWORD color = get_readback_color(&rb, x, y); + DWORD expected_color; + if (x < 240) + expected_color = 0xffffff00; + else if (x >= 640 - 240) + expected_color = 0xff0000ff; + else + expected_color = 0x00000000; + ok(compare_color(color, expected_color, 1), + "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n", + i, color, expected_color, x, y); + } + } + release_resource_readback(&rb); + } + + ID3D10Buffer_Release(ib16); + ID3D10Buffer_Release(ib32); + ID3D10Buffer_Release(vb); + ID3D10InputLayout_Release(layout); + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -10122,4 +10280,5 @@ START_TEST(device) test_shader_input_registers_limits(); test_stencil_separate(); test_sm4_ret_instruction(); + test_primitive_restart(); }

1 0

André Hentschel : WWN 404: Fix image width of screenshot
by Jeremy Newman Dec. 13, 2016

Dec. 13, 2016

Module: website Branch: master Commit: 2dc4c5358dbf35e22e7dfa6dd7b85cdb9f08d115 URL: http://source.winehq.org/git/website.git/?a=commit;h=2dc4c5358dbf35e22e7dfa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 13 21:19:39 2016 +0100 WWN 404: Fix image width of screenshot Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- wwn/en/wn20161212_404.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wwn/en/wn20161212_404.xml b/wwn/en/wn20161212_404.xml index 6657374..f0c7d19 100644 --- a/wwn/en/wn20161212_404.xml +++ b/wwn/en/wn20161212_404.xml @@ -110,7 +110,7 @@ Thank you all for helping make Wine 2.0 as good as we can! And finally here is a screenshot provided by Andrew showing Overwatch running on his Linux desktop: -<img border="0" src="//www.winehq.org/images/wwn404-overwatch.png"/> +<img border="0" width="100%" src="//www.winehq.org/images/wwn404-overwatch.png"/> Again, the patches necessary to run the game are not in Wine or Wine-Staging yet, and they won’t make it in for Wine 2.0. So don’t hold your breath just yet!

1 0

Hugh McMaster : kernel32: Use Emacs keymap mode immediately after wineconsole configuration change.
by Alexandre Julliard Dec. 13, 2016

Dec. 13, 2016

Module: wine Branch: master Commit: 6a3ffc4f3fa4c3b11658dce4a941e9ffcbf34317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3ffc4f3fa4c3b11658dce4a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 13 11:09:23 2016 +0000 kernel32: Use Emacs keymap mode immediately after wineconsole configuration change. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index e685e1e..415f28e 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -985,6 +985,8 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } } + CONSOLE_GetEditionMode(hConsoleIn, &use_emacs); + GetConsoleMode(hConsoleIn, &mode); if (input_mode != mode) {

1 0

Nikolay Sivov : comctl32/tests: Trackbar test to show that thumb is updated on TBM_SETTICFREQ.
by Alexandre Julliard Dec. 13, 2016

Dec. 13, 2016

Module: wine Branch: master Commit: 458ddd59b247a52fc4463a1a8b90d4744f154142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458ddd59b247a52fc4463a1a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 12 22:03:20 2016 +0300 comctl32/tests: Trackbar test to show that thumb is updated on TBM_SETTICFREQ. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 47 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 28af8c5..a6f1462 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -890,7 +890,7 @@ static void test_thumb_length(void) static void test_tic_settings(void) { HWND hWndTrackbar; - int r; + int r, i; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); @@ -955,6 +955,51 @@ static void test_tic_settings(void) SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); r = SendMessageA(hWndTrackbar, TBM_GETNUMTICS, 0, 0); expect(3, r); + + DestroyWindow(hWndTrackbar); + + /* Test to show that TBM_SETTICFREQ updates thumb */ + for (i = 0; i < 2; i++) + { + DWORD style = i ? defaultstyle : defaultstyle & ~TBS_AUTOTICKS; + RECT rect, rect1; + WNDPROC oldproc; + + hWndTrackbar = create_trackbar2(style, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-100, 100)); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Old position is also 0, but thumb position will be different after range change */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Previous frequency is also 1, yet thumb is updated */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + todo_wine + ok(!EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)oldproc); + + DestroyWindow(hWndTrackbar); + } } static void test_tic_placement(void)

1 0

Hugh McMaster : kernel32: Check for a valid pointer before yanking the line.
by Alexandre Julliard Dec. 13, 2016

Dec. 13, 2016

Module: wine Branch: master Commit: 8cacba5ff942ee91124895bb10fec026556cdf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cacba5ff942ee91124895bb1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 13 12:00:03 2016 +0000 kernel32: Check for a valid pointer before yanking the line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 415f28e..6c0b8eb 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -636,7 +636,8 @@ static void WCEL_CapitalizeWord(WCEL_Context* ctx) static void WCEL_Yank(WCEL_Context* ctx) { - WCEL_InsertString(ctx, ctx->yanked); + if (ctx->yanked) + WCEL_InsertString(ctx, ctx->yanked); } static void WCEL_KillToEndOfLine(WCEL_Context* ctx)

1 0

Hans Leidekker : winhttp: Handle EINTR from connect and poll.
by Alexandre Julliard Dec. 13, 2016

Dec. 13, 2016

Module: wine Branch: master Commit: ec353945708de5569484a68509c89232556ab2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec353945708de5569484a6850… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 10:33:35 2016 +0100 winhttp: Handle EINTR from connect and poll. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 7213dd9..1cabec0 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -353,7 +353,7 @@ BOOL netconn_close( netconn_t *conn ) BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len, int timeout ) { BOOL ret = FALSE; - int res = 0; + int res; ULONG state; if (timeout > 0) @@ -361,23 +361,42 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned state = 1; ioctlsocket( conn->socket, FIONBIO, &state ); } - if (connect( conn->socket, sockaddr, addr_len ) < 0) + + for (;;) { - res = sock_get_error( errno ); - if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) + res = 0; + if (connect( conn->socket, sockaddr, addr_len ) < 0) { - struct pollfd pfd; - - pfd.fd = conn->socket; - pfd.events = POLLOUT; - if (poll( &pfd, 1, timeout ) > 0) - ret = TRUE; - else - res = sock_get_error( errno ); + res = sock_get_error( errno ); + if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) + { + struct pollfd pfd; + + pfd.fd = conn->socket; + pfd.events = POLLOUT; + for (;;) + { + res = 0; + if (poll( &pfd, 1, timeout ) > 0) + { + ret = TRUE; + break; + } + else + { + res = sock_get_error( errno ); + if (res != WSAEINTR) break; + } + } + } + if (res != WSAEINTR) break; + } + else + { + ret = TRUE; + break; } } - else - ret = TRUE; if (timeout > 0) { state = 0;

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb unconditionally on TBM_SETTICFREQ.
by Alexandre Julliard Dec. 13, 2016

Dec. 13, 2016

Module: wine Branch: master Commit: a6aabe0159b6c38664380718b57418618e305704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6aabe0159b6c38664380718b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 12 22:03:21 2016 +0300 comctl32/trackbar: Update thumb unconditionally on TBM_SETTICFREQ. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 1 - dlls/comctl32/trackbar.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index a6f1462..b236cc3 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -992,7 +992,6 @@ static void test_tic_settings(void) SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); - todo_wine ok(!EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 5ce32e4..c6757a5 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1429,6 +1429,7 @@ TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq) TRACKBAR_InvalidateAll(infoPtr); } + TRACKBAR_UpdateThumb (infoPtr); return 0; }

1 0

Józef Kucia : wined3d: Recognize SM5 atomic_imin opcode.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: 5e4e2a1535885c447d081d81ceb4b620e73ecb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4e2a1535885c447d081d81c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:53 2016 +0100 wined3d: Recognize SM5 atomic_imin opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cab03b9..210b2f9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5206,6 +5206,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_ATOMIC_IMIN */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1f9f5dd..a8d208e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8930,6 +8930,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_ATOMIC_IMIN */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3c11fea..5e9b0de 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -47,6 +47,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_IMAX */ "atomic_imax", + /* WINED3DSIH_ATOMIC_IMIN */ "atomic_imin", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax", /* WINED3DSIH_ATOMIC_UMIN */ "atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 1fffbc7..66c33b3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -265,6 +265,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_ATOMIC_IMAX = 0xae, + WINED3D_SM5_OP_ATOMIC_IMIN = 0xaf, WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0, WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, @@ -972,6 +973,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE, "U", "iuu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_IMAX, WINED3DSIH_ATOMIC_IMAX, "U", "ii"}, + {WINED3D_SM5_OP_ATOMIC_IMIN, WINED3DSIH_ATOMIC_IMIN, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6597300..35e60c6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -578,6 +578,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_IMAX, + WINED3DSIH_ATOMIC_IMIN, WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMIN,

1 0

Józef Kucia : wined3d: Recognize SM5 vCoverage input registers.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: c6b2977e69e591df249cc7c211e4422b912c1953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b2977e69e591df249cc7c21… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:50 2016 +0100 wined3d: Recognize SM5 vCoverage input registers. 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 | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 24051cc..e5b969c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1931,6 +1931,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "fp"); break; + case WINED3DSPR_COVERAGE: + shader_addline(buffer, "vCoverage"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4a4926b..4ed2391 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -306,6 +306,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_THREAD_ID = 0x20, WINED3D_SM5_RT_THREAD_GROUP_ID = 0x21, WINED3D_SM5_RT_LOCAL_THREAD_ID = 0x22, + WINED3D_SM5_RT_COVERAGE = 0x23, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, }; @@ -1020,7 +1021,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_THREAD_ID */ WINED3DSPR_THREADID, /* WINED3D_SM5_RT_THREAD_GROUP_ID */ WINED3DSPR_THREADGROUPID, /* WINED3D_SM5_RT_LOCAL_THREAD_ID */ WINED3DSPR_LOCALTHREADID, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_COVERAGE */ WINED3DSPR_COVERAGE, /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e788f59..0be5856 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -394,6 +394,7 @@ enum wined3d_shader_register_type WINED3DSPR_STREAM, WINED3DSPR_FUNCTIONBODY, WINED3DSPR_FUNCTIONPOINTER, + WINED3DSPR_COVERAGE, }; enum wined3d_data_type

1 0

Józef Kucia : d3d11/tests: Add test for depth/ stencil shader resource views.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: 7ed0e333881d7ffa974030ba5490c9faaba317e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed0e333881d7ffa974030ba5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:49 2016 +0100 d3d11/tests: Add test for depth/stencil shader resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 349 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ed0e333881d7ffa97403…

1 0

Nikolay Sivov : dwrite: Fix a typo in assertion condition (Coverity).
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: 93829e4b2bc1a1289235817b764536df99d4d4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93829e4b2bc1a1289235817b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 08:17:17 2016 +0300 dwrite: Fix a typo in assertion condition (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ba97025..d9ddce0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1691,7 +1691,7 @@ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace { if (!iface) return NULL; - assert(iface->lpVtbl = (IDWriteFontFaceVtbl*)&dwritefontfacevtbl); + assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl); return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace4_iface); }

1 0

Nikolay Sivov : scrrun/tests: Test to query for IUnknown from IProvideClassInfo.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: 2c2b50a4ed5143fea37b3c3c572c9d09069a60df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2b50a4ed5143fea37b3c3c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 08:13:51 2016 +0300 scrrun/tests: Test to query for IUnknown from IProvideClassInfo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/dictionary.c | 6 ++++++ dlls/scrrun/tests/filesystem.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 78922b7..658dd66 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -36,6 +36,7 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) IProvideClassInfo *classinfo; TYPEATTR *attr; ITypeInfo *ti; + IUnknown *unk; HRESULT hr; hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); @@ -50,6 +51,11 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), wine_dbgstr_guid(guid)); + hr = IProvideClassInfo_QueryInterface(classinfo, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to QI for IUnknown.\n"); + ok(unk == (IUnknown *)disp, "Got unk %p, original %p\n", unk, disp); + IUnknown_Release(unk); + IProvideClassInfo_Release(classinfo); ITypeInfo_ReleaseTypeAttr(ti, attr); ITypeInfo_Release(ti); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5516099..57aacf6 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -106,6 +106,7 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) IProvideClassInfo *classinfo; TYPEATTR *attr; ITypeInfo *ti; + IUnknown *unk; HRESULT hr; hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); @@ -120,6 +121,11 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), wine_dbgstr_guid(guid)); + hr = IProvideClassInfo_QueryInterface(classinfo, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to QI for IUnknown.\n"); + ok(unk == (IUnknown *)disp, "Got unk %p, original %p.\n", unk, disp); + IUnknown_Release(unk); + IProvideClassInfo_Release(classinfo); ITypeInfo_ReleaseTypeAttr(ti, attr); ITypeInfo_Release(ti);

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: cd8c09b3e359b9f05bb19ca508d7d409f7263310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8c09b3e359b9f05bb19ca50… Author: Mingcong Bai <jeffbaichina(a)gmail.com> Date: Sat Dec 10 10:12:05 2016 -0600 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 586 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 326 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd8c09b3e359b9f05bb19…

1 0

Lauri Kenttä : kernel32/tests: Show flags as text in test results.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: 44c1f0cd962206f96ccb731aad206adf3a2c3f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c1f0cd962206f96ccb731aa… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Dec 9 22:04:18 2016 +0200 kernel32/tests: Show flags as text in test results. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 89 ++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44c1f0cd962206f96ccb7…

1 0

Lauri Kenttä : kernel32/tests: Test FindFirstFile with wildcards.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: f7b625754e8a6bf1be47b3fbca84e0bbe7060138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b625754e8a6bf1be47b3fbc… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Dec 9 16:09:28 2016 +0200 kernel32/tests: Test FindFirstFile with wildcards. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 70424db..9f4dd2d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2813,6 +2813,97 @@ cleanup: RemoveDirectoryA("test-dir"); } +static void test_FindFirstFile_wildcards(void) +{ + WIN32_FIND_DATAA find_data; + HANDLE handle; + int i; + static const char* files[] = { + "..a", "..a.a", ".a", ".a..a", ".a.a", ".aaa", + "a", "a..a", "a.a", "a.a.a", "aa", "aaa", "aaaa" + }; + static const struct { + int todo; + const char *pattern, *result; + } tests[] = { + {0, "*.*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*.*.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, ".*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa'"}, + {0, "*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, ".*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa'"}, + {1, "*.", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, "*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {1, "*..*", ", '.', '..', '..a', '..a.a', '.a..a', 'a..a'"}, + {1, "*..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, ".*.", ", '.', '..', '.a', '.aaa'"}, + {0, "..*", ", '.', '..', '..a', '..a.a'"}, + {0, "**", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "**.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {1, "* .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, "* . ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*.. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {1, "*. .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, " *..", ", '.aaa'"}, + {0, "..* ", ", '.', '..', '..a', '..a.a'"}, + {1, "?", ", '.', '..', 'a'"}, + {1, "?.", ", '.', '..', 'a'"}, + {1, "?. ", ", '.', '..', 'a'"}, + {1, "??.", ", '.', '..', 'a', 'aa'"}, + {1, "??. ", ", '.', '..', 'a', 'aa'"}, + {1, "???.", ", '.', '..', 'a', 'aa', 'aaa'"}, + {1, "?.??.", ", '.', '..', '.a', 'a', 'a.a'"} + }; + + CreateDirectoryA("test-dir", NULL); + SetCurrentDirectoryA("test-dir"); + for (i = 0; i < sizeof(files) / sizeof(files[0]); ++i) + _lclose(_lcreat(files[i], 0)); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + char correct[512]; + char incorrect[512]; + char missing[512]; + + strcpy(missing, tests[i].result); + correct[0] = incorrect[0] = 0; + + handle = FindFirstFileA(tests[i].pattern, &find_data); + if (handle) do { + char* ptr; + char quoted[16]; + + sprintf( quoted, ", '%.10s'", find_data.cFileName ); + + if ((ptr = strstr(missing, quoted))) + { + int len = strlen(quoted); + while ((ptr[0] = ptr[len]) != 0) + ++ptr; + strcat(correct, quoted); + } + else + strcat(incorrect, quoted); + } while (FindNextFileA(handle, &find_data)); + FindClose(handle); + + todo_wine_if (tests[i].todo) + ok(missing[0] == 0 && incorrect[0] == 0, + "FindFirstFile with '%s' found correctly %s, found incorrectly %s, and missed %s\n", + tests[i].pattern, + correct[0] ? correct+2 : "none", + incorrect[0] ? incorrect+2 : "none", + missing[0] ? missing+2 : "none"); + } + + for (i = 0; i < sizeof(files) / sizeof(files[0]); ++i) + DeleteFileA(files[i]); + SetCurrentDirectoryA(".."); + RemoveDirectoryA("test-dir"); +} + static int test_Mapfile_createtemp(HANDLE *handle) { SetFileAttributesA(filename,FILE_ATTRIBUTE_NORMAL); @@ -4741,6 +4832,7 @@ START_TEST(file) test_MoveFileW(); test_FindFirstFileA(); test_FindNextFileA(); + test_FindFirstFile_wildcards(); test_FindFirstFileExA(FindExInfoStandard, 0, 0); test_FindFirstFileExA(FindExInfoStandard, 0, FIND_FIRST_EX_CASE_SENSITIVE); test_FindFirstFileExA(FindExInfoStandard, 0, FIND_FIRST_EX_LARGE_FETCH);

1 0

Józef Kucia : wined3d: Recognize SM4.1 oMask output register.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: 0700c9e599fdfe3355f151484c4657bbb685988e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0700c9e599fdfe3355f151484… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:51 2016 +0100 wined3d: Recognize SM4.1 oMask output register. 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 | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e5b969c..feaa6b9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1935,6 +1935,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vCoverage"); break; + case WINED3DSPR_SAMPLEMASK: + shader_addline(buffer, "oMask"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4ed2391..aa6aead 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -292,6 +292,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_PRIMID = 0x0b, WINED3D_SM4_RT_DEPTHOUT = 0x0c, WINED3D_SM4_RT_NULL = 0x0d, + WINED3D_SM4_RT_OMASK = 0x0f, WINED3D_SM5_RT_STREAM = 0x10, WINED3D_SM5_RT_FUNCTION_BODY = 0x11, WINED3D_SM5_RT_FUNCTION_POINTER = 0x13, @@ -1001,7 +1002,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_OMASK */ WINED3DSPR_SAMPLEMASK, /* WINED3D_SM5_RT_STREAM */ WINED3DSPR_STREAM, /* WINED3D_SM5_RT_FUNCTION_BODY */ WINED3DSPR_FUNCTIONBODY, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0be5856..d632d42 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -395,6 +395,7 @@ enum wined3d_shader_register_type WINED3DSPR_FUNCTIONBODY, WINED3DSPR_FUNCTIONPOINTER, WINED3DSPR_COVERAGE, + WINED3DSPR_SAMPLEMASK, }; enum wined3d_data_type

1 0