June 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Use the generic install flags for the tools directories.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 49c31e3bf8d083388ca50d5acb76274e86a00a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c31e3bf8d083388ca50d5ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 12 12:13:17 2011 +0200 makefiles: Use the generic install flags for the tools directories. --- aclocal.m4 | 24 +++--------------------- configure | 35 +++++++++-------------------------- configure.ac | 12 ++++++------ tools/widl/Makefile.in | 2 +- tools/winebuild/Makefile.in | 2 +- tools/winedump/Makefile.in | 2 +- tools/winegcc/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 9 files changed, 24 insertions(+), 59 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 781e627..6dd0361 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -439,28 +439,10 @@ wine_fn_config_tool () ac_flags=$[2] AS_VAR_IF([enable_tools],[no],[return 0]) - wine_fn_all_dir_rules $ac_dir Make.rules + wine_fn_config_makefile $ac_dir enable_tools $ac_flags - case $ac_dir in - dnl tools directory has both install-lib and install-dev - tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install:: $ac_dir - @cd $ac_dir && \$(MAKE) install -install-lib:: $ac_dir - @cd $ac_dir && \$(MAKE) install-lib -install-dev:: $ac_dir - @cd $ac_dir && \$(MAKE) install-dev" ;; - *) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install install-dev:: $ac_dir - @cd $ac_dir && \$(MAKE) install" ;; - esac - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"uninstall:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall -all __tooldeps__: $ac_dir -.PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile libs/port dummy - @cd $ac_dir && \$(MAKE)" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__tooldeps__: $ac_dir" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: libs/port" case $ac_dir in tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;; esac diff --git a/configure b/configure index 36692f7..e0afaa6 100755 --- a/configure +++ b/configure @@ -14817,27 +14817,10 @@ wine_fn_config_tool () return 0 fi - wine_fn_all_dir_rules $ac_dir Make.rules + wine_fn_config_makefile $ac_dir enable_tools $ac_flags - case $ac_dir in - tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install:: $ac_dir - @cd $ac_dir && \$(MAKE) install -install-lib:: $ac_dir - @cd $ac_dir && \$(MAKE) install-lib -install-dev:: $ac_dir - @cd $ac_dir && \$(MAKE) install-dev" ;; - *) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install install-dev:: $ac_dir - @cd $ac_dir && \$(MAKE) install" ;; - esac - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"uninstall:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall -all __tooldeps__: $ac_dir -.PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile libs/port dummy - @cd $ac_dir && \$(MAKE)" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__tooldeps__: $ac_dir" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: libs/port" case $ac_dir in tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;; esac @@ -15560,12 +15543,12 @@ wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_makefile server enable_server install-lib wine_fn_config_tool tools install-dev,install-lib -wine_fn_config_tool tools/widl -wine_fn_config_tool tools/winebuild -wine_fn_config_tool tools/winedump -wine_fn_config_tool tools/winegcc -wine_fn_config_tool tools/wmc -wine_fn_config_tool tools/wrc +wine_fn_config_tool tools/widl install-dev +wine_fn_config_tool tools/winebuild install-dev +wine_fn_config_tool tools/winedump install-dev +wine_fn_config_tool tools/winegcc install-dev +wine_fn_config_tool tools/wmc install-dev +wine_fn_config_tool tools/wrc install-dev LINGUAS="\ ar \ diff --git a/configure.ac b/configure.ac index 81a32f5..9db37c7 100644 --- a/configure.ac +++ b/configure.ac @@ -3011,12 +3011,12 @@ WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_MAKEFILE([server],,[install-lib]) WINE_CONFIG_TOOL(tools,[install-dev,install-lib]) -WINE_CONFIG_TOOL(tools/widl) -WINE_CONFIG_TOOL(tools/winebuild) -WINE_CONFIG_TOOL(tools/winedump) -WINE_CONFIG_TOOL(tools/winegcc) -WINE_CONFIG_TOOL(tools/wmc) -WINE_CONFIG_TOOL(tools/wrc) +WINE_CONFIG_TOOL(tools/widl,[install-dev]) +WINE_CONFIG_TOOL(tools/winebuild,[install-dev]) +WINE_CONFIG_TOOL(tools/winedump,[install-dev]) +WINE_CONFIG_TOOL(tools/winegcc,[install-dev]) +WINE_CONFIG_TOOL(tools/wmc,[install-dev]) +WINE_CONFIG_TOOL(tools/wrc,[install-dev]) AC_SUBST([LINGUAS],["\ ar \ diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 72cb1c0..f2bd3f3 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -30,7 +30,7 @@ all: $(PROGRAMS) widl$(EXEEXT): $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LDFLAGS) -install:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) widl$(EXEEXT) $(DESTDIR)$(bindir)/widl$(EXEEXT) uninstall:: diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index d10ede5..2017129 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -23,7 +23,7 @@ all: $(PROGRAMS) winebuild$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS) -install:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) winebuild$(EXEEXT) $(DESTDIR)$(bindir)/winebuild$(EXEEXT) uninstall:: diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index d4210c1..c61096a 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -33,7 +33,7 @@ all: $(PROGRAMS) winedump$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS) -install:: $(PROGRAMS) $(DESTDIR)$(bindir) +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT) $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index db869fb..85e8002 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -32,7 +32,7 @@ winegcc$(EXEEXT): winegcc.o utils.o winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT) $(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@ -install:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages +install install-dev:: $(PROGRAMS) $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) winegcc$(EXEEXT) $(DESTDIR)$(bindir)/winegcc$(EXEEXT) cd $(DESTDIR)$(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT) cd $(DESTDIR)$(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index a6400b7..a3ba3dd 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -25,7 +25,7 @@ wmc$(EXEEXT): $(OBJS) wmc-installed: $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL) -install:: wmc-installed $(DESTDIR)$(bindir) +install install-dev:: wmc-installed $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) wmc-installed $(DESTDIR)$(bindir)/wmc$(EXEEXT) uninstall:: diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index ff4f086..5092adb 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -29,7 +29,7 @@ wrc$(EXEEXT): $(OBJS) $(LIBWPP) wrc-installed: $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL) -install:: wrc-installed $(DESTDIR)$(bindir) +install install-dev:: wrc-installed $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) wrc-installed $(DESTDIR)$(bindir)/wrc$(EXEEXT) uninstall::

