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

Alexandre Julliard : rpcrt4: Fix handling of complex types of return values on the client side.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: b0f858607893c46312277abda3d15c8f4ca7a59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f858607893c46312277abda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 15:11:40 2011 +0200 rpcrt4: Fix handling of complex types of return values on the client side. --- dlls/rpcrt4/ndr_stubless.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 436dccf..f508c9e 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -332,11 +332,8 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, case PROXY_UNMARSHAL: if (pParam->param_attributes.IsOut) { - if (pParam->param_attributes.IsReturn) - call_unmarshaller(pStubMsg, &pRetVal, pTypeFormat, 0); - else - call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); - TRACE("pRetVal = %p\n", pRetVal); + if (pParam->param_attributes.IsReturn) pArg = pRetVal; + call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); } break; default: @@ -386,9 +383,8 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, case PROXY_UNMARSHAL: if (pParam->param_attributes.IsOut) { - if (pParam->param_attributes.IsReturn) - call_unmarshaller(pStubMsg, &pRetVal, pTypeFormat, 0); - else if (pParam->param_attributes.IsByValue) + if (pParam->param_attributes.IsReturn) pArg = pRetVal; + if (pParam->param_attributes.IsByValue) call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); else call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0);

1 0

Alexandre Julliard : rpcrt4: Also check base types for null ref pointers.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: e8567110b3cdb3014a5c387278129b08e88a96c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8567110b3cdb3014a5c38727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 20:14:40 2011 +0200 rpcrt4: Also check base types for null ref pointers. --- dlls/rpcrt4/ndr_stubless.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f508c9e..f019776 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -315,7 +315,10 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, &pParam->type_format_char; if (pParam->param_attributes.IsSimpleRef) + { pArg = *(unsigned char **)pArg; + if (!pArg) RpcRaiseException(RPC_X_NULL_REF_POINTER); + } TRACE("\tbase type: 0x%02x\n", *pTypeFormat);

1 0

