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

A few function prototype fixes.

This commit is contained in:
Marcus Meissner 1998-10-11 11:27:05 +00:00 committed by Alexandre Julliard
parent 8220bc9d7d
commit 7ed9441684
7 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/shell32/shellole.c
View File

@ -77,9 +77,8 @@ static DWORD SH_get_instance(REFCLSID clsid,LPSTR dllname,LPVOID unknownouter,RE
} }
hres = (*dllgetclassob)(clsid,(REFIID)&IID_IClassFactory,&classfac); hres = (*dllgetclassob)(clsid,(REFIID)&IID_IClassFactory,&classfac);
if (hres<0 || (hres>=0x80000000)) if ((hres<0) || (hres>=0x80000000))
{ return hres; return hres;
}
if (!classfac) if (!classfac)
{ FIXME(shell,"no classfactory, but hres is 0x%ld!\n",hres); { FIXME(shell,"no classfactory, but hres is 0x%ld!\n",hres);
return E_FAIL; return E_FAIL;
@ -137,7 +136,7 @@ LRESULT WINAPI SHCoCreateInstance(LPSTR aclsid,CLSID *clsid,LPUNKNOWN unknownout
TRACE(shell, "Threading model is %s\n",tmodel); TRACE(shell, "Threading model is %s\n",tmodel);
hres=SH_get_instance(clsid,path,unknownouter,refiid,inst); hres=SH_get_instance(clsid,path,unknownouter,refiid,inst);
if (hres<0) if (hres<0 || (hres>0x80000000))
{ hres=SH_get_instance(clsid,"shell32.dll",unknownouter,refiid,inst); { hres=SH_get_instance(clsid,"shell32.dll",unknownouter,refiid,inst);
} }
RegCloseKey(inprockey); RegCloseKey(inprockey);

2
include/callback.h
View File

@ -10,7 +10,7 @@
#include "wintypes.h" #include "wintypes.h"
#include "winnt.h" #include "winnt.h"
extern int (*IF1632_CallLargeStack)( int (*func)(), void *arg ); extern int (*IF1632_CallLargeStack)( int (*func)(void), void *arg );
#define CALL_LARGE_STACK(func,arg) \ #define CALL_LARGE_STACK(func,arg) \
(IF1632_CallLargeStack ? \ (IF1632_CallLargeStack ? \

6
include/interfaces.h
View File

@ -103,9 +103,9 @@ struct IMalloc16 {
/* private prototypes for the constructors */ /* private prototypes for the constructors */
#ifdef __WINE__ #ifdef __WINE__
LPUNKNOWN IUnknown_Constructor(); LPUNKNOWN IUnknown_Constructor(void);
LPMALLOC16 IMalloc16_Constructor(); LPMALLOC16 IMalloc16_Constructor(void);
LPMALLOC32 IMalloc32_Constructor(); LPMALLOC32 IMalloc32_Constructor(void);
#endif #endif
HRESULT WINAPI CoGetMalloc32(DWORD, LPMALLOC32*); HRESULT WINAPI CoGetMalloc32(DWORD, LPMALLOC32*);

6
include/shell.h
View File

@ -15,9 +15,9 @@
/**************************************************************************** /****************************************************************************
* shell 16 * shell 16
*/ */
extern void SHELL_LoadRegistry(); extern void SHELL_LoadRegistry(void);
extern void SHELL_SaveRegistry(); extern void SHELL_SaveRegistry(void);
extern void SHELL_Init(); extern void SHELL_Init(void);
/* global functions used from shell32 */ /* global functions used from shell32 */
extern HINSTANCE32 SHELL_FindExecutable(LPCSTR,LPCSTR ,LPSTR); extern HINSTANCE32 SHELL_FindExecutable(LPCSTR,LPCSTR ,LPSTR);

6
include/winreg.h
View File

@ -88,7 +88,7 @@
KEY_CREATE_LINK \ KEY_CREATE_LINK \
) )
void SHELL_Init(); void SHELL_Init(void);
void SHELL_SaveRegistry(); void SHELL_SaveRegistry(void);
void SHELL_LoadRegistry(); void SHELL_LoadRegistry(void);
#endif /* __WINE_WINREG_H */ #endif /* __WINE_WINREG_H */

2
relay32/user32.spec
View File

@ -612,5 +612,5 @@ type win32
608 stdcall GetMonitorInfoW(long ptr) GetMonitorInfo32W 608 stdcall GetMonitorInfoW(long ptr) GetMonitorInfo32W
609 stdcall MonitorFromWindow(long long) MonitorFromPoint 609 stdcall MonitorFromWindow(long long) MonitorFromPoint
610 stdcall MonitorFromRect(ptr long) MonitorFromRect 610 stdcall MonitorFromRect(ptr long) MonitorFromRect
611 stdcall MonitorFromPoint(ptr long) MonitorFromPoint 611 stdcall MonitorFromPoint(long long long) MonitorFromPoint
612 stdcall EnumDisplayMonitors(long ptr ptr long) EnumDisplayMonitors 612 stdcall EnumDisplayMonitors(long ptr ptr long) EnumDisplayMonitors

2
tools/fnt2bdf.c
View File

@ -46,7 +46,7 @@ static char* errorEmpty = "No fonts found.\n";
/* info */ /* info */
void usage() void usage(void)
{ {
printf("Usage: fnt2bdf [-t] [-c charset] [-o basename] [input file]\n"); printf("Usage: fnt2bdf [-t] [-c charset] [-o basename] [input file]\n");
printf(" -c charset\tcharset name for OEM_CHARSET fonts\n"); printf(" -c charset\tcharset name for OEM_CHARSET fonts\n");