January 2014 - Wine-commits

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

14 Jan '14

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

Ken Thomases : winemac: Make WineOpenGLContext hold a strong reference to its view.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: e21192469dbd3c234e1051504b6429bd9cfb0dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21192469dbd3c234e1051504… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:08 2014 -0600 winemac: Make WineOpenGLContext hold a strong reference to its view. Its superclass, NSOpenGLContext, only holds a weak reference. The view was sometimes being deallocated before the context was disposed of, resulting in crashes. --- dlls/winemac.drv/cocoa_opengl.m | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 5ec5688..32d182f 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -35,10 +35,26 @@ - (void) dealloc { + [[self view] release]; [latentView release]; [super dealloc]; } + - (void) setView:(NSView*)newView + { + NSView* oldView = [self view]; + [super setView:newView]; + [newView retain]; + [oldView release]; + } + + - (void) clearDrawable + { + NSView* oldView = [self view]; + [super clearDrawable]; + [oldView release]; + } + /* On at least some versions of Mac OS X, -[NSOpenGLContext clearDrawable] has the undesirable side effect of ordering the view's GL surface off-screen. This isn't done when just changing the context's view to a different view (which I would

1 0

Dmitry Timoshkov : taskschd: Implement ITaskService::get_Connected.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 189bfa96436774fc97c716c8b08999da04bb52cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=189bfa96436774fc97c716c8b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 17:18:03 2014 +0900 taskschd: Implement ITaskService::get_Connected. --- dlls/taskschd/task.c | 13 +++++++++++-- dlls/taskschd/tests/scheduler.c | 4 ---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 87d9273..76c0e9b 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -35,6 +35,7 @@ typedef struct { ITaskService ITaskService_iface; LONG ref; + BOOL connected; } TaskService; static inline TaskService *impl_from_ITaskService(ITaskService *iface) @@ -135,8 +136,15 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V static HRESULT WINAPI TaskService_get_Connected(ITaskService *iface, VARIANT_BOOL *connected) { - FIXME("%p,%p: stub\n", iface, connected); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, connected); + + if (!connected) return E_POINTER; + + *connected = task_svc->connected ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } static HRESULT WINAPI TaskService_get_TargetServer(ITaskService *iface, BSTR *server) @@ -192,6 +200,7 @@ HRESULT TaskService_create(void **obj) task_svc->ITaskService_iface.lpVtbl = &TaskService_vtbl; task_svc->ref = 1; + task_svc->connected = FALSE; *obj = &task_svc->ITaskService_iface; TRACE("created %p\n", *obj); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9b99258..adb7487 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -48,9 +48,7 @@ static void test_Connect(void) vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); -todo_wine ok(hr == S_OK, "get_Connected error %#x\n", hr); -todo_wine ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); hr = ITaskService_get_TargetServer(service, &bstr); @@ -81,7 +79,6 @@ todo_wine vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); -todo_wine ok(hr == S_OK, "get_Connected error %#x\n", hr); todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); @@ -92,7 +89,6 @@ todo_wine vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); -todo_wine ok(hr == S_OK, "get_Connected error %#x\n", hr); todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool);

1 0

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

14 Jan '14

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

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

14 Jan '14

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

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

14 Jan '14

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

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

14 Jan '14

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

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

14 Jan '14

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 : makefiles: Get rid of Make.rules.
by Alexandre Julliard 14 Jan '14

14 Jan '14

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

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

14 Jan '14

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