December 2013 - Wine-Commits

Alexandre Julliard : makefiles: Generate the top-level . gitignore from configure.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: e3fc518e8e96b853fbeb4fa79e610c3c6cc79223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3fc518e8e96b853fbeb4fa79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 15 11:44:39 2013 +0100 makefiles: Generate the top-level .gitignore from configure. --- .gitignore | 53 - Makefile.in | 2 +- aclocal.m4 | 33 +- configure |12628 +++++++++++++++++++++++++------------------------- configure.ac | 66 + tools/make_makefiles | 88 - 6 files changed, 6444 insertions(+), 6426 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3fc518e8e96b853fbeb4…

1 0

Alexandre Julliard : makefiles: Don't use Make. rules in the top-level Makefile.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: a8b633b1a194d12a946f39cbf4cfed46953e5360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b633b1a194d12a946f39cbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 15 10:38:25 2013 +0100 makefiles: Don't use Make.rules in the top-level Makefile. --- Make.rules.in | 1 - Make.vars.in | 1 + Makefile.in | 14 ++++++++------ configure | 4 ++-- configure.ac | 4 ++-- tools/make_makefiles | 1 + 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 27e5667..5948180 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -19,7 +19,6 @@ RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) -CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) \ $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) diff --git a/Make.vars.in b/Make.vars.in index ac74f1f..7b6e265 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -76,6 +76,7 @@ INSTALL = @INSTALL@ $(INSTALL_FLAGS) INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(INSTALL_PROGRAM_FLAGS) INSTALL_SCRIPT = @INSTALL_SCRIPT@ $(INSTALL_SCRIPT_FLAGS) INSTALL_DATA = @INSTALL_DATA@ $(INSTALL_DATA_FLAGS) +CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c prog_manext = 1 api_manext = 3w conf_manext = 5 diff --git a/Makefile.in b/Makefile.in index c2bb1ed..c7889d0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,8 +28,6 @@ INSTALLDIRS = \ all: wine @echo "Wine build complete." -(a)MAKE_RULES@ - # Rules for re-running configure config.status: $(srcdir)/configure @@ -41,15 +39,19 @@ include/stamp-h: $(srcdir)/include/config.h.in config.status # Rules for cleaning -.PHONY: __clean__ +.PHONY: clean distclean __clean__ + clean:: __clean__ distclean:: clean $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp $(RM) -r autom4te.cache -# Rules for uninstalling +# Rules for installing + +$(INSTALLDIRS): + $(MKDIR_P) -m 755 $@ -.PHONY: __uninstall__ +.PHONY: install install-lib install-dev uninstall __uninstall__ uninstall:: __uninstall__ -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) @@ -58,7 +60,7 @@ uninstall:: __uninstall__ # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wine libs/wpp __builddeps__: __tooldeps__ include -.PHONY: check test testclean crosstest __tooldeps__ __builddeps__ +.PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__ loader server: libs/port libs/wine tools fonts: tools diff --git a/configure b/configure index 8fde226..e604301 100755 --- a/configure +++ b/configure @@ -16681,7 +16681,7 @@ wine_fn_append_rule " .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in Make.rules config.status +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status @./config.status Make.tmp Makefile" if test "x$enable_fonts" != xno; then @@ -17525,7 +17525,7 @@ then ac_config_commands="$ac_config_commands tools" wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h - \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) + \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext" else diff --git a/configure.ac b/configure.ac index 34b7a52..fc6cdde 100644 --- a/configure.ac +++ b/configure.ac @@ -2664,7 +2664,7 @@ WINE_APPEND_RULE([ .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in Make.rules config.status +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status @./config.status Make.tmp Makefile]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) @@ -3502,7 +3502,7 @@ then AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) WINE_APPEND_RULE( [tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h - \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) + \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext]) else diff --git a/tools/make_makefiles b/tools/make_makefiles index 13106e7..34fef85 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -543,6 +543,7 @@ sub update_makefiles(@) foreach my $file (sort @_) { my %make = %{$makefiles{$file}}; + next unless defined $make{"=rules"}; my $rules = $make{"=rules"}; my $args = ""; my $is_win16 = $make{"MODULE"} && ($make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}});

