March 2020 - Wine-devel - list.winehq.org

[PATCH v2 6/9] adsldp: Map 1.3.6.1.4.1.1466.115.121.1.7 to ADSTYPE_BOOLEAN.
by Dmitry Timoshkov 30 Mar '20

30 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 13 +++++++++++++ dlls/adsldp/schema.c | 2 ++ 2 files changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index e27e641eb0..8fe7bfd18c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1349,6 +1349,19 @@ static HRESULT add_column_values(LDAP_namespace *ldap, ADS_SEARCH_COLUMN *col, break; } + case ADSTYPE_BOOLEAN: + if (stricmp(values[i]->bv_val, "TRUE")) + col->pADsValues[i].u.Boolean = 1; + else if (stricmp(values[i]->bv_val, "FALSE")) + col->pADsValues[i].u.Boolean = 0; + else + { + FIXME("not recognized boolean value %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len)); + col->pADsValues[i].u.Boolean = 0; + } + TRACE("=> %d\n", col->pADsValues[i].u.Boolean); + break; + case ADSTYPE_INTEGER: col->pADsValues[i].u.Integer = strtol(values[i]->bv_val, NULL, 10); TRACE("%s => %d\n", debugstr_an(values[i]->bv_val, values[i]->bv_len), col->pADsValues[i].u.Integer); diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 234a76dfa9..bff754be7a 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -58,6 +58,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, type = find_schema_type(name, at, at_count); if (!type || !type->syntax) return ADSTYPE_CASE_IGNORE_STRING; + if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.7")) + return ADSTYPE_BOOLEAN; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.12")) return ADSTYPE_DN_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.15")) -- 2.25.1

1 0

[PATCH v2 5/9] adsldp: Map 1.3.6.1.4.1.1466.115.121.1.15 to ADSTYPE_CASE_IGNORE_STRING.
by Dmitry Timoshkov 30 Mar '20

30 Mar '20

According to RFC4517 1.3.6.1.4.1.1466.115.121.1.15 is a Directory string which should map to one of TeletextString, PrintableString or UniversalString. Something else should map to ADSTYPE_NT_SECURITY_DESCRIPTOR. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 1 - dlls/adsldp/schema.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index d3feb89a05..e27e641eb0 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1337,7 +1337,6 @@ static HRESULT add_column_values(LDAP_namespace *ldap, ADS_SEARCH_COLUMN *col, case ADSTYPE_CASE_EXACT_STRING: case ADSTYPE_CASE_IGNORE_STRING: case ADSTYPE_PRINTABLE_STRING: - case ADSTYPE_NT_SECURITY_DESCRIPTOR: { DWORD outlen; TRACE("=> %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len)); diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 412902f25e..234a76dfa9 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -61,7 +61,7 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.12")) return ADSTYPE_DN_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.15")) - return ADSTYPE_NT_SECURITY_DESCRIPTOR; + return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38")) -- 2.25.1

1 0

[PATCH v2 4/9] adsldp: Map 1.3.6.1.4.1.1466.115.121.1.38 to ADSTYPE_CASE_IGNORE_STRING.
by Dmitry Timoshkov 30 Mar '20

30 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/schema.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 1f02916496..412902f25e 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -64,6 +64,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, return ADSTYPE_NT_SECURITY_DESCRIPTOR; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; + if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38")) + return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.40")) return ADSTYPE_OCTET_STRING; -- 2.25.1

1 0

[PATCH v2 3/9] adsldp: Add support for NAME token with multiple entries.
by Dmitry Timoshkov 30 Mar '20

