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
July
June
May
April
March
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
November 2011
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 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
852 discussions
Start a n
N
ew thread
Tag wine-1.3.32 : Alexandre Julliard : Release 1.3.32
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: refs/tags/wine-1.3.32 Tag: 02b65a21fd4cb51c4655938b1855e90ded03fdcf URL:
http://source.winehq.org/git/wine.git/?a=tag;h=02b65a21fd4cb51c4655938b1855…
Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 20:02:31 2011 +0100 Release 1.3.32
1
0
0
0
Alexandre Julliard : Release 1.3.32.
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: master Commit: 08a4ca7b531e9fdf2d6868f57adc11a6982293ce URL:
http://source.winehq.org/git/wine.git/?a=commit;h=08a4ca7b531e9fdf2d6868f57…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 20:02:31 2011 +0100 Release 1.3.32. --- ANNOUNCE | 1079 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 541 insertions(+), 558 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=08a4ca7b531e9fdf2d686…
1
0
0
0
Alexandre Julliard : dpnet/tests: Fix another test failure on Windows.
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: master Commit: 2d18d5feeb3affdab6575aafa20245beb2526748 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2d18d5feeb3affdab6575aafa…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 17:19:51 2011 +0100 dpnet/tests: Fix another test failure on Windows. --- dlls/dpnet/tests/peer.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 0deb988..fc22f66 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -130,8 +130,10 @@ static void test_get_sp_caps(void) hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); - ok(caps.dwFlags == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS | - DPNSPCAPS_SUPPORTSTHREADPOOL), "unexpected flags %x\n", caps.dwFlags); + ok((caps.dwFlags & + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), + "unexpected flags %x\n", caps.dwFlags); ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval);
1
0
0
0
Eric Pouech : icinfo: No longer use stdio functions, but direct kernel32 ones.
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: master Commit: ad54412813dc24c52b98814fb0926dc6f6e65658 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ad54412813dc24c52b98814fb…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Nov 3 21:54:11 2011 +0100 icinfo: No longer use stdio functions, but direct kernel32 ones. --- programs/icinfo/Makefile.in | 2 +- programs/icinfo/icinfo.c | 112 ++++++++++++++++++++++++++++++++---------- 2 files changed, 86 insertions(+), 28 deletions(-) diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index cbd49f9..e6f6b95 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = icinfo.exe -APPMODE = -mconsole +APPMODE = -mconsole -municode IMPORTS = msvfw32 C_SRCS = icinfo.c diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 345f813..1801d09 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -18,28 +18,88 @@ #include <stdio.h> #include <string.h> +#include <wine/unicode.h> #include "windows.h" #include "mmsystem.h" #include "vfw.h" +static int mywprintf(const WCHAR *format, ...) +{ + static char output_bufA[65536]; + static WCHAR output_bufW[sizeof(output_bufA) / sizeof(WCHAR)]; + va_list parms; + DWORD nOut; + int len; + BOOL res = FALSE; + HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); + + va_start(parms, format); + len = vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); + va_end(parms); + if (len < 0) + { + /* String too long */ + return 0; + } + + /* Try to write as unicode whenever we think it's a console */ + if (((DWORD_PTR)hout & 3) == 3) + { + res = WriteConsoleW(hout, output_bufW, len, &nOut, NULL); + } + else + { + BOOL usedDefaultChar = FALSE; + DWORD convertedChars; + + /* Convert to OEM, then output */ + convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, len, + output_bufA, sizeof(output_bufA), + "?", &usedDefaultChar); + res = WriteFile(hout, output_bufA, convertedChars, &nOut, FALSE); + } + + return res ? nOut : 0; +} -int main(int argc, char* argv[]) +int wmain(int argc, WCHAR* argv[]) { int i, n=0,doabout=0,doconfigure=0; - char buf[128],type[5],handler[5]; + + static const WCHAR header[] = {'C','u','r','r','e','n','t','l','y',' ','i','n','s','t','a','l','l','e','d',' ', + 'V','i','d','e','o',' ','C','o','m','p','r','e','s','s','o','r','s',':','\n',0}; + static const WCHAR close_flags[] = {')','\n',0}; + static const WCHAR s_fmt[] = {'%','s',0}; + static const WCHAR sspc_fmt[] = {'%','s',' ',0}; + static const WCHAR fcc_fmt[] = {'%','c','%','c','%','c','%','c','.','%','c','%','c','%','c','%','c',':',' ','%','s','\n',0}; + static const WCHAR desc_fmt[] = {'\t','s','z','D','e','s','c','r','i','p','t','i','o','n',':',' ','%','s','\n',0}; + static const WCHAR flags_fmt[] = {'\t','d','w','F','l','a','g','s',':',' ','0','x','%','0','8','x',' ','(',0}; + static const WCHAR version_fmt[] = {'\t','d','w','V','e','r','s','i','o','n',':',' ','0','x','%','0','8','x','\n',0}; + static const WCHAR versicm_fmt[] = {'\t','d','w','V','e','r','s','i','o','n','I','C','M',':',' ','0','x','%','0','8','x','\n',0}; + static const WCHAR VIDCF_QUALITY_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y',0}; + static const WCHAR VIDCF_CRUNCH_W[] = {'V','I','D','C','F','_','C','R','U','N','C','H',0}; + static const WCHAR VIDCF_TEMPORAL_W[] = {'V','I','D','C','F','_','T','E','M','P','O','R','A','L',0}; + static const WCHAR VIDCF_COMPRESSFRAMES_W[] = {'V','I','D','C','F','_','C','O','M','P','R','E','S','S','F','R','A','M','E','S',0}; + static const WCHAR VIDCF_DRAW_W[] = {'V','I','D','C','F','_','D','R','A','W',0}; + static const WCHAR VIDCF_FASTTEMPORALC_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','C',0}; + static const WCHAR VIDCF_FASTTEMPORALD_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','D',0}; + static const WCHAR VIDCF_QUALITYTIME_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y','T','I','M','E',0}; + static const WCHAR about[] = {'-','a','b','o','u','t','\0'}; + static const WCHAR configure[] = {'-','c','o','n','f','i','g','u','r','e','\0'}; + static const WCHAR unk_opt_fmt[] = {'U','n','k','n','o','w','n',' ','o','p','t','i','o','n',':',' ','%','s','\n',0}; for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-about")) + if (!strcmpW(argv[i], about)) doabout = 1; - else if (!strcmp(argv[i], "-configure")) + else if (!strcmpW(argv[i], configure)) doconfigure = 1; else { - printf("Unknown option: %s\n", argv[i]); + mywprintf(unk_opt_fmt, argv[i]); return -1; } } - printf("Currently installed Video Compressors:\n"); + mywprintf(s_fmt, header); while (1) { ICINFO ii; HIC hic; @@ -53,28 +113,26 @@ int main(int argc, char* argv[]) ICClose(hic); continue; } -#define w2s(w,s) WideCharToMultiByte(0,0,w,-1,s,128,0,NULL) - w2s(ii.szName,buf); - memcpy(type,&(ii.fccType),4);type[4]='\0'; - memcpy(handler,&(ii.fccHandler),4);handler[4]='\0'; - printf("%s.%s: %s\n",type,handler,buf); - printf("\tdwFlags: 0x%08x (",ii.dwFlags); -#define XX(x) if (ii.dwFlags & x) printf(#x" "); - XX(VIDCF_QUALITY); - XX(VIDCF_CRUNCH); - XX(VIDCF_TEMPORAL); - XX(VIDCF_COMPRESSFRAMES); - XX(VIDCF_DRAW); - XX(VIDCF_FASTTEMPORALC); - XX(VIDCF_FASTTEMPORALD); - XX(VIDCF_QUALITYTIME); -#undef XX - printf(")\n"); - printf("\tdwVersion: 0x%08x\n",ii.dwVersion); - printf("\tdwVersionICM: 0x%08x\n",ii.dwVersionICM); - w2s(ii.szDescription,buf); - printf("\tszDescription: %s\n",buf); + mywprintf(fcc_fmt, + LOBYTE(ii.fccType),LOBYTE(ii.fccType>>8),LOBYTE(ii.fccType>>16),LOBYTE(ii.fccType>>24), + LOBYTE(ii.fccHandler),LOBYTE(ii.fccHandler>>8),LOBYTE(ii.fccHandler>>16),LOBYTE(ii.fccHandler>>24), + ii.szName); + mywprintf(flags_fmt,ii.dwFlags); + + if (ii.dwFlags & VIDCF_QUALITY) mywprintf(sspc_fmt, VIDCF_QUALITY_W); + if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(sspc_fmt, VIDCF_CRUNCH_W); + if (ii.dwFlags & VIDCF_TEMPORAL) mywprintf(sspc_fmt, VIDCF_TEMPORAL_W); + if (ii.dwFlags & VIDCF_COMPRESSFRAMES) mywprintf(sspc_fmt, VIDCF_COMPRESSFRAMES_W); + if (ii.dwFlags & VIDCF_DRAW) mywprintf(sspc_fmt, VIDCF_DRAW_W); + if (ii.dwFlags & VIDCF_FASTTEMPORALC) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALC_W); + if (ii.dwFlags & VIDCF_FASTTEMPORALD) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALD_W); + if (ii.dwFlags & VIDCF_QUALITYTIME) mywprintf(sspc_fmt, VIDCF_QUALITYTIME_W); + + mywprintf(s_fmt, close_flags); + mywprintf(version_fmt,ii.dwVersion); + mywprintf(versicm_fmt,ii.dwVersionICM); + mywprintf(desc_fmt,ii.szDescription); if (doabout) ICAbout(hic,0); if (doconfigure && ICQueryConfigure(hic)) ICConfigure(hic,0);
1
0
0
0
Eric Pouech : icinfo: Compile the IcInfo program as a command-line app.
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: master Commit: 15bcb63bca6ac74c2f4d4dbbc5bb449fd52f4cb8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=15bcb63bca6ac74c2f4d4dbbc…
Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Nov 3 21:54:05 2011 +0100 icinfo: Compile the IcInfo program as a command-line app. --- programs/icinfo/Makefile.in | 2 +- programs/icinfo/icinfo.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index 16a5bb7..cbd49f9 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = icinfo.exe -APPMODE = -mwindows +APPMODE = -mconsole IMPORTS = msvfw32 C_SRCS = icinfo.c diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 3b882ac..345f813 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -23,15 +23,21 @@ #include "vfw.h" -int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +int main(int argc, char* argv[]) { - int n=0,doabout=0,doconfigure=0; + int i, n=0,doabout=0,doconfigure=0; char buf[128],type[5],handler[5]; - if (strstr(cmdline,"-about")) - doabout = 1; - if (strstr(cmdline,"-configure")) - doconfigure = 1; + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "-about")) + doabout = 1; + else if (!strcmp(argv[i], "-configure")) + doconfigure = 1; + else { + printf("Unknown option: %s\n", argv[i]); + return -1; + } + } printf("Currently installed Video Compressors:\n"); while (1) {
1
0
0
0
Alexandre Julliard : wineps: Fix the font escapement when coordinates are being mirrored.
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: master Commit: 29295e98e61021028a79212748d1d904cbedc742 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=29295e98e61021028a7921274…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 16:08:29 2011 +0100 wineps: Fix the font escapement when coordinates are being mirrored. --- dlls/wineps.drv/download.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index a09f97a..6996205 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -274,6 +274,7 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev) if(GetGraphicsMode(dev->hdc) == GM_COMPATIBLE) { + if (xform.eM22 < 0) physDev->font.escapement = -physDev->font.escapement; xform.eM11 = xform.eM22 = fabs(xform.eM22); xform.eM21 = xform.eM12 = 0; }
1
0
0
0
Andrew Talbot : ws2_32: Remove unneeded address-of operator from array name .
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: master Commit: a38b3008c5c14f6850c6b9c6c79b1f8d81848d24 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a38b3008c5c14f6850c6b9c6c…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 3 23:03:22 2011 +0000 ws2_32: Remove unneeded address-of operator from array name. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 219e954..00a15b6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2784,7 +2784,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, &src->dev[i].daddr, sizeof(dst->Device[i].irdaDeviceID) ) ; memcpy( dst->Device[i].irdaDeviceName, - &src->dev[i].info, + src->dev[i].info, sizeof(dst->Device[i].irdaDeviceName) ) ; memcpy( &dst->Device[i].irdaDeviceHints1, &src->dev[i].hints[0],
1
0
0
0
Andrew Talbot : wined3d: Remove unneeded address-of operators from array names.
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: master Commit: a89584415b29be02921bce0f087734022d7e0d97 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a89584415b29be02921bce0f0…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 3 23:03:18 2011 +0000 wined3d: Remove unneeded address-of operators from array names. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ffcc2a8..d32b5f1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4485,7 +4485,7 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, int_skip = ~shader->reg_maps.integer_constants | shader->reg_maps.local_int_consts; if (int_skip == 0xffff || gl_info->supported[NV_FRAGMENT_PROGRAM_OPTION]) { - memset(&args->loop_ctrl, 0, sizeof(args->loop_ctrl)); + memset(args->loop_ctrl, 0, sizeof(args->loop_ctrl)); return; } @@ -4561,7 +4561,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, /* This is about flow control, not clipping. */ if (int_skip == 0xffff || gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]) { - memset(&args->loop_ctrl, 0, sizeof(args->loop_ctrl)); + memset(args->loop_ctrl, 0, sizeof(args->loop_ctrl)); return; }
1
0
0
0
Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (oledlg.h).
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: master Commit: 232bf4cf318fe417e66fa639c2ea0c990eae136e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=232bf4cf318fe417e66fa639c…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 3 23:59:47 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (oledlg.h). --- include/oledlg.h | 112 +++++++++++++++++++++++++++--------------------------- 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index 29fff5a..29f842f 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -197,20 +197,20 @@ DECL_WINELIB_TYPE_AW(OLEUIINSERTOBJECT) DECL_WINELIB_TYPE_AW(POLEUIINSERTOBJECT) DECL_WINELIB_TYPE_AW(LPOLEUIINSERTOBJECT) -#define IOF_SHOWHELP 0x00000001L -#define IOF_SELECTCREATENEW 0x00000002L -#define IOF_SELECTCREATEFROMFILE 0x00000004L -#define IOF_CHECKLINK 0x00000008L -#define IOF_CHECKDISPLAYASICON 0x00000010L -#define IOF_CREATENEWOBJECT 0x00000020L -#define IOF_CREATEFILEOBJECT 0x00000040L -#define IOF_CREATELINKOBJECT 0x00000080L -#define IOF_DISABLELINK 0x00000100L -#define IOF_VERIFYSERVERSEXIST 0x00000200L -#define IOF_DISABLEDISPLAYASICON 0x00000400L -#define IOF_HIDECHANGEICON 0x00000800L -#define IOF_SHOWINSERTCONTROL 0x00001000L -#define IOF_SELECTCREATECONTROL 0x00002000L +#define IOF_SHOWHELP __MSABI_LONG(0x00000001) +#define IOF_SELECTCREATENEW __MSABI_LONG(0x00000002) +#define IOF_SELECTCREATEFROMFILE __MSABI_LONG(0x00000004) +#define IOF_CHECKLINK __MSABI_LONG(0x00000008) +#define IOF_CHECKDISPLAYASICON __MSABI_LONG(0x00000010) +#define IOF_CREATENEWOBJECT __MSABI_LONG(0x00000020) +#define IOF_CREATEFILEOBJECT __MSABI_LONG(0x00000040) +#define IOF_CREATELINKOBJECT __MSABI_LONG(0x00000080) +#define IOF_DISABLELINK __MSABI_LONG(0x00000100) +#define IOF_VERIFYSERVERSEXIST __MSABI_LONG(0x00000200) +#define IOF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000400) +#define IOF_HIDECHANGEICON __MSABI_LONG(0x00000800) +#define IOF_SHOWINSERTCONTROL __MSABI_LONG(0x00001000) +#define IOF_SELECTCREATECONTROL __MSABI_LONG(0x00002000) /***************************************************************************** * CONVERT DIALOG @@ -271,15 +271,15 @@ DECL_WINELIB_TYPE_AW(OLEUICONVERT) DECL_WINELIB_TYPE_AW(POLEUICONVERT) DECL_WINELIB_TYPE_AW(LPOLEUICONVERT) -#define CF_SHOWHELPBUTTON 0x00000001L -#define CF_SETCONVERTDEFAULT 0x00000002L -#define CF_SETACTIVATEDEFAULT 0x00000004L -#define CF_SELECTCONVERTTO 0x00000008L -#define CF_SELECTACTIVATEAS 0x00000010L -#define CF_DISABLEDISPLAYASICON 0x00000020L -#define CF_DISABLEACTIVATEAS 0x00000040L -#define CF_HIDECHANGEICON 0x00000080L -#define CF_CONVERTONLY 0x00000100L +#define CF_SHOWHELPBUTTON __MSABI_LONG(0x00000001) +#define CF_SETCONVERTDEFAULT __MSABI_LONG(0x00000002) +#define CF_SETACTIVATEDEFAULT __MSABI_LONG(0x00000004) +#define CF_SELECTCONVERTTO __MSABI_LONG(0x00000008) +#define CF_SELECTACTIVATEAS __MSABI_LONG(0x00000010) +#define CF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000020) +#define CF_DISABLEACTIVATEAS __MSABI_LONG(0x00000040) +#define CF_HIDECHANGEICON __MSABI_LONG(0x00000080) +#define CF_CONVERTONLY __MSABI_LONG(0x00000100) /***************************************************************************** * CHANGE ICON DIALOG @@ -323,11 +323,11 @@ DECL_WINELIB_TYPE_AW(POLEUICHANGEICON) DECL_WINELIB_TYPE_AW(LPOLEUICHANGEICON) -#define CIF_SHOWHELP 0x00000001L -#define CIF_SELECTCURRENT 0x00000002L -#define CIF_SELECTDEFAULT 0x00000004L -#define CIF_SELECTFROMFILE 0x00000008L -#define CIF_USEICONEXE 0x00000010L +#define CIF_SHOWHELP __MSABI_LONG(0x00000001) +#define CIF_SELECTCURRENT __MSABI_LONG(0x00000002) +#define CIF_SELECTDEFAULT __MSABI_LONG(0x00000004) +#define CIF_SELECTFROMFILE __MSABI_LONG(0x00000008) +#define CIF_USEICONEXE __MSABI_LONG(0x00000010) /***************************************************************************** * PASTE SPECIAL DIALOG @@ -425,15 +425,15 @@ DECL_WINELIB_TYPE_AW(LPOLEUIPASTESPECIAL) #define PS_MAXLINKTYPES 8 -#define PSF_SHOWHELP 0x00000001L -#define PSF_SELECTPASTE 0x00000002L -#define PSF_SELECTPASTELINK 0x00000004L +#define PSF_SHOWHELP __MSABI_LONG(0x00000001) +#define PSF_SELECTPASTE __MSABI_LONG(0x00000002) +#define PSF_SELECTPASTELINK __MSABI_LONG(0x00000004) -#define PSF_CHECKDISPLAYASICON 0x00000008L -#define PSF_DISABLEDISPLAYASICON 0x00000010L -#define PSF_HIDECHANGEICON 0x00000020L -#define PSF_STAYONCLIPBOARDCHANGE 0x00000040L -#define PSF_NOREFRESHDATAOBJECT 0x00000080L +#define PSF_CHECKDISPLAYASICON __MSABI_LONG(0x00000008) +#define PSF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000010) +#define PSF_HIDECHANGEICON __MSABI_LONG(0x00000020) +#define PSF_STAYONCLIPBOARDCHANGE __MSABI_LONG(0x00000040) +#define PSF_NOREFRESHDATAOBJECT __MSABI_LONG(0x00000080) #define OLEUI_IOERR_SRCDATAOBJECTINVALID (OLEUI_ERR_STANDARDMAX+0) #define OLEUI_IOERR_ARRPASTEENTRIESINVALID (OLEUI_ERR_STANDARDMAX+1) @@ -462,11 +462,11 @@ DECL_WINELIB_TYPE_AW(LPOLEUIPASTESPECIAL) * EDIT LINKS DIALOG */ -#define ELF_SHOWHELP 0x00000001L -#define ELF_DISABLEUPDATENOW 0x00000002L -#define ELF_DISABLEOPENSOURCE 0x00000004L -#define ELF_DISABLECHANGESOURCE 0x00000008L -#define ELF_DISABLECANCELLINK 0x00000010L +#define ELF_SHOWHELP __MSABI_LONG(0x00000001) +#define ELF_DISABLEUPDATENOW __MSABI_LONG(0x00000002) +#define ELF_DISABLEOPENSOURCE __MSABI_LONG(0x00000004) +#define ELF_DISABLECHANGESOURCE __MSABI_LONG(0x00000008) +#define ELF_DISABLECANCELLINK __MSABI_LONG(0x00000010) typedef struct tagOLEUIEDITLINKSW { @@ -539,10 +539,10 @@ DECL_WINELIB_TYPE_AW(POLEUIBUSY) DECL_WINELIB_TYPE_AW(LPOLEUIBUSY) -#define BZ_DISABLECANCELBUTTON 0x00000001L -#define BZ_DISABLESWITCHTOBUTTON 0x00000002L -#define BZ_DISABLERETRYBUTTON 0x00000004L -#define BZ_NOTRESPONDINGDIALOG 0x00000008L +#define BZ_DISABLECANCELBUTTON __MSABI_LONG(0x00000001) +#define BZ_DISABLESWITCHTOBUTTON __MSABI_LONG(0x00000002) +#define BZ_DISABLERETRYBUTTON __MSABI_LONG(0x00000004) +#define BZ_NOTRESPONDINGDIALOG __MSABI_LONG(0x00000008) /*********************************************************************************** * OBJECT PROPERTIES DIALOG @@ -609,9 +609,9 @@ DECL_WINELIB_TYPE_AW(POLEUIVIEWPROPS) DECL_WINELIB_TYPE_AW(LPOLEUIVIEWPROPS) -#define VPF_SELECTRELATIVE 0x00000001L -#define VPF_DISABLERELATIVE 0x00000002L -#define VPF_DISABLESCALE 0x00000004L +#define VPF_SELECTRELATIVE __MSABI_LONG(0x00000001) +#define VPF_DISABLERELATIVE __MSABI_LONG(0x00000002) +#define VPF_DISABLESCALE __MSABI_LONG(0x00000004) typedef struct tagOLEUILINKPROPSA { @@ -671,10 +671,10 @@ DECL_WINELIB_TYPE_AW(OLEUIOBJECTPROPS) DECL_WINELIB_TYPE_AW(POLEUIOBJECTPROPS) DECL_WINELIB_TYPE_AW(LPOLEUIOBJECTPROPS) -#define OPF_OBJECTISLINK 0x00000001L -#define OPF_NOFILLDEFAULT 0x00000002L -#define OPF_SHOWHELP 0x00000004L -#define OPF_DISABLECONVERT 0x00000008L +#define OPF_OBJECTISLINK __MSABI_LONG(0x00000001) +#define OPF_NOFILLDEFAULT __MSABI_LONG(0x00000002) +#define OPF_SHOWHELP __MSABI_LONG(0x00000004) +#define OPF_DISABLECONVERT __MSABI_LONG(0x00000008) /************************************************************************************ @@ -731,10 +731,10 @@ DECL_WINELIB_TYPE_AW(POLEUICHANGESOURCE) DECL_WINELIB_TYPE_AW(LPOLEUICHANGESOURCE) /* Change Source Dialog flags */ -#define CSF_SHOWHELP 0x00000001L -#define CSF_VALIDSOURCE 0x00000002L -#define CSF_ONLYGETSOURCE 0x00000004L -#define CSF_EXPLORER 0x00000008L +#define CSF_SHOWHELP __MSABI_LONG(0x00000001) +#define CSF_VALIDSOURCE __MSABI_LONG(0x00000002) +#define CSF_ONLYGETSOURCE __MSABI_LONG(0x00000004) +#define CSF_EXPLORER __MSABI_LONG(0x00000008) /*****************************************************************************
1
0
0
0
Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (winver.h).
by Alexandre Julliard
04 Nov '11
04 Nov '11
Module: wine Branch: master Commit: cb72e666ba351f894c383e0caeb6b8bb680eefe8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cb72e666ba351f894c383e0ca…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 3 23:58:54 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (winver.h). --- include/winver.h | 124 +++++++++++++++++++++++++++--------------------------- 1 files changed, 62 insertions(+), 62 deletions(-) diff --git a/include/winver.h b/include/winver.h index f7e887b..2de105b 100644 --- a/include/winver.h +++ b/include/winver.h @@ -29,33 +29,33 @@ extern "C" { #define VS_VERSION_INFO 1 #define VS_USER_DEFINED 100 -#define VS_FFI_SIGNATURE 0xfeef04bdL /* FileInfo Magic */ -#define VS_FFI_STRUCVERSION 0x00010000L /* struc version 1.0 */ -#define VS_FFI_FILEFLAGSMASK 0x0000003fL /* valid flags */ +#define VS_FFI_SIGNATURE __MSABI_LONG(0xfeef04bd) /* FileInfo Magic */ +#define VS_FFI_STRUCVERSION __MSABI_LONG(0x00010000) /* struc version 1.0 */ +#define VS_FFI_FILEFLAGSMASK __MSABI_LONG(0x0000003f) /* valid flags */ /* VS_VERSION.dwFileFlags */ -#define VS_FF_DEBUG 0x01L -#define VS_FF_PRERELEASE 0x02L -#define VS_FF_PATCHED 0x04L -#define VS_FF_PRIVATEBUILD 0x08L -#define VS_FF_INFOINFERRED 0x10L -#define VS_FF_SPECIALBUILD 0x20L +#define VS_FF_DEBUG __MSABI_LONG(0x01) +#define VS_FF_PRERELEASE __MSABI_LONG(0x02) +#define VS_FF_PATCHED __MSABI_LONG(0x04) +#define VS_FF_PRIVATEBUILD __MSABI_LONG(0x08) +#define VS_FF_INFOINFERRED __MSABI_LONG(0x10) +#define VS_FF_SPECIALBUILD __MSABI_LONG(0x20) /* VS_VERSION.dwFileOS */ /* major os version */ -#define VOS_UNKNOWN 0x00000000L -#define VOS_DOS 0x00010000L -#define VOS_OS216 0x00020000L -#define VOS_OS232 0x00030000L -#define VOS_NT 0x00040000L +#define VOS_UNKNOWN __MSABI_LONG(0x00000000) +#define VOS_DOS __MSABI_LONG(0x00010000) +#define VOS_OS216 __MSABI_LONG(0x00020000) +#define VOS_OS232 __MSABI_LONG(0x00030000) +#define VOS_NT __MSABI_LONG(0x00040000) /* minor os version */ -#define VOS__BASE 0x00000000L -#define VOS__WINDOWS16 0x00000001L -#define VOS__PM16 0x00000002L -#define VOS__PM32 0x00000003L -#define VOS__WINDOWS32 0x00000004L +#define VOS__BASE __MSABI_LONG(0x00000000) +#define VOS__WINDOWS16 __MSABI_LONG(0x00000001) +#define VOS__PM16 __MSABI_LONG(0x00000002) +#define VOS__PM32 __MSABI_LONG(0x00000003) +#define VOS__WINDOWS32 __MSABI_LONG(0x00000004) /* possible versions */ #define VOS_DOS_WINDOWS16 (VOS_DOS|VOS__WINDOWS16) @@ -65,34 +65,34 @@ extern "C" { #define VOS_NT_WINDOWS32 (VOS_NT|VOS__WINDOWS32) /* VS_VERSION.dwFileType */ -#define VFT_UNKNOWN 0x00000000L -#define VFT_APP 0x00000001L -#define VFT_DLL 0x00000002L -#define VFT_DRV 0x00000003L -#define VFT_FONT 0x00000004L -#define VFT_VXD 0x00000005L -/* ??one type missing?? 0x00000006L -Marcus */ -#define VFT_STATIC_LIB 0x00000007L +#define VFT_UNKNOWN __MSABI_LONG(0x00000000) +#define VFT_APP __MSABI_LONG(0x00000001) +#define VFT_DLL __MSABI_LONG(0x00000002) +#define VFT_DRV __MSABI_LONG(0x00000003) +#define VFT_FONT __MSABI_LONG(0x00000004) +#define VFT_VXD __MSABI_LONG(0x00000005) +/* ??one type missing?? __MSABI_LONG(0x00000006) -Marcus */ +#define VFT_STATIC_LIB __MSABI_LONG(0x00000007) /* VS_VERSION.dwFileSubtype for VFT_DRV */ -#define VFT2_UNKNOWN 0x00000000L -#define VFT2_DRV_PRINTER 0x00000001L -#define VFT2_DRV_KEYBOARD 0x00000002L -#define VFT2_DRV_LANGUAGE 0x00000003L -#define VFT2_DRV_DISPLAY 0x00000004L -#define VFT2_DRV_MOUSE 0x00000005L -#define VFT2_DRV_NETWORK 0x00000006L -#define VFT2_DRV_SYSTEM 0x00000007L -#define VFT2_DRV_INSTALLABLE 0x00000008L -#define VFT2_DRV_SOUND 0x00000009L -#define VFT2_DRV_COMM 0x0000000aL -#define VFT2_DRV_INPUTMETHOD 0x0000000bL -#define VFT2_DRV_VERSIONED_PRINTER 0x0000000cL +#define VFT2_UNKNOWN __MSABI_LONG(0x00000000) +#define VFT2_DRV_PRINTER __MSABI_LONG(0x00000001) +#define VFT2_DRV_KEYBOARD __MSABI_LONG(0x00000002) +#define VFT2_DRV_LANGUAGE __MSABI_LONG(0x00000003) +#define VFT2_DRV_DISPLAY __MSABI_LONG(0x00000004) +#define VFT2_DRV_MOUSE __MSABI_LONG(0x00000005) +#define VFT2_DRV_NETWORK __MSABI_LONG(0x00000006) +#define VFT2_DRV_SYSTEM __MSABI_LONG(0x00000007) +#define VFT2_DRV_INSTALLABLE __MSABI_LONG(0x00000008) +#define VFT2_DRV_SOUND __MSABI_LONG(0x00000009) +#define VFT2_DRV_COMM __MSABI_LONG(0x0000000a) +#define VFT2_DRV_INPUTMETHOD __MSABI_LONG(0x0000000b) +#define VFT2_DRV_VERSIONED_PRINTER __MSABI_LONG(0x0000000c) /* VS_VERSION.dwFileSubtype for VFT_FONT */ -#define VFT2_FONT_RASTER 0x00000001L -#define VFT2_FONT_VECTOR 0x00000002L -#define VFT2_FONT_TRUETYPE 0x00000003L +#define VFT2_FONT_RASTER __MSABI_LONG(0x00000001) +#define VFT2_FONT_VECTOR __MSABI_LONG(0x00000002) +#define VFT2_FONT_TRUETYPE __MSABI_LONG(0x00000003) /* VerFindFile Flags */ /* input */ @@ -109,25 +109,25 @@ extern "C" { #define VIFF_DONTDELETEOLD 0x0002 /* output (return) */ -#define VIF_TEMPFILE 0x00000001L -#define VIF_MISMATCH 0x00000002L -#define VIF_SRCOLD 0x00000004L -#define VIF_DIFFLANG 0x00000008L -#define VIF_DIFFCODEPG 0x00000010L -#define VIF_DIFFTYPE 0x00000020L -#define VIF_WRITEPROT 0x00000040L -#define VIF_FILEINUSE 0x00000080L -#define VIF_OUTOFSPACE 0x00000100L -#define VIF_ACCESSVIOLATION 0x00000200L -#define VIF_SHARINGVIOLATION 0x00000400L -#define VIF_CANNOTCREATE 0x00000800L -#define VIF_CANNOTDELETE 0x00001000L -#define VIF_CANNOTRENAME 0x00002000L -#define VIF_CANNOTDELETECUR 0x00004000L -#define VIF_OUTOFMEMORY 0x00008000L -#define VIF_CANNOTREADSRC 0x00010000L -#define VIF_CANNOTREADDST 0x00020000L -#define VIF_BUFFTOOSMALL 0x00040000L +#define VIF_TEMPFILE __MSABI_LONG(0x00000001) +#define VIF_MISMATCH __MSABI_LONG(0x00000002) +#define VIF_SRCOLD __MSABI_LONG(0x00000004) +#define VIF_DIFFLANG __MSABI_LONG(0x00000008) +#define VIF_DIFFCODEPG __MSABI_LONG(0x00000010) +#define VIF_DIFFTYPE __MSABI_LONG(0x00000020) +#define VIF_WRITEPROT __MSABI_LONG(0x00000040) +#define VIF_FILEINUSE __MSABI_LONG(0x00000080) +#define VIF_OUTOFSPACE __MSABI_LONG(0x00000100) +#define VIF_ACCESSVIOLATION __MSABI_LONG(0x00000200) +#define VIF_SHARINGVIOLATION __MSABI_LONG(0x00000400) +#define VIF_CANNOTCREATE __MSABI_LONG(0x00000800) +#define VIF_CANNOTDELETE __MSABI_LONG(0x00001000) +#define VIF_CANNOTRENAME __MSABI_LONG(0x00002000) +#define VIF_CANNOTDELETECUR __MSABI_LONG(0x00004000) +#define VIF_OUTOFMEMORY __MSABI_LONG(0x00008000) +#define VIF_CANNOTREADSRC __MSABI_LONG(0x00010000) +#define VIF_CANNOTREADDST __MSABI_LONG(0x00020000) +#define VIF_BUFFTOOSMALL __MSABI_LONG(0x00040000) typedef struct tagVS_FIXEDFILEINFO { DWORD dwSignature;
1
0
0
0
← Newer
1
...
70
71
72
73
74
75
76
...
86
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
Results per page:
10
25
50
100
200