January 2014 - Wine-commits

Alexandre Julliard : msvcp90: Remove parameter checks from functions that are only used for old msvcp versions.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 4d7255d2df5a9262970e532c3e078ea7cd75631a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7255d2df5a9262970e532c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 11:50:36 2014 +0100 msvcp90: Remove parameter checks from functions that are only used for old msvcp versions. --- dlls/msvcp90/locale.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 45380d2..f428396 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9713,12 +9713,6 @@ size_t __cdecl mbsrtowcs(wchar_t *dst, const char **pstr, size_t n, mbstate_t *s wchar_t wc; const char *src; - if (!pstr) - { - *_errno() = EINVAL; - _invalid_parameter( NULL, NULL, NULL, 0, 0 ); - return -1; - } src = *pstr; if (!state) state = &local_state; @@ -9757,12 +9751,6 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s char buffer[MB_LEN_MAX]; size_t ret = 0; - if (!pstr) - { - *_errno() = EINVAL; - _invalid_parameter( NULL, NULL, NULL, 0, 0 ); - return -1; - } src = *pstr; while (!dst || n > ret)

1 0

Alexandre Julliard : msvcp90: Don' t build the new-style string iterator functions for old msvcp versions.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 581dd68c8a8c7660d1b5b2ce42608a6824507279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581dd68c8a8c7660d1b5b2ce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 11:56:02 2014 +0100 msvcp90: Don't build the new-style string iterator functions for old msvcp versions. --- dlls/msvcp90/string.c | 1288 +++++++++++++++++++++++++------------------------ 1 file changed, 650 insertions(+), 638 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=581dd68c8a8c7660d1b5b…

1 0

Alexandre Julliard : msvcp90: Avoid using get_current_locale that doesn' t exist in old msvcrt versions.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: c2b0732108ec9eb59fb26142abbfc5868caf7bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b0732108ec9eb59fb26142a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 12:51:53 2014 +0100 msvcp90: Avoid using get_current_locale that doesn't exist in old msvcrt versions. --- dlls/msvcp90/locale.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f428396..0ae1d8d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -43,6 +43,8 @@ char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); +int __cdecl ___lc_collate_cp_func(void); +const unsigned short* __cdecl __pctype_func(void); const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t); MSVCP_size_t __cdecl _Strftime(char*, MSVCP_size_t, const char*, const struct tm*, struct __lc_time_data*); @@ -589,13 +591,11 @@ ULONGLONG __cdecl _Getcoll(void) _Collvec collvec; ULONGLONG ull; } ret; - _locale_t locale = _get_current_locale(); TRACE("\n"); - ret.collvec.page = locale->locinfo->lc_collate_cp; - ret.collvec.handle = locale->locinfo->lc_handle[LC_COLLATE]; - _free_locale(locale); + ret.collvec.page = ___lc_collate_cp_func(); + ret.collvec.handle = ___lc_handle_func()[LC_COLLATE]; return ret.ull; } @@ -612,22 +612,17 @@ _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) /* _Getctype */ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) { - _locale_t locale = _get_current_locale(); short *table; TRACE("\n"); - ret->page = locale->locinfo->lc_codepage; - ret->handle = locale->locinfo->lc_handle[LC_COLLATE]; + ret->page = ___lc_codepage_func(); + ret->handle = ___lc_handle_func()[LC_COLLATE]; ret->delfl = TRUE; table = malloc(sizeof(short[256])); - if(!table) { - _free_locale(locale); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - } - memcpy(table, locale->locinfo->pctype, sizeof(short[256])); + if(!table) throw_exception(EXCEPTION_BAD_ALLOC, NULL); + memcpy(table, __pctype_func(), sizeof(short[256])); ret->table = table; - _free_locale(locale); return ret; } @@ -642,7 +637,6 @@ _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) /* _Getcvt */ ULONGLONG __cdecl _Getcvt(void) { - _locale_t locale = _get_current_locale(); union { _Cvtvec cvtvec; ULONGLONG ull; @@ -650,9 +644,8 @@ ULONGLONG __cdecl _Getcvt(void) TRACE("\n"); - ret.cvtvec.page = locale->locinfo->lc_codepage; - ret.cvtvec.handle = locale->locinfo->lc_handle[LC_CTYPE]; - _free_locale(locale); + ret.cvtvec.page = ___lc_codepage_func(); + ret.cvtvec.handle = ___lc_handle_func()[LC_CTYPE]; return ret.ull; }

1 0

Alexandre Julliard : msvcp90: Add wrappers for functions that don' t exist in old msvcrt versions.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 645540beed24327a145b7571ba5fe6d58f890f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645540beed24327a145b7571b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 12:52:17 2014 +0100 msvcp90: Add wrappers for functions that don't exist in old msvcrt versions. --- dlls/msvcp90/locale.c | 7 +++---- dlls/msvcp90/msvcp90.h | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0ae1d8d..263bb8c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -20,7 +20,6 @@ #include <stdarg.h> -#include "msvcp90.h" #include "locale.h" #include "errno.h" #include "limits.h" @@ -29,14 +28,14 @@ #include "wchar.h" #include "wctype.h" #include "time.h" - -#include "wine/list.h" - #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "msvcp90.h" #include "wine/unicode.h" +#include "wine/list.h" #include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(msvcp); char* __cdecl _Getdays(void); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index b04faab..026a04d 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -515,3 +515,10 @@ typedef struct { double real; double imag; } complex_double; + +#if _MSVCP_VER < 80 +#define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0) +#define memmove_s( dst, size, src, count ) (memmove( (dst), (src), (count) ), 0) +#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) )) +#define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) +#endif

1 0

Alexandre Julliard : msvcp71: Import the correct msvcrt version.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 0d72182bd80a18799022d75a3cc8a66c4912618e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d72182bd80a18799022d75a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 12:52:28 2014 +0100 msvcp71: Import the correct msvcrt version. --- dlls/msvcp71/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp71/Makefile.in b/dlls/msvcp71/Makefile.in index 03ce2cb..dfa0a2b 100644 --- a/dlls/msvcp71/Makefile.in +++ b/dlls/msvcp71/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp71.dll -IMPORTS = msvcrt +IMPORTS = msvcr71 EXTRADEFS = -D_MSVCP_VER=71 PARENTSRC = ../msvcp90

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 3ea6334222319ec44ec64000b85a6325e368eda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea6334222319ec44ec64000b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Jan 11 13:40:59 2014 +0200 po: Update Finnish translation. --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index ac1c326..164a493 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-06 21:18+0300\n" +"PO-Revision-Date: 2014-01-11 13:40+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: none\n" "Language: Finnish\n" @@ -10124,10 +10124,8 @@ msgid "Wine Explorer" msgstr "Winen Explorer" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Käynnistys" +msgstr "Käynnistä" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Huw Davies : mshtml: Finish with the correct string.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 5ac8507a8ebaebb407aea439948a07e1ad9bbcea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac8507a8ebaebb407aea4399… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 13 11:32:44 2014 +0000 mshtml: Finish with the correct string. --- dlls/mshtml/npplugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 57bb772..f5eb754 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -309,7 +309,7 @@ static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) ERR("GetAttribute failed: %08x\n", nsres); } - nsAString_Finish(&attr_str); + nsAString_Finish(&val_str); return ret; } @@ -557,7 +557,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) ERR("GetAttribute failed: %08x\n", nsres); } - nsAString_Finish(&attr_str); + nsAString_Finish(&val_str); if(!uri) return;

