wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Alexander Nicolaysen Sørnes : comdlg32: ChooseFont: Set font effects on init.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 23dc9a38cd64fa9cd07c3d7cbc3e4db207a56b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dc9a38cd64fa9cd07c3d7cb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 26 18:29:23 2007 +0200 comdlg32: ChooseFont: Set font effects on init. --- dlls/comdlg32/fontdlg.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index a900c69..4afb222 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -617,6 +617,15 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam, himlTT = ImageList_LoadImageW( COMDLG32_hInstance, MAKEINTRESOURCEW(38), TTBITMAP_XSIZE, 0, CLR_DEFAULT, IMAGE_BITMAP, 0); + /* Set effect flags */ + if((lpcf->Flags & CF_EFFECTS) && (lpcf->Flags & CF_INITTOLOGFONTSTRUCT)) + { + if(lpxx->lfUnderline) + CheckDlgButton(hDlg, chx2, TRUE); + if(lpxx->lfStrikeOut) + CheckDlgButton(hDlg, chx1, TRUE); + } + if (!(lpcf->Flags & CF_SHOWHELP) || !IsWindow(lpcf->hwndOwner)) ShowWindow(GetDlgItem(hDlg,pshHelp),SW_HIDE); if (!(lpcf->Flags & CF_APPLY))

1 0

Francois Gouget : quartz: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: ec6e307b922a0a0ed9141add1f0f38abb21d3fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6e307b922a0a0ed9141add1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:45:48 2007 +0200 quartz: Better match the PSDK types and fix the winapi_check warnings. --- dlls/quartz/main.c | 4 ++-- tools/winapi/win32.api | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 230e5be..1e73979 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -273,7 +273,7 @@ LONG WINAPI DBToAmpFactor(LONG db) /*********************************************************************** * AMGetErrorTextA (QUARTZ.@) */ -DWORD WINAPI AMGetErrorTextA(HRESULT hr, char *buffer, DWORD maxlen) +DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) { int len; static const char format[] = "Error: 0x%x"; @@ -291,7 +291,7 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, char *buffer, DWORD maxlen) /*********************************************************************** * AMGetErrorTextW (QUARTZ.@) */ -DWORD WINAPI AMGetErrorTextW(HRESULT hr, WCHAR *buffer, DWORD maxlen) +DWORD WINAPI AMGetErrorTextW(HRESULT hr, LPWSTR buffer, DWORD maxlen) { int len; static const WCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0}; diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 21bee48..d772561 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4087,6 +4087,7 @@ REFIID %long +DWORD HRESULT LONG @@ -4096,6 +4097,14 @@ LPVOID * REFCLSID REFIID +%str + +LPSTR + +%wstr + +LPWSTR + %%query.dll %long

1 0

Francois Gouget : query: Update win32.api to fix the winapi_check warnings.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: b306d150842dee292e3b9f240730554ae8dbbfe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b306d150842dee292e3b9f240… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:43:12 2007 +0200 query: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index e82bd49..21bee48 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4096,6 +4096,26 @@ LPVOID * REFCLSID REFIID +%%query.dll + +%long + +HRESULT +ULONG + +%ptr + +CI_STATE * +ULONG * + +%str + +CHAR * + +%wstr + +WCHAR * + %%rasapi32.dll %long

1 0

Francois Gouget : query: Make ntquery.h C++ compatible.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: b1494b13771578078a393ea4146004ef494d21e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1494b13771578078a393ea41… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:43:06 2007 +0200 query: Make ntquery.h C++ compatible. Add missing prototypes. Add a commented-out #include directive as a reminder. --- include/ntquery.h | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/ntquery.h b/include/ntquery.h index 8ebe074..fc78c32 100644 --- a/include/ntquery.h +++ b/include/ntquery.h @@ -19,6 +19,8 @@ #ifndef __WINE_NTQUERY_H__ #define __WINE_NTQUERY_H__ +/* FIXME: #include <stgprop.h> */ + #include <pshpack4.h> typedef struct _CI_STATE @@ -42,8 +44,6 @@ typedef struct _CI_STATE #include <poppack.h> -STDAPI CIState(WCHAR const *, WCHAR const *, CI_STATE *); - #define PSGUID_STORAGE {0xb725f130, 0x47ef, 0x101a, {0xa5, 0xf1, 0x02, 0x60, 0x8c, 0x9e, 0xeb, 0xac}} #define PID_STG_DIRECTORY ((PROPID)0x02) #define PID_STG_CLASSID ((PROPID)0x03) @@ -65,4 +65,18 @@ STDAPI CIState(WCHAR const *, WCHAR const *, CI_STATE *); #define PID_STG_SHORTNAME ((PROPID)0x14) #define PID_STG_MAX PID_STG_SHORTNAME + +#ifdef __cplusplus +extern "C" { +#endif + +STDAPI CIState(WCHAR const *, WCHAR const *, CI_STATE *); +STDAPI LocateCatalogsA(CHAR const *, ULONG, CHAR *, ULONG *, CHAR *, ULONG *); +STDAPI LocateCatalogsW(WCHAR const *, ULONG, WCHAR *, ULONG *, WCHAR *, ULONG *); +#define LocateCatalogs WINELIB_NAME_AW(LocateCatalogs) + +#ifdef __cplusplus +} +#endif + #endif