1 0

Alexandre Julliard : makefiles: Generate individual . gitignore files corresponding to the build targets.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: 3bcad54fc6b27fc1814a2349105b3b7ab30ad179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bcad54fc6b27fc1814a23491… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 20:37:26 2013 +0100 makefiles: Generate individual .gitignore files corresponding to the build targets. --- .gitignore | 285 +--------------------------------------------- aclocal.m4 | 10 +- configure | 10 +- documentation/.gitignore | 1 - fonts/.gitignore | 50 -------- libs/.gitignore | 3 - loader/Makefile.in | 2 - tools/make_makefiles | 46 +------- tools/makedep.c | 89 +++++++++++---- 9 files changed, 91 insertions(+), 405 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bcad54fc6b27fc1814a2…

1 0

Alexandre Julliard : makefiles: Get rid of the no longer used PO_SRCS variables.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

1 0

Alexandre Julliard : makefiles: Automatically update the IDL_H_SRCS variable.
by Alexandre Julliard Dec. 16, 2013

Dec. 16, 2013

Module: wine Branch: master Commit: ca41acc1f943f07e06cc70c69733c36e87fdc83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca41acc1f943f07e06cc70c69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 14 11:35:40 2013 +0100 makefiles: Automatically update the IDL_H_SRCS variable. --- dlls/infosoft/Makefile.in | 1 - dlls/jscript/Makefile.in | 1 - dlls/mshtml/tests/Makefile.in | 1 - dlls/msi/Makefile.in | 1 - dlls/msxml3/Makefile.in | 2 -- dlls/scrrun/Makefile.in | 2 -- dlls/vbscript/Makefile.in | 5 ----- dlls/wbemdisp/Makefile.in | 1 - dlls/wshom.ocx/Makefile.in | 1 - programs/wscript/Makefile.in | 1 - tools/make_makefiles | 4 +++- 11 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index f7c1bbf..3acc7c9 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -5,7 +5,6 @@ C_SRCS = \ infosoft_main.c \ wordbreaker.c -IDL_H_SRCS = infosoft.idl IDL_R_SRCS = infosoft.idl @MAKE_DLL_RULES@ diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index cb041b2..9078b04 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -30,7 +30,6 @@ RC_SRCS = jscript.rc IDL_TLB_SRCS = jsglobal.idl IDL_R_SRCS = jscript_classes.idl -IDL_H_SRCS = jscript_classes.idl BISON_SRCS = \ parser.y diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in index e339175..6471156 100644 --- a/dlls/mshtml/tests/Makefile.in +++ b/dlls/mshtml/tests/Makefile.in @@ -12,7 +12,6 @@ C_SRCS = \ style.c IDL_TLB_SRCS = test_tlb.idl -IDL_H_SRCS = test_tlb.idl RC_SRCS = rsrc.rc diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index cba9c03..36cf303 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -44,7 +44,6 @@ C_SRCS = \ upgrade.c \ where.c -IDL_H_SRCS = msiserver.idl IDL_I_SRCS = msiserver.idl IDL_R_SRCS = msiserver.idl IDL_TLB_SRCS = msiserver.idl diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 1e056cf..ed4c039 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -47,8 +47,6 @@ RC_SRCS = \ IDL_R_SRCS = xmlparser.idl -IDL_H_SRCS = xmlparser.idl - IDL_TLB_SRCS = msxml3_v1.idl @MAKE_DLL_RULES@ diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index cb5d981..362cba7 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -10,6 +10,4 @@ RC_SRCS = scrrun.rc IDL_TLB_SRCS = scrrun.idl -IDL_H_SRCS = scrrun.idl - @MAKE_DLL_RULES@ diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 5bc66cf..381dfd1 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -18,11 +18,6 @@ BISON_SRCS = \ RC_SRCS = vbscript.rc -IDL_H_SRCS = \ - vbscript_classes.idl \ - vbsglobal.idl \ - vbsregexp55.idl - IDL_TLB_SRCS = \ vbsglobal.idl \ vbsregexp10.idl \ diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in index 3f3ff49..dbd76d9 100644 --- a/dlls/wbemdisp/Makefile.in +++ b/dlls/wbemdisp/Makefile.in @@ -6,7 +6,6 @@ C_SRCS = \ main.c IDL_R_SRCS = wbemdisp_classes.idl -IDL_H_SRCS = wbemdisp_classes.idl IDL_TLB_SRCS = wbemdisp_tlb.idl diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 6635e5d..9d49bde 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ RC_SRCS = wshom.rc -IDL_H_SRCS = wshom.idl IDL_TLB_SRCS = wshom.idl @MAKE_DLL_RULES@ diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 2f4074e..2e85e35 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -10,7 +10,6 @@ C_SRCS = \ host.c \ main.c -IDL_H_SRCS = ihost.idl IDL_TLB_SRCS = ihost.idl @MAKE_PROG_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index 6b6cdb9..13106e7 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -485,7 +485,7 @@ sub assign_sources_to_makefiles(@) { my %flags = get_makedep_flags( $file ); push @{${$make}{"=IDL_C_SRCS"}}, $name if defined $flags{"client"}; - push @{${$make}{"=IDL_H_SRCS"}}, $name if defined $flags{"header"}; + push @{${$make}{"=IDL_H_SRCS"}}, $name if defined $flags{"header"} || !(keys %flags); push @{${$make}{"=IDL_I_SRCS"}}, $name if defined $flags{"ident"}; push @{${$make}{"=IDL_P_SRCS"}}, $name if defined $flags{"proxy"}; push @{${$make}{"=IDL_R_SRCS"}}, $name if defined $flags{"register"}; @@ -510,6 +510,7 @@ sub assign_sources_to_makefiles(@) unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(XTEMPLATE_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)"; + unshift @{${$make}{"=IDL_H_SRCS"}}, "\$(PUBLIC_IDL_H_SRCS) \$(PRIVATE_IDL_H_SRCS)"; # preserve shared source files from the parent makefile foreach my $file (@makefiles) @@ -619,6 +620,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" ); replace_makefile_variable( $file, "IDL_C_SRCS" ); + replace_makefile_variable( $file, "IDL_H_SRCS" ); replace_makefile_variable( $file, "IDL_I_SRCS" ); replace_makefile_variable( $file, "IDL_P_SRCS" ); replace_makefile_variable( $file, "IDL_R_SRCS" );

1 0

Stefan Dösinger : wined3d: Don' t store user memory in allocatedMemory.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: fb752928757498e04362b4ca1366e83985273173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb752928757498e04362b4ca1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 13 12:30:13 2013 +0100 wined3d: Don't store user memory in allocatedMemory. --- dlls/wined3d/surface.c | 45 ++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f18bab1..2fca299 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -88,9 +88,6 @@ static void surface_cleanup(struct wined3d_surface *surface) surface->resource.allocatedMemory = NULL; } - if (surface->flags & SFLAG_USERPTR) - surface->resource.allocatedMemory = NULL; - if (surface->overlay_dest) list_remove(&surface->overlay_entry); @@ -497,7 +494,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.height * wined3d_surface_get_pitch(surface)); } - else + else if (!surface->user_memory) { /* This is to make maps read the GL texture although memory is allocated. */ surface->flags &= ~SFLAG_INSYSMEM; @@ -519,16 +516,20 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) static void surface_get_memory(const struct wined3d_surface *surface, struct wined3d_bo_address *data) { + if (surface->user_memory) + { + data->addr = surface->user_memory; + data->buffer_object = 0; + return; + } if (surface->flags & SFLAG_PBO) { data->addr = NULL; data->buffer_object = surface->pbo; + return; } - else - { - data->addr = surface->resource.allocatedMemory; - data->buffer_object = 0; - } + data->addr = surface->resource.allocatedMemory; + data->buffer_object = 0; } static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) @@ -587,7 +588,8 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) + else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO + || surface->user_memory)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ @@ -831,6 +833,9 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR return ret; } + if (surface->user_memory) + return surface->user_memory; + return surface->resource.allocatedMemory; } @@ -1296,7 +1301,11 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win static BOOL surface_init_sysmem(struct wined3d_surface *surface) { - if (!surface->resource.allocatedMemory) + if (surface->resource.allocatedMemory) + { + memset(surface->resource.allocatedMemory, 0, surface->resource.size); + } + else if (!surface->user_memory) { if (!surface->resource.heap_memory) { @@ -1314,10 +1323,6 @@ static BOOL surface_init_sysmem(struct wined3d_surface *surface) surface->resource.allocatedMemory = surface->resource.heap_memory; } - else - { - memset(surface->resource.allocatedMemory, 0, surface->resource.size); - } surface_validate_location(surface, SFLAG_INSYSMEM); surface_invalidate_location(surface, ~SFLAG_INSYSMEM); @@ -1491,6 +1496,9 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); + if (surface->user_memory) + return surface->user_memory; + return surface->resource.allocatedMemory; } @@ -2611,7 +2619,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem return WINED3DERR_INVALIDCALL; } - if (mem && mem != surface->resource.allocatedMemory) + if (mem && mem != surface->user_memory) { /* Do I have to copy the old surface content? */ if (surface->flags & SFLAG_DIBSECTION) @@ -2626,8 +2634,9 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem else if (!(surface->flags & SFLAG_USERPTR)) { wined3d_resource_free_sysmem(&surface->resource); + surface->resource.allocatedMemory = NULL; } - surface->resource.allocatedMemory = mem; + surface->user_memory = mem; surface->flags |= SFLAG_USERPTR; /* Now the surface memory is most up do date. Invalidate drawable and texture. */ @@ -2646,7 +2655,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem if (!mem) { - surface->resource.allocatedMemory = NULL; + surface->user_memory = NULL; surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); if (surface->flags & SFLAG_CLIENT) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0a8624..5f42964 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2186,6 +2186,7 @@ struct wined3d_surface struct wined3d_swapchain *swapchain; struct wined3d_palette *palette; /* D3D7 style palette handling */ DWORD draw_binding; + void *user_memory; DWORD flags;

1 0

Stefan Dösinger : wined3d: Don' t check for render target usage in wined3d_surface_set_mem.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: a1762ba8a46eca5c7ef1e6a509cdc39fbbb44f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1762ba8a46eca5c7ef1e6a50… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 13 12:30:12 2013 +0100 wined3d: Don't check for render target usage in wined3d_surface_set_mem. Ddraw and d3d9 already take care of this. --- dlls/wined3d/surface.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8c40516..f18bab1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2611,13 +2611,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem return WINED3DERR_INVALIDCALL; } - /* Render targets depend on their hdc, and we can't create an hdc on a user pointer. */ - if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - { - ERR("Not supported on render targets.\n"); - return WINED3DERR_INVALIDCALL; - } - if (mem && mem != surface->resource.allocatedMemory) { /* Do I have to copy the old surface content? */

1 0

Dmitry Timoshkov : secur32/tests: Add a test for QueryCredentialsAttributes (SECPKG_CRED_ATTR_NAMES).
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 25a037543293a933d3517d4844d6d9e7cef86bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a037543293a933d3517d484… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 12 14:13:01 2013 +0900 secur32/tests: Add a test for QueryCredentialsAttributes(SECPKG_CRED_ATTR_NAMES). --- dlls/secur32/tests/schannel.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index daac39f..8cfa4f8 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -198,6 +198,7 @@ static void testAcquireSecurityContext(void) ULONG i; SECURITY_STATUS st; CredHandle cred; + SecPkgCredentials_NamesA names; TimeStamp exp; SCHANNEL_CRED schanCred; PCCERT_CONTEXT certs[2]; @@ -299,6 +300,10 @@ static void testAcquireSecurityContext(void) ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); /* expriy is indeterminate in win2k3 */ trace("expiry: %08x%08x\n", exp.HighPart, exp.LowPart); + + st = pQueryCredentialsAttributesA(&cred, SECPKG_CRED_ATTR_NAMES, &names); + ok(st == SEC_E_NO_CREDENTIALS || st == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", st); + pFreeCredentialsHandle(&cred); /* Bad version in SCHANNEL_CRED */ @@ -621,6 +626,7 @@ static void test_communication(void) SCHANNEL_CRED cred; CredHandle cred_handle; CtxtHandle context; + SecPkgCredentials_NamesA names; SecPkgContext_StreamSizes sizes; SecPkgContext_ConnectionInfo conn_info; CERT_CONTEXT *cert; @@ -790,6 +796,9 @@ todo_wine return; } + status = pQueryCredentialsAttributesA(&cred_handle, SECPKG_CRED_ATTR_NAMES, &names); + ok(status == SEC_E_NO_CREDENTIALS || status == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", status); + status = pQueryContextAttributesA(&context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_REMOTE_CERT_CONTEXT) failed: %08x\n", status); if(status == SEC_E_OK) {

