October 2013 - Wine-commits

Ken Thomases : winemac: Make sure the same housekeeping is done when closing a window as is done when hiding it .
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 05e3d0e5cc4211d408210e4ef3969a1446f9c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e3d0e5cc4211d408210e4ef… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 9 16:30:53 2013 -0500 winemac: Make sure the same housekeeping is done when closing a window as is done when hiding it. --- dlls/winemac.drv/cocoa_window.m | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a48b691..7371cbc 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1801,8 +1801,11 @@ void macdrv_destroy_cocoa_window(macdrv_window w) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineWindow* window = (WineWindow*)w; + OnMainThread(^{ + [window doOrderOut]; + [window close]; + }); [window.queue discardEventsMatchingMask:-1 forWindow:window]; - [window close]; [window release]; [pool release];

1 0

Ken Thomases : winemac: Add registry settings to make Option keys send Alt rather than accessing additional characters from the keyboard layout .
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 79d45585bcd7b884fb195ce59bc8b5dada9ad4f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d45585bcd7b884fb195ce59… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 9 16:30:59 2013 -0500 winemac: Add registry settings to make Option keys send Alt rather than accessing additional characters from the keyboard layout. --- dlls/winemac.drv/cocoa_window.m | 22 ++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/macdrv_main.c | 7 +++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7371cbc..2bb9aef 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -117,6 +117,24 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) *modifiers &= ~NX_ALTERNATEMASK; } +static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modifiers) +{ + fix_device_modifiers_by_generic(&modifiers); + if (left_option_is_alt && (modifiers & NX_DEVICELALTKEYMASK)) + { + modifiers |= NX_DEVICELCMDKEYMASK; + modifiers &= ~NX_DEVICELALTKEYMASK; + } + if (right_option_is_alt && (modifiers & NX_DEVICERALTKEYMASK)) + { + modifiers |= NX_DEVICERCMDKEYMASK; + modifiers &= ~NX_DEVICERALTKEYMASK; + } + fix_generic_modifiers_by_device(&modifiers); + + return modifiers; +} + @interface WineContentView : NSView <NSTextInputClient> { @@ -1253,7 +1271,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self flagsChanged:theEvent]; [self postKey:[theEvent keyCode] pressed:[theEvent type] == NSKeyDown - modifiers:[theEvent modifierFlags] + modifiers:adjusted_modifiers_for_option_behavior([theEvent modifierFlags]) event:theEvent]; } @@ -1416,7 +1434,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { NX_DEVICERCMDKEYMASK, kVK_RightCommand }, }; - NSUInteger modifierFlags = [theEvent modifierFlags]; + NSUInteger modifierFlags = adjusted_modifiers_for_option_behavior([theEvent modifierFlags]); NSUInteger changed; int i, last_changed; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 1a38b56..1c2d140 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -143,6 +143,8 @@ struct macdrv_display { extern int macdrv_err_on; extern int topmost_float_inactive DECLSPEC_HIDDEN; extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; +extern int left_option_is_alt DECLSPEC_HIDDEN; +extern int right_option_is_alt DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index dd032f3..d27ce94 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -50,6 +50,8 @@ int capture_displays_for_fullscreen = 0; BOOL skip_single_buffer_flushes = FALSE; BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; +int left_option_is_alt = 0; +int right_option_is_alt = 0; /************************************************************************** @@ -168,6 +170,11 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "AllowSetGamma", buffer, sizeof(buffer))) allow_set_gamma = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "LeftOptionIsAlt", buffer, sizeof(buffer))) + left_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) + right_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Alexandre Julliard : makefiles: Generate the common rules for import libraries from configure.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: a3b76d3366acd5b7aeb2923bd1ce5c39fbb72455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b76d3366acd5b7aeb2923bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 10 10:51:32 2013 +0200 makefiles: Generate the common rules for import libraries from configure. --- .gitignore | 1 - aclocal.m4 | 2 +- configure | 21 ++++++++++++++------- configure.ac | 14 +++++++++++++- dlls/Makeimplib.rules.in | 14 -------------- tools/make_makefiles | 5 ++--- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index f7e8b2b..f5133b7 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,6 @@ Makefile dlldata.c dlls/*/*.def dlls/Makedll.rules -dlls/Makeimplib.rules dlls/actxprxy/actxprxy_activscp.h dlls/actxprxy/actxprxy_activscp_p.c dlls/actxprxy/actxprxy_comcat.h diff --git a/aclocal.m4 b/aclocal.m4 index 9e2e147..0058603 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -351,7 +351,7 @@ wine_fn_config_lib () ac_flags=$[2] ac_dir=dlls/$ac_name - wine_fn_all_rules dlls/Makeimplib.rules + wine_fn_all_rules Make.rules.in wine_fn_clean_rules wine_fn_append_rule \ diff --git a/configure b/configure index c67e7ba..4744a1a 100755 --- a/configure +++ b/configure @@ -627,6 +627,7 @@ LIBOBJS PORCFLAGS LINGUAS ALL_TEST_RESOURCES +MAKE_IMPLIB_RULES LDAPLIBS LIBRT LIBPOLL @@ -801,7 +802,6 @@ SHELL' ac_subst_files='MAKE_RULES MAKE_TEST_RULES MAKE_DLL_RULES -MAKE_IMPLIB_RULES MAKE_PROG_RULES' ac_user_opts=' enable_option_checking @@ -16053,6 +16053,18 @@ ac_config_commands="$ac_config_commands include/stamp-h" $as_echo_n "creating Makefile rules..." >&6 + +MAKE_IMPLIB_RULES="DLLFLAGS = $DLLFLAGS +" + +if test "x$CROSSTEST_DISABLE" = x +then + as_fn_append MAKE_IMPLIB_RULES "MAKEDEPFLAGS = -xo -xcross.o +all: \$(STATICLIB:.a=.cross.a) +" +fi + + wine_rules_file=conf$$rules.make rm -f $wine_rules_file ALL_POT_FILES="" @@ -16213,7 +16225,7 @@ wine_fn_config_lib () ac_flags=$2 ac_dir=dlls/$ac_name - wine_fn_all_rules dlls/Makeimplib.rules + wine_fn_all_rules Make.rules.in wine_fn_clean_rules wine_fn_append_rule \ @@ -16597,10 +16609,6 @@ wine_fn_config_makerules dlls/Makedll.rules Make.rules MAKE_DLL_RULES=dlls/Makedll.rules ac_config_files="$ac_config_files dlls/Makedll.rules" -wine_fn_config_makerules dlls/Makeimplib.rules Make.rules -MAKE_IMPLIB_RULES=dlls/Makeimplib.rules -ac_config_files="$ac_config_files dlls/Makeimplib.rules" - wine_fn_config_makerules programs/Makeprog.rules Make.rules MAKE_PROG_RULES=programs/Makeprog.rules ac_config_files="$ac_config_files programs/Makeprog.rules" @@ -18173,7 +18181,6 @@ do "Make.rules") CONFIG_FILES="$CONFIG_FILES Make.rules" ;; "Maketest.rules") CONFIG_FILES="$CONFIG_FILES Maketest.rules" ;; "dlls/Makedll.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makedll.rules" ;; - "dlls/Makeimplib.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makeimplib.rules" ;; "programs/Makeprog.rules") CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;; "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Make.tmp") CONFIG_FILES="$CONFIG_FILES Make.tmp:Make.vars.in:Makefile.in" ;; diff --git a/configure.ac b/configure.ac index f407355..90feb73 100644 --- a/configure.ac +++ b/configure.ac @@ -2597,6 +2597,19 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */ AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD +dnl Import library rules + +AC_SUBST(MAKE_IMPLIB_RULES,"DLLFLAGS = $DLLFLAGS +") +if test "x$CROSSTEST_DISABLE" = x +then + AS_VAR_APPEND([MAKE_IMPLIB_RULES],"MAKEDEPFLAGS = -xo -xcross.o +all: \$(STATICLIB:.a=.cross.a) +") +fi + +dnl Main makefile + WINE_APPEND_RULE([ # Rules automatically generated by configure @@ -2624,7 +2637,6 @@ WINE_CONFIG_EXTRA_DIR(include/wine) WINE_CONFIG_MAKERULES([Make.rules],[MAKE_RULES]) WINE_CONFIG_MAKERULES([Maketest.rules],[MAKE_TEST_RULES],[Make.rules]) WINE_CONFIG_MAKERULES([dlls/Makedll.rules],[MAKE_DLL_RULES],[Make.rules]) -WINE_CONFIG_MAKERULES([dlls/Makeimplib.rules],[MAKE_IMPLIB_RULES],[Make.rules]) WINE_CONFIG_MAKERULES([programs/Makeprog.rules],[MAKE_PROG_RULES],[Make.rules]) WINE_CONFIG_DLL(acledit) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in deleted file mode 100644 index 5e59a50..0000000 --- a/dlls/Makeimplib.rules.in +++ /dev/null @@ -1,14 +0,0 @@ -# Global rules for building a static import library -*-Makefile-*- -# -# Each individual makefile should define the following variables: -# MODULE : name of the main module being built -# -# plus all variables required by the global Make.rules.in -# - -DLLFLAGS = @DLLFLAGS@ -MAKEDEPFLAGS = -xo -xcross.o - -(a)CROSSTEST_DISABLE@ all: $(STATICLIB:.a=.cross.a) - -(a)MAKE_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index 42814bf..8785326 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -26,7 +26,6 @@ my %makerules = ( "MAKE_RULES" => "Make.rules", "MAKE_DLL_RULES" => "dlls/Makedll.rules", - "MAKE_IMPLIB_RULES" => "dlls/Makeimplib.rules", "MAKE_TEST_RULES" => "Maketest.rules", "MAKE_PROG_RULES" => "programs/Makeprog.rules", ); @@ -312,7 +311,7 @@ sub parse_makefile($) if (/^\@(MAKE.*RULES)\@/) { my $var = $1; - $make{"=rules"} = $makerules{$var}; + $make{"=rules"} = $makerules{$var} || $var; next; } if (/^\s*(MODULE|IMPORTLIB|TESTDLL|MANPAGE)\s*=\s*(.*)/) @@ -486,7 +485,7 @@ sub update_makefiles(@) (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n"; } - elsif ($rules eq $makerules{"MAKE_IMPLIB_RULES"}) + elsif ($rules eq "MAKE_IMPLIB_RULES") { (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; push @lines, "WINE_CONFIG_LIB($name$flag_args)\n";

1 0

Nikolay Sivov : xmllite: Correct allocated destination buffer size.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 587398259e184ec7e7d7093ef6ee2564461ff66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=587398259e184ec7e7d7093ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 15:38:34 2013 +0400 xmllite: Correct allocated destination buffer size. --- dlls/xmllite/reader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ebea0b4..0a4423c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -711,11 +711,12 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) return hr; } -/* grows UTF-16 buffer so it has at least 'length' bytes free on return */ +/* grows UTF-16 buffer so it has at least 'length' WCHAR chars free on return */ static void readerinput_grow(xmlreaderinput *readerinput, int length) { encoded_buffer *buffer = &readerinput->buffer->utf16; + length *= sizeof(WCHAR); /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ if (buffer->allocated < buffer->written + length + 4) {

1 0

Frédéric Delanoy : services: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: debd1346b003ae34013a04318e7105f88075c866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=debd1346b003ae34013a04318… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:17 2013 +0200 services: Use BOOL type where appropriate. --- programs/services/services.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 75abf06..37f3d65 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -44,7 +44,7 @@ DWORD service_kill_timeout = 60000; static DWORD default_preshutdown_timeout = 180000; static void *env = NULL; -static const int is_win64 = (sizeof(void *) > sizeof(int)); +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); static const WCHAR SZ_LOCAL_SYSTEM[] = {'L','o','c','a','l','S','y','s','t','e','m',0};

1 0

Frédéric Delanoy : winecfg: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 183f00cb6c6c171af5224eed609c625b62615871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183f00cb6c6c171af5224eed6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:18 2013 +0200 winecfg: Use BOOL type where appropriate. --- programs/winecfg/winecfg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index ea116e8..3fbfedf 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #include "winecfg.h" #include "resource.h" -static const int is_win64 = (sizeof(void *) > sizeof(int)); +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); HKEY config_key = NULL; HMENU hPopupMenus = 0;

1 0

Henri Verbeet : wined3d: Send clip plane updates through the command stream .
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: db68c43678f28acebafaab1fc3608b3963dcc65f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db68c43678f28acebafaab1fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:36 2013 +0200 wined3d: Send clip plane updates through the command stream. --- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/device.c | 10 ++-------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 16ffcf9..b6542bc 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -45,6 +45,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_TEXTURE_STATE, WINED3D_CS_OP_SET_SAMPLER_STATE, WINED3D_CS_OP_SET_TRANSFORM, + WINED3D_CS_OP_SET_CLIP_PLANE, }; struct wined3d_cs_present @@ -177,6 +178,13 @@ struct wined3d_cs_set_transform const struct wined3d_matrix *matrix; }; +struct wined3d_cs_set_clip_plane +{ + enum wined3d_cs_op opcode; + UINT plane_idx; + const struct wined3d_vec4 *plane; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -691,6 +699,26 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform cs->ops->submit(cs); } +static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_clip_plane *op = data; + + cs->state.clip_planes[op->plane_idx] = *op->plane; + device_invalidate_state(cs->device, STATE_CLIPPLANE(op->plane_idx)); +} + +void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) +{ + struct wined3d_cs_set_clip_plane *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_CLIP_PLANE; + op->plane_idx = plane_idx; + op->plane = plane; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -712,6 +740,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, + /* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e37a28d..1f2642b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1734,14 +1734,8 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, device->update_state->clip_planes[plane_idx] = *plane; - /* Handle recording of state blocks. */ - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; - } - - device_invalidate_state(device, STATE_CLIPPLANE(plane_idx)); + if (!device->recording) + wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 69738d5..6dc5c7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2485,6 +2485,8 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, + const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer,

