From 7c1d8db987db4c4792db459d02a453385dc0a3d4 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Wed, 19 Jun 2002 01:15:45 +0000 Subject: [PATCH] 2002-06-19 Casper S. Hornstrup * include/ddeml.h (DdeCreateStringHandle{AW]:Correct prototypes. * include/winsvc.h (StartServiceW): Correct prototype. * include/winbase.h (BackupRead,BackupSeek,BackupWrite, FileTimeToLocalFileTime, GetAce,GetPrivateProfileStruct[AW], GetTickCount,InterlockedExchangeAdd, WritePrivateProfileStruct[AW]: Correct prototypes. (GetEnvironmentStrings): Correct mapping to GetEnvironmentStringsA. * include/winver.h (VerQueryValueA,VerQueryValueW): Correct prototypes. * include/wincon.h (CreateConsoleScreenBuffer): Correct prototype. * include/winreg.h (RegQueryMultipleValues[AW], RegQueryValueEx[AW]):Correct prototypes. * include/wingdi.h (PXFORM, PLOGBRUSH, PLOGPEN, PPOLYTEXTA, PPOLYTEXTW): Add typedefs. (_DESIGNVECTOR,COLOR16, _TRIVERTEX, _DISPLAY_DEVICE): Add structures and typedefs. (MM_MAX_NUMAXES): Add define. (EnumFontsW,GetEnhMetaFilePixelFormat,wglGetLayerPaletteEntries): Correct prototypes. * include/winerror.h (RPC_X_INVALID_PIPE_OBJECT, RPC_X_WRONG_PIPE_ORDER,RPC_X_WRONG_PIPE_VERSION, RPC_S_SEND_INCOMPLETE): Add defines. --- winsup/w32api/ChangeLog | 28 +++++++++++++++++++++ winsup/w32api/include/ddeml.h | 4 +-- winsup/w32api/include/winbase.h | 22 ++++++++--------- winsup/w32api/include/wincon.h | 3 +-- winsup/w32api/include/winerror.h | 4 +++ winsup/w32api/include/wingdi.h | 42 +++++++++++++++++++++++++------- winsup/w32api/include/winreg.h | 8 +++--- winsup/w32api/include/winsvc.h | 2 +- winsup/w32api/include/winver.h | 4 +-- 9 files changed, 86 insertions(+), 31 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 01858adc9..eebc19353 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,31 @@ +2002-06-19 Casper S. Hornstrup + + * include/ddeml.h (DdeCreateStringHandle{AW]:Correct + prototypes. + * include/winsvc.h (StartServiceW): Correct prototype. + * include/winbase.h (BackupRead,BackupSeek,BackupWrite, + FileTimeToLocalFileTime, GetAce,GetPrivateProfileStruct[AW], + GetTickCount,InterlockedExchangeAdd, + WritePrivateProfileStruct[AW]: Correct prototypes. + (GetEnvironmentStrings): Correct mapping to + GetEnvironmentStringsA. + * include/winver.h (VerQueryValueA,VerQueryValueW): + Correct prototypes. + * include/wincon.h (CreateConsoleScreenBuffer): Correct + prototype. + * include/winreg.h (RegQueryMultipleValues[AW], + RegQueryValueEx[AW]):Correct prototypes. + * include/wingdi.h (PXFORM, PLOGBRUSH, PLOGPEN, PPOLYTEXTA, + PPOLYTEXTW): Add typedefs. + (_DESIGNVECTOR,COLOR16, _TRIVERTEX, _DISPLAY_DEVICE): Add + structures and typedefs. + (MM_MAX_NUMAXES): Add define. + (EnumFontsW,GetEnhMetaFilePixelFormat, + wglGetLayerPaletteEntries): Correct prototypes. + * include/winerror.h (RPC_X_INVALID_PIPE_OBJECT, + RPC_X_WRONG_PIPE_ORDER,RPC_X_WRONG_PIPE_VERSION, + RPC_S_SEND_INCOMPLETE): Add defines. + 2002-06-17 Casper S. Hornstrup * include/windef.h (_fastcall, __fastcall, FASTCALL): diff --git a/winsup/w32api/include/ddeml.h b/winsup/w32api/include/ddeml.h index 9419ede95..f6a9e21c5 100644 --- a/winsup/w32api/include/ddeml.h +++ b/winsup/w32api/include/ddeml.h @@ -190,8 +190,8 @@ int WINAPI DdeCmpStringHandles(HSZ,HSZ); HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,PCONVCONTEXT); HCONVLIST WINAPI DdeConnectList(DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT); HDDEDATA WINAPI DdeCreateDataHandle(DWORD,PBYTE,DWORD,DWORD,HSZ,UINT,UINT); -HSZ WINAPI DdeCreateStringHandleA(DWORD,LPCSTR,int); -HSZ WINAPI DdeCreateStringHandleW(DWORD,LPCWSTR,int); +HSZ WINAPI DdeCreateStringHandleA(DWORD,LPSTR,int); +HSZ WINAPI DdeCreateStringHandleW(DWORD,LPWSTR,int); BOOL WINAPI DdeDisconnect(HCONV); BOOL WINAPI DdeDisconnectList(HCONVLIST); BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT); diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index b3fab6c3d..6a7dd2c16 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -955,9 +955,9 @@ BOOL WINAPI AreAnyAccessesGranted(DWORD,DWORD); BOOL WINAPI AreFileApisANSI(void); BOOL WINAPI BackupEventLogA(HANDLE,LPCSTR); BOOL WINAPI BackupEventLogW(HANDLE,LPCWSTR); -BOOL WINAPI BackupRead(HANDLE,PBYTE,DWORD,PDWORD,BOOL,BOOL,PVOID); -BOOL WINAPI BackupSeek(HANDLE,DWORD,DWORD,PDWORD,PDWORD,PVOID); -BOOL WINAPI BackupWrite(HANDLE,PBYTE,DWORD,PDWORD,BOOL,BOOL,PVOID); +BOOL WINAPI BackupRead(HANDLE,LPBYTE,DWORD,LPDWORD,BOOL,BOOL,LPVOID*); +BOOL WINAPI BackupSeek(HANDLE,DWORD,DWORD,LPDWORD,LPDWORD,LPVOID*); +BOOL WINAPI BackupWrite(HANDLE,LPBYTE,DWORD,LPDWORD,BOOL,BOOL,LPVOID*); BOOL WINAPI Beep(DWORD,DWORD); HANDLE WINAPI BeginUpdateResourceA(LPCSTR,BOOL); HANDLE WINAPI BeginUpdateResourceW(LPCWSTR,BOOL); @@ -1068,7 +1068,7 @@ void WINAPI FatalAppExitA(UINT,LPCSTR); void WINAPI FatalAppExitW(UINT,LPCWSTR); void WINAPI FatalExit(int); BOOL WINAPI FileTimeToDosDateTime(CONST FILETIME *,LPWORD,LPWORD); -BOOL WINAPI FileTimeToLocalFileTime(FILETIME *,LPFILETIME); +BOOL WINAPI FileTimeToLocalFileTime(CONST FILETIME *,LPFILETIME); BOOL WINAPI FileTimeToSystemTime(CONST FILETIME *,LPSYSTEMTIME); ATOM WINAPI FindAtomA(LPCSTR); ATOM WINAPI FindAtomW(LPCWSTR); @@ -1103,7 +1103,7 @@ DECLSPEC_NORETURN void WINAPI FreeLibraryAndExitThread(HMODULE,DWORD); BOOL WINAPI FreeResource(HGLOBAL); #endif /* ndef XFree86Server */ PVOID WINAPI FreeSid(PSID); -BOOL WINAPI GetAce(PACL,DWORD,PVOID); +BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); BOOL WINAPI GetAclInformation(PACL,PVOID,DWORD,ACL_INFORMATION_CLASS); UINT WINAPI GetAtomNameA(ATOM,LPSTR,int); UINT WINAPI GetAtomNameW(ATOM,LPWSTR,int); @@ -1188,8 +1188,8 @@ DWORD WINAPI GetPrivateProfileSectionNamesA(LPSTR,DWORD,LPCSTR); DWORD WINAPI GetPrivateProfileSectionNamesW(LPWSTR,DWORD,LPCWSTR); DWORD WINAPI GetPrivateProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPSTR,DWORD,LPCSTR); DWORD WINAPI GetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD,LPCWSTR); -BOOL WINAPI GetPrivateProfileStructA(LPCSTR,LPCSTR,PVOID,UINT,LPCSTR); -BOOL WINAPI GetPrivateProfileStructW(LPCWSTR,LPCWSTR,PVOID,UINT,LPCWSTR); +BOOL WINAPI GetPrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR); +BOOL WINAPI GetPrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR); FARPROC WINAPI GetProcAddress(HINSTANCE,LPCSTR); BOOL WINAPI GetProcessAffinityMask(HANDLE,PDWORD,PDWORD); HANDLE WINAPI GetProcessHeap(VOID); @@ -1241,7 +1241,7 @@ int WINAPI GetThreadPriority(HANDLE); BOOL WINAPI GetThreadPriorityBoost(HANDLE,PBOOL); BOOL WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY); BOOL WINAPI GetThreadTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME); -DWORD WINAPI GetTickCount(void); +DWORD WINAPI GetTickCount(VOID); DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION); BOOL WINAPI GetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,DWORD,PDWORD); BOOL WINAPI GetUserNameA (LPSTR,PDWORD); @@ -1309,7 +1309,7 @@ LONG WINAPI InterlockedExchange(LPLONG,LONG); /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ #define InterlockedExchangePointer(t,v) \ (PVOID)InterlockedExchange((LPLONG)(t),(LONG)(v)) -LONG WINAPI InterlockedExchangeAdd(PLONG,LONG); +LONG WINAPI InterlockedExchangeAdd(LPLONG,LONG); LONG WINAPI InterlockedIncrement(LPLONG); BOOL WINAPI IsBadCodePtr(FARPROC); BOOL WINAPI IsBadHugeReadPtr(PCVOID,UINT); @@ -1562,8 +1562,8 @@ BOOL WINAPI WritePrivateProfileSectionA(LPCSTR,LPCSTR,LPCSTR); BOOL WINAPI WritePrivateProfileSectionW(LPCWSTR,LPCWSTR,LPCWSTR); BOOL WINAPI WritePrivateProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPCSTR); BOOL WINAPI WritePrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); -BOOL WINAPI WritePrivateProfileStructA(LPCSTR,LPCSTR,PVOID,UINT,LPCSTR); -BOOL WINAPI WritePrivateProfileStructW(LPCWSTR,LPCWSTR,PVOID,UINT,LPCWSTR); +BOOL WINAPI WritePrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR); +BOOL WINAPI WritePrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR); BOOL WINAPI WriteProcessMemory(HANDLE,PVOID,PVOID,DWORD,PDWORD); BOOL WINAPI WriteProfileSectionA(LPCSTR,LPCSTR); BOOL WINAPI WriteProfileSectionW(LPCWSTR,LPCWSTR); diff --git a/winsup/w32api/include/wincon.h b/winsup/w32api/include/wincon.h index 8539fe5c6..fe7331c6a 100644 --- a/winsup/w32api/include/wincon.h +++ b/winsup/w32api/include/wincon.h @@ -4,7 +4,6 @@ #pragma GCC system_header #endif - #ifdef __cplusplus extern "C" { #endif @@ -119,7 +118,7 @@ typedef struct _INPUT_RECORD { } INPUT_RECORD,*PINPUT_RECORD; BOOL WINAPI AllocConsole(void); -HANDLE WINAPI CreateConsoleScreenBuffer(DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,PVOID); +HANDLE WINAPI CreateConsoleScreenBuffer(DWORD,DWORD,CONST SECURITY_ATTRIBUTES*,DWORD,LPVOID); BOOL WINAPI FillConsoleOutputAttribute(HANDLE,WORD,DWORD,COORD,PDWORD); BOOL WINAPI FillConsoleOutputCharacterA(HANDLE,CHAR,DWORD,COORD,PDWORD); BOOL WINAPI FillConsoleOutputCharacterW(HANDLE,WCHAR,DWORD,COORD,PDWORD); diff --git a/winsup/w32api/include/winerror.h b/winsup/w32api/include/winerror.h index 8865d9782..1f78eabda 100644 --- a/winsup/w32api/include/winerror.h +++ b/winsup/w32api/include/winerror.h @@ -631,6 +631,9 @@ #define RPC_X_INVALID_ES_ACTION 1827L #define RPC_X_WRONG_ES_VERSION 1828L #define RPC_X_WRONG_STUB_VERSION 1829L +#define RPC_X_INVALID_PIPE_OBJECT 1830L +#define RPC_X_WRONG_PIPE_ORDER 1831L +#define RPC_X_WRONG_PIPE_VERSION 1832L #define RPC_S_GROUP_MEMBER_NOT_FOUND 1898L #define EPT_S_CANT_CREATE 1899L #define RPC_S_INVALID_OBJECT 1900L @@ -643,6 +646,7 @@ #define ERROR_PASSWORD_MUST_CHANGE 1907L #define ERROR_DOMAIN_CONTROLLER_NOT_FOUND 1908L #define ERROR_ACCOUNT_LOCKED_OUT 1909L +#define RPC_S_SEND_INCOMPLETE 1913L #define ERROR_NO_BROWSER_SERVERS_FOUND 6118L #define ERROR_INVALID_PIXEL_FORMAT 2000L #define ERROR_BAD_DRIVER 2001L diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index 7045d20ea..a3717106a 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -1401,7 +1401,7 @@ typedef struct _XFORM { FLOAT eM22; FLOAT eDx; FLOAT eDy; -} XFORM,*LPXFORM; +} XFORM,*PXFORM,*LPXFORM; typedef struct tagEMRBITBLT { EMR emr; RECTL rclBounds; @@ -1423,7 +1423,7 @@ typedef struct tagLOGBRUSH { UINT lbStyle; COLORREF lbColor; LONG lbHatch; -} LOGBRUSH,*LPLOGBRUSH; +} LOGBRUSH,*PLOGBRUSH,*LPLOGBRUSH; typedef LOGBRUSH PATTERN,*PPATTERN,*LPPATTERN; typedef struct tagEMRCREATEBRUSHINDIRECT { EMR emr; @@ -1499,7 +1499,7 @@ typedef struct tagLOGPEN { UINT lopnStyle; POINT lopnWidth; COLORREF lopnColor; -} LOGPEN,*LPLOGPEN; +} LOGPEN,*PLOGPEN,*LPLOGPEN; typedef struct tagEMRCREATEPEN { EMR emr; DWORD ihPen; @@ -2020,7 +2020,7 @@ typedef struct _RGNDATAHEADER { typedef struct _RGNDATA { RGNDATAHEADER rdh; char Buffer[1]; -} RGNDATA,*LPRGNDATA; +} RGNDATA,*PRGNDATA, *LPRGNDATA; /* for GetRandomRgn */ #define SYSRGN 4 typedef struct tagGCP_RESULTSA { @@ -2148,7 +2148,7 @@ typedef struct _POLYTEXTA { UINT uiFlags; RECT rcl; int *pdx; -} POLYTEXTA; +} POLYTEXTA, *PPOLYTEXTA; typedef struct _POLYTEXTW { int x; int y; @@ -2157,7 +2157,7 @@ typedef struct _POLYTEXTW { UINT uiFlags; RECT rcl; int *pdx; -} POLYTEXTW; +} POLYTEXTW, *PPOLYTEXTW; typedef struct tagPIXELFORMATDESCRIPTOR { WORD nSize; WORD nVersion; @@ -2346,6 +2346,30 @@ typedef struct _BLENDFUNCTION { BYTE SourceConstantAlpha; BYTE AlphaFormat; } BLENDFUNCTION,*PBLENDFUNCTION,*LPBLENDFUNCTION; +#define MM_MAX_NUMAXES 16 +typedef struct _DESIGNVECTOR { + DWORD dvReserved; + DWORD dvNumAxes; + LONG dvValues[MM_MAX_NUMAXES]; +} DESIGNVECTOR, *PDESIGNVECTOR, FAR *LPDESIGNVECTOR; +typedef USHORT COLOR16; +typedef struct _TRIVERTEX { + LONG x; + LONG y; + COLOR16 Red; + COLOR16 Green; + COLOR16 Blue; + COLOR16 Alpha; +} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; +typedef struct _DISPLAY_DEVICE { + DWORD cb; + WCHAR DeviceName[32]; + WCHAR DeviceString[128]; + DWORD StateFlags; + WCHAR DeviceID[128]; + WCHAR DeviceKey[128]; +} DISPLAY_DEVICE, *PDISPLAY_DEVICE; + typedef BOOL (CALLBACK *ABORTPROC)(HDC,int); typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM); typedef int (CALLBACK *ENHMFENUMPROC)(HDC,HANDLETABLE*,ENHMETARECORD*,int,LPARAM); @@ -2450,7 +2474,7 @@ int WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM); int WINAPI EnumFontFamiliesExA(HDC,PLOGFONTA,FONTENUMPROCA,LPARAM,DWORD); int WINAPI EnumFontFamiliesExW(HDC,PLOGFONTW,FONTENUMPROCW,LPARAM,DWORD); int WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM); -int WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCA,LPARAM); +int WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM); int WINAPI EnumICMProfilesA(HDC,ICMENUMPROCA,LPARAM); int WINAPI EnumICMProfilesW(HDC,ICMENUMPROCW,LPARAM); BOOL WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM); @@ -2523,7 +2547,7 @@ UINT WINAPI GetEnhMetaFileDescriptionA(HENHMETAFILE,UINT,LPSTR); UINT WINAPI GetEnhMetaFileDescriptionW(HENHMETAFILE,UINT,LPWSTR); UINT WINAPI GetEnhMetaFileHeader(HENHMETAFILE,UINT,LPENHMETAHEADER); UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY); -UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,DWORD,PIXELFORMATDESCRIPTOR*); +UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,DWORD,CONST PIXELFORMATDESCRIPTOR*); DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD); DWORD WINAPI GetFontLanguageInfo(HDC); DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*); @@ -2700,7 +2724,7 @@ BOOL WINAPI wglDeleteContext(HGLRC); BOOL WINAPI wglDescribeLayerPlane(HDC,int,int,UINT,LPLAYERPLANEDESCRIPTOR); HGLRC WINAPI wglGetCurrentContext(void); HDC WINAPI wglGetCurrentDC(void); -int WINAPI wglGetLayerPaletteEntries(HDC,int,int,int,COLORREF*); +int WINAPI wglGetLayerPaletteEntries(HDC,int,int,int,CONST COLORREF*); PROC WINAPI wglGetProcAddress(LPCSTR); BOOL WINAPI wglMakeCurrent(HDC,HGLRC); BOOL WINAPI wglRealizeLayerPalette(HDC,int,BOOL); diff --git a/winsup/w32api/include/winreg.h b/winsup/w32api/include/winreg.h index 0ab3715b1..c82adf5d7 100644 --- a/winsup/w32api/include/winreg.h +++ b/winsup/w32api/include/winreg.h @@ -83,11 +83,11 @@ LONG WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY); LONG WINAPI RegOpenKeyW(HKEY,LPCWSTR,PHKEY); LONG WINAPI RegQueryInfoKeyA(HKEY,LPSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME); LONG WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME); -LONG WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,PDWORD); -LONG WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,PDWORD); +LONG WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); +LONG WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); LONG WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,PLONG); -LONG WINAPI RegQueryValueExA(HKEY,LPCSTR,PDWORD,PDWORD,LPBYTE,PDWORD); -LONG WINAPI RegQueryValueExW(HKEY,LPCWSTR,PDWORD,PDWORD,LPBYTE,PDWORD); +LONG WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +LONG WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); LONG WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,PLONG); LONG WINAPI RegReplaceKeyA(HKEY,LPCSTR,LPCSTR,LPCSTR); LONG WINAPI RegReplaceKeyW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR); diff --git a/winsup/w32api/include/winsvc.h b/winsup/w32api/include/winsvc.h index ae60d46a2..7e41eab4c 100644 --- a/winsup/w32api/include/winsvc.h +++ b/winsup/w32api/include/winsvc.h @@ -235,7 +235,7 @@ BOOL WINAPI SetServiceStatus(SERVICE_STATUS_HANDLE,LPSERVICE_STATUS); BOOL WINAPI StartServiceA(SC_HANDLE,DWORD,LPCSTR*); BOOL WINAPI StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA); BOOL WINAPI StartServiceCtrlDispatcherW(LPSERVICE_TABLE_ENTRYW); -BOOL WINAPI StartServiceW(SC_HANDLE,DWORD,LPCWSTR); +BOOL WINAPI StartServiceW(SC_HANDLE,DWORD,LPCWSTR*); BOOL WINAPI UnlockServiceDatabase(SC_LOCK); #ifdef UNICODE diff --git a/winsup/w32api/include/winver.h b/winsup/w32api/include/winver.h index f20333ac8..913a35561 100644 --- a/winsup/w32api/include/winver.h +++ b/winsup/w32api/include/winver.h @@ -107,8 +107,8 @@ BOOL WINAPI GetFileVersionInfoA(LPSTR,DWORD,DWORD,PVOID); BOOL WINAPI GetFileVersionInfoW(LPWSTR,DWORD,DWORD,PVOID); DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD); DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); -BOOL WINAPI VerQueryValueA(PCVOID,LPSTR,PVOID*,PUINT); -BOOL WINAPI VerQueryValueW(PCVOID,LPWSTR,PVOID*,PUINT); +BOOL WINAPI VerQueryValueA(const LPVOID,LPSTR,LPVOID*,PUINT); +BOOL WINAPI VerQueryValueW(const LPVOID,LPWSTR,LPVOID*,PUINT); #ifdef UNICODE #define VerFindFile VerFindFileW #define VerQueryValue VerQueryValueW