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
May 2019
----- 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
1019 discussions
Start a n
N
ew thread
Alexandre Julliard : winefile: Get rid of the Unix filesystem support.
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: dff5a02546247375dd5fca476ef9a80c18f9d0c2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=dff5a02546247375dd5fca47…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 10:57:51 2019 +0200 winefile: Get rid of the Unix filesystem support. We already have a unixfs shell folder. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 84 +++++++------ po/bg.po | 84 +++++++------ po/ca.po | 84 +++++++------ po/cs.po | 84 +++++++------ po/da.po | 84 +++++++------ po/de.po | 84 +++++++------ po/el.po | 84 +++++++------ po/en.po | 84 +++++++------ po/en_US.po | 84 +++++++------ po/eo.po | 84 +++++++------ po/es.po | 84 +++++++------ po/fa.po | 84 +++++++------ po/fi.po | 84 +++++++------ po/fr.po | 84 +++++++------ po/he.po | 84 +++++++------ po/hi.po | 84 +++++++------ po/hr.po | 84 +++++++------ po/hu.po | 84 +++++++------ po/it.po | 84 +++++++------ po/ja.po | 84 +++++++------ po/ko.po | 84 +++++++------ po/lt.po | 84 +++++++------ po/ml.po | 84 +++++++------ po/nb_NO.po | 84 +++++++------ po/nl.po | 84 +++++++------ po/or.po | 84 +++++++------ po/pa.po | 84 +++++++------ po/pl.po | 84 +++++++------ po/pt_BR.po | 84 +++++++------ po/pt_PT.po | 84 +++++++------ po/rm.po | 84 +++++++------ po/ro.po | 84 +++++++------ po/ru.po | 84 +++++++------ po/si.po | 84 +++++++------ po/sk.po | 84 +++++++------ po/sl.po | 84 +++++++------ po/sr_RS(a)cyrillic.po | 84 +++++++------ po/sr_RS(a)latin.po | 84 +++++++------ po/sv.po | 84 +++++++------ po/ta.po | 84 +++++++------ po/te.po | 84 +++++++------ po/th.po | 84 +++++++------ po/tr.po | 84 +++++++------ po/uk.po | 84 +++++++------ po/wa.po | 84 +++++++------ po/wine.pot | 84 +++++++------ po/zh_CN.po | 84 +++++++------ po/zh_TW.po | 84 +++++++------ programs/winefile/Makefile.in | 1 - programs/winefile/resource.h | 4 - programs/winefile/winefile.c | 265 +----------------------------------------- programs/winefile/winefile.rc | 1 - 52 files changed, 1923 insertions(+), 2380 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=dff5a02546247375dd5f…
1
0
0
0
Alexandre Julliard : ping: Build with msvcrt.
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: 7497710839327762460497a22b98f9928e41824f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7497710839327762460497a2…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:35:25 2019 +0200 ping: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ping/Makefile.in | 3 ++- programs/ping/ping_main.c | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in index 0f87ad0..f814b04 100644 --- a/programs/ping/Makefile.in +++ b/programs/ping/Makefile.in @@ -1,6 +1,7 @@ MODULE = ping.exe -APPMODE = -mconsole IMPORTS = ws2_32 iphlpapi +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = \ ping_main.c diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 59d36b7..5022fe2 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "winsock2.h" #include "ws2tcpip.h" #include "iphlpapi.h" @@ -30,9 +28,6 @@ #include <string.h> #include <icmpapi.h> #include <limits.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif #include <windows.h>
1
0
0
0
Alexandre Julliard : ping: Avoid using getopt().
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: cf39ae8962e921eec25ad2ec9beaeef8f5bcc347 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=cf39ae8962e921eec25ad2ec…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:35:20 2019 +0200 ping: Avoid using getopt(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ping/ping_main.c | 54 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 9c4f239..59d36b7 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -52,14 +52,14 @@ static void usage(void) int main(int argc, char** argv) { - unsigned int n = 4, i = 0, w = 4000, l = 32; - int optc, res; + unsigned int n = 4, i, w = 4000, l = 32; + int res; int rec = 0, lost = 0, min = INT_MAX, max = 0; WSADATA wsa; HANDLE icmp_file; unsigned long ipaddr; DWORD retval, reply_size; - char *send_data, ip[100], *hostname, rtt[16]; + char *send_data, ip[100], *hostname = NULL, rtt[16]; void *reply_buffer; struct in_addr addr; ICMP_ECHO_REPLY *reply; @@ -72,12 +72,19 @@ int main(int argc, char** argv) exit(1); } - while ((optc = getopt( argc, argv, "n:w:l:tal:fi:v:r:s:j:k:" )) != -1) + for (i = 1; i < argc; i++) { - switch(optc) + if (argv[i][0] == '-' || argv[i][0] == '/') { + switch (argv[i][1]) + { case 'n': - n = atoi(optarg); + if (i == argc - 1) + { + printf( "Missing value for option %s\n", argv[i] ); + exit(1); + } + n = atoi(argv[++i]); if (n == 0) { printf("Bad value for option -n, valid range is from 1 to 4294967295.\n"); @@ -85,7 +92,12 @@ int main(int argc, char** argv) } break; case 'w': - w = atoi(optarg); + if (i == argc - 1) + { + printf( "Missing value for option %s\n", argv[i] ); + exit(1); + } + w = atoi(argv[++i]); if (w == 0) { printf("Bad value for option -w.\n"); @@ -93,7 +105,12 @@ int main(int argc, char** argv) } break; case 'l': - l = atoi(optarg); + if (i == argc - 1) + { + printf( "Missing value for option %s\n", argv[i] ); + exit(1); + } + l = atoi(argv[++i]); if (l == 0) { printf("Bad value for option -l.\n"); @@ -107,12 +124,20 @@ int main(int argc, char** argv) usage(); WINE_FIXME( "this command currently only supports the -n, -w and -l parameters.\n" ); exit(1); + } + } + else + { + if (hostname) + { + printf( "Bad argument %s\n", argv[i] ); + exit(1); + } + hostname = argv[i]; } } - if (argv[optind] != NULL) - hostname = argv[optind]; - else + if (!hostname) { printf("Pass a host name.\n"); return 1; @@ -155,7 +180,7 @@ int main(int argc, char** argv) } printf("Pinging %s [%s] with %d bytes of data:\n", hostname, ip, l); - for (;;) + for (i = 0; i < n; i++) { SetLastError(0); retval = IcmpSendEcho(icmp_file, ipaddr, send_data, l, @@ -184,10 +209,7 @@ int main(int argc, char** argv) puts("PING: transmit failed. General failure."); lost++; } - i++; - if (i == n) - break; - Sleep(1000); + if (i < n - 1) Sleep(1000); } printf("\nPing statistics for %s\n", ip);
1
0
0
0
Alexandre Julliard : wscript: Build with msvcrt.
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: 4432405ec5b61536fe9a75c3289a8e6f35dfb203 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4432405ec5b61536fe9a75c3…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:36 2019 +0200 wscript: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cscript/Makefile.in | 3 ++- programs/wscript/Makefile.in | 3 ++- programs/wscript/host.c | 7 +++---- programs/wscript/main.c | 13 ++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in index b3fee31..73b8966 100644 --- a/programs/cscript/Makefile.in +++ b/programs/cscript/Makefile.in @@ -1,9 +1,10 @@ MODULE = cscript.exe -APPMODE = -mwindows -municode IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 EXTRADEFS = -DCSCRIPT_BUILD PARENTSRC = ../wscript +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ arguments.c \ host.c \ diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 07d8832..96a4244 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -1,7 +1,8 @@ MODULE = wscript.exe -APPMODE = -mwindows -municode IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + RC_SRCS = \ rsrc.rc diff --git a/programs/wscript/host.c b/programs/wscript/host.c index fb1c86f..315b8ac 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -29,7 +29,6 @@ #include <wine/debug.h> #include <wine/heap.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); @@ -80,7 +79,7 @@ static void print_string(const WCHAR *string) return; } - len = strlenW(string); + len = lstrlenW(string); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); if(ret) { static const WCHAR crnlW[] = {'\r','\n'}; @@ -200,7 +199,7 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) if(GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)) == 0) return E_FAIL; - pos = strrchrW(path, '\\'); + pos = wcsrchr(path, '\\'); howMany = pos - path; if(!(*out_Path = SysAllocStringLen(path, howMany))) return E_OUTOFMEMORY; @@ -237,7 +236,7 @@ static HRESULT WINAPI Host_get_ScriptName(IHost *iface, BSTR *out_ScriptName) WINE_TRACE("(%p)\n", out_ScriptName); - scriptName = strrchrW(scriptFullName, '\\'); + scriptName = wcsrchr(scriptFullName, '\\'); ++scriptName; if(!(*out_ScriptName = SysAllocString(scriptName))) return E_OUTOFMEMORY; diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 1cbb9e7..8a80360 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -31,7 +31,6 @@ #include "wscript.h" #include <wine/debug.h> -#include <wine/unicode.h> #ifdef _WIN64 @@ -87,7 +86,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, { WINE_TRACE("(%s %x %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti); - if(strcmpW(pstrName, wshW) && strcmpW(pstrName, wscriptW)) + if(lstrcmpW(pstrName, wshW) && lstrcmpW(pstrName, wscriptW)) return E_FAIL; if(dwReturnMask & SCRIPTINFO_ITYPEINFO) { @@ -261,7 +260,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) WINE_TRACE("fileid is %s\n", wine_dbgstr_w(fileid)); - strcatW(fileid, script_engineW); + lstrcatW(fileid, script_engineW); res = RegOpenKeyW(HKEY_CLASSES_ROOT, fileid, &hkey); if(res != ERROR_SUCCESS) return FALSE; @@ -400,11 +399,11 @@ static BOOL set_host_properties(const WCHAR *prop) else ++prop; - if(strcmpiW(prop, iactive) == 0) + if(wcsicmp(prop, iactive) == 0) wshInteractive = VARIANT_TRUE; - else if(strcmpiW(prop, batch) == 0) + else if(wcsicmp(prop, batch) == 0) wshInteractive = VARIANT_FALSE; - else if(strcmpiW(prop, nologoW) == 0) + else if(wcsicmp(prop, nologoW) == 0) WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW)); else { @@ -450,7 +449,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm if(!res || res > ARRAY_SIZE(scriptFullName)) return 1; - ext = strrchrW(filepart, '.'); + ext = wcsrchr(filepart, '.'); if(!ext || !get_engine_clsid(ext, &clsid)) { WINE_FIXME("Could not find engine for %s\n", wine_dbgstr_w(ext)); return 1;
1
0
0
0
Alexandre Julliard : write: Build with msvcrt.
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: bb90e8dd4979f3fa852698317ccb1f9e1284d8cb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=bb90e8dd4979f3fa85269831…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:28 2019 +0200 write: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/write/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index dcdca16..b0280b7 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -1,7 +1,8 @@ MODULE = write.exe -APPMODE = -mwindows IMPORTS = user32 gdi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = write.c RC_SRCS = write.rc
1
0
0
0
Alexandre Julliard : wmic: Build with msvcrt.
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: be5c1c86d416735b09d1c1b48d08ad241204b00d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=be5c1c86d416735b09d1c1b4…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:22 2019 +0200 wmic: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/Makefile.in | 3 ++- programs/wmic/main.c | 41 ++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/wmic/Makefile.in b/programs/wmic/Makefile.in index 87185f7..16098c1 100644 --- a/programs/wmic/Makefile.in +++ b/programs/wmic/Makefile.in @@ -1,7 +1,8 @@ MODULE = wmic.exe -APPMODE = -mconsole -municode IMPORTS = oleaut32 ole32 user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 5d50045..e20b1f8 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -28,7 +28,6 @@ #include "wmic.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wmic); @@ -84,7 +83,7 @@ static const WCHAR *find_class( const WCHAR *alias ) for (i = 0; i < ARRAY_SIZE(alias_map); i++) { - if (!strcmpiW( alias, alias_map[i].alias )) return alias_map[i].class; + if (!wcsicmp( alias, alias_map[i].alias )) return alias_map[i].class; } return NULL; } @@ -93,8 +92,8 @@ static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) return NULL; - strcpyW( dst, src ); + if (!(dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) return NULL; + lstrcpyW( dst, src ); return dst; } @@ -111,7 +110,7 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) for (i = 0; i <= last_index; i++) { SafeArrayGetElement( sa, &i, &str ); - if (!strcmpiW( str, prop )) + if (!wcsicmp( str, prop )) { ret = strdupW( str ); break; @@ -121,16 +120,16 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) return ret; } -static int output_string( HANDLE handle, const WCHAR *msg, ... ) +static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) { - va_list va_args; + __ms_va_list va_args; int len; DWORD count; WCHAR buffer[8192]; - va_start( va_args, msg ); - len = vsnprintfW( buffer, ARRAY_SIZE(buffer), msg, va_args ); - va_end( va_args ); + __ms_va_start( va_args, msg ); + len = vswprintf( buffer, ARRAY_SIZE(buffer), msg, va_args ); + __ms_va_end( va_args ); if (!WriteConsoleW( handle, buffer, len, &count, NULL )) WriteFile( handle, buffer, len * sizeof(WCHAR), &count, FALSE ); @@ -154,7 +153,7 @@ static int output_header( const WCHAR *prop, ULONG column_width ) DWORD count; WCHAR buffer[8192]; - len = snprintfW( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop ); + len = swprintf( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop ); if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ { @@ -204,10 +203,10 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = strlenW( class ) + ARRAY_SIZE(select_allW); + len = lstrlenW( class ) + ARRAY_SIZE(select_allW); if (!(query = SysAllocStringLen( NULL, len ))) goto done; - strcpyW( query, select_allW ); - strcatW( query, class ); + lstrcpyW( query, select_allW ); + lstrcatW( query, class ); if (!(wql = SysAllocString( wqlW ))) goto done; hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); @@ -226,7 +225,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { VariantChangeType( &v, &v, 0, VT_BSTR ); - width = max( strlenW( V_BSTR( &v ) ), width ); + width = max( lstrlenW( V_BSTR( &v ) ), width ); VariantClear( &v ); } IWbemClassObject_Release( obj ); @@ -283,20 +282,20 @@ int wmain(int argc, WCHAR *argv[]) if (i >= argc) goto not_supported; - if (!strcmpiW( argv[i], quitW ) || - !strcmpiW( argv[i], exitW )) + if (!wcsicmp( argv[i], quitW ) || + !wcsicmp( argv[i], exitW )) { return 0; } - if (!strcmpiW( argv[i], classW) || - !strcmpiW( argv[i], contextW )) + if (!wcsicmp( argv[i], classW) || + !wcsicmp( argv[i], contextW )) { WINE_FIXME( "command %s not supported\n", debugstr_w(argv[i]) ); goto not_supported; } - if (!strcmpiW( argv[i], pathW )) + if (!wcsicmp( argv[i], pathW )) { if (++i >= argc) { @@ -318,7 +317,7 @@ int wmain(int argc, WCHAR *argv[]) if (++i >= argc) goto not_supported; - if (!strcmpiW( argv[i], getW )) + if (!wcsicmp( argv[i], getW )) { if (++i >= argc) goto not_supported;
1
0
0
0
Alexandre Julliard : winhlp32: Build with msvcrt.
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: 6cd7240fec06829e73f240104f6e690b7ca5ff8c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6cd7240fec06829e73f24010…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:16 2019 +0200 winhlp32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/Makefile.in | 3 ++- programs/winhlp32/macro.lex.l | 1 - programs/winhlp32/winhelp.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index 40ce8a1..78e0e5a 100644 --- a/programs/winhlp32/Makefile.in +++ b/programs/winhlp32/Makefile.in @@ -1,8 +1,9 @@ MODULE = winhlp32.exe -APPMODE = -mwindows IMPORTS = user32 gdi32 DELAYIMPORTS = shell32 comctl32 comdlg32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ callback.c \ hlpfile.c \ diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index eab7a79..08067a4 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -23,7 +23,6 @@ %option noinput nounput never-interactive 8bit %x quote %{ -#include "config.h" #include <assert.h> #include <stdarg.h> diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 7ce5d4a..a98a760 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -275,10 +275,10 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) strcpy(mwi.name, "main"); if (hlpfile && hlpfile->lpszTitle[0]) { - char tmp[128]; + char tmp[40]; LoadStringA(Globals.hInstance, STID_WINE_HELP, tmp, sizeof(tmp)); - snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s", - hlpfile->lpszTitle, tmp, hlpfile->lpszPath); + _snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s", + hlpfile->lpszTitle, tmp, hlpfile->lpszPath); } else LoadStringA(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption));
1
0
0
0
Alexandre Julliard : winetest: Build with msvcrt.
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: 15c4352f4cf8ba1e54c3b97759f158d51285e747 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=15c4352f4cf8ba1e54c3b977…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:10 2019 +0200 winetest: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/Makefile.in | 3 ++- programs/winetest/gui.c | 63 ++++++++++++++++++++++--------------------- programs/winetest/main.c | 3 --- programs/winetest/send.c | 9 +++---- programs/winetest/util.c | 20 +++++++------- programs/winetest/winetest.h | 8 +++--- 6 files changed, 52 insertions(+), 54 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 2719a24..0322e77 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -1,8 +1,9 @@ MODULE = winetest.exe -APPMODE = -mconsole IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 DELAYIMPORTS = ole32 +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = \ gui.c \ main.c \ diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index bda00f3..bf9c3de 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -60,7 +60,7 @@ MBdefault (int uType) /* report (R_STATUS, fmt, ...) */ static int -textStatus (va_list ap) +textStatus (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -71,7 +71,7 @@ textStatus (va_list ap) } static int -guiStatus (va_list ap) +guiStatus (__ms_va_list ap) { size_t len; char *str = vstrmake (&len, ap); @@ -84,7 +84,7 @@ guiStatus (va_list ap) /* report (R_PROGRESS, barnum, steps) */ static int -textProgress (va_list ap) +textProgress (__ms_va_list ap) { progressGroup = va_arg (ap, int); progressMax = va_arg (ap, int); @@ -93,7 +93,7 @@ textProgress (va_list ap) } static int -guiProgress (va_list ap) +guiProgress (__ms_va_list ap) { unsigned int max; HWND pb; @@ -114,7 +114,7 @@ guiProgress (va_list ap) /* report (R_STEP, fmt, ...) */ static int -textStep (va_list ap) +textStep (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -126,7 +126,7 @@ textStep (va_list ap) } static int -guiStep (va_list ap) +guiStep (__ms_va_list ap) { const int pgID = IDC_ST0 + progressGroup * 2; char *str = vstrmake (NULL, ap); @@ -141,7 +141,7 @@ guiStep (va_list ap) /* report (R_DELTA, inc, fmt, ...) */ static int -textDelta (va_list ap) +textDelta (__ms_va_list ap) { const int inc = va_arg (ap, int); char *str = vstrmake (NULL, ap); @@ -154,7 +154,7 @@ textDelta (va_list ap) } static int -guiDelta (va_list ap) +guiDelta (__ms_va_list ap) { const int inc = va_arg (ap, int); const int pgID = IDC_ST0 + progressGroup * 2; @@ -170,7 +170,7 @@ guiDelta (va_list ap) /* report (R_TAG) */ static int -textTag (va_list ap) +textTag (__ms_va_list ap) { fputs ("Tag: ", stderr); fputs (tag, stderr); @@ -179,7 +179,7 @@ textTag (va_list ap) } static int -guiTag (va_list ap) +guiTag (__ms_va_list ap) { SetDlgItemTextA (dialog, IDC_TAG, tag); return 0; @@ -187,7 +187,7 @@ guiTag (va_list ap) /* report (R_DIR, fmt, ...) */ static int -textDir (va_list ap) +textDir (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -199,7 +199,7 @@ textDir (va_list ap) } static int -guiDir (va_list ap) +guiDir (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -210,7 +210,7 @@ guiDir (va_list ap) /* report (R_OUT, fmt, ...) */ static int -textOut (va_list ap) +textOut (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -222,7 +222,7 @@ textOut (va_list ap) } static int -guiOut (va_list ap) +guiOut (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -233,7 +233,7 @@ guiOut (va_list ap) /* report (R_WARNING, fmt, ...) */ static int -textWarning (va_list ap) +textWarning (__ms_va_list ap) { fputs ("Warning: ", stderr); textStatus (ap); @@ -241,7 +241,7 @@ textWarning (va_list ap) } static int -guiWarning (va_list ap) +guiWarning (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -252,7 +252,7 @@ guiWarning (va_list ap) /* report (R_ERROR, fmt, ...) */ static int -textError (va_list ap) +textError (__ms_va_list ap) { fputs ("Error: ", stderr); textStatus (ap); @@ -260,7 +260,7 @@ textError (va_list ap) } static int -guiError (va_list ap) +guiError (__ms_va_list ap) { char *str = vstrmake (NULL, ap); @@ -271,22 +271,24 @@ guiError (va_list ap) /* report (R_FATAL, fmt, ...) */ static int -textFatal (va_list ap) +textFatal (__ms_va_list ap) { textError (ap); exit (1); + return 0; } static int -guiFatal (va_list ap) +guiFatal (__ms_va_list ap) { guiError (ap); exit (1); + return 0; } /* report (R_ASK, type, fmt, ...) */ static int -textAsk (va_list ap) +textAsk (__ms_va_list ap) { int uType = va_arg (ap, int); int ret = MBdefault (uType); @@ -299,7 +301,7 @@ textAsk (va_list ap) } static int -guiAsk (va_list ap) +guiAsk (__ms_va_list ap) { int uType = va_arg (ap, int); char *str = vstrmake (NULL, ap); @@ -393,13 +395,13 @@ guiAskEmail (void) /* Quiet functions */ static int -qNoOp (va_list ap) +qNoOp (__ms_va_list ap) { return 0; } static int -qAsk (va_list ap) +qAsk (__ms_va_list ap) { return MBdefault (va_arg (ap, int)); } @@ -476,12 +478,11 @@ DlgThreadProc (LPVOID param) return 0; } -int -report (enum report_type t, ...) +int WINAPIV report (enum report_type t, ...) { - typedef int r_fun_t (va_list); + typedef int r_fun_t (__ms_va_list); - va_list ap; + __ms_va_list ap; int ret = 0; static r_fun_t * const text_funcs[] = {textStatus, textProgress, textStep, textDelta, @@ -545,10 +546,10 @@ report (enum report_type t, ...) } } } - - va_start (ap, t); + + __ms_va_start (ap, t); if (t < ARRAY_SIZE(text_funcs)) ret = funcs[t](ap); else report (R_WARNING, "unimplemented report type: %d", t); - va_end (ap); + __ms_va_end (ap); return ret; } diff --git a/programs/winetest/main.c b/programs/winetest/main.c index ec2f6a7..a6874c2 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -25,9 +25,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #define COBJMACROS #include <stdio.h> #include <assert.h> diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 1b0b94a..1d4e3a7 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -103,17 +103,16 @@ send_buf (SOCKET s, const char *buf, size_t length) return 0; } -static int -send_str (SOCKET s, ...) +static int WINAPIV send_str (SOCKET s, ...) { - va_list ap; + __ms_va_list ap; char *p; int ret; size_t len; - va_start (ap, s); + __ms_va_start (ap, s); p = vstrmake (&len, ap); - va_end (ap); + __ms_va_end (ap); if (!p) return 1; ret = send_buf (s, p, len); heap_free (p); diff --git a/programs/winetest/util.c b/programs/winetest/util.c index af625e7..b3d112e 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -57,7 +57,7 @@ void heap_free (void *op) HeapFree(GetProcessHeap(), 0, op); } -static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) +static char *vstrfmtmake (size_t *lenp, const char *fmt, __ms_va_list ap) { size_t size = 1000; char *p, *q; @@ -81,7 +81,7 @@ static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) return p; } -char *vstrmake (size_t *lenp, va_list ap) +char *vstrmake (size_t *lenp, __ms_va_list ap) { const char *fmt; @@ -89,29 +89,29 @@ char *vstrmake (size_t *lenp, va_list ap) return vstrfmtmake (lenp, fmt, ap); } -char *strmake (size_t *lenp, ...) +char * WINAPIV strmake (size_t *lenp, ...) { - va_list ap; + __ms_va_list ap; char *p; - va_start (ap, lenp); + __ms_va_start (ap, lenp); p = vstrmake (lenp, ap); if (!p) report (R_FATAL, "Out of memory."); - va_end (ap); + __ms_va_end (ap); return p; } -void xprintf (const char *fmt, ...) +void WINAPIV xprintf (const char *fmt, ...) { - va_list ap; + __ms_va_list ap; size_t size; DWORD written; char *buffer, *head; - va_start (ap, fmt); + __ms_va_start (ap, fmt); buffer = vstrfmtmake (&size, fmt, ap); head = buffer; - va_end (ap); + __ms_va_end (ap); while (size) { if (!WriteFile( logfile, head, size, &written, NULL )) report (R_FATAL, "Can't write logs: %u", GetLastError()); diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 0446ad5..32d3f90 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -28,9 +28,9 @@ void fatal (const char* msg); void warning (const char* msg); -void xprintf (const char *fmt, ...); -char *vstrmake (size_t *lenp, va_list ap); -char *strmake (size_t *lenp, ...); +void WINAPIV xprintf (const char *fmt, ...); +char *vstrmake (size_t *lenp, __ms_va_list ap); +char * WINAPIV strmake (size_t *lenp, ...); int goodtagchar (char c); const char *findbadtagchar (const char *tag); @@ -72,6 +72,6 @@ extern char *email; extern BOOL aborting; int guiAskTag (void); int guiAskEmail (void); -int report (enum report_type t, ...); +int WINAPIV report (enum report_type t, ...); #endif /* __WINETESTS_H */
1
0
0
0
Alexandre Julliard : winemsibuilder: Build with msvcrt.
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: d87da76156eb7a14dfc77d2071d1ad4b00348f77 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d87da76156eb7a14dfc77d20…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:31:02 2019 +0200 winemsibuilder: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemsibuilder/Makefile.in | 3 ++- programs/winemsibuilder/main.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winemsibuilder/Makefile.in b/programs/winemsibuilder/Makefile.in index b29f44c..1d7031e 100644 --- a/programs/winemsibuilder/Makefile.in +++ b/programs/winemsibuilder/Makefile.in @@ -1,5 +1,6 @@ MODULE = winemsibuilder.exe -APPMODE = -mconsole -municode IMPORTS = msi ole32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = main.c diff --git a/programs/winemsibuilder/main.c b/programs/winemsibuilder/main.c index ea4607e..71fd1fd 100644 --- a/programs/winemsibuilder/main.c +++ b/programs/winemsibuilder/main.c @@ -28,7 +28,6 @@ #include <objbase.h> #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(winemsibuilder); @@ -131,7 +130,7 @@ static WCHAR *encode_stream( const WCHAR *in ) DWORD c, next, count; WCHAR *out, *p; - count = strlenW( in ); + count = lstrlenW( in ); if (count > MAX_STREAM_NAME) return NULL;
1
0
0
0
Alexandre Julliard : winemine: Build with msvcrt.
by Alexandre Julliard
02 May '19
02 May '19
Module: wine Branch: master Commit: 4a8ae1c0f47f17bb159ca95c38c4d5025254ec4b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4a8ae1c0f47f17bb159ca95c…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:30:56 2019 +0200 winemine: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index f72e1b1..8f5aebd 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -1,8 +1,9 @@ MODULE = winemine.exe -APPMODE = -mwindows -municode IMPORTS = user32 gdi32 advapi32 DELAYIMPORTS = shell32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ dialog.c \ main.c
1
0
0
0
← Newer
1
...
95
96
97
98
99
100
101
102
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
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
Results per page:
10
25
50
100
200