February 2022 - Wine-devel - list.winehq.org

[PATCH 5/6] d3d10: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/Makefile.in | 2 +- dlls/d3d10/d3d10_main.c | 24 ++-- dlls/d3d10/effect.c | 228 +++++++++++++++---------------- dlls/d3d10/shader.c | 2 +- dlls/d3d10/stateblock.c | 4 +- dlls/d3dcompiler_43/reflection.c | 7 +- dlls/d3dcompiler_43/utils.c | 3 + 7 files changed, 138 insertions(+), 132 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 38d2055ecd9..1b869f47f6c 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3d10.dll IMPORTLIB = d3d10 IMPORTS = uuid d3d10core d3dcompiler dxgi -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0 +EXTRADEFS = -DD3D_COMPILER_VERSION=0 PARENTSRC = ../d3dcompiler_43 C_SRCS = \ diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 6961589ca31..82c2ecc2ec9 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -64,7 +64,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to get dxgi factory, returning %#x.\n", hr); + WARN("Failed to get dxgi factory, returning %#lx.\n", hr); return hr; } } @@ -73,7 +73,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to create dxgi factory, returning %#x.\n", hr); + WARN("Failed to create dxgi factory, returning %#lx.\n", hr); return hr; } @@ -86,7 +86,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (FAILED(hr)) { - WARN("No adapters found, returning %#x.\n", hr); + WARN("No adapters found, returning %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -109,7 +109,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv FreeLibrary(refrast); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x.\n", hr); + WARN("Failed to create a software adapter, returning %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -127,7 +127,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x.\n", hr); + WARN("Failed to create a software adapter, returning %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -146,7 +146,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv IDXGIFactory_Release(factory); if (FAILED(hr)) { - WARN("Failed to create a device, returning %#x.\n", hr); + WARN("Failed to create a device, returning %#lx.\n", hr); return hr; } @@ -178,7 +178,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER * hooking these entry-points. */ if (FAILED(hr = d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device))) { - WARN("Failed to create a device, returning %#x\n", hr); + WARN("Failed to create a device, returning %#lx.\n", hr); *device = NULL; return hr; } @@ -188,7 +188,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER hr = ID3D10Device_QueryInterface(*device, &IID_IDXGIDevice, (void **)&dxgi_device); if (FAILED(hr)) { - ERR("Failed to get a dxgi device from the d3d10 device, returning %#x\n", hr); + ERR("Failed to get a dxgi device from the d3d10 device, returning %#lx.\n", hr); ID3D10Device_Release(*device); *device = NULL; return hr; @@ -198,7 +198,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER IDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { - ERR("Failed to get the device adapter, returning %#x\n", hr); + ERR("Failed to get the device adapter, returning %#lx.\n", hr); ID3D10Device_Release(*device); *device = NULL; return hr; @@ -208,7 +208,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER IDXGIAdapter_Release(adapter); if (FAILED(hr)) { - ERR("Failed to get the adapter factory, returning %#x\n", hr); + ERR("Failed to get the adapter factory, returning %#lx.\n", hr); ID3D10Device_Release(*device); *device = NULL; return hr; @@ -221,7 +221,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER ID3D10Device_Release(*device); *device = NULL; - WARN("Failed to create a swapchain, returning %#x\n", hr); + WARN("Failed to create a swapchain, returning %#lx.\n", hr); return hr; } @@ -234,7 +234,7 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) { - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, " + TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, " "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p.\n", data, data_size, wine_dbgstr_a(filename), defines, include, hlsl_flags, fx_flags, effect, errors); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 68afc061d1e..bb105beee6d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -778,7 +778,7 @@ static void d3d10_effect_update_dependent_props(struct d3d10_effect_prop_depende if (FAILED(hr = d3d10_effect_preshader_eval(&d->index_expr.index))) { - WARN("Failed to evaluate index expression, hr %#x.\n", hr); + WARN("Failed to evaluate index expression, hr %#lx.\n", hr); return; } @@ -786,7 +786,7 @@ static void d3d10_effect_update_dependent_props(struct d3d10_effect_prop_depende if (variable_idx >= v->type->element_count) { - WARN("Expression evaluated to invalid index value %u, array %s of size %u.\n", + WARN("Expression evaluated to invalid index value %u, array %s of size %lu.\n", variable_idx, debugstr_a(v->name), v->type->element_count); variable_idx = 0; } @@ -861,7 +861,7 @@ static void skip_dword_unknown(const char *location, const char **ptr, unsigned for (i = 0; i < count; ++i) { d = read_dword(ptr); - FIXME("\t0x%08x\n", d); + FIXME("\t0x%08lx\n", d); } } @@ -894,15 +894,15 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, skip_dword_unknown("DXBC checksum", &ptr, 4); version = read_dword(&ptr); - TRACE("version: %#x.\n", version); + TRACE("version: %#lx.\n", version); if (version != 0x00000001) { - WARN("Got unexpected DXBC version %#x.\n", version); + WARN("Got unexpected DXBC version %#lx.\n", version); return E_FAIL; } total_size = read_dword(&ptr); - TRACE("total size: %#x\n", total_size); + TRACE("total size: %#lx\n", total_size); if (data_size != total_size) { @@ -911,7 +911,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, } chunk_count = read_dword(&ptr); - TRACE("chunk count: %#x\n", chunk_count); + TRACE("chunk count: %#lx\n", chunk_count); for (i = 0; i < chunk_count; ++i) { @@ -920,11 +920,11 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_offset; chunk_offset = read_dword(&ptr); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); + TRACE("chunk %u at offset %#lx\n", i, chunk_offset); if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { - WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + WARN("Invalid chunk offset %#lx (data size %#Ix).\n", chunk_offset, data_size); return E_FAIL; } @@ -935,7 +935,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { - WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", + WARN("Invalid chunk size %#lx (data size %#Ix, chunk offset %#lx).\n", chunk_size, data_size, chunk_offset); return E_FAIL; } @@ -953,7 +953,7 @@ static BOOL fx10_get_string(const char *data, size_t data_size, DWORD offset, co if (offset >= data_size) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return FALSE; } @@ -1264,17 +1264,17 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse if (offset >= data_size || !require_space(offset, 1, sizeof(dxbc_size), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } ptr = data + offset; dxbc_size = read_dword(&ptr); - TRACE("dxbc size: %#x\n", dxbc_size); + TRACE("dxbc size: %#lx\n", dxbc_size); if (!require_space(ptr - data, 1, dxbc_size, data_size)) { - WARN("Invalid dxbc size %#x (data size %#lx, offset %#x).\n", offset, (long)data_size, offset); + WARN("Invalid dxbc size %#lx (data size %#Ix, offset %#lx).\n", offset, data_size, offset); return E_FAIL; } @@ -1311,7 +1311,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse if (FAILED(hr = d3d10_effect_parse_stream_output_declaration(v->u.shader.stream_output_declaration, &so_decl))) { - WARN("Failed to parse stream output declaration, hr %#x.\n", hr); + WARN("Failed to parse stream output declaration, hr %#lx.\n", hr); break; } @@ -1341,7 +1341,7 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_ case 3: if (is_column_major) return D3D10_SVC_MATRIX_COLUMNS; else return D3D10_SVC_MATRIX_ROWS; default: - FIXME("Unknown variable class %#x.\n", c); + FIXME("Unknown variable class %#lx.\n", c); return 0; } } @@ -1381,7 +1381,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, case 21: return D3D10_SVT_SAMPLER; case 22: return D3D10_SVT_BUFFER; default: - FIXME("Unknown variable type %#x.\n", t); + FIXME("Unknown variable type %#lx.\n", t); return D3D10_SVT_VOID; } } @@ -1394,7 +1394,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, case 3: return D3D10_SVT_UINT; case 4: return D3D10_SVT_BOOL; default: - FIXME("Unknown variable type %#x.\n", t); + FIXME("Unknown variable type %#lx.\n", t); return D3D10_SVT_VOID; } } @@ -1408,13 +1408,13 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } ptr = data + offset; offset = read_dword(&ptr); - TRACE("Type name at offset %#x.\n", offset); + TRACE("Type name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) { @@ -1427,16 +1427,16 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Kind: %u.\n", type_kind); t->element_count = read_dword(&ptr); - TRACE("Element count: %u.\n", t->element_count); + TRACE("Element count: %lu.\n", t->element_count); t->size_unpacked = read_dword(&ptr); - TRACE("Unpacked size: %#x.\n", t->size_unpacked); + TRACE("Unpacked size: %#lx.\n", t->size_unpacked); t->stride = read_dword(&ptr); - TRACE("Stride: %#x.\n", t->stride); + TRACE("Stride: %#lx.\n", t->stride); t->size_packed = read_dword(&ptr); - TRACE("Packed size %#x.\n", t->size_packed); + TRACE("Packed size %#lx.\n", t->size_packed); switch (type_kind) { @@ -1445,7 +1445,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } @@ -1457,8 +1457,8 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->type_class = d3d10_variable_class((typeinfo & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, typeinfo & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); TRACE("Type description: %#x.\n", typeinfo); - TRACE("\tcolumns: %u.\n", t->column_count); - TRACE("\trows: %u.\n", t->row_count); + TRACE("\tcolumns: %lu.\n", t->column_count); + TRACE("\trows: %lu.\n", t->row_count); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); TRACE("\tunknown bits: %#x.\n", typeinfo & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK @@ -1470,7 +1470,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } @@ -1493,12 +1493,12 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, 1, sizeof(t->member_count), data_size)) { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + WARN("Invalid offset %#lx (data size %#Ix).\n", offset, data_size); return E_FAIL; } t->member_count = read_dword(&ptr); - TRACE("Member count: %u.\n", t->member_count); + TRACE("Member count: %lu.\n", t->member_count); t->column_count = 0; t->row_count = 0; @@ -1513,8 +1513,8 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (!require_space(ptr - data, t->member_count, 4 * sizeof(DWORD), data_size)) { - WARN("Invalid member count %#x (data size %#lx, offset %#x).\n", - t->member_count, (long)data_size, offset); + WARN("Invalid member count %#lx (data size %#Ix, offset %#lx).\n", + t->member_count, data_size, offset); return E_FAIL; } @@ -1523,7 +1523,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type_member *typem = &t->members[i]; offset = read_dword(&ptr); - TRACE("Member name at offset %#x.\n", offset); + TRACE("Member name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->name)) { @@ -1533,7 +1533,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Member name: %s.\n", debugstr_a(typem->name)); offset = read_dword(&ptr); - TRACE("Member semantic at offset %#x.\n", offset); + TRACE("Member semantic at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->semantic)) { @@ -1543,10 +1543,10 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Member semantic: %s.\n", debugstr_a(typem->semantic)); typem->buffer_offset = read_dword(&ptr); - TRACE("Member offset in struct: %#x.\n", typem->buffer_offset); + TRACE("Member offset in struct: %#lx.\n", typem->buffer_offset); offset = read_dword(&ptr); - TRACE("Member type info at offset %#x.\n", offset); + TRACE("Member type info at offset %#lx.\n", offset); if (!(typem->type = get_fx10_type(t->effect, data, data_size, offset))) { @@ -1563,7 +1563,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, if (t->element_count) { - TRACE("Elementtype for type at offset: %#x\n", t->id); + TRACE("Elementtype for type at offset: %#lx\n", t->id); /* allocate elementtype - we need only one, because all elements have the same type */ if (!(t->elementtype = heap_alloc_zero(sizeof(*t->elementtype)))) @@ -1584,29 +1584,29 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("\tType name: %s.\n", debugstr_a(t->elementtype->name)); t->elementtype->element_count = 0; - TRACE("\tElement count: %u.\n", t->elementtype->element_count); + TRACE("\tElement count: %lu.\n", t->elementtype->element_count); /* * Not sure if this calculation is 100% correct, but a test * shows that these values work. */ t->elementtype->size_unpacked = t->size_packed / t->element_count; - TRACE("\tUnpacked size: %#x.\n", t->elementtype->size_unpacked); + TRACE("\tUnpacked size: %#lx.\n", t->elementtype->size_unpacked); t->elementtype->stride = t->stride; - TRACE("\tStride: %#x.\n", t->elementtype->stride); + TRACE("\tStride: %#lx.\n", t->elementtype->stride); t->elementtype->size_packed = t->size_packed / t->element_count; - TRACE("\tPacked size: %#x.\n", t->elementtype->size_packed); + TRACE("\tPacked size: %#lx.\n", t->elementtype->size_packed); t->elementtype->member_count = t->member_count; - TRACE("\tMember count: %u.\n", t->elementtype->member_count); + TRACE("\tMember count: %lu.\n", t->elementtype->member_count); t->elementtype->column_count = t->column_count; - TRACE("\tColumns: %u.\n", t->elementtype->column_count); + TRACE("\tColumns: %lu.\n", t->elementtype->column_count); t->elementtype->row_count = t->row_count; - TRACE("\tRows: %u.\n", t->elementtype->row_count); + TRACE("\tRows: %lu.\n", t->elementtype->row_count); t->elementtype->basetype = t->basetype; TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(t->elementtype->basetype)); @@ -1645,7 +1645,7 @@ static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, type->effect = effect; if (FAILED(hr = parse_fx10_type(data, data_size, offset, type))) { - ERR("Failed to parse type info, hr %#x.\n", hr); + ERR("Failed to parse type info, hr %#lx.\n", hr); heap_free(type); return NULL; } @@ -1785,7 +1785,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) TRACE("Variable semantic: %s.\n", debugstr_a(var->semantic)); var->buffer_offset = v->buffer_offset + typem->buffer_offset; - TRACE("Variable buffer offset: %u.\n", var->buffer_offset); + TRACE("Variable buffer offset: %lu.\n", var->buffer_offset); hr = copy_variableinfo_from_type(var); if (FAILED(hr)) return hr; @@ -1830,7 +1830,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) bufferoffset += v->type->stride; } var->buffer_offset = bufferoffset; - TRACE("Variable buffer offset: %u.\n", var->buffer_offset); + TRACE("Variable buffer offset: %lu.\n", var->buffer_offset); hr = copy_variableinfo_from_type(var); if (FAILED(hr)) return hr; @@ -1846,7 +1846,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, DWORD offset; offset = read_dword(ptr); - TRACE("Variable name at offset %#x.\n", offset); + TRACE("Variable name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->name)) { @@ -1856,7 +1856,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, TRACE("Variable name: %s.\n", debugstr_a(v->name)); offset = read_dword(ptr); - TRACE("Variable type info at offset %#x.\n", offset); + TRACE("Variable type info at offset %#lx.\n", offset); if (!(v->type = get_fx10_type(v->effect, data, data_size, offset))) { @@ -1883,7 +1883,7 @@ static HRESULT parse_fx10_annotation(const char *data, size_t data_size, return hr; offset = read_dword(ptr); - TRACE("Annotation value is at offset %#x.\n", offset); + TRACE("Annotation value is at offset %#lx.\n", offset); switch (a->type->basetype) { @@ -2306,7 +2306,7 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si if (!require_space(header.constantinfo, header.constants, sizeof(*info), data_size)) { - WARN("Invalid constant info section offset %#x.\n", header.constantinfo); + WARN("Invalid constant info section offset %#lx.\n", header.constantinfo); return E_FAIL; } @@ -2348,7 +2348,7 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si static HRESULT fxlvm_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { - TRACE("Chunk tag: %s, size: %u.\n", debugstr_an((const char *)&tag, 4), data_size); + TRACE("Chunk tag: %s, size: %lu.\n", debugstr_an((const char *)&tag, 4), data_size); switch (tag) { @@ -2510,7 +2510,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size { if (property_info->size * sizeof(float) > variable->type->size_unpacked) { - WARN("Mismatching variable size %u, property size %u.\n", + WARN("Mismatching variable size %lu, property size %u.\n", variable->type->size_unpacked, property_info->size); return E_FAIL; } @@ -2557,7 +2557,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size { if (!variable->type->element_count || variable_idx >= variable->type->element_count) { - WARN("Invalid array size %u.\n", variable->type->element_count); + WARN("Invalid array size %lu.\n", variable->type->element_count); return E_FAIL; } @@ -2663,7 +2663,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size dep.index_expr.v = variable; if (FAILED(hr = parse_fx10_preshader(data_ptr, blob_size, effect, &dep.index_expr.index))) { - WARN("Failed to parse preshader, hr %#x.\n", hr); + WARN("Failed to parse preshader, hr %#lx.\n", hr); return hr; } @@ -2691,7 +2691,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size dep.operation = operation; if (FAILED(hr = parse_fx10_preshader(data_ptr, blob_size, effect, &dep.value_expr.value))) { - WARN("Failed to parse preshader, hr %#x.\n", hr); + WARN("Failed to parse preshader, hr %#lx.\n", hr); return hr; } @@ -2771,7 +2771,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, HRESULT hr; offset = read_dword(ptr); - TRACE("Pass name at offset %#x.\n", offset); + TRACE("Pass name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &p->name)) { @@ -2781,7 +2781,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, TRACE("Pass name: %s.\n", debugstr_a(p->name)); object_count = read_dword(ptr); - TRACE("Pass has %u effect objects.\n", object_count); + TRACE("Pass has %lu effect objects.\n", object_count); p->annotations.count = read_dword(ptr); TRACE("Pass has %u annotations.\n", p->annotations.count); @@ -2789,7 +2789,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, p->technique->effect, &p->annotations))) { - ERR("Failed to parse pass annotations, hr %#x.\n", hr); + ERR("Failed to parse pass annotations, hr %#lx.\n", hr); return hr; } @@ -2802,7 +2802,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_property_assignment(data, data_size, ptr, D3D10_C_PASS, p->technique->effect, p, &p->dependencies))) { - WARN("Failed to parse pass assignment %u, hr %#x.\n", i, hr); + WARN("Failed to parse pass assignment %u, hr %#lx.\n", i, hr); return hr; } } @@ -2818,7 +2818,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, HRESULT hr; offset = read_dword(ptr); - TRACE("Technique name at offset %#x.\n", offset); + TRACE("Technique name at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) { @@ -2828,7 +2828,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, TRACE("Technique name: %s.\n", debugstr_a(t->name)); t->pass_count = read_dword(ptr); - TRACE("Technique has %u passes\n", t->pass_count); + TRACE("Technique has %lu passes.\n", t->pass_count); t->annotations.count = read_dword(ptr); TRACE("Technique has %u annotations.\n", t->annotations.count); @@ -2836,7 +2836,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, t->effect, &t->annotations))) { - ERR("Failed to parse technique annotations, hr %#x.\n", hr); + ERR("Failed to parse technique annotations, hr %#lx.\n", hr); return hr; } @@ -2974,7 +2974,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, { if (!require_space(default_value_offset, 1, v->type->size_packed, data_size)) { - WARN("Invalid default value offset %#x, variable packed size %u.\n", default_value_offset, + WARN("Invalid default value offset %#x, variable packed size %lu.\n", default_value_offset, v->type->size_packed); return E_FAIL; } @@ -2989,7 +2989,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, &v->annotations))) { - ERR("Failed to parse variable annotations, hr %#x.\n", hr); + ERR("Failed to parse variable annotations, hr %#lx.\n", hr); return hr; } } @@ -3052,7 +3052,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return hr; offset = read_dword(ptr); - TRACE("Variable semantic at offset %#x.\n", offset); + TRACE("Variable semantic at offset %#lx.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->semantic)) { @@ -3062,7 +3062,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); v->explicit_bind_point = read_dword(ptr); - TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); + TRACE("Variable explicit bind point %#lx.\n", v->explicit_bind_point); /* Shared variable description contains only type information. */ if (shared_type_desc) return S_OK; @@ -3114,12 +3114,12 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, var = d3d10_array_get_element(v, i); shader_offset = read_dword(ptr); - TRACE("Shader offset: %#x.\n", shader_offset); + TRACE("Shader offset: %#lx.\n", shader_offset); if (v->type->flags & D3D10_EOT_FLAG_GS_SO) { sodecl_offset = read_dword(ptr); - TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); + TRACE("Stream output declaration at offset %#lx.\n", sodecl_offset); if (!fx10_copy_string(data, data_size, sodecl_offset, &var->u.shader.stream_output_declaration)) @@ -3152,7 +3152,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, if (storage_info->size > sizeof(v->u.state.desc)) { - ERR("Invalid storage size %#lx.\n", storage_info->size); + ERR("Invalid storage size %#Ix.\n", storage_info->size); return E_FAIL; } @@ -3221,7 +3221,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, &v->annotations))) { - ERR("Failed to parse variable annotations, hr %#x.\n", hr); + ERR("Failed to parse variable annotations, hr %#lx.\n", hr); return hr; } @@ -3292,7 +3292,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char l->type->effect = l->effect; offset = read_dword(ptr); - TRACE("%s buffer name at offset %#x.\n", prefix, offset); + TRACE("%s buffer name at offset %#lx.\n", prefix, offset); if (!fx10_copy_string(data, data_size, offset, &l->name)) { @@ -3302,7 +3302,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("%s buffer name: %s.\n", prefix, debugstr_a(l->name)); l->data_size = read_dword(ptr); - TRACE("%s buffer data size: %#x.\n", prefix, l->data_size); + TRACE("%s buffer data size: %#lx.\n", prefix, l->data_size); d3d10_cbuffer_type = read_dword(ptr); TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type); @@ -3333,10 +3333,10 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char } l->type->member_count = read_dword(ptr); - TRACE("%s buffer member count: %#x.\n", prefix, l->type->member_count); + TRACE("%s buffer member count: %#lx.\n", prefix, l->type->member_count); l->explicit_bind_point = read_dword(ptr); - TRACE("%s buffer explicit bind point: %#x.\n", prefix, l->explicit_bind_point); + TRACE("%s buffer explicit bind point: %#lx.\n", prefix, l->explicit_bind_point); if (l->effect->flags & D3D10_EFFECT_IS_POOL) l->flag |= D3D10_EFFECT_VARIABLE_POOLED; @@ -3349,7 +3349,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, l->effect, &l->annotations))) { - ERR("Failed to parse buffer annotations, hr %#x.\n", hr); + ERR("Failed to parse buffer annotations, hr %#lx.\n", hr); return hr; } } @@ -3404,7 +3404,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("Variable semantic: %s.\n", debugstr_a(typem->semantic)); typem->buffer_offset = v->buffer_offset; - TRACE("Variable buffer offset: %u.\n", typem->buffer_offset); + TRACE("Variable buffer offset: %lu.\n", typem->buffer_offset); l->type->size_packed += v->type->size_packed; @@ -3453,11 +3453,11 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char TRACE("%s constant buffer:\n", prefix); TRACE("\tType name: %s.\n", debugstr_a(l->type->name)); - TRACE("\tElement count: %u.\n", l->type->element_count); - TRACE("\tMember count: %u.\n", l->type->member_count); - TRACE("\tUnpacked size: %#x.\n", l->type->size_unpacked); - TRACE("\tStride: %#x.\n", l->type->stride); - TRACE("\tPacked size %#x.\n", l->type->size_packed); + TRACE("\tElement count: %lu.\n", l->type->element_count); + TRACE("\tMember count: %lu.\n", l->type->member_count); + TRACE("\tUnpacked size: %#lx.\n", l->type->size_unpacked); + TRACE("\tStride: %#lx.\n", l->type->stride); + TRACE("\tPacked size %#lx.\n", l->type->size_packed); TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); @@ -3465,7 +3465,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char { if (FAILED(hr = create_buffer_object(l))) { - WARN("Failed to create a buffer object, hr %#x.\n", hr); + WARN("Failed to create a buffer object, hr %#lx.\n", hr); return hr; } } @@ -3574,7 +3574,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d if (e->index_offset >= data_size) { - WARN("Invalid index offset %#x (data size %#x).\n", e->index_offset, data_size); + WARN("Invalid index offset %#lx (data size %#lx).\n", e->index_offset, data_size); return E_FAIL; } ptr = data + e->index_offset; @@ -3711,43 +3711,43 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s if (!require_space(0, 19, sizeof(DWORD), data_size)) { - WARN("Invalid data size %#x.\n", data_size); + WARN("Invalid data size %#lx.\n", data_size); return E_INVALIDARG; } /* Compiled target version (e.g. fx_4_0=0xfeff1001, fx_4_1=0xfeff1011). */ e->version = read_dword(&ptr); - TRACE("Target: %#x\n", e->version); + TRACE("Target: %#lx\n", e->version); e->local_buffer_count = read_dword(&ptr); - TRACE("Local buffer count: %u.\n", e->local_buffer_count); + TRACE("Local buffer count: %lu.\n", e->local_buffer_count); e->variable_count = read_dword(&ptr); - TRACE("Variable count: %u\n", e->variable_count); + TRACE("Variable count: %lu\n", e->variable_count); e->local_variable_count = read_dword(&ptr); - TRACE("Object count: %u\n", e->local_variable_count); + TRACE("Object count: %lu\n", e->local_variable_count); e->shared_buffer_count = read_dword(&ptr); - TRACE("Pool buffer count: %u\n", e->shared_buffer_count); + TRACE("Pool buffer count: %lu\n", e->shared_buffer_count); unused = read_dword(&ptr); - TRACE("Pool variable count: %u\n", unused); + TRACE("Pool variable count: %lu\n", unused); e->shared_object_count = read_dword(&ptr); - TRACE("Pool objects count: %u\n", e->shared_object_count); + TRACE("Pool objects count: %lu\n", e->shared_object_count); e->technique_count = read_dword(&ptr); - TRACE("Technique count: %u\n", e->technique_count); + TRACE("Technique count: %lu\n", e->technique_count); e->index_offset = read_dword(&ptr); - TRACE("Index offset: %#x\n", e->index_offset); + TRACE("Index offset: %#lx\n", e->index_offset); unused = read_dword(&ptr); - TRACE("String count: %u\n", unused); + TRACE("String count: %lu\n", unused); e->texture_count = read_dword(&ptr); - TRACE("Texture count: %u\n", e->texture_count); + TRACE("Texture count: %lu\n", e->texture_count); e->ds_states.count = read_dword(&ptr); TRACE("Depthstencilstate count: %u\n", e->ds_states.count); @@ -3771,7 +3771,7 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Used shader count: %u\n", e->shaders.count); e->anonymous_shader_count = read_dword(&ptr); - TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); + TRACE("Anonymous shader count: %lu\n", e->anonymous_shader_count); if (!e->pool && (e->shared_object_count || e->shared_buffer_count)) { @@ -3788,7 +3788,7 @@ static HRESULT fx10_chunk_handler(const char *data, DWORD data_size, DWORD tag, TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - TRACE("chunk size: %#x\n", data_size); + TRACE("chunk size: %#lx\n", data_size); switch(tag) { @@ -4015,7 +4015,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface) struct d3d10_effect *This = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedIncrement(&This->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %lu.\n", This, refcount); return refcount; } @@ -4025,7 +4025,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedDecrement(&effect->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -5815,13 +5815,13 @@ static void write_variable_array_to_buffer(struct d3d10_effect_variable *variabl if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -5865,13 +5865,13 @@ static void read_variable_array_from_buffer(struct d3d10_effect_variable *variab if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -6617,13 +6617,13 @@ static void write_matrix_variable_array_to_buffer(struct d3d10_effect_variable * if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -6693,13 +6693,13 @@ static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable if (offset >= variable->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, variable->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, variable->type->element_count); return; } if (count > variable->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, variable->type->element_count); count = variable->type->element_count - offset; } @@ -7441,13 +7441,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_SetResour if (offset >= v->type->element_count) { - WARN("Offset %u larger than element count %u, ignoring.\n", offset, v->type->element_count); + WARN("Offset %u larger than element count %lu, ignoring.\n", offset, v->type->element_count); return S_OK; } if (count > v->type->element_count - offset) { - WARN("Offset %u, count %u overruns the variable (element count %u), fixing up.\n", + WARN("Offset %u, count %u overruns the variable (element count %lu), fixing up.\n", offset, count, v->type->element_count); count = v->type->element_count - offset; } @@ -9600,7 +9600,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl struct d3d10_effect *object, *pool = NULL; HRESULT hr; - TRACE("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p.\n", + TRACE("data %p, data_size %Iu, flags %#x, device %p, effect_pool %p, effect %p.\n", data, data_size, flags, device, effect_pool, effect); if (!(flags & D3D10_EFFECT_COMPILE_CHILD_EFFECT) != !effect_pool) @@ -9614,7 +9614,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl if (FAILED(hr = d3d10_create_effect(data, data_size, device, pool, 0, &object))) { - WARN("Failed to create an effect, hr %#x.\n", hr); + WARN("Failed to create an effect, hr %#lx.\n", hr); return hr; } @@ -9663,13 +9663,13 @@ HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UIN struct d3d10_effect *object; HRESULT hr; - TRACE("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p.\n", + TRACE("data %p, data_size %Iu, fx_flags %#x, device %p, effect_pool %p.\n", data, data_size, fx_flags, device, effect_pool); if (FAILED(hr = d3d10_create_effect(data, data_size, device, NULL, D3D10_EFFECT_IS_POOL, &object))) { - WARN("Failed to create an effect, hr %#x.\n", hr); + WARN("Failed to create an effect, hr %#lx.\n", hr); return hr; } diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index d198689af64..761b2b3211f 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -34,7 +34,7 @@ HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, BOOL color_code, const char *comments, ID3D10Blob **disassembly) { - TRACE("data %p, data_size %#lx, color_code %#x, comments %p, disassembly %p.\n", + TRACE("data %p, data_size %#Ix, color_code %#x, comments %p, disassembly %p.\n", data, data_size, color_code, comments, disassembly); return D3DDisassemble(data, data_size, color_code ? D3D_DISASM_ENABLE_COLOR_CODE : 0, comments, disassembly); diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index fef78872a49..ac4ddedc898 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -294,7 +294,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_AddRef(ID3D10StateBlock *iface) struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface); ULONG refcount = InterlockedIncrement(&stateblock->refcount); - TRACE("%p increasing refcount to %u.\n", stateblock, refcount); + TRACE("%p increasing refcount to %lu.\n", stateblock, refcount); return refcount; } @@ -304,7 +304,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface) struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface); ULONG refcount = InterlockedDecrement(&stateblock->refcount); - TRACE("%p decreasing refcount to %u.\n", stateblock, refcount); + TRACE("%p decreasing refcount to %lu.\n", stateblock, refcount); if (!refcount) { diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 97abad4da30..69970136390 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -18,6 +18,9 @@ * */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #include "initguid.h" #include "d3dcompiler_private.h" #include "d3d10.h" @@ -2322,7 +2325,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad struct d3dcompiler_shader_reflection *object; HRESULT hr; - TRACE("data %p, data_size %lu, reflector %p.\n", data, data_size, reflector); + TRACE("data %p, data_size %Iu, reflector %p.\n", data, data_size, reflector); if (!(object = heap_alloc_zero(sizeof(*object)))) { @@ -2356,7 +2359,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void HRESULT hr; const DWORD *temp = data; - TRACE("data %p, data_size %lu, riid %s, blob %p\n", data, data_size, debugstr_guid(riid), reflector); + TRACE("data %p, data_size %Iu, riid %s, blob %p.\n", data, data_size, debugstr_guid(riid), reflector); if (!data || data_size < 32) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 2c5c903106e..84f776626ba 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -21,6 +21,9 @@ * */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #include <stdio.h> #include "d3dcompiler_private.h" -- 2.30.2

