August 2007 - Wine-commits - list.winehq.org

Francois Gouget : shlwapi: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 6dbf9c1932dbd2db13c9b9a51fd4d71dc0f58b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dbf9c1932dbd2db13c9b9a51… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:20:47 2007 +0200 shlwapi: Update win32.api to fix the winapi_check warnings. --- dlls/shlwapi/clist.c | 2 +- tools/winapi/win32.api | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index a68ada4..2fa53cd 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -425,7 +425,7 @@ BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature) * NOTES * See SHWriteDataBlockList. */ -LPDATABLOCK_HEADER WINAPI SHFindDataBlock(LPDBLIST lpList, DWORD dwSignature) +DATABLOCK_HEADER* WINAPI SHFindDataBlock(LPDBLIST lpList, DWORD dwSignature) { TRACE("(%p,%d)\n", lpList, dwSignature); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index a8e1c73..8f396b9 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4693,6 +4693,7 @@ LONGLONG BOOL * BSTR * CLSID * +DATABLOCK_HEADER * DISPPARAMS * DLGPROC DLLVERSIONINFO * @@ -4723,10 +4724,11 @@ LPBROWSEINFOW LPBYTE LPCITEMIDLIST LPCRECT -LPCSHLWAPI_CLIST LPCSTR * LPCVOID LPCWSTR * +LPDBLIST +LPDBLIST * LPDWORD LPINT LPITEMIDLIST @@ -4739,8 +4741,6 @@ LPSECURITY_ATTRIBUTES LPSHELLEXECUTEINFOW LPSHELLFOLDER LPSHFILEOPSTRUCTW -LPSHLWAPI_CLIST -LPSHLWAPI_CLIST * LPSTR * LPSTRRET LPTHREAD_START_ROUTINE

1 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

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

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

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

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

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

Francois Gouget : gdiplus: Add some extra prototypes.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 4067c194c6fbbe3139c584d2bb1ff931e22150d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4067c194c6fbbe3139c584d2b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:14:29 2007 +0200 gdiplus: Add some extra prototypes. --- include/gdiplusflat.h | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 29d9f5b..05ed742 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -143,8 +143,13 @@ GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint*,INT,GpWrapMode,Gp GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, GpPathGradient**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); +GpStatus WINGDIPAPI GdipCreateTexture(GpImage*,GpWrapMode,GpTexture**); +GpStatus WINGDIPAPI GdipCreateTexture2(GpImage*,GpWrapMode,REAL,REAL,REAL,REAL,GpTexture**); +GpStatus WINGDIPAPI GdipCreateTexture2I(GpImage*,GpWrapMode,INT,INT,INT,INT,GpTexture**); GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage*,GDIPCONST GpImageAttributes*, REAL,REAL,REAL,REAL,GpTexture**); +GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage*,GDIPCONST GpImageAttributes*, + INT,INT,INT,INT,GpTexture**); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*); @@ -157,6 +162,7 @@ GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*, ARGB*,INT*); GpStatus WINGDIPAPI GdipGetPathGradientWrapMode(GpPathGradient*,GpWrapMode*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); +GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture*,GpMatrix*); GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*, GDIPCONST REAL*,INT); GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); @@ -236,8 +242,10 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*); -GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,BOOL*, +GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,INT*, EmfType,const WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipConvertToEmfPlusToFile(const GpGraphics*,GpMetafile*,INT*,const WCHAR*,EmfType,const WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipConvertToEmfPlusToStream(const GpGraphics*,GpMetafile*,INT*,IStream*,EmfType,const WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*,

1 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

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