October 2013 - Wine-Commits

Frédéric Delanoy : ws2_32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: aedb86a46f48626839f3ae9253470a13bd9c29a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aedb86a46f48626839f3ae925… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:40 2013 +0200 ws2_32: Use BOOL type where appropriate. --- dlls/ws2_32/socket.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1b1815c..679258b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5065,7 +5065,8 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) for (n = 0; n < routes->dwNumEntries; n++) { IF_INDEX ifindex; - DWORD ifmetric, exists = FALSE; + DWORD ifmetric; + BOOL exists = FALSE; if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) continue;

1 0

Alexandre Julliard : makefiles: Remove some obsolete rules.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 7260277e1db30d574161a10b8c19b765f0047955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7260277e1db30d574161a10b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 8 10:18:56 2013 +0200 makefiles: Remove some obsolete rules. --- Make.rules.in | 36 +----------------------------------- Make.vars.in | 5 ++--- Makefile.in | 2 -- configure | 50 -------------------------------------------------- configure.ac | 9 --------- 5 files changed, 3 insertions(+), 99 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index aeb605b..db3a45f 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -16,7 +16,6 @@ INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL) DEFS = -D__WINESRC__ $(EXTRADEFS) ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) -ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) @@ -25,7 +24,7 @@ IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=.h) \ $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) -CLEAN_FILES = *.o *.a *.so *.mo *.ln *.res *.fake *.ok *.tab.[ch] *.yy.c +CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \ $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:.idl=_p.c dlldata.c) \ $(PO_SRCS:.rc=.res rsrc.pot) $(MC_SRCS:.mc=.res msg.pot) $(XTEMPLATE_SRCS:.x=.h) @@ -34,12 +33,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) -LINTS = $(C_SRCS:.c=.ln) - -filter: dummy - @$(top_srcdir)/tools/winapi/make_filter --make $(MAKE) all - -.PHONY: all filter # Implicit rules @@ -93,9 +86,6 @@ filter: dummy .idl_t.res: $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $< -.c.ln: - $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) - .c.ok: $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ @@ -119,26 +109,6 @@ filter: dummy dlldata.c: $(WIDL) Makefile.in $(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS) -# Rule for linting - -$(MODULE).ln : $(LINTS) - if test "$(LINTS)" ; \ - then \ - $(LINT) $(ALLLINTFLAGS) -o$(MODULE) $(LINTS) ; \ - $(MV) llib-l$(MODULE).ln $(MODULE).ln ; \ - else \ - $(LINT) $(ALLLINTFLAGS) -C$(MODULE) /dev/null ; \ - fi - -lint:: $(MODULE).ln - -# Rules for Windows API checking - -winapi_check:: dummy - $(WINAPI_CHECK) $(WINAPI_CHECK_FLAGS) $(WINAPI_CHECK_EXTRA_FLAGS) . - -.PHONY: winapi_check - # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ @@ -200,8 +170,4 @@ $(PO_SRCS:.rc=.res): $(ALL_MO_FILES) $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_TLB_RES) $(IDL_R_SRCS:.idl=_r.res): $(WIDL) -dummy: - -.PHONY: dummy - # End of global rules diff --git a/Make.vars.in b/Make.vars.in index b5cca68..570009e 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -45,8 +45,6 @@ MKDIR_P = @MKDIR_P@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ PRELINK = @PRELINK@ -LINT = @LINT@ -LINTFLAGS = @LINTFLAGS@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ CONVERT = @CONVERT@ @@ -58,7 +56,6 @@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo) PORCFLAGS = @PORCFLAGS@ CROSSAR = $(CROSSTARGET)-ar CROSSRANLIB = $(CROSSTARGET)-ranlib -WINAPI_CHECK = $(top_srcdir)/tools/winapi/winapi_check BUILDIMAGE = $(top_srcdir)/tools/buildimage C2MAN = $(top_srcdir)/tools/c2man.pl RUNTEST = $(top_srcdir)/tools/runtest @@ -89,5 +86,7 @@ conf_manext = 5 @SET_MAKE@ all: +dummy: +.PHONY: all dummy # End of common header diff --git a/Makefile.in b/Makefile.in index a07abd2..7635612 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,8 +35,6 @@ INSTALLDIRS = \ all: wine @echo "Wine build complete." -WINAPI_CHECK_EXTRA_FLAGS = --global - @MAKE_RULES@ # Rules for re-running configure diff --git a/configure b/configure index 602eaca..b022253 100755 --- a/configure +++ b/configure @@ -723,8 +723,6 @@ ICOTOOL CONVERT RSVG FONTFORGE -LINTFLAGS -LINT INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM @@ -5535,54 +5533,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -for ac_prog in lclint lint -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LINT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LINT"; then - ac_cv_prog_LINT="$LINT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_LINT="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -LINT=$ac_cv_prog_LINT -if test -n "$LINT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5 -$as_echo "$LINT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$LINT" && break -done - -if test "$LINT" = "lint" -then - LINTFLAGS="$LINTFLAGS -errchk=%all,no%longptr64 -errhdr=%user -Ncheck=macro -Nlevel=4" - fi - - for ac_prog in fontforge do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index fc4f096..f407355 100644 --- a/configure.ac +++ b/configure.ac @@ -268,15 +268,6 @@ dnl Use the correct strip to install programs test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" AC_PROG_INSTALL -dnl Check for lint -AC_CHECK_PROGS(LINT, lclint lint) -if test "$LINT" = "lint" -then - LINTFLAGS="$LINTFLAGS -errchk=%all,no%longptr64 -errhdr=%user -Ncheck=macro -Nlevel=4" - dnl LINTFLAGS='-D_SIZE_T "-Dsize_t=unsigned long" -errchk=longptr64' -fi -AC_SUBST(LINTFLAGS) - dnl Check for various programs AC_CHECK_PROGS(FONTFORGE, fontforge, false) AC_CHECK_PROGS(RSVG, rsvg, false)