1 0

[PATCH 4/6] d3d10: Store the type fields in parse_fx10_type() as uint32_t.
by Henri Verbeet 08 Feb '22

08 Feb '22

In particular, d3d10_variable_type() takes an integer flags pointer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4759dea5ee9..68afc061d1e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1402,7 +1402,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { - DWORD typeinfo, type_flags, type_kind; + uint32_t typeinfo, type_flags, type_kind; const char *ptr; unsigned int i; -- 2.30.2

1 0

[PATCH 3/6] d3d10: Return the read value from read_dword().
by Henri Verbeet 08 Feb '22

08 Feb '22

This makes it consistent with d3dcompiler after commit e6961f6e16b35729301967b04078158cd66eaab2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/effect.c | 202 ++++++++++++++++++++++---------------------- 1 file changed, 103 insertions(+), 99 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e3c261d0270..4759dea5ee9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -837,10 +837,14 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S return TRUE; } -static void read_dword(const char **ptr, DWORD *d) +static inline DWORD read_dword(const char **ptr) { - memcpy(d, *ptr, sizeof(*d)); - *ptr += sizeof(*d); + DWORD d; + + memcpy(&d, *ptr, sizeof(d)); + *ptr += sizeof(d); + + return d; } static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) @@ -856,7 +860,7 @@ static void skip_dword_unknown(const char *location, const char **ptr, unsigned FIXME("Skipping %u unknown DWORDs (%s):\n", count, location); for (i = 0; i < count; ++i) { - read_dword(ptr, &d); + d = read_dword(ptr); FIXME("\t0x%08x\n", d); } } @@ -878,7 +882,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_FAIL; } - read_dword(&ptr, &tag); + tag = read_dword(&ptr); TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); if (tag != TAG_DXBC) @@ -889,7 +893,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, skip_dword_unknown("DXBC checksum", &ptr, 4); - read_dword(&ptr, &version); + version = read_dword(&ptr); TRACE("version: %#x.\n", version); if (version != 0x00000001) { @@ -897,7 +901,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_FAIL; } - read_dword(&ptr, &total_size); + total_size = read_dword(&ptr); TRACE("total size: %#x\n", total_size); if (data_size != total_size) @@ -906,7 +910,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_FAIL; } - read_dword(&ptr, &chunk_count); + chunk_count = read_dword(&ptr); TRACE("chunk count: %#x\n", chunk_count); for (i = 0; i < chunk_count; ++i) @@ -915,7 +919,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, const char *chunk_ptr; DWORD chunk_offset; - read_dword(&ptr, &chunk_offset); + chunk_offset = read_dword(&ptr); TRACE("chunk %u at offset %#x\n", i, chunk_offset); if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) @@ -926,8 +930,8 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, chunk_ptr = data + chunk_offset; - read_dword(&chunk_ptr, &chunk_tag); - read_dword(&chunk_ptr, &chunk_size); + chunk_tag = read_dword(&chunk_ptr); + chunk_size = read_dword(&chunk_ptr); if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { @@ -1265,7 +1269,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse } ptr = data + offset; - read_dword(&ptr, &dxbc_size); + dxbc_size = read_dword(&ptr); TRACE("dxbc size: %#x\n", dxbc_size); if (!require_space(ptr - data, 1, dxbc_size, data_size)) @@ -1409,7 +1413,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } ptr = data + offset; - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Type name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) @@ -1419,19 +1423,19 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Type name: %s.\n", debugstr_a(t->name)); - read_dword(&ptr, &type_kind); + type_kind = read_dword(&ptr); TRACE("Kind: %u.\n", type_kind); - read_dword(&ptr, &t->element_count); + t->element_count = read_dword(&ptr); TRACE("Element count: %u.\n", t->element_count); - read_dword(&ptr, &t->size_unpacked); + t->size_unpacked = read_dword(&ptr); TRACE("Unpacked size: %#x.\n", t->size_unpacked); - read_dword(&ptr, &t->stride); + t->stride = read_dword(&ptr); TRACE("Stride: %#x.\n", t->stride); - read_dword(&ptr, &t->size_packed); + t->size_packed = read_dword(&ptr); TRACE("Packed size %#x.\n", t->size_packed); switch (type_kind) @@ -1445,7 +1449,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_FAIL; } - read_dword(&ptr, &typeinfo); + typeinfo = read_dword(&ptr); t->member_count = 0; t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; @@ -1470,7 +1474,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_FAIL; } - read_dword(&ptr, &typeinfo); + typeinfo = read_dword(&ptr); t->member_count = 0; t->column_count = 0; t->row_count = 0; @@ -1493,7 +1497,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, return E_FAIL; } - read_dword(&ptr, &t->member_count); + t->member_count = read_dword(&ptr); TRACE("Member count: %u.\n", t->member_count); t->column_count = 0; @@ -1518,7 +1522,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, { struct d3d10_effect_type_member *typem = &t->members[i]; - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Member name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->name)) @@ -1528,7 +1532,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Member name: %s.\n", debugstr_a(typem->name)); - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Member semantic at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &typem->semantic)) @@ -1538,10 +1542,10 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Member semantic: %s.\n", debugstr_a(typem->semantic)); - read_dword(&ptr, &typem->buffer_offset); + typem->buffer_offset = read_dword(&ptr); TRACE("Member offset in struct: %#x.\n", typem->buffer_offset); - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Member type info at offset %#x.\n", offset); if (!(typem->type = get_fx10_type(t->effect, data, data_size, offset))) @@ -1841,7 +1845,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, { DWORD offset; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->name)) @@ -1851,7 +1855,7 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, } TRACE("Variable name: %s.\n", debugstr_a(v->name)); - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable type info at offset %#x.\n", offset); if (!(v->type = get_fx10_type(v->effect, data, data_size, offset))) @@ -1878,7 +1882,7 @@ static HRESULT parse_fx10_annotation(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, a))) return hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Annotation value is at offset %#x.\n", offset); switch (a->type->basetype) @@ -2009,7 +2013,7 @@ static BOOL read_value_list(const char *data, size_t data_size, uint32_t offset, } ptr = data + offset; - read_dword(&ptr, &count); + count = read_dword(&ptr); if (count != out_size) return FALSE; @@ -2024,8 +2028,8 @@ static BOOL read_value_list(const char *data, size_t data_size, uint32_t offset, { unsigned int out_idx = out_base * out_size + i; - read_dword(&ptr, &t); - read_dword(&ptr, &value); + t = read_dword(&ptr); + value = read_dword(&ptr); in_type = d3d10_variable_type(t, FALSE, &type_flags); TRACE("\t%s: %#x.\n", debug_d3d10_shader_variable_type(in_type), value); @@ -2129,8 +2133,8 @@ static HRESULT parse_fx10_preshader_instr(struct d3d10_preshader_parse_context * return E_FAIL; } - read_dword(ptr, (uint32_t *)&ins); - read_dword(ptr, &input_count); + *(uint32_t *)&ins = read_dword(ptr); + input_count = read_dword(ptr); *offset += 2 * sizeof(uint32_t); if (!(op_info = d3d10_effect_get_op_info(ins.opcode))) @@ -2155,15 +2159,15 @@ static HRESULT parse_fx10_preshader_instr(struct d3d10_preshader_parse_context * { uint32_t flags, regt, param_offset; - read_dword(ptr, &flags); + flags = read_dword(ptr); if (flags) { FIXME("Arguments flags are not supported %#x.\n", flags); return E_UNEXPECTED; } - read_dword(ptr, &regt); - read_dword(ptr, &param_offset); + regt = read_dword(ptr); + param_offset = read_dword(ptr); switch (regt) { @@ -2203,7 +2207,7 @@ static HRESULT parse_fx10_fxlc(void *ctx, const char *data, unsigned int data_si memcpy(ID3D10Blob_GetBufferPointer(p->code), data, data_size); ptr = data; - read_dword(&ptr, &ins_count); + ins_count = read_dword(&ptr); TRACE("%u instructions.\n", ins_count); for (i = 0; i < ins_count; ++i) @@ -2238,7 +2242,7 @@ static HRESULT parse_fx10_cli4(void *ctx, const char *data, unsigned int data_si return E_FAIL; } - read_dword(&ptr, &count); + count = read_dword(&ptr); TRACE("%u literal constants.\n", count); @@ -2292,13 +2296,13 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si return E_FAIL; } - read_dword(&ptr, &header.size); - read_dword(&ptr, &header.creator); - read_dword(&ptr, &header.version); - read_dword(&ptr, &header.constants); - read_dword(&ptr, &header.constantinfo); - read_dword(&ptr, &header.flags); - read_dword(&ptr, &header.target); + header.size = read_dword(&ptr); + header.creator = read_dword(&ptr); + header.version = read_dword(&ptr); + header.constants = read_dword(&ptr); + header.constantinfo = read_dword(&ptr); + header.flags = read_dword(&ptr); + header.target = read_dword(&ptr); if (!require_space(header.constantinfo, header.constants, sizeof(*info), data_size)) { @@ -2421,10 +2425,10 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size HRESULT hr; void *dst; - read_dword(ptr, &id); - read_dword(ptr, &idx); - read_dword(ptr, &operation); - read_dword(ptr, &value_offset); + id = read_dword(ptr); + idx = read_dword(ptr); + operation = read_dword(ptr); + value_offset = read_dword(ptr); if (id >= ARRAY_SIZE(property_infos)) { @@ -2531,8 +2535,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } data_ptr = data + value_offset; - read_dword(&data_ptr, &value_offset); - read_dword(&data_ptr, &variable_idx); + value_offset = read_dword(&data_ptr); + variable_idx = read_dword(&data_ptr); if (!fx10_get_string(data, data_size, value_offset, &name, &name_len)) { @@ -2609,8 +2613,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size } data_ptr = data + value_offset; - read_dword(&data_ptr, &value_offset); - read_dword(&data_ptr, &code_offset); + value_offset = read_dword(&data_ptr); + code_offset = read_dword(&data_ptr); if (!fx10_get_string(data, data_size, value_offset, &name, &name_len)) { @@ -2645,7 +2649,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size } data_ptr = data + code_offset; - read_dword(&data_ptr, &blob_size); + blob_size = read_dword(&data_ptr); if (!require_space(code_offset, 1, sizeof(uint32_t) + blob_size, data_size)) { @@ -2674,7 +2678,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size } data_ptr = data + value_offset; - read_dword(&data_ptr, &blob_size); + blob_size = read_dword(&data_ptr); if (!require_space(value_offset, 1, sizeof(uint32_t) + blob_size, data_size)) { @@ -2708,8 +2712,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } data_ptr = data + value_offset; - read_dword(&data_ptr, &value_offset); - read_dword(&data_ptr, &sodecl_offset); + value_offset = read_dword(&data_ptr); + sodecl_offset = read_dword(&data_ptr); TRACE("Effect object starts at offset %#x.\n", value_offset); @@ -2766,7 +2770,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, unsigned int i; HRESULT hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Pass name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &p->name)) @@ -2776,10 +2780,10 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, } TRACE("Pass name: %s.\n", debugstr_a(p->name)); - read_dword(ptr, &object_count); + object_count = read_dword(ptr); TRACE("Pass has %u effect objects.\n", object_count); - read_dword(ptr, &p->annotations.count); + p->annotations.count = read_dword(ptr); TRACE("Pass has %u annotations.\n", p->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, p->technique->effect, @@ -2813,7 +2817,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, DWORD offset; HRESULT hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Technique name at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &t->name)) @@ -2823,10 +2827,10 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, } TRACE("Technique name: %s.\n", debugstr_a(t->name)); - read_dword(ptr, &t->pass_count); + t->pass_count = read_dword(ptr); TRACE("Technique has %u passes\n", t->pass_count); - read_dword(ptr, &t->annotations.count); + t->annotations.count = read_dword(ptr); TRACE("Technique has %u annotations.\n", t->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, t->effect, @@ -2939,7 +2943,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, v))) return hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable semantic at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->semantic)) @@ -2949,13 +2953,13 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - read_dword(ptr, &buffer_offset); + buffer_offset = read_dword(ptr); TRACE("Variable offset in buffer: %#x.\n", buffer_offset); - read_dword(ptr, &default_value_offset); + default_value_offset = read_dword(ptr); TRACE("Variable default value offset: %#x.\n", default_value_offset); - read_dword(ptr, &flags); + flags = read_dword(ptr); TRACE("Variable flags: %#x.\n", flags); v->flag |= flags; @@ -2979,7 +2983,7 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, parse_fx10_default_value(&data_ptr, v); } - read_dword(ptr, &v->annotations.count); + v->annotations.count = read_dword(ptr); TRACE("Variable has %u annotations.\n", v->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, @@ -3047,7 +3051,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, v))) return hr; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Variable semantic at offset %#x.\n", offset); if (!fx10_copy_string(data, data_size, offset, &v->semantic)) @@ -3057,7 +3061,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - read_dword(ptr, &v->explicit_bind_point); + v->explicit_bind_point = read_dword(ptr); TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); /* Shared variable description contains only type information. */ @@ -3109,12 +3113,12 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, var = d3d10_array_get_element(v, i); - read_dword(ptr, &shader_offset); + shader_offset = read_dword(ptr); TRACE("Shader offset: %#x.\n", shader_offset); if (v->type->flags & D3D10_EOT_FLAG_GS_SO) { - read_dword(ptr, &sodecl_offset); + sodecl_offset = read_dword(ptr); TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); if (!fx10_copy_string(data, data_size, sodecl_offset, @@ -3184,7 +3188,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, var->u.state.index = vars->current; vars->v[vars->current++] = var; - read_dword(ptr, &prop_count); + prop_count = read_dword(ptr); TRACE("State object property count: %#x.\n", prop_count); memcpy(&var->u.state.desc, storage_info->default_state, storage_info->size); @@ -3211,7 +3215,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return E_FAIL; } - read_dword(ptr, &v->annotations.count); + v->annotations.count = read_dword(ptr); TRACE("Variable has %u annotations.\n", v->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, v->effect, @@ -3287,7 +3291,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char l->type->type_class = D3D10_SVC_OBJECT; l->type->effect = l->effect; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("%s buffer name at offset %#x.\n", prefix, offset); if (!fx10_copy_string(data, data_size, offset, &l->name)) @@ -3297,10 +3301,10 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char } TRACE("%s buffer name: %s.\n", prefix, debugstr_a(l->name)); - read_dword(ptr, &l->data_size); + l->data_size = read_dword(ptr); TRACE("%s buffer data size: %#x.\n", prefix, l->data_size); - read_dword(ptr, &d3d10_cbuffer_type); + d3d10_cbuffer_type = read_dword(ptr); TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type); switch(d3d10_cbuffer_type) @@ -3328,10 +3332,10 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char return E_FAIL; } - read_dword(ptr, &l->type->member_count); + l->type->member_count = read_dword(ptr); TRACE("%s buffer member count: %#x.\n", prefix, l->type->member_count); - read_dword(ptr, &l->explicit_bind_point); + l->explicit_bind_point = read_dword(ptr); TRACE("%s buffer explicit bind point: %#x.\n", prefix, l->explicit_bind_point); if (l->effect->flags & D3D10_EFFECT_IS_POOL) @@ -3339,7 +3343,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char if (local) { - read_dword(ptr, &l->annotations.count); + l->annotations.count = read_dword(ptr); TRACE("Local buffer has %u annotations.\n", l->annotations.count); if (FAILED(hr = parse_fx10_annotations(data, data_size, ptr, l->effect, @@ -3712,61 +3716,61 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s } /* Compiled target version (e.g. fx_4_0=0xfeff1001, fx_4_1=0xfeff1011). */ - read_dword(&ptr, &e->version); + e->version = read_dword(&ptr); TRACE("Target: %#x\n", e->version); - read_dword(&ptr, &e->local_buffer_count); + e->local_buffer_count = read_dword(&ptr); TRACE("Local buffer count: %u.\n", e->local_buffer_count); - read_dword(&ptr, &e->variable_count); + e->variable_count = read_dword(&ptr); TRACE("Variable count: %u\n", e->variable_count); - read_dword(&ptr, &e->local_variable_count); + e->local_variable_count = read_dword(&ptr); TRACE("Object count: %u\n", e->local_variable_count); - read_dword(&ptr, &e->shared_buffer_count); + e->shared_buffer_count = read_dword(&ptr); TRACE("Pool buffer count: %u\n", e->shared_buffer_count); - read_dword(&ptr, &unused); + unused = read_dword(&ptr); TRACE("Pool variable count: %u\n", unused); - read_dword(&ptr, &e->shared_object_count); + e->shared_object_count = read_dword(&ptr); TRACE("Pool objects count: %u\n", e->shared_object_count); - read_dword(&ptr, &e->technique_count); + e->technique_count = read_dword(&ptr); TRACE("Technique count: %u\n", e->technique_count); - read_dword(&ptr, &e->index_offset); + e->index_offset = read_dword(&ptr); TRACE("Index offset: %#x\n", e->index_offset); - read_dword(&ptr, &unused); + unused = read_dword(&ptr); TRACE("String count: %u\n", unused); - read_dword(&ptr, &e->texture_count); + e->texture_count = read_dword(&ptr); TRACE("Texture count: %u\n", e->texture_count); - read_dword(&ptr, &e->ds_states.count); + e->ds_states.count = read_dword(&ptr); TRACE("Depthstencilstate count: %u\n", e->ds_states.count); - read_dword(&ptr, &e->blend_states.count); + e->blend_states.count = read_dword(&ptr); TRACE("Blendstate count: %u\n", e->blend_states.count); - read_dword(&ptr, &e->rs_states.count); + e->rs_states.count = read_dword(&ptr); TRACE("Rasterizerstate count: %u\n", e->rs_states.count); - read_dword(&ptr, &e->samplers.count); + e->samplers.count = read_dword(&ptr); TRACE("Samplerstate count: %u\n", e->samplers.count); - read_dword(&ptr, &e->rtvs.count); + e->rtvs.count = read_dword(&ptr); TRACE("Rendertargetview count: %u\n", e->rtvs.count); - read_dword(&ptr, &e->dsvs.count); + e->dsvs.count = read_dword(&ptr); TRACE("Depthstencilview count: %u\n", e->dsvs.count); - read_dword(&ptr, &e->shaders.count); + e->shaders.count = read_dword(&ptr); TRACE("Used shader count: %u\n", e->shaders.count); - read_dword(&ptr, &e->anonymous_shader_count); + e->anonymous_shader_count = read_dword(&ptr); TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); if (!e->pool && (e->shared_object_count || e->shared_buffer_count)) -- 2.30.2

