winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2014
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
500 discussions
Start a n
N
ew thread
Francois Gouget : testbot/testagentd: Generate debugging information when compiling.
by Alexandre Julliard
14 Apr '14
14 Apr '14
Module: tools Branch: master Commit: bffa9e544e9b676747ce58d75fea294157938a4a URL:
http://source.winehq.org/git/tools.git/?a=commit;h=bffa9e544e9b676747ce58d7…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 14:46:46 2014 +0200 testbot/testagentd: Generate debugging information when compiling. This way one just has to comment out the strip commands to get binaries with useful debug information. --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 676d71c..5a7b735 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -13,7 +13,7 @@ $(builddir)/testagentd: testagentd.o platform_unix.o strip $@ .c.o: - gcc -Wall -c -o $@ $< + gcc -Wall -g -c -o $@ $< TestAgentd.exe: testagentd.obj platform_windows.obj @@ -22,7 +22,7 @@ TestAgentd.exe: testagentd.obj platform_windows.obj .SUFFIXES: .obj .c.obj: - $(CROSSCC32) -Wall -c -o $@ $< + $(CROSSCC32) -Wall -g -c -o $@ $< testagentd.o testagentd.obj: platform.h platform_unix.o: platform.h list.h
1
0
0
0
Alexandre Julliard : testbot: Always use the configured web host name in registration emails.
by Alexandre Julliard
14 Apr '14
14 Apr '14
Module: tools Branch: master Commit: c9aca501f71e74ef3ab76eba7202f45dd2e48c37 URL:
http://source.winehq.org/git/tools.git/?a=commit;h=c9aca501f71e74ef3ab76eba…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 19:06:41 2014 +0200 testbot: Always use the configured web host name in registration emails. --- testbot/web/Register.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index d5eb4cd..ca82d55 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -110,8 +110,8 @@ sub OnSendRequest { $Msg .= "Remarks:\n" . $self->GetParam("Remarks") . "\n"; } - my $URL = MakeSecureURL("/admin/UserDetails.pl?Key=" . - uri_escape($self->GetParam("Name"))); + my $URL = ($UseSSL ? "https://" : "http://") . $WebHostName . + "/admin/UserDetails.pl?Key=" . uri_escape($self->GetParam("Name")); $Msg .= "\nTo approve or deny the request, please go to " . $URL; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");
1
0
0
0
André Hentschel : Add WWN 367
by Jeremy Newman
11 Apr '14
11 Apr '14
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
0
0
Austin English : wmp: Add HKLM\\Software\\Microsoft\\Multimedia\\WMPlayer\\Extensions key.
by Alexandre Julliard
11 Apr '14
11 Apr '14
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
0
0
Austin English : wine.inf: Add HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PagingFiles key.
by Alexandre Julliard
11 Apr '14
11 Apr '14
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
0
0
Austin English : gdi32/tests: Skip some tests if Times New Roman is not installed.
by Alexandre Julliard
11 Apr '14
11 Apr '14
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
0
0
Nikolay Sivov : winhlp32: Remove unused assignments (Coverity).
by Alexandre Julliard
11 Apr '14
11 Apr '14
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
0
0
Ryan Turner : wined3d: Add NVIDIA Geforce GTX 750 to device list.
by Alexandre Julliard
11 Apr '14
11 Apr '14
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
0
0
Alexandre Julliard : makedep: Store the includes list inside the makefile structure.
by Alexandre Julliard
11 Apr '14
11 Apr '14
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
0
0
Alexandre Julliard : makedep: Parse files as soon as they are loaded, and cache the information.
by Alexandre Julliard
11 Apr '14
11 Apr '14
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
0
0
← Newer
1
...
26
27
28
29
30
31
32
...
50
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
Results per page:
10
25
50
100
200