1 0

Francois Gouget : url: Fix the InetIsOffline() prototype.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 16793656ea7288516b3cac681fe52355d01ef36f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16793656ea7288516b3cac681… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:42:51 2007 +0200 url: Fix the InetIsOffline() prototype. Add a skeleton intshcut.h header declaring InetIsOffline(), and use it. --- dlls/url/url.spec | 2 +- dlls/url/url_main.c | 5 +++-- include/Makefile.in | 1 + include/intshcut.h | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/url/url.spec b/dlls/url/url.spec index 76981d8..43de3b6 100644 --- a/dlls/url/url.spec +++ b/dlls/url/url.spec @@ -6,7 +6,7 @@ @ stub DummyEntryPointA @ stdcall FileProtocolHandler(long str long) FileProtocolHandlerA @ stdcall FileProtocolHandlerA(long str long) -@ stdcall InetIsOffline() +@ stdcall InetIsOffline(long) @ stub MIMEAssociationDialogA @ stub MIMEAssociationDialogW @ stub MailToProtocolHandler diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index 0d8b5eb..af960cf 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -23,6 +23,7 @@ #include "winerror.h" #include "shellapi.h" #include "shlwapi.h" +#include "intshcut.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(url); @@ -47,9 +48,9 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) * InetIsOffline (URL.@) * */ -BOOL WINAPI InetIsOffline(void) +BOOL WINAPI InetIsOffline(DWORD flags) { - FIXME("stub!\n"); + FIXME("(%08x): stub!\n", flags); return FALSE; } diff --git a/include/Makefile.in b/include/Makefile.in index 4607006..2557d2a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -188,6 +188,7 @@ SRCDIR_INCLUDES = \ imagehlp.h \ imm.h \ initguid.h \ + intshcut.h \ ipexport.h \ iphlpapi.h \ ipifcons.h \ diff --git a/include/intshcut.h b/include/intshcut.h new file mode 100644 index 0000000..54c2f2d --- /dev/null +++ b/include/intshcut.h @@ -0,0 +1,36 @@ +/* + * 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_INTSHCUT_H +#define __WINE_INTSHCUT_H + +/* FIXME: #include <isguids.h> */ + +#define INTSHCUTAPI + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WINAPI InetIsOffline(DWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_INTSHCUT_H */

1 0

