November 2013 - Wine-commits

Nikolay Sivov : ole32: Added activation context support for OleRegGetMiscStatus().
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: d0bf7f4eafb8295e3ad773e791cd16e914a51414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0bf7f4eafb8295e3ad773e79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 22:02:58 2013 +0400 ole32: Added activation context support for OleRegGetMiscStatus(). --- dlls/ole32/compobj.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/compobj_private.h | 2 + dlls/ole32/ole2.c | 2 + dlls/ole32/tests/compobj.c | 5 +-- 4 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index fd7cc48..d3f4804 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -99,6 +99,15 @@ enum comclass_threadingmodel ThreadingModel_Neutral = 5 }; +enum comclass_miscfields +{ + MiscStatus = 1, + MiscStatusIcon = 2, + MiscStatusContent = 4, + MiscStatusThumbnail = 8, + MiscStatusDocPrint = 16 +}; + struct comclassredirect_data { ULONG size; @@ -218,6 +227,71 @@ static CRITICAL_SECTION_DEBUG class_cs_debug = }; static CRITICAL_SECTION csRegisteredClassList = { &class_cs_debug, -1, 0, 0, 0, 0 }; +static inline enum comclass_miscfields dvaspect_to_miscfields(DWORD aspect) +{ + switch (aspect) + { + case DVASPECT_CONTENT: + return MiscStatusContent; + case DVASPECT_THUMBNAIL: + return MiscStatusThumbnail; + case DVASPECT_ICON: + return MiscStatusIcon; + case DVASPECT_DOCPRINT: + return MiscStatusDocPrint; + default: + return MiscStatus; + }; +} + +BOOL actctx_get_miscstatus(const CLSID *clsid, DWORD aspect, DWORD *status) +{ + ACTCTX_SECTION_KEYED_DATA data; + + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, + clsid, &data)) + { + struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; + enum comclass_miscfields misc = dvaspect_to_miscfields(aspect); + + if (!(comclass->miscmask & misc)) + { + if (!(comclass->miscmask & MiscStatus)) + { + *status = 0; + return TRUE; + } + misc = MiscStatus; + } + + switch (misc) + { + case MiscStatus: + *status = comclass->miscstatus; + break; + case MiscStatusIcon: + *status = comclass->miscstatusicon; + break; + case MiscStatusContent: + *status = comclass->miscstatuscontent; + break; + case MiscStatusThumbnail: + *status = comclass->miscstatusthumbnail; + break; + case MiscStatusDocPrint: + *status = comclass->miscstatusdocprint; + break; + default: + ; + }; + + return TRUE; + } + else + return FALSE; +} + /* wrapper for NtCreateKey that creates the key recursively if necessary */ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) { diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 0f4519b..933b71c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -315,6 +315,8 @@ extern UINT ole_private_data_clipboard_format DECLSPEC_HIDDEN; extern LSTATUS create_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; +extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 0994a5f..5e789f2 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -895,6 +895,8 @@ HRESULT WINAPI OleRegGetMiscStatus( *pdwStatus = 0; + if (actctx_get_miscstatus(clsid, dwAspect, pdwStatus)) return S_OK; + /* * Open the class id Key */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3deedf3..8c4d6a8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1889,21 +1889,18 @@ static void test_OleRegGetMiscStatus(void) { status = 0; hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, &status); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(status == OLEMISC_RECOMPOSEONRESIZE, "got 0x%08x\n", status); -} + /* context data takes precedence over registration info */ status = 0; hr = OleRegGetMiscStatus(&CLSID_StdFont, DVASPECT_ICON, &status); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(status == OLEMISC_RECOMPOSEONRESIZE, "got 0x%08x\n", status); /* there's no such attribute in context */ status = -1; hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_DOCPRINT, &status); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(status == 0, "got 0x%08x\n", status);

1 0

Alexandre Julliard : makefiles: Merge the relpath functionality into makedep.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 067d3f0ddbbf651fba68557d3cec9a194bf8e91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=067d3f0ddbbf651fba68557d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 8 21:11:59 2013 +0100 makefiles: Merge the relpath functionality into makedep. --- .gitignore | 1 - Make.vars.in | 1 - configure | 12 +++--- configure.ac | 12 +++--- libs/wine/Makefile.in | 13 ++----- tools/Makefile.in | 7 +--- tools/makedep.c | 77 ++++++++++++++++++++++++++++++++++++++++--- tools/relpath.c | 86 ------------------------------------------------- 8 files changed, 88 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=067d3f0ddbbf651fba685…

1 0

Alexandre Julliard : makefiles: Output clean rules for generated files from makedep.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 31eb8be66195d5a1c69e26a4eadeeb057538d44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31eb8be66195d5a1c69e26a4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 9 18:57:00 2013 +0100 makefiles: Output clean rules for generated files from makedep. --- Make.rules.in | 8 +----- aclocal.m4 | 3 +- configure | 3 +- tools/makedep.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 65 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31eb8be66195d5a1c69e2…

1 0

Alexandre Julliard : makefiles: Remove the no longer needed EXTRASUBDIRS variables.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 456c8f435a39b2f1e2323f01628e5b1627ab30b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456c8f435a39b2f1e2323f016… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 9 20:41:49 2013 +0100 makefiles: Remove the no longer needed EXTRASUBDIRS variables. --- Make.rules.in | 8 +----- Makefile.in | 7 ------ aclocal.m4 | 9 +++---- configure | 44 ++++++++++++++++-------------------------- configure.ac | 13 +++++++---- dlls/gdi32/Makefile.in | 5 ---- dlls/kernel32/Makefile.in | 2 - dlls/user32/Makefile.in | 2 - dlls/wineps.drv/Makefile.in | 2 - include/Makefile.in | 6 ----- tools/Makefile.in | 2 - tools/make_makefiles | 20 +----------------- 12 files changed, 33 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=456c8f435a39b2f1e2323…

1 0

Alexandre Julliard : makefiles: Add a makedep pragma to mark source files that are parts of the import library .
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: fe946f253ad8ef8ec2400aaf1d71799ca2a99567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe946f253ad8ef8ec2400aaf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 11 11:23:38 2013 +0100 makefiles: Add a makedep pragma to mark source files that are parts of the import library. --- Make.rules.in | 11 +---------- dlls/dinput/data_formats.c | 4 ++++ tools/make_makefiles | 25 +++++++++++++++++++------ tools/makedep.c | 9 +++++++++ 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index ffa6cc3..d9c9827 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -32,16 +32,7 @@ ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Implicit rules -.SUFFIXES: .ok .man.in .man .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp - -.c.o: - $(CC) -c $(ALLCFLAGS) -o $@ $< - -.m.o: - $(CC) -c $(ALLCFLAGS) -o $@ $< - -.c.cross.o: - $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< +.SUFFIXES: .ok .man.in .man .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.ok: $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index 1f25556..5fac7b7 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep implib +#endif + #include <stdarg.h> #include "windef.h" diff --git a/tools/make_makefiles b/tools/make_makefiles index 048dfe3..b61d403 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -335,9 +335,7 @@ sub parse_makefile($) my $var = $1; my @list = split(/\s+/, $2); $make{$var} = \@list; - ${$make{"=flags"}}{"mc"} = 1 if $var eq "MC_SRCS"; - ${$make{"=flags"}}{"staticimplib"} = 1 if $var eq "IMPLIB_SRCS"; - ${$make{"=flags"}}{"clean"} = 1 if $var =~ /IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|PROGRAMS/; + ${$make{"=flags"}}{"clean"} = 1 if $var eq "PROGRAMS"; next; } if (/(install-lib|install-dev|clean)\s*:/) @@ -427,12 +425,20 @@ sub assign_sources_to_makefiles(@) } else { - if ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name; } - elsif ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } + if ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } - elsif ($name =~ /\.mc$/) { push @{${$make}{"=MC_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } + elsif ($name =~ /\.c$/) + { + my %flags = get_makedep_flags( $file ); + if (defined $flags{"implib"}) + { + push @{${$make}{"=IMPLIB_SRCS"}}, $name; + ${${$make}{"=flags"}}{"staticimplib"} = 1; + } + push @{${$make}{"=C_SRCS"}}, $name; + } elsif ($name =~ /\.rc$/) { my %flags = get_makedep_flags( $file ); @@ -443,6 +449,11 @@ sub assign_sources_to_makefiles(@) } push @{${$make}{"=RC_SRCS"}}, $name; } + elsif ($name =~ /\.mc$/) + { + push @{${$make}{"=MC_SRCS"}}, $name; + ${${$make}{"=flags"}}{"mc"} = 1; + } elsif ($name =~ /\.idl$/) { my %flags = get_makedep_flags( $file ); @@ -453,6 +464,7 @@ sub assign_sources_to_makefiles(@) push @{${$make}{"=IDL_R_SRCS"}}, $name if defined $flags{"register"}; push @{${$make}{"=IDL_S_SRCS"}}, $name if defined $flags{"server"}; push @{${$make}{"=IDL_TLB_SRCS"}}, $name if defined $flags{"typelib"}; + ${${$make}{"=flags"}}{"clean"} = 1; } } } @@ -567,6 +579,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "IDL_S_SRCS" ); replace_makefile_variable( $file, "IDL_TLB_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); + replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "SRCDIR_INCLUDES" ); } diff --git a/tools/makedep.c b/tools/makedep.c index aef0f3e..945ba26 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -59,6 +59,7 @@ struct incl_file #define FLAG_IDL_TYPELIB 0x0040 /* generates a typelib (.tlb) file */ #define FLAG_IDL_HEADER 0x0080 /* generates a header (.h) file */ #define FLAG_RC_PO 0x0100 /* rc file contains translations */ +#define FLAG_C_IMPLIB 0x0200 /* file is part of an import library */ static const struct { @@ -747,6 +748,7 @@ static void parse_pragma_directive( struct incl_file *source, char *str ) { if (!strcmp( flag, "po" )) source->flags |= FLAG_RC_PO; } + else if (!strcmp( flag, "implib" )) source->flags |= FLAG_C_IMPLIB; } } @@ -1232,8 +1234,15 @@ static void output_sources(void) else output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s\n", source->filename ); } + if (source->flags & FLAG_C_IMPLIB) + { + strarray_add( &clean_files, strmake( "%s.cross.o", obj )); + output( "%s.cross.o: %s\n", obj, source->filename ); + output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); + } LIST_FOR_EACH_ENTRY( ext, &object_extensions, struct object_extension, entry ) column += output( "%s.%s ", obj, ext->extension ); + if (source->flags & FLAG_C_IMPLIB) column += output( "%s.cross.o", obj ); column += output( ":" ); } free( obj );

1 0

