Commit d628f436 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard

Fixed some ANSI C violations.

parent 205721e7
...@@ -579,7 +579,7 @@ static HANDLER_DEF(trap_handler) ...@@ -579,7 +579,7 @@ static HANDLER_DEF(trap_handler)
context.EFlags &= ~0x100; /* clear single-step flag */ context.EFlags &= ~0x100; /* clear single-step flag */
break; break;
case T_BPTFLT: /* Breakpoint exception */ 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 */ /* fall through */
default: default:
rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.ExceptionCode = EXCEPTION_BREAKPOINT;
...@@ -732,11 +732,13 @@ BOOL SIGNAL_Init(void) ...@@ -732,11 +732,13 @@ BOOL SIGNAL_Init(void)
/********************************************************************** /**********************************************************************
* DbgBreakPoint (NTDLL) * DbgBreakPoint (NTDLL)
*/ */
__ASM_GLOBAL_FUNC( DbgBreakPoint, "int3; ret"); void WINAPI DbgBreakPoint(void);
__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret");
/********************************************************************** /**********************************************************************
* DbgUserBreakPoint (NTDLL) * DbgUserBreakPoint (NTDLL)
*/ */
__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int3; ret"); void WINAPI DbgUserBreakPoint(void);
__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret");
#endif /* __i386__ */ #endif /* __i386__ */
...@@ -49,7 +49,7 @@ typedef struct ...@@ -49,7 +49,7 @@ typedef struct
DWORD dwOleObjFileNameLength; DWORD dwOleObjFileNameLength;
DWORD dwMetaFileWidth; DWORD dwMetaFileWidth;
DWORD dwMetaFileHeight; 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; DWORD dwDataLength;
BYTE *pData; BYTE *pData;
}OLECONVERT_OLESTREAM_DATA; }OLECONVERT_OLESTREAM_DATA;
...@@ -6004,7 +6004,7 @@ HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA * ...@@ -6004,7 +6004,7 @@ HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA *
} }
if(hRes == S_OK) 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->dwOleObjFileNameLength = sizeof(pData->dwOleObjFileNameLength);
pData->pstrOleObjFileName = (CHAR *)malloc(pData->dwOleObjFileNameLength); pData->pstrOleObjFileName = (CHAR *)malloc(pData->dwOleObjFileNameLength);
if(pData->pstrOleObjFileName) if(pData->pstrOleObjFileName)
...@@ -6047,9 +6047,9 @@ HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA * ...@@ -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; pData->dwDataLength -= 8;
dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->strUnknown), sizeof(pData->strUnknown)); dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->strUnknown), sizeof(pData->strUnknown));
......
...@@ -1284,7 +1284,9 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn ...@@ -1284,7 +1284,9 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
msg.pt = 0;*/ msg.pt = 0;*/
LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh; 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); FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey);
} }
break; break;
......
...@@ -1070,6 +1070,7 @@ typedef struct _NT_TIB ...@@ -1070,6 +1070,7 @@ typedef struct _NT_TIB
struct _TEB; struct _TEB;
#if defined(__i386__) && defined(__GNUC__) #if defined(__i386__) && defined(__GNUC__)
extern inline struct _TEB * WINAPI NtCurrentTeb(void);
extern inline struct _TEB * WINAPI NtCurrentTeb(void) extern inline struct _TEB * WINAPI NtCurrentTeb(void)
{ {
struct _TEB *teb; struct _TEB *teb;
......
...@@ -3616,7 +3616,7 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags, ...@@ -3616,7 +3616,7 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags,
*(roundbuffer+1)='0'; *(roundbuffer+1)='0';
} else } else
*roundbuffer='0'; *roundbuffer='0';
dptr=roundbuffer+(sptr-lpValue); // +1-1 dptr=roundbuffer+(sptr-lpValue); /* +1-1 */
while ( (++*dptr) > '9') { while ( (++*dptr) > '9') {
*(dptr--)='0'; *(dptr--)='0';
......
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