Commit bc38d6bf authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard

- Made sure that the files that contains the declarations

of the implementated functions are included. - Corrected mismatching prototypes. - Cleaned up the include section.
parent 12070e1c
......@@ -4,11 +4,17 @@
* Copyright 1998 Alexandre Julliard
*/
#include "config.h"
#include <string.h>
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
#include "wine/unicode.h"
#include "wine/server.h"
#include "wine/unicode.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(win32);
......
......@@ -65,11 +65,6 @@ typedef struct {
#include "poppack.h"
LRESULT VFWAPI ICSendMessage16(HIC16 hic, UINT16 msg, DWORD dw1, DWORD dw2);
HIC16 VFWAPI ICOpen16(DWORD fccType, DWORD fccHangler, UINT16 wMode);
HIC16 VFWAPI ICLocate16(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, WORD wFlags);
typedef struct {
DWORD dwFlags;
LPBITMAPINFOHEADER lpbiIn;
......@@ -81,24 +76,28 @@ typedef struct {
HIC16 hicDecompressor;
} ICDRAWSUGGEST16;
DWORD VFWAPIV ICDrawBegin16(
HIC16 hic,
DWORD dwFlags,/* flags */
HPALETTE16 hpal, /* palette to draw with */
HWND16 hwnd, /* window to draw to */
HDC16 hdc, /* HDC to draw to */
INT16 xDst, /* destination rectangle */
INT16 yDst,
INT16 dxDst,
INT16 dyDst,
LPBITMAPINFOHEADER lpbi, /* format of frame to draw */
INT16 xSrc, /* source rectangle */
INT16 ySrc,
INT16 dxSrc,
INT16 dySrc,
DWORD dwRate, /* frames/second = (dwRate/dwScale) */
DWORD dwScale
);
DWORD VFWAPIV ICDraw16(HIC16,DWORD,LPVOID,LPVOID,DWORD,LONG);
DWORD VFWAPIV ICDrawBegin16(HIC16,DWORD,HPALETTE16,HWND16,HDC16,INT16,
INT16,INT16,INT16,LPBITMAPINFOHEADER,
INT16,INT16,INT16,INT16,DWORD,DWORD);
LRESULT WINAPI ICClose16(HIC16);
DWORD VFWAPIV ICCompress16(HIC16,DWORD,LPBITMAPINFOHEADER,LPVOID,
LPBITMAPINFOHEADER,LPVOID,LPDWORD,
LPDWORD,LONG,DWORD,DWORD,
LPBITMAPINFOHEADER,LPVOID);
DWORD VFWAPIV ICDecompress16(HIC16,DWORD,LPBITMAPINFOHEADER,LPVOID,
LPBITMAPINFOHEADER,LPVOID);
HIC16 VFWAPI ICGetDisplayFormat16(HIC16,LPBITMAPINFOHEADER,
LPBITMAPINFOHEADER,INT16,INT16,
INT16);
LRESULT VFWAPI ICGetInfo16(HIC16,ICINFO16 *,DWORD);
BOOL16 VFWAPI ICInfo16(DWORD,DWORD,ICINFO16 *);
HIC16 VFWAPI ICLocate16(DWORD,DWORD,LPBITMAPINFOHEADER,
LPBITMAPINFOHEADER,WORD);
LRESULT VFWAPIV ICMessage16(void);
HIC16 VFWAPI ICOpen16(DWORD,DWORD,UINT16);
HIC16 VFWAPI ICOpenFunction16(DWORD,DWORD,UINT16,FARPROC16);
LRESULT VFWAPI ICSendMessage16(HIC16,UINT16,DWORD,DWORD);
#ifdef __cplusplus
}
......
......@@ -12,14 +12,16 @@
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/ucontext.h>
#include "wine/exception.h"
#include "winnt.h"
#include "ntddk.h"
#include "winbase.h"
#include "winnt.h"
#include "wine/exception.h"
#include "global.h"
#include "stackframe.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(seh);
......
......@@ -12,6 +12,6 @@ HRESULT WINAPI RunningObjectTableImpl_Initialize();
HRESULT WINAPI RunningObjectTableImpl_UnInitialize();
/* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */
int WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** stringTable);
int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable);
#endif /* __WINE_OLE_COMPOBJ_H */
......@@ -9,16 +9,19 @@
*/
#include <string.h>
#include "debugtools.h"
#include "windef.h"
#include "heap.h"
#include "oleauto.h"
#include "winerror.h"
#include "thread.h"
#include "debugtools.h"
#include "wine/obj_base.h"
#include "wine/obj_oleaut.h"
#include "wine/obj_errorinfo.h"
#include "wine/unicode.h"
#include "heap.h"
#include "thread.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole);
......
......@@ -84,7 +84,7 @@ static HRESULT WINAPI FileMonikerROTDataImpl_GetComparaisonData(IROTData* iface,
/* Local function used by filemoniker implementation */
HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName);
HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* iface);
int WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** tabStr);
int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** tabStr);
/********************************************************************************/
......@@ -1068,7 +1068,7 @@ HRESULT WINAPI FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOth
/******************************************************************************
* DecomposePath (local function)
******************************************************************************/
int WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** stringTable)
int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable)
{
WCHAR bSlash[] = {'\\',0};
WCHAR word[MAX_PATH];
......
......@@ -6,16 +6,21 @@
*
* Copyright 1999 Francis Beaudet
*/
#include "config.h"
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
#include "objbase.h"
#include "ole2.h"
#include "winbase.h"
#include "winerror.h"
#include "debugtools.h"
#include "objbase.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(storage);
......
......@@ -6,10 +6,15 @@
*
*/
#include "config.h"
#include <string.h>
#include "windef.h"
#include "objbase.h"
#include "ole2.h"
#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
#include "debugtools.h"
......
......@@ -5,6 +5,9 @@
* Copyright 1998 David Lee Lambert
* Copyright 2000 Julio Csar Gzquez
*/
#include "config.h"
#include <string.h>
#include <stdio.h>
#include <ctype.h>
......@@ -13,14 +16,16 @@
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/windef16.h"
#include "heap.h"
#include "winver.h"
#include "winnls.h"
#include "winreg.h"
#include "winerror.h"
#include "winuser.h"
#include "winver.h"
#include "wine/winbase16.h"
#include "heap.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole);
......
......@@ -8,16 +8,23 @@
* TODO: Type coercion is implemented in variant.c but not called yet.
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#include "windef.h"
#include "ole.h"
#include "oleauto.h"
#include "winerror.h"
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */
#include "winnls.h" /* for PRIMARYLANGID */
#include "ole.h"
#include "heap.h"
#include "wine/obj_oleaut.h"
#include "heap.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole);
......
......@@ -3,22 +3,28 @@
*
* 1998 Marcus Meissner
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <ctype.h>
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/winbase16.h"
#include "wine/shell16.h"
#include "winerror.h"
#include "dlgs.h"
#include "shellapi.h"
#include "shlobj.h"
#include "debugtools.h"
#include "winreg.h"
#include "shlwapi.h"
#include "windef.h"
#include "winerror.h"
#include "winreg.h"
#include "wine/shell16.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "shell32_main.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(shell);
DECLARE_DEBUG_CHANNEL(exec);
......
......@@ -4,28 +4,31 @@
* 1998 Marcus Meissner
* 1998 Juergen Schmied (jsch) * <juergen.schmied@metronet.de>
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include "dlgs.h"
#include "shellapi.h"
#include "shlobj.h"
#include "shlguid.h"
#include "shlwapi.h"
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winerror.h"
#include "heap.h"
#include "dlgs.h"
#include "debugtools.h"
#include "winreg.h"
#include "authors.h"
#include "shellapi.h"
#include "wine/shell16.h"
#include "wine/undocshell.h"
#include "wine/winuser16.h"
#include "authors.h"
#include "heap.h"
#include "pidl.h"
#include "shell32_main.h"
#include "wine/undocshell.h"
#include "shlobj.h"
#include "shlguid.h"
#include "shlwapi.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(shell);
......
......@@ -6,22 +6,26 @@
*
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include "shlobj.h"
#include "shellapi.h"
#include "shlobj.h"
#include "shlguid.h"
#include "winreg.h"
#include "wine/unicode.h"
#include "winerror.h"
#include "debugtools.h"
#include "wine/undocshell.h"
#include "wine/unicode.h"
#include "shell32_main.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(shell);
DWORD WINAPI SHCLSIDFromStringA (LPSTR clsid, CLSID *id);
DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id);
extern IShellFolder * IShellFolder_Constructor(
IShellFolder * psf,
LPITEMIDLIST pidl);
......@@ -37,9 +41,9 @@ extern HRESULT IFSFolder_Constructor(
* exported by ordinal
*/
LRESULT WINAPI SHCoCreateInstance(
LPSTR aclsid,
LPCSTR aclsid,
REFCLSID clsid,
IUnknown * unknownouter,
LPUNKNOWN unknownouter,
REFIID refiid,
LPVOID *ppv)
{
......@@ -114,7 +118,7 @@ HRESULT WINAPI SHELL32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv
* NOTES
* exported by ordinal
*/
DWORD WINAPI SHCLSIDFromStringA (LPSTR clsid, CLSID *id)
DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id)
{
WCHAR buffer[40];
TRACE("(%p(%s) %p)\n", clsid, clsid, id);
......@@ -489,7 +493,7 @@ HRESULT WINAPI SHCreateDefClassObject(
REFIID riid,
LPVOID* ppv,
LPFNCREATEINSTANCE lpfnCI, /* [in] create instance callback entry */
PLONG pcRefDll, /* [in/out] ref count of the dll */
LPDWORD pcRefDll, /* [in/out] ref count of the dll */
REFIID riidInst) /* [in] optional interface to the instance */
{
TRACE("\n\tIID:\t%s %p %p %p \n\tIIDIns:\t%s\n",
......
/*
Shell Registry Access
*/
#include "config.h"
#include <string.h>
#include <stdio.h>
#include "shellapi.h"
#include "shlobj.h"
#include "winerror.h"
#include "winreg.h"
#include "debugtools.h"
#include "winnls.h"
#include "shellapi.h"
#include "shlobj.h"
#include "shell32_main.h"
#include "wine/undocshell.h"
#include "wine/winbase16.h"
#include "shell32_main.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(shell);
......
......@@ -17,12 +17,14 @@
#include <string.h>
#include "windef.h"
#include "wingdi.h"
#include "winerror.h"
#include "winreg.h"
#include "debugtools.h"
#include "wine/undocshell.h"
#include "wine/winuser16.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(shell);
#define SHELL_MAX_POLICIES 57
......
......@@ -188,7 +188,6 @@ extern LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD dwParam2, BOOL bIs3
extern DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2, BOOL bFrom32);
extern DWORD MCI_SendCommandFrom32(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2);
extern DWORD MCI_SendCommandFrom16(UINT wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2);
extern DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2, UINT size);
void CALLBACK WINE_mmThreadEntryPoint(DWORD _pmt);
......
#ifndef __WINE_WINE_SHELL16_H
#define __WINE_WINE_SHELL16_H
#include "windef.h"
#include "wine/windef16.h"
BOOL16 WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM);
BOOL WINAPI AboutDlgProc(HWND,UINT,WPARAM,LPARAM);
......
......@@ -11,20 +11,24 @@
* have to be changed.
*/
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "windef.h"
#include "winnls.h"
#include "wine/winbase16.h"
#include "wine/unicode.h"
#include "winerror.h"
#include "wine/server.h"
#include "wine/unicode.h"
#include "wine/winbase16.h"
#include "global.h"
#include "instance.h"
#include "stackframe.h"
#include "debugtools.h"
#include "wine/server.h"
DEFAULT_DEBUG_CHANNEL(atom);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment