January 2014 - Wine-Commits

Ken Thomases : winemac: When clearing the OpenGL context, disassociate it from its view.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 18963963306cbb75d409189da8ec2df219850d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18963963306cbb75d409189da… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:24:57 2014 -0600 winemac: When clearing the OpenGL context, disassociate it from its view. --- dlls/winemac.drv/cocoa_opengl.m | 41 +++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index f546be5..0b67ed1 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -90,6 +90,23 @@ } } + - (void) removeFromViews:(BOOL)removeViews + { + if ([self view]) + { + macdrv_remove_view_opengl_context((macdrv_view)[self view], (macdrv_opengl_context)self); + if (removeViews) + [self clearDrawableLeavingSurfaceOnScreen]; + } + if ([self latentView]) + { + macdrv_remove_view_opengl_context((macdrv_view)[self latentView], (macdrv_opengl_context)self); + if (removeViews) + [self setLatentView:nil]; + } + needsUpdate = FALSE; + } + @end @@ -122,11 +139,7 @@ void macdrv_dispose_opengl_context(macdrv_opengl_context c) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineOpenGLContext *context = (WineOpenGLContext*)c; - if ([context view]) - macdrv_remove_view_opengl_context((macdrv_view)[context view], c); - if ([context latentView]) - macdrv_remove_view_opengl_context((macdrv_view)[context latentView], c); - [context clearDrawableLeavingSurfaceOnScreen]; + [context removeFromViews:YES]; [context release]; [pool release]; @@ -143,11 +156,7 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) if (context) { - if ([context view]) - macdrv_remove_view_opengl_context((macdrv_view)[context view], c); - if ([context latentView]) - macdrv_remove_view_opengl_context((macdrv_view)[context latentView], c); - context.needsUpdate = FALSE; + [context removeFromViews:NO]; if (view) { macdrv_add_view_opengl_context(v, c); @@ -169,11 +178,19 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) else { [WineOpenGLContext clearCurrentContext]; - [context clearDrawableLeavingSurfaceOnScreen]; + [context removeFromViews:YES]; } } else - [WineOpenGLContext clearCurrentContext]; + { + WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext]; + + if ([currentContext isKindOfClass:[WineOpenGLContext class]]) + { + [WineOpenGLContext clearCurrentContext]; + [currentContext removeFromViews:YES]; + } + } [pool release]; }

1 0

Alexandre Julliard : makedep: Generate dependencies for mo files when supported.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: ab4fc685ba7c035dff91b8c486a95882eaa8dc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4fc685ba7c035dff91b8c48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 11:49:42 2014 +0100 makedep: Generate dependencies for mo files when supported. --- Make.vars.in | 2 -- configure | 7 ++---- configure.ac | 5 ++-- tools/makedep.c | 69 +++++++++++++++++++++++++++++-------------------------- 4 files changed, 41 insertions(+), 42 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 1a1aae9..61c2016 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -49,8 +49,6 @@ ICOTOOL = @ICOTOOL@ MSGFMT = @MSGFMT@ CROSSTARGET = @CROSSTARGET@ LINGUAS = @LINGUAS@ -ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo) -PORCFLAGS = @PORCFLAGS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT) diff --git a/configure b/configure index 7255985..6e6488e 100755 --- a/configure +++ b/configure @@ -624,7 +624,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS -PORCFLAGS LINGUAS LDAPLIBS LIBRT @@ -17383,11 +17382,9 @@ fi if test "$MSGFMT" != false then - PORCFLAGS="--po-dir=\$(top_builddir)/po" - - wine_fn_append_rule "__builddeps__: \$(ALL_MO_FILES) + wine_fn_append_rule "__builddeps__: \$(LINGUAS:%=po/%.mo) clean:: - \$(RM) \$(ALL_MO_FILES)" + \$(RM) \$(LINGUAS:%=po/%.mo)" posrc="po" test "$srcdir" = . || posrc="$srcdir/po" diff --git a/configure.ac b/configure.ac index dcabb55..c60d870 100644 --- a/configure.ac +++ b/configure.ac @@ -3445,11 +3445,10 @@ fi if test "$MSGFMT" != false then - AC_SUBST([PORCFLAGS],["--po-dir=\$(top_builddir)/po"]) WINE_APPEND_RULE( -[__builddeps__: \$(ALL_MO_FILES) +[__builddeps__: \$(LINGUAS:%=po/%.mo) clean:: - \$(RM) \$(ALL_MO_FILES)]) + \$(RM) \$(LINGUAS:%=po/%.mo)]) posrc="po" test "$srcdir" = . || posrc="$srcdir/po" diff --git a/tools/makedep.c b/tools/makedep.c index c7512a8..108cdb0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1408,6 +1408,7 @@ static struct strarray output_sources(void) struct strarray res_files = empty_strarray; struct strarray clean_files = empty_strarray; struct strarray po_files = empty_strarray; + struct strarray mo_files = empty_strarray; struct strarray mc_files = empty_strarray; struct strarray test_files = empty_strarray; struct strarray dlldata_files = empty_strarray; @@ -1415,6 +1416,7 @@ static struct strarray output_sources(void) struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; struct strarray phony_targets = empty_strarray; + struct strarray linguas = get_expanded_make_var_array( "LINGUAS" ); struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray targetflags = get_expanded_make_var_array( "TARGETFLAGS" ); struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" ); @@ -1429,6 +1431,9 @@ static struct strarray output_sources(void) if (module && strendswith( module, ".a" )) staticlib = module; 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( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); if (parent_dir) strarray_add( &includes, strmake( "-I%s", src_dir_path( parent_dir ))); @@ -1491,47 +1496,47 @@ static struct strarray output_sources(void) } else if (!strcmp( ext, "rc" )) /* resource file */ { - if (source->flags & FLAG_RC_PO) + strarray_add( &res_files, strmake( "%s.res", obj )); + output( "%s.res: %s %s\n", obj, tools_path( "wrc" ), source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); + output( "\t%s -o $@ %s", tools_path( "wrc" ), source->filename ); + if (is_win16) output_filename( "-m16" ); + else output_filenames( targetflags ); + output_filename( "--nostdinc" ); + output_filenames( includes ); + output_filenames( define_args ); + output_filenames( extradefs ); + if (mo_files.count && (source->flags & FLAG_RC_PO)) { - output( "%s.res: %s $(ALL_MO_FILES) %s\n", obj, tools_path( "wrc" ), source->filename ); - if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); - output( "\t%s -o $@ %s", tools_path( "wrc" ), source->filename ); - if (is_win16) output_filename( "-m16" ); - else output_filenames( targetflags ); - output_filename( "--nostdinc" ); - output_filenames( includes ); - output_filenames( define_args ); - output_filenames( extradefs ); - output_filename( "$(PORCFLAGS)" ); - output( "\n" ); - output( "%s.res rsrc.pot:", obj ); strarray_add( &po_files, source->filename ); - } - else - { - output( "%s.res: %s %s\n", obj, tools_path( "wrc" ), source->filename ); - if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); - output( "\t%s -o $@ %s", tools_path( "wrc" ), source->filename ); - if (is_win16) output_filename( "-m16" ); - else output_filenames( targetflags ); - output_filename( "--nostdinc" ); - output_filenames( includes ); - output_filenames( define_args ); - output_filenames( extradefs ); - output_filename( "$(PORCFLAGS)" ); + output_filename( strmake( "--po-dir=%s/po", top_obj_dir )); output( "\n" ); output( "%s.res:", obj ); + output_filenames( mo_files ); + output( "\n" ); + output( "rsrc.pot " ); } - strarray_add( &res_files, strmake( "%s.res", obj )); + else output( "\n" ); + output( "%s.res:", obj ); } else if (!strcmp( ext, "mc" )) /* message file */ { - output( "%s.res: %s $(ALL_MO_FILES) %s\n", obj, tools_path( "wmc" ), source->filename ); - if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); - output( "\t%s -U -O res $(PORCFLAGS) -o $@ %s\n", tools_path( "wmc" ), source->filename ); strarray_add( &res_files, strmake( "%s.res", obj )); - strarray_add( &mc_files, source->filename ); - output( "msg.pot %s.res:", obj ); + output( "%s.res: %s %s\n", obj, tools_path( "wmc" ), source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); + output( "\t%s -U -O res -o $@ %s", tools_path( "wmc" ), source->filename ); + if (mo_files.count) + { + strarray_add( &mc_files, source->filename ); + output_filename( strmake( "--po-dir=%s/po", top_obj_dir )); + output( "\n" ); + output( "%s.res:", obj ); + output_filenames( mo_files ); + output( "\n" ); + output( "msg.pot " ); + } + else output( "\n" ); + output( "%s.res:", obj ); } else if (!strcmp( ext, "idl" )) /* IDL file */ {