Francois Gouget : secur32: Add some missing prototypes to ntsecapi.h.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 11ab3dacfd77c6b9ad2887452280816fea92cc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ab3dacfd77c6b9ad2887452… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:45:33 2007 +0200 secur32: Add some missing prototypes to ntsecapi.h. --- include/ntsecapi.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 03e8d35..3ce14b3 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -350,9 +350,14 @@ NTSTATUS WINAPI LsaDeleteTrustedDomain(LSA_HANDLE,PSID); NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE); NTSTATUS WINAPI LsaEnumerateAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING*,PULONG); NTSTATUS WINAPI LsaEnumerateAccountsWithUserRight(LSA_HANDLE,PLSA_UNICODE_STRING,PVOID*,PULONG); +NTSTATUS WINAPI LsaEnumerateLogonSessions(PULONG,PLUID*); NTSTATUS WINAPI LsaEnumerateTrustedDomains(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*,ULONG,PULONG); NTSTATUS WINAPI LsaEnumerateTrustedDomainsEx(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*,ULONG,PULONG); NTSTATUS WINAPI LsaFreeMemory(PVOID); +NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID); +NTSTATUS WINAPI LsaGetLogonSessionData(PLUID,PSECURITY_LOGON_SESSION_DATA*); +NTSTATUS WINAPI LsaLogonUser(HANDLE,PLSA_STRING,SECURITY_LOGON_TYPE,ULONG,PVOID,ULONG,PTOKEN_GROUPS,PTOKEN_SOURCE,PVOID*,PULONG,PLUID,PHANDLE,PQUOTA_LIMITS,PNTSTATUS); +NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE,PLSA_STRING,PULONG); NTSTATUS WINAPI LsaLookupNames(LSA_HANDLE,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*, PLSA_TRANSLATED_SID*); NTSTATUS WINAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*, @@ -364,6 +369,7 @@ NTSTATUS WINAPI LsaOpenTrustedDomainByName(LSA_HANDLE,PLSA_UNICODE_STRING,ACCESS NTSTATUS WINAPI LsaQueryInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); NTSTATUS WINAPI LsaQueryTrustedDomainInfo(LSA_HANDLE,PSID,TRUSTED_INFORMATION_CLASS,PVOID*); NTSTATUS WINAPI LsaQueryTrustedDomainInfoByName(LSA_HANDLE,PLSA_UNICODE_STRING,TRUSTED_INFORMATION_CLASS,PVOID*); +NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING,PHANDLE,PLSA_OPERATIONAL_MODE); NTSTATUS WINAPI LsaRegisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS,HANDLE); NTSTATUS WINAPI LsaRemoveAccountRights(LSA_HANDLE,PSID,BOOLEAN,PLSA_UNICODE_STRING,ULONG); NTSTATUS WINAPI LsaRetrievePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING,PLSA_UNICODE_STRING*);

1 0

Francois Gouget : crypt32: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 4aed59ef5b246fead260256631ab2a18d99a37f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aed59ef5b246fead26025663… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:45:39 2007 +0200 crypt32: Better match the PSDK types and fix the winapi_check warnings. --- include/wincrypt.h | 4 ++-- tools/winapi/win32.api | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 3213b4a..890934c 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3537,7 +3537,7 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, BOOL WINAPI CertResyncCertificateChainEngine(HCERTCHAINENGINE hChainEngine); -void WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine); +VOID WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine); BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, @@ -3547,7 +3547,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCCERT_CHAIN_CONTEXT WINAPI CertDuplicateCertificateChain( PCCERT_CHAIN_CONTEXT pChainContext); -void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext); +VOID WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext); PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFindFlags, DWORD dwFindType, diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 8f6e35d..e82bd49 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -696,6 +696,7 @@ ALG_ID BOOL DWORD HANDLE +HCRYPTASN1MODULE HCRYPTMSG HCRYPTPROV HCRYPTPROV_LEGACY @@ -706,6 +707,9 @@ ULONG %ptr +ASN1decoding_t +ASN1encoding_t +ASN1module_t BOOL * BYTE * CERT_EXTENSION[] @@ -733,6 +737,7 @@ LPFILETIME LPSTR * LPVOID LPWSTR * +PCCERT_CHAIN_CONTEXT PCCERT_CHAIN_CONTEXT * PCCERT_CONTEXT PCCERT_CONTEXT *

1 0

Francois Gouget : winex11.drv: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 878c6f4f5eca834e5fcbd7b35eeee569f3b62eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878c6f4f5eca834e5fcbd7b35… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:46:38 2007 +0200 winex11.drv: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 75d34ae..8f6e35d 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5716,9 +5716,12 @@ HBITMAP HBRUSH HDC HFONT +HGLRC HICON HKL +HMONITOR HPALETTE +HPBUFFERARB HPEN HRGN HWND @@ -5729,6 +5732,7 @@ LRESULT SHORT UINT WCHAR +Window WPARAM int @@ -5746,23 +5750,26 @@ HANDLE16 * HKL * INT * LPBYTE +LPCRECT LPCVOID LPDEVMODEW LPINPUT LPINT LPLOGFONTW +LPMONITORINFO LPPALETTEENTRY LPPOINT LPRECT LPSIZE LPVOID LPWTPACKET * +MONITORENUMPROC PIXELFORMATDESCRIPTOR * POINT * +PROC RECT * RGBQUAD * TEXTMETRICW * -WINDOWPOS * X11DRV_PDEVICE * X11DRV_PDEVICE ** void * @@ -5771,6 +5778,10 @@ void * void +%str + +LPCSTR + %wstr LPCWSTR

1 0

