ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile ole32 with -DSTRICT.

This commit is contained in:
Alexandre Julliard 2002-11-22 04:43:02 +00:00
parent 991fd85d2f
commit 8710a79d54
9 changed files with 82 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ole32/Makefile.in
View File

@ -1,4 +1,4 @@
EXTRADEFS = -D_OLE32_ -DWINE_NO_STRICT
EXTRADEFS = -D_OLE32_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@

5
dlls/ole32/clipboard.c
View File

@ -110,9 +110,9 @@ struct OLEClipbrd
UINT cfDataObj;
/*
* The handle to our ourself
* The handle to ourself
*/
UINT hSelf;
HGLOBAL hSelf;
/*
* Reference count of this object
@ -1779,4 +1779,3 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone
return (*ppenum) ? S_OK : E_OUTOFMEMORY;
}

2
dlls/ole32/compobj.c
View File

@ -220,7 +220,7 @@ static void COMPOBJ_DllList_FreeUnused(int Timeout)
if ( (DllCanUnloadNow != NULL) && (DllCanUnloadNow() == S_OK) ) {
next = curr->next;
TRACE("freeing 0x%08x\n", curr->hLibrary);
TRACE("freeing %p\n", curr->hLibrary);
FreeLibrary(curr->hLibrary);
HeapFree(GetProcessHeap(), 0, curr);

4
dlls/ole32/datacache.c
View File

@ -1580,7 +1580,7 @@ static HRESULT WINAPI DataCache_Draw(
_ICOM_THIS_From_IViewObject2(DataCache, iface);
TRACE("(%p, %lx, %ld, %p, %x, %x, %p, %p, %p, %lx)\n",
TRACE("(%p, %lx, %ld, %p, %p, %p, %p, %p, %p, %lx)\n",
iface,
dwDrawAspect,
lindex,
@ -2035,5 +2035,3 @@ static HRESULT WINAPI DataCache_OnStop(
FIXME("stub\n");
return E_NOTIMPL;
}

17
dlls/ole32/ole2.c
View File

@ -51,6 +51,7 @@ WINE_DECLARE_DEBUG_CHANNEL(accel);
#define HICON_16(h32) (LOWORD(h32))
#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16))
#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16))
/******************************************************************************
* These are static/global variables and internal data structures that the
@ -335,7 +336,7 @@ HRESULT WINAPI RegisterDragDrop(
{
DropTargetNode* dropTargetInfo;
TRACE("(0x%x,%p)\n", hwnd, pDropTarget);
TRACE("(%p,%p)\n", hwnd, pDropTarget);
/*
* First, check if the window is already registered.
@ -387,7 +388,7 @@ HRESULT WINAPI RevokeDragDrop(
{
DropTargetNode* dropTargetInfo;
TRACE("(0x%x)\n", hwnd);
TRACE("(%p)\n", hwnd);
/*
* First, check if the window is already registered.
@ -1370,7 +1371,7 @@ HRESULT WINAPI OleSetMenuDescriptor(
if ( lpFrame || lpActiveObject )
{
FIXME("(%x, %x, %x, %p, %p), Context sensitive help filtering not implemented!\n",
FIXME("(%x, %p, %p, %p, %p), Context sensitive help filtering not implemented!\n",
(unsigned int)hOleMenu,
hwndFrame,
hwndActiveObject,
@ -1437,7 +1438,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
if(!lpMsg) return FALSE;
if (!hAccel || !(lpAccelTbl = (LPACCEL16)LockResource16(HACCEL_16(hAccel))))
{
WARN_(accel)("invalid accel handle=%04x\n", hAccel);
WARN_(accel)("invalid accel handle=%p\n", hAccel);
return FALSE;
}
if((lpMsg->message != WM_KEYDOWN &&
@ -1446,8 +1447,8 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
lpMsg->message != WM_SYSKEYUP &&
lpMsg->message != WM_CHAR)) return FALSE;
TRACE_(accel)("hAccel=%04x, cAccelEntries=%d,"
"msg->hwnd=%04x, msg->message=%04x, wParam=%08x, lParam=%08lx\n",
TRACE_(accel)("hAccel=%p, cAccelEntries=%d,"
"msg->hwnd=%p, msg->message=%04x, wParam=%08x, lParam=%08lx\n",
hAccel, cAccelEntries,
lpMsg->hwnd, lpMsg->message, lpMsg->wParam, lpMsg->lParam);
for(i = 0; i < cAccelEntries; i++)
@ -2243,10 +2244,10 @@ HGLOBAL16 WINAPI OleMetaFilePictFromIconAndLabel16(
HINSTANCE16 hInstance = LoadLibrary16(lpszSourceFile);
/* load the icon at index from lpszSourceFile */
hIcon = HICON_16(LoadIconA(hInstance, (LPCSTR)(DWORD)iIconIndex));
hIcon = HICON_16(LoadIconA(HINSTANCE_32(hInstance), (LPCSTR)(DWORD)iIconIndex));
FreeLibrary16(hInstance);
} else
return (HGLOBAL)NULL;
return 0;
}
hdc = CreateMetaFileA(NULL);