Alexandre Julliard : makefiles: Generate explicit rules for building mo files.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 7f8412f253866c1910566c4fe130f76f20fc0d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8412f253866c1910566c4fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 11 11:46:04 2013 +0100 makefiles: Generate explicit rules for building mo files. --- Make.rules.in | 7 ++----- configure | 8 ++++++++ configure.ac | 9 +++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index d9c9827..a853afe 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -20,7 +20,7 @@ RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTR IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) -CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c +CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) $(XTEMPLATE_SRCS:.x=.h) \ $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) @@ -32,7 +32,7 @@ ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Implicit rules -.SUFFIXES: .ok .man.in .man .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .ok .man.in .man @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.ok: $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ @@ -49,9 +49,6 @@ ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) .svg.bmp: CONVERT="$(CONVERT)" ICOTOOL="$(ICOTOOL)" RSVG="$(RSVG)" $(BUILDIMAGE) $< $@ -.po.mo: - $(MSGFMT) -o $@ $< - # Rules for main module $(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) Makefile.in diff --git a/configure b/configure index 5dd4a59..663de64 100755 --- a/configure +++ b/configure @@ -17428,6 +17428,14 @@ then wine_fn_append_rule "__builddeps__: \$(ALL_MO_FILES) clean:: \$(RM) \$(ALL_MO_FILES)" + + posrc="po" + test "$srcdir" = . || posrc="$srcdir/po" + for i in $LINGUAS + do + wine_fn_append_rule "po/$i.mo: $posrc/$i.po + \$(MSGFMT) -o \$@ $posrc/$i.po" + done else LINGUAS= fi diff --git a/configure.ac b/configure.ac index 8bbbac5..98220b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3489,6 +3489,15 @@ then [__builddeps__: \$(ALL_MO_FILES) clean:: \$(RM) \$(ALL_MO_FILES)]) + + posrc="po" + test "$srcdir" = . || posrc="$srcdir/po" + for i in $LINGUAS + do + WINE_APPEND_RULE( +[po/$i.mo: $posrc/$i.po + \$(MSGFMT) -o \$@ $posrc/$i.po]) + done else LINGUAS= fi

1 0

Alexandre Julliard : dbghelp: Remove a useless DllMain, msvcrt can' t be unloaded.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 836b682ed3bff439f1264bc9cee4ecce6ca88bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836b682ed3bff439f1264bc9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 9 11:22:56 2013 +0100 dbghelp: Remove a useless DllMain, msvcrt can't be unloaded. --- dlls/dbghelp/dbghelp.c | 19 ------------------- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/symbol.c | 1 + 3 files changed, 1 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index b61676d..f5d0b67 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -65,25 +65,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); */ unsigned dbghelp_options = SYMOPT_UNDNAME; -HANDLE hMsvcrt = NULL; - -/*********************************************************************** - * DllMain (DEBUGHLP.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: break; - case DLL_PROCESS_DETACH: - if (hMsvcrt) FreeLibrary(hMsvcrt); - break; - case DLL_THREAD_ATTACH: break; - case DLL_THREAD_DETACH: break; - default: break; - } - return TRUE; -} static struct process* process_first /* = NULL */; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index f18a0fe..9390fab 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -545,7 +545,6 @@ extern struct cpu* dbghelp_current_cpu DECLSPEC_HIDDEN; /* dbghelp.c */ extern struct process* process_find_by_handle(HANDLE hProcess) DECLSPEC_HIDDEN; -extern HANDLE hMsvcrt DECLSPEC_HIDDEN; extern BOOL validate_addr64(DWORD64 addr) DECLSPEC_HIDDEN; extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) DECLSPEC_HIDDEN; extern void* fetch_buffer(struct process* pcs, unsigned size) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ebc4644..e6401a9 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1759,6 +1759,7 @@ DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, DWORD UndecoratedLength, DWORD Flags) { /* undocumented from msvcrt */ + static HANDLE hMsvcrt; static char* (CDECL *p_undname)(char*, const char*, int, void* (CDECL*)(size_t), void (CDECL*)(void*), unsigned short); static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0};

1 0