David Hedberg : kernel32: GlobalSize() should also work with GMEM_MOVEABLE data pointers received from GlobalLock ().
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: fed025fd42b642ae86189f329043969599ed6501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed025fd42b642ae86189f329… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Jun 13 08:22:15 2011 +0200 kernel32: GlobalSize() should also work with GMEM_MOVEABLE data pointers received from GlobalLock(). --- dlls/kernel32/heap.c | 6 ++++++ dlls/kernel32/tests/heap.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 7be9172..4ade995 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -820,6 +820,12 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) if(ISPOINTER(hmem)) { retval=HeapSize(GetProcessHeap(), 0, hmem); + + if (retval == (DWORD)-1) /* It might be a GMEM_MOVEABLE data pointer */ + { + retval = HeapSize(GetProcessHeap(), 0, (char*)(hmem) - HGLOBAL_STORAGE); + if (retval != (DWORD)-1) retval -= HGLOBAL_STORAGE; + } } else { diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f7ac478..26bc58f 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -85,7 +85,7 @@ static void test_heap(void) UINT flags; HGLOBAL gbl; HGLOBAL hsecond; - SIZE_T size; + SIZE_T size, size2; /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -403,6 +403,36 @@ static void test_heap(void) "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); GlobalFree(gbl); + + /* trying to get size from data pointer (GMEM_MOVEABLE) */ + gbl = GlobalAlloc(GMEM_MOVEABLE, 0x123); + ok(gbl != NULL, "returned NULL\n"); + mem = GlobalLock(gbl); + ok(mem != NULL, "returned NULL.\n"); + ok(gbl != mem, "unexpectedly equal.\n"); + + size = GlobalSize(gbl); + size2 = GlobalSize(mem); + ok(size == 0x123, "got %lu\n", size); + ok(size2 == 0x123, "got %lu\n", size2); + + GlobalFree(gbl); + + /* trying to get size from data pointer (GMEM_FIXED) */ + gbl = GlobalAlloc(GMEM_FIXED, 0x123); + ok(gbl != NULL, "returned NULL\n"); + mem = GlobalLock(gbl); + ok(mem != NULL, "returned NULL.\n"); + ok(gbl == mem, "got %p, %p.\n", gbl, mem); + + size = GlobalSize(gbl); + ok(size == 0x123, "got %lu\n", size); + + GlobalFree(gbl); + + size = GlobalSize((void *)0xdeadbee0); + ok(size == 0, "got %lu\n", size); + } static void test_obsolete_flags(void)

1 0

Alexandre Goujon : winenas.drv: Avoid a warning in a trace on x86_64.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 43c648ecdc595a59abece282c5db178ede931f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c648ecdc595a59abece282c… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sat Jun 11 14:30:29 2011 +0200 winenas.drv: Avoid a warning in a trace on x86_64. --- dlls/winenas.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index a5768fa..4b63ea1 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -1360,7 +1360,7 @@ event_handler(AuServer* aud, AuEvent* ev, AuEventHandlerRec* hnd) nas_state(event->prev_state), nas_state(event->cur_state), nas_reason(event->reason), - event->num_bytes, wwo->freeBytes); + (long)event->num_bytes, wwo->freeBytes); if (event->cur_state == AuStatePause && event->reason != AuReasonUser) { wwo->freeBytes += event->num_bytes;

1 0

Francois Gouget : d3dxof: Make read_bytes() static.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: bb658848c060377e4adc07bf0dfe8804a58349b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb658848c060377e4adc07bf0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:34 2011 +0200 d3dxof: Make read_bytes() static. --- dlls/d3dxof/d3dxof_private.h | 1 - dlls/d3dxof/parsing.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 40870ac..186e707 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -162,7 +162,6 @@ typedef struct { HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) DECLSPEC_HIDDEN; HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr) DECLSPEC_HIDDEN; BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; BOOL parse_templates(parse_buffer * buf) DECLSPEC_HIDDEN; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 4d72219..cbf1761 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -166,7 +166,7 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) DPRINTF("}\n"); } -BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) +static BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) { if (buf->rem_bytes < size) return FALSE;

1 0

Francois Gouget : oleaut32: Fix a typo in a documentation comment.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 30664aa0917b2cbe3a1a3a7909c531727de352d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30664aa0917b2cbe3a1a3a790… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:05 2011 +0200 oleaut32: Fix a typo in a documentation comment. --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2d4d4e3..2b1307e 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -1655,7 +1655,7 @@ HRESULT WINAPI VarI4FromBool(VARIANT_BOOL boolIn, LONG *piOut) /************************************************************************ * VarI4FromI1 (OLEAUT32.209) * - * Convert a VT_I4 to a VT_I4. + * Convert a VT_I1 to a VT_I4. * * PARAMS * cIn [I] Source

1 0

Francois Gouget : ddraw: Make unsafe_impl_from_IDirectDrawSurface{2, 3}() static.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 9c99738780c6aeefbdc9e79fe8b49226130e313d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c99738780c6aeefbdc9e79fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:25 2011 +0200 ddraw: Make unsafe_impl_from_IDirectDrawSurface{2,3}() static. --- dlls/ddraw/ddraw_private.h | 2 -- dlls/ddraw/surface.c | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index cfea63e..42c1f13 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -249,8 +249,6 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface7(IDirectDrawS } IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) DECLSPEC_HIDDEN; -IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface) DECLSPEC_HIDDEN; -IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0d0220f..504e107 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -31,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface); +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); + static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawGammaControl(IDirectDrawGammaControl *iface) { return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawGammaControl_iface); @@ -4813,14 +4816,14 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface4_iface); } -IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &ddraw_surface3_vtbl); return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); } -IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface) +static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &ddraw_surface2_vtbl);

1 0

Francois Gouget : comdlg32: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard June 13, 2011

June 13, 2011

Module: wine Branch: master Commit: 7777d61ff4f504f2ba1d34860970cad342ded345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7777d61ff4f504f2ba1d34860… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:50 2011 +0200 comdlg32: Add a trailing '\n' to a TRACE() call. --- dlls/comdlg32/itemdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 354e952..bc309c9 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -993,7 +993,7 @@ static LRESULT ctrl_container_on_create(HWND hwnd, CREATESTRUCTW *crs) static LRESULT ctrl_container_on_wm_destroy(FileDialogImpl *This) { customctrl *cur1, *cur2; - TRACE("%p", This); + TRACE("%p\n", This); LIST_FOR_EACH_ENTRY_SAFE(cur1, cur2, &This->cctrls, customctrl, entry) {

1 0

Austin English : shdocvw: Add a stub for RunInstallUninstallStubs2.
by Alexandre Julliard June 13, 2011

June 13, 2011

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 : makefiles: Use the generic install flags for the tools directories.
by Alexandre Julliard June 13, 2011

June 13, 2011

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