January 2014 - Wine-Commits

Sebastian Lackner : ntdll: Fix incorrect value passed to RtlDeleteTimerQueueEx.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 23adc9aaed72ed38d0c682ee27451de6546e9794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23adc9aaed72ed38d0c682ee2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 30 03:56:19 2014 +0100 ntdll: Fix incorrect value passed to RtlDeleteTimerQueueEx. --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 4edd069..5bf3385 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -889,7 +889,7 @@ static struct timer_queue *get_timer_queue(HANDLE TimerQueue) (void **) &default_timer_queue, q, NULL); if (p) /* Got beat to the punch. */ - RtlDeleteTimerQueueEx(p, NULL); + RtlDeleteTimerQueueEx(q, NULL); } } return default_timer_queue;

1 0

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

Jan. 30, 2014

Module: wine Branch: master Commit: 408c351035cf357d530a3a28f3d4a49163e5fe72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408c351035cf357d530a3a28f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:41 2014 +0100 oledb32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/oledb32/tests/database.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index fa56e56..b7020ab 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -40,21 +40,6 @@ DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44 static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - 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; -} - static void test_GetDataSource(WCHAR *initstring) { IDataInitialize *datainit = NULL; @@ -266,7 +251,7 @@ if (hr == S_OK) { ok(hr == S_OK, "got 0x%08x\n", hr); hr = IConnectionPoint_GetConnectionInterface(cp, &iid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualIID(&iid, &IID_IRowPositionChange), "got %s\n", debugstr_guid(&iid)); + ok(IsEqualIID(&iid, &IID_IRowPositionChange), "got %s\n", wine_dbgstr_guid(&iid)); IConnectionPoint_Release(cp); hr = IEnumConnectionPoints_Next(enum_points, 1, &cp, NULL); @@ -300,7 +285,7 @@ static HRESULT WINAPI rset_QI(IRowset *iface, REFIID riid, void **obj) return S_OK; } - ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; }

1 0

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

Jan. 30, 2014

Module: wine Branch: master Commit: a2b548ac3ae7e26ad7495f3f2d880261b8610d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b548ac3ae7e26ad7495f3f2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 30 02:41:06 2014 +0100 shell32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/shell32/tests/ebrowser.c | 25 +++++-------------------- dlls/shell32/tests/shellole.c | 20 ++++---------------- dlls/shell32/tests/shellpath.c | 36 ++++++++++-------------------------- dlls/shell32/tests/shlfolder.c | 14 +------------- 4 files changed, 20 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2b548ac3ae7e26ad7495…

1 0

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

Jan. 30, 2014

Module: wine Branch: master Commit: e877ec4c5a740eb4c224646f3a3d2cc2286c72b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e877ec4c5a740eb4c224646f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:43 2014 +0100 riched20/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/riched20/tests/txtsrv.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 566381c..efda32c 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -42,21 +42,6 @@ static IID *pIID_ITextHost; static IID *pIID_ITextHost2; static PCreateTextServices pCreateTextServices; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - 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; -} - /* Define C Macros for ITextServices calls. */ /* Use a special table for x86 machines to convert the thiscall @@ -806,11 +791,11 @@ DEFINE_GUID(expected_iid_itexthost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xa static void test_IIDs(void) { ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices), - "unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices)); + "unexpected value for IID_ITextServices: %s\n", wine_dbgstr_guid(pIID_ITextServices)); ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), - "unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost)); + "unexpected value for IID_ITextHost: %s\n", wine_dbgstr_guid(pIID_ITextHost)); ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), - "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); + "unexpected value for IID_ITextHost2: %s\n", wine_dbgstr_guid(pIID_ITextHost2)); } /* Outer IUnknown for COM aggregation tests */

1 0