2
dlls/ole32/ole2stubs.c
View File

@ -45,7 +45,7 @@ HRESULT WINAPI OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid,
HRESULT WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat,
UINT uiFlags)
{
FIXME("(%x,%x,%x), stub!\n", hSrc, cfFormat, uiFlags);
FIXME("(%p,%x,%x), stub!\n", hSrc, cfFormat, uiFlags);
return E_NOTIMPL;
}

2
dlls/ole32/ole32_main.c
View File

@ -34,7 +34,7 @@ HINSTANCE OLE32_hInstance = 0;
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
switch(fdwReason) {
case DLL_PROCESS_ATTACH:

12
dlls/ole32/rpc.c
View File

@ -90,11 +90,11 @@ static HRESULT WINAPI
_xread(HANDLE hf, LPVOID ptr, DWORD size) {
DWORD res;
if (!ReadFile(hf,ptr,size,&res,NULL)) {
FIXME("Failed to read from %x, le is %lx\n",hf,GetLastError());
FIXME("Failed to read from %p, le is %lx\n",hf,GetLastError());
return E_FAIL;
}
if (res!=size) {
FIXME("Read only %ld of %ld bytes from %x.\n",res,size,hf);
FIXME("Read only %ld of %ld bytes from %p.\n",res,size,hf);
return E_FAIL;
}
return S_OK;
@ -126,11 +126,11 @@ static HRESULT WINAPI
_xwrite(HANDLE hf, LPVOID ptr, DWORD size) {
DWORD res;
if (!WriteFile(hf,ptr,size,&res,NULL)) {
FIXME("Failed to write to %x, le is %lx\n",hf,GetLastError());
FIXME("Failed to write to %p, le is %lx\n",hf,GetLastError());
return E_FAIL;
}
if (res!=size) {
FIXME("Wrote only %ld of %ld bytes to %x.\n",res,size,hf);
FIXME("Wrote only %ld of %ld bytes to %p.\n",res,size,hf);
return E_FAIL;
}
return S_OK;
@ -441,7 +441,7 @@ PIPE_GetNewPipeBuf(wine_marshal_id *mid, IRpcChannelBuffer **pipebuf) {
NULL,
OPEN_EXISTING,
0,
-1
0
);
if (hPipe == INVALID_HANDLE_VALUE) {
FIXME("Could not open named pipe %s, le is %lx\n",pipefn,GetLastError());
@ -518,7 +518,7 @@ HRESULT create_marshalled_proxy(REFCLSID rclsid, REFIID iid, LPVOID *ppv) {
NULL,
OPEN_EXISTING,
0,
-1
0
);
if (hPipe == INVALID_HANDLE_VALUE) {
if (tries == 1) {

113
dlls/ole32/storage.c
View File

@ -101,44 +101,51 @@ static void _create_istream16(LPSTREAM16 *str);
* Reading OLE compound storage
*/
static BOOL
STORAGE_get_big_block(HFILE hf,int n,BYTE *block) {
assert(n>=-1);
if (-1==_llseek(hf,(n+1)*BIGSIZE,SEEK_SET)) {
WARN(" seek failed (%ld)\n",GetLastError());
return FALSE;
}
assert((n+1)*BIGSIZE==_llseek(hf,0,SEEK_CUR));
if (BIGSIZE!=_lread(hf,block,BIGSIZE)) {
WARN("(block size %d): read didn't read (%ld)\n",n,GetLastError());
assert(0);
return FALSE;
}
return TRUE;
STORAGE_get_big_block(HANDLE hf,int n,BYTE *block)
{
DWORD result;
assert(n>=-1);
if (!SetFilePointer( hf, (n+1)*BIGSIZE, NULL, SEEK_SET ))
{
WARN(" seek failed (%ld)\n",GetLastError());
return FALSE;
}
if (!ReadFile( hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE)
{
WARN("(block size %d): read didn't read (%ld)\n",n,GetLastError());
return FALSE;
}
return TRUE;
}
/******************************************************************************
* STORAGE_put_big_block [INTERNAL]
*/
static BOOL
STORAGE_put_big_block(HFILE hf,int n,BYTE *block) {
assert(n>=-1);
if (-1==_llseek(hf,(n+1)*BIGSIZE,SEEK_SET)) {
WARN(" seek failed (%ld)\n",GetLastError());
return FALSE;
}
assert((n+1)*BIGSIZE==_llseek(hf,0,SEEK_CUR));
if (BIGSIZE!=_lwrite(hf,block,BIGSIZE)) {
WARN(" write failed (%ld)\n",GetLastError());
return FALSE;
}
return TRUE;
STORAGE_put_big_block(HANDLE hf,int n,BYTE *block)
{
DWORD result;
assert(n>=-1);
if (!SetFilePointer( hf, (n+1)*BIGSIZE, NULL, SEEK_SET ))
{
WARN(" seek failed (%ld)\n",GetLastError());
return FALSE;
}
if (!WriteFile( hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE)
{
WARN(" write failed (%ld)\n",GetLastError());
return FALSE;
}
return TRUE;
}
/******************************************************************************
* STORAGE_get_next_big_blocknr [INTERNAL]
*/
static int
STORAGE_get_next_big_blocknr(HFILE hf,int blocknr) {
STORAGE_get_next_big_blocknr(HANDLE hf,int blocknr) {
INT bbs[BIGSIZE/sizeof(INT)];
struct storage_header sth;
@ -157,7 +164,7 @@ STORAGE_get_next_big_blocknr(HFILE hf,int blocknr) {
* STORAGE_get_nth_next_big_blocknr [INTERNAL]
*/
static int
STORAGE_get_nth_next_big_blocknr(HFILE hf,int blocknr,int nr) {
STORAGE_get_nth_next_big_blocknr(HANDLE hf,int blocknr,int nr) {
INT bbs[BIGSIZE/sizeof(INT)];
int lastblock = -1;
struct storage_header sth;
@ -183,7 +190,7 @@ STORAGE_get_nth_next_big_blocknr(HFILE hf,int blocknr,int nr) {
* STORAGE_get_root_pps_entry [Internal]
*/
static BOOL
STORAGE_get_root_pps_entry(HFILE hf,struct storage_pps_entry *pstde) {
STORAGE_get_root_pps_entry(HANDLE hf,struct storage_pps_entry *pstde) {
int blocknr,i;
BYTE block[BIGSIZE];
struct storage_pps_entry *stde=(struct storage_pps_entry*)block;
@ -210,7 +217,7 @@ STORAGE_get_root_pps_entry(HFILE hf,struct storage_pps_entry *pstde) {
* STORAGE_get_small_block [INTERNAL]
*/
static BOOL
STORAGE_get_small_block(HFILE hf,int blocknr,BYTE *sblock) {
STORAGE_get_small_block(HANDLE hf,int blocknr,BYTE *sblock) {
BYTE block[BIGSIZE];
int bigblocknr;
struct storage_pps_entry root;
@ -229,7 +236,7 @@ STORAGE_get_small_block(HFILE hf,int blocknr,BYTE *sblock) {
* STORAGE_put_small_block [INTERNAL]
*/
static BOOL
STORAGE_put_small_block(HFILE hf,int blocknr,BYTE *sblock) {
STORAGE_put_small_block(HANDLE hf,int blocknr,BYTE *sblock) {
BYTE block[BIGSIZE];
int bigblocknr;
struct storage_pps_entry root;
@ -250,7 +257,7 @@ STORAGE_put_small_block(HFILE hf,int blocknr,BYTE *sblock) {
* STORAGE_get_next_small_blocknr [INTERNAL]
*/
static int
STORAGE_get_next_small_blocknr(HFILE hf,int blocknr) {
STORAGE_get_next_small_blocknr(HANDLE hf,int blocknr) {
BYTE block[BIGSIZE];
LPINT sbd = (LPINT)block;
int bigblocknr;
@ -269,7 +276,7 @@ STORAGE_get_next_small_blocknr(HFILE hf,int blocknr) {
* STORAGE_get_nth_next_small_blocknr [INTERNAL]
*/
static int
STORAGE_get_nth_next_small_blocknr(HFILE hf,int blocknr,int nr) {
STORAGE_get_nth_next_small_blocknr(HANDLE hf,int blocknr,int nr) {
int lastblocknr;
BYTE block[BIGSIZE];
LPINT sbd = (LPINT)block;
@ -298,7 +305,7 @@ STORAGE_get_nth_next_small_blocknr(HFILE hf,int blocknr,int nr) {
* STORAGE_get_pps_entry [INTERNAL]
*/
static int
STORAGE_get_pps_entry(HFILE hf,int n,struct storage_pps_entry *pstde) {
STORAGE_get_pps_entry(HANDLE hf,int n,struct storage_pps_entry *pstde) {
int blocknr;
BYTE block[BIGSIZE];
struct storage_pps_entry *stde = (struct storage_pps_entry*)(((LPBYTE)block)+128*(n&3));
@ -318,7 +325,7 @@ STORAGE_get_pps_entry(HFILE hf,int n,struct storage_pps_entry *pstde) {
* STORAGE_put_pps_entry [Internal]
*/
static int
STORAGE_put_pps_entry(HFILE hf,int n,struct storage_pps_entry *pstde) {
STORAGE_put_pps_entry(HANDLE hf,int n,struct storage_pps_entry *pstde) {
int blocknr;
BYTE block[BIGSIZE];
struct storage_pps_entry *stde = (struct storage_pps_entry*)(((LPBYTE)block)+128*(n&3));
@ -339,7 +346,7 @@ STORAGE_put_pps_entry(HFILE hf,int n,struct storage_pps_entry *pstde) {
* STORAGE_look_for_named_pps [Internal]
*/
static int
STORAGE_look_for_named_pps(HFILE hf,int n,LPOLESTR name) {
STORAGE_look_for_named_pps(HANDLE hf,int n,LPOLESTR name) {
struct storage_pps_entry stde;
int ret;
@ -400,13 +407,14 @@ STORAGE_dump_pps_entry(struct storage_pps_entry *stde) {
* STORAGE_init_storage [INTERNAL]
*/
static BOOL
STORAGE_init_storage(HFILE hf) {
STORAGE_init_storage(HANDLE hf) {
BYTE block[BIGSIZE];
LPDWORD bbs;
struct storage_header *sth;
struct storage_pps_entry *stde;
DWORD result;
assert(-1!=_llseek(hf,0,SEEK_SET));
SetFilePointer( hf, 0, NULL, SEEK_SET );
/* block -1 is the storage header */
sth = (struct storage_header*)block;
memcpy(sth->magic,STORAGE_magic,8);
@ -418,13 +426,13 @@ STORAGE_init_storage(HFILE hf) {
sth->sbd_startblock = 0xffffffff;
memset(sth->bbd_list,0xff,sizeof(sth->bbd_list));
sth->bbd_list[0] = 0;
assert(BIGSIZE==_lwrite(hf,block,BIGSIZE));
if (!WriteFile( hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE) return FALSE;
/* block 0 is the big block directory */
bbs=(LPDWORD)block;
memset(block,0xff,sizeof(block)); /* mark all blocks as free */
bbs[0]=STORAGE_CHAINENTRY_ENDOFCHAIN; /* for this block */
bbs[1]=STORAGE_CHAINENTRY_ENDOFCHAIN; /* for directory entry */
assert(BIGSIZE==_lwrite(hf,block,BIGSIZE));
if (!WriteFile( hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE) return FALSE;
/* block 1 is the root directory entry */
memset(block,0x00,sizeof(block));
stde = (struct storage_pps_entry*)block;
@ -437,15 +445,14 @@ STORAGE_init_storage(HFILE hf) {
stde->pps_prev = -1;
stde->pps_sb = 0xffffffff;
stde->pps_size = 0;
assert(BIGSIZE==_lwrite(hf,block,BIGSIZE));
return TRUE;
return (WriteFile( hf, block, BIGSIZE, &result, NULL ) && result == BIGSIZE);
}
/******************************************************************************
* STORAGE_set_big_chain [Internal]
*/
static BOOL
STORAGE_set_big_chain(HFILE hf,int blocknr,INT type) {
STORAGE_set_big_chain(HANDLE hf,int blocknr,INT type) {
BYTE block[BIGSIZE];
LPINT bbd = (LPINT)block;
int nextblocknr,bigblocknr;
@ -473,7 +480,7 @@ STORAGE_set_big_chain(HFILE hf,int blocknr,INT type) {
* STORAGE_set_small_chain [Internal]
*/
static BOOL
STORAGE_set_small_chain(HFILE hf,int blocknr,INT type) {
STORAGE_set_small_chain(HANDLE hf,int blocknr,INT type) {
BYTE block[BIGSIZE];
LPINT sbd = (LPINT)block;
int lastblocknr,nextsmallblocknr,bigblocknr;
@ -506,7 +513,7 @@ STORAGE_set_small_chain(HFILE hf,int blocknr,INT type) {
* STORAGE_get_free_big_blocknr [Internal]
*/
static int
STORAGE_get_free_big_blocknr(HFILE hf) {
STORAGE_get_free_big_blocknr(HANDLE hf) {
BYTE block[BIGSIZE];
LPINT sbd = (LPINT)block;
int lastbigblocknr,i,curblock,bigblocknr;
@ -565,7 +572,7 @@ STORAGE_get_free_big_blocknr(HFILE hf) {
* STORAGE_get_free_small_blocknr [Internal]
*/
static int
STORAGE_get_free_small_blocknr(HFILE hf) {
STORAGE_get_free_small_blocknr(HANDLE hf) {
BYTE block[BIGSIZE];
LPINT sbd = (LPINT)block;
int lastbigblocknr,newblocknr,i,curblock,bigblocknr;
@ -647,7 +654,7 @@ STORAGE_get_free_small_blocknr(HFILE hf) {
* STORAGE_get_free_pps_entry [Internal]
*/
static int
STORAGE_get_free_pps_entry(HFILE hf) {
STORAGE_get_free_pps_entry(HANDLE hf) {
int blocknr,i,curblock,lastblocknr;
BYTE block[BIGSIZE];
struct storage_pps_entry *stde = (struct storage_pps_entry*)block;
@ -693,7 +700,7 @@ typedef struct
SEGPTR thisptr; /* pointer to this struct as segmented */
struct storage_pps_entry stde;
int ppsent;
HFILE hf;
HANDLE hf;
ULARGE_INTEGER offset;
} IStream16Impl;
@ -855,7 +862,7 @@ HRESULT WINAPI IStream16_fnWrite(
BYTE block[BIGSIZE];
ULONG *byteswritten=pcbWrite,xxwritten;
int oldsize,newsize,i,curoffset=0,lastblocknr,blocknr,cc;
HFILE hf = This->hf;
HANDLE hf = This->hf;
if (!pcbWrite) byteswritten=&xxwritten;
*byteswritten = 0;
@ -1184,7 +1191,7 @@ typedef struct
/* IStream32 fields */
struct storage_pps_entry stde;
int ppsent;
HFILE hf;
HANDLE hf;
ULARGE_INTEGER offset;
} IStream32Impl;
@ -1239,7 +1246,7 @@ typedef struct
SEGPTR thisptr; /* pointer to this struct as segmented */
struct storage_pps_entry stde;
int ppsent;
HFILE hf;
HANDLE hf;
} IStorage16Impl;
/******************************************************************************
@ -1344,7 +1351,7 @@ HRESULT WINAPI IStorage16_fnCreateStorage(
int ppsent,x;
struct storage_pps_entry stde;
struct storage_header sth;
HFILE hf=This->hf;
HANDLE hf=This->hf;
READ_HEADER;
@ -1593,7 +1600,7 @@ static void _create_istorage16(LPSTORAGE16 *stg) {
HRESULT WINAPI StgCreateDocFile16(
LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved,IStorage16 **ppstgOpen
) {
HFILE hf;
HANDLE hf;
int i,ret;
IStorage16Impl* lpstg;
struct storage_pps_entry stde;
@ -1653,7 +1660,7 @@ HRESULT WINAPI StgOpenStorage16(
LPCOLESTR16 pwcsName,IStorage16 *pstgPriority,DWORD grfMode,
SNB16 snbExclude,DWORD reserved, IStorage16 **ppstgOpen
) {
HFILE hf;
HANDLE hf;
int ret,i;
IStorage16Impl* lpstg;
struct storage_pps_entry stde;