30 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp_private.h | 1 + dlls/adsldp/schema.c | 76 +++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index bf24de2385..a0d3a977a2 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -50,6 +50,7 @@ struct attribute_type { WCHAR *oid; WCHAR *name; + ULONG name_count; WCHAR *syntax; int single_value; }; diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 06e61f258a..1f02916496 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -32,10 +32,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(adsldp); static const struct attribute_type *find_schema_type(const WCHAR *name, const struct attribute_type *at, ULONG count) { - ULONG i; + ULONG i, n, off; for (i = 0; i < count; i++) - if (at[i].name && !wcsicmp(at[i].name, name)) return &at[i]; + { + if (!at[i].name) continue; + + off = 0; + + for (n = 0; n < at[i].name_count; n++) + { + if (!wcsicmp(at[i].name + off, name)) return &at[i]; + off += wcslen(at[i].name + off) + 1; + } + } return NULL; } @@ -114,13 +124,64 @@ static WCHAR *parse_oid(WCHAR **str) return oid; } -static WCHAR *parse_name(WCHAR **str) +static WCHAR *parse_name(WCHAR **str, ULONG *name_count) { WCHAR *name, *p = *str, *end; int count; + *name_count = 0; + while (is_space(*p)) p++; + if (*p == '(') + { + int total_count = 0; + + p++; + name = NULL; + + while (*p) + { + WCHAR *tmp_name, *new_name; + ULONG dummy; + + while (is_space(*p)) p++; + if (*p == ')') + { + *str = p + 1; + return name; + } + + tmp_name = parse_name(&p, &dummy); + if (!tmp_name) break; + + TRACE("NAME[%u] %s\n", *name_count, debugstr_w(tmp_name)); + + count = wcslen(tmp_name); + + if (!name) + new_name = heap_alloc((count + 1) * sizeof(WCHAR)); + else + new_name = heap_realloc(name, (total_count + count + 1) * sizeof(WCHAR)); + + if (!new_name) break; + + memcpy(new_name + total_count, tmp_name, (count + 1) * sizeof(WCHAR)); + + name = new_name; + heap_free(tmp_name); + total_count += count + 1; + + *name_count += 1; + *str = p; + } + + *str = *p ? p + 1 : p; + + heap_free(name); + return NULL; + } + if (*p != '\'') { FIXME("not suported NAME start at %s\n", debugstr_w(p)); @@ -138,6 +199,8 @@ static WCHAR *parse_name(WCHAR **str) memcpy(name, p, count * sizeof(WCHAR)); name[count] = 0; + *name_count = 1; + *str = end + 1; return name; @@ -171,6 +234,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) at->oid = NULL; at->name = NULL; + at->name_count = 0; at->syntax = NULL; at->single_value = 0; @@ -188,7 +252,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) if (!wcsnicmp(p, L"NAME", 4)) { p += 4; - at->name = parse_name(&p); + at->name = parse_name(&p, &at->name_count); } else if (!wcsnicmp(p, L"SYNTAX", 6)) { @@ -292,8 +356,8 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_count) continue; } - TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[count].oid), - debugstr_w(at[count].name), debugstr_w(at[count].syntax), at[count].single_value); + TRACE("oid %s, name %s, name_count %u, syntax %s, single-value %d\n", debugstr_w(at[count].oid), + debugstr_w(at[count].name), at[count].name_count, debugstr_w(at[count].syntax), at[count].single_value); count++; } -- 2.25.1

1 0

[PATCH v2 1/9] adsldp: Recognize and skip not supported schema tokens.
by Dmitry Timoshkov 30 Mar '20

30 Mar '20

v2: Fix incorrect rebase. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/schema.c | 48 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index fa03d63edc..32b11a361a 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -143,8 +143,30 @@ static WCHAR *parse_name(WCHAR **str) return name; } +static void skip_token(WCHAR **str) +{ + WCHAR *p = *str; + + while (is_space(*p)) p++; + + if (*p == '\'') + { + p++; + while (*p && *p != '\'') p++; + } + else + { + while (*p && !is_space(*p)) p++; + } + + *str = *p ? p + 1 : p; +} + static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) { + static const WCHAR * const not_supported[] = { L"DESC", L"EQUALITY", + L"ORDERING", L"SUBSTR", L"SUP", L"USAGE", L"X-ORDERED" }; + int i; WCHAR *p = str; at->oid = NULL; @@ -184,9 +206,25 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) } else { - FIXME("not supported token at %s\n", debugstr_w(p)); - free_attribute_type(at); - return FALSE; + BOOL recognized = FALSE; + + for (i = 0; i < ARRAY_SIZE(not_supported); i++) + { + if (!wcsnicmp(p, not_supported[i], wcslen(not_supported[i]))) + { + p += wcslen(not_supported[i]); + skip_token(&p); + recognized = TRUE; + break; + } + } + + if (!recognized) + { + FIXME("not supported token at %s\n", debugstr_w(p)); + free_attribute_type(at); + return FALSE; + } } } @@ -251,8 +289,8 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_count) continue; } - TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[i].oid), - debugstr_w(at[i].name), debugstr_w(at[i].syntax), at[i].single_value); + TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[count].oid), + debugstr_w(at[count].name), debugstr_w(at[count].syntax), at[count].single_value); count++; } -- 2.25.1

