marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some ANSI C violations.

oldstable
Patrik Stridvall 2000-03-24 20:42:08 +00:00 committed by Alexandre Julliard
parent 205721e724
commit d628f43693
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ntdll/signal_i386.c
View File

@ -579,7 +579,7 @@ static HANDLER_DEF(trap_handler)
context.EFlags &= ~0x100; /* clear single-step flag */
break;
case T_BPTFLT: /* Breakpoint exception */
rec.ExceptionAddress--; /* back up over the int3 instruction */
rec.ExceptionAddress = (char *) rec.ExceptionAddress - 1; /* back up over the int3 instruction */
/* fall through */
default:
rec.ExceptionCode = EXCEPTION_BREAKPOINT;
@ -732,11 +732,13 @@ BOOL SIGNAL_Init(void)
/**********************************************************************
* DbgBreakPoint (NTDLL)
*/
__ASM_GLOBAL_FUNC( DbgBreakPoint, "int3; ret");
void WINAPI DbgBreakPoint(void);
__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret");
/**********************************************************************
* DbgUserBreakPoint (NTDLL)
*/
__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int3; ret");
void WINAPI DbgUserBreakPoint(void);
__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret");
#endif /* __i386__ */

8
dlls/ole32/storage32.c
View File

@ -49,7 +49,7 @@ typedef struct
DWORD dwOleObjFileNameLength;
DWORD dwMetaFileWidth;
DWORD dwMetaFileHeight;
CHAR strUnknown[8]; //don't know what is this 8 byts information in OLE stream.
CHAR strUnknown[8]; /* don't know what is this 8 byts information in OLE stream. */
DWORD dwDataLength;
BYTE *pData;
}OLECONVERT_OLESTREAM_DATA;
@ -6004,7 +6004,7 @@ HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA *
}
if(hRes == S_OK)
{
if(pData->dwOleObjFileNameLength < 1) //there is no file name exist
if(pData->dwOleObjFileNameLength < 1) /* there is no file name exist */
pData->dwOleObjFileNameLength = sizeof(pData->dwOleObjFileNameLength);
pData->pstrOleObjFileName = (CHAR *)malloc(pData->dwOleObjFileNameLength);
if(pData->pstrOleObjFileName)
@ -6047,9 +6047,9 @@ HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA *
}
}
if(hRes == S_OK) // I don't know what is this 8 byts information is we have to figure out
if(hRes == S_OK) /* I don't know what is this 8 byts information is we have to figure out */
{
if(!bStrem1) //if it is a second OLE stream data
if(!bStrem1) /* if it is a second OLE stream data */
{
pData->dwDataLength -= 8;
dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->strUnknown), sizeof(pData->strUnknown));

4
dlls/shell32/shlview.c
View File

@ -1284,7 +1284,9 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
msg.pt = 0;*/
LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh;
// TranslateAccelerator(This->hWnd, This->hAccel, &msg)
#if 0
TranslateAccelerator(This->hWnd, This->hAccel, &msg)
#endif
FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey);
}
break;

1
include/winnt.h
View File

@ -1070,6 +1070,7 @@ typedef struct _NT_TIB
struct _TEB;
#if defined(__i386__) && defined(__GNUC__)
extern inline struct _TEB * WINAPI NtCurrentTeb(void);
extern inline struct _TEB * WINAPI NtCurrentTeb(void)
{
struct _TEB *teb;

2
ole/ole2nls.c
View File

@ -3616,7 +3616,7 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags,
*(roundbuffer+1)='0';
} else
*roundbuffer='0';
dptr=roundbuffer+(sptr-lpValue); // +1-1
dptr=roundbuffer+(sptr-lpValue); /* +1-1 */
while ( (++*dptr) > '9') {
*(dptr--)='0';