January 2014 - Wine-Commits

Frédéric Delanoy : oleaut32/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: f4fa510ea00c350a8f0767d105295f685736d5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fa510ea00c350a8f0767d10… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:40 2014 +0100 oleaut32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/oleaut32/tests/vartype.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 035502a..8ec56c7 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -510,18 +510,6 @@ static HRESULT (WINAPI *pVarBstrCat)(BSTR,BSTR,BSTR*); static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); static void (WINAPI *pClearCustData)(LPCUSTDATA); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - /* Internal representation of a BSTR */ typedef struct tagINTERNAL_BSTR { @@ -602,7 +590,7 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, CHECK_EXPECT(dispatch_invoke); ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); - ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", debugstr_guid(riid)); + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", wine_dbgstr_guid(riid)); ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); ok(params->rgvarg == NULL, "got %p\n", params->rgvarg);

1 0

Ken Thomases : winemac: Ignore mouse capture during window drags for routing click and move events.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 70c4f43ed365c368ae83857550ff335280fe93e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c4f43ed365c368ae8385755… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 28 15:50:15 2014 -0600 winemac: Ignore mouse capture during window drags for routing click and move events. --- dlls/winemac.drv/cocoa_app.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index d499fd1..dff6977 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1857,14 +1857,14 @@ int macdrv_err_on; type == NSRightMouseDragged || type == NSOtherMouseDragged) { [self handleMouseMove:anEvent]; - ret = mouseCaptureWindow != nil; + ret = mouseCaptureWindow && ![windowsBeingDragged count]; } else if (type == NSLeftMouseDown || type == NSLeftMouseUp || type == NSRightMouseDown || type == NSRightMouseUp || type == NSOtherMouseDown || type == NSOtherMouseUp) { [self handleMouseButton:anEvent]; - ret = mouseCaptureWindow != nil; + ret = mouseCaptureWindow && ![windowsBeingDragged count]; } else if (type == NSScrollWheel) {

1 0

Vincent Povirk : gdiplus: Move metafile functions to metafile.c.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 2d487e22d6faa3f851804d5e4064206311303d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d487e22d6faa3f851804d5e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jan 28 13:42:39 2014 -0600 gdiplus: Move metafile functions to metafile.c. --- dlls/gdiplus/gdiplus_private.h | 1 - dlls/gdiplus/graphics.c | 127 -------------------- dlls/gdiplus/image.c | 132 -------------------- dlls/gdiplus/metafile.c | 259 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 259 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d487e22d6faa3f851804…

1 0

Alexandre Julliard : configure: Build makedep at configure time.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 5114deda9c9bf17636460547bcea543316ebb03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5114deda9c9bf17636460547b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 28 15:14:00 2014 +0100 configure: Build makedep at configure time. --- configure | 30 ++++++++++++++++++++---------- configure.ac | 24 +++++++++++++++++------- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 9939a69..5f8bbf5 100755 --- a/configure +++ b/configure @@ -16471,8 +16471,8 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status - @./config.status Make.tmp Makefile" +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) + @./config.status Make.tmp Makefile && \$(MAKEDEP) ." test "$srcdir" = . && wine_fn_append_rule "all: .gitignore .gitignore: config.status @@ -17296,6 +17296,13 @@ wine_fn_ignore_file "include/config.h" wine_fn_ignore_file "include/stamp-h" test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine" +if test "x$enable_tools" != xno +then + wine_fn_ignore_file "tools/makedep$ac_exeext" + ac_config_commands="$ac_config_commands tools/makedep" + +fi + ac_config_commands="$ac_config_commands Makefile" @@ -17343,12 +17350,10 @@ fi if test "x$enable_tools" != xno then - ac_config_commands="$ac_config_commands tools" - - wine_fn_ignore_file "tools/makedep$ac_exeext" - wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h - \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) -clean:: __clean__ + wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status + @./config.status tools/makedep +Makefile: tools/makedep$ac_exeext +distclean:: clean \$(RM) tools/makedep$ac_exeext" else wine_fn_append_rule "\$(MAKEDEP): @@ -18079,6 +18084,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # +wine_fn_output_makedep () +{ + as_dir=tools; as_fn_mkdir_p + $CC -Iinclude -I$srcdir/include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext $srcdir/tools/makedep.c $LDFLAGS +} wine_fn_output_makefile () { cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && return @@ -18112,9 +18122,9 @@ do "po/LINGUAS") CONFIG_LINKS="$CONFIG_LINKS po/LINGUAS:po/LINGUAS" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;; + "tools/makedep") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/makedep" ;; "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Make.vars.in:Makefile.in" ;; - "tools") CONFIG_COMMANDS="$CONFIG_COMMANDS tools" ;; ".gitignore") CONFIG_COMMANDS="$CONFIG_COMMANDS .gitignore" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -18699,8 +18709,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "include/stamp-h":C) echo timestamp > include/stamp-h ;; + "tools/makedep":C) wine_fn_output_makedep || as_fn_exit $? ;; "Makefile":C) wine_fn_output_makefile Makefile ;; - "tools":C) as_dir=tools; as_fn_mkdir_p ;; ".gitignore":C) wine_fn_output_gitignore .gitignore ;; esac diff --git a/configure.ac b/configure.ac index 81bdb81..1a39337 100644 --- a/configure.ac +++ b/configure.ac @@ -2603,8 +2603,8 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[[ch]] *.yy.c .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status - @./config.status Make.tmp Makefile]) +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) + @./config.status Make.tmp Makefile && \$(MAKEDEP) .]) test "$srcdir" = . && WINE_APPEND_RULE( [all: .gitignore @@ -3419,6 +3419,17 @@ WINE_IGNORE_FILE("include/config.h") WINE_IGNORE_FILE("include/stamp-h") test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine") +if test "x$enable_tools" != xno +then + WINE_IGNORE_FILE("tools/makedep$ac_exeext") + AC_CONFIG_COMMANDS([tools/makedep],[wine_fn_output_makedep || AS_EXIT], +[wine_fn_output_makedep () +{ + AS_MKDIR_P(tools) + $CC -Iinclude -I$srcdir/include -D__WINESRC__ $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext $srcdir/tools/makedep.c $LDFLAGS +}]) +fi + AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], [wine_fn_output_makefile () { @@ -3476,12 +3487,11 @@ fi if test "x$enable_tools" != xno then - AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) - WINE_IGNORE_FILE("tools/makedep$ac_exeext") WINE_APPEND_RULE( -[tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h - \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) -clean:: __clean__ +[tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status + @./config.status tools/makedep +Makefile: tools/makedep$ac_exeext +distclean:: clean \$(RM) tools/makedep$ac_exeext]) else WINE_APPEND_RULE(

