April 2014 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/testagentd: Avoid crashing when the server cannot create its master socket.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: tools Branch: master Commit: 410bea9e02ee9cbae4445b2788be92b0dccacf8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=410bea9e02ee9cbae4445b27… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 14:48:35 2014 +0200 testbot/testagentd: Avoid crashing when the server cannot create its master socket. --- testbot/src/testagentd/testagentd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 35b42f3..b8f9c57 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1192,7 +1192,8 @@ int main(int argc, char** argv) break; closesocket(master); }; - addrlen = addrp->ai_addrlen; + if (addrp) + addrlen = addrp->ai_addrlen; ta_freeaddrinfo(addresses); if (addrp == NULL) {

1 0

Francois Gouget : testbot/testagent: Always strip the trailing '\0' from strings, even for error messages.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: tools Branch: master Commit: fa4327a3d2e74df70924c2e7a7c7b93069a30b6b URL: http://source.winehq.org/git/tools.git/?a=commit;h=fa4327a3d2e74df70924c2e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:10 2014 +0200 testbot/testagent: Always strip the trailing '\0' from strings, even for error messages. --- testbot/lib/WineTestBot/TestAgent.pm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index c9895ba..178cf51 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -323,6 +323,20 @@ sub _SkipRawData($$) return $Success; } +sub _RecvRawString($$$) +{ + my ($self, $Name, $Size) = @_; + + my $Str = $self->_RecvRawData($Name, $Size); + if (defined $Str) + { + # Remove the trailing '\0' + chop $Str; + debug(" RecvRawString('$Name') -> '$Str'\n"); + } + return $Str; +} + sub _RecvRawUInt32($$) { my ($self, $Name) = @_; @@ -379,7 +393,7 @@ sub _ExpectEntryHeader($$$;$) if ($HType eq 'e') { # The expected data was replaced with an error message - my $Message = $self->_RecvRawData("$Name.e", $HSize); + my $Message = $self->_RecvRawString("$Name.e", $HSize); return undef if (!defined $Message); $self->_SetError($ERROR, $Message); } @@ -502,7 +516,7 @@ sub _SkipEntries($$) if ($Type eq 'e') { # The expected data was replaced with an error message - my $Message = $self->_RecvRawData("Skip$i.e", $Size); + my $Message = $self->_RecvRawString("Skip$i.e", $Size); return undef if (!defined $Message); $self->_SetError($ERROR, $Message); } @@ -599,7 +613,7 @@ sub _RecvErrorList($) } elsif ($Type eq 's') { - my $Status = $self->_RecvRawData("Err$i.s", $Size); + my $Status = $self->_RecvRawString("Err$i.s", $Size); return $self->GetLastError() if (!defined $Status); debug(" RecvStatus() -> '$Status'\n"); push @$Errors, $Status; @@ -607,7 +621,7 @@ sub _RecvErrorList($) elsif ($Type eq 'e') { # The expected data was replaced with an error message - my $Message = $self->_RecvRawData("Err$i.e", $Size); + my $Message = $self->_RecvRawString("Err$i.e", $Size); if (defined $Message) { debug(" RecvError() -> '$Message'\n");

1 0

André Hentschel : Add WWN 367
by Jeremy Newman April 11, 2014

April 11, 2014

Module: website Branch: master Commit: 081b1334d9aec45f022d2a871fe574bea095af67 URL: http://source.winehq.org/git/website.git/?a=commit;h=081b1334d9aec45f022d2a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 11 21:15:02 2014 +0200 Add WWN 367 --- news/de/2014041101.xml | 11 + news/en/2014041101.xml | 11 + wwn/en/wn20140411_367.xml | 686 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 708 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=081b1334d9aec45f02…

1 0

Austin English : gdi32/tests: Skip some tests if Times New Roman is not installed.
by Alexandre Julliard April 11, 2014

April 11, 2014

Module: wine Branch: master Commit: d0fa8cbc743559e31d36305dac8d46acc353f656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fa8cbc743559e31d36305da… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 10 21:45:59 2014 -0700 gdi32/tests: Skip some tests if Times New Roman is not installed. --- dlls/gdi32/tests/font.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a205ac7..fa3b420 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2254,6 +2254,12 @@ static void test_SetTextJustification(void) GetClientRect( hwnd, &clientArea ); hdc = GetDC( hwnd ); + if (!is_font_installed("Times New Roman")) + { + skip("Times New Roman is not installed\n"); + return; + } + memset(&lf, 0, sizeof lf); lf.lfCharSet = ANSI_CHARSET; lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;

1 0

Ryan Turner : wined3d: Add NVIDIA Geforce GTX 750 to device list.
by Alexandre Julliard April 11, 2014

April 11, 2014

Module: wine Branch: master Commit: a69c488f087b5a09599b841c929ec2531888d279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69c488f087b5a09599b841c9… Author: Ryan Turner <zdbiohazard2(a)gmail.com> Date: Thu Apr 10 11:47:41 2014 -0700 wined3d: Add NVIDIA Geforce GTX 750 to device list. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1f3ed4c..62ad4c8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1261,6 +1261,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA Geforce GTX 760", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, @@ -1675,6 +1677,8 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ {"GTX 760", CARD_NVIDIA_GEFORCE_GTX760}, /* Geforce 700 - midend high */ + {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ + {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ @@ -2168,6 +2172,8 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } cards[] = { + /* Maxwell */ + {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 40494bf..dd49f43 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1474,6 +1474,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, + CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380, CARD_NVIDIA_GEFORCE_GTX760 = 0x1187, CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0,

1 0

Nikolay Sivov : winhlp32: Remove unused assignments (Coverity).
by Alexandre Julliard April 11, 2014

April 11, 2014

Module: wine Branch: master Commit: 6c1d5f0bac0ddc1fe03104f49a5b67cbf5412708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1d5f0bac0ddc1fe03104f49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 11 16:48:22 2014 +0400 winhlp32: Remove unused assignments (Coverity). --- programs/winhlp32/winhelp.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index cb1ac55..195a23f 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1131,7 +1131,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara win->hHistoryWnd = hWnd; break; case WM_CREATE: - win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0); hDc = GetDC(hWnd); GetTextMetricsW(hDc, &tm); GetWindowRect(hWnd, &r); @@ -1146,7 +1145,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara ReleaseDC(hWnd, hDc); break; case WM_LBUTTONDOWN: - win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0); hDc = GetDC(hWnd); GetTextMetricsW(hDc, &tm); i = HIWORD(lParam) / tm.tmHeight; @@ -1156,7 +1154,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara break; case WM_PAINT: hDc = BeginPaint(hWnd, &ps); - win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0); GetTextMetricsW(hDc, &tm); for (i = 0; i < Globals.history.index; i++)

1 0

Austin English : wine.inf: Add HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PagingFiles key.
by Alexandre Julliard April 11, 2014

April 11, 2014

Module: wine Branch: master Commit: 946b80a56739a2530698c237c4c0adc77de1361d URL: http://source.winehq.org/git/wine.git/?a=commit;h=946b80a56739a2530698c237c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 9 20:17:45 2014 -0700 wine.inf: Add HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PagingFiles key. --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1f08d2e..802b0cf 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -545,6 +545,7 @@ HKLM,%Control%\Session Manager\Environment,"TEMP",0x00020002,"%10%\temp" HKLM,%Control%\Session Manager\Environment,"TMP",0x00020002,"%10%\temp" HKLM,%Control%\Session Manager\Environment,"windir",0x00020000,"%10%" HKLM,%Control%\Session Manager\Environment,"winsysdir",,"%11%" +HKLM,%Control%\Session Manager\Memory Management,PagingFiles,,"%24%\pagefile.sys 27 77" HKLM,%Control%\Session Manager\Memory Management,WriteWatch,0x00040002,1 [Fonts]

1 0

Austin English : wmp: Add HKLM\\Software\\Microsoft\\Multimedia\\WMPlayer\\Extensions key.
by Alexandre Julliard April 11, 2014

April 11, 2014

Module: wine Branch: master Commit: d8ca8c275dc8b8269f0e4abe478e616645100c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ca8c275dc8b8269f0e4abe4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 8 23:26:55 2014 -0700 wmp: Add HKLM\\Software\\Microsoft\\Multimedia\\WMPlayer\\Extensions key. --- dlls/wmp/wmp.rgs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wmp/wmp.rgs b/dlls/wmp/wmp.rgs index fa40fa7..216b964 100644 --- a/dlls/wmp/wmp.rgs +++ b/dlls/wmp/wmp.rgs @@ -18,3 +18,20 @@ HKCR Insertable } } + +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Multimedia + { + WMPlayer + { + Extensions + } + } + } + } +}

1 0

Alexandre Julliard : makedep: Store the includes list inside the makefile structure.
by Alexandre Julliard April 11, 2014

April 11, 2014