1 0

Alexandre Julliard : makefiles: Get rid of the recursive installation rules for dlls and programs.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 08eea24b94dc8a238b0af295471f512719acfb55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08eea24b94dc8a238b0af2954… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 19:41:25 2013 +0200 makefiles: Get rid of the recursive installation rules for dlls and programs. --- Make.rules.in | 3 --- configure | 3 --- configure.ac | 1 - dlls/Makedll.rules.in | 19 ------------------- programs/Makeprog.rules.in | 19 ------------------- 5 files changed, 0 insertions(+), 45 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 2f3f29a..aeb605b 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -163,9 +163,6 @@ install-man-pages:: $(MANPAGE) $(DESTDIR)$(mandir)/man$(prog_manext) uninstall-man-pages:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/$(MANPAGE:.man=).$(prog_manext) -install:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in install-man-pages) -uninstall:: @WOW64_DISABLE@ $(MANPAGE:.man=.man.in uninstall-man-pages) - .PHONY: install-man-pages uninstall-man-pages # Rules for cleaning diff --git a/configure b/configure index 6c2d41f..602eaca 100755 --- a/configure +++ b/configure @@ -741,7 +741,6 @@ AR BISON FLEX TOOLSDIR -WOW64_DISABLE TARGETFLAGS CPPBIN ac_ct_CXX @@ -4775,8 +4774,6 @@ then as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 fi - WOW64_DISABLE=\# - enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" diff --git a/configure.ac b/configure.ac index 763889b..fc4f096 100644 --- a/configure.ac +++ b/configure.ac @@ -194,7 +194,6 @@ then AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) fi - AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} elif test "x$enable_win64" = "xyes" diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index dba64f6..3a226ce 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -16,7 +16,6 @@ IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) IMPLIBFLAGS = $(TARGETFLAGS) $(EXTRAIMPLIBFLAGS) IMPORTLIBFILE = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) -INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(datadir)/wine @MAKE_RULES@ @@ -63,24 +62,6 @@ sgmlpages:: $(C_SRCS) dummy xmlpages:: $(C_SRCS) dummy $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS) -# Rules for installation - -.PHONY: install_dll install_dll.so install_dll.fake - -install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) - -install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so - -install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy - $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) - -install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT) - -uninstall:: - $(RM) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) - # Misc. rules clean:: diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index f72ad2e..802baff 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -11,7 +11,6 @@ DLLFLAGS = @DLLFLAGS@ ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) -INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext) @MAKE_RULES@ @@ -20,23 +19,5 @@ all: $(MODULE)$(DLLEXT) $(MODULE)$(FAKEEXT) $(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) -# Rules for installation - -.PHONY: install_prog install_prog.so install_prog.fake - -install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so - -install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy - $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) - -install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy - $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE) - -install install-lib:: install_prog$(DLLEXT) install_prog$(FAKEEXT) - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) - clean:: $(RM) $(MODULE)