1 0

Francois Gouget : riched20: Make ME_GetDITypeName() static.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 25e0f11ced51e9462fefe06da7e71d6423f50ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e0f11ced51e9462fefe06da… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 13 13:30:37 2014 +0100 riched20: Make ME_GetDITypeName() static. --- dlls/riched20/editor.h | 1 - dlls/riched20/list.c | 31 ++++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 40bf04c..ae8b81a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -95,7 +95,6 @@ ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; -const char *ME_GetDITypeName(ME_DIType type) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 7722fc9..a6b3c65 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -139,9 +139,24 @@ ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass) return NULL; } +static const char *ME_GetDITypeName(ME_DIType type) +{ + switch(type) + { + case diParagraph: return "diParagraph"; + case diRun: return "diRun"; + case diCell: return "diCell"; + case diTextStart: return "diTextStart"; + case diTextEnd: return "diTextEnd"; + case diStartRow: return "diStartRow"; + default: return "?"; + } +} + void ME_DestroyDisplayItem(ME_DisplayItem *item) { -/* TRACE("type=%s\n", ME_GetDITypeName(item->type)); */ + if (0) + TRACE("type=%s\n", ME_GetDITypeName(item->type)); if (item->type==diParagraph) { FREE_OBJ(item->member.para.pFmt); @@ -172,20 +187,6 @@ ME_DisplayItem *ME_MakeDI(ME_DIType type) return item; } -const char *ME_GetDITypeName(ME_DIType type) -{ - switch(type) - { - case diParagraph: return "diParagraph"; - case diRun: return "diRun"; - case diCell: return "diCell"; - case diTextStart: return "diTextStart"; - case diTextEnd: return "diTextEnd"; - case diStartRow: return "diStartRow"; - default: return "?"; - } -} - void ME_DumpDocument(ME_TextBuffer *buffer) { /* FIXME this is useless, */

1 0

Bruno Jesus : iphlpapi: Return error for IP address with value zero in IcmpSendEcho.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 1470d7b4cc607976b7d379d5ce594f65b3ca3c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1470d7b4cc607976b7d379d5c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 9 20:45:37 2014 -0200 iphlpapi: Return error for IP address with value zero in IcmpSendEcho. --- dlls/iphlpapi/icmp.c | 5 +++++ dlls/iphlpapi/tests/iphlpapi.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 7d84811..abd8ddc 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -239,6 +239,11 @@ DWORD WINAPI IcmpSendEcho( } /* check the request size against SO_MAX_MSG_SIZE using getsockopt */ + if (!DestinationAddress) { + SetLastError(ERROR_INVALID_NETNAME); + return 0; + } + /* Prepare the request */ id=getpid() & 0xFFFF; seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 94716d7..13a21c0 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -906,12 +906,10 @@ todo_wine SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); - todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_NETNAME || broken(error == IP_BAD_DESTINATION) /* <= 2003 */, "expected 1214, got %d\n", error); - } address = htonl(INADDR_LOOPBACK); if (0) /* crashes in XP */

1 0

Alexandre Julliard : makedep: Expand the winegcc target arguments into the generated rules.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: c7411e22bec85336ea3220944f3c067201bb2c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7411e22bec85336ea3220944… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 14:44:26 2014 +0100 makedep: Expand the winegcc target arguments into the generated rules. --- Make.vars.in | 4 ++-- tools/makedep.c | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 75cb1e6..9814b88 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -24,6 +24,7 @@ CPPFLAGS = @CPPFLAGS@ EXTRACFLAGS = @EXTRACFLAGS@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ +UNWINDFLAGS = @UNWINDFLAGS@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ @@ -59,12 +60,11 @@ WIDL = $(TOOLSDIR)/tools/widl/widl$(TOOLSEXT) WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) +WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc$(TOOLSEXT) LIBPORT = $(top_builddir)/libs/port/libwine_port.a LIBWPP = $(top_builddir)/libs/wpp/libwpp.a LIBWINE = -L$(top_builddir)/libs/wine -lwine LIBWINE_STATIC = $(top_builddir)/libs/wine/libwine_static.a -WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@ -CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ diff --git a/tools/makedep.c b/tools/makedep.c index c968187..94609a2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -104,6 +104,7 @@ static const char *src_dir; static const char *top_src_dir; static const char *top_obj_dir; static const char *parent_dir; +static const char *tools_dir; static const char *makefile_name = "Makefile"; static const char *Separator = "### Dependencies"; static const char *input_file_name; @@ -497,6 +498,17 @@ static char *top_dir_path( const char *path ) /******************************************************************* + * tools_dir_path + */ +static char *tools_dir_path( const char *path ) +{ + if (tools_dir) return strmake( "%s/tools/%s", tools_dir, path ); + if (top_obj_dir) return strmake( "%s/tools/%s", top_obj_dir, path ); + return strmake( "tools/%s", path ); +} + + +/******************************************************************* * init_paths */ static void init_paths(void) @@ -504,6 +516,7 @@ static void init_paths(void) /* ignore redundant source paths */ if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; + if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; strarray_insert( &include_args, 0, strmake( "-I%s", top_dir_path( "include" ))); } @@ -1718,7 +1731,10 @@ static struct strarray output_sources(void) output_filenames( res_files ); output( "\n" ); output( "\t$(WINEGCC) -o $@" ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); output_filenames( targetflags ); + output_filenames( get_expanded_make_var_array( "UNWINDFLAGS" )); if (spec_file) { output( " -shared %s", spec_file ); @@ -1854,7 +1870,10 @@ static struct strarray output_sources(void) strarray_add( &clean_files, strmake( "%s%s", stripped, dllext )); output( "%s%s:\n", testmodule, dllext ); output( "\t$(WINEGCC) -o $@" ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); output_filenames( targetflags ); + output_filenames( get_expanded_make_var_array( "UNWINDFLAGS" )); output_filenames( appmode ); output_filenames( object_files ); output_filenames( res_files ); @@ -1863,7 +1882,10 @@ static struct strarray output_sources(void) output( "\n" ); output( "%s%s:\n", stripped, dllext ); output( "\t$(WINEGCC) -s -o $@" ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); output_filenames( targetflags ); + output_filenames( get_expanded_make_var_array( "UNWINDFLAGS" )); output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( appmode ); output_filenames( object_files ); @@ -1895,7 +1917,10 @@ static struct strarray output_sources(void) output_filenames( crossobj_files ); output_filenames( res_files ); output( "\n" ); - output( "\t$(CROSSWINEGCC) -o $@ -b %s", crosstarget ); + output( "\t$(WINEGCC) -o $@ -b %s", crosstarget ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); + output_filename( "--lib-suffix=.cross.a" ); output_filenames( crossobj_files ); output_filenames( res_files ); output_filenames( all_libs ); @@ -2104,6 +2129,7 @@ static void update_makefile( const char *path ) top_src_dir = get_expanded_make_variable( "top_srcdir" ); top_obj_dir = get_expanded_make_variable( "top_builddir" ); parent_dir = get_expanded_make_variable( "PARENTSRC" ); + tools_dir = get_expanded_make_variable( "TOOLSDIR" ); appmode = get_expanded_make_var_array( "APPMODE" ); dllflags = get_expanded_make_var_array( "DLLFLAGS" );

1 0