1 0

[PATCH 4/9] adsldp: Map 1.3.6.1.4.1.1466.115.121.1.38 to ADSTYPE_CASE_IGNORE_STRING.
by Dmitry Timoshkov 30 Mar '20

30 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/schema.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 1f02916496..412902f25e 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -64,6 +64,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, return ADSTYPE_NT_SECURITY_DESCRIPTOR; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; + if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38")) + return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.40")) return ADSTYPE_OCTET_STRING; -- 2.25.1

1 0

[PATCH 3/9] adsldp: Add support for NAME token with multiple entries.
by Dmitry Timoshkov 30 Mar '20

30 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp_private.h | 1 + dlls/adsldp/schema.c | 76 +++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index bf24de2385..a0d3a977a2 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -50,6 +50,7 @@ struct attribute_type { WCHAR *oid; WCHAR *name; + ULONG name_count; WCHAR *syntax; int single_value; }; diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 06e61f258a..1f02916496 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -32,10 +32,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(adsldp); static const struct attribute_type *find_schema_type(const WCHAR *name, const struct attribute_type *at, ULONG count) { - ULONG i; + ULONG i, n, off; for (i = 0; i < count; i++) - if (at[i].name && !wcsicmp(at[i].name, name)) return &at[i]; + { + if (!at[i].name) continue; + + off = 0; + + for (n = 0; n < at[i].name_count; n++) + { + if (!wcsicmp(at[i].name + off, name)) return &at[i]; + off += wcslen(at[i].name + off) + 1; + } + } return NULL; } @@ -114,13 +124,64 @@ static WCHAR *parse_oid(WCHAR **str) return oid; } -static WCHAR *parse_name(WCHAR **str) +static WCHAR *parse_name(WCHAR **str, ULONG *name_count) { WCHAR *name, *p = *str, *end; int count; + *name_count = 0; + while (is_space(*p)) p++; + if (*p == '(') + { + int total_count = 0; + + p++; + name = NULL; + + while (*p) + { + WCHAR *tmp_name, *new_name; + ULONG dummy; + + while (is_space(*p)) p++; + if (*p == ')') + { + *str = p + 1; + return name; + } + + tmp_name = parse_name(&p, &dummy); + if (!tmp_name) break; + + TRACE("NAME[%u] %s\n", *name_count, debugstr_w(tmp_name)); + + count = wcslen(tmp_name); + + if (!name) + new_name = heap_alloc((count + 1) * sizeof(WCHAR)); + else + new_name = heap_realloc(name, (total_count + count + 1) * sizeof(WCHAR)); + + if (!new_name) break; + + memcpy(new_name + total_count, tmp_name, (count + 1) * sizeof(WCHAR)); + + name = new_name; + heap_free(tmp_name); + total_count += count + 1; + + *name_count += 1; + *str = p; + } + + *str = *p ? p + 1 : p; + + heap_free(name); + return NULL; + } + if (*p != '\'') { FIXME("not suported NAME start at %s\n", debugstr_w(p)); @@ -138,6 +199,8 @@ static WCHAR *parse_name(WCHAR **str) memcpy(name, p, count * sizeof(WCHAR)); name[count] = 0; + *name_count = 1; + *str = end + 1; return name; @@ -171,6 +234,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) at->oid = NULL; at->name = NULL; + at->name_count = 0; at->syntax = NULL; at->single_value = 0; @@ -188,7 +252,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) if (!wcsnicmp(p, L"NAME", 4)) { p += 4; - at->name = parse_name(&p); + at->name = parse_name(&p, &at->name_count); } else if (!wcsnicmp(p, L"SYNTAX", 6)) { @@ -292,8 +356,8 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_count) continue; } - TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[count].oid), - debugstr_w(at[count].name), debugstr_w(at[count].syntax), at[count].single_value); + TRACE("oid %s, name %s, name_count %u, syntax %s, single-value %d\n", debugstr_w(at[count].oid), + debugstr_w(at[count].name), at[count].name_count, debugstr_w(at[count].syntax), at[count].single_value); count++; } -- 2.25.1

