winecfg: Fix some compatibility problems.
This commit is contained in:
parent
0faf3f8a1a
commit
43a072b1cb
|
@ -168,10 +168,10 @@ static DWORD get_drive_type( char letter )
|
||||||
if (!RegQueryValueExA( hKey, driveValue, NULL, NULL, (LPBYTE)buffer, &size ))
|
if (!RegQueryValueExA( hKey, driveValue, NULL, NULL, (LPBYTE)buffer, &size ))
|
||||||
{
|
{
|
||||||
WINE_TRACE("Got type '%s' for %s\n", buffer, driveValue );
|
WINE_TRACE("Got type '%s' for %s\n", buffer, driveValue );
|
||||||
if (!strcasecmp( buffer, "hd" )) ret = DRIVE_FIXED;
|
if (!lstrcmpi( buffer, "hd" )) ret = DRIVE_FIXED;
|
||||||
else if (!strcasecmp( buffer, "network" )) ret = DRIVE_REMOTE;
|
else if (!lstrcmpi( buffer, "network" )) ret = DRIVE_REMOTE;
|
||||||
else if (!strcasecmp( buffer, "floppy" )) ret = DRIVE_REMOVABLE;
|
else if (!lstrcmpi( buffer, "floppy" )) ret = DRIVE_REMOVABLE;
|
||||||
else if (!strcasecmp( buffer, "cdrom" )) ret = DRIVE_CDROM;
|
else if (!lstrcmpi( buffer, "cdrom" )) ret = DRIVE_CDROM;
|
||||||
}
|
}
|
||||||
RegCloseKey(hKey);
|
RegCloseKey(hKey);
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#define NONAMELESSUNION
|
#define NONAMELESSUNION
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
|
|
@ -22,11 +22,21 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#ifdef HAVE_SYS_STAT_H
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_UNISTD_H
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_DIRECT_H
|
||||||
|
#include <direct.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define COBJMACROS
|
#define COBJMACROS
|
||||||
|
|
||||||
|
|
|
@ -317,9 +317,9 @@ char *get_reg_key(HKEY root, const char *path, const char *name, const char *def
|
||||||
s = LIST_ENTRY(cursor, struct setting, entry);
|
s = LIST_ENTRY(cursor, struct setting, entry);
|
||||||
|
|
||||||
if (root != s->root) continue;
|
if (root != s->root) continue;
|
||||||
if (strcasecmp(path, s->path) != 0) continue;
|
if (lstrcmpi(path, s->path) != 0) continue;
|
||||||
if (!s->name) continue;
|
if (!s->name) continue;
|
||||||
if (strcasecmp(name, s->name) != 0) continue;
|
if (lstrcmpi(name, s->name) != 0) continue;
|
||||||
|
|
||||||
WINE_TRACE("found %s:%s in settings list, returning %s\n", path, name, s->value);
|
WINE_TRACE("found %s:%s in settings list, returning %s\n", path, name, s->value);
|
||||||
return s->value ? strdupA(s->value) : NULL;
|
return s->value ? strdupA(s->value) : NULL;
|
||||||
|
@ -363,8 +363,8 @@ static void set_reg_key_ex(HKEY root, const char *path, const char *name, const
|
||||||
struct setting *s = LIST_ENTRY(cursor, struct setting, entry);
|
struct setting *s = LIST_ENTRY(cursor, struct setting, entry);
|
||||||
|
|
||||||
if (root != s->root) continue;
|
if (root != s->root) continue;
|
||||||
if (strcasecmp(s->path, path) != 0) continue;
|
if (lstrcmpi(s->path, path) != 0) continue;
|
||||||
if ((s->name && name) && strcasecmp(s->name, name) != 0) continue;
|
if ((s->name && name) && lstrcmpi(s->name, name) != 0) continue;
|
||||||
|
|
||||||
/* are we attempting a double delete? */
|
/* are we attempting a double delete? */
|
||||||
if (!s->name && !name) return;
|
if (!s->name && !name) return;
|
||||||
|
@ -463,8 +463,8 @@ char **enumerate_values(HKEY root, char *path)
|
||||||
LIST_FOR_EACH( cursor, settings )
|
LIST_FOR_EACH( cursor, settings )
|
||||||
{
|
{
|
||||||
struct setting *s = LIST_ENTRY(cursor, struct setting, entry);
|
struct setting *s = LIST_ENTRY(cursor, struct setting, entry);
|
||||||
if (strcasecmp(s->path, path) != 0) continue;
|
if (lstrcmpi(s->path, path) != 0) continue;
|
||||||
if (strcasecmp(s->name, name) != 0) continue;
|
if (lstrcmpi(s->name, name) != 0) continue;
|
||||||
|
|
||||||
if (!s->value)
|
if (!s->value)
|
||||||
{
|
{
|
||||||
|
@ -503,13 +503,13 @@ char **enumerate_values(HKEY root, char *path)
|
||||||
struct setting *setting = LIST_ENTRY(cursor, struct setting, entry);
|
struct setting *setting = LIST_ENTRY(cursor, struct setting, entry);
|
||||||
BOOL found = FALSE;
|
BOOL found = FALSE;
|
||||||
|
|
||||||
if (strcasecmp(setting->path, path) != 0) continue;
|
if (lstrcmpi(setting->path, path) != 0) continue;
|
||||||
|
|
||||||
if (!setting->value) continue;
|
if (!setting->value) continue;
|
||||||
|
|
||||||
for (i = 0; i < valueslen; i++)
|
for (i = 0; i < valueslen; i++)
|
||||||
{
|
{
|
||||||
if (strcasecmp(setting->name, values[i]) == 0)
|
if (lstrcmpi(setting->name, values[i]) == 0)
|
||||||
{
|
{
|
||||||
found = TRUE;
|
found = TRUE;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue