December 2016 - Wine-commits

Bruno Jesus : xinput1_3: Prefer builtin DLL.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: ecba1f4c5fcef8f0bf854064af63398462f32eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecba1f4c5fcef8f0bf854064a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Oct 29 23:13:25 2016 -0200 xinput1_3: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4b09e848b8867683007f4c90ac589b43dfdc5707) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 63f725b..d5d6147 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -35,8 +35,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break;

1 0

Matteo Bruni : wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: e8caceda7059474499420ef940928ed2abf4e9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8caceda7059474499420ef94… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 14 00:03:34 2016 +0200 wined3d: Recognize a couple of Haswell / Broadwell GPUs on macOS. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bdc3df38ed1129d6b0dd6a55446322cf64acc138) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6fe1cdb..364082d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2009,8 +2009,10 @@ cards_intel[] = /* Broadwell */ {"Iris Pro 6200", CARD_INTEL_IP6200}, {"Iris 6100", CARD_INTEL_IG6100}, + {"Iris(TM) Graphics 6100", CARD_INTEL_IG6100}, /* MacOS */ /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, + {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM},

1 0

Jacek Caban : secur32: Use %LATEST_RECORD_VERSION gnutls priority.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: stable Commit: c02915d0dde1094106783db93c84020a582d40c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02915d0dde1094106783db93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 28 12:42:05 2016 +0200 secur32: Use %LATEST_RECORD_VERSION gnutls priority. It's based on [1], where it's reported to fix issues with older gnutls. I tested what client hello packages Windows reports for different sets of used protocol versions, and it always uses newest possible version. There may be a concern about not using SSL3 client hello, which still may negotiate newer protocol and was recommended for compatibility reasons, but it's known to be problematic the other way those days and recent gnutls won't use it by default anyway [2]. [1] http://us.battle.net/wow/en/forum/topic/20742995286?page=11 [2] https://gitlab.com/gnutls/gnutls/commit/25ed2750438178ff65d555a49212dc7b5a3… Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f198b5a45a52aa0bcf79f1909c8f6dc4e56c4143) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 4f95e4d..bcadd47 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -159,7 +159,7 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - char priority[64] = "NORMAL", *p; + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT);

1 0

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

19 Dec '16

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

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

19 Dec '16

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 : rpcrt4: Added NdrAsyncServerCall stub.
by Alexandre Julliard 19 Dec '16

19 Dec '16

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

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

19 Dec '16

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 19 Dec '16

19 Dec '16

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: Spelling fixes in a few comments.
by Alexandre Julliard 19 Dec '16

19 Dec '16

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 : testbot: A spelling and a case fix in the documentation.
by Alexandre Julliard 19 Dec '16

19 Dec '16

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