mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-08-29 19:26:33 +00:00
more fixes for GCC4
svn path=/trunk/; revision=15110
This commit is contained in:
@@ -618,7 +618,7 @@ RegDeleteKeyA (HKEY hKey,
|
||||
InitializeObjectAttributes(&ObjectAttributes,
|
||||
&SubKeyName,
|
||||
OBJ_CASE_INSENSITIVE,
|
||||
(HANDLE)ParentKey,
|
||||
ParentKey,
|
||||
NULL);
|
||||
|
||||
Status = NtOpenKey (&TargetKey,
|
||||
@@ -668,7 +668,7 @@ RegDeleteKeyW (HKEY hKey,
|
||||
InitializeObjectAttributes (&ObjectAttributes,
|
||||
&SubKeyName,
|
||||
OBJ_CASE_INSENSITIVE,
|
||||
(HANDLE)ParentKey,
|
||||
ParentKey,
|
||||
NULL);
|
||||
Status = NtOpenKey (&TargetKey,
|
||||
DELETE,
|
||||
@@ -1178,7 +1178,7 @@ RegEnumValueA( HKEY hKey, DWORD index, LPSTR value, LPDWORD val_count,
|
||||
if (len > *count) status = STATUS_BUFFER_OVERFLOW;
|
||||
else
|
||||
{
|
||||
RtlUnicodeToMultiByteN( data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset),
|
||||
RtlUnicodeToMultiByteN( (PCHAR)data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset),
|
||||
total_size - info->DataOffset );
|
||||
/* if the type is REG_SZ and data is not 0-terminated
|
||||
* and there is enough space in the buffer NT appends a \0 */
|
||||
@@ -3179,7 +3179,7 @@ RegSetValueA (HKEY hKey,
|
||||
NULL,
|
||||
0,
|
||||
REG_SZ,
|
||||
lpData,
|
||||
(CONST BYTE*)lpData,
|
||||
strlen(lpData) + 1);
|
||||
|
||||
if (hSubKey != hKey)
|
||||
|
||||
@@ -286,7 +286,7 @@ fetch_texel_2d_f_rgb_dxt1( const struct gl_texture_image *texImage,
|
||||
GLint i, GLint j, GLint k, GLfloat *texel )
|
||||
{
|
||||
/* just sample as GLchan and convert to float here */
|
||||
GLchan rgba[4];
|
||||
GLchan rgba[4] = {0, 0, 0, 0};
|
||||
fetch_texel_2d_rgb_dxt1(texImage, i, j, k, rgba);
|
||||
texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
|
||||
texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
|
||||
@@ -308,7 +308,7 @@ fetch_texel_2d_f_rgba_dxt1( const struct gl_texture_image *texImage,
|
||||
GLint i, GLint j, GLint k, GLfloat *texel )
|
||||
{
|
||||
/* just sample as GLchan and convert to float here */
|
||||
GLchan rgba[4];
|
||||
GLchan rgba[4] = {0, 0, 0, 0};
|
||||
fetch_texel_2d_rgba_dxt1(texImage, i, j, k, rgba);
|
||||
texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
|
||||
texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
|
||||
@@ -330,7 +330,7 @@ fetch_texel_2d_f_rgba_dxt3( const struct gl_texture_image *texImage,
|
||||
GLint i, GLint j, GLint k, GLfloat *texel )
|
||||
{
|
||||
/* just sample as GLchan and convert to float here */
|
||||
GLchan rgba[4];
|
||||
GLchan rgba[4] = {0, 0, 0, 0};
|
||||
fetch_texel_2d_rgba_dxt3(texImage, i, j, k, rgba);
|
||||
texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
|
||||
texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
|
||||
@@ -352,7 +352,7 @@ fetch_texel_2d_f_rgba_dxt5( const struct gl_texture_image *texImage,
|
||||
GLint i, GLint j, GLint k, GLfloat *texel )
|
||||
{
|
||||
/* just sample as GLchan and convert to float here */
|
||||
GLchan rgba[4];
|
||||
GLchan rgba[4] = {0, 0, 0, 0};
|
||||
fetch_texel_2d_rgba_dxt5(texImage, i, j, k, rgba);
|
||||
texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
|
||||
texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
|
||||
|
||||
@@ -224,7 +224,7 @@ struct _EPROCESS
|
||||
ULONGLONG Filler; /* 158 */
|
||||
};
|
||||
ULONG Session; /* 160 */
|
||||
UCHAR ImageFileName[16]; /* 164 */
|
||||
CHAR ImageFileName[16]; /* 164 */
|
||||
LIST_ENTRY JobLinks; /* 174 */
|
||||
PVOID LockedPagesList; /* 17C */
|
||||
LIST_ENTRY ThreadListHead; /* 184 */
|
||||
|
||||
@@ -690,7 +690,7 @@ GspFindThread(PCHAR Data,
|
||||
HANDLE ThreadId;
|
||||
PCHAR ptr = &Data[0];
|
||||
|
||||
GspHex2Long (&ptr, (PULONG) &uThreadId);
|
||||
GspHex2Long (&ptr, (PLONG) &uThreadId);
|
||||
ThreadId = (HANDLE)uThreadId;
|
||||
|
||||
if (!NT_SUCCESS (PsLookupThreadByThreadId (ThreadId, &ThreadInfo)))
|
||||
|
||||
@@ -455,7 +455,6 @@ KeyboardThreadMain(PVOID StartContext)
|
||||
*/
|
||||
while (InputThreadsRunning)
|
||||
{
|
||||
KEY_EVENT_RECORD KeyEvent;
|
||||
BOOLEAN NumKeys = 1;
|
||||
KEYBOARD_INPUT_DATA KeyInput;
|
||||
KEYBOARD_INPUT_DATA NextKeyInput;
|
||||
@@ -663,7 +662,7 @@ KeyboardThreadMain(PVOID StartContext)
|
||||
&hWnd,
|
||||
&id))
|
||||
{
|
||||
if (KeyEvent.bKeyDown)
|
||||
if (!(KeyInput.Flags & KEY_BREAK))
|
||||
{
|
||||
DPRINT("Hot key pressed (hWnd %lx, id %d)\n", hWnd, id);
|
||||
MsqPostHotKeyMessage (Thread,
|
||||
|
||||
@@ -7474,8 +7474,11 @@ YY_RULE_SETUP
|
||||
char *fname;
|
||||
yy_pop_state();
|
||||
lineno = (int)strtol(yytext, &cptr, 10);
|
||||
#if 0
|
||||
/* ignore malformed line numbers by gcc: # 0 "<built-in>" */
|
||||
if(!lineno)
|
||||
yyerror("Malformed '#...' line-directive; invalid linenumber");
|
||||
#endif
|
||||
fname = strchr(cptr, '"');
|
||||
if(!fname)
|
||||
yyerror("Malformed '#...' line-directive; missing filename");
|
||||
|
||||
Reference in New Issue
Block a user