Francois Gouget : shlwapi/tests: Make test_SHCreateStreamOnFileEx_CopyTo() static.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: daf3c95d045509eee2019b9ce57102ae76861f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf3c95d045509eee2019b9ce… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 8 19:41:17 2013 +0100 shlwapi/tests: Make test_SHCreateStreamOnFileEx_CopyTo() static. --- dlls/shlwapi/tests/istream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 9ea3def..4421a78 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -655,7 +655,7 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) } -void test_SHCreateStreamOnFileEx_CopyTo(void) +static void test_SHCreateStreamOnFileEx_CopyTo(void) { HRESULT ret; IStream *src, *dst;

1 0

André Hentschel : dinput8/tests: Enable compilation with -D__WINESRC__.
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: 7ddb8e25bbe1d4c1a36272c0b4c4bd9adcca5900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ddb8e25bbe1d4c1a36272c0b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 8 20:49:48 2013 +0100 dinput8/tests: Enable compilation with -D__WINESRC__. --- dlls/dinput8/tests/Makefile.in | 1 - dlls/dinput8/tests/device.c | 54 ++++++++++++++------------------------- dlls/dinput8/tests/dinput.c | 10 +++--- 3 files changed, 25 insertions(+), 40 deletions(-) diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in index 9770842..fe87118 100644 --- a/dlls/dinput8/tests/Makefile.in +++ b/dlls/dinput8/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dinput8.dll IMPORTS = dinput8 ole32 user32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ device.c \ diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index c211594..53afdf3 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -27,10 +27,10 @@ #include "dinput.h" struct enum_data { - LPDIRECTINPUT8 pDI; - LPDIACTIONFORMAT lpdiaf; - LPDIRECTINPUTDEVICE8 keyboard; - LPDIRECTINPUTDEVICE8 mouse; + IDirectInput8A *pDI; + DIACTIONFORMATA *lpdiaf; + IDirectInputDevice8A *keyboard; + IDirectInputDevice8A *mouse; const char* username; int ndevices; }; @@ -46,7 +46,7 @@ enum { DITEST_YAXIS }; -static DIACTION actionMapping[]= +static DIACTIONA actionMapping[]= { /* axis */ { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */ , 0, { "Steer" } }, @@ -60,12 +60,7 @@ static DIACTION actionMapping[]= { 4, DIMOUSE_YAXIS, 0, { "Y Axis" } } }; -static void test_device_input( - LPDIRECTINPUTDEVICE8 lpdid, - DWORD event_type, - DWORD event, - DWORD expected -) +static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWORD event, DWORD expected) { HRESULT hr; DIDEVICEOBJECTDATA obj_data; @@ -115,16 +110,11 @@ static void test_device_input( ok(hr == DI_OK && data_size == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, data_size); } -static void test_build_action_map( - LPDIRECTINPUTDEVICE8 lpdid, - LPDIACTIONFORMAT lpdiaf, - int action_index, - DWORD expected_type, - DWORD expected_inst -) +static void test_build_action_map(IDirectInputDevice8A *lpdid, DIACTIONFORMATA *lpdiaf, + int action_index, DWORD expected_type, DWORD expected_inst) { HRESULT hr; - DIACTION *actions; + DIACTIONA *actions; DWORD instance, type, how; GUID assigned_to; DIDEVICEINSTANCEA ddi; @@ -147,12 +137,8 @@ static void test_build_action_map( ok (IsEqualGUID(&assigned_to, &ddi.guidInstance), "Action and device GUID do not match action=%d\n", action_index); } -static BOOL CALLBACK enumeration_callback( - LPCDIDEVICEINSTANCE lpddi, - LPDIRECTINPUTDEVICE8 lpdid, - DWORD dwFlags, - DWORD dwRemaining, - LPVOID pvRef) +static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, + DWORD dwFlags, DWORD dwRemaining, LPVOID pvRef) { HRESULT hr; DIPROPDWORD dp; @@ -266,9 +252,9 @@ static BOOL CALLBACK enumeration_callback( static void test_action_mapping(void) { HRESULT hr; - HINSTANCE hinst = GetModuleHandle(NULL); - LPDIRECTINPUT8 pDI = NULL; - DIACTIONFORMAT af; + HINSTANCE hinst = GetModuleHandleA(NULL); + IDirectInput8A *pDI = NULL; + DIACTIONFORMATA af; struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&pDI); @@ -293,7 +279,7 @@ static void test_action_mapping(void) memset (&af, 0, sizeof(af)); af.dwSize = sizeof(af); - af.dwActionSize = sizeof(DIACTION); + af.dwActionSize = sizeof(DIACTIONA); af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); af.rgoAction = actionMapping; @@ -345,15 +331,15 @@ static void test_action_mapping(void) static void test_save_settings(void) { HRESULT hr; - HINSTANCE hinst = GetModuleHandle(NULL); - LPDIRECTINPUT8 pDI = NULL; - DIACTIONFORMAT af; + HINSTANCE hinst = GetModuleHandleA(NULL); + IDirectInput8A *pDI = NULL; + DIACTIONFORMATA af; IDirectInputDevice8A *pKey; static const GUID mapping_guid = { 0xcafecafe, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; static const GUID other_guid = { 0xcafe, 0xcafe, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; - static DIACTION actions[] = { + static DIACTIONA actions[] = { { 0, DIKEYBOARD_A , 0, { "Blam" } }, { 1, DIKEYBOARD_B , 0, { "Kapow"} } }; @@ -392,7 +378,7 @@ static void test_save_settings(void) memset (&af, 0, sizeof(af)); af.dwSize = sizeof(af); - af.dwActionSize = sizeof(DIACTION); + af.dwActionSize = sizeof(DIACTIONA); af.dwDataSize = 4 * sizeof(actions) / sizeof(actions[0]); af.dwNumActions = sizeof(actions) / sizeof(actions[0]); af.rgoAction = actions; diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 2a23194..57f5505 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -436,11 +436,11 @@ struct enum_semantics_test unsigned int device_count; BOOL mouse; BOOL keyboard; - LPDIACTIONFORMAT lpdiaf; + DIACTIONFORMATA *lpdiaf; const char* username; }; -static DIACTION actionMapping[]= +static DIACTIONA actionMapping[]= { /* axis */ { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, { "Steer" } }, @@ -454,7 +454,7 @@ static DIACTION actionMapping[]= { 4, DIMOUSE_YAXIS, 0, { "Y Axis" } } }; -static BOOL CALLBACK enum_semantics_callback(LPCDIDEVICEINSTANCE lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context) +static BOOL CALLBACK enum_semantics_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context) { struct enum_semantics_test *data = context; @@ -469,7 +469,7 @@ static BOOL CALLBACK enum_semantics_callback(LPCDIDEVICEINSTANCE lpddi, IDirectI return DIENUM_CONTINUE; } -static BOOL CALLBACK set_action_map_callback(LPCDIDEVICEINSTANCE lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context) +static BOOL CALLBACK set_action_map_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context) { HRESULT hr; struct enum_semantics_test *data = context; @@ -503,7 +503,7 @@ static void test_EnumDevicesBySemantics(void) memset (&diaf, 0, sizeof(diaf)); diaf.dwSize = sizeof(diaf); - diaf.dwActionSize = sizeof(DIACTION); + diaf.dwActionSize = sizeof(DIACTIONA); diaf.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); diaf.dwDataSize = 4 * diaf.dwNumActions; diaf.rgoAction = actionMapping;

1 0

Marcus Meissner : quartz: Use FreeLibrary instead of CloseHandle (Coverity) .
by Alexandre Julliard 11 Nov '13

11 Nov '13

Module: wine Branch: master Commit: b745d8692b690dd7ec4f5f1ca1deff6116e7694a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b745d8692b690dd7ec4f5f1ca… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Nov 8 23:00:52 2013 +0100 quartz: Use FreeLibrary instead of CloseHandle (Coverity). --- dlls/quartz/vmr9.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2dc12a6..cd1e139 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -838,7 +838,7 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) { TRACE("Destroying\n"); BaseControlWindow_Destroy(&This->baseControlWindow); - CloseHandle(This->hD3d9); + FreeLibrary(This->hD3d9); if (This->allocator) IVMRSurfaceAllocatorEx9_Release(This->allocator); @@ -2308,7 +2308,7 @@ static HRESULT vmr_create(IUnknown *outer_unk, LPVOID *ppv, const CLSID *clsid) fail: BaseRendererImpl_Release(&pVMR->renderer.filter.IBaseFilter_iface); - CloseHandle(pVMR->hD3d9); + FreeLibrary(pVMR->hD3d9); CoTaskMemFree(pVMR); return hr; }

1 0