January 2015 - Wine-Commits

Charles Davis : kernel32: Recognize 64-bit Mach-O modules, too.
by Alexandre Julliard Jan. 23, 2015

Jan. 23, 2015

Module: wine Branch: master Commit: 2ace215b9a9a971b08dc319529249494b2897bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ace215b9a9a971b08dc31952… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 22 23:30:55 2015 -0700 kernel32: Recognize 64-bit Mach-O modules, too. --- dlls/kernel32/module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 2a87e66..f495e81 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -289,10 +289,11 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) } } /* Mach-o File with Endian set to Big Endian or Little Endian */ - else if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe) + else if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe || + header.macho.magic == 0xfeedfacf || header.macho.magic == 0xcffaedfe) { if ((header.macho.cputype >> 24) == 1) info->flags |= BINARY_FLAG_64BIT; - if (header.macho.magic == 0xcefaedfe) + if (header.macho.magic == 0xcefaedfe || header.macho.magic == 0xcffaedfe) { header.macho.filetype = RtlUlongByteSwap( header.macho.filetype ); header.macho.cputype = RtlUlongByteSwap( header.macho.cputype );

1 0

Matteo Bruni : wined3d: Use the core version of GL vertex attribute functions where possible.
by Alexandre Julliard Jan. 23, 2015

Jan. 23, 2015

Module: wine Branch: master Commit: e192939652f396292283f05034b10b6c2d13d334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e192939652f396292283f0503… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 22 17:41:42 2015 +0100 wined3d: Use the core version of GL vertex attribute functions where possible. --- dlls/wined3d/directx.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/drawprim.c | 30 +++++++++++++++--------------- dlls/wined3d/state.c | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 73 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e192939652f396292283f…

1 0

Matteo Bruni : wined3d: Properly initialize the last two components of R16G16_SINT attributes.
by Alexandre Julliard Jan. 23, 2015

Jan. 23, 2015

Module: wine Branch: master Commit: 584892b6923a8b3d772435c1982dcc9981a13603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=584892b6923a8b3d772435c19… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 22 17:41:41 2015 +0100 wined3d: Properly initialize the last two components of R16G16_SINT attributes. --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 12b03f6..4812143 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -377,7 +377,7 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, break; case WINED3DFMT_R16G16_SINT: - GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); + GL_EXTCALL(glVertexAttrib2svARB(index, ptr)); break; case WINED3DFMT_R16G16B16A16_SINT: GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3c204ca..7cac2dc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4297,7 +4297,7 @@ static void load_numbered_arrays(struct wined3d_context *context, break; case WINED3DFMT_R16G16_SINT: - GL_EXTCALL(glVertexAttrib4svARB(i, (const GLshort *)ptr)); + GL_EXTCALL(glVertexAttrib2svARB(i, (const GLshort *)ptr)); break; case WINED3DFMT_R16G16B16A16_SINT: GL_EXTCALL(glVertexAttrib4svARB(i, (const GLshort *)ptr));

1 0

Charles Davis : kernel32: Don't use %gs on 64-bit Mac OS.
by Alexandre Julliard Jan. 23, 2015

Jan. 23, 2015

Module: wine Branch: master Commit: 193d15cc3c5830c8986c028743900ab6833943a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=193d15cc3c5830c8986c02874… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 22 23:30:54 2015 -0700 kernel32: Don't use %gs on 64-bit Mac OS. --- dlls/kernel32/thread.c | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 5b9a683..0abfdf1 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -607,7 +607,7 @@ __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" /* HANDLE WINAPI GetProcessHeap(void) */ __ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x64\n\tmovl 0x30,%eax\n\tmovl 0x18(%eax),%eax\n\tret"); -#elif defined(__x86_64__) +#elif defined(__x86_64__) && !defined(__APPLE__) /*********************************************************************** * SetLastError (KERNEL32.@) diff --git a/include/winbase.h b/include/winbase.h index 5ac55b7..3055d5f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2783,7 +2783,7 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) /* A few optimizations for gcc */ -#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || defined(__x86_64__)) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) +#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || (defined(__x86_64__) && !defined(__APPLE__))) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) static FORCEINLINE DWORD WINAPI GetLastError(void) {

1 0

Michael Stefaniuc : winex11.drv: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard Jan. 23, 2015

Jan. 23, 2015

Module: wine Branch: master Commit: f256e1476c9ce9262ff252107f72782cab84f3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f256e1476c9ce9262ff252107… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 11:13:17 2015 +0100 winex11.drv: Remove an unused assignment (PVS-Studio). --- dlls/winex11.drv/xrandr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e9670c3..58e66d6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -163,7 +163,7 @@ static LONG xrandr10_set_current_mode( int mode ) root = DefaultRootWindow( gdi_display ); sc = pXRRGetScreenInfo (gdi_display, root); - size = pXRRConfigCurrentConfiguration (sc, &rot); + pXRRConfigCurrentConfiguration (sc, &rot); mode = mode % xrandr_mode_count; TRACE("Changing Resolution to %dx%d @%d Hz\n",

1 0

Matteo Bruni : wined3d: Use the core version of the shader object functions.
by Alexandre Julliard Jan. 23, 2015

Jan. 23, 2015

Module: wine Branch: master Commit: d360a51f3cb01d277b7438e5e04ce41f1228903b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d360a51f3cb01d277b7438e5e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 22 17:41:43 2015 +0100 wined3d: Use the core version of the shader object functions. --- dlls/wined3d/directx.c | 93 +++++++++- dlls/wined3d/glsl_shader.c | 454 ++++++++++++++++++++++----------------------- 2 files changed, 319 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d360a51f3cb01d277b743…

1 0

Gerald Pfeifer : makefiles: Support building with non-default LD.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: 189ffc2e7313e901822caa7f76d1fe3961e922e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189ffc2e7313e901822caa7f7… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jan 14 10:52:48 2015 +0100 makefiles: Support building with non-default LD. --- Make.vars.in | 1 + configure | 93 +++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + tools/winegcc/Makefile.in | 1 + tools/winegcc/winegcc.c | 2 + 5 files changed, 98 insertions(+) diff --git a/Make.vars.in b/Make.vars.in index ee8ee39..e825f4b 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -40,6 +40,7 @@ RANLIB = @RANLIB@ STRIP = @STRIP@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ +LD = @LD@ LDFLAGS = @LDFLAGS@ DLLFLAGS = @DLLFLAGS@ PRELINK = @PRELINK@ diff --git a/configure b/configure index 817ddd7..c0aa93e 100755 --- a/configure +++ b/configure @@ -732,6 +732,7 @@ BISON FLEX TOOLSDIR TARGETFLAGS +LD CPPBIN ac_ct_CXX CXXFLAGS @@ -4737,6 +4738,98 @@ cat >>confdefs.h <<_ACEOF #define EXEEXT "$ac_exeext" _ACEOF +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. +set dummy ${ac_tool_prefix}ld; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LD="${ac_tool_prefix}ld" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +LD=$ac_cv_prog_LD +if test -n "$LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_LD"; then + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. +set dummy ld; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LD"; then + ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LD="ld" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_LD=$ac_cv_prog_ac_ct_LD +if test -n "$ac_ct_LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LD" >&5 +$as_echo "$ac_ct_LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_LD" = x; then + LD="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LD=$ac_ct_LD + fi +else + LD="$ac_cv_prog_LD" +fi + case $host in *-darwin*) diff --git a/configure.ac b/configure.ac index df3c37b..ab8945a 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,7 @@ AC_PROG_CXX dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E AC_CHECK_TOOL(CPPBIN,cpp,cpp) AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.]) +AC_CHECK_TOOL(LD,ld) case $host in *-darwin*) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 3975ca5..370a2e4 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -16,6 +16,7 @@ winegcc_EXTRADEFS = \ -DCC="\"$(CC)\"" \ -DCPP="\"$(CPPBIN)\"" \ -DCXX="\"$(CXX)\"" \ + -DLD="\"$(LD)\"" \ -DPRELINK="\"$(PRELINK)\"" winegcc$(EXEEXT): winegcc.o utils.o diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a2f09d2..3b2794e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1034,6 +1034,8 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); + strarray_add( spec_args, strmake( "--ld-cmd=%s", build_tool_name( opts, "ld", LD ))); + spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));

1 0

Erich E. Hoover : winex11.drv: Update the check for broken nVidia RandR to test for the number of resolutions instead of the number of modes.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: 8e9e4a657f29ff018c6296ced1f115ca8731e5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9e4a657f29ff018c6296ced… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Aug 9 13:15:09 2014 -0600 winex11.drv: Update the check for broken nVidia RandR to test for the number of resolutions instead of the number of modes. --- dlls/winex11.drv/xrandr.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fc09020..e9670c3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -386,6 +386,7 @@ static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resource static int xrandr12_init_modes(void) { + unsigned int only_one_resolution = 1, mode_count; XRRScreenResources *resources; XRROutputInfo *output_info; XRRCrtcInfo *crtc_info; @@ -434,21 +435,6 @@ static int xrandr12_init_modes(void) goto done; } - /* Recent (304.64, possibly earlier) versions of the nvidia driver only - * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes - * are only listed through RandR 1.0 / 1.1. This is completely useless, - * but NVIDIA considers this a feature, so it's unlikely to change. The - * best we can do is to fall back to RandR 1.0 and encourage users to - * consider more cooperative driver vendors when we detect such a - * configuration. */ - if (output_info->nmode == 1 && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) - { - ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " - "Please consider using the Nouveau driver instead.\n"); - ret = -1; - goto done; - } - if (!(xrandr12_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr12_modes) * output_info->nmode ))) { ERR("Failed to allocate xrandr mode info array.\n"); @@ -480,6 +466,32 @@ static int xrandr12_init_modes(void) } } + mode_count = X11DRV_Settings_GetModeCount(); + for (i = 1; i < mode_count; ++i) + { + if (dd_modes[i].width != dd_modes[0].width || dd_modes[i].height != dd_modes[0].height) + { + only_one_resolution = 0; + break; + } + } + + /* Recent (304.64, possibly earlier) versions of the nvidia driver only + * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes + * are only listed through RandR 1.0 / 1.1. This is completely useless, + * but NVIDIA considers this a feature, so it's unlikely to change. The + * best we can do is to fall back to RandR 1.0 and encourage users to + * consider more cooperative driver vendors when we detect such a + * configuration. */ + if (only_one_resolution && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) + { + ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " + "Please consider using the Nouveau driver instead.\n"); + ret = -1; + HeapFree( GetProcessHeap(), 0, xrandr12_modes ); + goto done; + } + X11DRV_Settings_AddDepthModes(); ret = 0;

1 0

Qian Hong : atl100/tests: Added tests for AtlAxCreateControlEx.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: 412a070e49ae97918ae7fe4a7a9db7547acf89b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412a070e49ae97918ae7fe4a7… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 16:09:50 2015 +0800 atl100/tests: Added tests for AtlAxCreateControlEx. --- dlls/atl100/tests/atl.c | 191 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 173 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=412a070e49ae97918ae7f…

1 0

Jacek Caban : secur32/tests: Don' t call InitializeSecurityContext on an uninitialized buffer.
by Alexandre Julliard Jan. 22, 2015

Jan. 22, 2015

Module: wine Branch: master Commit: 48ea8a1cb488c3df1c7b2a249b4c03166fdcf29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ea8a1cb488c3df1c7b2a249… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 14:23:38 2015 +0100 secur32/tests: Don't call InitializeSecurityContext on an uninitialized buffer. Also documents failure on an invalid buffer. --- dlls/secur32/tests/schannel.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 97fa0bc..585ba21 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -700,6 +700,19 @@ static void test_communication(void) buffers[1].cBuffers = 1; buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; buffers[0].pBuffers[0].cbBuffer = 1; + memset(buffers[1].pBuffers[0].pvBuffer, 0xfa, buf_size); + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); +todo_wine + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); +todo_wine + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); + + buffers[1].cBuffers = 1; + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[0].pBuffers[0].cbBuffer = 1; + memset(buffers[1].pBuffers[0].pvBuffer, 0, buf_size); status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); @@ -707,6 +720,7 @@ static void test_communication(void) todo_wine ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); + buffers[0].pBuffers[0].cbBuffer = 0; status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL);

1 0