1 0

Alexandre Julliard : user32/tests: Protect the global message sequence with a critical section.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 70009d053c803ecdc7a3d54d14003b68a5d1fb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70009d053c803ecdc7a3d54d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 13:31:10 2014 +0100 user32/tests: Protect the global message sequence with a critical section. --- dlls/user32/tests/msg.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f9398ee..dffaa8d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1723,6 +1723,7 @@ static BOOL after_end_dialog, test_def_id, paint_loop_done; static int sequence_cnt, sequence_size; static struct recvd_message* sequence; static int log_all_parent_messages; +static CRITICAL_SECTION sequence_cs; /* user32 functions */ static HWND (WINAPI *pGetAncestor)(HWND,UINT); @@ -1813,7 +1814,8 @@ static void add_message_(int line, const struct recvd_message *msg) { struct recvd_message *seq; - if (!sequence) + EnterCriticalSection( &sequence_cs ); + if (!sequence) { sequence_size = 10; sequence = HeapAlloc( GetProcessHeap(), 0, sequence_size * sizeof(*sequence) ); @@ -1825,7 +1827,7 @@ static void add_message_(int line, const struct recvd_message *msg) } assert(sequence); - seq = &sequence[sequence_cnt]; + seq = &sequence[sequence_cnt++]; seq->hwnd = msg->hwnd; seq->message = msg->message; seq->flags = msg->flags; @@ -1834,6 +1836,7 @@ static void add_message_(int line, const struct recvd_message *msg) seq->line = line; seq->descr = msg->descr; seq->output[0] = 0; + LeaveCriticalSection( &sequence_cs ); if (msg->descr) { @@ -1918,8 +1921,6 @@ static void add_message_(int line, const struct recvd_message *msg) sprintf( seq->output + strlen(seq->output), " (flags %x)", msg->flags ); } } - - sequence_cnt++; } /* try to make sure pending X events have been processed before continuing */ @@ -1940,9 +1941,11 @@ static void flush_events(void) static void flush_sequence(void) { + EnterCriticalSection( &sequence_cs ); HeapFree(GetProcessHeap(), 0, sequence); sequence = 0; sequence_cnt = sequence_size = 0; + LeaveCriticalSection( &sequence_cs ); } static void dump_sequence(const struct message *expected, const char *context, const char *file, int line) @@ -14290,6 +14293,7 @@ START_TEST(msg) return; } + InitializeCriticalSection( &sequence_cs ); init_procs(); hModuleImm32 = LoadLibraryA("imm32.dll"); @@ -14402,4 +14406,5 @@ START_TEST(msg) GetLastError() == 0xdeadbeef, /* Win9x */ "unexpected error %d\n", GetLastError()); } + DeleteCriticalSection( &sequence_cs ); }

1 0

Piotr Caban : msvcp110: Make locale::facet::Incref and Decref virtual.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 866b616d1b296642f0db484b1131b4ee4bdeb49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=866b616d1b296642f0db484b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:54:09 2014 +0100 msvcp110: Make locale::facet::Incref and Decref virtual. --- dlls/msvcp110/msvcp110.spec | 12 +- dlls/msvcp90/locale.c | 655 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 623 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=866b616d1b296642f0db4…

1 0