Alexandre Julliard : configure: Automatically expand _CFLAGS and _LIBS variables in all makefiles.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 8aa64e358054c069a649e5df83a07d2b8dfea6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa64e358054c069a649e5df8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:15:49 2014 +0100 configure: Automatically expand _CFLAGS and _LIBS variables in all makefiles. --- Make.vars.in | 1 + configure | 41 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++++ dlls/capi2032/Makefile.in | 2 +- dlls/gdi32/Makefile.in | 2 +- dlls/glu32/Makefile.in | 4 ++-- dlls/gphoto2.ds/Makefile.in | 4 ++-- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mscms/Makefile.in | 4 ++-- dlls/msxml3/Makefile.in | 4 ++-- dlls/sane.ds/Makefile.in | 2 +- dlls/secur32/Makefile.in | 2 +- dlls/windowscodecs/Makefile.in | 2 +- dlls/winegstreamer/Makefile.in | 4 ++-- dlls/winemp3.acm/Makefile.in | 4 ++-- dlls/winex11.drv/Makefile.in | 4 ++-- tools/Makefile.in | 4 ++-- 17 files changed, 68 insertions(+), 22 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 21f7fac..a0727bd 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -66,6 +66,7 @@ INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) prog_manext = 1 api_manext = 3w conf_manext = 5 +(a)ALL_VARS_RULES@ @SET_MAKE@ all: diff --git a/configure b/configure index 5f8bbf5..0934c87 100755 --- a/configure +++ b/configure @@ -625,6 +625,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS LINGUAS +ALL_VARS_RULES LDAPLIBS LIBRT LIBPOLL @@ -16462,6 +16463,46 @@ ac_config_commands="$ac_config_commands include/stamp-h" $as_echo_n "creating Makefile rules..." >&6 +ALL_VARS_RULES="OPENGL_LIBS = $OPENGL_LIBS +X_CFLAGS = $X_CFLAGS +X_PRE_LIBS = $X_PRE_LIBS +X_LIBS = $X_LIBS +X_EXTRA_LIBS = $X_EXTRA_LIBS +XML2_CFLAGS = $XML2_CFLAGS +XML2_LIBS = $XML2_LIBS +XSLT_CFLAGS = $XSLT_CFLAGS +XSLT_LIBS = $XSLT_LIBS +DBUS_CFLAGS = $DBUS_CFLAGS +DBUS_LIBS = $DBUS_LIBS +HAL_CFLAGS = $HAL_CFLAGS +HAL_LIBS = $HAL_LIBS +GNUTLS_CFLAGS = $GNUTLS_CFLAGS +GNUTLS_LIBS = $GNUTLS_LIBS +SANE_CFLAGS = $SANE_CFLAGS +SANE_LIBS = $SANE_LIBS +GPHOTO2_CFLAGS = $GPHOTO2_CFLAGS +GPHOTO2_LIBS = $GPHOTO2_LIBS +GPHOTO2_PORT_CFLAGS = $GPHOTO2_PORT_CFLAGS +GPHOTO2_PORT_LIBS = $GPHOTO2_PORT_LIBS +LCMS2_CFLAGS = $LCMS2_CFLAGS +LCMS2_LIBS = $LCMS2_LIBS +FREETYPE_CFLAGS = $FREETYPE_CFLAGS +FREETYPE_LIBS = $FREETYPE_LIBS +GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS +GSTREAMER_LIBS = $GSTREAMER_LIBS +CAPI20_CFLAGS = $CAPI20_CFLAGS +CAPI20_LIBS = $CAPI20_LIBS +JPEG_CFLAGS = $JPEG_CFLAGS +JPEG_LIBS = $JPEG_LIBS +PNG_CFLAGS = $PNG_CFLAGS +PNG_LIBS = $PNG_LIBS +TIFF_CFLAGS = $TIFF_CFLAGS +TIFF_LIBS = $TIFF_LIBS +MPG123_CFLAGS = $MPG123_CFLAGS +MPG123_LIBS = $MPG123_LIBS +" + + wine_fn_append_rule " # Rules automatically generated by configure diff --git a/configure.ac b/configure.ac index 1a39337..f9f3e07 100644 --- a/configure.ac +++ b/configure.ac @@ -2593,6 +2593,10 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */ AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD +AC_SUBST([ALL_VARS_RULES], +"m4_set_foreach([_AC_SUBST_VARS],[var],[m4_if(m4_bregexp(m4_defn([var]),[$_CFLAGS\|_LIBS$$]),-1,,[var = $var +])])") + dnl Main makefile WINE_APPEND_RULE([ diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in index 6312c13..aa4003e 100644 --- a/dlls/capi2032/Makefile.in +++ b/dlls/capi2032/Makefile.in @@ -1,5 +1,5 @@ MODULE = capi2032.dll IMPORTLIB = capi2032 -EXTRAINCL = @CAPI20_CFLAGS@ +EXTRAINCL = $(CAPI20_CFLAGS) C_SRCS = cap20wxx.c diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 7f77208..da31559 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 -EXTRAINCL = @FREETYPE_CFLAGS@ @FONTCONFIGINCL@ +EXTRAINCL = $(FREETYPE_CFLAGS) @FONTCONFIGINCL@ EXTRALIBS = @CARBONLIB@ @APPKITLIB@ DELAYIMPORTS = usp10 diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index a31b14c..79418f7 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -1,7 +1,7 @@ MODULE = glu32.dll IMPORTLIB = glu32 -EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = -lGLU @OPENGL_LIBS@ @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@ +EXTRAINCL = $(X_CFLAGS) +EXTRALIBS = -lGLU $(OPENGL_LIBS) $(X_LIBS) @XLIB@ $(X_EXTRA_LIBS) C_SRCS = \ glu.c diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index 6e50a21..f2921be 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -1,7 +1,7 @@ MODULE = gphoto2.ds IMPORTS = comctl32 user32 gdi32 advapi32 -EXTRALIBS = @GPHOTO2_LIBS@ @GPHOTO2_PORT_LIBS@ -EXTRAINCL = @GPHOTO2_CFLAGS@ @GPHOTO2_PORT_CFLAGS@ @JPEG_CFLAGS@ +EXTRALIBS = $(GPHOTO2_LIBS) $(GPHOTO2_PORT_LIBS) +EXTRAINCL = $(GPHOTO2_CFLAGS) $(GPHOTO2_PORT_CFLAGS) $(JPEG_CFLAGS) C_SRCS = \ capability.c \ diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 36895e3..3e542fa 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -2,7 +2,7 @@ MODULE = mountmgr.sys IMPORTS = uuid advapi32 ntoskrnl.exe DELAYIMPORTS = user32 EXTRADLLFLAGS = -Wb,--subsystem,native -EXTRAINCL = @DBUS_CFLAGS@ @HAL_CFLAGS@ +EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS) EXTRALIBS = @DISKARBITRATIONLIB@ C_SRCS = \ diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index ffe8cb1..ef6ae23 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,8 +1,8 @@ MODULE = mscms.dll IMPORTLIB = mscms IMPORTS = shlwapi advapi32 -EXTRAINCL = @LCMS2_CFLAGS@ -EXTRALIBS = @LCMS2_LIBS@ +EXTRAINCL = $(LCMS2_CFLAGS) +EXTRALIBS = $(LCMS2_LIBS) C_SRCS = \ handle.c \ diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index a4fc087..936c745 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -1,7 +1,7 @@ MODULE = msxml3.dll IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 -EXTRALIBS = @XML2_LIBS@ -EXTRAINCL = @XML2_CFLAGS@ @XSLT_CFLAGS@ +EXTRALIBS = $(XML2_LIBS) +EXTRAINCL = $(XML2_CFLAGS) $(XSLT_CFLAGS) C_SRCS = \ attribute.c \ diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index a98766a..a0310d3 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -1,6 +1,6 @@ MODULE = sane.ds IMPORTS = comctl32 user32 gdi32 -EXTRAINCL = @SANE_CFLAGS@ +EXTRAINCL = $(SANE_CFLAGS) C_SRCS = \ capability.c \ diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 72e6df4..413e5b3 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -2,7 +2,7 @@ MODULE = secur32.dll IMPORTLIB = secur32 IMPORTS = netapi32 advapi32 DELAYIMPORTS = crypt32 -EXTRAINCL = @GNUTLS_CFLAGS@ +EXTRAINCL = $(GNUTLS_CFLAGS) EXTRALIBS = @SECURITYLIB@ C_SRCS = \ diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 2244642..50ecc29 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,7 +1,7 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 -EXTRAINCL = @JPEG_CFLAGS@ @PNG_CFLAGS@ @TIFF_CFLAGS@ +EXTRAINCL = $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) EXTRALIBS = @APPLICATIONSERVICESLIB@ C_SRCS = \ diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 286d6ec..af07a43 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,7 +1,7 @@ MODULE = winegstreamer.dll IMPORTS = strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 -EXTRAINCL = @GSTREAMER_CFLAGS@ -EXTRALIBS = @GSTREAMER_LIBS@ @LIBPTHREAD@ +EXTRAINCL = $(GSTREAMER_CFLAGS) +EXTRALIBS = $(GSTREAMER_LIBS) @LIBPTHREAD@ C_SRCS = \ glibthread.c \ diff --git a/dlls/winemp3.acm/Makefile.in b/dlls/winemp3.acm/Makefile.in index 71e2ccd..7627155 100644 --- a/dlls/winemp3.acm/Makefile.in +++ b/dlls/winemp3.acm/Makefile.in @@ -1,7 +1,7 @@ MODULE = winemp3.acm IMPORTS = winmm user32 -EXTRAINCL = @MPG123_CFLAGS@ -EXTRALIBS = @MPG123_LIBS@ @COREAUDIO@ +EXTRAINCL = $(MPG123_CFLAGS) +EXTRALIBS = $(MPG123_LIBS) @COREAUDIO@ C_SRCS = \ mpegl3.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 3f40fda..bc8c5bc 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,8 +1,8 @@ MODULE = winex11.drv IMPORTS = uuid user32 gdi32 advapi32 DELAYIMPORTS = comctl32 ole32 shell32 imm32 -EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@ +EXTRAINCL = $(X_CFLAGS) +EXTRALIBS = $(X_LIBS) @XLIB@ $(X_EXTRA_LIBS) C_SRCS = \ bitblt.c \ diff --git a/tools/Makefile.in b/tools/Makefile.in index 3ee8473..a7cc154 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,5 +1,5 @@ -EXTRAINCL = @FREETYPE_CFLAGS@ -FREETYPELIBS = @FREETYPE_LIBS@ +EXTRAINCL = $(FREETYPE_CFLAGS) +FREETYPELIBS = $(FREETYPE_LIBS) PROGRAMS = \ fnt2fon$(EXEEXT) \