1 0

Frédéric Delanoy : riched20/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: c388cce8aa75a4c724a51d956844c08d06744366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c388cce8aa75a4c724a51d956… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:38 2013 +0200 riched20/tests: Use BOOL type where appropriate. --- dlls/riched20/tests/editor.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4d9fde6..2fc228b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1637,27 +1637,27 @@ static void test_EM_SETOPTIONS(void) DestroyWindow(hwndRichEdit); } -static int check_CFE_LINK_selection(HWND hwnd, int sel_start, int sel_end) +static BOOL check_CFE_LINK_selection(HWND hwnd, int sel_start, int sel_end) { CHARFORMAT2W text_format; text_format.cbSize = sizeof(text_format); SendMessage(hwnd, EM_SETSEL, sel_start, sel_end); SendMessage(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &text_format); - return (text_format.dwEffects & CFE_LINK) ? 1 : 0; + return (text_format.dwEffects & CFE_LINK) != 0; } -static void check_CFE_LINK_rcvd(HWND hwnd, int is_url, const char * url) +static void check_CFE_LINK_rcvd(HWND hwnd, BOOL is_url, const char * url) { - int link_present = 0; + BOOL link_present = FALSE; link_present = check_CFE_LINK_selection(hwnd, 0, 1); if (is_url) { /* control text is url; should get CFE_LINK */ - ok(0 != link_present, "URL Case: CFE_LINK not set for [%s].\n", url); + ok(link_present, "URL Case: CFE_LINK not set for [%s].\n", url); } else { - ok(0 == link_present, "Non-URL Case: CFE_LINK set for [%s].\n", url); + ok(!link_present, "Non-URL Case: CFE_LINK set for [%s].\n", url); } } @@ -1672,20 +1672,20 @@ static void test_EM_AUTOURLDETECT(void) one non-URL and one URL */ struct urls_s { const char *text; - int is_url; + BOOL is_url; } urls[12] = { - {"winehq.org", 0}, - {"http://www.winehq.org", 1}, - {"http//winehq.org", 0}, - {"ww.winehq.org", 0}, - {"www.winehq.org", 1}, - {"ftp://192.168.1.1", 1}, - {"ftp//192.168.1.1", 0}, - {"mailto:your(a)email.com", 1}, - {"prospero:prosperoserver", 1}, - {"telnet:test", 1}, - {"news:newserver", 1}, - {"wais:waisserver", 1} + {"winehq.org", FALSE}, + {"http://www.winehq.org", TRUE}, + {"http//winehq.org", FALSE}, + {"ww.winehq.org", FALSE}, + {"www.winehq.org", TRUE}, + {"ftp://192.168.1.1", TRUE}, + {"ftp//192.168.1.1", FALSE}, + {"mailto:your(a)email.com", TRUE}, + {"prospero:prosperoserver", TRUE}, + {"telnet:test", TRUE}, + {"news:newserver", TRUE}, + {"wais:waisserver", TRUE} }; int i, j; @@ -1769,7 +1769,7 @@ static void test_EM_AUTOURLDETECT(void) SendMessage(hwndRichEdit, EM_AUTOURLDETECT, FALSE, 0); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text); - check_CFE_LINK_rcvd(hwndRichEdit, 0, urls[i].text); + check_CFE_LINK_rcvd(hwndRichEdit, FALSE, urls[i].text); /* Link detection should happen immediately upon WM_SETTEXT */ SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0);