Alexandre Julliard : makedep: Expand compilation flags into the generated rules.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d19b68fa1aa6b282a87e21c491698b3da03e277d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19b68fa1aa6b282a87e21c49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 11:45:54 2014 +0100 makedep: Expand compilation flags into the generated rules. --- Make.rules.in | 6 ------ tools/makedep.c | 25 +++++++++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index ec79531..e34bf53 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -11,15 +11,9 @@ # First some useful definitions -ALLCFLAGS = $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) -IDLFLAGS = $(EXTRAIDLFLAGS) -RCFLAGS = --nostdinc $(PORCFLAGS) - OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(OBJC_SRCS:.m=.o) \ $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) -ALLCROSSCFLAGS = $(CPPFLAGS) $(CFLAGS) - # Rules for cleaning clean:: diff --git a/tools/makedep.c b/tools/makedep.c index 4a34a01..c7512a8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1462,7 +1462,7 @@ static struct strarray output_sources(void) { output( "%s.tab.h: %s\n", obj, source->filename ); if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); - output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o %s.tab.c -d %s\n", + output( "\t$(BISON) -p %s_ -o %s.tab.c -d %s\n", obj, obj, source->filename ); output( "%s.tab.c: %s %s\n", obj, source->filename, header ); strarray_add( &clean_files, strmake( "%s.tab.h", obj )); @@ -1470,7 +1470,7 @@ static struct strarray output_sources(void) else output( "%s.tab.c: %s\n", obj, source->filename ); if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); - output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); + output( "\t$(BISON) -p %s_ -o $@ %s\n", obj, source->filename ); free( header ); continue; /* no dependencies */ } @@ -1486,7 +1486,7 @@ static struct strarray output_sources(void) { output( "%s.yy.c: %s\n", obj, source->filename ); if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); - output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename ); + output( "\t$(FLEX) -o$@ %s\n", source->filename ); continue; /* no dependencies */ } else if (!strcmp( ext, "rc" )) /* resource file */ @@ -1498,10 +1498,11 @@ static struct strarray output_sources(void) output( "\t%s -o $@ %s", tools_path( "wrc" ), source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filename( "--nostdinc" ); output_filenames( includes ); output_filenames( define_args ); output_filenames( extradefs ); - output_filename( "$(RCFLAGS)" ); + output_filename( "$(PORCFLAGS)" ); output( "\n" ); output( "%s.res rsrc.pot:", obj ); strarray_add( &po_files, source->filename ); @@ -1513,10 +1514,11 @@ static struct strarray output_sources(void) output( "\t%s -o $@ %s", tools_path( "wrc" ), source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filename( "--nostdinc" ); output_filenames( includes ); output_filenames( define_args ); output_filenames( extradefs ); - output_filename( "$(RCFLAGS)" ); + output_filename( "$(PORCFLAGS)" ); output( "\n" ); output( "%s.res:", obj ); } @@ -1556,7 +1558,7 @@ static struct strarray output_sources(void) output_filenames( includes ); output_filenames( define_args ); output_filenames( extradefs ); - output_filename( "$(IDLFLAGS)" ); + output_filenames( get_expanded_make_var_array( "EXTRAIDLFLAGS" )); output( "\n" ); output_filenames( targets ); output( ": %s", source->filename ); @@ -1637,7 +1639,9 @@ static struct strarray output_sources(void) output_filenames( define_args ); output_filenames( extradefs ); if (module || staticlib || testdll) output_filenames( dllflags ); - output_filename( "$(ALLCFLAGS)" ); + output_filenames( get_expanded_make_var_array( "EXTRACFLAGS" )); + output_filenames( get_expanded_make_var_array( "CPPFLAGS" )); + output_filename( "$(CFLAGS)" ); output( "\n" ); if (crosstarget && need_cross) { @@ -1649,7 +1653,8 @@ static struct strarray output_sources(void) output_filenames( define_args ); output_filenames( extradefs ); output_filename( "-DWINE_CROSSTEST" ); - output_filename( "$(ALLCROSSCFLAGS)" ); + output_filenames( get_expanded_make_var_array( "CPPFLAGS" )); + output_filename( "$(CFLAGS)" ); output( "\n" ); } if (testdll && !strcmp( ext, "c" ) && !(source->flags & FLAG_GENERATED)) @@ -1680,12 +1685,12 @@ static struct strarray output_sources(void) output_filenames( po_files ); output( "\n" ); output( "\t%s -O pot -o $@", tools_path( "wrc" )); + output_filenames( po_files ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filename( "--nostdinc" ); output_filenames( includes ); output_filenames( define_args ); - output_filename( "$(RCFLAGS)" ); - output_filenames( po_files ); output( "\n" ); strarray_add( &clean_files, "rsrc.pot" ); }

1 0