1 0

Alexandre Julliard : makefiles: Use the generic install flags for the static libraries.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: a0b8fa9f97b115274d863e8c22bdb1b99b0ffb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b8fa9f97b115274d863e8c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 12 12:44:03 2011 +0200 makefiles: Use the generic install flags for the static libraries. --- aclocal.m4 | 15 +++++---------- configure | 15 +++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 6dd0361..18b920b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -204,9 +204,10 @@ wine_fn_config_makefile () ac_dir=$[1] ac_enable=$[2] ac_flags=$[3] + ac_rules=$[4] AS_VAR_IF([$ac_enable],[no],[return 0]) - wine_fn_all_dir_rules $ac_dir Make.rules + wine_fn_all_dir_rules $ac_dir ${ac_rules:-Make.rules} wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir @@ -241,15 +242,9 @@ wine_fn_config_lib () ac_name=$[1] ac_flags=$[2] ac_dir=dlls/$ac_name - wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all __builddeps__: $ac_dir -$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy - @cd $ac_dir && \$(MAKE) -install install-dev:: $ac_dir - @cd $ac_dir && \$(MAKE) install -uninstall:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall" + wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include" } wine_fn_config_dll () diff --git a/configure b/configure index e0afaa6..1bdae44 100755 --- a/configure +++ b/configure @@ -14569,11 +14569,12 @@ wine_fn_config_makefile () ac_dir=$1 ac_enable=$2 ac_flags=$3 + ac_rules=$4 if eval test \"x\$"$ac_enable"\" = x"no"; then : return 0 fi - wine_fn_all_dir_rules $ac_dir Make.rules + wine_fn_all_dir_rules $ac_dir ${ac_rules:-Make.rules} wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir @@ -14608,15 +14609,9 @@ wine_fn_config_lib () ac_name=$1 ac_flags=$2 ac_dir=dlls/$ac_name - wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all __builddeps__: $ac_dir -$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy - @cd $ac_dir && \$(MAKE) -install install-dev:: $ac_dir - @cd $ac_dir && \$(MAKE) install -uninstall:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall" + wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include" } wine_fn_config_dll ()

1 0