1 0

[PATCH 2/9] adsldp: Require attribute definition to be properly terminated.
by Dmitry Timoshkov 30 Mar '20

30 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/schema.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 32b11a361a..06e61f258a 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -183,7 +183,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) while (*p) { while (is_space(*p)) p++; - if (*p == ')') break; + if (*p == ')') return TRUE; if (!wcsnicmp(p, L"NAME", 4)) { @@ -228,7 +228,10 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) } } - return TRUE; + WARN("attribute definition is not terminated\n"); + + free_attribute_type(at); + return FALSE; } struct attribute_type *load_schema(LDAP *ld, ULONG *at_count) -- 2.25.1

1 0

[PATCH 1/9] adsldp: Recognize and skip not supported schema tokens.
by Dmitry Timoshkov 30 Mar '20

30 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/schema.c | 48 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index fa03d63edc..32b11a361a 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -143,8 +143,30 @@ static WCHAR *parse_name(WCHAR **str) return name; } +static void skip_token(WCHAR **str) +{ + WCHAR *p = *str; + + while (is_space(*p)) p++; + + if (*p == '\'') + { + p++; + while (*p && *p != '\'') p++; + } + else + { + while (*p && !is_space(*p)) p++; + } + + *str = *p ? p + 1 : p; +} + static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) { + static const WCHAR * const not_supported[] = { L"DESC", L"EQUALITY", + L"ORDERING", L"SUBSTR", L"SUP", L"USAGE", L"X-ORDERED" }; + int i; WCHAR *p = str; at->oid = NULL; @@ -184,9 +206,25 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) } else { - FIXME("not supported token at %s\n", debugstr_w(p)); - free_attribute_type(at); - return FALSE; + BOOL recognized = FALSE; + + for (i = 0; i < ARRAY_SIZE(not_supported); i++) + { + if (!wcsnicmp(p, not_supported[i], wcslen(not_supported[i]))) + { + p += wcslen(not_supported[i]); + skip_token(&p); + recognized = TRUE; + break; + } + } + + if (!recognized) + { + FIXME("not supported token at %s\n", debugstr_w(p)); + free_attribute_type(at); + return FALSE; + } } } @@ -251,8 +289,8 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_count) continue; } - TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[i].oid), - debugstr_w(at[i].name), debugstr_w(at[i].syntax), at[i].single_value); + TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[count].oid), + debugstr_w(at[count].name), debugstr_w(at[count].syntax), at[count].single_value); count++; } -- 2.25.1

1 0

[PATCH 6/7] d3d8: Store a struct d3d8 in struct d3d8_device.
by Zhiyi Zhang 30 Mar '20

30 Mar '20

So that d3d8->wined3d_outputs can be accessed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 9352641176..ca958942f8 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -115,7 +115,7 @@ struct d3d8_device LONG ref; struct wined3d_device *wined3d_device; unsigned int adapter_ordinal; - IDirect3D8 *d3d_parent; + struct d3d8 *d3d_parent; struct d3d8_handle_table handle_table; /* FVF management */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 23e93df061..44a81ba672 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -576,7 +576,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) if (!ref) { - IDirect3D8 *parent = device->d3d_parent; + IDirect3D8 *parent = &device->d3d_parent->IDirect3D8_iface; unsigned i; TRACE("Releasing wined3d device %p.\n", device->wined3d_device); @@ -672,7 +672,8 @@ static HRESULT WINAPI d3d8_device_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D if (!d3d8) return D3DERR_INVALIDCALL; - return IDirect3D8_QueryInterface(device->d3d_parent, &IID_IDirect3D8, (void **)d3d8); + return IDirect3D8_QueryInterface(&device->d3d_parent->IDirect3D8_iface, &IID_IDirect3D8, + (void **)d3d8); } static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS8 *caps) @@ -3779,8 +3780,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->implicit_swapchain = wined3d_swapchain; - device->d3d_parent = &parent->IDirect3D8_iface; - IDirect3D8_AddRef(device->d3d_parent); + device->d3d_parent = parent; + IDirect3D8_AddRef(&parent->IDirect3D8_iface); return D3D_OK; -- 2.20.1

1 0