Dmitry Timoshkov : taskschd/tests: Add some tests for invalid parameters.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d9b9faa18ad32fb9f6da33ca3be2e7825e6a1944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9b9faa18ad32fb9f6da33ca3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 17:18:18 2014 +0900 taskschd/tests: Add some tests for invalid parameters. --- dlls/taskschd/tests/scheduler.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 02382c5..1953199 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -46,11 +46,17 @@ static void test_Connect(void) return; } + hr = ITaskService_get_Connected(service, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); ok(hr == S_OK, "get_Connected error %#x\n", hr); ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); + hr = ITaskService_get_TargetServer(service, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = ITaskService_get_TargetServer(service, &bstr); ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#x\n", hr);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskService::Connect.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 938f073e5cbe9c479fbc50ec652b8e0dd7de3661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938f073e5cbe9c479fbc50ec6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 17:18:07 2014 +0900 taskschd: Implement ITaskService::Connect. --- dlls/taskschd/task.c | 48 +++++++++++++++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 5 ---- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 76c0e9b..fd64bf9 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -27,6 +27,7 @@ #include "taskschd.h" #include "taskschd_private.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(taskschd); @@ -36,6 +37,7 @@ typedef struct ITaskService ITaskService_iface; LONG ref; BOOL connected; + WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; } TaskService; static inline TaskService *impl_from_ITaskService(ITaskService *iface) @@ -127,11 +129,53 @@ static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITas return E_NOTIMPL; } +static inline BOOL is_variant_null(const VARIANT *var) +{ + return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL; +} + static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, VARIANT user, VARIANT domain, VARIANT password) { - FIXME("%p,%s,%s,%s,%s: stub\n", iface, debugstr_variant(&server), debugstr_variant(&user), + TaskService *task_svc = impl_from_ITaskService(iface); + WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len; + + TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user), debugstr_variant(&domain), debugstr_variant(&password)); - return E_NOTIMPL; + + if (!is_variant_null(&user) || !is_variant_null(&domain) || !is_variant_null(&password)) + FIXME("user/domain/password are ignored\n"); + + len = sizeof(comp_name)/sizeof(comp_name[0]); + if (!GetComputerNameW(comp_name, &len)) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!is_variant_null(&server)) + { + const WCHAR *server_name; + + if (V_VT(&server) != VT_BSTR) + { + FIXME("server variant type %d is not supported\n", V_VT(&server)); + return HRESULT_FROM_WIN32(ERROR_BAD_NETPATH); + } + + /* skip UNC prefix if any */ + server_name = V_BSTR(&server); + if (server_name[0] == '\\' && server_name[1] == '\\') + server_name += 2; + + if (strcmpiW(server_name, comp_name)) + { + FIXME("connection to remote server %s is not supported\n", debugstr_w(V_BSTR(&server))); + return HRESULT_FROM_WIN32(ERROR_BAD_NETPATH); + } + } + + strcpyW(task_svc->comp_name, comp_name); + task_svc->connected = TRUE; + + return S_OK; } static HRESULT WINAPI TaskService_get_Connected(ITaskService *iface, VARIANT_BOOL *connected) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index adb7487..bf84c0d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -67,30 +67,25 @@ todo_wine V_BSTR(&v_comp) = SysAllocString(comp_name); hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); -todo_wine ok(hr == S_OK || hr == E_ACCESSDENIED /* not an administrator */, "Connect error %#x\n", hr); SysFreeString(V_BSTR(&v_comp)); V_BSTR(&v_comp) = SysAllocString(deadbeefW); hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "expected ERROR_BAD_NETPATH, got %#x\n", hr); vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); ok(hr == S_OK, "get_Connected error %#x\n", hr); -todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); -todo_wine ok(hr == S_OK, "Connect error %#x\n", hr); vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); ok(hr == S_OK, "get_Connected error %#x\n", hr); -todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); hr = ITaskService_get_TargetServer(service, &bstr);

1 0

Ken Thomases : winemac: Don't remove an OpenGL context from its view if we 're only going to re-add it.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 2963a2d4ab8c1843a97e9086fd0c2f7c5c843aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2963a2d4ab8c1843a97e9086f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:05 2014 -0600 winemac: Don't remove an OpenGL context from its view if we're only going to re-add it. If the context is being made current with its existing view, just update it before making it current. --- dlls/winemac.drv/cocoa_opengl.m | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 196da46..5ec5688 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -156,20 +156,25 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) if (context && view) { - [context removeFromViews:NO]; - macdrv_add_view_opengl_context(v, c); - - if (context.needsUpdate) - { - context.needsUpdate = FALSE; - [context setView:view]; - [context setLatentView:nil]; - } + if (view == [context view] || view == [context latentView]) + macdrv_update_opengl_context(c); else { - if ([context view]) - [context clearDrawableLeavingSurfaceOnScreen]; - [context setLatentView:view]; + [context removeFromViews:NO]; + macdrv_add_view_opengl_context(v, c); + + if (context.needsUpdate) + { + context.needsUpdate = FALSE; + [context setView:view]; + [context setLatentView:nil]; + } + else + { + if ([context view]) + [context clearDrawableLeavingSurfaceOnScreen]; + [context setLatentView:view]; + } } [context makeCurrentContext];

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 993fb8636c9d7ebb9369af5e1b2a36673e6d708a URL: http://source.winehq.org/git/wine.git/?a=commit;h=993fb8636c9d7ebb9369af5e1… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 13 18:01:47 2014 +0100 po: Update German translation. --- po/de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index c48a8b8..e6e9286 100644 --- a/po/de.po +++ b/po/de.po @@ -10149,7 +10149,7 @@ msgstr "Wine Befehlsprozessor" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10219,10 +10219,8 @@ msgid "Wine Explorer" msgstr "Wine Explorer" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Autostart" +msgstr "Start" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Jonathan Liu : wined3d: Avoid wined3d_ftoa buffer overflow.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 91c5cf33adfa000fe1376ff2ca58d320bbcb95d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c5cf33adfa000fe1376ff2c… Author: Jonathan Liu <net147(a)gmail.com> Date: Tue Jan 14 21:45:42 2014 +1100 wined3d: Avoid wined3d_ftoa buffer overflow. --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/utils.c | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ff4345f..0866820 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -767,7 +767,7 @@ static void shader_arb_update_float_pixel_constants(struct wined3d_device *devic static void shader_arb_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) { - char str[4][16]; + char str[4][17]; wined3d_ftoa(values[0], str[0]); wined3d_ftoa(values[1], str[1]); @@ -3605,7 +3605,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, BOOL custom_linear_fog = FALSE; char srgbtmp[4][4]; - char ftoa_tmp[16]; + char ftoa_tmp[17]; unsigned int i, found = 0; for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) @@ -4220,7 +4220,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, shader_addline(buffer, "TEMP TMP_FOGCOORD;\n"); if (need_helper_const(shader_data, reg_maps, gl_info)) { - char ftoa_tmp[16]; + char ftoa_tmp[17]; wined3d_ftoa(eps, ftoa_tmp); shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %s};\n", ftoa_tmp); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 351742b..32ad9e7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -250,7 +250,7 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) { - char str[4][16]; + char str[4][17]; wined3d_ftoa(values[0], str[0]); wined3d_ftoa(values[1], str[1]); @@ -1415,7 +1415,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); struct glsl_src_param rel_param0, rel_param1; - char imm_str[4][16]; + char imm_str[4][17]; if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 54eb988..fa72a07 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3814,6 +3814,9 @@ void wined3d_ftoa(float value, char *s) if (copysignf(1.0f, value) < 0.0f) ++idx; + /* Be sure to allocate a buffer of at least 17 characters for the result + as sprintf may return a 3 digit exponent when using the MSVC runtime + instead of a 2 digit exponent. */ sprintf(s, "%.8e", value); if (isfinite(value)) s[idx] = '.';

1 0

Dmitry Timoshkov : windowscodecs: Move the aggregation check from object constructors to class factory.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d03f65a51fd4977f7875d87a6dffe5769caa8e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03f65a51fd4977f7875d87a6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 20:18:11 2014 +0900 windowscodecs: Move the aggregation check from object constructors to class factory. --- dlls/windowscodecs/bmpdecode.c | 14 ++++----- dlls/windowscodecs/bmpencode.c | 6 ++-- dlls/windowscodecs/clsfactory.c | 8 ++++-- dlls/windowscodecs/converter.c | 6 ++-- dlls/windowscodecs/gifformat.c | 26 ++++++++--------- dlls/windowscodecs/icnsformat.c | 8 ++---- dlls/windowscodecs/icoformat.c | 8 ++---- dlls/windowscodecs/imgfactory.c | 8 ++---- dlls/windowscodecs/jpegformat.c | 16 ++++------- dlls/windowscodecs/metadatahandler.c | 12 ++++---- dlls/windowscodecs/pngformat.c | 20 ++++++------- dlls/windowscodecs/proxy.c | 2 +- dlls/windowscodecs/tgaformat.c | 6 ++-- dlls/windowscodecs/tiffformat.c | 16 ++++------- dlls/windowscodecs/wincodecs_private.h | 49 ++++++++++++++++---------------- 15 files changed, 89 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d03f65a51fd4977f7875d…

1 0

Alexandre Julliard : gdi32/tests: Update a few more failing DIB cases.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 36301db4d3b7dcb544e32d9da3f69288ecc74f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36301db4d3b7dcb544e32d9da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 20:10:41 2014 +0100 gdi32/tests: Update a few more failing DIB cases. --- dlls/gdi32/tests/dib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d23fba5..6e0fccd 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1127,12 +1127,12 @@ static const char *sha1_graphics_1[] = "4842a30dd7fdf38ddc3ddec85c08efe13a0e2e0b", "cc76db6da5ba1776f20240a5ad97a26a9cdf96b0", "014f477664a7f4ce4a948d6359a2707119afc8e2", - "1ee4e951743efc8764249fbc7adecefbfec0428e", + "74d01690e344bc22e7a0478e7a09ccd92354c486", "9ab50a663b74577b656e9849484a909d7ac52eeb", "128eefd2ee043d59dc37918065f687e378e5ca95", - "c642abc651f525332d9d635049646d309e877839", + "d7e2daab98ce1f698c4bfedfc01c0d79fcb76b8e", "8d34215487088b5d4ef63062270ce25c2862643d", - "3dc3075b0c87fdcaabbbae8928303fb2358c15c2", + "826562eb11a0d0bba77fa21245f7406a194e9225", "bbae6f0659e095a42b420082079663f937065813", "bbabe686a6955402c90530e7c67f1428868369b3", NULL

1 0

Michael Stefaniuc : dmscript: Return CLASS_E_CLASSNOTAVAILABLE for classes not implemented.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 1643038eca27f31c4c10487268107946483550cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1643038eca27f31c4c1048726… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 13 21:53:11 2014 +0100 dmscript: Return CLASS_E_CLASSNOTAVAILABLE for classes not implemented. --- dlls/dmscript/dmscript_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index e3dc8b7..6caf158 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -37,7 +37,7 @@ static HRESULT WINAPI create_unimpl_instance(REFIID riid, void **ppv, IUnknown * { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return E_NOINTERFACE; + return CLASS_E_CLASSNOTAVAILABLE; } /******************************************************************

1 0

Dmitry Timoshkov : taskschd: Implement ITaskService::get_TargetServer.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: c940a3e97e930e089ab3d168ddbef1da196d689c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c940a3e97e930e089ab3d168d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 17:18:11 2014 +0900 taskschd: Implement ITaskService::get_TargetServer. --- dlls/taskschd/Makefile.in | 1 + dlls/taskschd/task.c | 15 +++++++++++++-- dlls/taskschd/tests/scheduler.c | 2 -- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 2436289..2b49585 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,4 +1,5 @@ MODULE = taskschd.dll +IMPORTS = oleaut32 C_SRCS = \ task.c \ diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index fd64bf9..5ff3761 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -193,8 +193,19 @@ static HRESULT WINAPI TaskService_get_Connected(ITaskService *iface, VARIANT_BOO static HRESULT WINAPI TaskService_get_TargetServer(ITaskService *iface, BSTR *server) { - FIXME("%p,%p: stub\n", iface, server); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, server); + + if (!server) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + *server = SysAllocString(task_svc->comp_name); + if (!*server) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI TaskService_get_ConnectedUser(ITaskService *iface, BSTR *user) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index bf84c0d..02382c5 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -52,7 +52,6 @@ static void test_Connect(void) ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); hr = ITaskService_get_TargetServer(service, &bstr); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#x\n", hr); /* Win7 doesn't support UNC \\ prefix, but according to a user @@ -89,7 +88,6 @@ todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); hr = ITaskService_get_TargetServer(service, &bstr); -todo_wine ok(hr == S_OK, "get_TargetServer error %#x\n", hr); if (hr == S_OK) {

1 0

Alexandre Julliard : makefiles: Get rid of Make.rules.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 509364e1dd0c6bd4c1aa90573ddc33c1acd2fca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509364e1dd0c6bd4c1aa90573… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 11:59:25 2014 +0100 makefiles: Get rid of Make.rules. --- Make.rules.in | 30 ------------ Make.vars.in | 1 - aclocal.m4 | 55 ++++----------------- configure | 112 ++++++++++--------------------------------- configure.ac | 12 ++++- documentation/Makefile.in | 2 - fonts/Makefile.in | 4 +- include/Makefile.in | 4 +- libs/port/Makefile.in | 2 - libs/wine/Makefile.in | 3 +- libs/wpp/Makefile.in | 2 - loader/Makefile.in | 3 +- server/Makefile.in | 4 +- tools/Makefile.in | 4 +- tools/make_makefiles | 25 +--------- tools/widl/Makefile.in | 4 +- tools/winebuild/Makefile.in | 4 +- tools/winedump/Makefile.in | 4 +- tools/winegcc/Makefile.in | 4 +- tools/wmc/Makefile.in | 4 +- tools/wrc/Makefile.in | 4 +- 21 files changed, 76 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=509364e1dd0c6bd4c1aa9…

1 0

Ken Thomases : winemac: When setting a view for an OpenGL context and it is latent, clear any existing view.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d57a99b48274e2020382465bccc69df5aa24630e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57a99b48274e2020382465bc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:01 2014 -0600 winemac: When setting a view for an OpenGL context and it is latent, clear any existing view. --- dlls/winemac.drv/cocoa_opengl.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 0b67ed1..752fb77 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -168,7 +168,11 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) [context setLatentView:nil]; } else + { + if ([context view]) + [context clearDrawableLeavingSurfaceOnScreen]; [context setLatentView:view]; + } [context makeCurrentContext];

1 0

André Hentschel : oleaut32/tests: Mark W2k results as broken.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 0485e528f7c3fcf73f5dbf5ad5d6d1444de43192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0485e528f7c3fcf73f5dbf5ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 12 23:28:14 2014 +0100 oleaut32/tests: Mark W2k results as broken. --- dlls/oleaut32/tests/safearray.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 3e311e3..bb346f6 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1467,11 +1467,17 @@ static void test_SafeArrayCopyData(void) sa = SafeArrayCreateVector(VT_UI1, 0, 2); sacopy = SafeArrayCreateVector(VT_UI1, 0, 2); - ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sa->fFeatures); - ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sacopy->fFeatures); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(sa->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%08x\n", sa->fFeatures); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(sacopy->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%08x\n", sacopy->fFeatures); hres = SafeArrayCopyData(sa, sacopy); ok(hres == S_OK, "got 0x%08x\n", hres); - ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%04x\n", sacopy->fFeatures); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(sacopy->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%04x\n", sacopy->fFeatures); SafeArrayDestroy(sacopy); sacopy = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab); @@ -1771,10 +1777,14 @@ static void test_SafeArrayCopy(void) /* copy from a vector */ sa = SafeArrayCreateVector(VT_UI1, 0, 2); - ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", hres); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(!sa->fFeatures /* W2k */), + "got 0x%08x\n", hres); hres = SafeArrayCopy(sa, &sa2); ok(hres == S_OK, "got 0x%08x\n", hres); - ok(sa2->fFeatures == FADF_HAVEVARTYPE, "got 0x%04x\n", sa2->fFeatures); + ok(sa2->fFeatures == FADF_HAVEVARTYPE || + broken(!sa2->fFeatures /* W2k */), "got 0x%04x\n", + sa2->fFeatures); SafeArrayDestroy(sa2); SafeArrayDestroy(sa);

1 0

Andrey Gusev : Assorted typos fixes.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: be367393c95bd391d7ad3309d3e085d9f4be2237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be367393c95bd391d7ad3309d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jan 11 17:02:02 2014 +0200 Assorted typos fixes. --- dlls/acledit/main.c | 2 +- dlls/advapi32/security.c | 4 ++-- dlls/atl100/atl.c | 2 +- dlls/avifil32/api.c | 2 +- dlls/avifil32/avifile.c | 2 +- dlls/comctl32/dpa.c | 2 +- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/listview.c | 6 +++--- dlls/comctl32/tests/trackbar.c | 2 +- dlls/comctl32/treeview.c | 2 +- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/fontdlg.c | 2 +- dlls/comdlg32/printdlg.c | 8 ++++---- dlls/crypt32/tests/store.c | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index d1a9ac7..49de8b5 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -55,7 +55,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) LONG WINAPI FMExtensionProcW(HWND hWnd, WORD wEvent, LONG lParam) { - FIXME("%p, %d, 0x%x) stub\n", hWnd, wEvent, lParam); + FIXME("(%p, %d, 0x%x) stub\n", hWnd, wEvent, lParam); return 0; } diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 280ba77..ac0a941 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5302,7 +5302,7 @@ BOOL WINAPI CreateProcessAsUserW( LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation ) { - FIXME("%p %s %s %p %p %d 0x%08x %p %s %p %p - semi- stub\n", hToken, + FIXME("%p %s %s %p %p %d 0x%08x %p %s %p %p - semi-stub\n", hToken, debugstr_w(lpApplicationName), debugstr_w(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); @@ -5801,7 +5801,7 @@ DWORD WINAPI TreeResetNamedSecurityInfoW( LPWSTR pObjectName, BOOL KeepExplicit, FN_PROGRESS fnProgress, PROG_INVOKE_SETTING ProgressInvokeSetting, PVOID Args) { - FIXME("(%s, %i, %i, %p, %p, %p, %p, %i, %p, %i, %p Stub\n", + FIXME("(%s, %i, %i, %p, %p, %p, %p, %i, %p, %i, %p) stub\n", debugstr_w(pObjectName), ObjectType, SecurityInfo, pOwner, pGroup, pDacl, pSacl, KeepExplicit, fnProgress, ProgressInvokeSetting, Args); diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 9156afb..058fa22 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -391,7 +391,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, */ HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE *winmod) { - TRACE("(%p\n", winmod); + TRACE("(%p)\n", winmod); if(winmod->cbSize != sizeof(*winmod)) return E_INVALIDARG; diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 6c07a2f..20985cd 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1515,7 +1515,7 @@ HRESULT WINAPI AVISaveVA(LPCSTR szFile, CLSID *pclsidHandler, HRESULT hr; int len; - TRACE("%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler, + TRACE("(%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler, lpfnCallback, nStream, ppavi, plpOptions); if (szFile == NULL || ppavi == NULL || plpOptions == NULL) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 7c14805..6295c7b 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1292,7 +1292,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, void if (fcc == ckidSTREAMHANDLERDATA) { if (This->lpHandlerData != NULL) { - FIXME(": handler data already set -- overwirte?\n"); + FIXME(": handler data already set -- overwrite?\n"); return AVIERR_UNSUPPORTED; } diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 11dd14f..0b96df6 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -269,7 +269,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, INT nResult, i; INT nIndex; - TRACE("%p %p %08x %p %p %08lx)\n", + TRACE("(%p %p %08x %p %p %08lx)\n", hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam); if (IsBadWritePtr (hdpa1, sizeof(*hdpa1))) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 6461df6..ec90a9c 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2889,7 +2889,7 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) himl->hbmImage = hbmNewBitmap; } else - ERR("Could not create new image bitmap !\n"); + ERR("Could not create new image bitmap!\n"); if (himl->hbmMask) { diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5ce7de2..bc9a04c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8247,7 +8247,7 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) INT max_cx = 0; HDITEMW hdi; - TRACE("(nColumn=%d, cx=%d\n", nColumn, cx); + TRACE("(nColumn=%d, cx=%d)\n", nColumn, cx); /* set column width only if in report or list mode */ if (infoPtr->uView != LV_VIEW_DETAILS && infoPtr->uView != LV_VIEW_LIST) return FALSE; @@ -8631,7 +8631,7 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG INT oldHeight = infoPtr->nItemHeight; HIMAGELIST himlOld = 0; - TRACE("(nType=%d, himl=%p\n", nType, himl); + TRACE("(nType=%d, himl=%p)\n", nType, himl); switch (nType) { @@ -8786,7 +8786,7 @@ static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, const PO { POINT Origin, Pt; - TRACE("(nItem=%d, pt=%s\n", nItem, wine_dbgstr_point(pt)); + TRACE("(nItem=%d, pt=%s)\n", nItem, wine_dbgstr_point(pt)); if (!pt || nItem < 0 || nItem >= infoPtr->nItemCount || !(infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON)) return FALSE; diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 3ee7fda..32c9575 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -777,7 +777,7 @@ static void test_tic_settings(HWND hWndTrackbar){ ok(r == TRUE, "Expected TRUE, got %d\n", r); r = SendMessageA(hWndTrackbar, TBM_SETTIC, 0, 20); - ok(r == FALSE, "Expected False, got %d\n", r); + ok(r == FALSE, "Expected FALSE, got %d\n", r); /* test TBM_SETTICFREQ */ SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(0, 10)); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index a885543..b2eed3c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3428,7 +3428,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, TREEVIEW_ITEM *nextItem, *tmpItem; BOOL sendsNotifications; - TRACE("(%p, %p, partial=%d, %d\n", infoPtr, item, partial, user); + TRACE("(%p, %p, partial=%d, %d)\n", infoPtr, item, partial, user); if (!TREEVIEW_HasChildren(infoPtr, item)) return FALSE; diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 5f4c676..0409915 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -89,7 +89,7 @@ static BOOL FD31_Init(void) if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 || hHDisk == 0 || hCDRom == 0 || hNet == 0) { - ERR("Error loading icons !\n"); + ERR("Error loading icons!\n"); return FALSE; } initialized = TRUE; diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 68f0467..9e73ec9 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -632,7 +632,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) if (lpcf->lStructSize != sizeof(CHOOSEFONTW)) { - ERR("structure size failure !!!\n"); + ERR("structure size failure!!!\n"); EndDialog (hDlg, 0); return FALSE; } diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 292f764..d52b47d 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1495,7 +1495,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, PrintStructures->hNoCollateIcon == 0 || PrintStructures->hPortraitIcon == 0 || PrintStructures->hLandscapeIcon == 0) { - ERR("no icon in resourcefile\n"); + ERR("no icon in resource file\n"); COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); EndDialog(hDlg, FALSE); } @@ -1603,7 +1603,7 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, PrintStructures->hNoCollateIcon == 0 || PrintStructures->hPortraitIcon == 0 || PrintStructures->hLandscapeIcon == 0) { - ERR("no icon in resourcefile\n"); + ERR("no icon in resource file\n"); COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); EndDialog(hDlg, FALSE); } @@ -2263,7 +2263,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) } if(lppd->lStructSize != sizeof(PRINTDLGA)) { - WARN("structure size failure !!!\n"); + WARN("structure size failure!!!\n"); COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE); return FALSE; } @@ -2414,7 +2414,7 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) } if(lppd->lStructSize != sizeof(PRINTDLGW)) { - WARN("structure size failure !!!\n"); + WARN("structure size failure!!!\n"); COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE); return FALSE; } diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 1fa3ffa..a416a39 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -130,7 +130,7 @@ static void _test_store_is_empty(unsigned line, HCERTSTORE store) const CERT_CONTEXT *cert; cert = CertEnumCertificatesInStore(store, NULL); - ok_(__FILE__,line)(!cert && GetLastError() == CRYPT_E_NOT_FOUND, "store is not epmty\n"); + ok_(__FILE__,line)(!cert && GetLastError() == CRYPT_E_NOT_FOUND, "store is not empty\n"); } static void testMemStore(void)