Marcus Meissner : wined3d: Don't just print a FIXME on error, handle it ( Coverity).
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 2bcd4398182df76ea40ce84651d7b554f3660b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcd4398182df76ea40ce8465… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 11 18:05:02 2011 +0200 wined3d: Don't just print a FIXME on error, handle it (Coverity). --- dlls/wined3d/device.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5bc5a08..30d5b95 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1872,12 +1872,13 @@ HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device, * below means it will be recorded in a state block change, but it * works regardless where it is recorded. * If this is found to be wrong, change to StateBlock. */ + if (state > HIGHEST_TRANSFORMSTATE) + { + WARN("Unhandled transform state %#x.\n", state); + return WINED3D_OK; + } - if (state <= HIGHEST_TRANSFORMSTATE) - mat = &device->updateStateBlock->state.transforms[state]; - else - FIXME("Unhandled transform state %#x.\n", state); - + mat = &device->updateStateBlock->state.transforms[state]; multiply_matrix(&temp, mat, matrix); /* Apply change via set transform - will reapply to eg. lights this way. */

1 0

Marcus Meissner : user32: Initialize all of msg (Coverity).
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 891fcb20acedf15f61a285b442e2dcc5815c2c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=891fcb20acedf15f61a285b44… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 11 10:54:58 2011 +0200 user32: Initialize all of msg (Coverity). --- dlls/user32/tests/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 62acf8a..8c23da2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13054,6 +13054,7 @@ static LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam { KBDLLHOOKSTRUCT *kdbhookstruct = (KBDLLHOOKSTRUCT*)lParam; + msg.hwnd = 0; msg.message = wParam; msg.flags = kbd_hook|wparam|lparam; msg.wParam = kdbhookstruct->vkCode;

1 0

Marcus Meissner : msi: Fix some NULL dereferences (Coverity).
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: aec497b03d6ebd1246944d7a1fe463fba1502095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec497b03d6ebd1246944d7a1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 11 11:33:08 2011 +0200 msi: Fix some NULL dereferences (Coverity). --- dlls/msi/font.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index aea5702..afc7ee6 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -216,13 +216,13 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param) file = msi_get_loaded_file( package, filename ); if (!file) { - WARN("unable to find file %s\n", debugstr_w(file->File)); + WARN("unable to find file %s\n", debugstr_w(filename)); return ERROR_SUCCESS; } comp = msi_get_loaded_component( package, file->Component->Component ); if (!comp) { - WARN("unable to find component %s\n", debugstr_w(comp->Component)); + WARN("unable to find component %s\n", debugstr_w(file->Component->Component)); return ERROR_SUCCESS; } comp->Action = msi_get_component_action( package, comp ); @@ -301,13 +301,13 @@ static UINT ITERATE_UnregisterFonts( MSIRECORD *row, LPVOID param ) file = msi_get_loaded_file( package, filename ); if (!file) { - WARN("unable to find file %s\n", debugstr_w(file->File)); + WARN("unable to find file %s\n", debugstr_w(filename)); return ERROR_SUCCESS; } comp = msi_get_loaded_component( package, file->Component->Component ); if (!comp) { - WARN("unable to find component %s\n", debugstr_w(comp->Component)); + WARN("unable to find component %s\n", debugstr_w(file->Component->Component)); return ERROR_SUCCESS; } comp->Action = msi_get_component_action( package, comp );

1 0

André Hentschel : ws2_32/tests: Don' t read return value when we don't test for it.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 3437591e71d0375aff5ab45ef2919040c79e89ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3437591e71d0375aff5ab45ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 11 14:03:20 2011 +0200 ws2_32/tests: Don't read return value when we don't test for it. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 28d5db3..44539a8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -520,7 +520,7 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); /* Receive the rest of the out-of-band data and check atmark state */ - n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark );

1 0

André Hentschel : c2man: Initialise current comment info.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: b1d089baa3751ce5f59c080dc7eb5ebb191f899a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d089baa3751ce5f59c080dc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 11 16:45:24 2011 +0200 c2man: Initialise current comment info. --- tools/c2man.pl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 8030bc4..9c67488 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -420,6 +420,7 @@ sub process_source_file($) if ($parse_state == 4) # Reading in the function definition { # This file is used by the DLL - Make sure we get our contributors right + @{$spec_files{$comment->{DLL_NAME}}[0]->{CURRENT_EXTRA}} = (); push (@{$spec_files{$comment->{DLL_NAME}}[0]->{SOURCES}},$comment->{FILE}); push (@{$comment->{PROTOTYPE}},$_);

1 0

