ole32: Small cleanups.
This commit is contained in:
parent
1a80cb87cb
commit
49ff182fc4
|
@ -80,11 +80,6 @@
|
|||
|
||||
#define HANDLE_ERROR(err) { hr = err; TRACE("(HRESULT=%lx)\n", (HRESULT)err); goto CLEANUP; }
|
||||
|
||||
/* For CoGetMalloc (MEMCTX_TASK is currently ignored) */
|
||||
#ifndef MEMCTX_TASK
|
||||
# define MEMCTX_TASK -1
|
||||
#endif
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||
|
||||
/****************************************************************************
|
||||
|
@ -178,7 +173,7 @@ static OLEClipbrd* OLEClipbrd_Construct(void);
|
|||
static void OLEClipbrd_Destroy(OLEClipbrd* ptrToDestroy);
|
||||
static HWND OLEClipbrd_CreateWindow(void);
|
||||
static void OLEClipbrd_DestroyWindow(HWND hwnd);
|
||||
LRESULT CALLBACK OLEClipbrd_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
static LRESULT CALLBACK OLEClipbrd_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
static HRESULT OLEClipbrd_RenderFormat( IDataObject *pIDataObject, LPFORMATETC pFormatetc );
|
||||
static HGLOBAL OLEClipbrd_GlobalDupMem( HGLOBAL hGlobalSrc );
|
||||
|
||||
|
@ -283,7 +278,7 @@ static const IEnumFORMATETCVtbl efvt =
|
|||
/*
|
||||
* Name of our registered OLE clipboard window class
|
||||
*/
|
||||
CHAR OLEClipbrd_WNDCLASS[] = "CLIPBRDWNDCLASS";
|
||||
static const CHAR OLEClipbrd_WNDCLASS[] = "CLIPBRDWNDCLASS";
|
||||
|
||||
/*
|
||||
* If we need to store state info we can store it here.
|
||||
|
@ -487,7 +482,7 @@ HRESULT WINAPI OleGetClipboard(IDataObject** ppDataObj)
|
|||
* data object exposed through OleGetClipboard must convert this TYMED_HGLOBAL
|
||||
* back to TYMED_IStorage.
|
||||
*/
|
||||
HRESULT WINAPI OleFlushClipboard()
|
||||
HRESULT WINAPI OleFlushClipboard(void)
|
||||
{
|
||||
IEnumFORMATETC* penumFormatetc = NULL;
|
||||
FORMATETC rgelt;
|
||||
|
@ -577,7 +572,7 @@ CLEANUP:
|
|||
/***********************************************************************
|
||||
* OleIsCurrentClipboard [OLE32.@]
|
||||
*/
|
||||
HRESULT WINAPI OleIsCurrentClipboard ( IDataObject *pDataObject)
|
||||
HRESULT WINAPI OleIsCurrentClipboard(IDataObject *pDataObject)
|
||||
{
|
||||
TRACE("()\n");
|
||||
/*
|
||||
|
@ -638,7 +633,7 @@ void OLEClipbrd_UnInitialize(void)
|
|||
/*********************************************************
|
||||
* Construct the OLEClipbrd class.
|
||||
*/
|
||||
static OLEClipbrd* OLEClipbrd_Construct()
|
||||
static OLEClipbrd* OLEClipbrd_Construct(void)
|
||||
{
|
||||
OLEClipbrd* newObject = NULL;
|
||||
HGLOBAL hNewObject = 0;
|
||||
|
@ -711,7 +706,7 @@ static void OLEClipbrd_Destroy(OLEClipbrd* ptrToDestroy)
|
|||
* OLEClipbrd_CreateWindow()
|
||||
* Create the clipboard window
|
||||
*/
|
||||
static HWND OLEClipbrd_CreateWindow()
|
||||
static HWND OLEClipbrd_CreateWindow(void)
|
||||
{
|
||||
HWND hwnd = 0;
|
||||
WNDCLASSEXA wcex;
|
||||
|
@ -776,7 +771,7 @@ static void OLEClipbrd_DestroyWindow(HWND hwnd)
|
|||
* has been placed in the clipboard via OleSetClipboard().
|
||||
* i.e. Only when OLE owns the windows clipboard.
|
||||
*/
|
||||
LRESULT CALLBACK OLEClipbrd_WndProc
|
||||
static LRESULT CALLBACK OLEClipbrd_WndProc
|
||||
(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (message)
|
||||
|
@ -1559,7 +1554,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumDAdvise(
|
|||
* NOTE: this does not AddRef the interface.
|
||||
*/
|
||||
|
||||
LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[],
|
||||
static LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC afmt[],
|
||||
LPUNKNOWN pUnkDataObj)
|
||||
{
|
||||
IEnumFORMATETCImpl* ef;
|
||||
|
|
Loading…
Reference in New Issue