1 0

Akihiro Sagawa : gdi32: Fix ABC metrics for rotated font.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: f6bc356860a1ea2e5b4aed43e38ddf8b7d24a8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bc356860a1ea2e5b4aed43e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:58 2014 +0900 gdi32: Fix ABC metrics for rotated font. --- dlls/gdi32/freetype.c | 18 ++++++++++++++++-- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f8b365b..3cc8dd8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6438,6 +6438,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, gm.gmCellIncY = 0; origin_x = left; origin_y = top; + abc->abcA = origin_x >> 6; + abc->abcB = metrics.width >> 6; } else { INT xc, yc; FT_Vector vec; @@ -6534,6 +6536,19 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Vector_Transform(&vec, &transMatUnrotated); adv = pFT_MulFix(vec.x, em_scale) * 2; } + + vec.x = metrics.horiBearingX; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMatUnrotated); + abc->abcA = vec.x >> 6; + + vec.x = metrics.width; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMatUnrotated); + if (vec.x >= 0) + abc->abcB = vec.x >> 6; + else + abc->abcB = -vec.x >> 6; } width = (right - left) >> 6; @@ -6542,8 +6557,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, gm.gmBlackBoxY = height ? height : 1; gm.gmptGlyphOrigin.x = origin_x >> 6; gm.gmptGlyphOrigin.y = origin_y >> 6; - abc->abcA = left >> 6; - abc->abcB = gm.gmBlackBoxX; + if (!abc->abcB) abc->abcB = 1; abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", gm.gmBlackBoxX, gm.gmBlackBoxY, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 28bec52..e05cfea 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1325,14 +1325,12 @@ static void test_GetCharABCWidths(void) ok(ret, "GetCharABCWidthsW should have succeeded\n"); /* 3) compare ABC results */ - todo_wine { ok(match_off_by_1(abcw[0].abcA, abc[0].abcA, FALSE), "got %d, expected %d (A)\n", abc[0].abcA, abcw[0].abcA); ok(match_off_by_1(abcw[0].abcB, abc[0].abcB, FALSE), "got %d, expected %d (B)\n", abc[0].abcB, abcw[0].abcB); ok(match_off_by_1(abcw[0].abcC, abc[0].abcC, FALSE), "got %d, expected %d (C)\n", abc[0].abcC, abcw[0].abcC); - } DeleteObject(SelectObject(hdc, hfont)); ReleaseDC(NULL, hdc);