1 0

[PATCH 2/6] d3dcompiler/tests: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/asm.c | 58 ++--- dlls/d3dcompiler_43/tests/blob.c | 290 ++++++++++++------------- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 68 +++--- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 126 +++++------ dlls/d3dcompiler_43/tests/reflection.c | 205 +++++++++-------- dlls/d3dcompiler_46/tests/Makefile.in | 2 +- dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 8 files changed, 378 insertions(+), 375 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 1d59b23cbdb..6584ae92bea 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3dcompiler_43.dll IMPORTS = d3d9 user32 d3dcompiler_43 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=43 +EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asm.c \ diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 27f2c5b063d..61a6f3e2bc3 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -39,7 +39,7 @@ struct shader_test { static void dump_shader(DWORD *shader) { unsigned int i = 0, j = 0; do { - trace("0x%08x ", shader[i]); + trace("0x%08lx ", shader[i]); j++; i++; if(j == 6) trace("\n"); @@ -59,7 +59,7 @@ static void exec_tests(const char *name, struct shader_test tests[], unsigned in messages = NULL; hr = D3DAssemble(tests[i].text, strlen(tests[i].text), NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == S_OK, "Test %s, shader %d: D3DAssemble failed with error 0x%x - %d\n", name, i, hr, hr & 0x0000FFFF); + ok(hr == S_OK, "Test %s, shader %u: D3DAssemble failed with error %#lx - %ld.\n", name, i, hr, hr & 0xffff); if(messages) { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); @@ -1413,10 +1413,9 @@ static void failure_test(void) { shader = NULL; messages = NULL; hr = D3DAssemble(tests[i], strlen(tests[i]), NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "Failure test, shader %d: " - "expected D3DAssemble failure with D3DXERR_INVALIDDATA, " - "got 0x%x - %d\n", i, hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == D3DXERR_INVALIDDATA, "Test %u: Got unexpected hr %#lx.\n", i, hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1539,8 +1538,9 @@ static void assembleshader_test(void) { shader = NULL; messages = NULL; hr = D3DAssemble(test1, strlen(test1), NULL, defines, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == S_OK, "defines test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1549,14 +1549,16 @@ static void assembleshader_test(void) { /* NULL messages test */ shader = NULL; hr = D3DAssemble(test1, strlen(test1), NULL, defines, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, NULL); - ok(hr == S_OK, "NULL messages test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(shader) ID3D10Blob_Release(shader); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (shader) + ID3D10Blob_Release(shader); /* NULL shader test */ messages = NULL; hr = D3DAssemble(test1, strlen(test1), NULL, defines, NULL, D3DCOMPILE_SKIP_VALIDATION, NULL, &messages); - ok(hr == S_OK, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1567,8 +1569,9 @@ static void assembleshader_test(void) { include.ID3DInclude_iface.lpVtbl = &D3DInclude_Vtbl; hr = D3DAssemble(testshader, strlen(testshader), NULL, NULL, &include.ID3DInclude_iface, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == S_OK, "D3DInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1578,8 +1581,9 @@ static void assembleshader_test(void) { shader = NULL; messages = NULL; hr = D3DAssemble(NULL, 0, NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { + ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#lx.\n", hr); + if (messages) + { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); ID3D10Blob_Release(messages); } @@ -1638,7 +1642,7 @@ static void d3dpreprocess_test(void) shader = NULL; messages = NULL; hr = D3DPreprocess(test1, strlen(test1), NULL, defines, NULL, &shader, &messages); - ok(hr == S_OK, "pDefines test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1649,13 +1653,14 @@ static void d3dpreprocess_test(void) /* NULL messages test */ shader = NULL; hr = D3DPreprocess(test1, strlen(test1), NULL, defines, NULL, &shader, NULL); - ok(hr == S_OK, "NULL messages test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if (shader) ID3D10Blob_Release(shader); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (shader) + ID3D10Blob_Release(shader); /* NULL shader test */ messages = NULL; hr = D3DPreprocess(test1, strlen(test1), NULL, defines, NULL, NULL, &messages); - ok(hr == E_INVALIDARG, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1666,7 +1671,7 @@ static void d3dpreprocess_test(void) shader = NULL; messages = NULL; hr = D3DPreprocess(quotation_marks_test, strlen(quotation_marks_test), NULL, NULL, NULL, &shader, &messages); - todo_wine ok(hr == S_OK, "quotation marks test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1682,7 +1687,7 @@ static void d3dpreprocess_test(void) messages = NULL; hr = D3DPreprocess(include_test_shaders[i], strlen(include_test_shaders[i]), NULL, NULL, &include.ID3DInclude_iface, &shader, &messages); - ok(hr == S_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1695,7 +1700,7 @@ static void d3dpreprocess_test(void) shader = NULL; messages = NULL; hr = D3DPreprocess(NULL, 0, NULL, NULL, NULL, &shader, &messages); - ok(hr == E_INVALIDARG, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); if (messages) { trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -1727,14 +1732,13 @@ static void test_disassemble_shader(void) hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob); todo_wine #if D3D_COMPILER_VERSION >= 46 - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #else - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); #endif hr = D3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); - todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) ID3D10Blob_Release(blob); } diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 400d5940bf7..90e4ef3d7da 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -57,16 +57,16 @@ static void test_create_blob(void) ULONG refcount; hr = D3DCreateBlob(1, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DCreateBlob(0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DCreateBlob(0, &blob); - ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } static const D3D_BLOB_PART parts[] = @@ -128,55 +128,55 @@ static void test_get_blob_part(void) #endif hr = D3DCreateBlob(1, &blob2); - ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); blob = blob2; /* invalid cases */ hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 1, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], 0xffffffff, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_INPUT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 124, "GetBufferSize failed, got %lu, expected %u\n", size, 124); + ok(size == 124, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+9), "ISGN got %#x, expected %#x.\n", *(dword+9), TAG_ISGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 9), "ISGN got %#lx, expected %#lx.\n", *(dword + 9), TAG_ISGN); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -184,30 +184,30 @@ static void test_get_blob_part(void) if (parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_OUTPUT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 88, "GetBufferSize failed, got %lu, expected %u\n", size, 88); + ok(size == 88, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_OSGN == *(dword+9), "OSGN got %#x, expected %#x.\n", *(dword+9), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_OSGN == *(dword + 9), "OSGN got %#lx, expected %#lx.\n", *(dword + 9), TAG_OSGN); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -215,31 +215,31 @@ static void test_get_blob_part(void) if (parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 180, "GetBufferSize failed, got %lu, expected %u\n", size, 180); + ok(size == 180, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+10), "ISGN got %#x, expected %#x.\n", *(dword+10), TAG_ISGN); - ok(TAG_OSGN == *(dword+32), "OSGN got %#x, expected %#x.\n", *(dword+32), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 10), "ISGN got %#lx, expected %#lx.\n", *(dword + 10), TAG_ISGN); + ok(TAG_OSGN == *(dword + 32), "OSGN got %#lx, expected %#lx.\n", *(dword + 32), TAG_OSGN); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -249,41 +249,41 @@ static void test_get_blob_part(void) || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_ALL_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_DEBUG_INFO */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_DEBUG_INFO, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_LEGACY_SHADER */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_LEGACY_SHADER, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 92, "GetBufferSize failed, got %lu, expected %u\n", size, 92); + ok(size == 92, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + ok(test_blob_part[0] != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -292,21 +292,21 @@ static void test_get_blob_part(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_XNA_PREPASS_SHADER */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_XNA_PREPASS_SHADER, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 68, "GetBufferSize failed, got %lu, expected %u\n", size, 68); + ok(size == 68, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + ok(test_blob_part[0] != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -315,21 +315,21 @@ static void test_get_blob_part(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_XNA_SHADER */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_XNA_SHADER, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 68, "GetBufferSize failed, got %lu, expected %u\n", size, 68); + ok(size == 68, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + ok(test_blob_part[0] != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -338,82 +338,82 @@ static void test_get_blob_part(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* check corner cases for D3DStripShader */ hr = D3DStripShader(test_blob_part, test_blob_part[6], 0xffffffff, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); hr = D3DStripShader(test_blob_part, test_blob_part[6], 0, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); hr = D3DStripShader(NULL, test_blob_part[6], 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DStripShader failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(test_blob_part, 2, 0, &blob); - ok(hr == D3DERR_INVALIDCALL, "D3DStripShader failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(test_blob_part, test_blob_part[6], 0, NULL); - ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(NULL, test_blob_part[6], 0, NULL); - ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = D3DStripShader(test_blob_part, 0, 0, NULL); - ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3DCOMPILER_STRIP_DEBUG_INFO */ hr = D3DStripShader(test_blob_part, test_blob_part[6], D3DCOMPILER_STRIP_DEBUG_INFO, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 736, "GetBufferSize failed, got %lu, expected %u\n", size, 736); + ok(size == 736, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_XNAS == *(dword+16), "XNAS got %#x, expected %#x.\n", *(dword+16), TAG_XNAS); - ok(TAG_XNAP == *(dword+35), "XNAP got %#x, expected %#x.\n", *(dword+35), TAG_XNAP); - ok(TAG_Aon9 == *(dword+54), "Aon9 got %#x, expected %#x.\n", *(dword+54), TAG_Aon9); - ok(TAG_SHDR == *(dword+79), "SHDR got %#x, expected %#x.\n", *(dword+79), TAG_SHDR); - ok(TAG_STAT == *(dword+96), "STAT got %#x, expected %#x.\n", *(dword+96), TAG_STAT); - ok(TAG_RDEF == *(dword+127), "RDEF got %#x, expected %#x.\n", *(dword+127), TAG_RDEF); - ok(TAG_ISGN == *(dword+149), "ISGN got %#x, expected %#x.\n", *(dword+149), TAG_ISGN); - ok(TAG_OSGN == *(dword+171), "OSGN got %#x, expected %#x.\n", *(dword+171), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_XNAS == *(dword + 16), "XNAS got %#lx, expected %#lx.\n", *(dword + 16), TAG_XNAS); + ok(TAG_XNAP == *(dword + 35), "XNAP got %#lx, expected %#lx.\n", *(dword + 35), TAG_XNAP); + ok(TAG_Aon9 == *(dword + 54), "Aon9 got %#lx, expected %#lx.\n", *(dword + 54), TAG_Aon9); + ok(TAG_SHDR == *(dword + 79), "SHDR got %#lx, expected %#lx.\n", *(dword + 79), TAG_SHDR); + ok(TAG_STAT == *(dword + 96), "STAT got %#lx, expected %#lx.\n", *(dword + 96), TAG_STAT); + ok(TAG_RDEF == *(dword + 127), "RDEF got %#lx, expected %#lx.\n", *(dword + 127), TAG_RDEF); + ok(TAG_ISGN == *(dword + 149), "ISGN got %#lx, expected %#lx.\n", *(dword + 149), TAG_ISGN); + ok(TAG_OSGN == *(dword + 171), "OSGN got %#lx, expected %#lx.\n", *(dword + 171), TAG_OSGN); hr = D3DGetBlobPart(dword, size, D3D_BLOB_DEBUG_INFO, 0, &blob2); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3DCOMPILER_STRIP_REFLECTION_DATA */ hr = D3DStripShader(test_blob_part, test_blob_part[6], D3DCOMPILER_STRIP_REFLECTION_DATA, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 516, "GetBufferSize failed, got %lu, expected %u\n", size, 516); + ok(size == 516, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_XNAS == *(dword+14), "XNAS got %#x, expected %#x.\n", *(dword+14), TAG_XNAS); - ok(TAG_XNAP == *(dword+33), "XNAP got %#x, expected %#x.\n", *(dword+33), TAG_XNAP); - ok(TAG_Aon9 == *(dword+52), "Aon9 got %#x, expected %#x.\n", *(dword+52), TAG_Aon9); - ok(TAG_SHDR == *(dword+77), "SHDR got %#x, expected %#x.\n", *(dword+77), TAG_SHDR); - ok(TAG_ISGN == *(dword+94), "ISGN got %#x, expected %#x.\n", *(dword+94), TAG_ISGN); - ok(TAG_OSGN == *(dword+116), "OSGN got %#x, expected %#x.\n", *(dword+116), TAG_OSGN); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_XNAS == *(dword + 14), "XNAS got %#lx, expected %#lx.\n", *(dword + 14), TAG_XNAS); + ok(TAG_XNAP == *(dword + 33), "XNAP got %#lx, expected %#lx.\n", *(dword + 33), TAG_XNAP); + ok(TAG_Aon9 == *(dword + 52), "Aon9 got %#lx, expected %#lx.\n", *(dword + 52), TAG_Aon9); + ok(TAG_SHDR == *(dword + 77), "SHDR got %#lx, expected %#lx.\n", *(dword + 77), TAG_SHDR); + ok(TAG_ISGN == *(dword + 94), "ISGN got %#lx, expected %#lx.\n", *(dword + 94), TAG_ISGN); + ok(TAG_OSGN == *(dword + 116), "OSGN got %#lx, expected %#lx.\n", *(dword + 116), TAG_OSGN); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } /* @@ -619,14 +619,14 @@ static void test_get_blob_part2(void) /* D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 232, "GetBufferSize failed, got %lu, expected %u\n", size, 232); + ok(size == 232, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_PCSG == *(dword+9), "PCSG got %#x, expected %#x.\n", *(dword+9), TAG_PCSG); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_PCSG == *(dword + 9), "PCSG got %#lx, expected %#lx.\n", *(dword + 9), TAG_PCSG); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -634,32 +634,32 @@ static void test_get_blob_part2(void) if (parts[i] == D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_ALL_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 344, "GetBufferSize failed, got %lu, expected %u\n", size, 344); + ok(size == 344, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+11), "ISGN got %#x, expected %#x.\n", *(dword+11), TAG_ISGN); - ok(TAG_OSGN == *(dword+24), "OSGN got %#x, expected %#x.\n", *(dword+24), TAG_OSGN); - ok(TAG_PCSG == *(dword+37), "PCSG got %#x, expected %#x.\n", *(dword+37), TAG_PCSG); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 11), "ISGN got %#lx, expected %#lx.\n", *(dword + 11), TAG_ISGN); + ok(TAG_OSGN == *(dword + 24), "OSGN got %#lx, expected %#lx.\n", *(dword + 24), TAG_OSGN); + ok(TAG_PCSG == *(dword + 37), "PCSG got %#lx, expected %#lx.\n", *(dword + 37), TAG_PCSG); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -671,29 +671,29 @@ static void test_get_blob_part2(void) || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) { - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob2); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } else { - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); } } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_DEBUG_INFO */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_DEBUG_INFO, 0, &blob); - ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 4055, "GetBufferSize failed, got %lu, expected %u\n", size, 4055); + ok(size == 4055, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC != *dword, "DXBC failed got %#x.\n", *dword); + ok(TAG_DXBC != *dword, "DXBC failed got %#lx.\n", *dword); for (i = 0; i < ARRAY_SIZE(parts); i++) { @@ -702,63 +702,63 @@ static void test_get_blob_part2(void) #if D3D_COMPILER_VERSION >= 46 todo_wine #endif - ok(hr == expected, "D3DGetBlobPart failed, got %x, expected %x\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3D_BLOB_LEGACY_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_LEGACY_SHADER, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_XNA_PREPASS_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_PREPASS_SHADER, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3D_BLOB_XNA_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_SHADER, 0, &blob); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* D3DCOMPILER_STRIP_DEBUG_INFO */ hr = D3DStripShader(test_blob_part2, test_blob_part2[6], D3DCOMPILER_STRIP_DEBUG_INFO, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 952, "GetBufferSize failed, got %lu, expected %u\n", size, 952); + ok(size == 952, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_RDEF == *(dword+14), "RDEF got %#x, expected %#x.\n", *(dword+14), TAG_RDEF); - ok(TAG_ISGN == *(dword+44), "ISGN got %#x, expected %#x.\n", *(dword+44), TAG_ISGN); - ok(TAG_OSGN == *(dword+57), "OSGN got %#x, expected %#x.\n", *(dword+57), TAG_OSGN); - ok(TAG_PCSG == *(dword+70), "PCSG got %#x, expected %#x.\n", *(dword+70), TAG_PCSG); - ok(TAG_SHEX == *(dword+119), "SHEX got %#x, expected %#x.\n", *(dword+119), TAG_SHEX); - ok(TAG_STAT == *(dword+199), "STAT got %#x, expected %#x.\n", *(dword+199), TAG_STAT); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_RDEF == *(dword + 14), "RDEF got %#lx, expected %#lx.\n", *(dword + 14), TAG_RDEF); + ok(TAG_ISGN == *(dword + 44), "ISGN got %#lx, expected %#lx.\n", *(dword + 44), TAG_ISGN); + ok(TAG_OSGN == *(dword + 57), "OSGN got %#lx, expected %#lx.\n", *(dword + 57), TAG_OSGN); + ok(TAG_PCSG == *(dword + 70), "PCSG got %#lx, expected %#lx.\n", *(dword + 70), TAG_PCSG); + ok(TAG_SHEX == *(dword + 119), "SHEX got %#lx, expected %#lx.\n", *(dword + 119), TAG_SHEX); + ok(TAG_STAT == *(dword + 199), "STAT got %#lx, expected %#lx.\n", *(dword + 199), TAG_STAT); hr = D3DGetBlobPart(dword, size, D3D_BLOB_DEBUG_INFO, 0, &blob2); - ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); /* D3DCOMPILER_STRIP_REFLECTION_DATA */ hr = D3DStripShader(test_blob_part2, test_blob_part2[6], D3DCOMPILER_STRIP_REFLECTION_DATA, &blob); - ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = ID3D10Blob_GetBufferSize(blob); - ok(size == 4735, "GetBufferSize failed, got %lu, expected %u\n", size, 4735); + ok(size == 4735, "Got unexpected size %Iu.\n", size); dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); - ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); - ok(TAG_ISGN == *(dword+13), "ISGN got %#x, expected %#x.\n", *(dword+13), TAG_ISGN); - ok(TAG_OSGN == *(dword+26), "OSGN got %#x, expected %#x.\n", *(dword+26), TAG_OSGN); - ok(TAG_PCSG == *(dword+39), "PCSG got %#x, expected %#x.\n", *(dword+39), TAG_PCSG); - ok(TAG_SHEX == *(dword+88), "SHEX got %#x, expected %#x.\n", *(dword+88), TAG_SHEX); - ok(TAG_SDBG == *(dword+168), "SDBG got %#x, expected %#x.\n", *(dword+168), TAG_SDBG); + ok(TAG_DXBC == *dword, "DXBC got %#lx, expected %#lx.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword + 13), "ISGN got %#lx, expected %#lx.\n", *(dword + 13), TAG_ISGN); + ok(TAG_OSGN == *(dword + 26), "OSGN got %#lx, expected %#lx.\n", *(dword + 26), TAG_OSGN); + ok(TAG_PCSG == *(dword + 39), "PCSG got %#lx, expected %#lx.\n", *(dword + 39), TAG_PCSG); + ok(TAG_SHEX == *(dword + 88), "SHEX got %#lx, expected %#lx.\n", *(dword + 88), TAG_SHEX); + ok(TAG_SDBG == *(dword + 168), "SDBG got %#lx, expected %#lx.\n", *(dword + 168), TAG_SDBG); refcount = ID3D10Blob_Release(blob); - ok(!refcount, "ID3DBlob has %u references left\n", refcount); + ok(!refcount, "ID3DBlob has %lu references left.\n", refcount); } #if D3D_COMPILER_VERSION >= 46 @@ -820,10 +820,10 @@ static void test_D3DReadFileToBlob(void) HRESULT hr; hr = D3DReadFileToBlob(filename, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); hr = D3DReadFileToBlob(filename, &blob); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); if (0) { @@ -839,7 +839,7 @@ static void test_D3DReadFileToBlob(void) return; } hr = D3DReadFileToBlob(filename, &blob); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); data_size = ID3D10Blob_GetBufferSize(blob); ok(!data_size, "Got unexpected data size.\n"); DeleteFileW(filename); @@ -851,7 +851,7 @@ static void test_D3DReadFileToBlob(void) return; } hr = D3DReadFileToBlob(filename, &blob); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); data_size = ID3D10Blob_GetBufferSize(blob); ok(data_size == ARRAY_SIZE(test_cso_data), "Got unexpected data size.\n"); data = ID3D10Blob_GetBufferPointer(blob); @@ -870,21 +870,21 @@ static void test_D3DWriteBlobToFile(void) GetTempFileNameW(temp_dir, NULL, 0, filename); hr = D3DCreateBlob(16, &blob); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = D3DWriteBlobToFile(blob, filename, FALSE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Got unexpected hr %#lx.\n", hr); hr = D3DWriteBlobToFile(blob, filename, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); DeleteFileW(filename); hr = D3DWriteBlobToFile(blob, filename, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = D3DWriteBlobToFile(blob, filename, FALSE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Got unexpected hr %#lx.\n", hr); DeleteFileW(filename); diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 8e19d4d5aa3..5f7846a479b 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -47,7 +47,7 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const HRESULT hr; hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, flags, 0, &blob, &errors); - ok_(__FILE__, line)(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) { if (winetest_debug > 1) @@ -128,12 +128,12 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) HRESULT hr; hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); - ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIDevice_Release(dxgi_device); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); dxgi_desc.BufferDesc.Width = 640; @@ -153,7 +153,7 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) dxgi_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &dxgi_desc, &swapchain); - ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIFactory_Release(factory); return swapchain; @@ -195,10 +195,10 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context) context->swapchain = create_swapchain(context->device, context->window); hr = ID3D11Device_CreateTexture2D(context->device, &texture_desc, NULL, &context->rt); - ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); hr = ID3D11Device_CreateRenderTargetView(context->device, (ID3D11Resource *)context->rt, NULL, &context->rtv); - ok_(__FILE__, line)(hr == S_OK, "Failed to create rendertarget view, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create rendertarget view, hr %#lx.\n", hr); ID3D11Device_GetImmediateContext(context->device, &context->immediate_context); @@ -234,7 +234,7 @@ static void release_test_context_(unsigned int line, struct test_context *contex DestroyWindow(context->window); ref = ID3D11Device_Release(context->device); - ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref); + ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); } #define create_buffer(a, b, c, d) create_buffer_(__LINE__, a, b, c, d) @@ -252,7 +252,7 @@ static ID3D11Buffer *create_buffer_(unsigned int line, ID3D11Device *device, HRESULT hr; hr = ID3D11Device_CreateBuffer(device, &buffer_desc, data ? &resource_data : NULL, &buffer); - ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create buffer, hr %#lx.\n", hr); return buffer; } @@ -289,11 +289,11 @@ static void draw_quad_(unsigned int line, struct test_context *context, ID3D10Bl hr = ID3D11Device_CreateInputLayout(device, default_layout_desc, ARRAY_SIZE(default_layout_desc), ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), &context->input_layout); - ok_(__FILE__, line)(hr == S_OK, "Failed to create input layout, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create input layout, hr %#lx.\n", hr); hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), NULL, &context->vs); - ok_(__FILE__, line)(hr == S_OK, "Failed to create vertex shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create vertex shader, hr %#lx.\n", hr); } if (!context->vb) @@ -301,7 +301,7 @@ static void draw_quad_(unsigned int line, struct test_context *context, ID3D10Bl hr = ID3D11Device_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), ID3D10Blob_GetBufferSize(ps_code), NULL, &ps); - ok_(__FILE__, line)(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); ID3D11DeviceContext_IASetInputLayout(context->immediate_context, context->input_layout); ID3D11DeviceContext_IASetPrimitiveTopology(context->immediate_context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); @@ -333,11 +333,11 @@ static void init_readback(struct test_context *context, struct readback *rb) texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; texture_desc.MiscFlags = 0; hr = ID3D11Device_CreateTexture2D(context->device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_CopyResource(context->immediate_context, rb->resource, (ID3D11Resource *)context->rt); hr = ID3D11DeviceContext_Map(context->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &rb->map_desc); - ok(hr == S_OK, "Failed to map texture, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } static void release_readback(struct test_context *context, struct readback *rb) @@ -604,16 +604,16 @@ static void test_sampling(void) return; hr = ID3D11Device_CreateTexture2D(test_context.device, &texture_desc, &resource_data, &texture); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; srv_desc.Texture2D.MipLevels = 1; hr = ID3D11Device_CreateShaderResourceView(test_context.device, (ID3D11Resource *)texture, &srv_desc, &srv); - ok(hr == S_OK, "Failed to create SRV, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShaderResources(test_context.immediate_context, 0, 1, &srv); hr = ID3D11Device_CreateSamplerState(test_context.device, &sampler_desc, &sampler); - ok(hr == S_OK, "Failed to create sampler, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetSamplers(test_context.immediate_context, 0, 1, &sampler); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -831,10 +831,10 @@ static void test_reflection(void) hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ConstantBuffers == ARRAY_SIZE(vs_buffers), "Got %u buffers.\n", shader_desc.ConstantBuffers); ok(shader_desc.BoundResources == ARRAY_SIZE(vs_bindings), "Got %u resources.\n", shader_desc.BoundResources); @@ -844,7 +844,7 @@ static void test_reflection(void) cbuffer = reflection->lpVtbl->GetConstantBufferByIndex(reflection, i); hr = cbuffer->lpVtbl->GetDesc(cbuffer, &buffer_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(buffer_desc.Name, vs_buffers[i].desc.Name), "Got name %s.\n", debugstr_a(buffer_desc.Name)); ok(buffer_desc.Type == vs_buffers[i].desc.Type, "Got type %#x.\n", buffer_desc.Type); ok(buffer_desc.Variables == vs_buffers[i].desc.Variables, "Got %u variables.\n", buffer_desc.Variables); @@ -859,7 +859,7 @@ static void test_reflection(void) var = cbuffer->lpVtbl->GetVariableByIndex(cbuffer, j); hr = var->lpVtbl->GetDesc(var, &var_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, expect->var_desc.Name), "Got name %s.\n", debugstr_a(var_desc.Name)); ok(var_desc.StartOffset == expect->var_desc.StartOffset, "Got offset %u.\n", var_desc.StartOffset); ok(var_desc.Size == expect->var_desc.Size, "Got size %u.\n", var_desc.Size); @@ -868,7 +868,7 @@ static void test_reflection(void) type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_type_desc(&type_desc, &expect->type_desc); for (k = 0; k < type_desc.Members; ++k) @@ -877,7 +877,7 @@ static void test_reflection(void) field = type->lpVtbl->GetMemberTypeByIndex(type, k); hr = field->lpVtbl->GetDesc(field, &type_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_type_desc(&type_desc, &vs_buffers[i].vars[j].field_types[k]); winetest_pop_context(); @@ -896,7 +896,7 @@ static void test_reflection(void) winetest_push_context("Binding %u", i); hr = reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_resource_binding(&desc, &vs_bindings[i]); winetest_pop_context(); @@ -904,15 +904,15 @@ static void test_reflection(void) ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); - ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); code = compile_shader_flags(ps_source, "ps_4_0", D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ConstantBuffers, "Got %u buffers.\n", shader_desc.ConstantBuffers); ok(shader_desc.BoundResources == ARRAY_SIZE(ps_bindings), "Got %u resources.\n", shader_desc.BoundResources); @@ -923,7 +923,7 @@ static void test_reflection(void) winetest_push_context("Binding %u", i); hr = reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_resource_binding(&desc, &ps_bindings[i]); winetest_pop_context(); @@ -931,7 +931,7 @@ static void test_reflection(void) ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); - ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); } static void check_parameter_desc(const D3D11_SIGNATURE_PARAMETER_DESC *desc, @@ -1139,10 +1139,10 @@ static void test_semantic_reflection(void) hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = reflection->lpVtbl->GetDesc(reflection, &shader_desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(shader_desc.InputParameters == tests[i].input_count, "Got %u input parameters.\n", shader_desc.InputParameters); todo_wine ok(shader_desc.OutputParameters == tests[i].output_count, @@ -1152,7 +1152,7 @@ static void test_semantic_reflection(void) { winetest_push_context("Input %u", j); hr = reflection->lpVtbl->GetInputParameterDesc(reflection, j, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_parameter_desc(&desc, &tests[i].inputs[j]); winetest_pop_context(); } @@ -1161,14 +1161,14 @@ static void test_semantic_reflection(void) { winetest_push_context("Output %u", j); hr = reflection->lpVtbl->GetOutputParameterDesc(reflection, j, &desc); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_parameter_desc(&desc, &tests[i].outputs[j]); winetest_pop_context(); } ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); - ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); winetest_pop_context(); } diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index febfa5a7d4f..4461a3f869f 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -106,7 +106,7 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const HRESULT hr; hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) { if (winetest_debug > 1) @@ -141,12 +141,12 @@ static IDirect3DDevice9 *create_device(HWND window) IDirect3D9_Release(d3d); if (FAILED(hr)) { - skip("Failed to create a 3D device, hr %#x.\n", hr); + skip("Failed to create a 3D device, hr %#lx.\n", hr); return NULL; } hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0) || caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) { skip("No shader model 2 support.\n"); @@ -157,13 +157,13 @@ static IDirect3DDevice9 *create_device(HWND window) if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A32B32G32R32F, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL))) { - skip("Failed to create an A32B32G32R32F surface, hr %#x.\n", hr); + skip("Failed to create an A32B32G32R32F surface, hr %#lx.\n", hr); IDirect3DDevice9_Release(device); return NULL; } - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); - ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); IDirect3DSurface9_Release(rt); return device; @@ -198,7 +198,7 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context) static void release_test_context_(unsigned int line, struct test_context *context) { ULONG ref = IDirect3DDevice9_Release(context->device); - ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref); + ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); DestroyWindow(context->window); } @@ -238,33 +238,33 @@ static void draw_quad_(unsigned int line, IDirect3DDevice9 *device, ID3D10Blob * "}"; hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex declaration, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex declaration, hr %#lx.\n", hr); vs_code = compile_shader(vs_source, "vs_2_0"); hr = IDirect3DDevice9_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), &vs); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create vertex shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, vs); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set vertex shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), &ps); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to create pixel shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, ps); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to set pixel shader, hr %#lx.\n", hr); hr = IDirect3DDevice9_BeginScene(device); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to draw, hr %#lx.\n", hr); IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DVertexShader9_Release(vs); @@ -285,19 +285,19 @@ static void init_readback(IDirect3DDevice9 *device, struct readback *rb) HRESULT hr; hr = IDirect3DDevice9Ex_GetRenderTarget(device, 0, &rt); - ok(hr == D3D_OK, "Failed to get render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DSurface9_GetDesc(rt, &desc); - ok(hr == D3D_OK, "Failed to get surface desc, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, desc.Width, desc.Height, desc.Format, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); - ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9Ex_GetRenderTargetData(device, rt, rb->surface); - ok(hr == D3D_OK, "Failed to get render target data, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DSurface9_LockRect(rb->surface, &rb->rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "Failed to lock surface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); IDirect3DSurface9_Release(rt); } @@ -460,9 +460,9 @@ static void test_swizzle(void) if (i == 0) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); } draw_quad(device, ps_code); @@ -505,19 +505,19 @@ static void test_math(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$u", 2.5f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$v", 0.3f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$w", 0.2f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$x", 0.7f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$y", 0.1f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetFloat(constants, device, "$z", 1.5f); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(device, ps_code); @@ -661,9 +661,9 @@ static void test_float_vectors(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constants, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetInt(constants, device, "i", 2); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(device, ps_code); @@ -882,11 +882,11 @@ static void test_majority(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "r", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "c", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(test_context.device, ps_code); @@ -902,11 +902,11 @@ static void test_majority(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "r", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetMatrix(constants, device, "c", &matrix); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(test_context.device, ps_code); @@ -1039,9 +1039,9 @@ static void test_global_initializer(void) if (ps_code) { hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_SetDefaults(constants, test_context.device); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ID3DXConstantTable_Release(constants); draw_quad(test_context.device, ps_code); @@ -1104,24 +1104,24 @@ static void test_samplers(void) hr = IDirect3DDevice9_CreateTexture(test_context.device, 2, 2, 1, D3DUSAGE_DYNAMIC, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); - ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DTexture9_LockRect(texture, 0, &map_desc, NULL, D3DLOCK_DISCARD); - ok(hr == D3D_OK, "Failed to map texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); memset(map_desc.pBits, 0, 2 * map_desc.Pitch); ((DWORD *)map_desc.pBits)[1] = 0x00ff00ff; hr = IDirect3DTexture9_UnlockRect(texture, 0); - ok(hr == D3D_OK, "Failed to unmap texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetTexture(test_context.device, 0, (IDirect3DBaseTexture9 *)texture); - ok(hr == D3D_OK, "Failed to set texture, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetSamplerState(test_context.device, 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); - ok(hr == D3D_OK, "Failed to set sampler state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice9_Clear(test_context.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(255, 0, 0), 1.0f, 0); - ok(hr == D3D_OK, "Test %u: Failed to clear, hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); todo_wine ps_code = compile_shader(tests[i], "ps_2_0"); if (ps_code) { @@ -1253,11 +1253,11 @@ static void test_constant_table(void) return; hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3DXConstantTable_GetDesc(constants, &table_desc); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); - ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got Version %#x.\n", table_desc.Version); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got unexpected version %#lx.\n", table_desc.Version); ok(table_desc.Constants == ARRAY_SIZE(expect_constants), "Got %u constants.\n", table_desc.Constants); for (i = 0; i < table_desc.Constants; ++i) @@ -1269,7 +1269,7 @@ static void test_constant_table(void) memset(&desc, 0xcc, sizeof(desc)); count = 1; hr = ID3DXConstantTable_GetConstantDesc(constants, handle, &desc, &count); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ok(count == 1, "Got count %u.\n", count); sprintf(prefix, "Test %u", i); check_constant_desc(prefix, &desc, &expect_constants[i], FALSE); @@ -1283,7 +1283,7 @@ static void test_constant_table(void) memset(&desc, 0xcc, sizeof(desc)); count = 1; hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ok(count == 1, "Got count %u.\n", count); sprintf(prefix, "Test %u, %u", i, j); check_constant_desc(prefix, &desc, &expect_fields_f[j], !!j); @@ -1296,7 +1296,7 @@ static void test_constant_table(void) memset(&desc, 0xcc, sizeof(desc)); count = 1; hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); - ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); ok(count == 1, "Got count %u.\n", count); sprintf(prefix, "Test %u", i); check_constant_desc(prefix, &desc, &expect_fields_j, FALSE); @@ -1434,7 +1434,7 @@ static void test_fail(void) { compiled = errors = NULL; hr = D3DCompile(tests[i], strlen(tests[i]), NULL, NULL, NULL, "test", targets[j], 0, 0, &compiled, &errors); - todo_wine ok(hr == E_FAIL, "Test %u, target %s, got unexpected hr %#x.\n", i, targets[j], hr); + todo_wine ok(hr == E_FAIL, "Test %u, target %s: Got unexpected hr %#lx.\n", i, targets[j], hr); if (hr == E_FAIL) { ok(!!errors, "Test %u, target %s, expected non-NULL error blob.\n", i, targets[j]); @@ -1631,7 +1631,7 @@ static void test_include(void) hr = tests[i](filename_a, &include.ID3DInclude_iface, &blob, &errors); todo_wine_if (i != 0) { - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } todo_wine_if (i == 1) @@ -1644,7 +1644,7 @@ static void test_include(void) #if D3D_COMPILER_VERSION >= 46 hr = tests[i](NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); - todo_wine_if (i == 0) ok(hr == (i == 0 ? D3DXERR_INVALIDDATA : E_FAIL), "Got hr %#x.\n", hr); + todo_wine_if (i == 0) ok(hr == (i == 0 ? D3DXERR_INVALIDDATA : E_FAIL), "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!!errors, "Got unexpected errors.\n"); ID3D10Blob_Release(errors); @@ -1656,7 +1656,7 @@ static void test_include(void) hr = tests[i](filename_a, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); todo_wine_if (i != 0) { - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } todo_wine_if (i == 1) @@ -1674,12 +1674,12 @@ static void test_include(void) #if D3D_COMPILER_VERSION >= 46 hr = D3DCompileFromFile(L"nonexistent", NULL, NULL, "main", "vs_2_0", 0, 0, &blob, &errors); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got hr %#x.\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); hr = D3DCompileFromFile(filename, NULL, NULL, "main", "ps_2_0", 0, 0, &blob, &errors); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!blob, "Got unexpected blob.\n"); ok(!!errors, "Got unexpected errors.\n"); trace("%s.\n", (char *)ID3D10Blob_GetBufferPointer(errors)); @@ -1687,7 +1687,7 @@ static void test_include(void) errors = NULL; hr = D3DCompileFromFile(filename, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); if (blob) @@ -1700,7 +1700,7 @@ static void test_include(void) * instead of using the immediate parent, as it would be the case for * standard C preprocessor includes. */ hr = D3DCompileFromFile(filename, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); if (blob) @@ -1712,7 +1712,7 @@ static void test_include(void) sprintf(ps_absolute_buffer, ps_absolute_template, include_filename); hr = D3DCompile(ps_absolute_buffer, sizeof(ps_absolute_buffer), filename_a, NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); todo_wine ok(!errors, "Got unexpected errors.\n"); if (blob) @@ -1731,7 +1731,7 @@ static void test_include(void) hr = tests[i](NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, &blob, &errors); todo_wine_if (i != 0) { - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!blob, "Got unexpected blob.\n"); } todo_wine_if (i == 1) @@ -1746,7 +1746,7 @@ static void test_include(void) } hr = D3DCompileFromFile(L"source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!!blob, "Got unexpected blob.\n"); ok(!errors, "Got unexpected errors.\n"); if (blob) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 13769d57e34..9c8247790c5 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -22,9 +22,6 @@ * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect */ -#ifndef WINE_NO_LONG_TYPES -#define WINE_NO_LONG_TYPES -#endif #define COBJMACROS #include "initguid.h" #include "d3dcompiler.h" @@ -93,22 +90,22 @@ static void test_reflection_references(void) ULONG count; hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D11ShaderReflection, (void **)&ref11_test); - ok(hr == S_OK, "QueryInterface failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); count = ref11_test->lpVtbl->Release(ref11_test); - ok(count == 1, "Release failed %u\n", count); + ok(count == 1, "Release failed %lu\n", count); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&ref10); - ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == E_NOINTERFACE, "QueryInterface failed, got %x, expected %x\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Release failed %u\n", count); + ok(!count, "Got unexpected count %lu.\n", count); /* check invalid cases */ #if D3D_COMPILER_VERSION >= 46 @@ -118,21 +115,21 @@ static void test_reflection_references(void) #endif hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10); ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, - "D3DReflect failed, got %x, expected %x\n", hr, expected); + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, - "D3DReflect failed, got %x, expected %x\n", hr, expected); + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DReflect(NULL, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); /* returns different errors with different sizes */ hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION >= 46 expected = D3DERR_INVALIDCALL; @@ -140,19 +137,19 @@ static void test_reflection_references(void) expected = E_FAIL; #endif hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, 31, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == D3DERR_INVALIDCALL, "Got %x, expected %x.\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = D3DReflect(test_reflection_blob, 32, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); hr = D3DReflect(test_reflection_blob, test_reflection_blob[6]-1, &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == expected, "Got %x, expected %x.\n", hr, expected); + ok(hr == expected, "Got unexpected hr %#lx, expected %#lx.\n", hr, expected); } #endif @@ -168,51 +165,52 @@ static void test_reflection_interfaces(void) expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); /* Broken with older d3dcompiler_46, d3dcompiler_47. */ - ok(hr == expected_hr || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + ok(hr == expected_hr || broken(hr == E_NOINTERFACE), + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); if (hr != S_OK) return; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D11ShaderReflection, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (void *)ref12, "Got unexpected interfaces %p, %p.\n", iface, ref12); hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == iunk, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iunk); iface->lpVtbl->Release(iface); hr = ref12->lpVtbl->QueryInterface(ref12, &IID_IUnknown, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (IUnknown *)ref12, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iface); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D12ShaderReflection, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (void *)ref11, "Got unexpected interfaces %p, %p.\n", iface, ref11); hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == iunk, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iunk); iface->lpVtbl->Release(iface); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_IUnknown, (void **)&iface); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(iface == (IUnknown *)ref11, "Got unexpected iface %p.\n", iface); iface->lpVtbl->Release(iface); hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&iface); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D10ShaderReflection, (void **)&iface); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); count = ref12->lpVtbl->Release(ref12); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); count = ref11->lpVtbl->Release(ref11); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } #endif @@ -402,15 +400,15 @@ static void test_reflection_desc_vs(void) #endif hr = call_reflect(test_reflection_desc_vs_blob, test_reflection_desc_vs_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D12ShaderReflection, (void **)&ref12); hr = ref11->lpVtbl->GetDesc(ref11, NULL); - ok(hr == E_FAIL, "GetDesc failed %x\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetDesc(ref11, &sdesc11); - ok(hr == S_OK, "GetDesc failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(sdesc11.Version == 65601, "GetDesc failed, got %u, expected %u\n", sdesc11.Version, 65601); ok(strcmp(sdesc11.Creator, (char*) shader_creator) == 0, "GetDesc failed, got \"%s\", expected \"%s\"\n", sdesc11.Creator, (char*)shader_creator); @@ -454,7 +452,7 @@ static void test_reflection_desc_vs(void) if (ref12) { hr = ref12->lpVtbl->GetDesc(ref12, &sdesc12); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!memcmp(&sdesc11, &sdesc12, sizeof(sdesc12)), "D3D11 and D3D12 descs do not match.\n"); } @@ -503,7 +501,7 @@ static void test_reflection_desc_vs(void) pdesc = &test_reflection_desc_vs_resultin[i]; hr = ref11->lpVtbl->GetInputParameterDesc(ref11, i, &desc11); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!strcmp(desc11.SemanticName, pdesc->SemanticName), "Got unexpected SemanticName \"%s\", i %u.\n", desc11.SemanticName, i); @@ -529,7 +527,7 @@ static void test_reflection_desc_vs(void) if (ref12) { hr = ref12->lpVtbl->GetInputParameterDesc(ref12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!memcmp(&desc12, &desc11, sizeof(desc11)), "D3D11 and D3D12 descs do not match.\n"); } @@ -540,7 +538,7 @@ static void test_reflection_desc_vs(void) pdesc = &test_reflection_desc_vs_resultout[i]; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, i, &desc11); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!strcmp(desc11.SemanticName, pdesc->SemanticName), "Got unexpected SemanticName \"%s\", i %u.\n", desc11.SemanticName, i); @@ -566,7 +564,7 @@ static void test_reflection_desc_vs(void) if (ref12) { hr = ref12->lpVtbl->GetOutputParameterDesc(ref12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, i %u.\n", hr, i); ok(!memcmp(&desc12, &desc11, sizeof(desc11)), "D3D11 and D3D12 descs do not match.\n"); } @@ -575,11 +573,11 @@ static void test_reflection_desc_vs(void) if (ref12) { count = ref12->lpVtbl->Release(ref12); - ok(count == 1, "Got unexpected ref count %u.\n", count); + ok(count == 1, "Got unexpected ref count %lu.\n", count); } count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Got unexpected ref count %u.\n", count); + ok(count == 0, "Got unexpected ref count %lu.\n", count); } /* @@ -758,10 +756,10 @@ static void test_reflection_desc_ps(void) #endif hr = call_reflect(test_reflection_desc_ps_blob, test_reflection_desc_ps_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetDesc(ref11, &sdesc11); - ok(hr == S_OK, "GetDesc failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(sdesc11.Version == 65, "GetDesc failed, got %u, expected %u\n", sdesc11.Version, 65); ok(strcmp(sdesc11.Creator, (char*) shader_creator) == 0, "GetDesc failed, got \"%s\", expected \"%s\"\n", sdesc11.Creator, (char*)shader_creator); @@ -818,20 +816,20 @@ static void test_reflection_desc_ps(void) /* check invalid Get*ParameterDesc cases*/ hr = ref11->lpVtbl->GetInputParameterDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "GetInputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetInputParameterDesc(ref11, 0xffffffff, &desc); - ok(hr == E_INVALIDARG, "GetInputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "GetOutputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0xffffffff, &desc); - ok(hr == E_INVALIDARG, "GetOutputParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION hr = ref11->lpVtbl->GetPatchConstantParameterDesc(ref11, 0, &desc); - ok(hr == E_INVALIDARG, "GetPatchConstantParameterDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #endif /* GetIn/OutputParameterDesc */ @@ -840,7 +838,7 @@ static void test_reflection_desc_ps(void) pdesc = &test_reflection_desc_ps_resultin[i]; hr = ref11->lpVtbl->GetInputParameterDesc(ref11, i, &desc); - ok(hr == S_OK, "GetInputParameterDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc.SemanticName, pdesc->SemanticName), "GetInputParameterDesc(%u) SemanticName failed, got \"%s\", expected \"%s\"\n", i, desc.SemanticName, pdesc->SemanticName); @@ -868,7 +866,7 @@ static void test_reflection_desc_ps(void) pdesc = &test_reflection_desc_ps_resultout[i]; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, i, &desc); - ok(hr == S_OK, "GetOutputParameterDesc(%u) failed, got %x, expected %x\n", i, hr, S_OK); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc.SemanticName, pdesc->SemanticName), "GetOutputParameterDesc(%u) SemanticName failed, got \"%s\", expected \"%s\"\n", i, desc.SemanticName, pdesc->SemanticName); @@ -898,7 +896,7 @@ static void test_reflection_desc_ps(void) } count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "Release failed %u\n", count); + ok(!count, "Got unexpected count %lu.\n", count); } /* The following shaders are stripped, in order to show that the correct @@ -1038,17 +1036,17 @@ static void test_reflection_desc_ps_output(void) hr = call_reflect(tests[i].blob, tests[i].blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); if (!D3D_COMPILER_VERSION) { - todo_wine ok(hr == E_INVALIDARG, "(%u): got unexpected hr %x.\n", i, hr); + todo_wine ok(hr == E_INVALIDARG, "%u: Got unexpected hr %#lx.\n", i, hr); if (SUCCEEDED(hr)) ref11->lpVtbl->Release(ref11); continue; } - ok(hr == S_OK, "(%u): got unexpected hr %x.\n", i, hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); pdesc = &tests[i].desc; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0, &desc); - ok(hr == S_OK, "(%u): GetOutputParameterDesc failed, got %x, expected %x\n", i, hr, S_OK); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc.SemanticName, pdesc->SemanticName), "(%u): GetOutputParameterDesc SemanticName failed, got \"%s\", expected \"%s\"\n", i, desc.SemanticName, pdesc->SemanticName); @@ -1077,7 +1075,7 @@ static void test_reflection_desc_ps_output(void) ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); count = ref11->lpVtbl->Release(ref11); - ok(count == 0, "(%u): Release failed %u\n", i, count); + ok(!count, "%u: Got unexpected count %lu.\n", i, count); } } @@ -1181,7 +1179,8 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE expected_hr = D3D_COMPILER_VERSION < 47 && target_version >= 0x501 ? E_INVALIDARG : S_OK; /* Older d3dcompiler_47 does not support sm5.1. */ - ok(hr == expected_hr || broken(hr == E_INVALIDARG && target_version >= 0x501), "Got unexpected hr %x.\n", hr); + ok(hr == expected_hr || broken(hr == E_INVALIDARG && target_version >= 0x501), + "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr); if (hr == E_INVALIDARG) return; @@ -1204,23 +1203,23 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE /* check invalid cases */ hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0xffffffff, &desc11); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, NULL, &desc11); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "sam", NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", &desc11); - ok(hr == E_INVALIDARG, "Got unexpected hr %x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #endif /* GetResourceBindingDesc */ @@ -1229,7 +1228,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE pdesc = &result[i]; hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, i, &desc11); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc11.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc11.Name, i); ok(desc11.Type == pdesc->Type, "Got unexpected Type %#x, i %u.\n", desc11.Type, i); @@ -1253,7 +1252,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.uID = 0xdeadbeef; hr = ref12->lpVtbl->GetResourceBindingDesc(ref12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1265,7 +1264,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref12_from_d3d11->lpVtbl->GetResourceBindingDesc(ref12_from_d3d11, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1283,7 +1282,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref11_from_d3d12->lpVtbl->GetResourceBindingDesc(ref11_from_d3d12, i, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), "D3D11 and D3D12 descs do not match.\n"); @@ -1299,7 +1298,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE pdesc = &result[i]; hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, pdesc->Name, &desc11); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc11.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc11.Name, i); ok(desc11.Type == pdesc->Type, "Got unexpected Type %#x, i %u.\n", desc11.Type, i); @@ -1317,7 +1316,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.uID = 0xdeadbeef; hr = ref12->lpVtbl->GetResourceBindingDescByName(ref12, pdesc->Name, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1329,7 +1328,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref12_from_d3d11->lpVtbl->GetResourceBindingDescByName(ref12_from_d3d11, pdesc->Name, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), @@ -1344,7 +1343,7 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE desc12.Space = 0xdeadbeef; desc12.uID = 0xdeadbeef; hr = ref11_from_d3d12->lpVtbl->GetResourceBindingDescByName(ref11_from_d3d12, pdesc->Name, &desc12); - ok(hr == S_OK, "Got unexpected hr %x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(desc12.Name, pdesc->Name), "Got unexpected Name \"%s\", i %u.\n", desc12.Name, i); ok(!memcmp(&desc12.Type, &desc11.Type, sizeof(desc11) - offsetof(D3D11_SHADER_INPUT_BIND_DESC, Type)), "D3D11 and D3D12 descs do not match.\n"); @@ -1357,17 +1356,17 @@ static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADE if (ref12) { count = ref11_from_d3d12->lpVtbl->Release(ref11_from_d3d12); - ok(count == 1, "Got unexpected ref count %u.\n", count); + ok(count == 1, "Got unexpected ref count %lu.\n", count); count = ref12->lpVtbl->Release(ref12); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); count = ref12_from_d3d11->lpVtbl->Release(ref12_from_d3d11); - ok(count == 1, "Got unexpected ref count %u.\n", count); + ok(count == 1, "Got unexpected ref count %lu.\n", count); } count = ref11->lpVtbl->Release(ref11); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } #if D3D_COMPILER_VERSION @@ -1618,7 +1617,7 @@ static void test_reflection_constant_buffer(void) hr = call_reflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "D3DReflect failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); #if D3D_COMPILER_VERSION call_reflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], @@ -1626,7 +1625,7 @@ static void test_reflection_constant_buffer(void) #endif hr = ref11->lpVtbl->GetDesc(ref11, &sdesc); - ok(hr == S_OK, "GetDesc failed %x\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); expected = D3D_COMPILER_VERSION ? 80 : 64; ok(sdesc.Version == expected, "Got unexpected version %u.\n", sdesc.Version); @@ -1758,33 +1757,33 @@ static void test_reflection_constant_buffer(void) } hr = cb11_dummy->lpVtbl->GetDesc(cb11_dummy, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = cb11_dummy->lpVtbl->GetDesc(cb11_dummy, &cbdesc); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = cb11_valid->lpVtbl->GetDesc(cb11_valid, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* variable calls */ hr = v11_dummy->lpVtbl->GetDesc(v11_dummy, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = v11_dummy->lpVtbl->GetDesc(v11_dummy, &vdesc); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = v11_valid->lpVtbl->GetDesc(v11_valid, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* type calls */ hr = t11_dummy->lpVtbl->GetDesc(t11_dummy, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_dummy->lpVtbl->GetDesc(t11_dummy, &tdesc); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->GetDesc(t11_valid, NULL); - ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); string = t11_dummy->lpVtbl->GetMemberTypeName(t11_dummy, 0xffffffff); ok(!strcmp(string, "$Invalid"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "$Invalid"); @@ -1812,16 +1811,16 @@ static void test_reflection_constant_buffer(void) #if D3D_COMPILER_VERSION hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_dummy); - ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_dummy); - ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_valid); - ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_valid); - ok(hr == S_OK, "IsEqual failed, got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); #endif /* constant buffers */ @@ -1833,7 +1832,7 @@ static void test_reflection_constant_buffer(void) ok(cb11_dummy != cb11, "Got dummy constant buffer, i %u.\n", i); hr = cb11->lpVtbl->GetDesc(cb11, &cbdesc); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(cbdesc.Name, pcbdesc->Name), "Got unexpected name \"%s\", i %u.\n", cbdesc.Name, i); ok(cbdesc.Type == pcbdesc->Type, "Got unexpected Type %#x, i %u.\n", cbdesc.Type, i); @@ -1847,7 +1846,7 @@ static void test_reflection_constant_buffer(void) ok(cb12_dummy != cb12, "Got dummy constant buffer, i %u.\n", i); hr = cb12->lpVtbl->GetDesc(cb12, &cbdesc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(cbdesc12.Name, pcbdesc->Name), "Got unexpected name \"%s\", i %u.\n", cbdesc.Name, i); ok(cbdesc.Type == pcbdesc->Type, "Got unexpected Type %#x, i %u.\n", cbdesc.Type, i); @@ -1881,7 +1880,7 @@ static void test_reflection_constant_buffer(void) } hr = v11->lpVtbl->GetDesc(v11, &vdesc); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(vdesc.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc.Name, i); ok(vdesc.StartOffset == pvdesc->StartOffset, "Got unexpected StartOffset %u, i %u.\n", @@ -1900,7 +1899,7 @@ static void test_reflection_constant_buffer(void) v12 = ref12->lpVtbl->GetVariableByName(ref12, pvdesc->Name); ok(v12_dummy != v12, "Test %u, got unexpected variable %p.\n", i, v12); hr = v12->lpVtbl->GetDesc(v12, &vdesc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!strcmp(vdesc12.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc12.Name, i); ok(!memcmp(&vdesc12.StartOffset, &vdesc.StartOffset, sizeof(vdesc) - offsetof(D3D11_SHADER_VARIABLE_DESC, StartOffset)), @@ -1919,7 +1918,7 @@ static void test_reflection_constant_buffer(void) ok(t11_dummy != t11, "Got unexpected type %p, i %u.\n", t11, i); hr = t11->lpVtbl->GetDesc(t11, &tdesc); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(tdesc.Class == ptdesc->Class, "Got unexpected Class %u, i %u.\n", tdesc.Class, i); ok(tdesc.Type == ptdesc->Type, "Got unexpected Type %u, i %u.\n", tdesc.Type, i); @@ -1936,7 +1935,7 @@ static void test_reflection_constant_buffer(void) ok(t12_dummy != t12, "Got unexpected type %p, i %u.\n", t12, i); hr = t12->lpVtbl->GetDesc(t12, &tdesc12); - ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(&tdesc12, &tdesc, offsetof(D3D11_SHADER_TYPE_DESC, Name)), "D3D11 and D3D12 descs do not match.\n"); ok(!strcmp(tdesc12.Name, ptdesc->Name), "Got unexpected Name %s, i %u.\n", debugstr_a(tdesc12.Name), i); @@ -1974,10 +1973,10 @@ static void test_reflection_constant_buffer(void) #if D3D_COMPILER_VERSION /* float vs float (in struct) */ hr = t11->lpVtbl->IsEqual(t11, t11_valid); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); /* float vs float */ t = t11->lpVtbl->GetMemberTypeByIndex(t11, 0); @@ -1987,7 +1986,7 @@ static void test_reflection_constant_buffer(void) ok(t2 != t11_dummy, "Got unexpected type %p.\n", t2); hr = t->lpVtbl->IsEqual(t, t2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); #endif if (ref12) @@ -2017,10 +2016,10 @@ static void test_reflection_constant_buffer(void) ok(!strcmp(string, "b"), "Got unexpected string \"%s\".\n", string); hr = t12->lpVtbl->IsEqual(t12, t12_valid); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = t12_valid->lpVtbl->IsEqual(t12_valid, t12); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); mt12 = t12->lpVtbl->GetMemberTypeByIndex(t12, 0); ok(mt12 != t12_dummy, "Got unexpected type %p.\n", mt12); @@ -2029,13 +2028,13 @@ static void test_reflection_constant_buffer(void) ok(mt12_2 != t12_dummy, "Got unexpected type %p.\n", mt12_2); hr = mt12->lpVtbl->IsEqual(mt12, mt12_2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); count = ref12->lpVtbl->Release(ref12); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } count = ref11->lpVtbl->Release(ref11); - ok(!count, "Got unexpected ref count %u.\n", count); + ok(!count, "Got unexpected ref count %lu.\n", count); } /* diff --git a/dlls/d3dcompiler_46/tests/Makefile.in b/dlls/d3dcompiler_46/tests/Makefile.in index c2effd862cf..7d2b899c0eb 100644 --- a/dlls/d3dcompiler_46/tests/Makefile.in +++ b/dlls/d3dcompiler_46/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3dcompiler_46.dll IMPORTS = d3d9 user32 d3dcompiler_46 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=46 +EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index 14732c65fd7..6e40550e777 100644 --- a/dlls/d3dcompiler_47/tests/Makefile.in +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3dcompiler_47.dll IMPORTS = d3d9 user32 d3dcompiler -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=47 +EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ -- 2.30.2

1 0

[PATCH 1/6] d3d10/tests: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/tests/Makefile.in | 2 +- dlls/d3d10/tests/device.c | 54 +- dlls/d3d10/tests/effect.c | 1168 ++++++++++++------------ dlls/d3dcompiler_43/tests/reflection.c | 3 + 4 files changed, 614 insertions(+), 613 deletions(-) diff --git a/dlls/d3d10/tests/Makefile.in b/dlls/d3d10/tests/Makefile.in index ed342153184..e3849ec634b 100644 --- a/dlls/d3d10/tests/Makefile.in +++ b/dlls/d3d10/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3d10.dll IMPORTS = d3d10 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0 +EXTRADEFS = -DD3D_COMPILER_VERSION=0 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index bb4bff51bdb..9307cc4713d 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -38,7 +38,7 @@ static void test_create_device(void) if (i == D3D10_SDK_VERSION) continue; hr = D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, i, &device); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x for SDK version %#x.\n", hr, i); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx for SDK version %#x.\n", hr, i); } } @@ -85,80 +85,80 @@ static void test_stateblock_mask(void) mask_y.Predication = 0xaa; hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDifference failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x66, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x33, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDifference(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskIntersect failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x11, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x88, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskIntersect(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskUnion failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x77, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xbb, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskUnion(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableAll(&result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!result.VS, "Got unexpected result.VS %#x.\n", result.VS); ok(!result.Predication, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDisableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableAll(&result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableAll failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0xff, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xff, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskEnableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); result.VS = 0xff; hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 1); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0xfe, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDisableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); result.VS = 0; hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 1); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x01, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskEnableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(capture_test); ++i) { memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS_SHADER_RESOURCES, capture_test[i].start_idx, capture_test[i].count); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_disable, 5), "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", @@ -169,7 +169,7 @@ static void test_stateblock_mask(void) memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS_SHADER_RESOURCES, capture_test[i].start_idx, capture_test[i].count); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_enable, 5), "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index b5df2fd8538..3bd6d6d0ecc 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -119,13 +119,13 @@ static void test_effect_constant_buffer_type(void) } hr = create_effect(fx_test_ecbt, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", @@ -138,14 +138,14 @@ static void test_effect_constant_buffer_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); ok(var_desc.ExplicitBindPoint == 1, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_OBJECT); @@ -159,7 +159,7 @@ static void test_effect_constant_buffer_type(void) ok(type_desc.Stride == 0x10, "Stride is %#x, expected 0x10\n", type_desc.Stride); hr = constantbuffer->lpVtbl->GetConstantBuffer(constantbuffer, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Buffer_GetDesc(buffer, &buffer_desc); ok(buffer_desc.ByteWidth == type_desc.UnpackedSize, "Unexpected buffer size %u.\n", buffer_desc.ByteWidth); ok(!buffer_desc.Usage, "Unexpected buffer usage %u.\n", buffer_desc.Usage); @@ -170,7 +170,7 @@ static void test_effect_constant_buffer_type(void) ID3D10Buffer_Release(buffer); hr = constantbuffer->lpVtbl->GetTextureBuffer(constantbuffer, &srv); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); string = type->lpVtbl->GetMemberName(type, 0); ok(strcmp(string, "f1") == 0, "GetMemberName is \"%s\", expected \"f1\"\n", string); @@ -191,7 +191,7 @@ static void test_effect_constant_buffer_type(void) else type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "SV_POSITION"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -209,7 +209,7 @@ static void test_effect_constant_buffer_type(void) else type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "COLOR0"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -225,14 +225,14 @@ static void test_effect_constant_buffer_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, NULL); - ok(hr == E_INVALIDARG, "GetDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); null_type = type->lpVtbl->GetMemberTypeByIndex(type, 3); hr = null_type->lpVtbl->GetDesc(null_type, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_type->lpVtbl->GetDesc(null_type, NULL); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, "invalid"); ok(type2 == null_type, "GetMemberTypeByName got wrong type %p, expected %p\n", type2, null_type); @@ -255,7 +255,7 @@ static void test_effect_constant_buffer_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 1); v = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); ok(var_desc.BufferOffset == 0x20, "Unexpected buffer offset %#x.\n", var_desc.BufferOffset); @@ -264,14 +264,14 @@ static void test_effect_constant_buffer_type(void) /* Invalid buffer variable */ constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 100); hr = constantbuffer->lpVtbl->GetConstantBuffer(constantbuffer, &buffer); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = constantbuffer->lpVtbl->GetTextureBuffer(constantbuffer, &srv); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -343,10 +343,10 @@ static void test_effect_variable_type(void) } hr = create_effect(fx_test_evt, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", @@ -359,7 +359,7 @@ static void test_effect_variable_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_OBJECT); @@ -376,7 +376,7 @@ static void test_effect_variable_type(void) variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test1") == 0, "TypeName is \"%s\", expected \"test1\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -400,7 +400,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -415,7 +415,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 1); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -430,7 +430,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 2); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -451,7 +451,7 @@ static void test_effect_variable_type(void) else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "sv_POSITION"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -471,7 +471,7 @@ static void test_effect_variable_type(void) else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "color0"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -488,27 +488,27 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, NULL); - ok(hr == E_INVALIDARG, "GetDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByIndex(type, 4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, "invalid"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, NULL); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "invalid"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeBySemantic(type, NULL); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); string = type->lpVtbl->GetMemberName(type, 4); ok(string == NULL, "GetMemberName is \"%s\", expected NULL\n", string); @@ -519,7 +519,7 @@ static void test_effect_variable_type(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -588,10 +588,10 @@ static void test_effect_variable_member(void) } hr = create_effect(fx_test_evm, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -605,7 +605,7 @@ static void test_effect_variable_member(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -616,16 +616,16 @@ static void test_effect_variable_member(void) null_variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 1); hr = null_variable->lpVtbl->GetDesc(null_variable, &desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); variable2 = constantbuffer->lpVtbl->GetMemberByName(constantbuffer, "t1"); ok(variable == variable2, "GetMemberByName got %p, expected %p\n", variable2, variable); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t1") == 0, "Name is \"%s\", expected \"t1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -649,7 +649,7 @@ static void test_effect_variable_member(void) /* check members of "t1" */ variable2 = variable->lpVtbl->GetMemberByName(variable, "f1"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f1") == 0, "Name is \"%s\", expected \"f1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -663,7 +663,7 @@ static void test_effect_variable_member(void) variable2 = variable->lpVtbl->GetMemberByName(variable, "f2"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -677,7 +677,7 @@ static void test_effect_variable_member(void) variable2 = variable->lpVtbl->GetMemberByName(variable, "t"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -692,7 +692,7 @@ static void test_effect_variable_member(void) /* check members of "t" */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f3"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -712,7 +712,7 @@ static void test_effect_variable_member(void) variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f4"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -733,7 +733,7 @@ static void test_effect_variable_member(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -809,10 +809,10 @@ static void test_effect_variable_element(void) } hr = create_effect(fx_test_eve, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -826,7 +826,7 @@ static void test_effect_variable_element(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -837,7 +837,7 @@ static void test_effect_variable_element(void) variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(parent == constantbuffer, "GetParentConstantBuffer got %p, expected %p\n", @@ -845,7 +845,7 @@ static void test_effect_variable_element(void) variable2 = constantbuffer->lpVtbl->GetMemberByName(constantbuffer, "t1"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); parent = variable2->lpVtbl->GetParentConstantBuffer(variable2); ok(parent == constantbuffer, "GetParentConstantBuffer got %p, expected %p\n", parent, constantbuffer); @@ -853,7 +853,7 @@ static void test_effect_variable_element(void) /* check variable f1 */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f1"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f1") == 0, "Name is \"%s\", expected \"f1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -868,7 +868,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -884,7 +884,7 @@ static void test_effect_variable_element(void) /* check variable f2 */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f2"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)!\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -899,7 +899,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -914,7 +914,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 0); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -929,7 +929,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -944,7 +944,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 1); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -959,7 +959,7 @@ static void test_effect_variable_element(void) type2 = variable4->lpVtbl->GetType(variable4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(type == type2, "type(%p) != type2(%p)\n", type, type2); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -975,7 +975,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 2); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -990,7 +990,7 @@ static void test_effect_variable_element(void) type2 = variable4->lpVtbl->GetType(variable4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(type == type2, "type(%p) != type2(%p)\n", type, type2); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -1007,7 +1007,7 @@ static void test_effect_variable_element(void) /* check variable t */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "t"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)!\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1022,7 +1022,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1037,7 +1037,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 0); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1052,7 +1052,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1067,7 +1067,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 0); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -1081,7 +1081,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1096,7 +1096,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 1); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -1110,7 +1110,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1125,7 +1125,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 2); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f5") == 0, "Name is \"%s\", expected \"f5\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR1") == 0, "Semantic is \"%s\", expected \"COLOR1\"\n", desc.Semantic); @@ -1139,7 +1139,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1154,7 +1154,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 1); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1169,7 +1169,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1184,7 +1184,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 0); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -1198,7 +1198,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1213,7 +1213,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 1); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -1227,7 +1227,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1242,7 +1242,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 2); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f5") == 0, "Name is \"%s\", expected \"f5\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR1") == 0, "Semantic is \"%s\", expected \"COLOR1\"\n", desc.Semantic); @@ -1256,7 +1256,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1272,7 +1272,7 @@ static void test_effect_variable_element(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -1390,7 +1390,7 @@ static void check_as(ID3D10EffectVariable *variable) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); variable2 = (ID3D10EffectVariable *)variable->lpVtbl->AsConstantBuffer(variable); is_valid = variable2->lpVtbl->IsValid(variable2); @@ -1487,10 +1487,10 @@ static void test_effect_variable_type_class(void) } hr = create_effect(fx_test_evtc, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -1508,7 +1508,7 @@ static void test_effect_variable_type_class(void) /* check constantbuffer cb */ constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1524,7 +1524,7 @@ static void test_effect_variable_type_class(void) type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1539,7 +1539,7 @@ static void test_effect_variable_type_class(void) variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "s") == 0, "Name is \"%s\", expected \"s\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1555,7 +1555,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "String") == 0, "TypeName is \"%s\", expected \"String\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1570,15 +1570,15 @@ static void test_effect_variable_type_class(void) string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = string_var->lpVtbl->GetString(string_var, &str1); - ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(str1, "STRING"), "Unexpected value %s.\n", str1); variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 1); string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, &str2); - ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(str2 != str1, "Unexpected string pointer.\n"); ok(!strcmp(str2, "STRING"), "Unexpected value %s.\n", str1); @@ -1586,16 +1586,16 @@ static void test_effect_variable_type_class(void) variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 2); string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, NULL); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); str1 = (void *)0xdeadbeef; hr = string_var->lpVtbl->GetString(string_var, &str1); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(str1 == (void *)0xdeadbeef, "Unexpected pointer.\n"); /* check float f */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "f") == 0, "Name is \"%s\", expected \"f\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1611,7 +1611,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", td.TypeName); ok(td.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", td.Class, D3D10_SVC_SCALAR); @@ -1627,7 +1627,7 @@ static void test_effect_variable_type_class(void) /* check int2 i */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "i") == 0, "Name is \"%s\", expected \"i\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1643,7 +1643,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "int2") == 0, "TypeName is \"%s\", expected \"int2\"\n", td.TypeName); ok(td.Class == D3D10_SVC_VECTOR, "Class is %x, expected %x\n", td.Class, D3D10_SVC_VECTOR); @@ -1659,7 +1659,7 @@ static void test_effect_variable_type_class(void) /* check uint2x3 u */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "u") == 0, "Name is \"%s\", expected \"u\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1675,7 +1675,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "uint2x3") == 0, "TypeName is \"%s\", expected \"uint2x3\"\n", td.TypeName); ok(td.Class == D3D10_SVC_MATRIX_COLUMNS, "Class is %x, expected %x\n", td.Class, D3D10_SVC_MATRIX_COLUMNS); @@ -1691,7 +1691,7 @@ static void test_effect_variable_type_class(void) /* check bool2x3 b */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "b") == 0, "Name is \"%s\", expected \"b\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1707,7 +1707,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "bool2x3") == 0, "TypeName is \"%s\", expected \"bool2x3\"\n", td.TypeName); ok(td.Class == D3D10_SVC_MATRIX_ROWS, "Class is %x, expected %x\n", td.Class, D3D10_SVC_MATRIX_ROWS); @@ -1723,7 +1723,7 @@ static void test_effect_variable_type_class(void) /* check BlendState blend */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "blend") == 0, "Name is \"%s\", expected \"blend\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1739,7 +1739,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "BlendState") == 0, "TypeName is \"%s\", expected \"BlendState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1755,7 +1755,7 @@ static void test_effect_variable_type_class(void) /* check DepthStencilState depthstencil */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "depthstencil") == 0, "Name is \"%s\", expected \"depthstencil\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1771,7 +1771,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "DepthStencilState") == 0, "TypeName is \"%s\", expected \"DepthStencilState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1787,7 +1787,7 @@ static void test_effect_variable_type_class(void) /* check RasterizerState rast */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "rast") == 0, "Name is \"%s\", expected \"rast\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1803,7 +1803,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "RasterizerState") == 0, "TypeName is \"%s\", expected \"RasterizerState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1819,7 +1819,7 @@ static void test_effect_variable_type_class(void) /* check SamplerState sam */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "sam") == 0, "Name is \"%s\", expected \"sam\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1835,7 +1835,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "SamplerState") == 0, "TypeName is \"%s\", expected \"SamplerState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1851,7 +1851,7 @@ static void test_effect_variable_type_class(void) /* check RenderTargetView rtv */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "rtv") == 0, "Name is \"%s\", expected \"rtv\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1867,7 +1867,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "RenderTargetView") == 0, "TypeName is \"%s\", expected \"RenderTargetView\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1883,7 +1883,7 @@ static void test_effect_variable_type_class(void) /* check DepthStencilView dsv */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "dsv") == 0, "Name is \"%s\", expected \"dsv\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1899,7 +1899,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "DepthStencilView") == 0, "TypeName is \"%s\", expected \"DepthStencilView\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1915,7 +1915,7 @@ static void test_effect_variable_type_class(void) /* check Texture t0 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(vd.Name, "t0"), "Unexpected Name \"%s\".\n", vd.Name); ok(!vd.Semantic, "Unexpected Semantic \"%s\".\n", vd.Semantic); @@ -1931,7 +1931,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(td.TypeName, "texture"), "Unexpected TypeName \"%s\".\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Unexpected Class %x.\n", td.Class); @@ -1947,7 +1947,7 @@ static void test_effect_variable_type_class(void) /* check Texture1D t1 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t1") == 0, "Name is \"%s\", expected \"t1\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1963,7 +1963,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture1D") == 0, "TypeName is \"%s\", expected \"Texture1D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1979,7 +1979,7 @@ static void test_effect_variable_type_class(void) /* check Texture1DArray t1a */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t1a") == 0, "Name is \"%s\", expected \"t1a\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1995,7 +1995,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture1DArray") == 0, "TypeName is \"%s\", expected \"Texture1DArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2011,7 +2011,7 @@ static void test_effect_variable_type_class(void) /* check Texture2D t2 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2") == 0, "Name is \"%s\", expected \"t2\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2027,7 +2027,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2D") == 0, "TypeName is \"%s\", expected \"Texture2D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2043,7 +2043,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DMS t2dms */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2dms") == 0, "Name is \"%s\", expected \"t2dms\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2059,7 +2059,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DMS") == 0, "TypeName is \"%s\", expected \"Texture2DMS\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2075,7 +2075,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DArray t2a */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2a") == 0, "Name is \"%s\", expected \"t2a\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2091,7 +2091,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DArray") == 0, "TypeName is \"%s\", expected \"Texture2DArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2107,7 +2107,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DMSArray t2dmsa */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2dmsa") == 0, "Name is \"%s\", expected \"t2dmsa\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2123,7 +2123,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DMSArray") == 0, "TypeName is \"%s\", expected \"TTexture2DMSArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2139,7 +2139,7 @@ static void test_effect_variable_type_class(void) /* check Texture3D t3 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t3") == 0, "Name is \"%s\", expected \"t3\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2155,7 +2155,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture3D") == 0, "TypeName is \"%s\", expected \"Texture3D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2171,7 +2171,7 @@ static void test_effect_variable_type_class(void) /* check TextureCube tq */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "tq") == 0, "Name is \"%s\", expected \"tq\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2187,7 +2187,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "TextureCube") == 0, "TypeName is \"%s\", expected \"TextureCube\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2203,7 +2203,7 @@ static void test_effect_variable_type_class(void) /* check GeometryShader gs[2] */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "gs") == 0, "Name is \"%s\", expected \"gs\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2219,7 +2219,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2235,7 +2235,7 @@ static void test_effect_variable_type_class(void) /* check PixelShader ps */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "ps") == 0, "Name is \"%s\", expected \"ps\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2251,7 +2251,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2267,7 +2267,7 @@ static void test_effect_variable_type_class(void) /* check VertexShader vs[1] */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "vs") == 0, "Name is \"%s\", expected \"vs\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2283,7 +2283,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2299,7 +2299,7 @@ static void test_effect_variable_type_class(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -2579,10 +2579,10 @@ static void test_effect_constant_buffer_stride(void) } hr = create_effect(fx_test_ecbs, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 15, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -2600,7 +2600,7 @@ static void test_effect_constant_buffer_stride(void) type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &tdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(tdesc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", tdesc.TypeName); ok(tdesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", tdesc.Class, D3D10_SVC_OBJECT); @@ -2617,7 +2617,7 @@ static void test_effect_constant_buffer_stride(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -2948,10 +2948,10 @@ static void test_effect_local_shader(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed!\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -2998,22 +2998,22 @@ if (0) /* check for invalid arguments */ hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetVertexShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetVertexShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetPixelShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetPixelShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetPixelShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetPixelShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* check valid pass arguments */ t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); @@ -3023,19 +3023,19 @@ if (0) ok(p2 == p, "GetPassByName got %p, expected %p\n", p2, p); hr = p->lpVtbl->GetVertexShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetVertexShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetPixelShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetPixelShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetGeometryShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "p"); ps = v->lpVtbl->AsShader(v); hr = ps->lpVtbl->GetPixelShader(ps, 0, &ps_d3d); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* get the null_shader_variable */ v = effect->lpVtbl->GetVariableByIndex(effect, 10000); @@ -3046,9 +3046,9 @@ if (0) /* Pass without Set*Shader() instructions */ hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(!ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); @@ -3058,52 +3058,52 @@ if (0) ID3D10Device_PSSetShader(device, ps_d3d); hr = p->lpVtbl->Apply(p, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShader(device, &ps_d3d_2); ok(ps_d3d_2 == ps_d3d, "Unexpected shader object.\n"); ID3D10PixelShader_Release(ps_d3d_2); hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* pass 1 */ p = t->lpVtbl->GetPassByIndex(t, 1); ID3D10Device_PSSetShader(device, ps_d3d); hr = p->lpVtbl->Apply(p, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShader(device, &ps_d3d_2); ok(!ps_d3d_2, "Unexpected shader object.\n"); /* pass 1 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3120,7 +3120,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexhader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3134,12 +3134,12 @@ if (0) /* pass 1 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3156,7 +3156,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3170,12 +3170,12 @@ if (0) /* pass 1 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == S_OK, "GetDesc failed (%x) expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3192,7 +3192,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3206,9 +3206,9 @@ if (0) /* Pass is using Set*Shader(NULL) */ hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); @@ -3221,12 +3221,12 @@ if (0) /* pass 2 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_vs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3237,12 +3237,12 @@ if (0) /* pass 2 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3253,12 +3253,12 @@ if (0) /* pass 2 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == S_OK, "GetDesc failed (%x) expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3272,12 +3272,12 @@ if (0) /* pass 3 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3294,7 +3294,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3308,12 +3308,12 @@ if (0) /* pass 3 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3330,7 +3330,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3344,12 +3344,12 @@ if (0) /* pass 3 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3366,7 +3366,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3383,12 +3383,12 @@ if (0) /* pass 4 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_vs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3405,7 +3405,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3419,12 +3419,12 @@ if (0) /* pass 4 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3441,7 +3441,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3455,12 +3455,12 @@ if (0) /* pass 4 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %x\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3477,7 +3477,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3494,11 +3494,11 @@ if (0) /* pass 5 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v0") == 0, "Name is \"%s\", expected \"v0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3515,7 +3515,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3529,11 +3529,11 @@ if (0) /* pass 5 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p0") == 0, "Name is \"%s\", expected \"p0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3550,7 +3550,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3564,11 +3564,11 @@ if (0) /* pass 5 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g0") == 0, "Name is \"%s\", expected \"g0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3585,7 +3585,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3602,12 +3602,12 @@ if (0) /* pass 6 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v") == 0, "Name is \"%s\", expected \"v\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3624,7 +3624,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3638,18 +3638,18 @@ if (0) /* Get input signature from vertex shader set from array element. */ hr = p->lpVtbl->GetDesc(p, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!pass_desc.pIAInputSignature, "Expected input signature.\n"); ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size.\n"); /* pass 6 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p") == 0, "Name is \"%s\", expected \"p\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3666,7 +3666,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3680,12 +3680,12 @@ if (0) /* pass 6 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g") == 0, "Name is \"%s\", expected \"g\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3702,7 +3702,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3719,12 +3719,12 @@ if (0) /* pass 7 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_vs); ok(pdesc.ShaderIndex == 1, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 1); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v") == 0, "Name is \"%s\", expected \"v\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3741,7 +3741,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3755,12 +3755,12 @@ if (0) /* pass 7 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p") == 0, "Name is \"%s\", expected \"p\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3777,7 +3777,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3791,12 +3791,12 @@ if (0) /* pass 7 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g") == 0, "Name is \"%s\", expected \"g\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3813,7 +3813,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3830,9 +3830,9 @@ if (0) /* Inline variant */ p = t->lpVtbl->GetPassByName(t, "P8"); hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); @@ -3840,7 +3840,7 @@ if (0) v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x; $Skip.x; SV_POSITION.gb"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); @@ -3850,25 +3850,25 @@ if (0) ps = v->lpVtbl->AsShader(v); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); todo_wine ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 4, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3876,24 +3876,24 @@ if (0) vs = v->lpVtbl->AsShader(v); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3902,31 +3902,31 @@ if (0) vs = v->lpVtbl->AsShader(v); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 2, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 3, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 2, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 3, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3935,7 +3935,7 @@ if (0) ID3D10PixelShader_Release(ps_d3d); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -3989,10 +3989,10 @@ static void test_effect_get_variable_by(void) } hr = create_effect(fx_test_egvb, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4091,7 +4091,7 @@ static void test_effect_get_variable_by(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -4423,9 +4423,9 @@ static void create_effect_texture_resource(ID3D10Device *device, ID3D10ShaderRes tex_desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture2D(device, &tex_desc, NULL, tex); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)*tex, NULL, srv); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } static void test_effect_state_groups(void) @@ -4465,10 +4465,10 @@ static void test_effect_state_groups(void) } hr = create_effect(fx_test_state_groups, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(!effect_desc.ConstantBuffers, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4498,7 +4498,7 @@ static void test_effect_state_groups(void) ok(sampler_desc.MinLOD == 6.0f, "Got unexpected MinLOD %.8e.\n", sampler_desc.MinLOD); ok(sampler_desc.MaxLOD == 5.0f, "Got unexpected MaxLOD %.8e.\n", sampler_desc.MaxLOD); hr = s->lpVtbl->GetSampler(s, 0, &sampler); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10SamplerState_GetDesc(sampler, &sampler_desc); ok(sampler_desc.Filter == D3D10_FILTER_MIN_MAG_MIP_LINEAR, "Got unexpected Filter %#x.\n", sampler_desc.Filter); ID3D10SamplerState_Release(sampler); @@ -4506,7 +4506,7 @@ static void test_effect_state_groups(void) s->lpVtbl->GetBackingStore(s, 1, &sampler_desc); ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); hr = s->lpVtbl->GetSampler(s, 1, &sampler); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10SamplerState_GetDesc(sampler, &sampler_desc); ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); ID3D10SamplerState_Release(sampler); @@ -4531,14 +4531,14 @@ static void test_effect_state_groups(void) ok(blend_desc.RenderTargetWriteMask[7] == 0x7, "Got unexpected RenderTargetWriteMask[7] %#x.\n", blend_desc.RenderTargetWriteMask[7]); hr = b->lpVtbl->GetBlendState(b, 0, &blend_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10BlendState_GetDesc(blend_state, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); ID3D10BlendState_Release(blend_state); b->lpVtbl->GetBackingStore(b, 1, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); hr = b->lpVtbl->GetBlendState(b, 1, &blend_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10BlendState_GetDesc(blend_state, &blend_desc); /* We can't check the SrcBlend value from the ID3D10BlendState object * descriptor because BlendEnable[0] is effectively false, which forces @@ -4574,14 +4574,14 @@ static void test_effect_state_groups(void) ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); hr = d->lpVtbl->GetDepthStencilState(d, 0, &ds_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ID3D10DepthStencilState_Release(ds_state); d->lpVtbl->GetBackingStore(d, 1, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); hr = d->lpVtbl->GetDepthStencilState(d, 1, &ds_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ID3D10DepthStencilState_Release(ds_state); @@ -4603,7 +4603,7 @@ static void test_effect_state_groups(void) ok(rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n", rast_desc.AntialiasedLineEnable); hr = r->lpVtbl->GetRasterizerState(r, 0, &rast_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_FRONT, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); ID3D10RasterizerState_Release(rast_state); @@ -4611,7 +4611,7 @@ static void test_effect_state_groups(void) r->lpVtbl->GetBackingStore(r, 1, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); hr = r->lpVtbl->GetRasterizerState(r, 1, &rast_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); ID3D10RasterizerState_Release(rast_state); @@ -4621,7 +4621,7 @@ static void test_effect_state_groups(void) pass = technique->lpVtbl->GetPassByName(technique, "pass0"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); ok(!pass_desc.Annotations, "Got unexpected Annotations %#x.\n", pass_desc.Annotations); ok(!pass_desc.pIAInputSignature, "Got unexpected pIAInputSignature %p.\n", pass_desc.pIAInputSignature); @@ -4633,9 +4633,9 @@ static void test_effect_state_groups(void) ok(pass_desc.BlendFactor[3] == 0.8f, "Got unexpected BlendFactor[3] %.8e.\n", pass_desc.BlendFactor[3]); hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_RS_RASTERIZER_STATE, 0); ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0); @@ -4644,7 +4644,7 @@ static void test_effect_state_groups(void) ok(ret, "Unexpected mask.\n"); hr = pass->lpVtbl->Apply(pass, 0); - ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ID3D10BlendState_GetDesc(blend_state, &blend_desc); @@ -4722,15 +4722,15 @@ static void test_effect_state_groups(void) create_effect_texture_resource(device, &srv0, &tex0); hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS_SHADER_RESOURCES, 0); ok(!ret, "Unexpected mask.\n"); ID3D10Device_PSSetShaderResources(device, 0, 1, &srv0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 0, 1, &srv1); ok(!srv1, "Unexpected resource pointer.\n"); @@ -4744,7 +4744,7 @@ static void test_effect_state_groups(void) ID3D10Device_OMSetDepthStencilState(device, ds_state, 0); ID3D10Device_OMSetBlendState(device, blend_state, NULL, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state2, &stencil_ref); ok(!ds_state2, "Unexpected depth stencil state.\n"); ID3D10Device_OMGetBlendState(device, &blend_state2, blend_factor, &sample_mask); @@ -4755,7 +4755,7 @@ static void test_effect_state_groups(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -4820,10 +4820,10 @@ static void test_effect_state_group_defaults(void) } hr = create_effect(fx_test_state_group_defaults, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4924,7 +4924,7 @@ static void test_effect_state_group_defaults(void) pass = technique->lpVtbl->GetPassByName(technique, "pass0"); ok(pass->lpVtbl->IsValid(pass), "Failed to get pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); ok(pass_desc.Annotations == 1, "Got unexpected Annotations %u.\n", pass_desc.Annotations); ok(!pass_desc.pIAInputSignature, "Got unexpected pIAInputSignature %p.\n", pass_desc.pIAInputSignature); @@ -4938,7 +4938,7 @@ static void test_effect_state_group_defaults(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -4987,68 +4987,68 @@ static void test_scalar_methods(ID3D10EffectScalarVariable *var, D3D10_SHADER_VA HRESULT hr; hr = var->lpVtbl->SetFloat(var, 5.0f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f = type == D3D10_SVT_BOOL ? -1.0f : 5.0f; ok(ret_f == expected_f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 5; ok(ret_i == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_b == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetInt(var, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f = type == D3D10_SVT_BOOL ? -1.0f : 2.0f; ok(ret_f == expected_f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 2; ok(ret_i == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_b == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetBool(var, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_f == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_i == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b = type == D3D10_SVT_BOOL ? 1 : -1; ok(ret_b == expected_b, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetBool(var, 32); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_f == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_i == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b = type == D3D10_SVT_BOOL ? 32 : -1; ok(ret_b == expected_b, "Variable %s, got unexpected value %#x.\n", name, ret_b); } @@ -5064,10 +5064,10 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA set_f[0] = 10.0f; set_f[1] = 20.0f; hr = var->lpVtbl->SetFloatArray(var, set_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5075,7 +5075,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5083,16 +5083,16 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_i[0] = 5; set_i[1] = 6; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5100,7 +5100,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5108,26 +5108,26 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_b[0] = 1; set_b[1] = 1; hr = var->lpVtbl->SetBoolArray(var, set_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5136,20 +5136,20 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA set_b[0] = 10; set_b[1] = 20; hr = var->lpVtbl->SetBoolArray(var, set_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5159,15 +5159,15 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA /* Array offset tests. Offset argument goes unused for scalar arrays. */ set_i[0] = 0; set_i[1] = 0; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* After this, if offset is in use, return should be { 0, 5 }. */ set_i[0] = 5; hr = var->lpVtbl->SetIntArray(var, set_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b_a[0] = -1; expected_b_a[1] = 0; expected_i_a[0] = 5; expected_i_a[1] = 0; for (i = 0; i < 2; ++i) @@ -5179,29 +5179,29 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA /* Test the offset on GetArray methods. If offset was in use, we'd get * back 5 given that the variable was previously set to { 0, 5 }. */ hr = var->lpVtbl->GetIntArray(var, ret_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 5; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); /* Try setting offset larger than number of elements. */ set_i[0] = 0; set_i[1] = 0; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); set_i[0] = 1; hr = var->lpVtbl->SetIntArray(var, set_i, 6, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* Since offset goes unused, a larger offset than the number of elements * in the array should have no effect. */ hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 1; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); memset(ret_i, 0, sizeof(ret_i)); hr = var->lpVtbl->GetIntArray(var, ret_i, 6, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 1; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); @@ -5211,11 +5211,11 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA * ends up writing over into the adjacent variables in the local buffer. */ set_i[0] = 1; set_i[1] = 2; set_i[2] = 3; set_i[3] = 4; set_i[4] = 5; set_i[5] = 6; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 6); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(ret_i, 0, sizeof(ret_i)); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 6); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_a[0] = 1; expected_i_a[1] = 2; expected_i_a[2] = 0; expected_i_a[3] = 0; expected_i_a[4] = 0; expected_i_a[5] = 0; @@ -5267,10 +5267,10 @@ static void test_effect_scalar_variable(void) } hr = create_effect(fx_test_scalar_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -5290,7 +5290,7 @@ static void test_effect_scalar_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); s_v = var->lpVtbl->AsScalar(var); @@ -5303,22 +5303,22 @@ static void test_effect_scalar_variable(void) var = effect->lpVtbl->GetVariableByName(effect, "f0"); s_v = var->lpVtbl->AsScalar(var); hr = s_v->lpVtbl->SetFloat(s_v, 1.0f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); var2 = effect->lpVtbl->GetVariableByName(effect, "f_a"); var2 = var2->lpVtbl->GetElement(var2, 0); s_v2 = var->lpVtbl->AsScalar(var2); hr = s_v2->lpVtbl->SetFloat(s_v2, 2.0f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = s_v->lpVtbl->GetFloat(s_v, &f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -5381,10 +5381,10 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA set_f[0] = 1.0f; set_f[1] = 2.0f; set_f[2] = 3.0f; set_f[3] = 4.0f; hr = var->lpVtbl->SetFloatVector(var, set_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5392,7 +5392,7 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5400,16 +5400,16 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_i[0] = 5; set_i[1] = 6; set_i[2] = 7; set_i[3] = 8; hr = var->lpVtbl->SetIntVector(var, set_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5417,7 +5417,7 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5425,28 +5425,28 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_b[0] = 1; set_b[1] = 0; set_b[2] = 1; set_b[3] = 0; hr = var->lpVtbl->SetBoolVector(var, set_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f_v[0] = -1.0f; expected_f_v[1] = 0.0f; expected_f_v[2] = -1.0f; expected_f_v[3] = 0.0f; for (i = 0; i < components; ++i) ok(ret_f[i] == expected_f_v[i], "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_v[0] = -1; expected_i_v[1] = 0; expected_i_v[2] = -1; expected_i_v[3] = 0; for (i = 0; i < components; ++i) ok(ret_i[i] == expected_i_v[i], "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : expected_i_v[i]; @@ -5455,20 +5455,20 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA set_b[0] = 5; set_b[1] = 10; set_b[2] = 15; set_b[3] = 20; hr = var->lpVtbl->SetBoolVector(var, set_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5489,10 +5489,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_f[4] = 5.0f; set_f[5] = 6.0f; set_f[6] = 7.0f; set_f[7] = 8.0f; set_f[8] = 9.0f; hr = var->lpVtbl->SetFloatVectorArray(var, set_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5500,7 +5500,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5508,7 +5508,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); @@ -5516,10 +5516,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_i[4] = 14; set_i[5] = 15; set_i[6] = 16; set_i[7] = 17; set_i[8] = 18; hr = var->lpVtbl->SetIntVectorArray(var, set_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5527,7 +5527,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5535,7 +5535,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); @@ -5543,10 +5543,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 1; set_b[5] = 0; set_b[6] = 0; set_b[7] = 1; set_b[8] = 1; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f_a[0] = -1.0f; expected_f_a[1] = 0.0f; expected_f_a[2] = -1.0f; expected_f_a[3] = -1.0f; expected_f_a[4] = -1.0f; expected_f_a[5] = 0.0f; expected_f_a[6] = 0.0f; expected_f_a[7] = -1.0f; expected_f_a[8] = -1.0f; @@ -5554,7 +5554,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA ok(ret_f[i] == expected_f_a[i], "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_a[0] = -1; expected_i_a[1] = 0; expected_i_a[2] = -1; expected_i_a[3] = -1; expected_i_a[4] = -1; expected_i_a[5] = 0; expected_i_a[6] = 0; expected_i_a[7] = -1; expected_i_a[8] = -1; @@ -5562,7 +5562,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA ok(ret_i[i] == expected_i_a[i], "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : expected_i_a[i]; @@ -5573,20 +5573,20 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 25; set_b[5] = 30; set_b[6] = 35; set_b[7] = 40; set_b[8] = 45; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5600,43 +5600,43 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 0; set_b[5] = 0; set_b[6] = 0; set_b[7] = 0; set_b[8] = 0; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); set_b[0] = 1; set_b[1] = 1; set_b[2] = 1; set_b[3] = 1; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* If the previous offset of 1 worked, then the first vector value of the * array should still be false. */ hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == 0, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == 0, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(!ret_b[i], "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); /* Test the GetFloatVectorArray offset argument. If it works, we should * get a vector with all values set to true. */ hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5648,10 +5648,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA /* Windows array setting function has no bounds checking on offset values * either, so this ends up writing into adjacent variables. */ hr = var->lpVtbl->SetBoolVectorArray(var, set_b, elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5696,10 +5696,10 @@ static void test_effect_vector_variable(void) } hr = create_effect(fx_test_vector_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -5716,7 +5716,7 @@ static void test_effect_vector_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); v_var = var->lpVtbl->AsVector(var); @@ -5728,7 +5728,7 @@ static void test_effect_vector_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -5888,31 +5888,31 @@ static void test_matrix_methods(ID3D10EffectMatrixVariable *var, D3D10_SHADER_VA set_test_matrix(&m_set, type, row_count, col_count, 1); hr = var->lpVtbl->SetMatrix(var, &m_set.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrix(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_set, &m_ret, row_count, col_count, FALSE); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixTranspose(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_set, &m_ret, row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTranspose(var, &m_set.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrix(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_ret, &m_set, row_count, col_count, TRUE); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); memset(&m_expected.m[0][0], 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTranspose(var, &m_ret.m[0][0]); transpose_matrix(&m_set, &m_expected, row_count, col_count); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_expected, &m_ret, row_count, col_count, TRUE); } @@ -5926,33 +5926,33 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA set_test_matrix(&m_set[0], type, row_count, col_count, elements); hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_set[i], &m_ret[i], row_count, col_count, FALSE); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_set[i], &m_ret[i], row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_ret[i], &m_set[i], row_count, col_count, TRUE); memset(m_ret, 0, sizeof(m_ret)); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) { memset(&m_expected, 0, sizeof(m_expected)); @@ -5965,21 +5965,21 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA hr = var->lpVtbl->SetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_ret[0], &m_set[0], row_count, col_count, FALSE); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->SetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); transpose_matrix(&m_set[0], &m_expected, row_count, col_count); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); @@ -5988,19 +5988,19 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA /* Like vector array functions, matrix array functions will allow for * writing out of bounds into adjacent memory. */ hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); transpose_matrix(&m_set[0], &m_expected, row_count, col_count); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); } @@ -6042,10 +6042,10 @@ static void test_effect_matrix_variable(void) } hr = create_effect(fx_test_matrix_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -6062,7 +6062,7 @@ static void test_effect_matrix_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); m_var = var->lpVtbl->AsMatrix(var); @@ -6075,7 +6075,7 @@ static void test_effect_matrix_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -6225,7 +6225,7 @@ static ID3D10EffectShaderResourceVariable *get_effect_shader_resource_variable_( type = var->lpVtbl->GetType(var); ok_(__FILE__, line)(!!type, "Got unexpected type %p.\n", type); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok_(__FILE__, line)(type_desc.Type == D3D10_SVT_TEXTURE2D, "Type is %x, expected %x.\n", type_desc.Type, D3D10_SVT_TEXTURE2D); return var->lpVtbl->AsShaderResource(var); @@ -6257,10 +6257,10 @@ static void test_effect_resource_variable(void) } hr = create_effect(fx_test_resource_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -6278,19 +6278,19 @@ static void test_effect_resource_variable(void) var = effect->lpVtbl->GetVariableByName(effect, "dummy name"); t0 = var->lpVtbl->AsShaderResource(var); hr = t0->lpVtbl->SetResource(t0, srv0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); var = effect->lpVtbl->GetVariableByName(effect, "t0"); t0 = get_effect_shader_resource_variable(var); hr = t0->lpVtbl->SetResource(t0, srv0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); var = effect->lpVtbl->GetVariableByName(effect, "t_a"); t_a = get_effect_shader_resource_variable(var); for (i = 0; i < 2; ++i) create_effect_texture_resource(device, &srv_a[i], &tex_a[i]); hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 0, 2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Apply the pass to bind the resource to the shader. */ technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); @@ -6298,13 +6298,13 @@ static void test_effect_resource_variable(void) pass = technique->lpVtbl->GetPassByName(technique, "p0"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!pass_desc.pIAInputSignature, "Unexpected input signature.\n"); - ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size %lu.\n", + ok(pass_desc.IAInputSignatureSize == 88, "Got unexpected input signature size %Iu.\n", pass_desc.IAInputSignatureSize); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 0, 1, &srv_tmp[0]); ok(srv_tmp[0] == srv0, "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6321,10 +6321,10 @@ static void test_effect_resource_variable(void) var = t_a->lpVtbl->GetElement(t_a, 1); t_a_0 = get_effect_shader_resource_variable(var); hr = t_a_0->lpVtbl->SetResource(t_a_0, srv0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 1, 2, srv_tmp); ok(srv_tmp[0] == srv_a[0], "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6334,10 +6334,10 @@ static void test_effect_resource_variable(void) /* Test offset. */ hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 1, 1); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 1, 2, srv_tmp); ok(srv_tmp[0] == srv_a[0], "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6349,7 +6349,7 @@ static void test_effect_resource_variable(void) { /* This crashes on Windows. */ hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 2, 2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } ID3D10ShaderResourceView_Release(srv0); @@ -6363,7 +6363,7 @@ static void test_effect_resource_variable(void) effect->lpVtbl->Release(effect); hr = create_effect(fx_test_resource_variable2, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n"); @@ -6377,12 +6377,12 @@ static void test_effect_resource_variable(void) ok(s->lpVtbl->IsValid(s), "Expected valid sample variable.\n"); hr = s->lpVtbl->GetSampler(s, 0, &sampler[0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = s->lpVtbl->GetSampler(s, 1, &sampler[1]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetSamplers(device, 0, ARRAY_SIZE(samplers), samplers); for (i = 0; i < ARRAY_SIZE(samplers); ++i) @@ -6402,7 +6402,7 @@ static void test_effect_resource_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -6492,7 +6492,7 @@ static void test_effect_annotations(void) } hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); a = cb->lpVtbl->GetAnnotationByName(cb, "s"); @@ -6505,7 +6505,7 @@ static void test_effect_annotations(void) { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6530,7 +6530,7 @@ static void test_effect_annotations(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_optimize(void) @@ -6558,23 +6558,23 @@ static void test_effect_optimize(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(tech_desc.Name, "Render"), "Unexpected technique name %s.\n", tech_desc.Name); pass = tech->lpVtbl->GetPassByIndex(tech, 0); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "P0"), "Unexpected pass name %s.\n", pass_desc.Name); v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!!shaderdesc.pBytecode, "Expected bytecode.\n"); @@ -6588,13 +6588,13 @@ static void test_effect_optimize(void) ok(!ret, "Unexpected return value.\n"); hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = effect->lpVtbl->IsOptimized(effect); ok(ret, "Unexpected return value.\n"); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!shaderdesc.pBytecode, "Unexpected bytecode.\n"); @@ -6604,11 +6604,11 @@ static void test_effect_optimize(void) ok(!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!tech_desc.Name, "Unexpected technique name %p.\n", tech_desc.Name); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!pass_desc.Name, "Unexpected pass name %p.\n", pass_desc.Name); pass = tech->lpVtbl->GetPassByName(tech, "P0"); @@ -6622,17 +6622,17 @@ static void test_effect_optimize(void) /* Already optimized */ hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); /* Annotations are stripped. */ hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = cb->lpVtbl->GetAnnotationByName(cb, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6643,7 +6643,7 @@ static void test_effect_optimize(void) { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6651,7 +6651,7 @@ static void test_effect_optimize(void) tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(tech_desc.Annotations == 1, "Unexpected annotations count %u.\n", tech_desc.Annotations); v = tech->lpVtbl->GetAnnotationByName(tech, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6659,17 +6659,17 @@ static void test_effect_optimize(void) pass = tech->lpVtbl->GetPassByIndex(tech, 0); ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pass_desc.Annotations == 1, "Unexpected annotations count %u.\n", pass_desc.Annotations); v = pass->lpVtbl->GetAnnotationByName(pass, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); v = cb->lpVtbl->GetAnnotationByName(cb, "s"); @@ -6682,7 +6682,7 @@ todo_wine { { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); @@ -6692,7 +6692,7 @@ todo_wine { tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!tech_desc.Annotations, "Unexpected annotations count %u.\n", tech_desc.Annotations); v = tech->lpVtbl->GetAnnotationByName(tech, "s"); @@ -6702,7 +6702,7 @@ todo_wine { pass = tech->lpVtbl->GetPassByIndex(tech, 0); ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!pass_desc.Annotations, "Unexpected annotations count %u.\n", pass_desc.Annotations); v = pass->lpVtbl->GetAnnotationByName(pass, "s"); @@ -6712,7 +6712,7 @@ todo_wine { effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_shader_description(void) @@ -6732,40 +6732,40 @@ static void test_effect_shader_description(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "v0"); /* GetShaderDesc() is indexing through all shaders in the effect.*/ s = v->lpVtbl->AsShader(v); hr = s->lpVtbl->GetShaderDesc(s, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 1, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 2, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 3, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 4, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 5, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 420, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 6, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!shaderdesc.SODecl, "Unexpected SO declaration %p.\n", shaderdesc.SODecl); hr = s->lpVtbl->GetShaderDesc(s, 7, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x; $Skip.x; SV_POSITION.gb"), @@ -6774,7 +6774,7 @@ static void test_effect_shader_description(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_shader_object(void) @@ -6796,7 +6796,7 @@ static void test_effect_shader_object(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect!\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "v0"); @@ -6804,108 +6804,108 @@ static void test_effect_shader_object(void) vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 0, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 1, &vs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 2, &vs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = NULL; hr = s->lpVtbl->GetVertexShader(s, 3, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); vs = NULL; hr = s->lpVtbl->GetVertexShader(s, 4, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 0, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 1, &ps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 2, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 3, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 4, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = NULL; hr = s->lpVtbl->GetPixelShader(s, 5, &ps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!ps, "Unexpected shader object.\n"); ID3D10PixelShader_Release(ps); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 0, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 1, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 2, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 3, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 4, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 5, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = NULL; hr = s->lpVtbl->GetGeometryShader(s, 6, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!gs, "Unexpected shader object.\n"); ID3D10GeometryShader_Release(gs); gs = NULL; hr = s->lpVtbl->GetGeometryShader(s, 7, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!gs, "Unexpected shader object.\n"); ID3D10GeometryShader_Release(gs); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7115,44 +7115,44 @@ static void test_effect_pool(void) hr = D3D10CreateEffectPoolFromMemory(NULL, 0, 0, device, &pool); todo_wine - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect_pool(fx_test_pool, device, &pool); - ok(hr == S_OK, "Failed to create effect pool, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); effect = pool->lpVtbl->AsEffect(pool); ok(!!effect, "Expected effect pointer.\n"); effect->lpVtbl->AddRef(effect); refcount = get_refcount(pool); - ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); effect->lpVtbl->Release(effect); hr = pool->lpVtbl->QueryInterface(pool, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3D10Effect, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3D10EffectPool, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(unk == (IUnknown *)pool, "Unexpected pointer.\n"); IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3D10Effect, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3D10EffectPool, (void **)&pool2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pool2 == pool, "Unexpected pool pointer.\n"); pool2->lpVtbl->Release(pool2); @@ -7160,7 +7160,7 @@ static void test_effect_pool(void) ok(ret, "Expected pool.\n"); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 1, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(!desc.SharedConstantBuffers, "Unexpected shared buffer count %u.\n", @@ -7171,13 +7171,13 @@ static void test_effect_pool(void) cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); a = cb->lpVtbl->GetAnnotationByIndex(cb, 0); ok(a->lpVtbl->IsValid(a), "Expected valid annotation.\n"); hr = a->lpVtbl->GetDesc(a, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == (D3D10_EFFECT_VARIABLE_POOLED | D3D10_EFFECT_VARIABLE_ANNOTATION), "Unexpected flags %#x.\n", var_desc.Flags); @@ -7186,70 +7186,68 @@ static void test_effect_pool(void) pass = t->lpVtbl->GetPassByName(t, "P1"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = shader_desc.pShaderVariable->lpVtbl->GetDesc(shader_desc.pShaderVariable, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "$Anonymous"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "s_blendstate"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_blendstate"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "ps"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "ps"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); pass = t->lpVtbl->GetPassByIndex(t, 0); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); sv = shader_desc.pShaderVariable; hr = sv->lpVtbl->GetDesc(sv, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "$Anonymous"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); /* Create standalone effect from the same blob used for pool, */ hr = create_effect(fx_test_pool, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool, 0, device, NULL, &effect2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10Effect, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); /* For regular effects querying for ID3D10EffectPool is broken */ hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10EffectPool, (void **)&unk); -todo_wine { - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(unk == (IUnknown *)effect2, "Unexpected pointer.\n"); -} + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine ok(unk == (IUnknown *)effect2, "Got unexpected pointer %p.\n", unk); if (SUCCEEDED(hr)) IUnknown_Release(unk); ret = effect2->lpVtbl->IsPool(effect2); ok(!ret, "Unexpected pool.\n"); hr = effect2->lpVtbl->GetDesc(effect2, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 1, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(!desc.SharedConstantBuffers, "Unexpected shared buffer count %u.\n", @@ -7260,7 +7258,7 @@ todo_wine { cb = effect2->lpVtbl->GetConstantBufferByIndex(effect2, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7268,13 +7266,13 @@ todo_wine { /* Pool and child that use different devices. */ hr = create_effect_pool(fx_test_pool, device2, &pool2); - ok(hr == S_OK, "Failed to create an effect pool, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, pool2, &child_effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = child_effect->lpVtbl->GetDevice(child_effect, &device3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(device3 == device, "Unexpected device.\n"); ID3D10Device_Release(device3); @@ -7282,7 +7280,7 @@ todo_wine { ok(cb->lpVtbl->IsValid(cb), "Expected valid constant buffer.\n"); hr = cb->lpVtbl->GetConstantBuffer(cb, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Buffer_GetDevice(buffer, &device3); ok(device3 == device2, "Unexpected device.\n"); ID3D10Device_Release(device3); @@ -7293,22 +7291,22 @@ todo_wine { /* When pool is specified, corresponding flag has to be set. */ hr = create_effect(fx_test_pool_child, 0, device, pool, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, pool, &child_effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); hr = child_effect->lpVtbl->GetDesc(child_effect, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 2, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 1, "Unexpected shared buffer count %u.\n", @@ -7323,7 +7321,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "l_cb"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7332,7 +7330,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "l_cb2"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7341,7 +7339,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7355,49 +7353,49 @@ todo_wine { /* Local variables first */ v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 0); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f0"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 1); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 2); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "vs"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 3); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f1"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 4); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByName(child_effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR0"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f0"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR1"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7406,10 +7404,10 @@ todo_wine { pool->lpVtbl->Release(pool); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = ID3D10Device_Release(device2); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7495,13 +7493,13 @@ static void test_effect_default_variable_value(void) } hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); memset(float_v, 0, sizeof(float_v)); v = effect->lpVtbl->GetVariableByName(effect, "f4"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 3.0f && float_v[3] == 4.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7510,7 +7508,7 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "f2"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7519,7 +7517,7 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "f1"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 5.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7527,32 +7525,32 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "i"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetInt(scalar, &int_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(int_s == 10, "Unexpected value %d.\n", int_s); memset(int_v, 0, sizeof(int_v)); v = effect->lpVtbl->GetVariableByName(effect, "i2"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetIntArray(scalar, int_v, 0, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(int_v[0] == 9 && int_v[1] == 12, "Unexpected vector {%d,%d}\n", int_v[0], int_v[1]); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); v2 = v->lpVtbl->GetElement(v, 0); hr = v2->lpVtbl->GetDesc(v2, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); v2 = v->lpVtbl->GetElement(v, 1); hr = v2->lpVtbl->GetDesc(v2, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 48, "Unexpected offset %u.\n", var_desc.BufferOffset); float_s = 0.0f; v = effect->lpVtbl->GetVariableByName(effect, "f"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetFloat(scalar, &float_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_s == 0.2f, "Unexpected value %.8e.\n", float_s); /* Matrix */ @@ -7561,7 +7559,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_INT, 2, 3, 1); compare_matrix("m1", __LINE__, &m_set, &m_ret, 2, 3, FALSE); @@ -7571,7 +7569,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_INT, 2, 3, 1); compare_matrix("m2", __LINE__, &m_set, &m_ret, 2, 3, FALSE); @@ -7581,7 +7579,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); memset(&m_set, 0, sizeof(m_set)); *(unsigned int *)&m_set.m[0][0] = 1; @@ -7597,7 +7595,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_FLOAT, 2, 2, 1); compare_matrix("m4", __LINE__, &m_set, &m_ret, 2, 2, FALSE); @@ -7610,27 +7608,27 @@ static void test_effect_default_variable_value(void) ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetBool(scalar, &ret); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(ret == 1, "Unexpected value.\n"); m = v->lpVtbl->GetMemberByName(v, "f2"); ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetFloat(scalar, &float_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_s == -0.2f, "Unexpected value %f.\n", float_s); m = v->lpVtbl->GetMemberByName(v, "b2"); ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetBool(scalar, &ret); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!ret, "Unexpected value.\n"); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_raw_value(void) @@ -7652,29 +7650,29 @@ static void test_effect_raw_value(void) } hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Read 1 float at a time, from float4 vector. */ v = effect->lpVtbl->GetVariableByName(effect, "f4"); for (i = 0; i < 4; ++i) { hr = v->lpVtbl->GetRawValue(v, &f, sizeof(f) * i, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == i + 1.0f, "Unexpected value %f.\n", f); } /* Offset outside of variable storage, returns adjacent memory contents. */ hr = v->lpVtbl->GetRawValue(v, &f, 16, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); hr = v->lpVtbl->GetRawValue(v, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 2.0f, "Unexpected value %f.\n", f); /* Array */ v = effect->lpVtbl->GetVariableByName(effect, "i2"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); hr = v->lpVtbl->GetRawValue(v, i_v, 0, 8 * sizeof(float)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(i_v[0] == 9, "Unexpected value %d.\n", i_v[0]); ok(i_v[1] == 0, "Unexpected value %d.\n", i_v[1]); ok(i_v[2] == 0, "Unexpected value %d.\n", i_v[2]); @@ -7682,7 +7680,7 @@ static void test_effect_raw_value(void) ok(i_v[4] == 12, "Unexpected value %d.\n", i_v[4]); hr = v->lpVtbl->GetRawValue(v, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 0.2f, "Unexpected value %f.\n", f); /* Matrix */ @@ -7715,25 +7713,25 @@ static void test_effect_raw_value(void) for (i = 0; i < 4; ++i) { hr = cb->lpVtbl->GetRawValue(cb, &f, sizeof(f) * i, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == i + 1.0f, "Unexpected value %f.\n", f); } hr = cb->lpVtbl->GetRawValue(cb, &f, 16, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); hr = cb->lpVtbl->GetRawValue(cb, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 2.0f, "Unexpected value %f.\n", f); /* Invalid variable */ v = effect->lpVtbl->GetVariableByName(effect, "invalid"); hr = v->lpVtbl->GetRawValue(v, &f, 0, sizeof(f)); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7816,7 +7814,7 @@ static void test_effect_dynamic_numeric_field(void) } hr = create_effect(fx_test_effect_dynamic_numeric_field, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); ok(tech->lpVtbl->IsValid(tech), "Expected valid technique.\n"); @@ -7828,7 +7826,7 @@ static void test_effect_dynamic_numeric_field(void) memset(blend_factor, 0, sizeof(blend_factor)); ID3D10Device_OMSetBlendState(device, NULL, blend_factor, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(!stencil_ref, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); @@ -7841,17 +7839,17 @@ static void test_effect_dynamic_numeric_field(void) v = effect->lpVtbl->GetVariableByName(effect, "i1"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->SetInt(scalar, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x2, "Unexpected stencil ref value %#x.\n", stencil_ref); hr = scalar->lpVtbl->SetInt(scalar, 3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pass_desc.StencilRef == 0x3, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x2, "Unexpected stencil ref value %#x.\n", stencil_ref); @@ -7862,13 +7860,13 @@ static void test_effect_dynamic_numeric_field(void) v = v->lpVtbl->GetElement(v, 1); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->SetInt(scalar, 4); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMSetDepthStencilState(device, NULL, 0x1); memset(blend_factor, 0, sizeof(blend_factor)); ID3D10Device_OMSetBlendState(device, NULL, blend_factor, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x4, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); @@ -7881,7 +7879,7 @@ static void test_effect_dynamic_numeric_field(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8000,13 +7998,13 @@ static void test_effect_index_expression(void) } hr = create_effect(fx_test_index_expression, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Initial index */ tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); pass = tech->lpVtbl->GetPassByIndex(tech, 0); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index.\n"); v = effect->lpVtbl->GetVariableByName(effect, "g_var"); @@ -8014,14 +8012,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8029,10 +8027,10 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 1.0f, 1.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8041,14 +8039,14 @@ static void test_effect_index_expression(void) /* Out of bounds index */ set_vec4(val, 0.0f, 0.0f, 2.0f, 2.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8056,14 +8054,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 3.0f, 3.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8071,14 +8069,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, -1.0f, -1.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8086,50 +8084,50 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, -11.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); ID3D10BlendState_Release(bs); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); set_vec4(val, 0.9f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); v = effect->lpVtbl->GetVariableByName(effect, "g_var2"); vector = v->lpVtbl->AsVector(v); hr = pass->lpVtbl->GetGeometryShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); set_vec4(val, 0.0f, 1.0f, 0.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetGeometryShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8201,12 +8199,12 @@ static void test_effect_value_expression(void) } hr = create_effect(fx_test_value_expression, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8238,12 +8236,12 @@ static void test_effect_fx_4_1(void) } hr = create_effect(fx_test_fx_4_1, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } START_TEST(effect) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 6d6173824a2..13769d57e34 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -22,6 +22,9 @@ * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #define COBJMACROS #include "initguid.h" #include "d3dcompiler.h" -- 2.30.2

1 0

[PATCH v3 5/5] msvcp: Print 0x prefix with %#x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH v3 4/5] msvcrt: Print 0x prefix with %#x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/file.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH v3 3/5] msvcrt: Use %#I64x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 2 +- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/except_x86_64.c | 4 ++-- dlls/msvcrt/file.c | 33 +++++++++++++++------------------ dlls/msvcrt/scanf.c | 8 ++++---- dlls/msvcrt/string.c | 10 +++++----- dlls/msvcrt/wcs.c | 14 +++++++------- 7 files changed, 36 insertions(+), 39 deletions(-)

1 0

[PATCH v3 2/5] msvcr: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

1 0

[PATCH v3 1/5] msvcp: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - use I64 instead of ll printf format dlls/msvcirt/Makefile.in | 2 +- dlls/msvcirt/msvcirt.c | 30 +++++++++++++++--------------- dlls/msvcp100/Makefile.in | 2 +- dlls/msvcp110/Makefile.in | 2 +- dlls/msvcp120/Makefile.in | 2 +- dlls/msvcp140/Makefile.in | 2 +- dlls/msvcp60/Makefile.in | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp70/Makefile.in | 2 +- dlls/msvcp71/Makefile.in | 2 +- dlls/msvcp80/Makefile.in | 2 +- dlls/msvcp90/Makefile.in | 2 +- dlls/msvcp90/locale.c | 20 ++++++++++---------- dlls/msvcp90/misc.c | 18 +++++++++--------- dlls/msvcp90/msvcp_main.c | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-)

1 0