1 0

Frédéric Delanoy : winemac.drv: Use BOOL type where appropriate.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: e0b68129fabf4b1027a3f40769a9a6ada0e475b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b68129fabf4b1027a3f4076… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 13 00:25:31 2013 +0100 winemac.drv: Use BOOL type where appropriate. --- dlls/winemac.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index bd710ce..c5749c8 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1933,7 +1933,7 @@ void macdrv_window_drag_begin(HWND hwnd) if (!(data = get_win_data(hwnd))) return; if (data->being_dragged) goto done; - data->being_dragged = 1; + data->being_dragged = TRUE; release_win_data(data); SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); @@ -1953,7 +1953,7 @@ void macdrv_window_drag_begin(HWND hwnd) TRACE("done\n"); if ((data = get_win_data(hwnd))) - data->being_dragged = 0; + data->being_dragged = FALSE; done: release_win_data(data);

1 0

Ken Thomases : user32: Fix distance calculation for MONITOR_DEFAULTTONEAREST.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 304ab65dbf0f143df5c92923c3b93cbeecb40d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=304ab65dbf0f143df5c92923c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 12 16:49:44 2013 -0600 user32: Fix distance calculation for MONITOR_DEFAULTTONEAREST. If the target rect is outside a monitor rect but is between its extremes in one dimension, that dimension should contribute 0 to the distance, rather than some arbitrary amount. --- dlls/user32/misc.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 732d11c..eb2631f 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -321,12 +321,14 @@ static BOOL CALLBACK monitor_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARA else if (!info->max_area) /* if not intersecting, check for min distance */ { UINT distance; - INT x, y; - - if (rect->left >= info->rect.right) x = info->rect.right - rect->left; - else x = rect->right - info->rect.left; - if (rect->top >= info->rect.bottom) y = info->rect.bottom - rect->top; - else y = rect->bottom - info->rect.top; + UINT x, y; + + if (info->rect.right <= rect->left) x = rect->left - info->rect.right; + else if (rect->right <= info->rect.left) x = info->rect.left - rect->right; + else x = 0; + if (info->rect.bottom <= rect->top) y = rect->top - info->rect.bottom; + else if (rect->bottom <= info->rect.top) y = info->rect.top - rect->bottom; + else y = 0; distance = x * x + y * y; if (distance < info->min_distance) {

1 0