Francois Gouget : winapi_check: Assorted win16.api and win32.api updates.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: ee6a9625323b20259c0e8d89b8e88bfff478bceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6a9625323b20259c0e8d89b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:46:34 2007 +0200 winapi_check: Assorted win16.api and win32.api updates. --- tools/winapi/win16.api | 4 ++-- tools/winapi/win32.api | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index 11644c6..ea646c9 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -1176,7 +1176,7 @@ REFGUID %str -LPOLESTR +LPSTR %word @@ -1237,7 +1237,7 @@ VA_LIST16 WINDOWPLACEMENT16 * WNDCLASS16 * WNDCLASSEX16 * -WNDPROC +WINDOWPROC * WORD * void * diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index f2a6ef0..75d34ae 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4422,6 +4422,7 @@ HSPFILEQ HSTRING_TABLE HWND INT +LogSeverity LONG REGSAM UINT @@ -4465,6 +4466,10 @@ PSP_FILE_CALLBACK_W PSP_FILE_COPY_PARAMS_A PSP_FILE_COPY_PARAMS_W PSP_INF_INFORMATION +PSP_ORIGINAL_FILE_INFO_A +PSP_ORIGINAL_FILE_INFO_W +PCSTR * +PCWSTR * PSTR * PUINT PVOID @@ -4497,6 +4502,8 @@ PWSTR BOOL HANDLE +HKEY +REGSAM %wstr @@ -4523,6 +4530,7 @@ REFIID %str LPCSTR +LPSTR %void @@ -4979,6 +4987,7 @@ LPBC LPBINDCTX LPBINDSTATUSCALLBACK LPSOFTDISTINFO +LPSTREAM * LPUNKNOWN LPVOID LPVOID * @@ -5064,6 +5073,7 @@ int %long --pointer INT_PTR +LONG_PTR UINT_PTR ULONG_PTR

1 0