1 0

Henri Verbeet : wined3d: Send material updates through the command stream.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 1f22246b84a6fa7a88a612be41a5c9edc05460a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f22246b84a6fa7a88a612be4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:37 2013 +0200 wined3d: Send material updates through the command stream. --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 9 ++------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b6542bc..0da79fc 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -46,6 +46,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_SAMPLER_STATE, WINED3D_CS_OP_SET_TRANSFORM, WINED3D_CS_OP_SET_CLIP_PLANE, + WINED3D_CS_OP_SET_MATERIAL, }; struct wined3d_cs_present @@ -185,6 +186,12 @@ struct wined3d_cs_set_clip_plane const struct wined3d_vec4 *plane; }; +struct wined3d_cs_set_material +{ + enum wined3d_cs_op opcode; + const struct wined3d_material *material; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -719,6 +726,25 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const cs->ops->submit(cs); } +static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_material *op = data; + + cs->state.material = *op->material; + device_invalidate_state(cs->device, STATE_MATERIAL); +} + +void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) +{ + struct wined3d_cs_set_material *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_MATERIAL; + op->material = material; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -741,6 +767,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, /* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane, + /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f2642b..20e7927 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1785,15 +1785,10 @@ void CDECL wined3d_device_set_material(struct wined3d_device *device, const stru device->update_state->material = *material; - /* Handle recording of state blocks */ if (device->recording) - { device->recording->changed.material = TRUE; - TRACE("Recording... not performing anything.\n"); - return; - } - - device_invalidate_state(device, STATE_MATERIAL); + else + wined3d_cs_emit_set_material(device->cs, material); } void CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6dc5c7f..e9569ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,6 +2491,7 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_pixel_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3drm: Compare with the correct IID in IDirect3DRMVisualArrayImpl_QueryInterface( ).
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: cd16932bf35846032ec6097d169a73f8b65fdec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd16932bf35846032ec6097d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:39 2013 +0200 d3drm: Compare with the correct IID in IDirect3DRMVisualArrayImpl_QueryInterface(). --- dlls/d3drm/frame.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index fb0c22d..4d8867e 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -215,24 +215,21 @@ static HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) return S_OK; } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisualArray* iface, - REFIID riid, void** ret_iface) +static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisualArray *iface, REFIID riid, void **out) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirect3DRMFrameArray)) + if (IsEqualGUID(riid, &IID_IDirect3DRMVisualArray) + || IsEqualGUID(riid, &IID_IUnknown)) { - *ret_iface = iface; IDirect3DRMVisualArray_AddRef(iface); + *out = iface; return S_OK; } - *ret_iface = NULL; - - WARN("Interface %s not implemented\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : wined3d: Unify the shader state IDs.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 079b6d4c11d3c9900fbc5b91e297786545024892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079b6d4c11d3c9900fbc5b91e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:38 2013 +0200 wined3d: Unify the shader state IDs. --- dlls/wined3d/arb_program_shader.c | 152 +++++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 4 +- dlls/wined3d/cs.c | 8 +- dlls/wined3d/glsl_shader.c | 150 +++++++++++++++++----------------- dlls/wined3d/nvidia_texture_shader.c | 4 +- dlls/wined3d/state.c | 16 ++-- dlls/wined3d/utils.c | 23 ++++-- dlls/wined3d/wined3d_private.h | 15 +-- 8 files changed, 189 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=079b6d4c11d3c9900fbc5…

1 0