From 85ecb9953495cc5241421f63e2a0a50ffbacfed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Wed, 25 Apr 2007 08:18:48 +0000 Subject: [PATCH] Fix some prototypes, prepare Wine sync of msvfw32 svn path=/trunk/; revision=26491 --- reactos/include/psdk/commctrl.h | 6 +++--- reactos/include/psdk/vfw.h | 9 +++++++++ reactos/media/doc/README.WINE | 2 +- reactos/tools/rgenstat/module_list.txt | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/reactos/include/psdk/commctrl.h b/reactos/include/psdk/commctrl.h index 8f6c4585a8d..3526709040d 100644 --- a/reactos/include/psdk/commctrl.h +++ b/reactos/include/psdk/commctrl.h @@ -28,7 +28,7 @@ extern "C" { #endif BOOL WINAPI ShowHideMenuCtl (HWND, UINT_PTR, LPINT); -VOID WINAPI GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo); +VOID WINAPI GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, const INT *lpInfo); VOID WINAPI InitCommonControls (VOID); typedef struct tagINITCOMMONCONTROLSEX { @@ -344,8 +344,8 @@ static const WCHAR STATUSCLASSNAMEW[] = { 'm','s','c','t','l','s','_', HWND WINAPI CreateStatusWindowA (LONG, LPCSTR, HWND, UINT); HWND WINAPI CreateStatusWindowW (LONG, LPCWSTR, HWND, UINT); #define CreateStatusWindow WINELIB_NAME_AW(CreateStatusWindow) -void WINAPI DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style); -void WINAPI DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style); +void WINAPI DrawStatusTextA (HDC hdc, LPCRECT lprc, LPCSTR text, UINT style); +void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style); #define DrawStatusText WINELIB_NAME_AW(DrawStatusText) VOID WINAPI MenuHelp (UINT, WPARAM, LPARAM, HMENU, HINSTANCE, HWND, UINT*); diff --git a/reactos/include/psdk/vfw.h b/reactos/include/psdk/vfw.h index f28d143141b..2558af9e982 100644 --- a/reactos/include/psdk/vfw.h +++ b/reactos/include/psdk/vfw.h @@ -378,6 +378,15 @@ DECLARE_HANDLE(HIC); DECLARE_HANDLE(HDRAWDIB); typedef WORD TWOCC; typedef BOOL (CALLBACK *AVISAVECALLBACK)(INT); +typedef struct { + LONG timeCount; + LONG timeDraw; + LONG timeDecompress; + LONG timeDither; + LONG timeStretch; + LONG timeBlt; + LONG timeSetDIBits; +} DRAWDIBTIME, *LPDRAWDIBTIME; typedef struct { DWORD dwSize; DWORD fccType; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 8a55b56533a..67186e09896 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -56,7 +56,7 @@ reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm # Out of sync reactos/dll/win32/msimg32 # Autosync reactos/dll/win32/msi # Autosync -reactos/dll/win32/msvideo # Out of sync +reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/netapi32 # Synced to Wine-0_9_5 reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. diff --git a/reactos/tools/rgenstat/module_list.txt b/reactos/tools/rgenstat/module_list.txt index 8cca6d33786..983d5cab726 100644 --- a/reactos/tools/rgenstat/module_list.txt +++ b/reactos/tools/rgenstat/module_list.txt @@ -82,7 +82,7 @@ msi dll\win32\msi msimg32 dll\win32\msimg32 msvcrt dll\win32\msvcrt msvcrt20 dll\win32\msvcrt20 -msvfw32 dll\win32\msvideo +msvfw32 dll\win32\msvfw32 mswsock dll\win32\mswsock netapi32 dll\win32\netapi32 netcfgx dll\win32\netcfgx