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
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
August 2007
----- 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
3 participants
1085 discussions
Start a n
N
ew thread
Francois Gouget : winscard: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: 566330691da717d09e2b6e9fd0ad1ffe2d97a858 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=566330691da717d09e2b6e9fd…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:18:22 2007 +0200 winscard: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 3e8a7b9..a8e1c73 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5928,6 +5928,18 @@ VOID BOOL HWND +%%winscard.dll + +%long + +DWORD +LONG + +%ptr + +LPCVOID +LPSCARDCONTEXT + %%winspool.drv %long
1
0
0
0
Francois Gouget : mmsystem: Better stick the the PSDK types.
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: cba68f4cd54c18d17c4a1145a12365e59ce48175 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cba68f4cd54c18d17c4a1145a…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:18:12 2007 +0200 mmsystem: Better stick the the PSDK types. --- dlls/winmm/mmsystem.c | 4 ++-- tools/winapi/win16.api | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 53d9055..02eabef 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -1238,7 +1238,7 @@ UINT16 WINAPI waveOutGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize) * waveOutOpen [MMSYSTEM.404] */ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, - const WAVEFORMATEX *lpFormat, DWORD dwCallback, + LPCWAVEFORMATEX lpFormat, DWORD dwCallback, DWORD dwInstance, DWORD dwFlags) { HANDLE hWaveOut; @@ -1529,7 +1529,7 @@ UINT16 WINAPI waveInGetDevCaps16(UINT16 uDeviceID, LPWAVEINCAPS16 lpCaps, * waveInOpen [MMSYSTEM.504] */ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, - const WAVEFORMATEX *lpFormat, DWORD dwCallback, + LPCWAVEFORMATEX lpFormat, DWORD dwCallback, DWORD dwInstance, DWORD dwFlags) { HANDLE hWaveIn; diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index 854ef32..11644c6 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -560,6 +560,7 @@ HWAVEIN16 * HWAVEOUT16 * LPAUXCAPS16 LPBYTE +LPCWAVEFORMATEX LPDWORD LPHANDLE16 LPHMIXER16 @@ -579,7 +580,6 @@ LPMMTIME16 LPTIMECAPS16 LPUINT16 LPVOID -LPWAVEFORMATEX LPWAVEHDR LPWAVEINCAPS16 LPWAVEOUTCAPS16
1
0
0
0
Francois Gouget : winscard: Use quotes to include winscard.h. Fixes a winapi_check warning.
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: b9a1036cb8060931b93b3874b221bc987338c3f1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b9a1036cb8060931b93b3874b…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:17:39 2007 +0200 winscard: Use quotes to include winscard.h. Fixes a winapi_check warning. --- dlls/winscard/winscard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 01b731d..810dee1 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -21,7 +21,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -#include <winscard.h> +#include "winscard.h" WINE_DEFAULT_DEBUG_CHANNEL(winscard);
1
0
0
0
Francois Gouget : winhttp: Add a skeleton winhttp.h and use it.
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: 5b3d0b88788b5f9befb5c08472b9bdf00303377d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5b3d0b88788b5f9befb5c0847…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:17:31 2007 +0200 winhttp: Add a skeleton winhttp.h and use it. --- dlls/winhttp/main.c | 3 +- include/Makefile.in | 1 + include/winhttp.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 3386463..163f57e 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -20,10 +20,9 @@ #include <stdarg.h> -#define COBJMACROS - #include "windef.h" #include "winbase.h" +#include "winhttp.h" #include "wine/debug.h" diff --git a/include/Makefile.in b/include/Makefile.in index 3df3172..bc48cfe 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -370,6 +370,7 @@ SRCDIR_INCLUDES = \ wine/unicode.h \ winerror.h \ wingdi.h \ + winhttp.h \ wininet.h \ winineti.h \ winioctl.h \ diff --git a/include/winhttp.h b/include/winhttp.h new file mode 100644 index 0000000..d0e1cf9 --- /dev/null +++ b/include/winhttp.h @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINHTTP_H +#define __WINE_WINHTTP_H + +#define WINHTTPAPI +#define BOOLAPI WINHTTPAPI BOOL WINAPI + + +typedef LPVOID HINTERNET; +typedef HINTERNET *LPHINTERNET; + +#define INTERNET_DEFAULT_PORT 0 +#define INTERNET_DEFAULT_HTTP_PORT 80 +#define INTERNET_DEFAULT_HTTPS_PORT 443 +typedef WORD INTERNET_PORT; +typedef INTERNET_PORT *LPINTERNET_PORT; + +#define INTERNET_SCHEME_HTTP 1 +#define INTERNET_SCHEME_HTTPS 2 +typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; + +typedef struct +{ + DWORD dwStructSize; + LPWSTR lpszScheme; + DWORD dwSchemeLength; + INTERNET_SCHEME nScheme; + LPWSTR lpszHostName; + DWORD dwHostNameLength; + INTERNET_PORT nPort; + LPWSTR lpszUserName; + DWORD dwUserNameLength; + LPWSTR lpszPassword; + DWORD dwPasswordLength; + LPWSTR lpszUrlPath; + DWORD dwUrlPathLength; + LPWSTR lpszExtraInfo; + DWORD dwExtraInfoLength; +} URL_COMPONENTS, *LPURL_COMPONENTS; +typedef URL_COMPONENTS URL_COMPONENTSW; +typedef LPURL_COMPONENTS LPURL_COMPONENTSW; + +typedef struct +{ + DWORD_PTR dwResult; + DWORD dwError; +} WINHTTP_ASYNC_RESULT, *LPWINHTTP_ASYNC_RESULT; + +typedef struct +{ + FILETIME ftExpiry; + FILETIME ftStart; + LPWSTR lpszSubjectInfo; + LPWSTR lpszIssuerInfo; + LPWSTR lpszProtocolName; + LPWSTR lpszSignatureAlgName; + LPWSTR lpszEncryptionAlgName; + DWORD dwKeySize; +} WINHTTP_CERTIFICATE_INFO; + +typedef struct +{ + DWORD dwAccessType; + LPCWSTR lpszProxy; + LPCWSTR lpszProxyBypass; +} WINHTTP_PROXY_INFO, *LPWINHTTP_PROXY_INFO; +typedef WINHTTP_PROXY_INFO WINHTTP_PROXY_INFOW; +typedef LPWINHTTP_PROXY_INFO LPWINHTTP_PROXY_INFOW; + + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WINAPI WinHttpCheckPlatform(void); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINHTTP_H */
1
0
0
0
Francois Gouget : winhttp: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: 93f7444d96330e095ca3a13a4a1f337dae9ca821 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=93f7444d96330e095ca3a13a4…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:16:56 2007 +0200 winhttp: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 96a9354..3e8a7b9 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5733,6 +5733,12 @@ RGBQUAD * void * void ** +%%winhttp.dll + +%long + +BOOL + %%wininet.dll %double
1
0
0
0
Francois Gouget : winapi_check: Assorted win32.api updates.
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: 043fd9b9fe2e8f0fe92e0e0190c1ad061f1c50ec URL:
http://source.winehq.org/git/wine.git/?a=commit;h=043fd9b9fe2e8f0fe92e0e019…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:16:51 2007 +0200 winapi_check: Assorted win32.api updates. --- tools/winapi/win32.api | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 71c8ca6..96a9354 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -386,7 +386,6 @@ INT_PTR %ptr DLLVERSIONINFO * -EXTRACTdest * PCCAB PERF PFDICABINETINFO @@ -412,6 +411,7 @@ PFNOPEN PFNREAD PFNSEEK PFNWRITE +SESSION * void * %str @@ -1811,6 +1811,7 @@ DIGEST_HANDLE LPDWORD LPSYSTEMTIME LPVOID +LPWIN_CERTIFICATE PCHAR * PDWORD PIMAGE_LOAD_CONFIG_DIRECTORY @@ -1818,7 +1819,6 @@ PIMAGE_NT_HEADERS PIMAGE_NT_HEADERS32 PIMAGEHLP_STATUS_ROUTINE PLOADED_IMAGE -PWIN_CERTIFICATE ULONG * ULONG_PTR * @@ -2812,6 +2812,7 @@ int long short size_t +unsigned char unsigned int unsigned long unsigned short int @@ -2834,6 +2835,7 @@ EXCEPTION_REGISTRATION_RECORD ** MSVCRT___sighandler_t MSVCRT__beginthread_start_routine_t MSVCRT__beginthreadex_start_routine_t +MSVCRT__LDOUBLE * MSVCRT__onexit_t MSVCRT__onexit_t ** MSVCRT__se_translator_function @@ -2870,6 +2872,7 @@ struct MSVCRT__finddata_t * struct MSVCRT__finddatai64_t * struct MSVCRT__heapinfo * struct MSVCRT__stat * +struct MSVCRT__stat64 * struct MSVCRT__stati64 * struct MSVCRT__timeb * struct MSVCRT__utimbuf * @@ -4522,6 +4525,7 @@ HINSTANCE HKEY HMENU HMODULE +HPSXA HRESULT HWND INT @@ -4562,6 +4566,8 @@ IShellFolder ** IShellView ** IStream * ITEMIDLIST * +IUnknown * +IUnknown ** LPBROWSEINFOA LPBROWSEINFOW LPBYTE @@ -4578,6 +4584,7 @@ LPDROPSOURCE LPDROPTARGET LPDWORD LPENUMFORMATETC * +LPFNADDPROPSHEETPAGE LPFNCREATEINSTANCE LPFNFMCALLBACK LPITEMIDLIST @@ -4599,7 +4606,6 @@ LPSHQUERYRBINFO LPSTRRET LPTPMPARAMS LPUNKNOWN -LPUNKNOWN * LPVOID LPVOID * LPWORD @@ -4615,6 +4621,7 @@ SHChangeNotifyEntry * SHFILEINFOA * SHFILEINFOW * int * +void * %str @@ -5757,6 +5764,7 @@ FILETIME %ptr DWORD * +DWORD_PTR * FILETIME * GOPHER_ATTRIBUTE_ENUMERATORA GOPHER_ATTRIBUTE_ENUMERATORW @@ -5795,10 +5803,6 @@ unsigned long * LPCSTR LPSTR -%void - -void - %wstr LPCWSTR @@ -5812,7 +5816,6 @@ PWSTR BOOL DWORD FOURCC -HANDLE HDRVR HINSTANCE HMIDIIN @@ -5908,6 +5911,10 @@ LPSTR LPCWSTR LPWSTR +%void + +VOID + %%winnls32.dll %long @@ -6008,6 +6015,7 @@ LONG %ptr BYTE * +CRYPT_PROVIDER_CERT * CRYPT_PROVIDER_DATA * CRYPT_PROVIDER_FUNCTIONS * CRYPT_PROVIDER_REGDEFUSAGE * @@ -6021,14 +6029,18 @@ HCATINFO * LPVOID PCCERT_CONTEXT WINTRUST_DATA * +void * %str +LPCSTR char * %wstr +LPCWSTR LPWSTR +PWSTR %void @@ -6287,9 +6299,7 @@ LPSTR %wstr -LPCWSTR LPWSTR -PWSTR %void
1
0
0
0
Francois Gouget : wintrust: Add a prototype for WTHelperGetProvCertFromChain().
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: f9ee796c42607dd038fb9f8ead7e80c46d9cd5e9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f9ee796c42607dd038fb9f8ea…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:16:23 2007 +0200 wintrust: Add a prototype for WTHelperGetProvCertFromChain(). --- include/wintrust.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index fa8870f..7b0b276 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -420,6 +420,8 @@ BOOL WINAPI WintrustSetRegPolicyFlags(DWORD); LONG WINAPI WinVerifyTrust(HWND,GUID*,LPVOID); HRESULT WINAPI WinVerifyTrustEx(HWND,GUID*,WINTRUST_DATA*); +CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( + CRYPT_PROVIDER_SGNR *pSgnr, DWORD idxCert); CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSigner, DWORD idxCounterSigner);
1
0
0
0
Francois Gouget : winmm: Fix the mmTask*() prototypes.
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: 7e8a9e3dfb9e58329162bec319694694e267f598 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7e8a9e3dfb9e58329162bec31…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:16:14 2007 +0200 winmm: Fix the mmTask*() prototypes. --- dlls/winmm/winmm.c | 14 +++++++------- include/mmddk.h | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 4be129a..6ead107 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -2817,7 +2817,7 @@ static DWORD WINAPI mmTaskRun(void* pmt) /****************************************************************** * mmTaskCreate (WINMM.@) */ -MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK cb, HANDLE* ph, DWORD client) +UINT WINAPI mmTaskCreate(LPTASKCALLBACK cb, HANDLE* ph, DWORD_PTR client) { HANDLE hThread; HANDLE hEvent = 0; @@ -2846,7 +2846,7 @@ MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK cb, HANDLE* ph, DWORD client) /****************************************************************** * mmTaskBlock (WINMM.@) */ -void WINAPI mmTaskBlock(HANDLE tid) +VOID WINAPI mmTaskBlock(DWORD tid) { MSG msg; @@ -2860,20 +2860,20 @@ void WINAPI mmTaskBlock(HANDLE tid) /****************************************************************** * mmTaskSignal (WINMM.@) */ -BOOL WINAPI mmTaskSignal(HANDLE tid) +BOOL WINAPI mmTaskSignal(DWORD tid) { - return PostThreadMessageW((DWORD)tid, WM_USER, 0, 0); + return PostThreadMessageW(tid, WM_USER, 0, 0); } /****************************************************************** * mmTaskYield (WINMM.@) */ -void WINAPI mmTaskYield(void) {} +VOID WINAPI mmTaskYield(VOID) {} /****************************************************************** * mmGetCurrentTask (WINMM.@) */ -HANDLE WINAPI mmGetCurrentTask(void) +DWORD WINAPI mmGetCurrentTask(VOID) { - return (HANDLE)GetCurrentThreadId(); + return GetCurrentThreadId(); } diff --git a/include/mmddk.h b/include/mmddk.h index 092a5f7..57d3e4b 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -453,15 +453,15 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable); BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -typedef void (*LPTASKCALLBACK)(DWORD dwInst); +typedef VOID (*LPTASKCALLBACK)(DWORD dwInst); #define TASKERR_NOTASKSUPPORT 1 #define TASKERR_OUTOFMEMORY 2 -MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD); -void WINAPI mmTaskBlock(HANDLE); -BOOL WINAPI mmTaskSignal(HANDLE); -void WINAPI mmTaskYield(void); -HANDLE WINAPI mmGetCurrentTask(void); +UINT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD_PTR); +VOID WINAPI mmTaskBlock(DWORD); +BOOL WINAPI mmTaskSignal(DWORD); +VOID WINAPI mmTaskYield(VOID); +DWORD WINAPI mmGetCurrentTask(VOID); #ifdef __WINESRC__ #define WAVE_DIRECTSOUND 0x0080
1
0
0
0
Francois Gouget : winmm: Make mmddk.h C++ compatible.
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: 2264b0c556fb346181a462fe674b6611a6285d46 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2264b0c556fb346181a462fe6…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:16:07 2007 +0200 winmm: Make mmddk.h C++ compatible. --- include/mmddk.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/mmddk.h b/include/mmddk.h index 75840a0..092a5f7 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -26,6 +26,10 @@ #include <mmsystem.h> #include <winbase.h> +#ifdef __cplusplus +extern "C" { +#endif + #define MAX_MIDIINDRV (16) /* For now I'm making 16 the maximum number of midi devices one can * have. This should be more than enough for everybody. But as a purist, @@ -465,4 +469,8 @@ HANDLE WINAPI mmGetCurrentTask(void); #include <poppack.h> +#ifdef __cplusplus +} +#endif + #endif /* __MMDDK_H */
1
0
0
0
Francois Gouget : msvcrt: Add a prototype for _atoldbl() & co and declare _LDOUBLE & co in stdlib.h.
by Alexandre Julliard
30 Aug '07
30 Aug '07
Module: wine Branch: master Commit: dd3e2be81020cddf776edc1c586304a04c62e7e6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dd3e2be81020cddf776edc1c5…
Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:15:47 2007 +0200 msvcrt: Add a prototype for _atoldbl() & co and declare _LDOUBLE & co in stdlib.h. --- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/string.c | 2 +- include/msvcrt/stdlib.h | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cf3c531..587d9e8 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -71,7 +71,7 @@ typedef void (*MSVCRT__beginthread_start_routine_t)(void *); typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (*MSVCRT__onexit_t)(void); -typedef struct {long double x;} _LDOUBLE; +typedef struct {long double x;} MSVCRT__LDOUBLE; struct MSVCRT_tm { int tm_sec; diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d1973a3..ffacc35 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -174,7 +174,7 @@ int CDECL MSVCRT__stricoll( const char* str1, const char* str2 ) /******************************************************************** * _atoldbl (MSVCRT.@) */ -int CDECL MSVCRT__atoldbl(_LDOUBLE * value, char * str) +int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE * value, char * str) { /* FIXME needs error checking for huge/small values */ #ifdef HAVE_STRTOLD diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 269f279..ddaae61 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -28,6 +28,22 @@ typedef unsigned short wchar_t; #endif #endif + +typedef struct +{ + float f; +} _CRT_FLOAT; + +typedef struct +{ + double x; +} _CRT_DOUBLE; + +typedef struct +{ + unsigned char ld[10]; +} _LDOUBLE; + #if defined(__x86_64__) && !defined(_WIN64) #define _WIN64 #endif @@ -128,8 +144,11 @@ extern int* _errno(void); typedef int (*_onexit_t)(void); +int _atodbl(_CRT_DOUBLE*,char*); +int _atoflt(_CRT_FLOAT*,char*); __int64 _atoi64(const char*); long double _atold(const char*); +int _atoldbl(_LDOUBLE*,char*); void _beep(unsigned int,unsigned int); char* _ecvt(double,int,int*,int*); char* _fcvt(double,int,int*,int*);
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
109
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
103
104
105
106
107
108
109
Results per page:
10
25
50
100
200