Skip to content

W
wine-winehq
Commit 4b157457 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard
Browse files
Options

- Made sure that the files that contains the declarations

of the implementated functions are included. - Corrected mismatching prototypes. - Cleaned up the include section.
parent d80b7a07
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 131 deletions
dlls/lzexpand/lzexpand_main.c
View file @ 4b157457
......@@ -7,29 +7,23 @@
* FIXME: return values might be wrong
*/
#include "config.h"
#include <string.h>
#include <ctype.h>
#include <sys/types.h>
#include <unistd.h>
#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "wine/unicode.h"
#include "lzexpand.h"
#include "wine/unicode.h"
#include "wine/winbase16.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(file);
LONG WINAPI CopyLZFile16(HFILE16,HFILE16);
INT16 WINAPI GetExpandedName16(LPCSTR,LPSTR);
void WINAPI LZClose16(HFILE16);
LONG WINAPI LZCopy16(HFILE16,HFILE16);
HFILE16 WINAPI LZInit16(HFILE16);
HFILE16 WINAPI LZOpenFile16(LPCSTR,LPOFSTRUCT,UINT16);
INT16 WINAPI LZRead16(HFILE16,LPVOID,UINT16);
LONG WINAPI LZSeek16(HFILE16,LONG,INT16);
INT16 WINAPI LZStart16(void);
/* The readahead length of the decompressor. Reading single bytes
* using _lread() would be SLOW.
*/
......
dlls/msvcrt/cpp.c
View file @ 4b157457
......@@ -8,12 +8,9 @@
#include "msvcrt/eh.h"
#include "msvcrt/malloc.h"
DEFAULT_DEBUG_CHANNEL(msvcrt);
void _purecall(void);
typedef void (*v_table_ptr)();
static v_table_ptr exception_vtable[2];
......
dlls/msvcrt/exit.c
View file @ 4b157457
......@@ -21,7 +21,6 @@ static int MSVCRT_atexit_table_size = 0;
static int MSVCRT_atexit_registered = 0; /* Points to free slot */
extern int MSVCRT_app_type;
void *MSVCRT_realloc(void *ptr, unsigned int size);
/* INTERNAL: call atexit functions */
void __MSVCRT__call_atexit(void)
......
dlls/msvcrt/mbcs.c
View file @ 4b157457
......@@ -13,6 +13,7 @@
#include "msvcrt/stdlib.h"
#include "msvcrt/string.h"
#include "msvcrt/wctype.h"
DEFAULT_DEBUG_CHANNEL(msvcrt);
......@@ -20,12 +21,6 @@ DEFAULT_DEBUG_CHANNEL(msvcrt);
unsigned char MSVCRT_mbctype[257];
int MSVCRT___mb_cur_max = 1;
int MSVCRT_isleadbyte(int);
char *_strset(char *, int);
char *_strnset(char *, int, unsigned int);
extern unsigned int MSVCRT_current_lc_all_cp;
/*********************************************************************
* __p__mbctype (MSVCRT.@)
*/
......
dlls/msvcrt/msvcrt.h
View file @ 4b157457
......@@ -29,6 +29,9 @@ typedef struct __MSVCRT_thread_data
#define SET_THREAD_VAR(x,y) \
((MSVCRT_thread_data*)TlsGetValue(MSVCRT_tls_index))->x = y
extern int MSVCRT_current_lc_all_cp;
void _purecall(void);
void MSVCRT__set_errno(int);
char* msvcrt_strndup(const char*,unsigned int);
LPWSTR msvcrt_wstrndup(LPCWSTR, unsigned int);
......
dlls/ntdll/signal_i386.c
View file @ 4b157457
......@@ -33,7 +33,9 @@
# include <sys/signal.h>
#endif
#include "ntddk.h"
#include "winnt.h"
#include "selectors.h"
/***********************************************************************
......@@ -1118,13 +1120,11 @@ void __wine_enter_vm86( CONTEXT *context )
/**********************************************************************
* DbgBreakPoint (NTDLL.@)
*/
void WINAPI DbgBreakPoint(void);
__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret");
/**********************************************************************
* DbgUserBreakPoint (NTDLL.@)
*/
void WINAPI DbgUserBreakPoint(void);
__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret");
#endif /* __i386__ */
dlls/ole32/compobj.c
View file @ 4b157457
......@@ -13,26 +13,29 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include "windef.h"
#include "wtypes.h"
#include "objbase.h"
#include "ole2.h"
#include "ole2ver.h"
#include "rpc.h"
#include "wingdi.h"
#include "wine/winbase16.h"
#include "winerror.h"
#include "wownt32.h"
#include "ole2ver.h"
#include "debugtools.h"
#include "heap.h"
#include "winreg.h"
#include "rpc.h"
#include "wownt32.h"
#include "wtypes.h"
#include "wine/obj_base.h"
#include "wine/obj_clientserver.h"
#include "wine/obj_misc.h"
#include "wine/obj_marshal.h"
#include "wine/obj_storage.h"
#include "wine/obj_clientserver.h"
#include "ole.h"
#include "ifs.h"
#include "wine/winbase16.h"
#include "compobj_private.h"
#include "ifs.h"
#include "heap.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole);
......@@ -851,17 +854,17 @@ HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid)
*
* This function read a CLSID from a stream
*/
HRESULT WINAPI ReadClassStm(IStream *pStm,REFCLSID rclsid)
HRESULT WINAPI ReadClassStm(IStream *pStm,CLSID *pclsid)
{
ULONG nbByte;
HRESULT res;
TRACE("(%p,%p)\n",pStm,rclsid);
TRACE("(%p,%p)\n",pStm,pclsid);
if (rclsid==NULL)
if (pclsid==NULL)
return E_INVALIDARG;
res = IStream_Read(pStm,(void*)rclsid,sizeof(CLSID),&nbByte);
res = IStream_Read(pStm,(void*)pclsid,sizeof(CLSID),&nbByte);
if (FAILED(res))
return res;
......@@ -1285,7 +1288,7 @@ HRESULT WINAPI CoResumeClassObjects(void)
*
* This function supplies the CLSID associated with the given filename.
*/
HRESULT WINAPI GetClassFile(LPOLESTR filePathName,CLSID *pclsid)
HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid)
{
IStorage *pstg=0;
HRESULT res;
......
dlls/ole32/ifs.c
View file @ 4b157457
......@@ -4,19 +4,24 @@
* Copyright 1997 Marcus Meissner
*/
#include "config.h"
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "ole2.h"
#include "windef.h"
#include "winerror.h"
#include "heap.h"
#include "wine/winbase16.h"
#include "wine/obj_base.h"
#include "debugtools.h"
#include "ole.h"
#include "wine/obj_base.h"
#include "wine/winbase16.h"
#include "heap.h"
#include "ifs.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(relay);
/* --- IUnknown implementation */
......
dlls/ole32/ifs.h
View file @ 4b157457
#ifndef __WINE_OLE_IFS_H
#define __WINE_OLE_IFS_H
#include "wine/obj_base.h"
/***********************************************************************
* IMalloc16 interface
*/
typedef struct IMalloc16 IMalloc16, *LPMALLOC16;
#define ICOM_INTERFACE IMalloc16
#define IMalloc16_METHODS \
ICOM_METHOD1 (LPVOID, Alloc, DWORD, cb) \
ICOM_METHOD2 (LPVOID, Realloc, LPVOID, pv, DWORD, cb) \
ICOM_VMETHOD1( Free, LPVOID, pv) \
ICOM_METHOD1 (DWORD, GetSize, LPVOID, pv) \
ICOM_METHOD1 (INT16, DidAlloc, LPVOID, pv) \
ICOM_METHOD (LPVOID, HeapMinimize)
#define IMalloc16_IMETHODS \
IUnknown_IMETHODS \
IMalloc16_METHODS
ICOM_DEFINE(IMalloc16,IUnknown)
#undef ICOM_INTERFACE
/*** IUnknown methods ***/
#define IMalloc16_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IMalloc16_AddRef(p) ICOM_CALL (AddRef,p)
#define IMalloc16_Release(p) ICOM_CALL (Release,p)
/*** IMalloc16 methods ***/
#define IMalloc16_Alloc(p,a) ICOM_CALL1(Alloc,p,a)
#define IMalloc16_Realloc(p,a,b) ICOM_CALL2(Realloc,p,a,b)
#define IMalloc16_Free(p,a) ICOM_CALL1(Free,p,a)
#define IMalloc16_GetSize(p,a) ICOM_CALL1(GetSize,p,a)
#define IMalloc16_DidAlloc(p,a) ICOM_CALL1(DidAlloc,p,a)
#define IMalloc16_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
/**********************************************************************/
extern LPMALLOC16 IMalloc16_Constructor();
extern LPMALLOC IMalloc_Constructor();
......
dlls/ole32/ole2.c
View file @ 4b157457
/*
* OLE2 library
*
......@@ -6,27 +7,31 @@
* Copyright 1999 Noel Borthwick
*/
#include "config.h"
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "commctrl.h"
#include "ole2.h"
#include "ole2ver.h"
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "ole2.h"
#include "commctrl.h"
#include "winreg.h"
#include "wine/obj_clientserver.h"
#include "wine/winbase16.h"
#include "wine/wingdi16.h"
#include "wine/winuser16.h"
#include "debugtools.h"
#include "ole2ver.h"
#include "winreg.h"
#include "ole32_main.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole);
DECLARE_DEBUG_CHANNEL(accel);
......
dlls/oleaut32/ole2disp.c
View file @ 4b157457
......@@ -3,18 +3,23 @@
*
* Copyright 1995 Martin von Loewis
*/
#include "config.h"
#include <string.h>
#include "ole2.h"
#include "oleauto.h"
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "wine/windef16.h"
#include "ole2.h"
#include "olectl.h"
#include "oleauto.h"
#include "heap.h"
#include "ole2disp.h"
#include "olectl.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole);
......
dlls/oleaut32/ole2disp.h 0 → 100644
View file @ 4b157457
#ifndef __WINE_OLEAUT32_OLE2DISP_H
#define __WINE_OLEAUT32_OLE2DISP_H
#include "wtypes.h"
BSTR16 WINAPI SysAllocString16(LPCOLESTR16);
BSTR16 WINAPI SysAllocStringLen16(const char*, int);
VOID WINAPI SysFreeString16(BSTR16);
INT16 WINAPI SysReAllocString16(LPBSTR16,LPCOLESTR16);
int WINAPI SysReAllocStringLen16(BSTR16*, const char*, int);
int WINAPI SysStringLen16(BSTR16);
#endif /* !defined(__WINE_OLEAUT32_OLE2DISP_H) */
dlls/oleaut32/typelib.c
View file @ 4b157457
......@@ -41,19 +41,24 @@
*
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#include "winerror.h"
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */
#include "winnls.h" /* for PRIMARYLANGID */
#include "ole.h"
#include "heap.h"
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */
#include "wine/obj_base.h"
#include "debugtools.h"
#include "heap.h"
#include "ole2disp.h"
#include "typelib.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole);
DECLARE_DEBUG_CHANNEL(typelib);
......
dlls/olecli/olecli_main.c
View file @ 4b157457
......@@ -6,10 +6,13 @@
/* At the moment, these are only empty stubs.
*/
#include "config.h"
#include "ole.h"
#include "winbase.h"
#include "wingdi.h"
#include "wtypes.h"
#include "ole.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole);
......
dlls/olesvr/olesvr_main.c
View file @ 4b157457
......@@ -7,10 +7,10 @@
/* At the moment, these are only empty stubs.
*/
#include "winbase.h"
#include "wingdi.h"
#include "wtypes.h"
#include "config.h"
#include "ole.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole);
......
dlls/shell32/shlmenu.c
View file @ 4b157457
......@@ -16,8 +16,8 @@
#include "pidl.h"
BOOL WINAPI FileMenu_DeleteAllItems (HMENU hMenu);
BOOL WINAPI FileMenu_AppendItemA(HMENU hMenu, LPCSTR lpText, UINT uID, int icon, HMENU hMenuPopup, int nItemHeight);
static BOOL FileMenu_AppendItemA(HMENU hMenu, LPCSTR lpText, UINT uID, int icon,
HMENU hMenuPopup, int nItemHeight);
typedef struct
{
......@@ -280,7 +280,7 @@ void WINAPI FileMenu_Destroy (HMENU hmenu)
* FileMenu_AppendItem [SHELL32.115]
*
*/
BOOL WINAPI FileMenu_AppendItemA(
static BOOL FileMenu_AppendItemA(
HMENU hMenu,
LPCSTR lpText,
UINT uID,
......
include/ole.h
View file @ 4b157457
......@@ -257,68 +257,6 @@ typedef struct _OLEOBJECT {
LPOLEOBJECTVTBL lpvtbl;
} OLEOBJECT;
typedef struct IMalloc16 IMalloc16,*LPMALLOC16;
#define ICOM_INTERFACE IMalloc16
#define IMalloc16_METHODS \
ICOM_METHOD1 (LPVOID,Alloc, DWORD,cb) \
ICOM_METHOD2 (LPVOID,Realloc, LPVOID,pv, DWORD,cb) \
ICOM_VMETHOD1( Free, LPVOID,pv) \
ICOM_METHOD1(DWORD, GetSize, LPVOID,pv) \
ICOM_METHOD1(INT16, DidAlloc, LPVOID,pv) \
ICOM_METHOD (LPVOID,HeapMinimize)
#define IMalloc16_IMETHODS \
IUnknown_IMETHODS \
IMalloc16_METHODS
ICOM_DEFINE(IMalloc16,IUnknown)
#undef ICOM_INTERFACE
/*** IUnknown methods ***/
#define IMalloc16_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IMalloc16_AddRef(p) ICOM_CALL (AddRef,p)
#define IMalloc16_Release(p) ICOM_CALL (Release,p)
/*** IMalloc16 methods ***/
#define IMalloc16_Alloc(p,a) ICOM_CALL1(Alloc,p,a)
#define IMalloc16_Realloc(p,a,b) ICOM_CALL2(Realloc,p,a,b)
#define IMalloc16_Free(p,a) ICOM_CALL1(Free,p,a)
#define IMalloc16_GetSize(p,a) ICOM_CALL1(GetSize,p,a)
#define IMalloc16_DidAlloc(p,a) ICOM_CALL1(DidAlloc,p,a)
#define IMalloc16_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext, LPMALLOC16* lpMalloc);
HRESULT WINAPI CoGetMalloc16(DWORD dwMemContext,LPMALLOC16* lpMalloc);
HRESULT WINAPI CoInitialize16(LPVOID lpReserved);
HRESULT WINAPI CoLockObjectExternal16(LPUNKNOWN,BOOL16,BOOL16);
HRESULT WINAPI CoRegisterClassObject16(REFCLSID,LPUNKNOWN,DWORD,DWORD,LPDWORD);
void WINAPI CoUninitialize16(void);
HRESULT WINAPI DoDragDrop16(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
OLESTATUS WINAPI OleRegisterServer16(LPCSTR,LPOLESERVER,LHSERVER *,HINSTANCE16,OLE_SERVER_USE);
OLESTATUS WINAPI OleUnblockServer16(LHSERVER,BOOL16 *);
OLESTATUS WINAPI OleRegisterServerDoc16(LHSERVER,LPCSTR,LPOLESERVERDOC,LHSERVERDOC *);
OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR,LPCSTR,LONG,LHCLIENTDOC *);
OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC,LPCSTR);
OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC);
OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC);
OLESTATUS WINAPI OleRevokeServer16(LHSERVER);
OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc);
OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data);
OLESTATUS WINAPI OleCreateLinkFromClip16(LPCSTR,SEGPTR,LHCLIENTDOC,LPCSTR,SEGPTR,UINT16,UINT16);
OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat);
OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat);
OLESTATUS WINAPI OleQueryType16(LPOLEOBJECT oleob, SEGPTR xlong);
OLESTATUS WINAPI OleCreateFromClip16(LPCSTR,SEGPTR,LHCLIENTDOC,LPCSTR,SEGPTR,UINT16,UINT16);
HRESULT WINAPI RegisterDragDrop16(HWND16,LPDROPTARGET);
HRESULT WINAPI RevokeDragDrop16(HWND16);
BSTR16 WINAPI SysAllocString16(LPCOLESTR16);
INT16 WINAPI SysReAllocString16(LPBSTR16,LPCOLESTR16);
VOID WINAPI SysFreeString16(BSTR16);
BSTR16 WINAPI SysAllocStringLen16(const char*, int);
int WINAPI SysReAllocStringLen16(BSTR16*, const char*, int);
int WINAPI SysStringLen16(BSTR16);
#ifdef __cplusplus
} /*extern*/
#endif
......
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