Module: wine Branch: master Commit: c6ba107a41557d24e025ad43d27256e534ae185b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ba107a41557d24e025ad43d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 11 17:03:54 2014 +0200 makedep: Store the includes list inside the makefile structure. --- tools/makedep.c | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 61e0c81..396a1e3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -111,7 +111,6 @@ static const struct #define HASH_SIZE 137 static struct list files[HASH_SIZE]; -static struct list includes = LIST_INIT(includes); struct strarray { @@ -155,6 +154,7 @@ struct makefile struct strarray delayimports; struct strarray extradllflags; struct list sources; + struct list includes; const char *base_dir; const char *src_dir; const char *obj_dir; @@ -770,11 +770,11 @@ static struct incl_file *find_src_file( struct makefile *make, const char *name /******************************************************************* * find_include_file */ -static struct incl_file *find_include_file( const char *name ) +static struct incl_file *find_include_file( struct makefile *make, const char *name ) { struct incl_file *file; - LIST_FOR_EACH_ENTRY( file, &includes, struct incl_file, entry ) + LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) if (!strcmp( name, file->name )) return file; return NULL; } @@ -784,7 +784,8 @@ static struct incl_file *find_include_file( const char *name ) * * Add an include file if it doesn't already exists. */ -static struct incl_file *add_include( struct incl_file *parent, const char *name, int line, int system ) +static struct incl_file *add_include( struct makefile *make, struct incl_file *parent, + const char *name, int line, int system ) { struct incl_file *include; @@ -795,7 +796,7 @@ static struct incl_file *add_include( struct incl_file *parent, const char *name parent->files = xrealloc( parent->files, parent->files_size * sizeof(*parent->files) ); } - LIST_FOR_EACH_ENTRY( include, &includes, struct incl_file, entry ) + LIST_FOR_EACH_ENTRY( include, &make->includes, struct incl_file, entry ) if (!strcmp( name, include->name )) goto found; include = xmalloc( sizeof(*include) ); @@ -804,7 +805,7 @@ static struct incl_file *add_include( struct incl_file *parent, const char *name include->included_by = parent; include->included_line = line; include->system = system; - list_add_tail( &includes, &include->entry ); + list_add_tail( &make->includes, &include->entry ); found: parent->files[parent->files_count++] = include; return include; @@ -1352,7 +1353,7 @@ static struct file *open_include_file( struct makefile *make, struct incl_file * /******************************************************************* * add_all_includes */ -static void add_all_includes( struct incl_file *parent, struct file *file ) +static void add_all_includes( struct makefile *make, struct incl_file *parent, struct file *file ) { unsigned int i; @@ -1365,10 +1366,10 @@ static void add_all_includes( struct incl_file *parent, struct file *file ) { case INCL_NORMAL: case INCL_IMPORT: - add_include( parent, file->deps[i].name, file->deps[i].line, 0 ); + add_include( make, parent, file->deps[i].name, file->deps[i].line, 0 ); break; case INCL_SYSTEM: - add_include( parent, file->deps[i].name, file->deps[i].line, 1 ); + add_include( make, parent, file->deps[i].name, file->deps[i].line, 1 ); break; case INCL_CPP_QUOTE: case INCL_CPP_QUOTE_SYSTEM: @@ -1407,24 +1408,24 @@ static void parse_file( struct makefile *make, struct incl_file *source, int src unsigned int i; /* generated .h file always includes these */ - add_include( source, "rpc.h", 0, 1 ); - add_include( source, "rpcndr.h", 0, 1 ); + add_include( make, source, "rpc.h", 0, 1 ); + add_include( make, source, "rpcndr.h", 0, 1 ); for (i = 0; i < file->deps_count; i++) { switch (file->deps[i].type) { case INCL_IMPORT: if (strendswith( file->deps[i].name, ".idl" )) - add_include( source, replace_extension( file->deps[i].name, ".idl", ".h" ), + add_include( make, source, replace_extension( file->deps[i].name, ".idl", ".h" ), file->deps[i].line, 0 ); else - add_include( source, file->deps[i].name, file->deps[i].line, 0 ); + add_include( make, source, file->deps[i].name, file->deps[i].line, 0 ); break; case INCL_CPP_QUOTE: - add_include( source, file->deps[i].name, file->deps[i].line, 0 ); + add_include( make, source, file->deps[i].name, file->deps[i].line, 0 ); break; case INCL_CPP_QUOTE_SYSTEM: - add_include( source, file->deps[i].name, file->deps[i].line, 1 ); + add_include( make, source, file->deps[i].name, file->deps[i].line, 1 ); break; case INCL_NORMAL: case INCL_SYSTEM: @@ -1437,7 +1438,7 @@ static void parse_file( struct makefile *make, struct incl_file *source, int src return; /* generated .tab.h doesn't include anything */ } - add_all_includes( source, file ); + add_all_includes( make, source, file ); } @@ -1610,14 +1611,14 @@ static void add_generated_sources( struct makefile *make ) { file = add_generated_source( make, replace_extension( source->name, ".idl", "_c.c" ), NULL ); add_dependency( file->file, replace_extension( source->name, ".idl", ".h" ), INCL_NORMAL ); - add_all_includes( file, file->file ); + add_all_includes( make, file, file->file ); } if (source->file->flags & FLAG_IDL_SERVER) { file = add_generated_source( make, replace_extension( source->name, ".idl", "_s.c" ), NULL ); add_dependency( file->file, "wine/exception.h", INCL_NORMAL ); add_dependency( file->file, replace_extension( source->name, ".idl", ".h" ), INCL_NORMAL ); - add_all_includes( file, file->file ); + add_all_includes( make, file, file->file ); } if (source->file->flags & FLAG_IDL_IDENT) { @@ -1625,20 +1626,20 @@ static void add_generated_sources( struct makefile *make ) add_dependency( file->file, "rpc.h", INCL_NORMAL ); add_dependency( file->file, "rpcndr.h", INCL_NORMAL ); add_dependency( file->file, "guiddef.h", INCL_NORMAL ); - add_all_includes( file, file->file ); + add_all_includes( make, file, file->file ); } if (source->file->flags & FLAG_IDL_PROXY) { file = add_generated_source( make, "dlldata.o", "dlldata.c" ); add_dependency( file->file, "objbase.h", INCL_NORMAL ); add_dependency( file->file, "rpcproxy.h", INCL_NORMAL ); - add_all_includes( file, file->file ); + add_all_includes( make, file, file->file ); file = add_generated_source( make, replace_extension( source->name, ".idl", "_p.c" ), NULL ); add_dependency( file->file, "objbase.h", INCL_NORMAL ); add_dependency( file->file, "rpcproxy.h", INCL_NORMAL ); add_dependency( file->file, "wine/exception.h", INCL_NORMAL ); add_dependency( file->file, replace_extension( source->name, ".idl", ".h" ), INCL_NORMAL ); - add_all_includes( file, file->file ); + add_all_includes( make, file, file->file ); } if (source->file->flags & FLAG_IDL_REGTYPELIB) { @@ -1673,7 +1674,7 @@ static void add_generated_sources( struct makefile *make ) { file = add_generated_source( make, "testlist.o", "testlist.c" ); add_dependency( file->file, "wine/test.h", INCL_NORMAL ); - add_all_includes( file, file->file ); + add_all_includes( make, file, file->file ); } } @@ -1781,7 +1782,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t /* add source file dependency for parallel makes */ char *header = strmake( "%s.tab.h", obj ); - if (find_include_file( header )) + if (find_include_file( make, header )) { output( "%s: %s\n", obj_dir_path( make, header ), source->filename ); output( "\t$(BISON) -p %s_ -o %s.tab.c -d %s\n", @@ -1859,7 +1860,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t struct strarray targets = empty_strarray; char *dest; - if (!source->file->flags || find_include_file( strmake( "%s.h", obj ))) + if (!source->file->flags || find_include_file( make, strmake( "%s.h", obj ))) source->file->flags |= FLAG_IDL_HEADER; for (i = 0; i < sizeof(idl_outputs) / sizeof(idl_outputs[0]); i++) @@ -2621,7 +2622,7 @@ static void update_makefile( const char *path ) strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" )); list_init( &make->sources ); - list_init( &includes ); + list_init( &make->includes ); for (var = source_vars; *var; var++) { @@ -2641,7 +2642,7 @@ static void update_makefile( const char *path ) add_generated_source( make, value.str[i], NULL ); } - LIST_FOR_EACH_ENTRY( file, &includes, struct incl_file, entry ) parse_file( make, file, 0 ); + LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); output_file_name = base_dir_path( make, makefile_name ); output_dependencies( make, output_file_name );

1 0

Alexandre Julliard : makedep: Parse files as soon as they are loaded, and cache the information.
by Alexandre Julliard April 11, 2014

April 11, 2014

Module: wine Branch: master Commit: b69a0e89dc2c022e4e223052707f3fbbade67925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69a0e89dc2c022e4e2230527… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 11 16:55:51 2014 +0200 makedep: Parse files as soon as they are loaded, and cache the information. --- tools/makedep.c | 800 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 478 insertions(+), 322 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b69a0e89dc2c022e4e223…

1 0