1 0

Ken Thomases : d3d9/tests: Improve testing of display formats and IDirect3D9_CheckDeviceType().
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 6f498c4946087337956a60eb499559b061b015c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f498c4946087337956a60eb4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 27 13:37:48 2014 -0600 d3d9/tests: Improve testing of display formats and IDirect3D9_CheckDeviceType(). Tests every combination of display format and backbuffer format from (D3DFMT_R5G6B5, D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_A2R10G10B10, D3DFMT_UNKNOWN). Tests the behavior of CheckDeviceType() with display formats for which there are no adapter modes, rather than skipping those. Tests windowed mode. --- dlls/d3d9/tests/device.c | 159 ++++++++++++++++++---------------------------- 1 file changed, 63 insertions(+), 96 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ed99f16..eeb2b07 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2271,54 +2271,25 @@ cleanup: if(d3d9) IDirect3D9_Release(d3d9); } -struct formats { - D3DFORMAT DisplayFormat; - D3DFORMAT BackBufferFormat; - BOOL shouldPass; +struct format { + D3DFORMAT format; + D3DFORMAT alpha_format; + const char* name; + BOOL display; + BOOL windowed; }; -static const struct formats r5g6b5_format_list[] = +static const struct format formats[] = { - { D3DFMT_R5G6B5, D3DFMT_R5G6B5, TRUE }, - { D3DFMT_R5G6B5, D3DFMT_X1R5G5B5, FALSE }, - { D3DFMT_R5G6B5, D3DFMT_A1R5G5B5, FALSE }, - { D3DFMT_R5G6B5, D3DFMT_X8R8G8B8, FALSE }, - { D3DFMT_R5G6B5, D3DFMT_A8R8G8B8, FALSE }, - { 0, 0, 0} -}; - -static const struct formats x1r5g5b5_format_list[] = -{ - { D3DFMT_X1R5G5B5, D3DFMT_R5G6B5, FALSE }, - { D3DFMT_X1R5G5B5, D3DFMT_X1R5G5B5, TRUE }, - { D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE }, - { D3DFMT_X1R5G5B5, D3DFMT_X8R8G8B8, FALSE }, - { D3DFMT_X1R5G5B5, D3DFMT_A8R8G8B8, FALSE }, - - /* A1R5G5B5 should not be usable as a display format, it is backbuffer-only */ - { D3DFMT_A1R5G5B5, D3DFMT_R5G6B5, FALSE }, - { D3DFMT_A1R5G5B5, D3DFMT_X1R5G5B5, FALSE }, - { D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE }, - { D3DFMT_A1R5G5B5, D3DFMT_X8R8G8B8, FALSE }, - { D3DFMT_A1R5G5B5, D3DFMT_A8R8G8B8, FALSE }, - { 0, 0, 0} -}; - -static const struct formats x8r8g8b8_format_list[] = -{ - { D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, FALSE }, - { D3DFMT_X8R8G8B8, D3DFMT_X1R5G5B5, FALSE }, - { D3DFMT_X8R8G8B8, D3DFMT_A1R5G5B5, FALSE }, - { D3DFMT_X8R8G8B8, D3DFMT_X8R8G8B8, TRUE }, - { D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE }, - - /* A1R8G8B8 should not be usable as a display format, it is backbuffer-only */ - { D3DFMT_A8R8G8B8, D3DFMT_R5G6B5, FALSE }, - { D3DFMT_A8R8G8B8, D3DFMT_X1R5G5B5, FALSE }, - { D3DFMT_A8R8G8B8, D3DFMT_A1R5G5B5, FALSE }, - { D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, FALSE }, - { D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE }, - { 0, 0, 0} +#define FORMAT(f, a, d, w) { f, a, #f, d, w } + FORMAT(D3DFMT_R5G6B5, 0, TRUE, TRUE), + FORMAT(D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE, TRUE), + FORMAT(D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE, FALSE), + FORMAT(D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE, TRUE), + FORMAT(D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, FALSE), + FORMAT(D3DFMT_A2R10G10B10, 0, TRUE, FALSE), + FORMAT(D3DFMT_UNKNOWN, 0, FALSE, FALSE), +#undef FORMAT }; static void test_display_formats(void) @@ -2326,71 +2297,67 @@ static void test_display_formats(void) /* Direct3D9 offers 4 display formats R5G6B5, X1R5G5B5, X8R8G8B8 and A2R10G10B10. * Next to these there are 6 different backbuffer formats. Only a fixed number of * combinations are possible in FULLSCREEN mode. In windowed mode more combinations are - * allowed due to depth conversion and this is likely driver dependent. - * This test checks which combinations are possible in fullscreen mode and this should not be driver dependent. - * TODO: handle A2R10G10B10 but what hardware supports it? Parhelia? It is very rare. */ + * allowed due to depth conversion and this is likely driver dependent. */ UINT Adapter = D3DADAPTER_DEFAULT; D3DDEVTYPE DeviceType = D3DDEVTYPE_HAL; - int i, nmodes; - HRESULT hr; + int display; IDirect3D9 *d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); if(!d3d9) return; - nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, D3DFMT_R5G6B5); - if(!nmodes) { - skip("Display format R5G6B5 not supported, skipping\n"); - } else { - trace("Testing display format R5G6B5\n"); - for(i=0; r5g6b5_format_list[i].DisplayFormat != 0; i++) - { - hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat, FALSE); + for (display = 0; display < sizeof(formats) / sizeof(formats[0]); display++) + { + int nmodes, windowed; - if(r5g6b5_format_list[i].shouldPass) - ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE) /* Windows VGA driver */, - "format %d %d didn't pass with hr=%#08x\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat, hr); - else - ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", r5g6b5_format_list[i].DisplayFormat, r5g6b5_format_list[i].BackBufferFormat); - } - } + nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, formats[display].format); - nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, D3DFMT_X1R5G5B5); - if(!nmodes) { - skip("Display format X1R5G5B5 not supported, skipping\n"); - } else { - trace("Testing display format X1R5G5B5\n"); - for(i=0; x1r5g5b5_format_list[i].DisplayFormat != 0; i++) + for (windowed = 0; windowed <= 1; windowed++) { - hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, FALSE); + int backbuffer; + for (backbuffer = 0; backbuffer < sizeof(formats) / sizeof(formats[0]); backbuffer++) + { + BOOL shouldPass; + HRESULT hr; - if(x1r5g5b5_format_list[i].shouldPass) - ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE) /* Spice QXL driver */, - "format %d %d didn't pass with hr=%#08x\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat, hr); - else - ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", x1r5g5b5_format_list[i].DisplayFormat, x1r5g5b5_format_list[i].BackBufferFormat); - } - } + if (!formats[display].display || (windowed && !formats[display].windowed) || (!windowed && !nmodes)) + shouldPass = FALSE; + else + { + D3DFORMAT backbuffer_format; - nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, D3DFMT_X8R8G8B8); - if(!nmodes) { - skip("Display format X8R8G8B8 not supported, skipping\n"); - } else { - trace("Testing display format X8R8G8B8\n"); - for(i=0; x8r8g8b8_format_list[i].DisplayFormat != 0; i++) - { - hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, FALSE); - trace("CheckDeviceType(%d %d) = %08x shouldPass = %d\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr, x8r8g8b8_format_list[i].shouldPass); + if (windowed && formats[backbuffer].format == D3DFMT_UNKNOWN) + backbuffer_format = formats[display].format; + else + backbuffer_format = formats[backbuffer].format; - if(x8r8g8b8_format_list[i].shouldPass) - ok(hr == D3D_OK || - broken(hr == D3DERR_NOTAVAILABLE) /* Windows VGA driver */, - "format %d %d didn't pass with hr=%#08x\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr); - else - ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat); + hr = IDirect3D9_CheckDeviceFormat(d3d9, Adapter, DeviceType, formats[display].format, D3DUSAGE_RENDERTARGET, + D3DRTYPE_SURFACE, backbuffer_format); + if (hr == D3D_OK) + { + if (windowed) + { + hr = IDirect3D9_CheckDeviceFormatConversion(d3d9, Adapter, DeviceType, backbuffer_format, formats[display].format); + shouldPass = (hr == D3D_OK); + } + else + shouldPass = (formats[display].format == formats[backbuffer].format || + (formats[display].alpha_format && formats[display].alpha_format == formats[backbuffer].alpha_format)); + } + else + shouldPass = FALSE; + } + + hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, formats[display].format, formats[backbuffer].format, windowed); + + if (shouldPass) + ok(hr == D3D_OK, "CheckDeviceType(..., %s, %s, windowed=%d) failed with hr=%#08x\n", formats[display].name, + formats[backbuffer].name, windowed, hr); + else + ok(hr != D3D_OK, "CheckDeviceType(..., %s, %s, windowed=%d) succeeded when it was expected to fail\n", formats[display].name, + formats[backbuffer].name, windowed); + } } }

1 0

Hans Leidekker : wbemprox: Add a couple of network properties.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: b5073646c6c4469577f200e9c672b3ba8dbc9187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5073646c6c4469577f200e9c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:26:57 2014 +0100 wbemprox: Add a couple of network properties. --- dlls/wbemprox/builtin.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3086a4f..afa32b5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -165,6 +165,8 @@ static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; +static const WCHAR prop_ipconnectionmetricW[] = + {'I','P','C','o','n','n','e','c','t','i','o','n','M','e','t','r','i','c',0}; static const WCHAR prop_ipenabledW[] = {'I','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_lastbootuptimeW[] = @@ -341,9 +343,11 @@ static const struct column col_networkadapter[] = { { prop_adaptertypeW, CIM_STRING }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_indexW, CIM_UINT32, VT_I4 }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_manufacturerW, CIM_STRING }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, { prop_physicaladapterW, CIM_BOOLEAN }, { prop_pnpdeviceidW, CIM_STRING }, @@ -351,9 +355,10 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { - { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, - { prop_ipenabledW, CIM_BOOLEAN }, - { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, + { prop_ipconnectionmetricW, CIM_UINT32 }, + { prop_ipenabledW, CIM_BOOLEAN }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_os[] = { @@ -616,9 +621,11 @@ struct record_networkadapter { const WCHAR *adaptertype; const WCHAR *device_id; - INT32 interface_index; + UINT32 index; + UINT32 interface_index; const WCHAR *mac_address; const WCHAR *manufacturer; + const WCHAR *name; UINT16 netconnection_status; int physicaladapter; const WCHAR *pnpdevice_id; @@ -627,6 +634,7 @@ struct record_networkadapter struct record_networkadapterconfig { UINT32 index; + UINT32 ipconnectionmetric; int ipenabled; const WCHAR *mac_address; }; @@ -1620,9 +1628,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e sprintfW( device_id, fmtW, aa->u.s.IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &physical ); rec->device_id = heap_strdupW( device_id ); + rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->manufacturer = compsys_manufacturerW; + rec->name = heap_strdupW( aa->FriendlyName ); rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->physicaladapter = physical; rec->pnpdevice_id = networkadapter_pnpdeviceidW; @@ -1668,9 +1678,10 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st for (aa = buffer; aa; aa = aa->Next) { rec = (struct record_networkadapterconfig *)(table->data + offset); - rec->index = aa->u.s.IfIndex; - rec->ipenabled = -1; - rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + rec->index = aa->u.s.IfIndex; + rec->ipconnectionmetric = 20; + rec->ipenabled = -1; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Ken Thomases : d3d9: Make CheckDeviceType() fail for display formats other than D3DFMT_X8R8G8B8 and D3DFMT_R5G6B5 in full-screen.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 35d8c5633332d6175ea3925b7df3d7f7d9921083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d8c5633332d6175ea3925b7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 27 13:32:02 2014 -0600 d3d9: Make CheckDeviceType() fail for display formats other than D3DFMT_X8R8G8B8 and D3DFMT_R5G6B5 in full-screen. The adapter mode functions already enforce this, and tests show CheckDeviceType() should fail for full-screen mode with display formats for which there are no adapter modes. --- dlls/d3d9/directx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 537e6af..e73051d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -232,6 +232,10 @@ static HRESULT WINAPI d3d9_CheckDeviceType(IDirect3D9Ex *iface, UINT adapter, D3 TRACE("iface %p, adapter %u, device_type %#x, display_format %#x, backbuffer_format %#x, windowed %#x.\n", iface, adapter, device_type, display_format, backbuffer_format, windowed); + /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out. */ + if (!windowed && display_format != D3DFMT_X8R8G8B8 && display_format != D3DFMT_R5G6B5) + return WINED3DERR_NOTAVAILABLE; + wined3d_mutex_lock(); hr = wined3d_check_device_type(d3d9->wined3d, adapter, device_type, wined3dformat_from_d3dformat(display_format), wined3dformat_from_d3dformat(backbuffer_format), windowed);

1 0

Jacek Caban : secur32: Ignore GNUTLS_A_UNRECOGNIZED_NAME warning alert.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: e3fa52a636384197fa900427a42a8616246f599b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3fa52a636384197fa900427a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 15:37:37 2014 +0100 secur32: Ignore GNUTLS_A_UNRECOGNIZED_NAME warning alert. --- dlls/secur32/schannel_gnutls.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 17b4b77..1b19544 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -193,9 +193,11 @@ void schan_imp_set_session_target(schan_imp_session session, const char *target) SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { gnutls_session_t s = (gnutls_session_t)session; - int err = pgnutls_handshake(s); - switch(err) - { + int err; + + while(1) { + err = pgnutls_handshake(s); + switch(err) { case GNUTLS_E_SUCCESS: TRACE("Handshake completed\n"); return SEC_E_OK; @@ -205,17 +207,31 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) return SEC_I_CONTINUE_NEEDED; case GNUTLS_E_WARNING_ALERT_RECEIVED: + { + gnutls_alert_description_t alert = pgnutls_alert_get(s); + + WARN("WARNING ALERT: %d %s\n", alert, pgnutls_alert_get_name(alert)); + + switch(alert) { + case GNUTLS_A_UNRECOGNIZED_NAME: + TRACE("Ignoring\n"); + continue; + default: + return SEC_E_INTERNAL_ERROR; + } + } + case GNUTLS_E_FATAL_ALERT_RECEIVED: { gnutls_alert_description_t alert = pgnutls_alert_get(s); - const char *alert_name = pgnutls_alert_get_name(alert); - WARN("ALERT: %d %s\n", alert, alert_name); + WARN("FATAL ALERT: %d %s\n", alert, pgnutls_alert_get_name(alert)); return SEC_E_INTERNAL_ERROR; } default: pgnutls_perror(err); return SEC_E_INTERNAL_ERROR; + } } /* Never reached */

1 0

Alexandre Julliard : makedep: Add a helper function for computing base dir paths.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: dc24a92f5bbba97398049b408ddb99f242457330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc24a92f5bbba97398049b408… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 28 15:08:28 2014 +0100 makedep: Add a helper function for computing base dir paths. --- tools/makedep.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 56c42a6..ff76d3e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -99,7 +99,7 @@ static struct strarray imports; static struct strarray make_vars; static struct strarray cmdline_vars; -static const char *base_dir = "."; +static const char *base_dir; static const char *src_dir; static const char *top_src_dir; static const char *top_obj_dir; @@ -449,6 +449,16 @@ static char *get_relative_path( const char *from, const char *dest ) /******************************************************************* + * base_dir_path + */ +static char *base_dir_path( const char *path ) +{ + if (base_dir && path[0] != '/') return strmake( "%s/%s", base_dir, path ); + return xstrdup( path ); +} + + +/******************************************************************* * src_dir_path */ static char *src_dir_path( const char *path ) @@ -629,17 +639,7 @@ found: */ static FILE *open_file( const char *path ) { - FILE *ret; - - if (path[0] != '/' && strcmp( base_dir, "." )) - { - char *full_path = strmake( "%s/%s", base_dir, path ); - ret = fopen( full_path, "r" ); - free( full_path ); - } - else ret = fopen( path, "r" ); - - return ret; + return fopen( base_dir_path( path ), "r" ); } /******************************************************************* @@ -1230,7 +1230,7 @@ static void parse_makefile(void) char *buffer; FILE *file; - input_file_name = strmake( "%s/%s", base_dir, makefile_name ); + input_file_name = base_dir_path( makefile_name ); if (!(file = fopen( input_file_name, "r" ))) { fatal_perror( "open" ); @@ -1419,7 +1419,7 @@ static struct strarray output_sources(void) for (i = 0; i < extradllflags.count; i++) if (!strcmp( extradllflags.str[i], "-m16" )) is_win16 = 1; for (i = 0; i < linguas.count; i++) - strarray_add( &mo_files, strmake( "%s/po/%s.mo", top_obj_dir, linguas.str[i] )); + strarray_add( &mo_files, strmake( "%s/%s.mo", top_obj_dir_path( "po" ), linguas.str[i] )); strarray_add( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); @@ -1438,7 +1438,7 @@ static struct strarray output_sources(void) if (src_dir && strchr( obj, '/' )) { - char *subdir = strmake( "%s/%s", base_dir, obj ); + char *subdir = base_dir_path( obj ); *strrchr( subdir, '/' ) = 0; strarray_add_uniq( &subdirs, subdir ); } @@ -1491,7 +1491,7 @@ static struct strarray output_sources(void) if (mo_files.count && (source->flags & FLAG_RC_PO)) { strarray_add( &po_files, source->filename ); - output_filename( strmake( "--po-dir=%s/po", top_obj_dir )); + output_filename( strmake( "--po-dir=%s", top_obj_dir_path( "po" ))); output( "\n" ); output( "%s.res:", obj ); output_filenames( mo_files ); @@ -1509,7 +1509,7 @@ static struct strarray output_sources(void) if (mo_files.count) { strarray_add( &mc_files, source->filename ); - output_filename( strmake( "--po-dir=%s/po", top_obj_dir )); + output_filename( strmake( "--po-dir=%s", top_obj_dir_path( "po" ))); output( "\n" ); output( "%s.res:", obj ); output_filenames( mo_files ); @@ -1974,7 +1974,7 @@ static struct strarray output_sources(void) if (top_obj_dir) { output( "depend:\n" ); - output( "\t(a)cd %s && $(MAKE) %s/depend\n", top_obj_dir, base_dir ); + output( "\t(a)cd %s && $(MAKE) %s\n", top_obj_dir, base_dir_path( "depend" )); strarray_add( &phony_targets, "depend" ); } @@ -2093,7 +2093,7 @@ static void output_dependencies( const char *path ) output_file = NULL; if (temp_file_name) rename_temp_file( path ); - if (!src_dir) output_gitignore( strmake( "%s/.gitignore", base_dir ), &targets ); + if (!src_dir && base_dir) output_gitignore( base_dir_path( ".gitignore" ), &targets ); } @@ -2125,7 +2125,8 @@ static void update_makefile( const char *path ) struct incl_file *file; base_dir = path; - output_file_name = strmake( "%s/%s", base_dir, makefile_name ); + if (!strcmp( base_dir, "." )) base_dir = NULL; + output_file_name = base_dir_path( makefile_name ); parse_makefile(); src_dir = get_expanded_make_variable( "srcdir" ); @@ -2139,6 +2140,7 @@ static void update_makefile( const char *path ) if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; + if (top_obj_dir && !strcmp( top_obj_dir, "." )) top_obj_dir = NULL; appmode = get_expanded_make_var_array( "APPMODE" ); dllflags = get_expanded_make_var_array( "DLLFLAGS" );

1 0

Hans Leidekker : wbemprox: Allow string values in boolean comparisons.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 6a042307a56270e1bd5fe6ad6a53d6cc68942d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a042307a56270e1bd5fe6ad6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:26:16 2014 +0100 wbemprox: Allow string values in boolean comparisons. --- dlls/wbemprox/builtin.c | 4 +- dlls/wbemprox/query.c | 113 ++++++++++++++++++++++++++++++++++---- dlls/wbemprox/wbemprox_private.h | 2 +- 3 files changed, 107 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 58054de..3086a4f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -806,12 +806,14 @@ static const struct record_stdregprov data_stdregprov[] = static BOOL match_row( const struct table *table, UINT row, const struct expr *cond, enum fill_status *status ) { LONGLONG val; + UINT type; + if (!cond) { *status = FILL_STATUS_UNFILTERED; return TRUE; } - if (eval_cond( table, row, cond, &val ) != S_OK) + if (eval_cond( table, row, cond, &val, &type ) != S_OK) { *status = FILL_STATUS_FAILED; return FALSE; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 5134d5b..bd68560 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -114,16 +114,93 @@ static inline BOOL is_strcmp( const struct complex_expr *expr ) (expr->left->type == EXPR_SVAL && expr->right->type == EXPR_PROPVAL)); } +static inline BOOL is_boolcmp( const struct complex_expr *expr, UINT ltype, UINT rtype ) +{ + if (ltype == CIM_BOOLEAN && expr->left->type == EXPR_PROPVAL && + (expr->right->type == EXPR_SVAL || expr->right->type == EXPR_BVAL)) return TRUE; + else if (rtype == CIM_BOOLEAN && expr->right->type == EXPR_PROPVAL && + (expr->left->type == EXPR_SVAL || expr->left->type == EXPR_BVAL)) return TRUE; + return FALSE; +} + +static HRESULT eval_boolcmp( UINT op, LONGLONG lval, LONGLONG rval, UINT ltype, UINT rtype, LONGLONG *val ) +{ + static const WCHAR trueW[] = {'T','r','u','e',0}; + + if (ltype == CIM_STRING) lval = !strcmpiW( (const WCHAR *)(INT_PTR)lval, trueW ) ? -1 : 0; + else if (rtype == CIM_STRING) rval = !strcmpiW( (const WCHAR *)(INT_PTR)rval, trueW ) ? -1 : 0; + + switch (op) + { + case OP_EQ: + *val = (lval == rval); + break; + case OP_NE: + *val = (lval != rval); + break; + default: + ERR("unhandled operator %u\n", op); + return WBEM_E_INVALID_QUERY; + } + return S_OK; +} + +static UINT resolve_type( UINT left, UINT right ) +{ + switch (left) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + case CIM_SINT64: + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + case CIM_UINT64: + switch (right) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + case CIM_SINT64: + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + case CIM_UINT64: + return CIM_UINT64; + default: break; + } + + case CIM_STRING: + if (right == CIM_STRING) return CIM_STRING; + break; + + case CIM_BOOLEAN: + if (right == CIM_BOOLEAN) return CIM_BOOLEAN; + break; + + default: + break; + } + return CIM_ILLEGAL; +} + static HRESULT eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, - LONGLONG *val ) + LONGLONG *val, UINT *type ) { HRESULT lret, rret; LONGLONG lval, rval; + UINT ltype, rtype; - lret = eval_cond( table, row, expr->left, &lval ); - rret = eval_cond( table, row, expr->right, &rval ); + lret = eval_cond( table, row, expr->left, &lval, &ltype ); + rret = eval_cond( table, row, expr->right, &rval, &rtype ); if (lret != S_OK || rret != S_OK) return WBEM_E_INVALID_QUERY; + *type = resolve_type( ltype, rtype ); + + if (is_boolcmp( expr, ltype, rtype )) + return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val ); + if (is_strcmp( expr )) { const WCHAR *lstr = (const WCHAR *)(INT_PTR)lval; @@ -165,7 +242,7 @@ static HRESULT eval_binary( const struct table *table, UINT row, const struct co } static HRESULT eval_unary( const struct table *table, UINT row, const struct complex_expr *expr, - LONGLONG *val ) + LONGLONG *val, UINT *type ) { HRESULT hr; @@ -192,11 +269,13 @@ static HRESULT eval_unary( const struct table *table, UINT row, const struct com ERR("unknown operator %u\n", expr->op); return WBEM_E_INVALID_QUERY; } + + *type = table->columns[column].type & CIM_TYPE_MASK; return S_OK; } static HRESULT eval_propval( const struct table *table, UINT row, const struct property *propval, - LONGLONG *val ) + LONGLONG *val, UINT *type ) { HRESULT hr; @@ -206,31 +285,44 @@ static HRESULT eval_propval( const struct table *table, UINT row, const struct p if (hr != S_OK) return hr; + *type = table->columns[column].type & CIM_TYPE_MASK; return get_value( table, row, column, val ); } -HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, LONGLONG *val ) +HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, LONGLONG *val, UINT *type ) { if (!cond) { *val = 1; + *type = CIM_UINT64; return S_OK; } switch (cond->type) { case EXPR_COMPLEX: - return eval_binary( table, row, &cond->u.expr, val ); + return eval_binary( table, row, &cond->u.expr, val, type ); + case EXPR_UNARY: - return eval_unary( table, row, &cond->u.expr, val ); + return eval_unary( table, row, &cond->u.expr, val, type ); + case EXPR_PROPVAL: - return eval_propval( table, row, cond->u.propval, val ); + return eval_propval( table, row, cond->u.propval, val, type ); + case EXPR_SVAL: *val = (INT_PTR)cond->u.sval; + *type = CIM_STRING; return S_OK; + case EXPR_IVAL: + *val = cond->u.ival; + *type = CIM_UINT64; + return S_OK; + case EXPR_BVAL: *val = cond->u.ival; + *type = CIM_BOOLEAN; return S_OK; + default: ERR("invalid expression type\n"); break; @@ -257,6 +349,7 @@ HRESULT execute_view( struct view *view ) { HRESULT hr; LONGLONG val = 0; + UINT type; if (j >= len) { @@ -265,7 +358,7 @@ HRESULT execute_view( struct view *view ) if (!(tmp = heap_realloc( view->result, len * sizeof(UINT) ))) return E_OUTOFMEMORY; view->result = tmp; } - if ((hr = eval_cond( view->table, i, view->cond, &val )) != S_OK) return hr; + if ((hr = eval_cond( view->table, i, view->cond, &val, &type )) != S_OK) return hr; if (val) view->result[j++] = i; } view->count = j; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 81c0fcc..0e39d00 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -186,7 +186,7 @@ void free_row_values( const struct table *, UINT ) DECLSPEC_HIDDEN; void clear_table( struct table * ) DECLSPEC_HIDDEN; void free_table( struct table * ) DECLSPEC_HIDDEN; UINT get_type_size( CIMTYPE ) DECLSPEC_HIDDEN; -HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG * ) DECLSPEC_HIDDEN; +HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG *, UINT * ) DECLSPEC_HIDDEN; HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC_HIDDEN; HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN; BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN;

1 0