From 326e2ba5a112d8e2dfc0d25cf69a6d8ebbbd9597 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 18 Jun 2000 17:26:44 +0000 Subject: [PATCH] Added some missing prototypes. Define the HDRAWDIB handle type. --- dlls/msvideo/msvideo_main.c | 12 ++++++------ include/ddeml.h | 3 +++ include/vfw.h | 9 ++++++++- include/winbase.h | 25 ++++++++++++++++++++++++- include/winuser.h | 6 ++++++ tools/winapi_check/win32/msvfw32.api | 1 + tools/winapi_check/win32/user32.api | 1 + windows/user.c | 4 ++-- 8 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 64ce1167708..4404fa70631 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -421,7 +421,7 @@ LRESULT WINAPI ICClose(HIC hic) { /*********************************************************************** * DrawDibOpen [MSVFW.10] */ -HANDLE /* HDRAWDIB */ WINAPI +HDRAWDIB VFWAPI DrawDibOpen( void ) { FIXME("stub!\n"); return 0xdead; @@ -430,8 +430,8 @@ DrawDibOpen( void ) { /*********************************************************************** * DrawDibClose [MSVFW.5] */ -BOOL WINAPI -DrawDibClose( HANDLE /*HDRAWDIB*/ hDib ) { +BOOL VFWAPI +DrawDibClose( HDRAWDIB hDib ) { FIXME("stub!\n"); return TRUE; } @@ -439,7 +439,7 @@ DrawDibClose( HANDLE /*HDRAWDIB*/ hDib ) { /*********************************************************************** * DrawDibBegin [MSVFW.3] */ -BOOL VFWAPI DrawDibBegin(HANDLE /*HDRAWDIB*/ hdd, +BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd, HDC hdc, INT dxDst, INT dyDst, @@ -458,7 +458,7 @@ BOOL VFWAPI DrawDibBegin(HANDLE /*HDRAWDIB*/ hdd, * DrawDibSetPalette [MSVFW.13] */ BOOL VFWAPI -DrawDibSetPalette(HANDLE /*HDRAWDIB*/ hdd, HPALETTE hpal) { +DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal) { FIXME("(%d,%d),stub!\n",hdd,hpal); return TRUE; } @@ -466,7 +466,7 @@ DrawDibSetPalette(HANDLE /*HDRAWDIB*/ hdd, HPALETTE hpal) { /*********************************************************************** * DrawDibRealize [MSVFW.12] */ -UINT VFWAPI DrawDibRealize(HANDLE /*HDRAWDIB*/ hdd, HDC hdc, BOOL fBackground) { +UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) { FIXME("(0x%08lx,0x%08lx,%d),stub!\n",(DWORD)hdd,(DWORD)hdc,fBackground); return 0; } diff --git a/include/ddeml.h b/include/ddeml.h index 1a9dc3f959a..18c183f614d 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -328,10 +328,12 @@ HDDEDATA WINAPI DdeClientTransaction16(LPVOID,DWORD,HCONV,HSZ,UINT16, UINT16,DWORD,LPDWORD); HDDEDATA WINAPI DdeClientTransaction(LPBYTE,DWORD,HCONV,HSZ,UINT, UINT,DWORD,LPDWORD); +BOOL WINAPI DdeImpersonateClient(HCONV); BOOL16 WINAPI DdeAbandonTransaction16(DWORD,HCONV,DWORD); BOOL16 WINAPI DdePostAdvise16(DWORD,HSZ,HSZ); BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ); HDDEDATA WINAPI DdeAddData16(HDDEDATA,LPBYTE,DWORD,DWORD); +HDDEDATA WINAPI DdeAddData(HDDEDATA,LPBYTE,DWORD,DWORD); DWORD WINAPI DdeGetData(HDDEDATA,LPBYTE,DWORD,DWORD); LPBYTE WINAPI DdeAccessData16(HDDEDATA,LPDWORD); LPBYTE WINAPI DdeAccessData(HDDEDATA,LPDWORD); @@ -341,6 +343,7 @@ BOOL16 WINAPI DdeEnableCallback16(DWORD,HCONV,UINT16); BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT); INT16 WINAPI DdeCmpStringHandles16(HSZ,HSZ); INT WINAPI DdeCmpStringHandles(HSZ,HSZ); +BOOL WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD); HDDEDATA WINAPI DdeNameService16(DWORD,HSZ,HSZ,UINT16); HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT); diff --git a/include/vfw.h b/include/vfw.h index 4d1b50de901..e51fdd7cdcd 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -10,7 +10,14 @@ #define VFWAPI WINAPI #define VFWAPIV WINAPIV -DWORD VFWAPI VideoForWindowsVersion(void); +typedef HANDLE HDRAWDIB; + +BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd, HDC hdc, INT dxDest, INT dyDest, LPBITMAPINFOHEADER lpbi, INT dxSrc, INT dySrc, UINT wFlags); +BOOL VFWAPI DrawDibClose(HDRAWDIB hdd); +HDRAWDIB VFWAPI DrawDibOpen(void); +UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground); +BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal); +DWORD VFWAPI VideoForWindowsVersion(void); #ifndef mmioFOURCC #define mmioFOURCC( ch0, ch1, ch2, ch3 ) \ diff --git a/include/winbase.h b/include/winbase.h index 8c0e23a197b..654fe610a36 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1234,6 +1234,8 @@ BOOL16 WINAPI SetWinDebugInfo16(LPWINDEBUGINFO); /* Declarations for functions that exist only in Win32 */ +BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); +BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); BOOL WINAPI AttachThreadInput(DWORD,DWORD,BOOL); BOOL WINAPI AccessCheck(PSECURITY_DESCRIPTOR,HANDLE,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,LPVOID,DWORD,LPVOID,LPDWORD); @@ -1244,6 +1246,9 @@ BOOL WINAPI AreFileApisANSI(void); BOOL WINAPI BackupEventLogA(HANDLE,LPCSTR); BOOL WINAPI BackupEventLogW(HANDLE,LPCWSTR); #define BackupEventLog WINELIB_NAME_AW(BackupEventLog) +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); BOOL WINAPI BuildCommDCBA(LPCSTR,LPDCB); BOOL WINAPI BuildCommDCBW(LPCWSTR,LPDCB); @@ -1298,6 +1303,7 @@ BOOL WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES, HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR); HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR); #define CreateSemaphore WINELIB_NAME_AW(CreateSemaphore) +DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); @@ -1335,6 +1341,7 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW lpTimeFmtEnumProc, LCID Loca #define EnumTimeFormats WINELIB_NAME_AW(EnumTimeFormats) BOOL WINAPI EqualSid(PSID, PSID); BOOL WINAPI EqualPrefixSid(PSID,PSID); +DWORD WINAPI EraseTape(HANDLE,DWORD,BOOL); VOID WINAPI ExitProcess(DWORD) WINE_NORETURN; VOID WINAPI ExitThread(DWORD) WINE_NORETURN; DWORD WINAPI ExpandEnvironmentStringsA(LPCSTR,LPSTR,DWORD); @@ -1363,6 +1370,7 @@ BOOL WINAPI FreeConsole(void); BOOL WINAPI FreeEnvironmentStringsA(LPSTR); BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); #define FreeEnvironmentStrings WINELIB_NAME_AW(FreeEnvironmentStrings) +VOID WINAPI FreeLibraryAndExitThread(HINSTANCE,DWORD); PVOID WINAPI FreeSid(PSID); UINT WINAPI GetACP(void); BOOL WINAPI GetCommConfig(HANDLE,LPCOMMCONFIG); @@ -1423,6 +1431,7 @@ BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); UINT WINAPI GetOEMCP(void); BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); DWORD WINAPI GetPriorityClass(HANDLE); +BOOL WINAPI GetProcessTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME); DWORD WINAPI GetProcessVersion(DWORD); BOOL WINAPI GetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR_CONTROL,LPDWORD); BOOL WINAPI GetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,LPBOOL,PACL *,LPBOOL); @@ -1445,6 +1454,9 @@ VOID WINAPI GetSystemInfo(LPSYSTEM_INFO); BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS); VOID WINAPI GetSystemTime(LPSYSTEMTIME); VOID WINAPI GetSystemTimeAsFileTime(LPFILETIME); +DWORD WINAPI GetTapeParameters(HANDLE,DWORD,LPDWORD,LPVOID); +DWORD WINAPI GetTapePosition(HANDLE,DWORD,LPDWORD,LPDWORD,LPDWORD); +DWORD WINAPI GetTapeStatus(HANDLE); INT WINAPI GetTimeFormatA(LCID,DWORD,LPSYSTEMTIME,LPCSTR,LPSTR,INT); INT WINAPI GetTimeFormatW(LCID,DWORD,LPSYSTEMTIME,LPCWSTR,LPWSTR,INT); #define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat) @@ -1469,6 +1481,8 @@ DWORD WINAPI HeapSize(HANDLE,DWORD,LPVOID); BOOL WINAPI HeapUnlock(HANDLE); BOOL WINAPI HeapValidate(HANDLE,DWORD,LPCVOID); BOOL WINAPI HeapWalk(HANDLE,LPPROCESS_HEAP_ENTRY); +DWORD WINAPI InitializeAcl(PACL,DWORD,DWORD); +BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); BOOL WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); BOOL WINAPI IsTextUnicode(CONST LPVOID lpBuffer, int cb, LPINT lpi); BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR); @@ -1526,12 +1540,14 @@ BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE); HANDLE WINAPI OpenWaitableTimerA(DWORD,BOOL,LPCSTR); HANDLE WINAPI OpenWaitableTimerW(DWORD,BOOL,LPCWSTR); #define OpenWaitableTimer WINELIB_NAME_AW(OpenWaitableTimer) +DWORD WINAPI PrepareTape(HANDLE,DWORD,BOOL); BOOL WINAPI PulseEvent(HANDLE); BOOL WINAPI PurgeComm(HANDLE,DWORD); DWORD WINAPI QueryDosDeviceA(LPCSTR,LPSTR,DWORD); DWORD WINAPI QueryDosDeviceW(LPCWSTR,LPWSTR,DWORD); #define QueryDosDevice WINELIB_NAME_AW(QueryDosDevice) -BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER); +BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER*); +BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER*); BOOL WINAPI ReadConsoleA(HANDLE,LPVOID,DWORD,LPDWORD,LPVOID); BOOL WINAPI ReadConsoleW(HANDLE,LPVOID,DWORD,LPDWORD,LPVOID); #define ReadConsole WINELIB_NAME_AW(ReadConsole) @@ -1580,6 +1596,7 @@ BOOL WINAPI SetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCR #define SetFileSecurity WINELIB_NAME_AW(SetFileSecurity) BOOL WINAPI SetFileTime(HANDLE,const FILETIME*,const FILETIME*,const FILETIME*); BOOL WINAPI SetHandleInformation(HANDLE,DWORD,DWORD); +BOOL WINAPI SetKernelObjectSecurity(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); BOOL WINAPI SetPriorityClass(HANDLE,DWORD); BOOL WINAPI SetLocalTime(const SYSTEMTIME*); BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL); @@ -1589,10 +1606,13 @@ BOOL WINAPI SetSecurityDescriptorSacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL BOOL WINAPI SetStdHandle(DWORD,HANDLE); BOOL WINAPI SetSystemPowerState(BOOL,BOOL); BOOL WINAPI SetSystemTime(const SYSTEMTIME*); +DWORD WINAPI SetTapeParameters(HANDLE,DWORD,LPVOID); +DWORD WINAPI SetTapePosition(HANDLE,DWORD,DWORD,DWORD,DWORD,BOOL); DWORD WINAPI SetThreadAffinityMask(HANDLE,DWORD); BOOL WINAPI SetThreadContext(HANDLE,const CONTEXT *); BOOL WINAPI SetThreadLocale(LCID); BOOL WINAPI SetThreadPriority(HANDLE,INT); +BOOL WINAPI SetThreadToken(PHANDLE,HANDLE); BOOL WINAPI SetTimeZoneInformation(const LPTIME_ZONE_INFORMATION); BOOL WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,BOOL); BOOL WINAPI SetupComm(HANDLE,DWORD,DWORD); @@ -1626,6 +1646,8 @@ BOOL WINAPI WriteConsoleA(HANDLE,LPCVOID,DWORD,LPDWORD,LPVOID); BOOL WINAPI WriteConsoleW(HANDLE,LPCVOID,DWORD,LPDWORD,LPVOID); #define WriteConsole WINELIB_NAME_AW(WriteConsole) BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED); +BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); +DWORD WINAPI WriteTapemark(HANDLE,DWORD,DWORD,BOOL); LANGID WINAPI GetSystemDefaultLangID(void); LCID WINAPI GetSystemDefaultLCID(void); LANGID WINAPI GetUserDefaultLangID(void); @@ -1829,6 +1851,7 @@ BOOL WINAPI SetVolumeLabelA(LPCSTR,LPCSTR); BOOL WINAPI SetVolumeLabelW(LPCWSTR,LPCWSTR); #define SetVolumeLabel WINELIB_NAME_AW(SetVolumeLabel) DWORD WINAPI SizeofResource(HMODULE,HRSRC); +BOOL WINAPI UnlockFileEx(HFILE,DWORD,DWORD,DWORD,LPOVERLAPPED); #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) BOOL WINAPI WritePrivateProfileSectionA(LPCSTR,LPCSTR,LPCSTR); BOOL WINAPI WritePrivateProfileSectionW(LPCWSTR,LPCWSTR,LPCWSTR); diff --git a/include/winuser.h b/include/winuser.h index 9c31a8d959a..4bd2b483c5b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3173,7 +3173,9 @@ BOOL WINAPI ClearCommBreak(HANDLE); BOOL WINAPI ClientToScreen(HWND,LPPOINT); BOOL WINAPI ClipCursor(const RECT*); BOOL WINAPI CloseClipboard(void); +BOOL WINAPI CloseDesktop(HDESK); BOOL WINAPI CloseWindow(HWND); +BOOL WINAPI CloseWindowStation(HWINSTA); #define CopyCursor(cur) ((HCURSOR)CopyIcon((HICON)(cur))) HICON WINAPI CopyIcon(HICON); HICON WINAPI CopyImage(HANDLE,UINT,INT,INT,UINT); @@ -3413,6 +3415,9 @@ DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,INT,INT,const INT*); HWND WINAPI GetTopWindow(HWND); BOOL WINAPI GetUpdateRect(HWND,LPRECT,BOOL); INT WINAPI GetUpdateRgn(HWND,HRGN,BOOL); +BOOL WINAPI GetUserObjectInformationA(HANDLE,INT,LPVOID,DWORD,LPDWORD); +BOOL WINAPI GetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD,LPDWORD); +#define GetUserObjectInformation WINELIB_NAME_AW(GetUserObjectInformation) HWND WINAPI GetWindow(HWND,WORD); HDC WINAPI GetWindowDC(HWND); LONG WINAPI GetWindowLongA(HWND,INT); @@ -3618,6 +3623,7 @@ BOOL WINAPI SetMenuContextHelpId(HMENU,DWORD); BOOL WINAPI SetMenuItemBitmaps(HMENU,UINT,UINT,HBITMAP,HBITMAP); BOOL WINAPI SetMessageQueue(INT); BOOL WINAPI SetProcessDefaultLayout(DWORD); +BOOL WINAPI SetProcessWindowStation(HWINSTA); HWND WINAPI SetParent(HWND,HWND); BOOL WINAPI SetPropA(HWND,LPCSTR,HANDLE); BOOL WINAPI SetPropW(HWND,LPCWSTR,HANDLE); diff --git a/tools/winapi_check/win32/msvfw32.api b/tools/winapi_check/win32/msvfw32.api index 1fac0410379..2eae17dd04e 100644 --- a/tools/winapi_check/win32/msvfw32.api +++ b/tools/winapi_check/win32/msvfw32.api @@ -7,6 +7,7 @@ HDC HIC HINSTANCE HPALETTE +HDRAWDIB HWND INT LONG diff --git a/tools/winapi_check/win32/user32.api b/tools/winapi_check/win32/user32.api index 20c8cfd20af..b352063874a 100644 --- a/tools/winapi_check/win32/user32.api +++ b/tools/winapi_check/win32/user32.api @@ -104,6 +104,7 @@ PROPENUMPROCEXA PROPENUMPROCEXW PROPENUMPROCW PSECURITY_DESCRIPTOR +PSECURITY_INFORMATION PSECURITY_QUALITY_OF_SERVICE RECT * SCROLLINFO * diff --git a/windows/user.c b/windows/user.c index e77f20c64cb..aa0daea1fb0 100644 --- a/windows/user.c +++ b/windows/user.c @@ -582,7 +582,7 @@ BOOL WINAPI SetProcessWindowStation(HWINSTA hWinSta) { */ BOOL WINAPI SetUserObjectSecurity( HANDLE hObj, - /*LPSECURITY_INFORMATION*/LPVOID pSIRequested, + PSECURITY_INFORMATION pSIRequested, PSECURITY_DESCRIPTOR pSID ) { FIXME_(win32)("(0x%08x,%p,%p),stub!\n",hObj,pSIRequested,pSID); @@ -661,7 +661,7 @@ BOOL WINAPI GetUserObjectInformationW( HANDLE hObj, INT nIndex, LPVOID pvInfo, D /*********************************************************************** * GetUserObjectSecurity (USER32.300) */ -BOOL WINAPI GetUserObjectSecurity(HANDLE hObj, SECURITY_INFORMATION * pSIRequested, +BOOL WINAPI GetUserObjectSecurity(HANDLE hObj, PSECURITY_INFORMATION pSIRequested, PSECURITY_DESCRIPTOR pSID, DWORD nLength, LPDWORD lpnLengthNeeded) { FIXME_(win32)("(0x%x %p %p len=%ld %p),stub!\n", hObj, pSIRequested, pSID, nLength, lpnLengthNeeded); return TRUE;