ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d2d1: Return numeric configuration settings as uint32_t. 

To allow building without -DWINE_NO_LONG_TYPES.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2022-02-01 19:23:13 +01:00 committed by Alexandre Julliard
parent 576e44e040
commit 2c6fd7b617
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d2d1/d2d1_private.h
View File

@ -24,6 +24,8 @@
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
#include <stdint.h>
#include <stdbool.h>
#include <math.h> #include <math.h>
#define COBJMACROS #define COBJMACROS
#include "d2d1_2.h" #include "d2d1_2.h"

11
dlls/d2d1/factory.c
View File

@ -937,9 +937,10 @@ D2D1_COLOR_F WINAPI D2D1ConvertColorSpace(D2D1_COLOR_SPACE src_colour_space,
return ret; return ret;
} }
static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) static bool get_config_key_u32(HKEY default_key, HKEY application_key, const char *name, uint32_t *value)
{ {
DWORD type, data, size; DWORD type, size;
uint32_t data;
size = sizeof(data); size = sizeof(data);
if (application_key && !RegQueryValueExA(application_key, if (application_key && !RegQueryValueExA(application_key,
@ -951,11 +952,11 @@ static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const c
name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD)
goto success; goto success;
return FALSE; return false;
success: success:
*value = data; *value = data;
return TRUE; return true;
} }
static void d2d_settings_init(void) static void d2d_settings_init(void)
@ -989,7 +990,7 @@ static void d2d_settings_init(void)
if (!default_key && !application_key) if (!default_key && !application_key)
return; return;
if (get_config_key_dword(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) if (get_config_key_u32(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory))
ERR_(winediag)("Limiting maximum Direct2D factory version to %#x.\n", d2d_settings.max_version_factory); ERR_(winediag)("Limiting maximum Direct2D factory version to %#x.\n", d2d_settings.max_version_factory);
if (application_key) if (application_key)