Commit f93256a5 authored by Alexandre Julliard's avatar Alexandre Julliard

Warning fixes.

parent a543971d
......@@ -1448,7 +1448,7 @@ static HLOCAL16 LOCAL_InternalLock( LPSTR heap, HLOCAL16 handle )
if (HANDLE_MOVEABLE(handle))
{
LOCALHANDLEENTRY *pEntry = (LOCALHANDLEENTRY *)(heap + handle);
if (pEntry->flags == LMEM_DISCARDED) return 0;
if (pEntry->flags == (LMEM_DISCARDED >> 8)) return 0;
if (pEntry->lock < 0xfe) pEntry->lock++;
handle = pEntry->addr;
}
......
......@@ -37,7 +37,7 @@ static void test_add_atom(void)
SetLastError( 0xdeadbeef );
atom = GlobalAddAtomA( "foobar" );
ok( (atom >= 0xc000) && (atom <= 0xffff), "bad atom id %x", atom );
ok( atom >= 0xc000, "bad atom id %x", atom );
ok( GetLastError() == 0xdeadbeef, "GlobalAddAtomA set last error" );
/* Verify that it can be found (or not) appropriately */
......
......@@ -21,6 +21,9 @@
#include "config.h"
#include "wine/port.h"
#include <locale.h>
#include <stdio.h>
#include "winbase.h"
#include "winuser.h"
......@@ -30,8 +33,6 @@
#include "wine/debug.h"
#include <locale.h>
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
/* FIXME: Need to hold locale for each LC_* type and aggregate
......@@ -258,8 +259,6 @@ static LCID MSVCRT_locale_to_LCID(locale_search_t* locale)
return lcid;
}
extern int snprintf(char *, int, const char *, ...);
/* INTERNAL: Set ctype behaviour for a codepage */
static void msvcrt_set_ctype(unsigned int codepage, LCID lcid)
{
......
......@@ -139,14 +139,13 @@ UINT16 WINAPI DragQueryFile16(
if(!lpDropFileStruct) goto end;
lpDrop = (LPSTR) lpDropFileStruct + lpDropFileStruct->wSize;
wFile = (wFile==0xffff) ? 0xffffffff : wFile;
while (i++ < wFile)
{
while (*lpDrop++); /* skip filename */
if (!*lpDrop)
{
i = (wFile == 0xFFFFFFFF) ? i : 0;
i = (wFile == 0xFFFF) ? i : 0;
goto end;
}
}
......
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