1 0

Alexandre Julliard : configure: Make some shell variables global.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: c48232661d3ac59e5bd7a8569374a83b3da789b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48232661d3ac59e5bd7a8569… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 8 13:20:36 2013 +0200 configure: Make some shell variables global. --- aclocal.m4 | 111 ++++++++++++++++++++++++++--------------------------------- configure | 111 ++++++++++++++++++++++++++--------------------------------- 2 files changed, 98 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c48232661d3ac59e5bd7a…

1 0

Alexandre Julliard : configure: Use more user-friendly names for subdirectory targets.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: bedf4757a8b11ce55940bb97289005a79e005cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedf4757a8b11ce55940bb972… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 19:35:07 2013 +0200 configure: Use more user-friendly names for subdirectory targets. --- Make.rules.in | 6 +- aclocal.m4 | 118 ++++++++++++++++++++++++++++---------------------------- configure | 118 ++++++++++++++++++++++++++++---------------------------- 3 files changed, 121 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bedf4757a8b11ce55940b…

1 0

Frédéric Delanoy : riched20: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: f03d251ef2b19813729a1d3313268f4db599f37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03d251ef2b19813729a1d331… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:37 2013 +0200 riched20: Use BOOL type where appropriate. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6e7ffae..4e3d978 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -253,7 +253,7 @@ HANDLE me_heap = NULL; static BOOL ME_ListBoxRegistered = FALSE; static BOOL ME_ComboBoxRegistered = FALSE; -static inline int is_version_nt(void) +static inline BOOL is_version_nt(void) { return !(GetVersion() & 0x80000000); }

1 0

