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
October 2013
----- 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
757 discussions
Start a n
N
ew thread
Michael Stefaniuc : winmm/tests: Use the explicit mciSendStringA() form.
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: 51ce8f254eedc9227fcbe6feaabb9b29e2c78004 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=51ce8f254eedc9227fcbe6fea…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 15 22:12:43 2013 +0200 winmm/tests: Use the explicit mciSendStringA() form. --- dlls/winmm/tests/mci.c | 342 ++++++++++++++++++++++---------------------- dlls/winmm/tests/mcicda.c | 86 ++++++------ dlls/winmm/tests/midi.c | 4 +- 3 files changed, 216 insertions(+), 216 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=51ce8f254eedc9227fcbe…
1
0
0
0
Michael Stefaniuc : services/tests: Compile with -D__WINESRC__.
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: ba3f11023f5b0218f37e5cddd9720088fceea631 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ba3f11023f5b0218f37e5cddd…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 15 22:08:39 2013 +0200 services/tests: Compile with -D__WINESRC__. --- programs/services/tests/Makefile.in | 1 - programs/services/tests/service.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/tests/Makefile.in b/programs/services/tests/Makefile.in index 2facc32..8a49219 100644 --- a/programs/services/tests/Makefile.in +++ b/programs/services/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = services.exe IMPORTS = advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ service.c diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index a2cd0b5..8511b92 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <windef.h> +#include <winsvc.h> #include <stdio.h> #include "wine/test.h"
1
0
0
0
Michael Stefaniuc : cmd/tests: Compile with -D__WINESRC__.
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: 7641cef0bdd9bc600934c00e7a183a68badff169 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7641cef0bdd9bc600934c00e7…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 15 22:01:13 2013 +0200 cmd/tests: Compile with -D__WINESRC__. --- programs/cmd/tests/Makefile.in | 1 - programs/cmd/tests/batch.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/Makefile.in b/programs/cmd/tests/Makefile.in index 9d73c99..8fd1670 100644 --- a/programs/cmd/tests/Makefile.in +++ b/programs/cmd/tests/Makefile.in @@ -1,5 +1,4 @@ TESTDLL = cmd.exe -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ batch.c diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 6cf740b..c011d70 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -139,9 +139,9 @@ static DWORD map_file(const char *file_name, const char **ret) size = GetFileSize(file, NULL); - map = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL); + map = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); CloseHandle(file); - ok(map != NULL, "CreateFileMapping(%s) failed: %u\n", file_name, GetLastError()); + ok(map != NULL, "CreateFileMappingA(%s) failed: %u\n", file_name, GetLastError()); if(!map) return 0; @@ -408,7 +408,7 @@ static DWORD load_resource(const char *name, const char *type, const char **ret) return size; } -static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG_PTR param) +static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) { const char *cmd_data, *out_data; DWORD cmd_size, out_size;
1
0
0
0
Nikolay Sivov : shlwapi/tests: Compile with -D__WINESRC__.
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: b70a5d52f1666203cae699322cbff3dc7c98ec9e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b70a5d52f1666203cae699322…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 23:41:10 2013 +0400 shlwapi/tests: Compile with -D__WINESRC__. --- dlls/shlwapi/tests/Makefile.in | 1 - dlls/shlwapi/tests/ordinal.c | 48 +++--- dlls/shlwapi/tests/path.c | 390 ++++++++++++++++++++-------------------- dlls/shlwapi/tests/shreg.c | 6 +- dlls/shlwapi/tests/string.c | 10 +- dlls/shlwapi/tests/url.c | 4 +- 6 files changed, 229 insertions(+), 230 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=b70a5d52f1666203cae69…
1
0
0
0
Nikolay Sivov : imagehlp/tests: Compile with -D__WINESRC__.
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: 94c0604e81ec6ef1d4fd03b50b5364bfae9df396 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=94c0604e81ec6ef1d4fd03b50…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 23:26:22 2013 +0400 imagehlp/tests: Compile with -D__WINESRC__. --- dlls/imagehlp/tests/Makefile.in | 1 - dlls/imagehlp/tests/integrity.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/imagehlp/tests/Makefile.in b/dlls/imagehlp/tests/Makefile.in index 8731a08..83a118f 100644 --- a/dlls/imagehlp/tests/Makefile.in +++ b/dlls/imagehlp/tests/Makefile.in @@ -1,5 +1,4 @@ TESTDLL = imagehlp.dll -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ image.c \ diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 0785c2a..c29eea8 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -107,10 +107,10 @@ static BOOL copy_dll_file(void) lstrcatA(sys_dir, "imagehlp.dll"); /* Copy DLL to a temp file */ - GetTempPath(MAX_PATH, temp_path); - GetTempFileName(temp_path, "img", 0, test_dll_path); + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "img", 0, test_dll_path); - if (CopyFile(sys_dir, test_dll_path, FALSE) == 0) + if (CopyFileA(sys_dir, test_dll_path, FALSE) == 0) { skip("Unable to create copy of imagehlp.dll for tests.\n"); return FALSE; @@ -295,5 +295,5 @@ START_TEST(integrity) ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); FreeLibrary(hImageHlp); - DeleteFile(test_dll_path); + DeleteFileA(test_dll_path); }
1
0
0
0
Nikolay Sivov : ole32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: 026b711483cd389ac1240682e528a88dd2efbadd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=026b711483cd389ac1240682e…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 22:37:46 2013 +0400 ole32/tests: Compile with -D__WINESRC__. --- dlls/ole32/tests/Makefile.in | 1 - dlls/ole32/tests/compobj.c | 38 +++++++------- dlls/ole32/tests/defaulthandler.c | 2 +- dlls/ole32/tests/dragdrop.c | 12 ++-- dlls/ole32/tests/marshal.c | 106 ++++++++++++++++++------------------ dlls/ole32/tests/ole2.c | 4 +- dlls/ole32/tests/ole_server.c | 32 ++++++------ dlls/ole32/tests/propvariant.c | 2 + dlls/ole32/tests/storage32.c | 2 +- dlls/ole32/tests/usrmarshal.c | 8 ++-- 10 files changed, 104 insertions(+), 103 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=026b711483cd389ac1240…
1
0
0
0
Nikolay Sivov : dispex/tests: Compile with -D__WINESRC__.
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: de69361b8ab531c3443ccc0051b6290d5a7a52d3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=de69361b8ab531c3443ccc005…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 20:42:36 2013 +0400 dispex/tests: Compile with -D__WINESRC__. --- dlls/dispex/tests/Makefile.in | 1 - dlls/dispex/tests/marshal.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dispex/tests/Makefile.in b/dlls/dispex/tests/Makefile.in index c200a8f..5c6b859 100644 --- a/dlls/dispex/tests/Makefile.in +++ b/dlls/dispex/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dispex.dll IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ marshal.c diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 7fa9121..1b2ef61 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -65,7 +65,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); /* force the message queue to be created before signaling parent thread */ - PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + PeekMessageA(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); if(hr == S_OK) SetEvent(data->marshal_event); @@ -76,7 +76,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) return hr; } - while (GetMessage(&msg, NULL, 0, 0)) + while (GetMessageA(&msg, NULL, 0, 0)) { if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) { @@ -85,7 +85,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) SetEvent((HANDLE)msg.lParam); } else - DispatchMessage(&msg); + DispatchMessageA(&msg); } HeapFree(GetProcessHeap(), 0, data); @@ -105,8 +105,8 @@ static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, data->iid = *riid; data->object = object; data->marshal_flags = marshal_flags; - data->marshal_event = events[0] = CreateEvent(NULL, FALSE, FALSE, NULL); - data->error_event = events[1] = CreateEvent(NULL, FALSE, FALSE, NULL); + data->marshal_event = events[0] = CreateEventW(NULL, FALSE, FALSE, NULL); + data->error_event = events[1] = CreateEventW(NULL, FALSE, FALSE, NULL); data->filter = filter; *thread = CreateThread(NULL, 0, host_object_proc, data, 0, &tid); @@ -131,7 +131,7 @@ static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, M static void end_host_object(DWORD tid, HANDLE thread) { - BOOL ret = PostThreadMessage(tid, WM_QUIT, 0, 0); + BOOL ret = PostThreadMessageA(tid, WM_QUIT, 0, 0); ok(ret, "PostThreadMessage failed with error %d\n", GetLastError()); /* be careful of races - don't return until hosting thread has terminated */ WaitForSingleObject(thread, INFINITE);
1
0
0
0
Alexandre Julliard : makedep: Add a helper function to replace a file name extension.
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: c9a4cc6ab7a3d2728bbc7fa19ebbf6a73f72aa6e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c9a4cc6ab7a3d2728bbc7fa19…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 20:29:09 2013 +0200 makedep: Add a helper function to replace a file name extension. --- tools/makedep.c | 47 ++++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index fb6b929..ea23318 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -250,6 +250,18 @@ static char *get_extension( char *filename ) /******************************************************************* + * replace_extension + */ +static char *replace_extension( const char *name, unsigned int old_len, const char *new_ext ) +{ + char *ret = xmalloc( strlen( name ) + strlen( new_ext ) + 1 ); + strcpy( ret, name ); + strcpy( ret + strlen( ret ) - old_len, new_ext ); + return ret; +} + + +/******************************************************************* * get_line */ static char *get_line( FILE *file ) @@ -452,10 +464,8 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".tab.h" )) { - if (src_dir) - filename = strmake( "%s/%.*s.y", src_dir, strlen(pFile->name) - 6, pFile->name ); - else - filename = strmake( "%.*s.y", strlen(pFile->name) - 6, pFile->name ); + filename = replace_extension( pFile->name, 6, ".y" ); + if (src_dir) filename = strmake( "%s/%s", src_dir, filename ); if ((file = fopen( filename, "r" ))) { @@ -472,10 +482,8 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".h" )) { - if (src_dir) - filename = strmake( "%s/%.*s.idl", src_dir, strlen(pFile->name) - 2, pFile->name ); - else - filename = strmake( "%.*s.idl", strlen(pFile->name) - 2, pFile->name ); + filename = replace_extension( pFile->name, 2, ".idl" ); + if (src_dir) filename = strmake( "%s/%s", src_dir, filename ); if ((file = fopen( filename, "r" ))) { @@ -505,12 +513,11 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, ".h" )) { + filename = replace_extension( pFile->name, 2, ".idl" ); if (top_src_dir) - filename = strmake( "%s/include/%.*s.idl", - top_src_dir, strlen(pFile->name) - 2, pFile->name ); + filename = strmake( "%s/include/%s", top_src_dir, filename ); else if (top_obj_dir) - filename = strmake( "%s/include/%.*s.idl", - top_obj_dir, strlen(pFile->name) - 2, pFile->name ); + filename = strmake( "%s/include/%s", top_obj_dir, filename ); else filename = NULL; @@ -527,12 +534,11 @@ static FILE *open_include_file( struct incl_file *pFile ) if (strendswith( pFile->name, "tmpl.h" )) { + filename = replace_extension( pFile->name, 2, ".x" ); if (top_src_dir) - filename = strmake( "%s/include/%.*s.x", - top_src_dir, strlen(pFile->name) - 2, pFile->name ); + filename = strmake( "%s/include/%s", top_src_dir, filename ); else if (top_obj_dir) - filename = strmake( "%s/include/%.*s.x", - top_obj_dir, strlen(pFile->name) - 2, pFile->name ); + filename = strmake( "%s/include/%s", top_obj_dir, filename ); else filename = NULL; @@ -778,11 +784,8 @@ static void parse_rc_file( struct incl_file *pFile, FILE *file ) */ static void parse_generated_idl( struct incl_file *source ) { - char *header, *basename; + char *header = replace_extension( source->name, 4, ".h" ); - basename = xstrdup( source->name ); - basename[strlen(basename) - 4] = 0; - header = strmake( "%s.h", basename ); source->filename = xstrdup( source->name ); if (strendswith( source->name, "_c.c" )) @@ -809,7 +812,6 @@ static void parse_generated_idl( struct incl_file *source ) } free( header ); - free( basename ); } /******************************************************************* @@ -855,8 +857,7 @@ static void parse_file( struct incl_file *source, int src ) if (strendswith( source->name, ".o" )) { /* default to .c for unknown extra object files */ - source->filename = xstrdup( source->name ); - source->filename[strlen(source->filename) - 1] = 'c'; + source->filename = replace_extension( source->name, 2, ".c" ); return; }
1
0
0
0
Alexandre Julliard : makedep: Automatically add the source idl for generated sources to the dependencies list .
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: b9cb6d4f956dc8ff0c74dc38d43e12d5a8cda5aa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b9cb6d4f956dc8ff0c74dc38d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 13:15:06 2013 +0200 makedep: Automatically add the source idl for generated sources to the dependencies list. --- Make.rules.in | 3 +- tools/makedep.c | 85 +++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 55 insertions(+), 33 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index cc04821..94c2e83 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -100,8 +100,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) $(PO_SRCS:.rc=.pot) \ - $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_R_SRCS) $(IDL_S_SRCS) \ - $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ + $(IDL_H_SRCS) $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) depend: dummy diff --git a/tools/makedep.c b/tools/makedep.c index ea23318..982d827 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -832,39 +832,8 @@ static void parse_file( struct incl_file *source, int src ) { FILE *file; - /* special case for source files generated from idl */ - if (is_generated_idl( source )) - { - parse_generated_idl( source ); - return; - } - - if (!strcmp( source->name, "dlldata.o" )) - { - source->filename = xstrdup( "dlldata.c" ); - add_include( source, "objbase.h", 1 ); - add_include( source, "rpcproxy.h", 1 ); - return; - } - - if (!strcmp( source->name, "testlist.o" )) - { - source->filename = xstrdup( "testlist.c" ); - add_include( source, "wine/test.h", 1 ); - return; - } - - if (strendswith( source->name, ".o" )) - { - /* default to .c for unknown extra object files */ - source->filename = replace_extension( source->name, 2, ".c" ); - return; - } - /* don't try to open certain types of files */ if (strendswith( source->name, ".tlb" ) || - strendswith( source->name, ".res" ) || - strendswith( source->name, ".pot" ) || strendswith( source->name, ".x" )) { source->filename = xstrdup( source->name ); @@ -900,14 +869,68 @@ static void parse_file( struct incl_file *source, int src ) static struct incl_file *add_src_file( const char *name ) { struct incl_file *file; + char *idl; if (find_src_file( name )) return NULL; /* we already have it */ file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->name = xstrdup(name); list_add_tail( &sources, &file->entry ); + + /* special cases for generated files */ + + if (is_generated_idl( file )) + { + parse_generated_idl( file ); + goto add_idl_source; + } + + if (!strcmp( file->name, "dlldata.o" )) + { + file->filename = xstrdup( "dlldata.c" ); + add_include( file, "objbase.h", 1 ); + add_include( file, "rpcproxy.h", 1 ); + return file; + } + + if (!strcmp( file->name, "testlist.o" )) + { + file->filename = xstrdup( "testlist.c" ); + add_include( file, "wine/test.h", 1 ); + return file; + } + + if (strendswith( file->name, ".o" )) + { + /* default to .c for unknown extra object files */ + file->filename = replace_extension( file->name, 2, ".c" ); + return file; + } + + if (strendswith( file->name, ".tlb" ) || + strendswith( file->name, "_r.res" ) || + strendswith( file->name, "_t.res" )) + { + file->filename = xstrdup( file->name ); + goto add_idl_source; + } + + if (strendswith( file->name, ".res" ) || + strendswith( file->name, ".pot" ) || + strendswith( file->name, ".x" )) + { + file->filename = xstrdup( file->name ); + return file; + } + parse_file( file, 1 ); return file; + +add_idl_source: + idl = replace_extension( name, strendswith( name, ".res" ) ? 6 : 4, ".idl" ); + add_src_file( idl ); + free( idl ); + return file; }
1
0
0
0
Alexandre Julliard : makedep: Remove support for no longer used .mc. rc files.
by Alexandre Julliard
16 Oct '13
16 Oct '13
Module: wine Branch: master Commit: b1d4807fc2d404ff23b98d4d09cda3512d3b994b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b1d4807fc2d404ff23b98d4d0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 20:29:34 2013 +0200 makedep: Remove support for no longer used .mc.rc files. --- tools/makedep.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e41fa77..fb6b929 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -468,28 +468,6 @@ static FILE *open_include_file( struct incl_file *pFile ) free( filename ); } - /* check for generated message resource */ - - if (strendswith( pFile->name, ".mc.rc" )) - { - if (src_dir) - filename = strmake( "%s/%s", src_dir, pFile->name ); - else - filename = xstrdup( pFile->name ); - - filename[strlen(filename) - 3] = 0; - - if ((file = fopen( filename, "r" ))) - { - pFile->sourcename = filename; - pFile->filename = xstrdup( pFile->name ); - /* don't bother to parse it */ - fclose( file ); - return NULL; - } - free( filename ); - } - /* check for corresponding idl file in source dir */ if (strendswith( pFile->name, ".h" ))
1
0
0
0
← Newer
1
...
36
37
38
39
40
41
42
...
76
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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
Results per page:
10
25
50
100
200