Francois Gouget : version: Fix some Ver*() prototypes ( especially wrt constness).
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 015dc79cd41f692ecf45bbb19fa95cbcd4e999ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=015dc79cd41f692ecf45bbb19… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 1 02:46:03 2007 +0200 version: Fix some Ver*() prototypes (especially wrt constness). Better match the PSDK types and fix the winapi_check warnings. --- dlls/kernel32/locale.c | 4 ++-- dlls/version/info.c | 4 ++-- dlls/version/install.c | 26 +++++++++++++------------- include/winver.h | 16 ++++++++-------- tools/winapi/win32.api | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 1d607f1..8a62991 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2140,7 +2140,7 @@ BOOL WINAPI EnumSystemLocalesW( LOCALE_ENUMPROCW lpfnLocaleEnum, DWORD dwFlags ) * Failure: 0. Use GetLastError() to determine the cause. * */ -DWORD WINAPI VerLanguageNameA( UINT wLang, LPSTR szLang, UINT nSize ) +DWORD WINAPI VerLanguageNameA( DWORD wLang, LPSTR szLang, DWORD nSize ) { return GetLocaleInfoA( MAKELCID(wLang, SORT_DEFAULT), LOCALE_SENGLANGUAGE, szLang, nSize ); } @@ -2151,7 +2151,7 @@ DWORD WINAPI VerLanguageNameA( UINT wLang, LPSTR szLang, UINT nSize ) * * See VerLanguageNameA. */ -DWORD WINAPI VerLanguageNameW( UINT wLang, LPWSTR szLang, UINT nSize ) +DWORD WINAPI VerLanguageNameW( DWORD wLang, LPWSTR szLang, DWORD nSize ) { return GetLocaleInfoW( MAKELCID(wLang, SORT_DEFAULT), LOCALE_SENGLANGUAGE, szLang, nSize ); } diff --git a/dlls/version/info.c b/dlls/version/info.c index 907cd23..0ad288e 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -762,7 +762,7 @@ static BOOL WINAPI VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *inf * VerQueryValueA [VERSION.@] */ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, - LPVOID *lplpBuffer, UINT *puLen ) + LPVOID *lplpBuffer, PUINT puLen ) { static const char rootA[] = "\\"; static const char varfileinfoA[] = "\\VarFileInfo\\Translation"; @@ -815,7 +815,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, * VerQueryValueW [VERSION.@] */ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, - LPVOID *lplpBuffer, UINT *puLen ) + LPVOID *lplpBuffer, PUINT puLen ) { static const WCHAR rootW[] = { '\\', 0 }; static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', diff --git a/dlls/version/install.c b/dlls/version/install.c index 2f70b10..5ff25e7 100644 --- a/dlls/version/install.c +++ b/dlls/version/install.c @@ -122,14 +122,14 @@ static int testFileExistenceW( const WCHAR *path, const WCHAR *file, BOOL excl ) * Reimplementation of VerFindFile from original stub. */ DWORD WINAPI VerFindFileA( - UINT flags, - LPSTR lpszFilename, - LPSTR lpszWinDir, - LPSTR lpszAppDir, + DWORD flags, + LPCSTR lpszFilename, + LPCSTR lpszWinDir, + LPCSTR lpszAppDir, LPSTR lpszCurDir, - UINT *lpuCurDirLen, + PUINT lpuCurDirLen, LPSTR lpszDestDir, - UINT *lpuDestDirLen ) + PUINT lpuDestDirLen ) { DWORD retval = 0; const char *curDir; @@ -220,9 +220,9 @@ DWORD WINAPI VerFindFileA( /***************************************************************************** * VerFindFileW [VERSION.@] */ -DWORD WINAPI VerFindFileW( UINT flags,LPWSTR lpszFilename,LPWSTR lpszWinDir, - LPWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen, - LPWSTR lpszDestDir,UINT *lpuDestDirLen ) +DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, + LPCWSTR lpszAppDir, LPWSTR lpszCurDir,PUINT lpuCurDirLen, + LPWSTR lpszDestDir,PUINT lpuDestDirLen ) { static const WCHAR emptyW; DWORD retval = 0; @@ -361,8 +361,8 @@ _error2vif(DWORD error) { * VerInstallFileA [VERSION.@] */ DWORD WINAPI VerInstallFileA( - UINT flags,LPSTR srcfilename,LPSTR destfilename,LPSTR srcdir, - LPSTR destdir,LPSTR curdir,LPSTR tmpfile,UINT *tmpfilelen ) + DWORD flags,LPCSTR srcfilename,LPCSTR destfilename,LPCSTR srcdir, + LPCSTR destdir,LPCSTR curdir,LPSTR tmpfile,PUINT tmpfilelen ) { LPCSTR pdest; char destfn[260],tmpfn[260],srcfn[260]; @@ -529,8 +529,8 @@ DWORD WINAPI VerInstallFileA( * VerInstallFileW [VERSION.@] */ DWORD WINAPI VerInstallFileW( - UINT flags,LPWSTR srcfilename,LPWSTR destfilename,LPWSTR srcdir, - LPWSTR destdir,LPWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen ) + DWORD flags,LPCWSTR srcfilename,LPCWSTR destfilename,LPCWSTR srcdir, + LPCWSTR destdir,LPCWSTR curdir,LPWSTR tmpfile,PUINT tmpfilelen ) { LPSTR wsrcf = NULL, wsrcd = NULL, wdestf = NULL, wdestd = NULL, wtmpf = NULL, wcurd = NULL; DWORD ret; diff --git a/include/winver.h b/include/winver.h index c38ad38..f7e887b 100644 --- a/include/winver.h +++ b/include/winver.h @@ -150,17 +150,17 @@ typedef struct tagVS_FIXEDFILEINFO { /* function prototypes */ -DWORD WINAPI VerFindFileA(UINT,LPSTR,LPSTR,LPSTR,LPSTR,UINT*,LPSTR,UINT*); -DWORD WINAPI VerFindFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,UINT*,LPWSTR,UINT*); +DWORD WINAPI VerFindFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT,LPSTR,PUINT); +DWORD WINAPI VerFindFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT,LPWSTR,PUINT); #define VerFindFile WINELIB_NAME_AW(VerFindFile) -DWORD WINAPI VerInstallFileA(UINT,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,UINT*); -DWORD WINAPI VerInstallFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,UINT*); +DWORD WINAPI VerInstallFileA(DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,PUINT); +DWORD WINAPI VerInstallFileW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,PUINT); #define VerInstallFile WINELIB_NAME_AW(VerInstallFile) -DWORD WINAPI VerLanguageNameA(UINT,LPSTR,UINT); -DWORD WINAPI VerLanguageNameW(UINT,LPWSTR,UINT); +DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); +DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); #define VerLanguageName WINELIB_NAME_AW(VerLanguageName) -BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,UINT*); -BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,UINT*); +BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT); +BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT); #define VerQueryValue WINELIB_NAME_AW(VerQueryValue) DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 0a25f1f..f2a6ef0 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5342,14 +5342,14 @@ TASKENUMPROC BOOL DWORD -UINT %ptr +LPCVOID LPDWORD LPVOID LPVOID * -UINT * +PUINT %str

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2007