Henri Verbeet : wined3d: Send transformation matrix updates through the command stream.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: c6f8404bb67520abf6a8d12f768c8724fea59033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f8404bb67520abf6a8d12f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:49 2013 +0200 wined3d: Send transformation matrix updates through the command stream. --- dlls/wined3d/cs.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 4 +--- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index af23a47..16ffcf9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -44,6 +44,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_RENDER_STATE, WINED3D_CS_OP_SET_TEXTURE_STATE, WINED3D_CS_OP_SET_SAMPLER_STATE, + WINED3D_CS_OP_SET_TRANSFORM, }; struct wined3d_cs_present @@ -169,6 +170,13 @@ struct wined3d_cs_set_sampler_state DWORD value; }; +struct wined3d_cs_set_transform +{ + enum wined3d_cs_op opcode; + enum wined3d_transform_state state; + const struct wined3d_matrix *matrix; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -661,6 +669,28 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, cs->ops->submit(cs); } +static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_transform *op = data; + + cs->state.transforms[op->state] = *op->matrix; + if (op->state < WINED3D_TS_WORLD_MATRIX(cs->device->adapter->gl_info.limits.blends)) + device_invalidate_state(cs->device, STATE_TRANSFORM(op->state)); +} + +void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, + const struct wined3d_matrix *matrix) +{ + struct wined3d_cs_set_transform *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TRANSFORM; + op->state = state; + op->matrix = matrix; + + 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, @@ -681,6 +711,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, /* 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, }; 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 cae3cfd..e37a28d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1360,9 +1360,7 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, } device->state.transforms[d3dts] = *matrix; - - if (d3dts < WINED3D_TS_WORLD_MATRIX(device->adapter->gl_info.limits.blends)) - device_invalidate_state(device, STATE_TRANSFORM(d3dts)); + wined3d_cs_emit_set_transform(device->cs, d3dts, matrix); } void CDECL wined3d_device_get_transform(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9626c54..c28643a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2505,6 +2505,8 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, + const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMLightArrayImpl typedef.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: e9f2fce16b96cb469173363902da7e5145a0a66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f2fce16b96cb46917336390… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:51 2013 +0200 d3drm: Get rid of the IDirect3DRMLightArrayImpl typedef. --- dlls/d3drm/frame.c | 163 +++++++++++++++++++++++---------------------------- 1 files changed, 74 insertions(+), 89 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 6cd6c0e..fb0c22d 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -72,12 +72,13 @@ typedef struct { IDirect3DRMVisual **visuals; } IDirect3DRMVisualArrayImpl; -typedef struct { +struct d3drm_light_array +{ IDirect3DRMLightArray IDirect3DRMLightArray_iface; LONG ref; ULONG size; IDirect3DRMLight **lights; -} IDirect3DRMLightArrayImpl; +}; static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) { @@ -91,9 +92,9 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); -static inline IDirect3DRMLightArrayImpl *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) +static inline struct d3drm_light_array *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) { - return CONTAINING_RECORD(iface, IDirect3DRMLightArrayImpl, IDirect3DRMLightArray_iface); + return CONTAINING_RECORD(iface, struct d3drm_light_array, IDirect3DRMLightArray_iface); } /*** IUnknown methods ***/ @@ -328,122 +329,106 @@ static HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) return S_OK; } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirect3DRMLightArrayImpl_QueryInterface(IDirect3DRMLightArray* iface, - REFIID riid, void** object) +static HRESULT WINAPI d3drm_light_array_QueryInterface(IDirect3DRMLightArray *iface, REFIID riid, void **out) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); - - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_guid(riid), object); - - *object = NULL; + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirect3DRMLightArray)) - { - *object = &This->IDirect3DRMLightArray_iface; - } - else + if (IsEqualGUID(riid, &IID_IDirect3DRMLightArray) + || IsEqualGUID(riid, &IID_IUnknown)) { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IDirect3DRMLightArray_AddRef(iface); + *out = iface; + return S_OK; } - IDirect3DRMLightArray_AddRef(iface); - return S_OK; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DRMLightArrayImpl_AddRef(IDirect3DRMLightArray* iface) +static ULONG WINAPI d3drm_light_array_AddRef(IDirect3DRMLightArray *iface) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); + ULONG refcount = InterlockedIncrement(&array->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirect3DRMLightArrayImpl_Release(IDirect3DRMLightArray* iface) +static ULONG WINAPI d3drm_light_array_Release(IDirect3DRMLightArray *iface) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); + ULONG refcount = InterlockedDecrement(&array->ref); ULONG i; - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!ref) + if (!refcount) { - for (i = 0; i < This->size; i++) - IDirect3DRMLight_Release(This->lights[i]); - HeapFree(GetProcessHeap(), 0, This->lights); - HeapFree(GetProcessHeap(), 0, This); + for (i = 0; i < array->size; ++i) + { + IDirect3DRMLight_Release(array->lights[i]); + } + HeapFree(GetProcessHeap(), 0, array->lights); + HeapFree(GetProcessHeap(), 0, array); } - return ref; + return refcount; } -/*** IDirect3DRMArray methods ***/ -static DWORD WINAPI IDirect3DRMLightArrayImpl_GetSize(IDirect3DRMLightArray* iface) +static DWORD WINAPI d3drm_light_array_GetSize(IDirect3DRMLightArray *iface) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); - TRACE("(%p)->() = %d\n", This, This->size); + TRACE("iface %p.\n", iface); - return This->size; + return array->size; } -/*** IDirect3DRMLightArray methods ***/ -static HRESULT WINAPI IDirect3DRMLightArrayImpl_GetElement(IDirect3DRMLightArray *iface, +static HRESULT WINAPI d3drm_light_array_GetElement(IDirect3DRMLightArray *iface, DWORD index, IDirect3DRMLight **light) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); - TRACE("(%p)->(%u, %p)\n", This, index, light); + TRACE("iface %p, index %u, light %p.\n", iface, index, light); if (!light) return D3DRMERR_BADVALUE; - *light = NULL; - - if (index >= This->size) + if (index >= array->size) + { + *light = NULL; return D3DRMERR_BADVALUE; + } - IDirect3DRMLight_AddRef(This->lights[index]); - *light = This->lights[index]; + IDirect3DRMLight_AddRef(array->lights[index]); + *light = array->lights[index]; return D3DRM_OK; } -static const struct IDirect3DRMLightArrayVtbl Direct3DRMLightArray_Vtbl = +static const struct IDirect3DRMLightArrayVtbl d3drm_light_array_vtbl = { - /*** IUnknown methods ***/ - IDirect3DRMLightArrayImpl_QueryInterface, - IDirect3DRMLightArrayImpl_AddRef, - IDirect3DRMLightArrayImpl_Release, - /*** IDirect3DRMArray methods ***/ - IDirect3DRMLightArrayImpl_GetSize, - /*** IDirect3DRMLightArray methods ***/ - IDirect3DRMLightArrayImpl_GetElement + d3drm_light_array_QueryInterface, + d3drm_light_array_AddRef, + d3drm_light_array_Release, + d3drm_light_array_GetSize, + d3drm_light_array_GetElement, }; -static HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj) +static struct d3drm_light_array *d3drm_light_array_create(void) { - IDirect3DRMLightArrayImpl* object; - - TRACE("(%p)\n", obj); - - *obj = NULL; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightArrayImpl)); - if (!object) - return E_OUTOFMEMORY; + struct d3drm_light_array *array; - object->IDirect3DRMLightArray_iface.lpVtbl = &Direct3DRMLightArray_Vtbl; - object->ref = 1; + if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) + return NULL; - *obj = &object->IDirect3DRMLightArray_iface; + array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl; + array->ref = 1; - return S_OK; + return array; } /*** IUnknown methods ***/ @@ -1678,32 +1663,32 @@ static D3DCOLOR WINAPI IDirect3DRMFrame3Impl_GetColor(IDirect3DRMFrame3* iface) static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3 *iface, IDirect3DRMLightArray **lights) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - IDirect3DRMLightArrayImpl* obj; - HRESULT hr; + IDirect3DRMFrameImpl *frame = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_light_array *array; - TRACE("(%p/%p)->(%p)\n", iface, This, lights); + TRACE("iface %p, lights %p.\n", iface, lights); if (!lights) return D3DRMERR_BADVALUE; - hr = Direct3DRMLightArray_create(lights); - - if (hr != D3DRM_OK) - return hr; - - obj = (IDirect3DRMLightArrayImpl*)*lights; + if (!(array = d3drm_light_array_create())) + return E_OUTOFMEMORY; - obj->size = This->nb_lights; - if (This->nb_lights) + array->size = frame->nb_lights; + if (frame->nb_lights) { ULONG i; - if (!(obj->lights = HeapAlloc(GetProcessHeap(), 0, This->nb_lights * sizeof(*obj->lights)))) + + if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, frame->nb_lights * sizeof(*array->lights)))) return E_OUTOFMEMORY; - for (i = 0; i < This->nb_lights; i++) - IDirect3DRMLight_QueryInterface(This->lights[i], &IID_IDirect3DRMLight, (void**)&obj->lights[i]); + for (i = 0; i < frame->nb_lights; ++i) + { + IDirect3DRMLight_QueryInterface(frame->lights[i], &IID_IDirect3DRMLight, (void **)&array->lights[i]); + } } + *lights = &array->IDirect3DRMLightArray_iface; + return D3DRM_OK; }

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMFaceImpl typedef.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 7320f3b87e68b04df5dd819656131a21c80c78f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7320f3b87e68b04df5dd81965… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:50 2013 +0200 d3drm: Get rid of the IDirect3DRMFaceImpl typedef. --- dlls/d3drm/face.c | 561 +++++++++++++++++++++-------------------------------- 1 files changed, 223 insertions(+), 338 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7320f3b87e68b04df5dd8…

1 0