1 0

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

Jan. 30, 2014

Module: wine Branch: master Commit: 672e2811ffd1dd8d51998dcb4229de3025f2e782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672e2811ffd1dd8d51998dcb4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 29 23:10:43 2014 +0100 mshtml/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/mshtml/tests/activex.c | 32 +++++++++------------------ dlls/mshtml/tests/dom.c | 22 +++++-------------- dlls/mshtml/tests/events.c | 30 ++++++++------------------ dlls/mshtml/tests/htmldoc.c | 49 +++++++++++++++--------------------------- dlls/mshtml/tests/protocol.c | 16 ++------------ dlls/mshtml/tests/script.c | 36 +++++++++++-------------------- 6 files changed, 55 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=672e2811ffd1dd8d51998…

1 0

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

Jan. 30, 2014

Module: wine Branch: master Commit: b553f543235110d77644784b2880fe167e7d23a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b553f543235110d77644784b2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:44 2014 +0100 rpcrt4/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/rpcrt4/tests/rpc.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 7ec2942..07ca7eb 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -730,15 +730,6 @@ static void test_RpcStringBindingFromBinding(void) ok(status == RPC_S_OK, "RpcBindingFree failed with error %u\n", status); } -static char *printGuid(char *buf, int size, const UUID *guid) -{ - snprintf(buf, size, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], - guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], - guid->Data4[6], guid->Data4[7]); - return buf; -} - static void test_UuidCreate(void) { UUID guid; @@ -756,7 +747,6 @@ static void test_UuidCreate(void) UUID and, or; RPC_STATUS rslt; int i; - char buf[39]; and = guid; or = guid; @@ -780,9 +770,9 @@ static void test_UuidCreate(void) *dst |= *src; } ok(UuidEqual(&and, &v4and, &rslt), - "unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &and)); + "unexpected bits set in V4 UUID: %s\n", wine_dbgstr_guid(&and)); ok(UuidEqual(&or, &v4or, &rslt), - "unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &or)); + "unexpected bits set in V4 UUID: %s\n", wine_dbgstr_guid(&or)); } else { @@ -816,7 +806,6 @@ static void test_UuidCreateSequential(void) if (version == 1) { UUID guid2; - char buf[39]; if (!ret) { @@ -825,7 +814,7 @@ static void test_UuidCreateSequential(void) */ ok(!(guid1.Data4[2] & 0x01), "GUID does not appear to contain a MAC address: %s\n", - printGuid(buf, sizeof(buf), &guid1)); + wine_dbgstr_guid(&guid1)); } else { @@ -834,7 +823,7 @@ static void test_UuidCreateSequential(void) */ ok((guid1.Data4[2] & 0x01), "GUID does not appear to contain a multicast MAC address: %s\n", - printGuid(buf, sizeof(buf), &guid1)); + wine_dbgstr_guid(&guid1)); } /* Generate another GUID, and make sure its MAC address matches the * first. @@ -846,7 +835,7 @@ static void test_UuidCreateSequential(void) ok(version == 1, "unexpected version %d\n", version); ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), "unexpected value in MAC address: %s\n", - printGuid(buf, sizeof(buf), &guid2)); + wine_dbgstr_guid(&guid2)); } }

1 0

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

Jan. 30, 2014

Module: wine Branch: master Commit: 2769763c64185cbd10673676654834cef5eba58d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2769763c64185cbd106736766… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:42 2014 +0100 qcap/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/qcap/tests/qcap.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index b403a74..83d38c8 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -61,18 +61,6 @@ DEFINE_EXPECT(NotifyAllocator); DEFINE_EXPECT(Reconnect); DEFINE_EXPECT(Read_FccHandler); -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; -} - static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -395,7 +383,7 @@ static HRESULT WINAPI GraphBuilder_QueryInterface( } ok(IsEqualIID(riid, &IID_IMediaEvent) || IsEqualIID(riid, &IID_IMediaEventSink), - "QueryInterface(%s)\n", debugstr_guid(riid)); + "QueryInterface(%s)\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -561,7 +549,7 @@ static HRESULT WINAPI BaseFilter_QueryInterface(IBaseFilter *iface, REFIID riid, } check_calls_list("BaseFilter_QueryInterface", BASEFILTER_QUERYINTERFACE, This->filter_type); - ok(IsEqualIID(riid, &IID_IPin), "riid = %s\n", debugstr_guid(riid)); + ok(IsEqualIID(riid, &IID_IPin), "riid = %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -768,7 +756,7 @@ static HRESULT WINAPI Pin_QueryInterface(IPin *iface, REFIID riid, void **ppv) return S_OK; } - ok(0, "unexpected call: %s\n", debugstr_guid(riid)); + ok(0, "unexpected call: %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -795,14 +783,14 @@ static HRESULT WINAPI Pin_ReceiveConnection(IPin *iface, CHECK_EXPECT(ReceiveConnection); ok(IsEqualIID(&pmt->majortype, &MEDIATYPE_Stream), "majortype = %s\n", - debugstr_guid(&pmt->majortype)); + wine_dbgstr_guid(&pmt->majortype)); ok(IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_Avi), "subtype = %s\n", - debugstr_guid(&pmt->subtype)); + wine_dbgstr_guid(&pmt->subtype)); ok(pmt->bFixedSizeSamples, "bFixedSizeSamples = %x\n", pmt->bFixedSizeSamples); ok(!pmt->bTemporalCompression, "bTemporalCompression = %x\n", pmt->bTemporalCompression); ok(pmt->lSampleSize == 1, "lSampleSize = %d\n", pmt->lSampleSize); ok(IsEqualIID(&pmt->formattype, &GUID_NULL), "formattype = %s\n", - debugstr_guid(&pmt->formattype)); + wine_dbgstr_guid(&pmt->formattype)); ok(!pmt->pUnk, "pUnk = %p\n", pmt->pUnk); ok(!pmt->cbFormat, "cbFormat = %d\n", pmt->cbFormat); ok(!pmt->pbFormat, "pbFormat = %p\n", pmt->pbFormat); @@ -956,7 +944,7 @@ static HRESULT WINAPI KsPropertySet_Get(IKsPropertySet *iface, REFGUID guidPropS test_filter *This = impl_from_IKsPropertySet(iface); check_calls_list("KsPropertySet_Get", KSPROPERTYSET_GET, This->filter_type); - ok(IsEqualIID(guidPropSet, &AMPROPSETID_Pin), "guidPropSet = %s\n", debugstr_guid(guidPropSet)); + ok(IsEqualIID(guidPropSet, &AMPROPSETID_Pin), "guidPropSet = %s\n", wine_dbgstr_guid(guidPropSet)); ok(dwPropID == 0, "dwPropID = %d\n", dwPropID); ok(pInstanceData == NULL, "pInstanceData != NULL\n"); ok(cbInstanceData == 0, "cbInstanceData != 0\n"); @@ -1278,14 +1266,14 @@ static void test_AviMux(void) hr = IEnumMediaTypes_Next(emt, 1, &media_type, NULL); ok(hr == S_OK, "Next returned %x\n", hr); ok(IsEqualIID(&media_type->majortype, &MEDIATYPE_Stream), "majortype = %s\n", - debugstr_guid(&media_type->majortype)); + wine_dbgstr_guid(&media_type->majortype)); ok(IsEqualIID(&media_type->subtype, &MEDIASUBTYPE_Avi), "subtype = %s\n", - debugstr_guid(&media_type->subtype)); + wine_dbgstr_guid(&media_type->subtype)); ok(media_type->bFixedSizeSamples, "bFixedSizeSamples = %x\n", media_type->bFixedSizeSamples); ok(!media_type->bTemporalCompression, "bTemporalCompression = %x\n", media_type->bTemporalCompression); ok(media_type->lSampleSize == 1, "lSampleSize = %d\n", media_type->lSampleSize); ok(IsEqualIID(&media_type->formattype, &GUID_NULL), "formattype = %s\n", - debugstr_guid(&media_type->formattype)); + wine_dbgstr_guid(&media_type->formattype)); ok(!media_type->pUnk, "pUnk = %p\n", media_type->pUnk); ok(!media_type->cbFormat, "cbFormat = %d\n", media_type->cbFormat); ok(!media_type->pbFormat, "pbFormat = %p\n", media_type->pbFormat); @@ -1363,7 +1351,7 @@ static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag *iface, REFIID rii return S_OK; } - ok(0, "unexpected call %s\n", debugstr_guid(riid)); + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

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

Jan. 30, 2014

Module: wine Branch: master Commit: 783176aa74ab046712648ed3ae90290454e14d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=783176aa74ab046712648ed3a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:32 2014 +0100 ieframe/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/ieframe/tests/intshcut.c | 15 +-------------- dlls/ieframe/tests/webbrowser.c | 22 +++++----------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index bbc7a18..d1da424 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -70,19 +70,6 @@ static IUnknown unknown = { &unknownVtbl }; -static const char *printGUID(const GUID *guid) -{ - static char guidSTR[39]; - - if (!guid) return NULL; - - sprintf(guidSTR, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); - return guidSTR; -} - static void test_Aggregability(void) { HRESULT hr; @@ -109,7 +96,7 @@ static void can_query_interface(IUnknown *pUnknown, REFIID riid) HRESULT hr; IUnknown *newInterface; hr = IUnknown_QueryInterface(pUnknown, riid, (void**)&newInterface); - ok(hr == S_OK, "interface %s could not be queried\n", printGUID(riid)); + ok(hr == S_OK, "interface %s could not be queried\n", wine_dbgstr_guid(riid)); if (SUCCEEDED(hr)) IUnknown_Release(newInterface); } diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index d045658..776e2bc 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -213,18 +213,6 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return unk1 == unk2; } -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; -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -483,7 +471,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(0, "unexpected nCmdID %d of CGID_DocHostCommandHandler\n", nCmdID); } }else { - ok(0, "unexpected pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); + ok(0, "unexpected pguidCmdGroup %s\n", wine_dbgstr_guid(pguidCmdGroup)); } return E_FAIL; @@ -664,7 +652,7 @@ static HRESULT WINAPI WebBrowserEvents2_QueryInterface(IDispatch *iface, REFIID return S_OK; } - ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1699,7 +1687,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, /* 20C46561-8491-11CF-960C-0080C7F4EE85 no info */ else - trace("Service %s not supported\n", debugstr_guid(guidService)); + trace("Service %s not supported\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -1745,7 +1733,7 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) else { /* are there more interfaces, that a host can support? */ - trace("%s: interface not supported\n", debugstr_guid(riid)); + trace("%s: interface not supported\n", wine_dbgstr_guid(riid)); } return (*ppv) ? S_OK : E_NOINTERFACE; @@ -1991,7 +1979,7 @@ static void test_ClassInfo(IWebBrowser2 *unk) ok(hres == S_OK, "GetTypeAtr failed: %08x\n", hres); ok(IsEqualGUID(&type_attr->guid, wb_version > 1 ? &CLSID_WebBrowser : &CLSID_WebBrowser_V1), - "guid = %s\n", debugstr_guid(&type_attr->guid)); + "guid = %s\n", wine_dbgstr_guid(&type_attr->guid)); ITypeInfo_ReleaseTypeAttr(typeinfo, type_attr); ITypeInfo_Release(typeinfo);

1 0

Dmitry Timoshkov : scrrun: Make file and folder collection constructors static.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: e526f120a9db000827fdeaaf20ebf92d99840441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e526f120a9db000827fdeaaf2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 30 14:19:53 2014 +0900 scrrun: Make file and folder collection constructors static. --- dlls/scrrun/filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 630e7e3..41cb51f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -615,7 +615,7 @@ static const IEnumVARIANTVtbl foldercollenumvariantvtbl = { foldercoll_enumvariant_Clone }; -HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) +static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) { struct enumvariant *This; @@ -770,7 +770,7 @@ static const IEnumVARIANTVtbl filecollenumvariantvtbl = { filecoll_enumvariant_Clone }; -HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) +static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) { struct enumvariant *This;

1 0