1 0

Michael Stefaniuc : dmloader/tests: Fix a crash due to a missing audio driver.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 3fef1be56f70075076d9ddb767b47d1a059152e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fef1be56f70075076d9ddb76… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 23:07:26 2014 +0100 dmloader/tests: Fix a crash due to a missing audio driver. --- dlls/dmloader/tests/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index ea5edca..8759033 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -73,6 +73,10 @@ static void test_simple_playing(void) hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); + if (hr == DSERR_NODRIVER) { + skip("No audio driver.\n"); + return; + } ok(hr == S_OK, "InitAudio failed: %08x\n", hr); ok(music != NULL, "Didn't get IDirectMusic pointer\n"); ok(dsound != NULL, "Didn't get IDirectSound pointer\n");

1 0

Huw Davies : mshtml: Release a leaked class factory.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 6da6f1861bb2f299c59c1a733ccfe5571b2594b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da6f1861bb2f299c59c1a733… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 13 13:32:27 2014 +0000 mshtml: Release a leaked class factory. --- dlls/mshtml/npplugin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index f5eb754..0ce72ff 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -635,6 +635,7 @@ static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *n } hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); + IClassFactory_Release(cf); if(FAILED(hres)) return NULL;

1 0

Stefan Dösinger : d3dx9_36: Make emsquare an unsigned int in create_outline.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 6bd6193cb13177bc012141458703fa5632ba5c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd6193cb13177bc012141458… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:04 2014 +0100 d3dx9_36: Make emsquare an unsigned int in create_outline. --- dlls/d3dx9_36/mesh.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b713079..118baf7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5128,7 +5128,7 @@ static HRESULT add_vertex_index(struct word_array *array, WORD vertex_index) C_ASSERT(sizeof(FIXED) == sizeof(float)); C_ASSERT(sizeof(POINTFX) == sizeof(D3DXVECTOR2)); -static inline D3DXVECTOR2 *convert_fixed_to_float(POINTFX *pt, int count, float emsquare) +static inline D3DXVECTOR2 *convert_fixed_to_float(POINTFX *pt, int count, unsigned int emsquare) { D3DXVECTOR2 *ret = (D3DXVECTOR2*)pt; while (count--) { @@ -5233,7 +5233,8 @@ static BOOL attempt_line_merge(struct outline *outline, } static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int datasize, - float max_deviation_sq, float emsquare, const struct cos_table *cos_table) + float max_deviation_sq, unsigned int emsquare, + const struct cos_table *cos_table) { TTPOLYGONHEADER *header = (TTPOLYGONHEADER *)raw_outline;

1 0

Akihiro Sagawa : gdi32/tests: Add tests for vertical writing metrics.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: a221654aaee6ff112da03b9d25c742344a47f58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a221654aaee6ff112da03b9d2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:59 2014 +0900 gdi32/tests: Add tests for vertical writing metrics. --- dlls/gdi32/tests/font.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e05cfea..bea7f28 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5229,13 +5229,98 @@ static void check_vertical_font(const char *name, BOOL *installed, BOOL *selecte ReleaseDC(NULL, hdc); } +static void check_vertical_metrics(const char *face) +{ + LOGFONTA lf; + HFONT hfont, hfont_prev; + HDC hdc; + DWORD ret; + GLYPHMETRICS rgm, vgm; + const UINT code = 0x5EAD, height = 1000; + WORD idx; + ABC abc; + OUTLINETEXTMETRICA otm; + USHORT numOfLongVerMetrics; + + hdc = GetDC(NULL); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, face); + lf.lfHeight = -height; + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfEscapement = lf.lfOrientation = 900; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ret = GetGlyphOutlineW(hdc, code, GGO_METRICS, &rgm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); + ret = GetCharABCWidthsW(hdc, code, code, &abc); + ok(ret, "GetCharABCWidthsW failed\n"); + DeleteObject(SelectObject(hdc, hfont_prev)); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "@"); + strcat(lf.lfFaceName, face); + lf.lfHeight = -height; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ret = GetGlyphOutlineW(hdc, code, GGO_METRICS, &vgm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); + + memset(&otm, 0, sizeof(otm)); + otm.otmSize = sizeof(otm); + ret = GetOutlineTextMetricsA(hdc, sizeof(otm), &otm); + ok(ret != 0, "GetOutlineTextMetricsA failed\n"); + ret = GetGlyphIndicesW(hdc, (LPCWSTR)&code, 1, &idx, 0); + ok(ret != 0, "GetGlyphIndicesW failed\n"); + + if (GetFontData(hdc, MS_MAKE_TAG('v','h','e','a'), sizeof(SHORT) * 17, + &numOfLongVerMetrics, sizeof(numOfLongVerMetrics)) != GDI_ERROR) { + int offset; + SHORT topSideBearing; + numOfLongVerMetrics = GET_BE_WORD(numOfLongVerMetrics); + if (numOfLongVerMetrics > idx) + offset = idx * 2 + 1; + else + offset = numOfLongVerMetrics * 2 + (idx - numOfLongVerMetrics); + ret = GetFontData(hdc, MS_MAKE_TAG('v','m','t','x'), offset * sizeof(SHORT), + &topSideBearing, sizeof(SHORT)); + ok(ret != GDI_ERROR, "GetFontData(vmtx) failed\n"); + topSideBearing = GET_BE_WORD(topSideBearing); + ok(match_off_by_1(vgm.gmptGlyphOrigin.x, + MulDiv(topSideBearing, height, otm.otmEMSquare), FALSE), + "expected %d, got %d\n", + MulDiv(topSideBearing, height, otm.otmEMSquare), vgm.gmptGlyphOrigin.x); + } + else + { + todo_wine + ok(vgm.gmptGlyphOrigin.x == rgm.gmptGlyphOrigin.x + vgm.gmCellIncX + otm.otmDescent, + "got %d, expected rgm.origin.x(%d) + vgm.cellIncX(%d) + descent(%d)\n", + vgm.gmptGlyphOrigin.x, rgm.gmptGlyphOrigin.x, vgm.gmCellIncX, otm.otmDescent); + } + + todo_wine + ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent, + "got %d, expected abcA(%d) + abcB(%u) + descent(%d)\n", + (INT)vgm.gmptGlyphOrigin.y, abc.abcA, abc.abcB, otm.otmDescent); + + DeleteObject(SelectObject(hdc, hfont_prev)); + ReleaseDC(NULL, hdc); +} + static void test_vertical_font(void) { char ttf_name[MAX_PATH]; - int num; + int num, i; BOOL ret, installed, selected; GLYPHMETRICS gm; WORD hgi, vgi; + const char* face_list[] = { + "@WineTestVertical", /* has vmtx table */ + "@Ume Gothic", /* doesn't have vmtx table */ + "@MS UI Gothic", /* has vmtx table, available on native */ + }; if (!pAddFontResourceExA || !pRemoveFontResourceExA || !pGetGlyphIndicesW) { @@ -5268,6 +5353,16 @@ static void test_vertical_font(void) ok(hgi != vgi, "same glyph h:%u v:%u\n", hgi, vgi); + for (i = 0; i < sizeof(face_list)/sizeof(face_list[0]); i++) { + const char* face = face_list[i]; + if (!is_truetype_font_installed(face)) { + skip("%s is not installed\n", face); + continue; + } + trace("Testing %s...\n", face); + check_vertical_metrics(&face[1]); + } + ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError());

1 0

Akihiro Sagawa : gdi32: Improve vertical writing metrics.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: f6475ace5fc812749beefc8fc17add8c4281bc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6475ace5fc812749beefc8fc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:30:01 2014 +0900 gdi32: Improve vertical writing metrics. --- dlls/gdi32/freetype.c | 44 ++++++++++++++------------------------------ dlls/gdi32/tests/font.c | 2 -- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3cc8dd8..722a211 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6443,6 +6443,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } else { INT xc, yc; FT_Vector vec; + FT_Pos lsb; left = right = 0; @@ -6468,41 +6469,24 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, bottom = bottom & -64; top = (top + 63) & -64; - if (tategaki) + if (tategaki && (font->potm || get_outline_text_metrics(font))) { - for(xc = 0; xc < 2; xc++) - { - for(yc = 0; yc < 2; yc++) - { - if (vertical_metrics) - { - vec.x = metrics.vertBearingY + xc * metrics.height; - vec.y = metrics.horiBearingX - yc * (metrics.vertBearingX * 2); - } - else - { - vec.x = metrics.horiBearingY - xc * metrics.height; - vec.y = metrics.horiBearingX + yc * metrics.width; - } - - TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); - pFT_Vector_Transform(&vec, &transMat); - if(xc == 0 && yc == 0) { - origin_x = vec.x; - origin_y = vec.y; - } else { - if(vec.x < origin_x) origin_x = vec.x; - if(vec.y > origin_y) origin_y = vec.y; - } - } - } - origin_x = origin_x & -64; - origin_y = (origin_y + 63) & -64; + if (vertical_metrics) + lsb = metrics.horiBearingY + metrics.vertBearingY; + else + lsb = metrics.vertAdvance + (font->potm->otmDescent << 6); + vec.x = lsb; + vec.y = font->potm->otmDescent << 6; + TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); + pFT_Vector_Transform(&vec, &transMat); + origin_x = (vec.x + left) & -64; + origin_y = (vec.y + top + 63) & -64; } else { origin_x = left; origin_y = top; + lsb = metrics.horiBearingX; } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); @@ -6537,7 +6521,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, adv = pFT_MulFix(vec.x, em_scale) * 2; } - vec.x = metrics.horiBearingX; + vec.x = lsb; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); abc->abcA = vec.x >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bea7f28..7e93f9d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5294,13 +5294,11 @@ static void check_vertical_metrics(const char *face) } else { - todo_wine ok(vgm.gmptGlyphOrigin.x == rgm.gmptGlyphOrigin.x + vgm.gmCellIncX + otm.otmDescent, "got %d, expected rgm.origin.x(%d) + vgm.cellIncX(%d) + descent(%d)\n", vgm.gmptGlyphOrigin.x, rgm.gmptGlyphOrigin.x, vgm.gmCellIncX, otm.otmDescent); } - todo_wine ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent, "got %d, expected abcA(%d) + abcB(%u) + descent(%d)\n", (INT)vgm.gmptGlyphOrigin.y, abc.abcA, abc.abcB, otm.otmDescent);

1 0

Michael Stefaniuc : dmime/tests: Fix a crash due to a missing audio driver.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 03d5b1248bcb75cc84b1bebe4e4a2b8a4cca8869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d5b1248bcb75cc84b1bebe4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 23:07:15 2014 +0100 dmime/tests: Fix a crash due to a missing audio driver. --- dlls/dmime/tests/dmime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3d5a426..669e99e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -57,6 +57,10 @@ static void test_COM_audiopath(void) } hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); + if (hr == DSERR_NODRIVER) { + skip("No audio driver\n"); + return; + } ok(hr == S_OK, "DirectMusicPerformance_InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &dmap); ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %08x\n", hr);

1 0