Marcus Meissner : d3dx9_36: Moved param NULL a bit forward (Coverity).
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 6c902b4201b8237195ef492dae2be70c70793612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c902b4201b8237195ef492da… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 11 11:00:33 2011 +0200 d3dx9_36: Moved param NULL a bit forward (Coverity). --- dlls/d3dx9_36/effect.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bbe21f0..ca88f76 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1516,6 +1516,11 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH TRACE("iface %p, parameter %p, data %p, bytes %u\n", This, parameter, data, bytes); if (!param) param = get_parameter_by_name(This, NULL, parameter); + if (!param) + { + WARN("Invalid parameter %p specified\n", parameter); + return D3DERR_INVALIDCALL; + } /* samplers don't touch data */ if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER @@ -1526,7 +1531,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH return E_FAIL; } - if (data && param && param->bytes <= bytes) + if (data && param->bytes <= bytes) { TRACE("Type %s\n", debug_d3dxparameter_type(param->type));

1 0

Austin English : shdocvw: Add a stub for RunInstallUninstallStubs2.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 830c2bde1880c5b2fbc48c06eaa8a4ae0249c82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=830c2bde1880c5b2fbc48c06e… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jun 11 13:12:26 2011 -0500 shdocvw: Add a stub for RunInstallUninstallStubs2. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index be59d85..672c7fa 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -20,7 +20,7 @@ 123 stdcall -noname StopWatchAFORWARD(long str long long long) 124 stdcall -noname StopWatchWFORWARD(long wstr long long long) 125 stdcall -noname RunInstallUninstallStubs() -130 stub -noname RunInstallUninstallStubs2 +130 stdcall -noname RunInstallUninstallStubs2() 131 stub -noname SHCreateSplashScreen 135 stub -noname IsFileUrl 136 stub -noname IsFileUrlW diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 4386ddc..9bf2fa7 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -210,6 +210,17 @@ DWORD WINAPI RunInstallUninstallStubs(void) } /*********************************************************************** + * @ (SHDOCVW.130) + * + * Called by Emerge Desktop (alternative Windows Shell). + */ +DWORD WINAPI RunInstallUninstallStubs2(void) +{ + FIXME("(), stub!\n"); + return 0x0deadbee; +} + +/*********************************************************************** * SetQueryNetSessionCount (SHDOCVW.@) */ DWORD WINAPI SetQueryNetSessionCount(DWORD arg)

1 0

Alexandre Julliard : urlmon: Fix some pointer cast warnings.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 59d76dd341e2ecf3fbea3a783555dc33ecc5accc URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d76dd341e2ecf3fbea3a783… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 11 11:18:00 2011 +0200 urlmon: Fix some pointer cast warnings. --- dlls/urlmon/protocol.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 94801ae..5bd16dd 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -89,13 +89,13 @@ static void request_complete(Protocol *protocol, INTERNET_ASYNC_RESULT *ar) } if(protocol->flags & FLAG_FIRST_CONTINUE_COMPLETE) - data.pData = (LPVOID)BINDSTATUS_ENDDOWNLOADCOMPONENTS; + data.pData = UlongToPtr(BINDSTATUS_ENDDOWNLOADCOMPONENTS); else - data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA; + data.pData = UlongToPtr(BINDSTATUS_DOWNLOADINGDATA); }else { protocol->flags |= FLAG_ERROR; - data.pData = (LPVOID)ar->dwError; + data.pData = UlongToPtr(ar->dwError); } if (protocol->bindf & BINDF_FROMURLMON) @@ -294,7 +294,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) return S_OK; } - is_start = data->pData == (LPVOID)BINDSTATUS_DOWNLOADINGDATA; + is_start = data->pData == UlongToPtr(BINDSTATUS_DOWNLOADINGDATA); if(!protocol->request) { WARN("Expected request to be non-NULL\n"); @@ -308,7 +308,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) if(protocol->flags & FLAG_ERROR) { protocol->flags &= ~FLAG_ERROR; - protocol->vtbl->on_error(protocol, (DWORD)data->pData); + protocol->vtbl->on_error(protocol, PtrToUlong(data->pData)); return S_OK; } @@ -338,7 +338,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; } - if(data->pData >= (LPVOID)BINDSTATUS_DOWNLOADINGDATA && !protocol->available_bytes) { + if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA) && !protocol->available_bytes) { BOOL res; /* InternetQueryDataAvailable may immediately fork and perform its asynchronous

1 0