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