[PATCH] quartz/systemclock: Use timeGetTime() to retrieve the current time.
by Zebediah Figura 14 May '22
by Zebediah Figura 14 May '22
14 May '22
There is no evidence that the extra overhead should matter, and this allows us
to be consistent, and potentially change timeGetTime() without having to worry
about quartz.
On Windows, timeGetTime() has identical resolution to the interrupt time [i.e.
the "InterruptTime" member of the shared user data, or QueryInterruptTime()].
Like those sources, it approximately measures the boot time. However, the values
are not identical; timeGetTime() lags behind QueryInterruptTime() anywhere from
1 to 12 ms (regardless of timer period) on my Windows 10 virtual machine. The
actual lag is consistent within a process but varies between runs. I have not
been able to account for this lag—it's not the suspend bias, nor is it an
attempt to match the tick count more closely.
In short, timeGetTime() seems to be idiosyncratic to winmm. Since quartz has
been shown to follow winmm exactly on Windows, let's follow it on Wine as well.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53005
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/quartz/Makefile.in | 2 +-
dlls/quartz/systemclock.c | 13 ++++---------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index e7e1b43da79..7854a87e846 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -1,6 +1,6 @@
MODULE = quartz.dll
IMPORTLIB = quartz
-IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32
+IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm
C_SRCS = \
acmwrapper.c \
diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c
index 729122fec46..dcc6549682c 100644
--- a/dlls/quartz/systemclock.c
+++ b/dlls/quartz/systemclock.c
@@ -45,7 +45,6 @@ struct system_clock
LONG thread_created;
BOOL thread_stopped;
HANDLE thread;
- LARGE_INTEGER frequency;
REFERENCE_TIME last_time;
CRITICAL_SECTION cs;
CONDITION_VARIABLE cv;
@@ -53,12 +52,9 @@ struct system_clock
struct list sinks;
};
-static REFERENCE_TIME get_current_time(const struct system_clock *clock)
+static REFERENCE_TIME get_current_time(void)
{
- LARGE_INTEGER time;
-
- QueryPerformanceCounter(&time);
- return (time.QuadPart * 1000) / clock->frequency.QuadPart * 10000;
+ return timeGetTime() * 10000;
}
static inline struct system_clock *impl_from_IUnknown(IUnknown *iface)
@@ -155,7 +151,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param)
EnterCriticalSection(&clock->cs);
- current_time = get_current_time(clock);
+ current_time = get_current_time();
LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry)
{
@@ -250,7 +246,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_
return E_POINTER;
}
- ret = get_current_time(clock);
+ ret = get_current_time();
EnterCriticalSection(&clock->cs);
@@ -346,7 +342,6 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out)
list_init(&object->sinks);
InitializeCriticalSection(&object->cs);
object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs");
- QueryPerformanceFrequency(&object->frequency);
TRACE("Created system clock %p.\n", object);
*out = &object->IUnknown_inner;
--
2.35.1
2
1
Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid
conflicts with reserved words when included from C++ applications.
Signed-off-by: Philip Allison <mangobrain(a)gmail.com>
---
dlls/uiautomationcore/uia_main.c | 4 ++--
include/uiautomationcoreapi.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
index 9f257684333..4b0fb545c51 100644
--- a/dlls/uiautomationcore/uia_main.c
+++ b/dlls/uiautomationcore/uia_main.c
@@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN
/***********************************************************************
* UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@)
*/
-HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new)
+HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue)
{
- FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new));
+ FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue));
return S_OK;
}
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index 22b3888dc6e..cc44501e1a0 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value);
int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid);
BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj);
HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id);
-HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new);
+HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue);
void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback);
LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov);
BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
--
2.32.0
2
2
Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com>
---
include/d2d1effectauthor.idl | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl
index b53aa515e85..a58ec35b4b5 100644
--- a/include/d2d1effectauthor.idl
+++ b/include/d2d1effectauthor.idl
@@ -18,6 +18,12 @@
import "d2d1_1.idl";
+typedef HRESULT (__stdcall *PD2D1_PROPERTY_SET_FUNCTION)(IUnknown *effect,
+ const BYTE *data, UINT32 data_size);
+
+typedef HRESULT (__stdcall *PD2D1_PROPERTY_GET_FUNCTION)(const IUnknown *effect,
+ BYTE *data, UINT32 data_size, UINT32 *actual_size);
+
typedef enum D2D1_FILTER
{
D2D1_FILTER_MIN_MAG_MIP_POINT = 0x00,
@@ -39,6 +45,13 @@ typedef enum D2D1_FEATURE
D2D1_FEATURE_FORCE_DWORD = 0xffffffff
} D2D1_FEATURE;
+typedef struct D2D1_PROPERTY_BINDING
+{
+ const WCHAR *propertyName;
+ PD2D1_PROPERTY_SET_FUNCTION setFunction;
+ PD2D1_PROPERTY_GET_FUNCTION getFunction;
+} D2D1_PROPERTY_BINDING;
+
typedef enum D2D1_CHANNEL_DEPTH
{
D2D1_CHANNEL_DEPTH_DEFAULT = 0x0,
--
2.25.1
5
7
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52993
Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
---
dlls/msi/tests/action.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c
index 224637eb286..e5c862e206c 100644
--- a/dlls/msi/tests/action.c
+++ b/dlls/msi/tests/action.c
@@ -3690,9 +3690,10 @@ static void test_publish(void)
LONG res;
HKEY uninstall, prodkey, uninstall_32node = NULL;
INSTALLSTATE state;
- char date[MAX_PATH], temp[MAX_PATH], prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}";
+ char date[MAX_PATH], date2[MAX_PATH], temp[MAX_PATH], buf[MAX_PATH];
+ const char prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}";
REGSAM access = KEY_ALL_ACCESS;
- DWORD error;
+ DWORD error, type, size;
if (!pMsiQueryFeatureStateExA)
{
@@ -4216,7 +4217,15 @@ static void test_publish(void)
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
CHECK_REG_STR(prodkey, "DisplayVersion", "1.1.1");
- CHECK_REG_STR(prodkey, "InstallDate", date);
+
+ get_date_str(date2);
+ size = ARRAY_SIZE(buf);
+ buf[0] = '\0';
+ res = RegQueryValueExA(prodkey, "InstallDate", NULL, &type, (BYTE *)buf, &size);
+ ok(!res, "Failed to query value, error %ld\n", res);
+ ok(type == REG_SZ, "Got wrong type %lu\n", type);
+ ok(!strcmp(buf, date) || !strcmp(buf, date2), "got %s\n", debugstr_a(buf));
+
CHECK_REG_STR(prodkey, "InstallSource", temp);
CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "Publisher", "Wine");
--
2.30.2
1
0
[PATCH v4 0/5] MR34: windows.media.speech: Changes for IAsyncAction.
by Bernhard Kölbl (ï¼ besentv) 14 May '22
by Bernhard Kölbl (ï¼ besentv) 14 May '22
14 May '22
Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
--
v4: windows.media.speech: Rename async_operation to async_inspectable.
windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed.
windows.media.speech/tests: Remove some unreliable ref checks.
windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent.
https://gitlab.winehq.org/wine/wine/-/merge_requests/34
3
6
Signed-off-by: James McDonnell <topgamer7(a)gmail.com>
---
dlls/d3d11/d3d11_private.h | 6 ++--
dlls/d3d11/device.c | 40 ++++++++++++++++++++++----
dlls/d3d11/state.c | 58 ++++++++++++++++++++++++++++----------
3 files changed, 80 insertions(+), 24 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index efe26551258..b8faf457870 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -411,7 +411,7 @@ HRESULT d3d11_class_linkage_create(struct d3d_device *device,
/* ID3D11BlendState, ID3D10BlendState1 */
struct d3d_blend_state
{
- ID3D11BlendState ID3D11BlendState_iface;
+ ID3D11BlendState1 ID3D11BlendState1_iface;
ID3D10BlendState1 ID3D10BlendState1_iface;
LONG refcount;
@@ -422,9 +422,9 @@ struct d3d_blend_state
ID3D11Device2 *device;
};
-static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface)
+static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState1 *iface)
{
- return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface);
+ return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState1_iface);
}
HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc,
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index ecf45e9ce33..117620472f5 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -2204,7 +2204,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetBlendState(ID3D11DeviceC
if (wined3d_state)
{
blend_state_impl = wined3d_blend_state_get_parent(wined3d_state);
- ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface);
+ ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState1_iface);
}
else
*blend_state = NULL;
@@ -3644,7 +3644,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device2 *if
if (FAILED(hr = d3d_blend_state_create(device, desc, &object)))
return hr;
- *blend_state = &object->ID3D11BlendState_iface;
+ *blend_state = &object->ID3D11BlendState1_iface;
return S_OK;
}
@@ -4282,11 +4282,39 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Devic
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *iface,
- const D3D11_BLEND_DESC1 *desc, ID3D11BlendState1 **state)
+ const D3D11_BLEND_DESC1 *desc, ID3D11BlendState1 **blend_state)
{
- FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state);
+ struct d3d_device *device = impl_from_ID3D11Device2(iface);
+ struct d3d_blend_state *object;
+ HRESULT hr;
+ unsigned i, j;
+ D3D11_BLEND_DESC simple_desc;
- return E_NOTIMPL;
+ TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state);
+ FIXME("Logical operations are not implemented.\n");
+
+ memset(&simple_desc, 0, sizeof(simple_desc));
+ simple_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable;
+ simple_desc.IndependentBlendEnable = desc->IndependentBlendEnable;
+ for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i)
+ {
+ j = desc->IndependentBlendEnable ? i : 0;
+ simple_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable;
+ simple_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend;
+ simple_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend;
+ simple_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp;
+ simple_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha;
+ simple_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha;
+ simple_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha;
+ simple_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask;
+ }
+
+ if (FAILED(hr = d3d_blend_state_create(device, &simple_desc, &object)))
+ return hr;
+
+ *blend_state = (ID3D11BlendState1*)&object->ID3D11BlendState1_iface;
+
+ return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device2 *iface,
@@ -4993,7 +5021,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface,
blend_state_object = unsafe_impl_from_ID3D10BlendState(blend_state);
d3d11_device_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface,
- blend_state_object ? &blend_state_object->ID3D11BlendState_iface : NULL, blend_factor, sample_mask);
+ blend_state_object ? &blend_state_object->ID3D11BlendState1_iface : NULL, blend_factor, sample_mask);
}
static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 *iface,
diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c
index f67017ff1ef..6c8d8fa611c 100644
--- a/dlls/d3d11/state.c
+++ b/dlls/d3d11/state.c
@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11);
/* ID3D11BlendState methods */
-static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState1 *iface,
REFIID riid, void **object)
{
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
@@ -54,7 +54,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendSta
return E_NOINTERFACE;
}
-static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface)
+static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState1 *iface)
{
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
ULONG refcount = InterlockedIncrement(&state->refcount);
@@ -70,7 +70,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface)
return refcount;
}
-static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface)
+static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState1 *iface)
{
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
ULONG refcount = InterlockedDecrement(&state->refcount);
@@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface
return refcount;
}
-static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *iface,
+static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState1 *iface,
ID3D11Device **device)
{
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
@@ -98,7 +98,7 @@ static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *ifac
ID3D11Device_AddRef(*device);
}
-static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendState *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendState1 *iface,
REFGUID guid, UINT *data_size, void *data)
{
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
@@ -108,7 +108,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendSta
return d3d_get_private_data(&state->private_store, guid, data_size, data);
}
-static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendState *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendState1 *iface,
REFGUID guid, UINT data_size, const void *data)
{
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
@@ -118,7 +118,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendSta
return d3d_set_private_data(&state->private_store, guid, data_size, data);
}
-static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D11BlendState *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D11BlendState1 *iface,
REFGUID guid, const IUnknown *data)
{
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
@@ -128,7 +128,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D1
return d3d_set_private_data_interface(&state->private_store, guid, data);
}
-static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState *iface, D3D11_BLEND_DESC *desc)
+static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState1 *iface, D3D11_BLEND_DESC *desc)
{
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
@@ -137,7 +137,33 @@ static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState *iface,
*desc = state->desc;
}
-static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl =
+static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc1(ID3D11BlendState1 *iface, D3D11_BLEND_DESC1 *desc)
+{
+ struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
+ D3D11_BLEND_DESC1 d3d11_1_desc;
+ unsigned i;
+
+ TRACE("iface %p, desc %p.\n", iface, desc);
+ FIXME("LogicOp is not yet supported.\n");
+
+ d3d11_1_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable;
+ d3d11_1_desc.IndependentBlendEnable = desc->IndependentBlendEnable;
+ for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; i++) {
+ d3d11_1_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[i].BlendEnable;
+ d3d11_1_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[i].SrcBlend;
+ d3d11_1_desc.RenderTarget[i].DestBlend = desc->RenderTarget[i].DestBlend;
+ d3d11_1_desc.RenderTarget[i].BlendOp = desc->RenderTarget[i].BlendOp;
+ d3d11_1_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[i].SrcBlendAlpha;
+ d3d11_1_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[i].DestBlendAlpha;
+ d3d11_1_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[i].BlendOpAlpha;
+ d3d11_1_desc.RenderTarget[i].LogicOp = D3D11_LOGIC_OP_CLEAR;
+ d3d11_1_desc.RenderTarget[i].LogicOpEnable = 0;
+ d3d11_1_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[i].RenderTargetWriteMask;
+ }
+ *desc = d3d11_1_desc;
+}
+
+static const struct ID3D11BlendState1Vtbl d3d11_blend_state_vtbl =
{
/* IUnknown methods */
d3d11_blend_state_QueryInterface,
@@ -150,6 +176,8 @@ static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl =
d3d11_blend_state_SetPrivateDataInterface,
/* ID3D11BlendState methods */
d3d11_blend_state_GetDesc,
+ /* ID3D11BlendState1 methods */
+ d3d11_blend_state_GetDesc1,
};
/* ID3D10BlendState methods */
@@ -168,7 +196,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendSta
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
- return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState_iface, riid, object);
+ return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState1_iface, riid, object);
}
static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState1 *iface)
@@ -177,7 +205,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState1 *iface
TRACE("iface %p.\n", iface);
- return d3d11_blend_state_AddRef(&state->ID3D11BlendState_iface);
+ return d3d11_blend_state_AddRef(&state->ID3D11BlendState1_iface);
}
static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState1 *iface)
@@ -186,7 +214,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState1 *ifac
TRACE("iface %p.\n", iface);
- return d3d11_blend_state_Release(&state->ID3D11BlendState_iface);
+ return d3d11_blend_state_Release(&state->ID3D11BlendState1_iface);
}
/* ID3D10DeviceChild methods */
@@ -366,7 +394,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC
object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry);
TRACE("Returning existing blend state %p.\n", object);
- ID3D11BlendState_AddRef(&object->ID3D11BlendState_iface);
+ ID3D11BlendState_AddRef(&object->ID3D11BlendState1_iface);
*state = object;
wined3d_mutex_unlock();
@@ -379,7 +407,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC
return E_OUTOFMEMORY;
}
- object->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl;
+ object->ID3D11BlendState1_iface.lpVtbl = (struct ID3D11BlendState1Vtbl *)&d3d11_blend_state_vtbl;
object->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl;
object->refcount = 1;
wined3d_private_store_init(&object->private_store);
@@ -436,7 +464,7 @@ struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *ifac
return NULL;
assert(iface->lpVtbl == &d3d11_blend_state_vtbl);
- return impl_from_ID3D11BlendState(iface);
+ return impl_from_ID3D11BlendState((ID3D11BlendState1 *)iface);
}
struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface)
--
2.35.1
3
3
Re: [PATCH v2 0/2] MR63: Test and fix an out-of-order RECT in RedrawWindow()
by Pedro Perdigão (ï¼ pperdigao) 13 May '22
by Pedro Perdigão (ï¼ pperdigao) 13 May '22
13 May '22
On Fri May 13 22:57:37 2022 +0000, **** wrote:
> Zebediah Figura replied on the mailing list:
> ```
> On 5/12/22 07:51, Pedro Perdigão wrote:
> > @@ -8186,7 +8187,10 @@ static void check_update_rgn_( int line, HWND
> hwnd, HRGN hrgn )
> > ok( ret != ERROR, "GetUpdateRgn failed\n" );
> > if (ret == NULLREGION)
> > {
> > - ok_(__FILE__,line)( !hrgn, "Update region shouldn't be
> empty\n" );
> > + if(todo)
> > + todo_wine ok_(__FILE__,line)( !hrgn, "Update region
> shouldn't be empty\n" );
> > + else
> > + ok_(__FILE__,line)( !hrgn, "Update region shouldn't be
> empty\n" );
> > }
> > else
> > {
> This was already committed, but for future reference, there's a
> "todo_wine_if()" macro for this.
> ```
Ok, thanks. But this changes was removed by commit 1146bde3
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/63#note_864
1
0
[PATCH 0/2] MR63: Test and fix an out-of-order RECT in RedrawWindow()
by Pedro Perdigão (ï¼ pperdigao) 13 May '22
by Pedro Perdigão (ï¼ pperdigao) 13 May '22
13 May '22
Signed-off-by: Pedro Perdigão <pperdigao(a)codeweavers.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/63
5
6
Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid
conflicts with reserved words when included from C++ applications.
Signed-off-by: Philip Allison <mangobrain(a)googlemail.com>
---
dlls/uiautomationcore/uia_main.c | 4 ++--
include/uiautomationcoreapi.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
index 9f257684333..4b0fb545c51 100644
--- a/dlls/uiautomationcore/uia_main.c
+++ b/dlls/uiautomationcore/uia_main.c
@@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN
/***********************************************************************
* UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@)
*/
-HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new)
+HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue)
{
- FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new));
+ FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue));
return S_OK;
}
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index 22b3888dc6e..cc44501e1a0 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value);
int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid);
BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj);
HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id);
-HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new);
+HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue);
void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback);
LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov);
BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
--
2.32.0
1
0
Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid
conflicts with reserved words when included from C++ applications.
Signed-off-by: Philip Allison <mangobrain(a)googlemail.com>
---
dlls/uiautomationcore/uia_main.c | 4 ++--
include/uiautomationcoreapi.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
index 9f257684333..4b0fb545c51 100644
--- a/dlls/uiautomationcore/uia_main.c
+++ b/dlls/uiautomationcore/uia_main.c
@@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN
/***********************************************************************
* UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@)
*/
-HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new)
+HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue)
{
- FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new));
+ FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue));
return S_OK;
}
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index 22b3888dc6e..cc44501e1a0 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value);
int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid);
BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj);
HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id);
-HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new);
+HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue);
void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback);
LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov);
BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
--
2.35.3
1
0
Re: [PATCH v2 0/5] MR51: Fix handling of dbghelp's basic type - approved
by Alexandre Julliard (ï¼ julliard) 13 May '22
by Alexandre Julliard (ï¼ julliard) 13 May '22
13 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/51
1
0
Re: [PATCH v2 0/5] MR65: ntdll: More heap cleanup and RtlWalkHeap fixes. - approved
by Alexandre Julliard (ï¼ julliard) 13 May '22
by Alexandre Julliard (ï¼ julliard) 13 May '22
13 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/65
1
0
Re: [PATCH v2 0/3] MR48: Implement IPv6 stats for Mac OS and BSD - approved
by Alexandre Julliard (ï¼ julliard) 13 May '22
by Alexandre Julliard (ï¼ julliard) 13 May '22
13 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/48
1
0
Re: [PATCH v2 0/1] MR35: wined3d: Don't do a full cleanup when waiting for a command buffer. - approved
by Alexandre Julliard (ï¼ julliard) 13 May '22
by Alexandre Julliard (ï¼ julliard) 13 May '22
13 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/35
1
0
Re: [PATCH v2 0/1] MR16: wined3d: Reduce the size of staging BO's for texture uploads. - approved
by Alexandre Julliard (ï¼ julliard) 13 May '22
by Alexandre Julliard (ï¼ julliard) 13 May '22
13 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/16
1
0
Re: [PATCH v2 0/2] MR63: Test and fix an out-of-order RECT in RedrawWindow() - approved
by Alexandre Julliard (ï¼ julliard) 13 May '22
by Alexandre Julliard (ï¼ julliard) 13 May '22
13 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/63
1
0
Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid
conflicts with reserved words when included from C++ applications.
Signed-off-by: Philip Allison <mangobrain(a)googlemail.com>
---
dlls/uiautomationcore/uia_main.c | 4 ++--
include/uiautomationcoreapi.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
index 9f257684333..4b0fb545c51 100644
--- a/dlls/uiautomationcore/uia_main.c
+++ b/dlls/uiautomationcore/uia_main.c
@@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN
/***********************************************************************
* UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@)
*/
-HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new)
+HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue)
{
- FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new));
+ FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue));
return S_OK;
}
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index 22b3888dc6e..cc44501e1a0 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value);
int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid);
BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj);
HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id);
-HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new);
+HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue);
void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback);
LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov);
BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
--
2.35.3
1
0
Hi,
This last week-end I updated 5 of the test machines, impacting 29 test
configurations.
Here's the rundown:
* w1064*
w1064 is now called w1064v2009.
And w1064 and all the derived snapshots are now running on Windows 10
21H2 (upgraded through Windows Update).
* w10pro64v2004
This snapshot used to have some specific failures most likely because
Windows Update was still installing already downloaded updates when I
initially took the snapshot (see bug 52560). So I let the VM quiet
down and retook the snapshot. That seems to have improved things. I'll
know for sure in a few days.
* w10pro64_*
w10pro64 had the same issue as w10pro64v2004, plus I needed to install
some more languages which requires un-metering the network at which
time Windows Update kicks in...
So I applied all updates and retook this snapshot. It's now on the
latest 21H1; Windows did not offer installing 21H2 for some reason.
It's just as well, this way test.winehq.org can separate the results
from this VM with all its locale tests, from those of the w1064 VM
which is more about past Windows versions and other configuration
options.
Then I let the TestBot recreate all the snapshots for the locale
tests. Windows has a bunch of locales: formats, display language,
system locale, keyboard layout, country. The old snapshots mostly had
the display language right but sometimes the other locales were still
stuck on English. The new snapshots are all consistent on that front
(whenever possible see below).
In the process I lost w10pro64_pt_PT which the new SetWinLocale have
trouble with (yet this works on my test VM so I blame the latest 21H1
updates). I also wanted to add a 'mixed locales' test configuration
but the scripts failed this one too. I'll investigate and get those
online later on.
* w10pro64_hi_u8
Before Windows 10 it was impossible to set the the system locale to
some values. For instance it was impossible to set it to Hindi. So the
w10pro64_hi still has English as its system locale unlike the other
locale test configurations.
Windows 10 lifted this restriction but this comes with two caveats:
- Setting the system locale to values like Hindi is possible but it
requires setting the codepage to UTF-8.
- This is considered beta and requires checking an extra box in the
GUI.
w10pro64_hi_u8 is one such configuration: Hindi through and through
with UTF-8 as the codepage. And based on the test results I think they
were not kidding with the 'beta' aspect: I count at least 11 tests
with UTF-8-specific failures on Windows. Some of these may be because
of issues in the test but I'm pretty sure some are Windows bugs we
will have to work around.
I would have liked to add another UTF-8 test configuration if only to
tweeze out Hindi-specific issues from the UTF-8 ones. I planned to use
en-EA for that because it's an all English UTF-8-only locale which
could be nice in case there are any error message that need reading...
But that's another locale that requires a SetWineLocale tweak.
* cw-gtx560
This is one of the two not-really-TestBot machines with real graphics
cards.
I added a Windows 10 21H2 snapshot. Note that again Windows did not
want to update it to 21H2 so I used Windows10Upgrade9252.exe to force
it. As far as I know the Nvidia driver is unchanged (391.35 iirc).
That machine's other snapshots are unchanged.
* cw-rx460
I also added a Windows 10 21H2 snapshot (Windows10Upgrade9252.exe
again, the other snapshots are unchanged).
Windows was suggesting I upgrade the GPU driver so I upgraded to the
latest Adrenalin 22.4.1 driver. In the past I had trouble with some of
the AMD drivers where it would either interfere with the clipboard
(causing tests to fail), or crash entirely (causing WineTest to fail
entirely).
So consider this new driver to be on probation.
* w7u*
I moved this VM from one host to another on 2022-03-14 which is when I
found issues with the new LibvirtTool and SetWinLocale scripts so I
ended up having to create most snapshots by hand :-( I restored it
again from backup to test the corrected scripts and this time all went
well.
The last move coincided with some new failures in mf:mf (2qxl only),
user32:sysparams and user32:win (2qxl only). It's possible the 2qxl
issues are because the VM is powered on for each test instead of
starting from a live snapshot: I suspect Windows 7 did not correctly
handle the multi-monitor setup when restored from a live snapshot.
This will require some more investigation...
--
Francois Gouget <fgouget(a)codeweavers.com>
5
16
[PATCH] shell32:shelllink: Make the create_lnk() failure messages unique.
by Francois Gouget 13 May '22
by Francois Gouget 13 May '22
13 May '22
create_lnk() reports all failures from the perspective of the caller.
That means the failure messages must be unique so one can figure out
which one of its ok() calls actually failed.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
Some of these tests sometimes fail (bug 28920 but it's not known which)
so this may cause the failures to look new.
---
dlls/shell32/tests/shelllink.c | 34 +++++++++++++++++++---------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index 8cbc46696ab..c8a0308a9cb 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -452,41 +452,45 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc)
init_dirty = IPersistFile_IsDirty(pf); /* empty links start off as clean */
r = IPersistFile_Save(pf, NULL, FALSE);
- lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08lx)\n", r);
+ lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */,
+ "save(NULL, FALSE) failed (0x%08lx)\n", r);
+
r = IPersistFile_IsDirty(pf);
- lok(r == init_dirty, "dirty (0x%08lx)\n", r);
+ lok(r == init_dirty, "dirty(NULL, FALSE) (0x%08lx)\n", r);
r = IPersistFile_Save(pf, NULL, TRUE);
- lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08lx)\n", r);
+ lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */,
+ "save(NULL, TRUE) failed (0x%08lx)\n", r);
+
r = IPersistFile_IsDirty(pf);
- lok(r == init_dirty, "dirty (0x%08lx)\n", r);
+ lok(r == init_dirty, "dirty(NULL, TRUE) (0x%08lx)\n", r);
/* test GetCurFile before ::Save */
str = (LPWSTR)0xdeadbeef;
r = IPersistFile_GetCurFile(pf, &str);
- lok(r == S_FALSE, "got 0x%08lx\n", r);
- lok(str == NULL, "got %p\n", str);
+ lok(r == S_FALSE, "GetCurFile:before got 0x%08lx\n", r);
+ lok(str == NULL, "GetCurFile:before got %p\n", str);
r = IPersistFile_Save(pf, path, TRUE);
- lok(r == S_OK, "save failed (0x%08lx)\n", r);
+ lok(r == S_OK, "save(path, TRUE) failed (0x%08lx)\n", r);
r = IPersistFile_IsDirty(pf);
- lok(r == S_FALSE, "dirty (0x%08lx)\n", r);
+ lok(r == S_FALSE, "dirty(path, TRUE) (0x%08lx)\n", r);
/* test GetCurFile after ::Save */
r = IPersistFile_GetCurFile(pf, &str);
- lok(r == S_OK, "got 0x%08lx\n", r);
- lok(str != NULL, "Didn't expect NULL\n");
- lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str));
+ lok(r == S_OK, "GetCurFile(path, TRUE) got 0x%08lx\n", r);
+ lok(str != NULL, "GetCurFile(path, TRUE) Didn't expect NULL\n");
+ lok(!wcscmp(path, str), "GetCurFile(path, TRUE) Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str));
CoTaskMemFree(str);
r = IPersistFile_Save(pf, NULL, TRUE);
- lok(r == S_OK, "save failed (0x%08lx)\n", r);
+ lok(r == S_OK, "save(NULL, TRUE) failed (0x%08lx)\n", r);
/* test GetCurFile after ::Save */
r = IPersistFile_GetCurFile(pf, &str);
- lok(r == S_OK, "got 0x%08lx\n", r);
- lok(str != NULL, "Didn't expect NULL\n");
- lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str));
+ lok(r == S_OK, "GetCurFile(NULL, TRUE) got 0x%08lx\n", r);
+ lok(str != NULL, "GetCurFile(NULL, TRUE) Didn't expect NULL\n");
+ lok(!wcscmp(path, str), "GetCurFile(NULL, TRUE) Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str));
CoTaskMemFree(str);
IPersistFile_Release(pf);
--
2.30.2
2
1
[PATCH 1/2] mstask/tests: Ignore the compare_trigger_state() return value.
by Francois Gouget 13 May '22
by Francois Gouget 13 May '22
13 May '22
What counts is the ok() calls that compare_trigger_state() makes. Its
return value is meaningless.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
dlls/mstask/tests/task_trigger.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c
index d0f659ef246..e0c1b549ab7 100644
--- a/dlls/mstask/tests/task_trigger.c
+++ b/dlls/mstask/tests/task_trigger.c
@@ -35,7 +35,7 @@ static DWORD obj_refcount(void *obj_to_check)
return IUnknown_Release(obj);
}
-static BOOL compare_trigger_state(TASK_TRIGGER found_state,
+static void compare_trigger_state(TASK_TRIGGER found_state,
TASK_TRIGGER expected_state)
{
ok(found_state.cbTriggerSize == expected_state.cbTriggerSize,
@@ -105,8 +105,6 @@ static BOOL compare_trigger_state(TASK_TRIGGER found_state,
ok(found_state.wRandomMinutesInterval == expected_state.wRandomMinutesInterval,
"wRandomMinutesInterval: Found %d but expected %d\n",
found_state.wRandomMinutesInterval, expected_state.wRandomMinutesInterval);
-
- return TRUE;
}
static void test_SetTrigger_GetTrigger(void)
@@ -342,14 +340,12 @@ static void test_SetTrigger_GetTrigger(void)
trigger_state.cbTriggerSize = sizeof(trigger_state) - 1;
hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state);
ok(hres == S_OK, "Failed to GetTrigger\n");
- ok(compare_trigger_state(trigger_state, normal_trigger_state),
- "Invalid state\n");
+ compare_trigger_state(trigger_state, normal_trigger_state);
memset(&trigger_state, 0xcf, sizeof(trigger_state));
trigger_state.cbTriggerSize = 0;
hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state);
ok(hres == S_OK, "Failed to GetTrigger\n");
- ok(compare_trigger_state(trigger_state, normal_trigger_state),
- "Invalid state\n");
+ compare_trigger_state(trigger_state, normal_trigger_state);
ITaskTrigger_Release(test_trigger);
ITask_Release(test_task);
--
2.30.2
1
1
[PATCH] comctl32/tests: Use winetest_push_context() in tooltip:test_customdraw().
by Francois Gouget 13 May '22
by Francois Gouget 13 May '22
13 May '22
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
dlls/comctl32/tests/tooltips.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c
index 3bde35250cc..b6f3ace7285 100644
--- a/dlls/comctl32/tests/tooltips.c
+++ b/dlls/comctl32/tests/tooltips.c
@@ -188,6 +188,7 @@ static void test_customdraw(void) {
HWND parent, hwndTip;
RECT rect;
TTTOOLINFOA toolInfo = { 0 };
+ winetest_push_context("%ld", iterationNumber);
/* Create a main window */
parent = CreateWindowExA(0, "CustomDrawClass", NULL,
@@ -196,7 +197,7 @@ static void test_customdraw(void) {
50, 50,
300, 300,
NULL, NULL, NULL, 0);
- ok(parent != NULL, "%ld: Creation of main window failed\n", iterationNumber);
+ ok(parent != NULL, "Creation of main window failed\n");
/* Make it show */
ShowWindow(parent, SW_SHOWNORMAL);
@@ -208,7 +209,7 @@ static void test_customdraw(void) {
CW_USEDEFAULT, CW_USEDEFAULT,
CW_USEDEFAULT, CW_USEDEFAULT,
parent, NULL, GetModuleHandleA(NULL), 0);
- ok(hwndTip != NULL, "%ld: Creation of tooltip window failed\n", iterationNumber);
+ ok(hwndTip != NULL, "Creation of tooltip window failed\n");
/* Set up parms for the wndproc to handle */
CD_Stages = 0;
@@ -229,7 +230,7 @@ static void test_customdraw(void) {
toolInfo.lParam = 0xdeadbeef;
GetClientRect (parent, &toolInfo.rect);
ret = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo);
- ok(ret, "%ld: Failed to add the tool.\n", iterationNumber);
+ ok(ret, "Failed to add the tool.\n");
/* Make tooltip appear quickly */
SendMessageA(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0));
@@ -243,27 +244,28 @@ static void test_customdraw(void) {
{
/* Check CustomDraw results */
ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls,
- "%ld: CustomDraw stages %x, expected %x\n", iterationNumber, CD_Stages,
+ "CustomDraw stages %x, expected %x\n", CD_Stages,
expectedResults[iterationNumber].ExpectedCalls);
}
ret = SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, 0);
- ok(ret, "%ld: Failed to get current tool %#Ix.\n", iterationNumber, ret);
+ ok(ret, "Failed to get current tool %#Ix.\n", ret);
memset(&toolInfo, 0xcc, sizeof(toolInfo));
toolInfo.cbSize = sizeof(toolInfo);
toolInfo.lpszText = NULL;
toolInfo.lpReserved = (void *)0xdeadbeef;
SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, (LPARAM)&toolInfo);
- ok(toolInfo.hwnd == parent, "%ld: Unexpected hwnd %p.\n", iterationNumber, toolInfo.hwnd);
- ok(toolInfo.hinst == GetModuleHandleA(NULL), "%ld: Unexpected hinst %p.\n", iterationNumber, toolInfo.hinst);
- ok(toolInfo.uId == 0x1234abcd, "%ld: Unexpected uId %Ix.\n", iterationNumber, toolInfo.uId);
- ok(toolInfo.lParam == 0, "%ld: Unexpected lParam %Ix.\n", iterationNumber, toolInfo.lParam);
- ok(toolInfo.lpReserved == (void *)0xdeadbeef, "%ld: Unexpected lpReserved %p.\n", iterationNumber, toolInfo.lpReserved);
+ ok(toolInfo.hwnd == parent, "Unexpected hwnd %p.\n", toolInfo.hwnd);
+ ok(toolInfo.hinst == GetModuleHandleA(NULL), "Unexpected hinst %p.\n", toolInfo.hinst);
+ ok(toolInfo.uId == 0x1234abcd, "Unexpected uId %Ix.\n", toolInfo.uId);
+ ok(toolInfo.lParam == 0, "Unexpected lParam %Ix.\n", toolInfo.lParam);
+ ok(toolInfo.lpReserved == (void *)0xdeadbeef, "Unexpected lpReserved %p.\n", toolInfo.lpReserved);
/* Clean up */
DestroyWindow(hwndTip);
DestroyWindow(parent);
+ winetest_pop_context();
}
SetCursorPos(orig_pos.x, orig_pos.y);
--
2.30.2
1
0
[PATCH v6 1/2] d2d1: Implement ID2D1DeviceContext::CreateImageBrush().
by Dmitry Timoshkov 13 May '22
by Dmitry Timoshkov 13 May '22
13 May '22
v3: Add missing AddRef() to ::SetImage(). Thanks Nikolay.
v4: Fix a typo in ::GetImage implementation.
v5: Specify correct brush type, add a FIXME for D2D1_IMAGE_BRUSH_PROPERTIES.sourceRectangle,
drop d2d_brush_bind_image() helper. Thanks Henri.
v6: Add some tests.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/d2d1/brush.c | 243 ++++++++++++++++++++++++++++++++++++++-
dlls/d2d1/d2d1_private.h | 11 ++
dlls/d2d1/device.c | 14 ++-
3 files changed, 264 insertions(+), 4 deletions(-)
diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index 14d9cb54e92..955740cd8ce 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -1101,6 +1101,246 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
return S_OK;
}
+static inline struct d2d_brush *impl_from_ID2D1ImageBrush(ID2D1ImageBrush *iface)
+{
+ return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_image_brush_QueryInterface(ID2D1ImageBrush *iface,
+ REFIID iid, void **out)
+{
+ TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+ if (IsEqualGUID(iid, &IID_ID2D1ImageBrush)
+ || IsEqualGUID(iid, &IID_ID2D1Brush)
+ || IsEqualGUID(iid, &IID_ID2D1Resource)
+ || IsEqualGUID(iid, &IID_IUnknown))
+ {
+ ID2D1ImageBrush_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_AddRef(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedIncrement(&brush->refcount);
+
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_Release(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedDecrement(&brush->refcount);
+
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
+
+ if (!refcount)
+ {
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ d2d_brush_destroy(brush);
+ }
+
+ return refcount;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetFactory(ID2D1ImageBrush *iface,
+ ID2D1Factory **factory)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, factory %p.\n", iface, factory);
+
+ ID2D1Factory_AddRef(*factory = brush->factory);
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetOpacity(ID2D1ImageBrush *iface, float opacity)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, opacity %.8e.\n", iface, opacity);
+
+ brush->opacity = opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetTransform(ID2D1ImageBrush *iface,
+ const D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ brush->transform = *transform;
+}
+
+static float STDMETHODCALLTYPE d2d_image_brush_GetOpacity(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetTransform(ID2D1ImageBrush *iface,
+ D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ *transform = brush->transform;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetImage(ID2D1ImageBrush *iface, ID2D1Image *image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if (image)
+ ID2D1Image_AddRef(image);
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ brush->u.image.image = image;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeX(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_x = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeY(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_y = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetInterpolationMode(ID2D1ImageBrush *iface,
+ D2D1_INTERPOLATION_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.interpolation_mode = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetSourceRectangle(ID2D1ImageBrush *iface, const D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %s stub!\n", iface, debug_d2d_rect_f(rect));
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetImage(ID2D1ImageBrush *iface, ID2D1Image **image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if ((*image = (ID2D1Image *)brush->u.image.image))
+ ID2D1Image_AddRef(*image);
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeX(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_x;
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeY(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_y;
+}
+
+static D2D1_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_image_brush_GetInterpolationMode(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.interpolation_mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetSourceRectangle(ID2D1ImageBrush *iface, D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %p stub!\n", iface, rect);
+}
+
+static const struct ID2D1ImageBrushVtbl d2d_image_brush_vtbl =
+{
+ d2d_image_brush_QueryInterface,
+ d2d_image_brush_AddRef,
+ d2d_image_brush_Release,
+ d2d_image_brush_GetFactory,
+ d2d_image_brush_SetOpacity,
+ d2d_image_brush_SetTransform,
+ d2d_image_brush_GetOpacity,
+ d2d_image_brush_GetTransform,
+ d2d_image_brush_SetImage,
+ d2d_image_brush_SetExtendModeX,
+ d2d_image_brush_SetExtendModeY,
+ d2d_image_brush_SetInterpolationMode,
+ d2d_image_brush_SetSourceRectangle,
+ d2d_image_brush_GetImage,
+ d2d_image_brush_GetExtendModeX,
+ d2d_image_brush_GetExtendModeY,
+ d2d_image_brush_GetInterpolationMode,
+ d2d_image_brush_GetSourceRectangle
+};
+
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush)
+{
+ if (!(*brush = heap_alloc_zero(sizeof(**brush))))
+ return E_OUTOFMEMORY;
+
+ d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_IMAGE,
+ brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
+ if (((*brush)->u.image.image = image))
+ ID2D1Image_AddRef((*brush)->u.image.image);
+ if (image_brush_desc)
+ {
+ FIXME("sourceRectangle %s is ignored.\n", debug_d2d_rect_f(&image_brush_desc->sourceRectangle));
+ (*brush)->u.image.extend_mode_x = image_brush_desc->extendModeX;
+ (*brush)->u.image.extend_mode_y = image_brush_desc->extendModeY;
+ (*brush)->u.image.interpolation_mode = image_brush_desc->interpolationMode;
+ }
+ else
+ {
+ (*brush)->u.image.extend_mode_x = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.extend_mode_y = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.interpolation_mode = D2D1_INTERPOLATION_MODE_LINEAR;
+ }
+
+ TRACE("Created brush %p.\n", *brush);
+ return S_OK;
+}
+
struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
{
if (!iface)
@@ -1108,7 +1348,8 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
assert(iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl
- || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl);
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
}
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index b7e1a12b3b8..2dedc3481ae 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -42,6 +42,7 @@ enum d2d_brush_type
D2D_BRUSH_TYPE_LINEAR,
D2D_BRUSH_TYPE_RADIAL,
D2D_BRUSH_TYPE_BITMAP,
+ D2D_BRUSH_TYPE_IMAGE,
D2D_BRUSH_TYPE_COUNT,
};
@@ -319,6 +320,13 @@ struct d2d_brush
D2D1_EXTEND_MODE extend_mode_y;
D2D1_INTERPOLATION_MODE interpolation_mode;
} bitmap;
+ struct
+ {
+ ID2D1Image *image;
+ D2D1_EXTEND_MODE extend_mode_x;
+ D2D1_EXTEND_MODE extend_mode_y;
+ D2D1_INTERPOLATION_MODE interpolation_mode;
+ } image;
} u;
};
@@ -333,6 +341,9 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
struct d2d_brush **brush) DECLSPEC_HIDDEN;
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush) DECLSPEC_HIDDEN;
void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context,
unsigned int brush_idx) DECLSPEC_HIDDEN;
BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) DECLSPEC_HIDDEN;
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 80badcddaac..eb0c1935ebb 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1923,10 +1923,18 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device
ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc,
const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush)
{
- FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n",
- iface, image, image_brush_desc, brush_desc, brush);
+ struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
+ struct d2d_brush *object;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p.\n", iface, image, image_brush_desc,
+ brush_desc, brush);
+
+ if (SUCCEEDED(hr = d2d_image_brush_create(context->factory, image, image_brush_desc,
+ brush_desc, &object)))
+ *brush = (ID2D1ImageBrush *)&object->ID2D1Brush_iface;
+
+ return hr;
}
static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface,
--
2.35.3
2
1
[PATCH v6 2/2] d2d1/tests: Add some tests for ID2D1DeviceContext::CreateImageBrush().
by Dmitry Timoshkov 13 May '22
by Dmitry Timoshkov 13 May '22
13 May '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/d2d1/tests/d2d1.c | 85 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 85 insertions(+)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index ca80a8e946b..72869f50132 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -2291,6 +2291,90 @@ static void test_bitmap_brush(BOOL d3d11)
release_test_context(&ctx);
}
+static void test_image_brush(BOOL d3d11)
+{
+ struct d2d1_test_context ctx;
+ ID2D1DeviceContext *device_context;
+ D2D1_BITMAP_PROPERTIES bitmap_desc;
+ ID2D1Bitmap *bitmap;
+ ID2D1Image *image, *tmp_image;
+ D2D1_IMAGE_BRUSH_PROPERTIES image_brush_desc;
+ D2D1_BRUSH_PROPERTIES brush_desc;
+ ID2D1ImageBrush *brush;
+ D2D1_SIZE_U size;
+ ULONG refcount;
+ HRESULT hr;
+ static const DWORD bitmap_data[] =
+ {
+ 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff,
+ 0xff0000ff, 0xffff00ff, 0xff000000, 0xff7f7f7f,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000,
+ 0xffffffff, 0xff000000, 0xff000000, 0xff000000,
+ };
+
+ if (!init_test_context(&ctx, d3d11))
+ return;
+
+ hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&device_context);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
+ ID2D1RenderTarget_SetDpi(ctx.rt, 192.0f, 48.0f);
+ ID2D1RenderTarget_SetAntialiasMode(ctx.rt, D2D1_ANTIALIAS_MODE_ALIASED);
+
+ set_size_u(&size, 4, 4);
+ bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
+ bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE;
+ bitmap_desc.dpiX = 96.0f;
+ bitmap_desc.dpiY = 96.0f;
+ hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
+ hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image);
+ ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Got unexpected hr %#lx.\n", hr);
+ if (hr != S_OK)
+ {
+ win_skip("ID2D1Image is not supported.\n");
+ return;
+ }
+
+ if (0) /* Crashes on Windows 7+ */
+ hr = ID2D1DeviceContext_CreateImageBrush(device_context, NULL, NULL, NULL, &brush);
+
+ if (0) /* Crashes on Windows 7+ */
+ hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, NULL, NULL, &brush);
+
+ set_rect(&image_brush_desc.sourceRectangle, 0.0f, 0.0f, 4.0f, 4.0f);
+ image_brush_desc.extendModeX = D2D1_EXTEND_MODE_CLAMP;
+ image_brush_desc.extendModeY = D2D1_EXTEND_MODE_CLAMP;
+ image_brush_desc.interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR;
+
+ brush_desc.opacity = 1.0f;
+ set_matrix_identity(&brush_desc.transform);
+
+ if (0) /* Crashes on Windows 7+ */
+ hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, NULL, &brush_desc, &brush);
+
+ hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, NULL, &brush);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ ID2D1ImageBrush_Release(brush);
+
+ hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, &brush_desc, &brush);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
+ ID2D1ImageBrush_GetImage(brush, &tmp_image);
+ ok(tmp_image == image, "Got unexpected image %p, expected %p.\n", tmp_image, image);
+ ID2D1Image_Release(tmp_image);
+
+ ID2D1ImageBrush_Release(brush);
+
+ ID2D1Image_Release(image);
+ refcount = ID2D1Bitmap_Release(bitmap);
+ ok(!refcount, "Bitmap has %lu references left.\n", refcount);
+
+ ID2D1DeviceContext_Release(device_context);
+ release_test_context(&ctx);
+}
+
static void test_linear_brush(BOOL d3d11)
{
D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES gradient_properties;
@@ -10919,6 +11003,7 @@ START_TEST(d2d1)
queue_test(test_state_block);
queue_test(test_color_brush);
queue_test(test_bitmap_brush);
+ queue_test(test_image_brush);
queue_test(test_linear_brush);
queue_test(test_radial_brush);
queue_test(test_path_geometry);
--
2.35.3
1
0
13 May '22
Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com>
---
dlls/wined3d/surface.c | 35 ++++++++++++++++++++--------------
dlls/wined3d/view.c | 14 ++++++++++++++
dlls/wined3d/wined3d_private.h | 2 ++
3 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 5feeba3be2d..448c8689342 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1276,17 +1276,9 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view,
c = wined3d_format_convert_from_float(view->format, colour);
bpp = view->format->byte_count;
- w = min(box->right, view->width) - min(box->left, view->width);
- h = min(box->bottom, view->height) - min(box->top, view->height);
- if (view->resource->type != WINED3D_RTYPE_TEXTURE_3D)
- {
- d = 1;
- }
- else
- {
- d = wined3d_texture_get_level_depth(texture, level);
- d = min(box->back, d) - min(box->front, d);
- }
+ w = box->right - box->left;
+ h = box->bottom - box->top;
+ d = box->back - box->front;
map_binding = texture->resource.map_binding;
if (!wined3d_texture_load_location(texture, view->sub_resource_idx, context, map_binding))
@@ -1361,13 +1353,22 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view,
context_release(context);
}
+static bool wined3d_box_intersect(struct wined3d_box *ret, const struct wined3d_box *b1,
+ const struct wined3d_box *b2)
+{
+ wined3d_box_set(ret, max(b1->left, b2->left), max(b1->top, b2->top),
+ min(b1->right, b2->right), min(b1->bottom, b2->bottom),
+ max(b1->front, b2->front), min(b1->back, b2->back));
+ return ret->right > ret->left && ret->bottom > ret->top && ret->back > ret->front;
+}
+
static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device,
unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects,
const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil)
{
struct wined3d_color c = {depth, 0.0f, 0.0f, 0.0f};
+ struct wined3d_box box, box_clip, box_view;
struct wined3d_rendertarget_view *view;
- struct wined3d_box box;
unsigned int i, j;
if (!rect_count)
@@ -1393,7 +1394,11 @@ static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de
for (j = 0; j < rt_count; ++j)
{
if ((view = fb->render_targets[j]))
- surface_cpu_blt_colour_fill(view, &box, colour);
+ {
+ wined3d_rendertarget_view_get_box(view, &box_view);
+ if (wined3d_box_intersect(&box_clip, &box_view, &box))
+ surface_cpu_blt_colour_fill(view, &box_clip, colour);
+ }
}
}
@@ -1403,7 +1408,9 @@ static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de
|| (view->format->stencil_size && !(flags & WINED3DCLEAR_STENCIL)))
FIXME("Clearing %#x on %s.\n", flags, debug_d3dformat(view->format->id));
- surface_cpu_blt_colour_fill(view, &box, &c);
+ wined3d_rendertarget_view_get_box(view, &box_view);
+ if (wined3d_box_intersect(&box_clip, &box_view, &box))
+ surface_cpu_blt_colour_fill(view, &box_clip, &c);
}
}
}
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 752563508c8..f2dea8f0f9a 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -534,6 +534,20 @@ DWORD wined3d_rendertarget_view_get_locations(const struct wined3d_rendertarget_
return ret;
}
+void wined3d_rendertarget_view_get_box(struct wined3d_rendertarget_view *view,
+ struct wined3d_box *box)
+{
+ if (view->resource->type != WINED3D_RTYPE_TEXTURE_3D)
+ {
+ wined3d_box_set(box, 0, 0, view->width, view->height, 0, 1);
+ }
+ else
+ {
+ struct wined3d_texture *texture = texture_from_resource(view->resource);
+ wined3d_texture_get_level_box(texture, view->sub_resource_idx, box);
+ }
+}
+
static void wined3d_render_target_view_gl_cs_init(void *object)
{
struct wined3d_rendertarget_view_gl *view_gl = object;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 3a12f5ef261..17afc183adb 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -5287,6 +5287,8 @@ struct wined3d_rendertarget_view
void wined3d_rendertarget_view_cleanup(struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN;
void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view,
const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN;
+void wined3d_rendertarget_view_get_box(struct wined3d_rendertarget_view *view,
+ struct wined3d_box *box) DECLSPEC_HIDDEN;
void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view,
DWORD location) DECLSPEC_HIDDEN;
void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view,
--
2.35.1
4
8
13 May '22
Instead of tracking when free notifications, simply propagate allocation
error to the caller. Behavior spotted by Giovanni.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/mfreadwrite/reader.c | 138 +++++++-------------------------------
1 file changed, 25 insertions(+), 113 deletions(-)
diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
index e7b7b555e68..741ef93f367 100644
--- a/dlls/mfreadwrite/reader.c
+++ b/dlls/mfreadwrite/reader.c
@@ -52,7 +52,6 @@ struct stream_response
DWORD stream_flags;
LONGLONG timestamp;
IMFSample *sample;
- unsigned int sa_pending : 1;
};
enum media_stream_state
@@ -87,7 +86,6 @@ struct media_stream
IMFMediaType *current;
struct stream_transform decoder;
IMFVideoSampleAllocatorEx *allocator;
- IMFVideoSampleAllocatorNotify notify_cb;
DWORD id;
unsigned int index;
enum media_stream_state state;
@@ -103,7 +101,6 @@ enum source_reader_async_op
SOURCE_READER_ASYNC_SEEK,
SOURCE_READER_ASYNC_FLUSH,
SOURCE_READER_ASYNC_SAMPLE_READY,
- SOURCE_READER_ASYNC_SA_READY,
};
struct source_reader_async_command
@@ -201,11 +198,6 @@ static struct source_reader_async_command *impl_from_async_command_IUnknown(IUnk
return CONTAINING_RECORD(iface, struct source_reader_async_command, IUnknown_iface);
}
-static struct media_stream *impl_stream_from_IMFVideoSampleAllocatorNotify(IMFVideoSampleAllocatorNotify *iface)
-{
- return CONTAINING_RECORD(iface, struct media_stream, notify_cb);
-}
-
static void source_reader_release_responses(struct source_reader *reader, struct media_stream *stream);
static ULONG source_reader_addref(struct source_reader *reader)
@@ -394,7 +386,7 @@ static void source_reader_response_ready(struct source_reader *reader, struct st
struct media_stream *stream = &reader->streams[response->stream_index];
HRESULT hr;
- if (!stream->requests || response->sa_pending)
+ if (!stream->requests)
return;
if (reader->async_callback)
@@ -446,20 +438,6 @@ static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst)
}
}
-static void source_reader_set_sa_response(struct source_reader *reader, struct stream_response *response)
-{
- struct media_stream *stream = &reader->streams[response->stream_index];
- IMFSample *sample;
-
- if (SUCCEEDED(IMFVideoSampleAllocatorEx_AllocateSample(stream->allocator, &sample)))
- {
- source_reader_copy_sample_buffer(response->sample, sample);
- response->sa_pending = 0;
- IMFSample_Release(response->sample);
- response->sample = sample;
- }
-}
-
static HRESULT source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status,
DWORD stream_flags, LONGLONG timestamp, IMFSample *sample)
{
@@ -476,12 +454,6 @@ static HRESULT source_reader_queue_response(struct source_reader *reader, struct
if (response->sample)
IMFSample_AddRef(response->sample);
- if (response->sample && stream->allocator)
- {
- response->sa_pending = 1;
- source_reader_set_sa_response(reader, response);
- }
-
list_add_tail(&reader->responses, &response->entry);
stream->responses++;
@@ -975,26 +947,37 @@ static struct stream_response * media_stream_detach_response(struct source_reade
static struct stream_response *media_stream_pop_response(struct source_reader *reader, struct media_stream *stream)
{
struct stream_response *response;
+ IMFSample *sample;
+ HRESULT hr;
LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry)
{
- if ((stream && response->stream_index != stream->index) || response->sa_pending)
+ if (stream && response->stream_index != stream->index)
continue;
- return media_stream_detach_response(reader, response);
- }
+ if (!stream) stream = &reader->streams[response->stream_index];
- return NULL;
-}
+ if (stream->allocator)
+ {
+ /* Return allocation error to the caller, while keeping original response sample in for later. */
+ if (SUCCEEDED(hr = IMFVideoSampleAllocatorEx_AllocateSample(stream->allocator, &sample)))
+ {
+ source_reader_copy_sample_buffer(response->sample, sample);
+ IMFSample_Release(response->sample);
+ response->sample = sample;
+ }
+ else
+ {
+ if (!(response = calloc(1, sizeof(*response))))
+ return NULL;
-static struct stream_response *media_stream_pick_pending_response(struct source_reader *reader, unsigned int stream)
-{
- struct stream_response *response;
+ response->status = hr;
+ response->stream_flags = MF_SOURCE_READERF_ERROR;
+ return response;
+ }
+ }
- LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry)
- {
- if (response->stream_index == stream && response->sa_pending)
- return response;
+ return media_stream_detach_response(reader, response);
}
return NULL;
@@ -1070,7 +1053,7 @@ static BOOL source_reader_got_response_for_stream(struct source_reader *reader,
LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry)
{
- if (response->stream_index == stream->index && !response->sa_pending)
+ if (response->stream_index == stream->index)
return TRUE;
}
@@ -1308,18 +1291,6 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb
break;
- case SOURCE_READER_ASYNC_SA_READY:
-
- EnterCriticalSection(&reader->cs);
- if ((response = media_stream_pick_pending_response(reader, command->u.sa.stream_index)))
- {
- source_reader_set_sa_response(reader, response);
- source_reader_response_ready(reader, response);
- }
- LeaveCriticalSection(&reader->cs);
-
- break;
-
case SOURCE_READER_ASYNC_SAMPLE_READY:
EnterCriticalSection(&reader->cs);
@@ -1683,7 +1654,6 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea
static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader, unsigned int index)
{
struct media_stream *stream = &reader->streams[index];
- IMFVideoSampleAllocatorCallback *callback;
GUID major = { 0 };
HRESULT hr;
@@ -1713,13 +1683,6 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader
if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, stream->current)))
WARN("Failed to initialize sample allocator, hr %#lx.\n", hr);
- if (SUCCEEDED(IMFVideoSampleAllocatorEx_QueryInterface(stream->allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&callback)))
- {
- if (FAILED(hr = IMFVideoSampleAllocatorCallback_SetCallback(callback, &stream->notify_cb)))
- WARN("Failed to set allocator callback, hr %#lx.\n", hr);
- IMFVideoSampleAllocatorCallback_Release(callback);
- }
-
return hr;
}
@@ -2283,56 +2246,6 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor
return MF_SOURCE_READER_INVALID_STREAM_INDEX;
}
-static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAllocatorNotify *iface,
- REFIID riid, void **obj)
-{
- if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) ||
- IsEqualIID(riid, &IID_IUnknown))
- {
- *obj = iface;
- IMFVideoSampleAllocatorNotify_AddRef(iface);
- return S_OK;
- }
-
- *obj = NULL;
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface)
-{
- struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface);
- return source_reader_addref(stream->reader);
-}
-
-static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface)
-{
- struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface);
- return source_reader_release(stream->reader);
-}
-
-static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface)
-{
- struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface);
- struct source_reader_async_command *command;
-
- if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SA_READY, &command)))
- {
- command->u.sa.stream_index = stream->index;
- MFPutWorkItem(stream->reader->queue, &stream->reader->async_commands_callback, &command->IUnknown_iface);
- IUnknown_Release(&command->IUnknown_iface);
- }
-
- return S_OK;
-}
-
-static const IMFVideoSampleAllocatorNotifyVtbl stream_sample_allocator_cb_vtbl =
-{
- stream_sample_allocator_cb_QueryInterface,
- stream_sample_allocator_cb_AddRef,
- stream_sample_allocator_cb_Release,
- stream_sample_allocator_cb_NotifyRelease,
-};
-
static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes,
BOOL shutdown_on_release, REFIID riid, void **out)
{
@@ -2404,7 +2317,6 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri
if (FAILED(hr))
break;
- object->streams[i].notify_cb.lpVtbl = &stream_sample_allocator_cb_vtbl;
object->streams[i].reader = object;
object->streams[i].index = i;
}
--
2.35.1
1
0
[PATCH 0/1] MR16: wined3d: Reduce the size of staging BO's for texture uploads.
by Jan Sikorski (ï¼ jsikorski) 13 May '22
by Jan Sikorski (ï¼ jsikorski) 13 May '22
13 May '22
Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/16
3
2
[PATCH 0/1] MR35: wined3d: Don't do a full cleanup when waiting for a command buffer.
by Jan Sikorski (ï¼ jsikorski) 13 May '22
by Jan Sikorski (ï¼ jsikorski) 13 May '22
13 May '22
Only clean while the command buffer is running. A full cleanup is done
after submitting to the queue. It can take a while, and we don't
necessarily want to delay submitting.
Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/35
4
3
[PATCH v3 0/5] MR34: windows.media.speech: Changes for IAsyncAction.
by Bernhard Kölbl (ï¼ besentv) 13 May '22
by Bernhard Kölbl (ï¼ besentv) 13 May '22
13 May '22
Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
--
v3: windows.media.speech: Rename async_operation to async_inspectable.
windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed.
windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent.
windows.media.speech/tests: Remove some unreliable ref checks.
https://gitlab.winehq.org/wine/wine/-/merge_requests/34
3
7
[PATCH 0/1] MR67: shell32/tests: Use 'shellpath' as tmpfile name in PathResolve tests
by Gijs Vermeulen (ï¼ gverm) 13 May '22
by Gijs Vermeulen (ï¼ gverm) 13 May '22
13 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52995
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com>
I also tried the GetTempFileName approach but it has a few problems:
- A .tmp file is created, which we don't want
- The returned path has a file extension in it
- We need to create a .lnk file anyway to test PRF_DONTFINDLNK
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/67
2
1
13 May '22
v3: Add missing AddRef() to ::SetImage(). Thanks Nikolay.
v4: Fix a typo in ::GetImage implementation.
v5: Specify correct brush type, add a FIXME for D2D1_IMAGE_BRUSH_PROPERTIES.sourceRectangle,
drop d2d_brush_bind_image() helper. Thanks Henri.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/d2d1/brush.c | 243 ++++++++++++++++++++++++++++++++++++++-
dlls/d2d1/d2d1_private.h | 11 ++
dlls/d2d1/device.c | 14 ++-
3 files changed, 264 insertions(+), 4 deletions(-)
diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index 14d9cb54e92..955740cd8ce 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -1101,6 +1101,246 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
return S_OK;
}
+static inline struct d2d_brush *impl_from_ID2D1ImageBrush(ID2D1ImageBrush *iface)
+{
+ return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_image_brush_QueryInterface(ID2D1ImageBrush *iface,
+ REFIID iid, void **out)
+{
+ TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+ if (IsEqualGUID(iid, &IID_ID2D1ImageBrush)
+ || IsEqualGUID(iid, &IID_ID2D1Brush)
+ || IsEqualGUID(iid, &IID_ID2D1Resource)
+ || IsEqualGUID(iid, &IID_IUnknown))
+ {
+ ID2D1ImageBrush_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_AddRef(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedIncrement(&brush->refcount);
+
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_Release(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedDecrement(&brush->refcount);
+
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
+
+ if (!refcount)
+ {
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ d2d_brush_destroy(brush);
+ }
+
+ return refcount;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetFactory(ID2D1ImageBrush *iface,
+ ID2D1Factory **factory)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, factory %p.\n", iface, factory);
+
+ ID2D1Factory_AddRef(*factory = brush->factory);
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetOpacity(ID2D1ImageBrush *iface, float opacity)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, opacity %.8e.\n", iface, opacity);
+
+ brush->opacity = opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetTransform(ID2D1ImageBrush *iface,
+ const D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ brush->transform = *transform;
+}
+
+static float STDMETHODCALLTYPE d2d_image_brush_GetOpacity(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetTransform(ID2D1ImageBrush *iface,
+ D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ *transform = brush->transform;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetImage(ID2D1ImageBrush *iface, ID2D1Image *image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if (image)
+ ID2D1Image_AddRef(image);
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ brush->u.image.image = image;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeX(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_x = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeY(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_y = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetInterpolationMode(ID2D1ImageBrush *iface,
+ D2D1_INTERPOLATION_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.interpolation_mode = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetSourceRectangle(ID2D1ImageBrush *iface, const D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %s stub!\n", iface, debug_d2d_rect_f(rect));
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetImage(ID2D1ImageBrush *iface, ID2D1Image **image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if ((*image = (ID2D1Image *)brush->u.image.image))
+ ID2D1Image_AddRef(*image);
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeX(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_x;
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeY(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_y;
+}
+
+static D2D1_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_image_brush_GetInterpolationMode(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.interpolation_mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetSourceRectangle(ID2D1ImageBrush *iface, D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %p stub!\n", iface, rect);
+}
+
+static const struct ID2D1ImageBrushVtbl d2d_image_brush_vtbl =
+{
+ d2d_image_brush_QueryInterface,
+ d2d_image_brush_AddRef,
+ d2d_image_brush_Release,
+ d2d_image_brush_GetFactory,
+ d2d_image_brush_SetOpacity,
+ d2d_image_brush_SetTransform,
+ d2d_image_brush_GetOpacity,
+ d2d_image_brush_GetTransform,
+ d2d_image_brush_SetImage,
+ d2d_image_brush_SetExtendModeX,
+ d2d_image_brush_SetExtendModeY,
+ d2d_image_brush_SetInterpolationMode,
+ d2d_image_brush_SetSourceRectangle,
+ d2d_image_brush_GetImage,
+ d2d_image_brush_GetExtendModeX,
+ d2d_image_brush_GetExtendModeY,
+ d2d_image_brush_GetInterpolationMode,
+ d2d_image_brush_GetSourceRectangle
+};
+
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush)
+{
+ if (!(*brush = heap_alloc_zero(sizeof(**brush))))
+ return E_OUTOFMEMORY;
+
+ d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_IMAGE,
+ brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
+ if (((*brush)->u.image.image = image))
+ ID2D1Image_AddRef((*brush)->u.image.image);
+ if (image_brush_desc)
+ {
+ FIXME("sourceRectangle %s is ignored.\n", debug_d2d_rect_f(&image_brush_desc->sourceRectangle));
+ (*brush)->u.image.extend_mode_x = image_brush_desc->extendModeX;
+ (*brush)->u.image.extend_mode_y = image_brush_desc->extendModeY;
+ (*brush)->u.image.interpolation_mode = image_brush_desc->interpolationMode;
+ }
+ else
+ {
+ (*brush)->u.image.extend_mode_x = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.extend_mode_y = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.interpolation_mode = D2D1_INTERPOLATION_MODE_LINEAR;
+ }
+
+ TRACE("Created brush %p.\n", *brush);
+ return S_OK;
+}
+
struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
{
if (!iface)
@@ -1108,7 +1348,8 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
assert(iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl
- || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl);
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
}
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index b7e1a12b3b8..2dedc3481ae 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -42,6 +42,7 @@ enum d2d_brush_type
D2D_BRUSH_TYPE_LINEAR,
D2D_BRUSH_TYPE_RADIAL,
D2D_BRUSH_TYPE_BITMAP,
+ D2D_BRUSH_TYPE_IMAGE,
D2D_BRUSH_TYPE_COUNT,
};
@@ -319,6 +320,13 @@ struct d2d_brush
D2D1_EXTEND_MODE extend_mode_y;
D2D1_INTERPOLATION_MODE interpolation_mode;
} bitmap;
+ struct
+ {
+ ID2D1Image *image;
+ D2D1_EXTEND_MODE extend_mode_x;
+ D2D1_EXTEND_MODE extend_mode_y;
+ D2D1_INTERPOLATION_MODE interpolation_mode;
+ } image;
} u;
};
@@ -333,6 +341,9 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
struct d2d_brush **brush) DECLSPEC_HIDDEN;
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush) DECLSPEC_HIDDEN;
void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context,
unsigned int brush_idx) DECLSPEC_HIDDEN;
BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) DECLSPEC_HIDDEN;
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 80badcddaac..eb0c1935ebb 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1923,10 +1923,18 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device
ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc,
const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush)
{
- FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n",
- iface, image, image_brush_desc, brush_desc, brush);
+ struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
+ struct d2d_brush *object;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p.\n", iface, image, image_brush_desc,
+ brush_desc, brush);
+
+ if (SUCCEEDED(hr = d2d_image_brush_create(context->factory, image, image_brush_desc,
+ brush_desc, &object)))
+ *brush = (ID2D1ImageBrush *)&object->ID2D1Brush_iface;
+
+ return hr;
}
static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface,
--
2.35.3
2
1
From: Angelo Haller <angelo(a)szanni.org>
The following patches fix sending of the LVN_ODSTATECHANGED notification for
LVS_OWNERDATA list views, adding more refined tests in the process and
fixing various bugs.
This is v2 addressing some of the issues raised in the first patch series.
Warning: I have had access to the Windows Research Kernel (WRK) 1.2
~10 years ago. These changes are regarding comctrl32 & tests which are NOT
part of the WRK. As outlined in https://wiki.winehq.org/Developer_FAQ this
should therefore satisfy the requirement of ONLY submitting patches to
components I have NOT had access to.
Angelo Haller (6):
comctl32/tests: Expand ownerdata listview tests.
comctl32/listview: Move LVN_ODSTATECHANGED notification to function.
comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists.
comctl32/listview: Send LVN_ODSTATECHANGED notification.
comctl32/listview: Send LVN_ODSTATECHANGED only for true ranges.
comctl32/listview: Fix deselect on LVS_OWNERDATA.
dlls/comctl32/listview.c | 55 +++++++++++++++++++++----------
dlls/comctl32/tests/listview.c | 59 +++++++++++++++++++++++++++++-----
2 files changed, 89 insertions(+), 25 deletions(-)
Signed-off-by: Angelo Haller <angelo(a)szanni.org>
--
2.36.0
1
6
[PATCH] combase: Execute local server for correct architecture in a WoW64 setup.
by Dmitry Timoshkov 13 May '22
by Dmitry Timoshkov 13 May '22
13 May '22
Based on implementation of create_surrogate_server().
This patch makes 64-bit application work with its own shipped 32-bit COM server.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/combase/rpc.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c
index 80760ca37e7..53cb32e08e2 100644
--- a/dlls/combase/rpc.c
+++ b/dlls/combase/rpc.c
@@ -478,6 +478,9 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process)
{
static const WCHAR embeddingW[] = L" -Embedding";
HKEY key;
+ int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32;
+ REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY;
+ BOOL is_wow64 = FALSE;
HRESULT hr;
WCHAR command[MAX_PATH + ARRAY_SIZE(embeddingW)];
DWORD size = (MAX_PATH+1) * sizeof(WCHAR);
@@ -485,7 +488,11 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process)
PROCESS_INFORMATION pinfo;
LONG ret;
+ TRACE("Attempting to start server for %s\n", debugstr_guid(rclsid));
+
hr = open_key_for_clsid(rclsid, L"LocalServer32", KEY_READ, &key);
+ if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)))
+ hr = open_key_for_clsid(rclsid, L"LocalServer32", opposite | KEY_READ, &key);
if (FAILED(hr))
{
ERR("class %s not registered\n", debugstr_guid(rclsid));
@@ -511,7 +518,19 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process)
/* FIXME: Win2003 supports a ServerExecutable value that is passed into
* CreateProcess */
- if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo))
+ if (is_wow64 && arch == 64)
+ {
+ void *cookie;
+ Wow64DisableWow64FsRedirection(&cookie);
+ if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo))
+ {
+ WARN("failed to run local server %s\n", debugstr_w(command));
+ hr = HRESULT_FROM_WIN32(GetLastError());
+ }
+ Wow64RevertWow64FsRedirection(cookie);
+ if (FAILED(hr)) return hr;
+ }
+ else if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo))
{
WARN("failed to run local server %s\n", debugstr_w(command));
return HRESULT_FROM_WIN32(GetLastError());
--
2.35.3
2
2
_OLE32_ is no longer used in the Wine source code.
Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com>
---
---
dlls/ole32/Makefile.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index 340ffdbded2..b87ec9fc975 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -2,7 +2,6 @@ MODULE = ole32.dll
IMPORTLIB = ole32
IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase
DELAYIMPORTS = oleaut32
-EXTRADEFS = -D_OLE32_
C_SRCS = \
antimoniker.c \
--
2.25.1
2
1
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
v2: Fix a few white-spaces at EOL.
dlls/winspool.drv/Makefile.in | 1 -
dlls/winspool.drv/info.c | 372 +++++++++++++++++-----------------
dlls/winspool.drv/wspool.c | 2 +-
3 files changed, 187 insertions(+), 188 deletions(-)
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index cd70d13b6f9..cf3f8d7f6c2 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = winspool.drv
UNIXLIB = winspool.so
IMPORTLIB = winspool
diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index a89abd0ced9..482f70a2235 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -439,7 +439,7 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab)
(BYTE *)(driver + len), &size );
RegCloseKey(device_key);
if (res || type != REG_SZ) {
- WARN("no configuration file: %u\n", res);
+ WARN("no configuration file: %lu\n", res);
goto ret;
}
@@ -501,12 +501,12 @@ static DWORD get_dword_from_reg( HKEY hkey, const WCHAR *name )
if (ret != ERROR_SUCCESS)
{
- WARN( "Got ret = %d on name %s\n", ret, debugstr_w(name) );
+ WARN( "Got ret = %ld on name %s\n", ret, debugstr_w(name) );
return 0;
}
if (type != REG_DWORD)
{
- ERR( "Got type %d\n", type );
+ ERR( "Got type %ld\n", type );
return 0;
}
return value;
@@ -682,11 +682,11 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir )
di3.pConfigFile = driver_9x;
}
res = AddPrinterDriverExW( NULL, 3, (BYTE *)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY );
- TRACE( "got %d and %d for %s (%s)\n", res, GetLastError(), debugstr_w( name ), debugstr_w( di3.pEnvironment ) );
+ TRACE( "got %d and %ld for %s (%s)\n", res, GetLastError(), debugstr_w( name ), debugstr_w( di3.pEnvironment ) );
if (!res && (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED))
{
- ERR( "failed with %u for %s (%s) %s\n", GetLastError(), debugstr_w( name ),
+ ERR( "failed with %lu for %s (%s) %s\n", GetLastError(), debugstr_w( name ),
debugstr_w( di3.pEnvironment ), debugstr_w( di3.pDriverPath ) );
break;
}
@@ -793,7 +793,7 @@ static BOOL init_unix_printers( void )
added_printer = AddPrinterW( NULL, 2, (BYTE *)&pi2 );
if (added_printer) ClosePrinter( added_printer );
else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS)
- ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w( printer->name ), GetLastError() );
+ ERR( "printer '%s' not added by AddPrinter (error %ld)\n", debugstr_w( printer->name ), GetLastError() );
heap_free( port );
}
@@ -1206,7 +1206,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
LPSTR ptr;
INT len;
- TRACE("(%p, %p, %d, %u, %u)\n", out, pPrintersW, level, outlen, numentries);
+ TRACE("(%p, %p, %ld, %lu, %lu)\n", out, pPrintersW, level, outlen, numentries);
len = pi_sizeof[level] * numentries;
ptr = (LPSTR) out + len;
@@ -1222,7 +1222,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_1W * piW = (PRINTER_INFO_1W *) pPrintersW;
PRINTER_INFO_1A * piA = (PRINTER_INFO_1A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(piW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(piW->pName));
if (piW->pDescription) {
piA->pDescription = ptr;
len = WideCharToMultiByte(CP_ACP, 0, piW->pDescription, -1,
@@ -1253,7 +1253,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_2A * piA = (PRINTER_INFO_2A *) out;
LPDEVMODEA dmA;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(piW->pPrinterName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(piW->pPrinterName));
if (piW->pServerName) {
piA->pServerName = ptr;
len = WideCharToMultiByte(CP_ACP, 0, piW->pServerName, -1,
@@ -1360,7 +1360,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_4W * piW = (PRINTER_INFO_4W *) pPrintersW;
PRINTER_INFO_4A * piA = (PRINTER_INFO_4A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(piW->pPrinterName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(piW->pPrinterName));
if (piW->pPrinterName) {
piA->pPrinterName = ptr;
@@ -1384,7 +1384,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_5W * piW = (PRINTER_INFO_5W *) pPrintersW;
PRINTER_INFO_5A * piA = (PRINTER_INFO_5A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(piW->pPrinterName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(piW->pPrinterName));
if (piW->pPrinterName) {
piA->pPrinterName = ptr;
@@ -1411,7 +1411,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_7W * piW = (PRINTER_INFO_7W *) pPrintersW;
PRINTER_INFO_7A * piA = (PRINTER_INFO_7A *) out;
- TRACE("(%u) #%u\n", level, id);
+ TRACE("(%lu) #%lu\n", level, id);
if (piW->pszObjectGUID) {
piA->pszObjectGUID = ptr;
len = WideCharToMultiByte(CP_ACP, 0, piW->pszObjectGUID, -1,
@@ -1429,7 +1429,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_9A * piA = (PRINTER_INFO_9A *) out;
LPDEVMODEA dmA;
- TRACE("(%u) #%u\n", level, id);
+ TRACE("(%lu) #%lu\n", level, id);
dmA = DEVMODEdupWtoA(piW->pDevMode);
if (dmA) {
/* align DEVMODEA to a DWORD boundary */
@@ -1450,7 +1450,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
}
default:
- FIXME("for level %u\n", level);
+ FIXME("for level %lu\n", level);
}
pPrintersW += pi_sizeof[level];
out += pi_sizeof[level];
@@ -1469,7 +1469,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
LPSTR ptr;
INT len;
- TRACE("(%p, %p, %d, %u, %u)\n", out, pDriversW, level, outlen, numentries);
+ TRACE("(%p, %p, %ld, %lu, %lu)\n", out, pDriversW, level, outlen, numentries);
len = di_sizeof[level] * numentries;
ptr = (LPSTR) out + len;
@@ -1503,7 +1503,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_1W * diW = (DRIVER_INFO_1W *) pDriversW;
DRIVER_INFO_1A * diA = (DRIVER_INFO_1A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
break;
@@ -1513,7 +1513,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_2W * diW = (DRIVER_INFO_2W *) pDriversW;
DRIVER_INFO_2A * diA = (DRIVER_INFO_2A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1527,7 +1527,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_3W * diW = (DRIVER_INFO_3W *) pDriversW;
DRIVER_INFO_3A * diA = (DRIVER_INFO_3A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1545,7 +1545,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_4W * diW = (DRIVER_INFO_4W *) pDriversW;
DRIVER_INFO_4A * diA = (DRIVER_INFO_4A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1564,7 +1564,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_5W * diW = (DRIVER_INFO_5W *) pDriversW;
DRIVER_INFO_5A * diA = (DRIVER_INFO_5A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1578,7 +1578,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_6W * diW = (DRIVER_INFO_6W *) pDriversW;
DRIVER_INFO_6A * diA = (DRIVER_INFO_6A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1601,7 +1601,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_8W * diW = (DRIVER_INFO_8W *) pDriversW;
DRIVER_INFO_8A * diA = (DRIVER_INFO_8A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1627,7 +1627,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
default:
- FIXME("for level %u\n", level);
+ FIXME("for level %lu\n", level);
}
pDriversW += di_sizeof[level];
@@ -1690,7 +1690,7 @@ static void *printer_info_AtoW( const void *data, DWORD level )
}
default:
- FIXME( "Unhandled level %d\n", level );
+ FIXME( "Unhandled level %ld\n", level );
HeapFree( GetProcessHeap(), 0, ret );
return NULL;
}
@@ -1736,7 +1736,7 @@ static void free_printer_info( void *data, DWORD level )
}
default:
- FIXME( "Unhandled level %d\n", level );
+ FIXME( "Unhandled level %ld\n", level );
}
HeapFree( GetProcessHeap(), 0, data );
@@ -1838,7 +1838,7 @@ LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DE
unsigned int len;
int ret;
- TRACE("(%p,%p,%s,%p,%p,%d)\n", hwnd, printer, debugstr_a(device_name), output, input, mode);
+ TRACE("(%p,%p,%s,%p,%p,%ld)\n", hwnd, printer, debugstr_a(device_name), output, input, mode);
len = MultiByteToWideChar(CP_ACP, 0, device_name, -1, NULL, 0);
if (len) {
@@ -1886,7 +1886,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
const WCHAR *device = NULL;
LONG ret;
- TRACE("(%p,%p,%s,%p,%p,%d)\n",
+ TRACE("(%p,%p,%s,%p,%p,%ld)\n",
hWnd, hPrinter, debugstr_w(pDeviceName), pDevModeOutput, pDevModeInput, fMode);
device = pDeviceName && pDeviceName[0] ? pDeviceName : get_opened_printer_name(hPrinter);
@@ -1917,7 +1917,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
*/
BOOL WINAPI IsValidDevmodeA(PDEVMODEA pDevMode, SIZE_T size)
{
- FIXME("(%p,%ld): stub\n", pDevMode, size);
+ FIXME("(%p,%Id): stub\n", pDevMode, size);
if(!pDevMode)
return FALSE;
@@ -2074,7 +2074,7 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU
RegCloseKey( key );
}
- TRACE("returning %d with %u and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter);
+ TRACE("returning %d with %lu and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter);
return (*phPrinter != 0);
}
@@ -2093,7 +2093,7 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors)
MONITOR_INFO_2W mi2w;
mi2a = (LPMONITOR_INFO_2A) pMonitors;
- TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_a(pName), Level, pMonitors,
+ TRACE("(%s, %ld, %p) : %s %s %s\n", debugstr_a(pName), Level, pMonitors,
debugstr_a(mi2a ? mi2a->pName : NULL),
debugstr_a(mi2a ? mi2a->pEnvironment : NULL),
debugstr_a(mi2a ? mi2a->pDLLName : NULL));
@@ -2164,7 +2164,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors)
LPMONITOR_INFO_2W mi2w;
mi2w = (LPMONITOR_INFO_2W) pMonitors;
- TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors,
+ TRACE("(%s, %ld, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors,
debugstr_w(mi2w ? mi2w->pName : NULL),
debugstr_w(mi2w ? mi2w->pEnvironment : NULL),
debugstr_w(mi2w ? mi2w->pDLLName : NULL));
@@ -2343,7 +2343,7 @@ BOOL WINAPI WritePrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pcWr
opened_printer_t *printer;
BOOL ret = FALSE;
- TRACE("(%p, %p, %d, %p)\n", hPrinter, pBuf, cbBuf, pcWritten);
+ TRACE("(%p, %p, %ld, %p)\n", hPrinter, pBuf, cbBuf, pcWritten);
EnterCriticalSection(&printer_handles_cs);
printer = get_opened_printer(hPrinter);
@@ -2370,7 +2370,7 @@ end:
*/
BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm)
{
- FIXME("(%p,%d,%p): stub\n", hPrinter, Level, pForm);
+ FIXME("(%p,%ld,%p): stub\n", hPrinter, Level, pForm);
return TRUE;
}
@@ -2381,7 +2381,7 @@ BOOL WINAPI AddFormW( HANDLE printer, DWORD level, BYTE *form )
{
HANDLE handle = get_backend_handle( printer );
- TRACE( "(%p, %d, %p)\n", printer, level, form );
+ TRACE( "(%p, %ld, %p)\n", printer, level, form );
if (!handle)
{
@@ -2438,7 +2438,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD
DWORD len;
ADDJOB_INFO_1W *addjob;
- TRACE("(%p,%d,%p,%d,%p)\n", hPrinter, Level, pData, cbBuf, pcbNeeded);
+ TRACE("(%p,%ld,%p,%ld,%p)\n", hPrinter, Level, pData, cbBuf, pcbNeeded);
EnterCriticalSection(&printer_handles_cs);
@@ -2508,9 +2508,9 @@ BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR env,
BOOL ret;
INT len;
- TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_a(server),
+ TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_a(server),
debugstr_a(env), level, Info, cbBuf, pcbNeeded);
-
+
if (server) {
len = MultiByteToWideChar(CP_ACP, 0, server, -1, NULL, 0);
@@ -2534,7 +2534,7 @@ BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR env,
cbBuf, NULL, NULL) > 0;
- TRACE(" required: 0x%x/%d\n", pcbNeeded ? *pcbNeeded : 0, pcbNeeded ? *pcbNeeded : 0);
+ TRACE(" required: 0x%lx/%ld\n", pcbNeeded ? *pcbNeeded : 0, pcbNeeded ? *pcbNeeded : 0);
HeapFree(GetProcessHeap(), 0, envW);
HeapFree(GetProcessHeap(), 0, serverW);
return ret;
@@ -2575,7 +2575,7 @@ BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR server, LPWSTR env,
DWORD cbBuf, LPDWORD pcbNeeded)
{
- TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(server), debugstr_w(env), level,
+ TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(server), debugstr_w(env), level,
Info, cbBuf, pcbNeeded);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -2646,7 +2646,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
HKEY printer_key, printers_key, hkeyDriver, hkeyDrivers;
LONG size;
- TRACE("(%s,%d,%p)\n", debugstr_w(pName), Level, pPrinter);
+ TRACE("(%s,%ld,%p)\n", debugstr_w(pName), Level, pPrinter);
if(pName && *pName) {
ERR("pName = %s - unsupported\n", debugstr_w(pName));
@@ -2654,7 +2654,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
return 0;
}
if(Level != 2) {
- ERR("Level = %d, unsupported!\n", Level);
+ ERR("Level = %ld, unsupported!\n", Level);
SetLastError(ERROR_INVALID_LEVEL);
return 0;
}
@@ -2782,9 +2782,9 @@ HANDLE WINAPI AddPrinterA(LPSTR pName, DWORD Level, LPBYTE pPrinter)
PRINTER_INFO_2A *piA = (PRINTER_INFO_2A*)pPrinter;
HANDLE ret;
- TRACE("(%s, %d, %p)\n", debugstr_a(pName), Level, pPrinter);
+ TRACE("(%s, %ld, %p)\n", debugstr_a(pName), Level, pPrinter);
if(Level != 2) {
- ERR("Level = %d, unsupported!\n", Level);
+ ERR("Level = %ld, unsupported!\n", Level);
SetLastError(ERROR_INVALID_LEVEL);
return 0;
}
@@ -2991,9 +2991,9 @@ BOOL WINAPI SetPrinterW( HANDLE printer, DWORD level, LPBYTE data, DWORD command
HKEY key;
BOOL ret = FALSE;
- TRACE( "(%p, %d, %p, %d)\n", printer, level, data, command );
+ TRACE( "(%p, %ld, %p, %ld)\n", printer, level, data, command );
- if (command != 0) FIXME( "Ignoring command %d\n", command );
+ if (command != 0) FIXME( "Ignoring command %ld\n", command );
if (WINSPOOL_GetOpenedPrinterRegKey( printer, &key ))
return FALSE;
@@ -3020,7 +3020,7 @@ BOOL WINAPI SetPrinterW( HANDLE printer, DWORD level, LPBYTE data, DWORD command
}
default:
- FIXME( "Unimplemented level %d\n", level );
+ FIXME( "Unimplemented level %ld\n", level );
SetLastError( ERROR_INVALID_LEVEL );
}
@@ -3038,7 +3038,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
LPBYTE JobW;
UNICODE_STRING usBuffer;
- TRACE("(%p, %d, %d, %p, %d)\n",hPrinter, JobId, Level, pJob, Command);
+ TRACE("(%p, %ld, %ld, %p, %ld)\n",hPrinter, JobId, Level, pJob, Command);
/* JobId, pPrinterName, pMachineName, pDriverName, Size, Submitted, Time and TotalPages
are all ignored by SetJob, so we don't bother copying them */
@@ -3136,7 +3136,7 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level,
BOOL ret = FALSE;
job_t *job;
- TRACE("(%p, %d, %d, %p, %d)\n", hPrinter, JobId, Level, pJob, Command);
+ TRACE("(%p, %ld, %ld, %p, %ld)\n", hPrinter, JobId, Level, pJob, Command);
FIXME("Ignoring everything other than document title\n");
EnterCriticalSection(&printer_handles_cs);
@@ -3274,7 +3274,7 @@ DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo)
WCHAR *filename;
job_t *job;
- TRACE("(hPrinter = %p, Level = %d, pDocInfo = %p {pDocName = %s, pOutputFile = %s, pDatatype = %s}):\n",
+ TRACE("(hPrinter = %p, Level = %ld, pDocInfo = %p {pDocName = %s, pOutputFile = %s, pDatatype = %s}):\n",
hPrinter, Level, doc, debugstr_w(doc->pDocName), debugstr_w(doc->pOutputFile),
debugstr_w(doc->pDatatype));
@@ -3303,7 +3303,7 @@ DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo)
if(!AddJobW(hPrinter, 1, addjob_buf, sizeof(addjob_buf), &needed))
{
- ERR("AddJob failed gle %u\n", GetLastError());
+ ERR("AddJob failed gle %lu\n", GetLastError());
goto end;
}
@@ -3369,7 +3369,7 @@ BOOL WINAPI GetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form, DWOR
{
HANDLE handle = get_backend_handle( printer );
- TRACE( "(%p, %s, %d, %p, %d, %p)\n", printer, debugstr_w( name ), level, form, size, needed );
+ TRACE( "(%p, %s, %ld, %p, %ld, %p)\n", printer, debugstr_w( name ), level, form, size, needed );
if (!handle)
{
@@ -3386,7 +3386,7 @@ BOOL WINAPI GetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form, DWOR
BOOL WINAPI SetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level,
LPBYTE pForm)
{
- FIXME("(%p,%s,%d,%p): stub\n",hPrinter,pFormName,Level,pForm);
+ FIXME("(%p,%s,%ld,%p): stub\n",hPrinter,pFormName,Level,pForm);
return FALSE;
}
@@ -3397,7 +3397,7 @@ BOOL WINAPI SetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form )
{
HANDLE handle = get_backend_handle( printer );
- TRACE( "(%p, %s, %d, %p)\n", printer, debugstr_w( name ), level, form );
+ TRACE( "(%p, %s, %ld, %p)\n", printer, debugstr_w( name ), level, form );
if (!handle)
{
@@ -3414,7 +3414,7 @@ BOOL WINAPI SetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form )
BOOL WINAPI ReadPrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf,
LPDWORD pNoBytesRead)
{
- FIXME("(%p,%p,%d,%p): stub\n",hPrinter,pBuf,cbBuf,pNoBytesRead);
+ FIXME("(%p,%p,%ld,%p): stub\n",hPrinter,pBuf,cbBuf,pNoBytesRead);
return FALSE;
}
@@ -3461,7 +3461,7 @@ static BOOL get_filename_from_reg(HKEY hkey, LPCWSTR driverdir, DWORD dirlen, LP
buffer[0] = '\0';
ret = RegQueryValueExW(hkey, ValueName, NULL, &type, (LPBYTE) buffer, &size);
if (ret == ERROR_MORE_DATA) {
- TRACE("need dynamic buffer: %u\n", size);
+ TRACE("need dynamic buffer: %lu\n", size);
buffer = HeapAlloc(GetProcessHeap(), 0, size);
if (!buffer) {
/* No Memory is bad */
@@ -3536,7 +3536,7 @@ static BOOL WINSPOOL_GetStringFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr,
ret = RegQueryValueExW(hkey, ValueName, 0, &type, ptr, &sz);
if(ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) {
- WARN("Got ret = %d\n", ret);
+ WARN("Got ret = %ld\n", ret);
*needed = 0;
return FALSE;
}
@@ -3587,7 +3587,7 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName,
if ((ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA)) sz = 0;
if (sz < sizeof(DEVMODEA))
{
- TRACE("corrupted registry for %s ( size %d)\n",debugstr_w(ValueName),sz);
+ TRACE("corrupted registry for %s ( size %ld)\n",debugstr_w(ValueName),sz);
return FALSE;
}
/* ensures that dmSize is not erratically bogus if registry is invalid */
@@ -3973,7 +3973,7 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
HKEY hkeyPrinter;
BOOL ret;
- TRACE("(%p,%d,%p,%d,%p)\n",hPrinter,Level,pPrinter,cbBuf, pcbNeeded);
+ TRACE("(%p,%ld,%p,%ld,%p)\n",hPrinter,Level,pPrinter,cbBuf, pcbNeeded);
err = WINSPOOL_GetOpenedPrinterRegKey( hPrinter, &hkeyPrinter );
if (err)
@@ -4120,7 +4120,7 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
default:
- FIXME("Unimplemented level %d\n", Level);
+ FIXME("Unimplemented level %ld\n", Level);
SetLastError(ERROR_INVALID_LEVEL);
RegCloseKey(hkeyPrinter);
return FALSE;
@@ -4128,7 +4128,7 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
RegCloseKey(hkeyPrinter);
- TRACE("returning %d needed = %d\n", ret, needed);
+ TRACE("returning %d needed = %ld\n", ret, needed);
if(pcbNeeded) *pcbNeeded = needed;
if(!ret)
SetLastError(ERROR_INSUFFICIENT_BUFFER);
@@ -4194,7 +4194,7 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName,
}
if (!((dwType & PRINTER_ENUM_LOCAL) || (dwType & PRINTER_ENUM_NAME))) {
- FIXME("dwType = %08x\n", dwType);
+ FIXME("dwType = %08lx\n", dwType);
SetLastError(ERROR_INVALID_FLAGS);
return FALSE;
}
@@ -4211,7 +4211,7 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName,
ERR("Can't query Printers key\n");
return FALSE;
}
- TRACE("Found %d printers\n", number);
+ TRACE("Found %ld printers\n", number);
switch(dwLevel) {
case 1:
@@ -4237,11 +4237,11 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName,
for(i = 0; i < number; i++) {
if (RegEnumKeyW( printers_key, i, PrinterName, ARRAY_SIZE(PrinterName) ))
{
- ERR("Can't enum key number %d\n", i);
+ ERR("Can't enum key number %ld\n", i);
RegCloseKey( printers_key );
return FALSE;
}
- TRACE("Printer %d is %s\n", i, debugstr_w(PrinterName));
+ TRACE("Printer %ld is %s\n", i, debugstr_w(PrinterName));
if (RegOpenKeyW( printers_key, PrinterName, &hkeyPrinter ))
{
ERR("Can't open key %s\n", debugstr_w(PrinterName));
@@ -4386,7 +4386,7 @@ BOOL WINAPI EnumPrintersA(DWORD flags, LPSTR pName, DWORD level, LPBYTE pPrinter
LPWSTR pNameW;
LPBYTE pPrintersW;
- TRACE("(0x%x, %s, %u, %p, %d, %p, %p)\n", flags, debugstr_a(pName), level,
+ TRACE("(0x%lx, %s, %lu, %p, %ld, %p, %p)\n", flags, debugstr_a(pName), level,
pPrinters, cbBuf, pcbNeeded, pcReturned);
pNameW = asciitounicode(&pNameU, pName);
@@ -4431,7 +4431,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
LPBYTE strPtr = pDriverStrings;
LPDRIVER_INFO_8W di = (LPDRIVER_INFO_8W) ptr;
- TRACE("(%p, %s, %p, %d, %p, %p, %d)\n", hkeyDrivers,
+ TRACE("(%p, %s, %p, %ld, %p, %p, %ld)\n", hkeyDrivers,
debugstr_w(DriverName), env,
Level, di, pDriverStrings, cbBuf);
@@ -4518,7 +4518,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
if (Level == 2 ) {
RegCloseKey(hkeyDriver);
- TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded);
+ TRACE("buffer space %ld required %ld\n", cbBuf, *pcbNeeded);
return TRUE;
}
@@ -4583,7 +4583,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
if (Level == 3 ) {
RegCloseKey(hkeyDriver);
- TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded);
+ TRACE("buffer space %ld required %ld\n", cbBuf, *pcbNeeded);
return TRUE;
}
@@ -4600,7 +4600,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
if (Level == 4 ) {
RegCloseKey(hkeyDriver);
- TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded);
+ TRACE("buffer space %ld required %ld\n", cbBuf, *pcbNeeded);
return TRUE;
}
@@ -4659,7 +4659,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
/* support is missing, but not important enough for a FIXME */
TRACE("level 8: incomplete\n");
- TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded);
+ TRACE("buffer space %ld required %ld\n", cbBuf, *pcbNeeded);
RegCloseKey(hkeyDriver);
return TRUE;
}
@@ -4678,7 +4678,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment,
HKEY hkeyPrinter, hkeyDrivers;
const printenv_t * env;
- TRACE("(%p,%s,%d,%p,%d,%p)\n",hPrinter,debugstr_w(pEnvironment),
+ TRACE("(%p,%s,%ld,%p,%ld,%p)\n",hPrinter,debugstr_w(pEnvironment),
Level,pDriverInfo,cbBuf, pcbNeeded);
if (cbBuf > 0)
@@ -4735,7 +4735,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment,
RegCloseKey(hkeyDrivers);
if(pcbNeeded) *pcbNeeded = size + needed;
- TRACE("buffer space %d required %d\n", cbBuf, size + needed);
+ TRACE("buffer space %ld required %ld\n", cbBuf, size + needed);
if(cbBuf >= size + needed) return TRUE;
SetLastError(ERROR_INSUFFICIENT_BUFFER);
return FALSE;
@@ -4805,7 +4805,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment,
DWORD Level, LPBYTE pDriverDirectory,
DWORD cbBuf, LPDWORD pcbNeeded)
{
- TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName),
+ TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName),
debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -4848,7 +4848,7 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment,
INT len = cbBuf * sizeof(WCHAR)/sizeof(CHAR);
WCHAR *driverDirectoryW = NULL;
- TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_a(pName),
+ TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_a(pName),
debugstr_a(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded);
if (len) driverDirectoryW = HeapAlloc( GetProcessHeap(), 0, len );
@@ -4870,7 +4870,7 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment,
} else
if(pcbNeeded) *pcbNeeded = pcbNeededW * sizeof(CHAR)/sizeof(WCHAR);
- TRACE("required: 0x%x/%d\n", pcbNeeded ? *pcbNeeded : 0, pcbNeeded ? *pcbNeeded : 0);
+ TRACE("required: 0x%lx/%ld\n", pcbNeeded ? *pcbNeeded : 0, pcbNeeded ? *pcbNeeded : 0);
HeapFree( GetProcessHeap(), 0, driverDirectoryW );
RtlFreeUnicodeString(&environmentW);
@@ -4887,7 +4887,7 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment,
*/
BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD level, LPBYTE pDriverInfo)
{
- TRACE("(%s, %d, %p)\n", debugstr_a(pName), level, pDriverInfo);
+ TRACE("(%s, %ld, %p)\n", debugstr_a(pName), level, pDriverInfo);
return AddPrinterDriverExA(pName, level, pDriverInfo, APD_COPY_NEW_FILES);
}
@@ -4908,7 +4908,7 @@ BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD level, LPBYTE pDriverInfo)
*/
BOOL WINAPI AddPrinterDriverW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo)
{
- TRACE("(%s, %d, %p)\n", debugstr_w(pName), level, pDriverInfo);
+ TRACE("(%s, %ld, %p)\n", debugstr_w(pName), level, pDriverInfo);
return AddPrinterDriverExW(pName, level, pDriverInfo, APD_COPY_NEW_FILES);
}
@@ -4955,7 +4955,7 @@ BOOL WINAPI AddPrintProcessorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPathNa
*/
BOOL WINAPI AddPrintProvidorA(LPSTR pName, DWORD Level, LPBYTE pProviderInfo)
{
- FIXME("(%s,0x%08x,%p): stub\n", debugstr_a(pName), Level, pProviderInfo);
+ FIXME("(%s,0x%08lx,%p): stub\n", debugstr_a(pName), Level, pProviderInfo);
return FALSE;
}
@@ -4964,7 +4964,7 @@ BOOL WINAPI AddPrintProvidorA(LPSTR pName, DWORD Level, LPBYTE pProviderInfo)
*/
BOOL WINAPI AddPrintProvidorW(LPWSTR pName, DWORD Level, LPBYTE pProviderInfo)
{
- FIXME("(%s,0x%08x,%p): stub\n", debugstr_w(pName), Level, pProviderInfo);
+ FIXME("(%s,0x%08lx,%p): stub\n", debugstr_w(pName), Level, pProviderInfo);
return FALSE;
}
@@ -5017,7 +5017,7 @@ BOOL WINAPI EnumJobsA(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs,
DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded,
LPDWORD pcReturned)
{
- FIXME("(%p,first=%d,no=%d,level=%d,job=%p,cb=%d,%p,%p), stub!\n",
+ FIXME("(%p,first=%ld,no=%ld,level=%ld,job=%p,cb=%ld,%p,%p), stub!\n",
hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned
);
if(pcbNeeded) *pcbNeeded = 0;
@@ -5034,7 +5034,7 @@ BOOL WINAPI EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs,
DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded,
LPDWORD pcReturned)
{
- FIXME("(%p,first=%d,no=%d,level=%d,job=%p,cb=%d,%p,%p), stub!\n",
+ FIXME("(%p,first=%ld,no=%ld,level=%ld,job=%p,cb=%ld,%p,%p), stub!\n",
hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned
);
if(pcbNeeded) *pcbNeeded = 0;
@@ -5065,7 +5065,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment,
DWORD i, size = 0;
const printenv_t * env;
- TRACE("%s,%s,%d,%p,%d,%d,%d\n",
+ TRACE("%s,%s,%ld,%p,%ld,%ld,%ld\n",
debugstr_w(pName), debugstr_w(pEnvironment),
Level, pDriverInfo, driver_index, cbBuf, data_offset);
@@ -5086,7 +5086,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment,
ERR("Can't query Drivers key\n");
return FALSE;
}
- TRACE("Found %d Drivers\n", *pcFound);
+ TRACE("Found %ld Drivers\n", *pcFound);
/* get size of single struct
* unicode and ascii structure have the same size
@@ -5104,7 +5104,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment,
DWORD needed = 0;
if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, ARRAY_SIZE(DriverNameW)) != ERROR_SUCCESS) {
- ERR("Can't enum key number %d\n", i);
+ ERR("Can't enum key number %ld\n", i);
RegCloseKey(hkeyDrivers);
return FALSE;
}
@@ -5265,7 +5265,7 @@ BOOL WINAPI EnumPortsA( LPSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf,
DWORD numentries = 0;
INT len;
- TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_a(pName), Level, pPorts,
+ TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_a(pName), Level, pPorts,
cbBuf, pcbNeeded, pcReturned);
/* convert servername to unicode */
@@ -5313,7 +5313,7 @@ BOOL WINAPI EnumPortsA( LPSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf,
while (index < numentries) {
index++;
needed += entrysize; /* PORT_INFO_?A */
- TRACE("%p: parsing #%d (%s)\n", pi2w, index, debugstr_w(pi2w->pPortName));
+ TRACE("%p: parsing #%ld (%s)\n", pi2w, index, debugstr_w(pi2w->pPortName));
needed += WideCharToMultiByte(CP_ACP, 0, pi2w->pPortName, -1,
NULL, 0, NULL, NULL);
@@ -5343,7 +5343,7 @@ BOOL WINAPI EnumPortsA( LPSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf,
/* Second Pass: Fill the User Buffer (if we have one) */
while ((index < numentries) && pPorts) {
index++;
- TRACE("%p: writing PORT_INFO_%dA #%d\n", pi2a, Level, index);
+ TRACE("%p: writing PORT_INFO_%ldA #%ld\n", pi2a, Level, index);
pi2a->pPortName = ptr;
len = WideCharToMultiByte(CP_ACP, 0, pi2w->pPortName, -1,
ptr, cbBuf , NULL, NULL);
@@ -5379,7 +5379,7 @@ cleanup:
HeapFree(GetProcessHeap(), 0, nameW);
HeapFree(GetProcessHeap(), 0, bufferW);
- TRACE("returning %d with %d (%d byte for %d of %d entries)\n",
+ TRACE("returning %d with %ld (%ld byte for %ld of %ld entries)\n",
(res), GetLastError(), needed, (res)? numentries : 0, numentries);
return (res);
@@ -5407,14 +5407,14 @@ cleanup:
BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pPorts,
+ TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pPorts,
cbBuf, pcbNeeded, pcReturned);
if ((backend == NULL) && !load_backend()) return FALSE;
/* Level is not checked in win9x */
if (!Level || (Level > 2)) {
- WARN("level (%d) is ignored in win9x\n", Level);
+ WARN("level (%ld) is ignored in win9x\n", Level);
SetLastError(ERROR_INVALID_LEVEL);
return FALSE;
}
@@ -5516,7 +5516,7 @@ BOOL WINAPI GetDefaultPrinterA(LPSTR name, LPDWORD namesize)
*namesize = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL);
retval = FALSE;
}
- TRACE("0x%08x/0x%08x:%s\n", *namesize, insize, debugstr_w(bufferW));
+ TRACE("0x%08lx/0x%08lx:%s\n", *namesize, insize, debugstr_w(bufferW));
end:
HeapFree( GetProcessHeap(), 0, bufferW);
@@ -5614,7 +5614,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter)
else
{
if (lres != ERROR_FILE_NOT_FOUND)
- FIXME("RegQueryValueExW failed with %d for %s\n", lres, debugstr_w(pszPrinter));
+ FIXME("RegQueryValueExW failed with %ld for %s\n", lres, debugstr_w(pszPrinter));
SetLastError(ERROR_INVALID_PRINTER_NAME);
}
@@ -5656,7 +5656,7 @@ DWORD WINAPI SetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
HKEY hkeyPrinter, hkeySubkey;
DWORD ret;
- TRACE("(%p, %s, %s %08x, %p, %08x)\n", hPrinter, debugstr_a(pKeyName),
+ TRACE("(%p, %s, %s %08lx, %p, %08lx)\n", hPrinter, debugstr_a(pKeyName),
debugstr_a(pValueName), Type, pData, cbData);
if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter))
@@ -5685,7 +5685,7 @@ DWORD WINAPI SetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
HKEY hkeyPrinter, hkeySubkey;
DWORD ret;
- TRACE("(%p, %s, %s %08x, %p, %08x)\n", hPrinter, debugstr_w(pKeyName),
+ TRACE("(%p, %s, %s %08lx, %p, %08lx)\n", hPrinter, debugstr_w(pKeyName),
debugstr_w(pValueName), Type, pData, cbData);
if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter))
@@ -5735,7 +5735,7 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
HKEY printers_key, hkeyPrinter = 0, hkeySubkey = 0;
DWORD ret;
- TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_a(pKeyName),
+ TRACE("(%p, %s, %s, %p, %p, %lu, %p)\n", hPrinter, debugstr_a(pKeyName),
debugstr_a(pValueName), pType, pData, nSize, pcbNeeded);
printer = get_opened_printer(hPrinter);
@@ -5755,7 +5755,7 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
return ret;
}
if((ret = RegOpenKeyA(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) {
- WARN("Can't open subkey %s: %d\n", debugstr_a(pKeyName), ret);
+ WARN("Can't open subkey %s: %ld\n", debugstr_a(pKeyName), ret);
RegCloseKey(hkeyPrinter);
RegCloseKey( printers_key );
return ret;
@@ -5771,7 +5771,7 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
RegCloseKey(hkeyPrinter);
RegCloseKey( printers_key );
- TRACE("--> %d\n", ret);
+ TRACE("--> %ld\n", ret);
return ret;
}
@@ -5786,7 +5786,7 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
HKEY printers_key, hkeyPrinter = 0, hkeySubkey = 0;
DWORD ret;
- TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_w(pKeyName),
+ TRACE("(%p, %s, %s, %p, %p, %lu, %p)\n", hPrinter, debugstr_w(pKeyName),
debugstr_w(pValueName), pType, pData, nSize, pcbNeeded);
printer = get_opened_printer(hPrinter);
@@ -5807,7 +5807,7 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
}
if ((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS)
{
- WARN("Can't open subkey %s: %d\n", debugstr_w(pKeyName), ret);
+ WARN("Can't open subkey %s: %ld\n", debugstr_w(pKeyName), ret);
RegCloseKey(hkeyPrinter);
RegCloseKey( printers_key );
return ret;
@@ -5823,7 +5823,7 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
RegCloseKey(hkeyPrinter);
RegCloseKey( printers_key );
- TRACE("--> %d\n", ret);
+ TRACE("--> %ld\n", ret);
return ret;
}
@@ -5871,7 +5871,7 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
ret = WINSPOOL_GetOpenedPrinterRegKey (hPrinter, &hkPrinter);
if (ret != ERROR_SUCCESS)
{
- TRACE ("WINSPOOL_GetOpenedPrinterRegKey (%p) returned %i\n",
+ TRACE ("WINSPOOL_GetOpenedPrinterRegKey (%p) returned %li\n",
hPrinter, ret);
return ret;
}
@@ -5881,8 +5881,8 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
{
r = RegCloseKey (hkPrinter);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("RegOpenKeyExW (%p, %s) returned %i\n", hPrinter,
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("RegOpenKeyExW (%p, %s) returned %li\n", hPrinter,
debugstr_w (pKeyName), ret);
return ret;
}
@@ -5890,10 +5890,10 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
ret = RegCloseKey (hkPrinter);
if (ret != ERROR_SUCCESS)
{
- ERR ("RegCloseKey returned %i\n", ret);
+ ERR ("RegCloseKey returned %li\n", ret);
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ret;
}
@@ -5903,19 +5903,19 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
{
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("RegQueryInfoKeyW (%p) returned %i\n", hkSubKey, ret);
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("RegQueryInfoKeyW (%p) returned %li\n", hkSubKey, ret);
return ret;
}
- TRACE ("RegQueryInfoKeyW returned cValues = %i, cbMaxValueNameLen = %i, "
- "cbMaxValueLen = %i\n", cValues, cbMaxValueNameLen, cbMaxValueLen);
+ TRACE ("RegQueryInfoKeyW returned cValues = %li, cbMaxValueNameLen = %li, "
+ "cbMaxValueLen = %li\n", cValues, cbMaxValueNameLen, cbMaxValueLen);
if (cValues == 0) /* empty key */
{
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
*pcbEnumValues = *pnEnumValues = 0;
return ERROR_SUCCESS;
}
@@ -5928,29 +5928,29 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
ERR ("GetProcessHeap failed\n");
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ERROR_OUTOFMEMORY;
}
lpValueName = HeapAlloc (hHeap, 0, cbMaxValueNameLen * sizeof (WCHAR));
if (lpValueName == NULL)
{
- ERR ("Failed to allocate %i WCHARs from process heap\n", cbMaxValueNameLen);
+ ERR ("Failed to allocate %li WCHARs from process heap\n", cbMaxValueNameLen);
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ERROR_OUTOFMEMORY;
}
lpValue = HeapAlloc (hHeap, 0, cbMaxValueLen);
if (lpValue == NULL)
{
- ERR ("Failed to allocate %i bytes from process heap\n", cbMaxValueLen);
+ ERR ("Failed to allocate %li bytes from process heap\n", cbMaxValueLen);
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ERROR_OUTOFMEMORY;
}
@@ -5958,7 +5958,7 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
cbBufSize = cValues * sizeof (PRINTER_ENUM_VALUESW);
- TRACE ("%i bytes required for %i headers\n", cbBufSize, cValues);
+ TRACE ("%li bytes required for %li headers\n", cbBufSize, cValues);
for (dwIndex = 0; dwIndex < cValues; ++dwIndex)
{
@@ -5968,17 +5968,17 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
if (ret != ERROR_SUCCESS)
{
if (HeapFree (hHeap, 0, lpValue) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("RegEnumValueW (%i) returned %i\n", dwIndex, ret);
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("RegEnumValueW (%li) returned %li\n", dwIndex, ret);
return ret;
}
- TRACE ("%s [%i]: name needs %i WCHARs, data needs %i bytes\n",
+ TRACE ("%s [%li]: name needs %li WCHARs, data needs %li bytes\n",
debugstr_w (lpValueName), dwIndex,
cbValueNameLen + 1, cbValueLen);
@@ -5986,7 +5986,7 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
cbBufSize += cbValueLen;
}
- TRACE ("%i bytes required for all %i values\n", cbBufSize, cValues);
+ TRACE ("%li bytes required for all %li values\n", cbBufSize, cValues);
*pcbEnumValues = cbBufSize;
*pnEnumValues = cValues;
@@ -5994,13 +5994,13 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
if (cbEnumValues < cbBufSize) /* buffer too small */
{
if (HeapFree (hHeap, 0, lpValue) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("%i byte buffer is not large enough\n", cbEnumValues);
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("%li byte buffer is not large enough\n", cbEnumValues);
return ERROR_MORE_DATA;
}
@@ -6017,13 +6017,13 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
if (ret != ERROR_SUCCESS)
{
if (HeapFree (hHeap, 0, lpValue) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("RegEnumValueW (%i) returned %i\n", dwIndex, ret);
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("RegEnumValueW (%li) returned %li\n", dwIndex, ret);
return ret;
}
@@ -6043,36 +6043,36 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
ppev[dwIndex].cbData = cbValueLen;
- TRACE ("%s [%i]: copied name (%i bytes) and data (%i bytes)\n",
+ TRACE ("%s [%li]: copied name (%li bytes) and data (%li bytes)\n",
debugstr_w (lpValueName), dwIndex, cbValueNameLen, cbValueLen);
}
if (HeapFree (hHeap, 0, lpValue) == 0)
{
ret = GetLastError ();
- ERR ("HeapFree failed with code %i\n", ret);
+ ERR ("HeapFree failed with code %li\n", ret);
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ret;
}
if (HeapFree (hHeap, 0, lpValueName) == 0)
{
ret = GetLastError ();
- ERR ("HeapFree failed with code %i\n", ret);
+ ERR ("HeapFree failed with code %li\n", ret);
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ret;
}
ret = RegCloseKey (hkSubKey);
if (ret != ERROR_SUCCESS)
{
- ERR ("RegCloseKey returned %i\n", ret);
+ ERR ("RegCloseKey returned %li\n", ret);
return ret;
}
@@ -6106,7 +6106,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (len == 0)
{
ret = GetLastError ();
- ERR ("MultiByteToWideChar failed with code %i\n", ret);
+ ERR ("MultiByteToWideChar failed with code %li\n", ret);
return ret;
}
@@ -6120,7 +6120,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
pKeyNameW = HeapAlloc (hHeap, 0, len * sizeof (WCHAR));
if (pKeyNameW == NULL)
{
- ERR ("Failed to allocate %i bytes from process heap\n",
+ ERR ("Failed to allocate %li bytes from process heap\n",
(LONG)(len * sizeof (WCHAR)));
return ERROR_OUTOFMEMORY;
}
@@ -6128,9 +6128,9 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (MultiByteToWideChar (CP_ACP, 0, pKeyName, -1, pKeyNameW, len) == 0)
{
ret = GetLastError ();
- ERR ("MultiByteToWideChar failed with code %i\n", ret);
+ ERR ("MultiByteToWideChar failed with code %li\n", ret);
if (HeapFree (hHeap, 0, pKeyNameW) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
return ret;
}
@@ -6139,15 +6139,15 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (ret != ERROR_SUCCESS)
{
if (HeapFree (hHeap, 0, pKeyNameW) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
- TRACE ("EnumPrinterDataExW returned %i\n", ret);
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
+ TRACE ("EnumPrinterDataExW returned %li\n", ret);
return ret;
}
if (HeapFree (hHeap, 0, pKeyNameW) == 0)
{
ret = GetLastError ();
- ERR ("HeapFree failed with code %i\n", ret);
+ ERR ("HeapFree failed with code %li\n", ret);
return ret;
}
@@ -6168,12 +6168,12 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
dwBufSize = ppev->cbData;
}
- TRACE ("Largest Unicode name or value is %i bytes\n", dwBufSize);
+ TRACE ("Largest Unicode name or value is %li bytes\n", dwBufSize);
pBuffer = HeapAlloc (hHeap, 0, dwBufSize);
if (pBuffer == NULL)
{
- ERR ("Failed to allocate %i bytes from process heap\n", dwBufSize);
+ ERR ("Failed to allocate %li bytes from process heap\n", dwBufSize);
return ERROR_OUTOFMEMORY;
}
@@ -6188,9 +6188,9 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (len == 0)
{
ret = GetLastError ();
- ERR ("WideCharToMultiByte failed with code %i\n", ret);
+ ERR ("WideCharToMultiByte failed with code %li\n", ret);
if (HeapFree (hHeap, 0, pBuffer) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
return ret;
}
@@ -6207,9 +6207,9 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (len == 0)
{
ret = GetLastError ();
- ERR ("WideCharToMultiByte failed with code %i\n", ret);
+ ERR ("WideCharToMultiByte failed with code %li\n", ret);
if (HeapFree (hHeap, 0, pBuffer) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
return ret;
}
@@ -6222,7 +6222,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (HeapFree (hHeap, 0, pBuffer) == 0)
{
ret = GetLastError ();
- ERR ("HeapFree failed with code %i\n", ret);
+ ERR ("HeapFree failed with code %li\n", ret);
return ret;
}
@@ -6316,7 +6316,7 @@ BOOL WINAPI AddPortExA(LPSTR pName, DWORD level, LPBYTE pBuffer, LPSTR pMonitorN
pi2A = (PORT_INFO_2A *) pBuffer;
- TRACE("(%s, %d, %p, %s): %s\n", debugstr_a(pName), level, pBuffer,
+ TRACE("(%s, %ld, %p, %s): %s\n", debugstr_a(pName), level, pBuffer,
debugstr_a(pMonitorName), debugstr_a(pi2A ? pi2A->pPortName : NULL));
if ((level < 1) || (level > 2)) {
@@ -6398,7 +6398,7 @@ BOOL WINAPI AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR pMonito
pi2 = (PORT_INFO_2W *) pBuffer;
- TRACE("(%s, %d, %p, %s): %s %s %s\n", debugstr_w(pName), level, pBuffer,
+ TRACE("(%s, %ld, %p, %s): %s %s %s\n", debugstr_w(pName), level, pBuffer,
debugstr_w(pMonitorName), debugstr_w(pi2 ? pi2->pPortName : NULL),
debugstr_w(((level > 1) && pi2) ? pi2->pMonitorName : NULL),
debugstr_w(((level > 1) && pi2) ? pi2->pDescription : NULL));
@@ -6449,7 +6449,7 @@ BOOL WINAPI AddPrinterConnectionW( LPWSTR pName )
*/
BOOL WINAPI AddPrinterDriverExW( LPWSTR pName, DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags)
{
- TRACE("(%s, %d, %p, 0x%x)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags);
+ TRACE("(%s, %ld, %p, 0x%lx)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -6481,7 +6481,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW
DWORD len;
BOOL res = FALSE;
- TRACE("(%s, %d, %p, 0x%x)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags);
+ TRACE("(%s, %ld, %p, 0x%lx)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags);
diA = (DRIVER_INFO_8A *) pDriverInfo;
ZeroMemory(&diW, sizeof(diW));
@@ -6636,7 +6636,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW
}
res = AddPrinterDriverExW(nameW, Level, (LPBYTE) &diW, dwFileCopyFlags);
- TRACE("got %u with %u\n", res, GetLastError());
+ TRACE("got %u with %lu\n", res, GetLastError());
HeapFree(GetProcessHeap(), 0, nameW);
HeapFree(GetProcessHeap(), 0, diW.pName);
HeapFree(GetProcessHeap(), 0, diW.pEnvironment);
@@ -6658,7 +6658,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW
HeapFree(GetProcessHeap(), 0, diW.pszInfPath);
HeapFree(GetProcessHeap(), 0, diW.pszzCoreDriverDependencies);
- TRACE("=> %u with %u\n", res, GetLastError());
+ TRACE("=> %u with %lu\n", res, GetLastError());
return res;
}
@@ -6732,7 +6732,7 @@ BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
*/
HANDLE WINAPI ConnectToPrinterDlg( HWND hWnd, DWORD Flags )
{
- FIXME("%p %x\n", hWnd, Flags);
+ FIXME("%p %lx\n", hWnd, Flags);
return NULL;
}
@@ -6763,7 +6763,7 @@ BOOL WINAPI DeletePrinterDriverExW( LPWSTR pName, LPWSTR pEnvironment,
HKEY hkey_drivers;
BOOL ret = FALSE;
- TRACE("%s %s %s %x %x\n", debugstr_w(pName), debugstr_w(pEnvironment),
+ TRACE("%s %s %s %lx %lx\n", debugstr_w(pName), debugstr_w(pEnvironment),
debugstr_w(pDriverName), dwDeleteFlag, dwVersionFlag);
if(pName && pName[0])
@@ -6775,7 +6775,7 @@ BOOL WINAPI DeletePrinterDriverExW( LPWSTR pName, LPWSTR pEnvironment,
if(dwDeleteFlag)
{
- FIXME("dwDeleteFlag = %x - unsupported\n", dwDeleteFlag);
+ FIXME("dwDeleteFlag = %lx - unsupported\n", dwDeleteFlag);
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
@@ -6906,7 +6906,7 @@ BOOL WINAPI EnumFormsW( HANDLE printer, DWORD level, BYTE *form, DWORD size, DWO
{
HANDLE handle = get_backend_handle( printer );
- TRACE( "(%p, %d, %p, %d, %p, %p)\n", printer, level, form, size, needed, count );
+ TRACE( "(%p, %ld, %p, %ld, %p, %p)\n", printer, level, form, size, needed, count );
if (!handle)
{
@@ -6945,7 +6945,7 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors,
DWORD numentries = 0;
INT len;
- TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_a(pName), Level, pMonitors,
+ TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_a(pName), Level, pMonitors,
cbBuf, pcbNeeded, pcReturned);
/* convert servername to unicode */
@@ -6992,7 +6992,7 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors,
while (index < numentries) {
index++;
needed += entrysize; /* MONITOR_INFO_?A */
- TRACE("%p: parsing #%d (%s)\n", mi2w, index, debugstr_w(mi2w->pName));
+ TRACE("%p: parsing #%ld (%s)\n", mi2w, index, debugstr_w(mi2w->pName));
needed += WideCharToMultiByte(CP_ACP, 0, mi2w->pName, -1,
NULL, 0, NULL, NULL);
@@ -7022,7 +7022,7 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors,
/* Second Pass: Fill the User Buffer (if we have one) */
while ((index < numentries) && pMonitors) {
index++;
- TRACE("%p: writing MONITOR_INFO_%dA #%d\n", mi2a, Level, index);
+ TRACE("%p: writing MONITOR_INFO_%ldA #%ld\n", mi2a, Level, index);
mi2a->pName = ptr;
len = WideCharToMultiByte(CP_ACP, 0, mi2w->pName, -1,
ptr, cbBuf , NULL, NULL);
@@ -7053,7 +7053,7 @@ emA_cleanup:
HeapFree(GetProcessHeap(), 0, nameW);
HeapFree(GetProcessHeap(), 0, bufferW);
- TRACE("returning %d with %d (%d byte for %d entries)\n",
+ TRACE("returning %d with %ld (%ld byte for %ld entries)\n",
(res), GetLastError(), needed, numentries);
return (res);
@@ -7082,7 +7082,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors,
DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pMonitors,
+ TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pMonitors,
cbBuf, pcbNeeded, pcReturned);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -7155,7 +7155,7 @@ BOOL WINAPI XcvDataW( HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData,
{
opened_printer_t *printer;
- TRACE("(%p, %s, %p, %d, %p, %d, %p, %p)\n", hXcv, debugstr_w(pszDataName),
+ TRACE("(%p, %s, %p, %ld, %p, %ld, %p, %p)\n", hXcv, debugstr_w(pszDataName),
pInputData, cbInputData, pOutputData,
cbOutputData, pcbOutputNeeded, pdwStatus);
@@ -7192,7 +7192,7 @@ DWORD WINAPI EnumPrinterDataA( HANDLE hPrinter, DWORD dwIndex, LPSTR pValueName,
DWORD cbValueName, LPDWORD pcbValueName, LPDWORD pType, LPBYTE pData,
DWORD cbData, LPDWORD pcbData )
{
- FIXME("%p %x %p %x %p %p %p %x %p\n", hPrinter, dwIndex, pValueName,
+ FIXME("%p %lx %p %lx %p %p %p %lx %p\n", hPrinter, dwIndex, pValueName,
cbValueName, pcbValueName, pType, pData, cbData, pcbData);
return ERROR_NO_MORE_ITEMS;
}
@@ -7205,7 +7205,7 @@ DWORD WINAPI EnumPrinterDataW( HANDLE hPrinter, DWORD dwIndex, LPWSTR pValueName
DWORD cbValueName, LPDWORD pcbValueName, LPDWORD pType, LPBYTE pData,
DWORD cbData, LPDWORD pcbData )
{
- FIXME("%p %x %p %x %p %p %p %x %p\n", hPrinter, dwIndex, pValueName,
+ FIXME("%p %lx %p %lx %p %p %p %lx %p\n", hPrinter, dwIndex, pValueName,
cbValueName, pcbValueName, pType, pData, cbData, pcbData);
return ERROR_NO_MORE_ITEMS;
}
@@ -7216,7 +7216,7 @@ DWORD WINAPI EnumPrinterDataW( HANDLE hPrinter, DWORD dwIndex, LPWSTR pValueName
*/
DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, CHAR *subkey, DWORD size, DWORD *needed)
{
- FIXME("%p %s %p %x %p\n", printer, debugstr_a(key), subkey, size, needed);
+ FIXME("%p %s %p %lx %p\n", printer, debugstr_a(key), subkey, size, needed);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -7226,7 +7226,7 @@ DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, CHAR *subkey, DWOR
*/
DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, WCHAR *subkey, DWORD size, DWORD *needed)
{
- FIXME("%p %s %p %x %p\n", printer, debugstr_w(key), subkey, size, needed);
+ FIXME("%p %s %p %lx %p\n", printer, debugstr_w(key), subkey, size, needed);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -7238,7 +7238,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesA(LPSTR pName, LPSTR pPrintProcessorName,
DWORD Level, LPBYTE pDatatypes, DWORD cbBuf,
LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- FIXME("Stub: %s %s %d %p %d %p %p\n", debugstr_a(pName),
+ FIXME("Stub: %s %s %ld %p %ld %p %p\n", debugstr_a(pName),
debugstr_a(pPrintProcessorName), Level, pDatatypes, cbBuf,
pcbNeeded, pcReturned);
return FALSE;
@@ -7252,7 +7252,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorNam
DWORD Level, LPBYTE pDatatypes, DWORD cbBuf,
LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- FIXME("Stub: %s %s %d %p %d %p %p\n", debugstr_w(pName),
+ FIXME("Stub: %s %s %ld %p %ld %p %p\n", debugstr_w(pName),
debugstr_w(pPrintProcessorName), Level, pDatatypes, cbBuf,
pcbNeeded, pcReturned);
return FALSE;
@@ -7275,7 +7275,7 @@ BOOL WINAPI EnumPrintProcessorsA(LPSTR pName, LPSTR pEnvironment, DWORD Level,
DWORD numentries = 0;
INT len;
- TRACE("(%s, %s, %d, %p, %d, %p, %p)\n", debugstr_a(pName), debugstr_a(pEnvironment),
+ TRACE("(%s, %s, %ld, %p, %ld, %p, %p)\n", debugstr_a(pName), debugstr_a(pEnvironment),
Level, pPPInfo, cbBuf, pcbNeeded, pcReturned);
/* convert names to unicode */
@@ -7321,7 +7321,7 @@ BOOL WINAPI EnumPrintProcessorsA(LPSTR pName, LPSTR pEnvironment, DWORD Level,
while (index < numentries) {
index++;
needed += sizeof(PRINTPROCESSOR_INFO_1A);
- TRACE("%p: parsing #%d (%s)\n", ppiw, index, debugstr_w(ppiw->pName));
+ TRACE("%p: parsing #%ld (%s)\n", ppiw, index, debugstr_w(ppiw->pName));
needed += WideCharToMultiByte(CP_ACP, 0, ppiw->pName, -1,
NULL, 0, NULL, NULL);
@@ -7346,7 +7346,7 @@ BOOL WINAPI EnumPrintProcessorsA(LPSTR pName, LPSTR pEnvironment, DWORD Level,
/* Second Pass: Fill the User Buffer (if we have one) */
while ((index < numentries) && pPPInfo) {
index++;
- TRACE("%p: writing PRINTPROCESSOR_INFO_1A #%d\n", ppia, index);
+ TRACE("%p: writing PRINTPROCESSOR_INFO_1A #%ld\n", ppia, index);
ppia->pName = ptr;
len = WideCharToMultiByte(CP_ACP, 0, ppiw->pName, -1,
ptr, cbBuf , NULL, NULL);
@@ -7366,7 +7366,7 @@ epp_cleanup:
HeapFree(GetProcessHeap(), 0, envW);
HeapFree(GetProcessHeap(), 0, bufferW);
- TRACE("returning %d with %d (%d byte for %d entries)\n",
+ TRACE("returning %d with %ld (%ld byte for %ld entries)\n",
(res), GetLastError(), needed, numentries);
return (res);
@@ -7395,7 +7395,7 @@ BOOL WINAPI EnumPrintProcessorsW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level,
LPBYTE pPPInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- TRACE("(%s, %s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment),
+ TRACE("(%s, %s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment),
Level, pPPInfo, cbBuf, pcbNeeded, pcReturned);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -7422,7 +7422,7 @@ LONG WINAPI ExtDeviceMode( HWND hWnd, HANDLE hInst, LPDEVMODEA pDevModeOutput,
LPSTR pDeviceName, LPSTR pPort, LPDEVMODEA pDevModeInput, LPSTR pProfile,
DWORD fMode)
{
- FIXME("Stub: %p %p %p %s %s %p %s %x\n", hWnd, hInst, pDevModeOutput,
+ FIXME("Stub: %p %p %p %s %s %p %s %lx\n", hWnd, hInst, pDevModeOutput,
debugstr_a(pDeviceName), debugstr_a(pPort), pDevModeInput,
debugstr_a(pProfile), fMode);
return -1;
@@ -7445,7 +7445,7 @@ BOOL WINAPI FindClosePrinterChangeNotification( HANDLE hChange )
HANDLE WINAPI FindFirstPrinterChangeNotification( HANDLE hPrinter,
DWORD fdwFlags, DWORD fdwOptions, LPVOID pPrinterNotifyOptions )
{
- FIXME("Stub: %p %x %x %p\n",
+ FIXME("Stub: %p %lx %lx %p\n",
hPrinter, fdwFlags, fdwOptions, pPrinterNotifyOptions);
return INVALID_HANDLE_VALUE;
}
@@ -7649,7 +7649,7 @@ static BOOL get_job_info(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob,
job_t *job;
LPBYTE ptr = pJob;
- TRACE("%p %d %d %p %d %p\n", hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded);
+ TRACE("%p %ld %ld %p %ld %p\n", hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded);
EnterCriticalSection(&printer_handles_cs);
job = get_job(hPrinter, JobId);
@@ -7832,7 +7832,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID )
BOOL ret = FALSE;
struct list *cursor, *cursor2;
- TRACE("(%p, %x)\n", hPrinter, dwJobID);
+ TRACE("(%p, %lx)\n", hPrinter, dwJobID);
EnterCriticalSection(&printer_handles_cs);
printer = get_opened_printer(hPrinter);
if(!printer)
@@ -7862,7 +7862,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID )
GetPrinterW(hPrinter, 5, (LPBYTE)pi5, needed, &needed);
portname = pi5->pPortName;
}
- TRACE("need to schedule job %d filename %s to port %s\n", job->job_id, debugstr_w(job->filename),
+ TRACE("need to schedule job %ld filename %s to port %s\n", job->job_id, debugstr_w(job->filename),
debugstr_w(portname));
if (!wcsncmp( portname, L"FILE:", ARRAY_SIZE(L"FILE:") - 1 ))
@@ -8032,7 +8032,7 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc )
HRESULT WINAPI UploadPrinterDriverPackageA( LPCSTR server, LPCSTR path, LPCSTR env,
DWORD flags, HWND hwnd, LPSTR dst, PULONG dstlen )
{
- FIXME("%s, %s, %s, %x, %p, %p, %p\n", debugstr_a(server), debugstr_a(path), debugstr_a(env),
+ FIXME("%s, %s, %s, %lx, %p, %p, %p\n", debugstr_a(server), debugstr_a(path), debugstr_a(env),
flags, hwnd, dst, dstlen);
return E_NOTIMPL;
}
@@ -8043,7 +8043,7 @@ HRESULT WINAPI UploadPrinterDriverPackageA( LPCSTR server, LPCSTR path, LPCSTR e
HRESULT WINAPI UploadPrinterDriverPackageW( LPCWSTR server, LPCWSTR path, LPCWSTR env,
DWORD flags, HWND hwnd, LPWSTR dst, PULONG dstlen )
{
- FIXME("%s, %s, %s, %x, %p, %p, %p\n", debugstr_w(server), debugstr_w(path), debugstr_w(env),
+ FIXME("%s, %s, %s, %lx, %p, %p, %p\n", debugstr_w(server), debugstr_w(path), debugstr_w(env),
flags, hwnd, dst, dstlen);
return E_NOTIMPL;
}
diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c
index 2555692b097..ff0e4418719 100644
--- a/dlls/winspool.drv/wspool.c
+++ b/dlls/winspool.drv/wspool.c
@@ -97,7 +97,7 @@ BOOL load_backend(void)
LeaveCriticalSection(&backend_cs);
- WARN("failed to load the backend: %u\n", GetLastError());
+ WARN("failed to load the backend: %lu\n", GetLastError());
SetLastError(RPC_S_SERVER_UNAVAILABLE);
return FALSE;
}
--
2.23.0
1
0
13 May '22
[PATCH v3 0/6] MR62: windows.gaming.input: More force feedback implementation.
by Rémi Bernon (ï¼ rbernon) 13 May '22
by Rémi Bernon (ï¼ rbernon) 13 May '22
13 May '22
--
v3: windows.gaming.input: Implement IForceFeedbackMotor_TryUnloadEffectAsync.
windows.gaming.input: Implement IForceFeedbackMotor_LoadEffectAsync.
windows.gaming.input: Add a type parameter to force_feedback_effect_create.
windows.gaming.input: Implement IForceFeedbackEffect interface for ConstantForceEffect.
windows.gaming.input: Implement and instantiate ConstantForceEffect runtimeclass stubs.
dinput/tests: Increase async bool handler wait timeout.
https://gitlab.winehq.org/wine/wine/-/merge_requests/62
2
6
[PATCH v2 0/6] MR62: windows.gaming.input: More force feedback implementation.
by Rémi Bernon (ï¼ rbernon) 13 May '22
by Rémi Bernon (ï¼ rbernon) 13 May '22
13 May '22
--
v2: windows.gaming.input: Implement IForceFeedbackMotor_TryUnloadEffectAsync.
windows.gaming.input: Implement IForceFeedbackMotor_LoadEffectAsync.
windows.gaming.input: Add a type parameter to force_feedback_effect_create.
windows.gaming.input: Implement IForceFeedbackEffect interface for ConstantForceEffect.
windows.gaming.input: Implement and instantiate ConstantForceEffect runtimeclass stubs.
dinput/tests: Increase async bool handler wait timeout.
https://gitlab.winehq.org/wine/wine/-/merge_requests/62
3
7
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/d3drm/tests/Makefile.in | 1 -
dlls/d3drm/tests/d3drm.c | 3117 +++++++++++++++++-----------------
dlls/d3drm/tests/vector.c | 8 +-
3 files changed, 1561 insertions(+), 1565 deletions(-)
diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in
index ec4a030e949..4b39989531c 100644
--- a/dlls/d3drm/tests/Makefile.in
+++ b/dlls/d3drm/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = d3drm.dll
IMPORTS = dxguid uuid d3drm ddraw user32
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 5e0acc14fcb..7b591958373 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -179,37 +179,37 @@ static void test_class_name_(unsigned int line, IDirect3DRMObject *object, const
HRESULT hr;
hr = IDirect3DRMObject_GetClassName(object, NULL, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetClassName(object, NULL, NULL);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
size = 0;
hr = IDirect3DRMObject_GetClassName(object, &size, NULL);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
size = size2 = !!*name;
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- ok_(__FILE__, line)(size == size2, "Got size %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == size2, "Got size %lu.\n", size);
size = sizeof(cname);
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
size = strlen(name) + 1;
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
size = strlen(name);
strcpy(cname, "XXX");
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, "XXX"), "Expected unchanged buffer, but got \"%s\".\n", cname);
}
@@ -221,70 +221,70 @@ static void test_object_name_(unsigned int line, IDirect3DRMObject *object)
DWORD size;
hr = IDirect3DRMObject_GetName(object, NULL, NULL);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, NULL, name);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected buffer contents, %#x.\n", name[0]);
/* Name is not set yet. */
size = 100;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
size = sizeof(name);
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0, "Unexpected name \"%s\".\n", name);
size = 0;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected name \"%s\".\n", name);
hr = IDirect3DRMObject_SetName(object, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMObject_SetName(object, "name");
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#lx.\n", hr);
size = 0;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
size = strlen("name") + 1;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(!strcmp(name, "name"), "Unexpected name \"%s\".\n", name);
size = 2;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 2, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 2, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0x1f, "Got unexpected name \"%s\".\n", name);
hr = IDirect3DRMObject_SetName(object, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#lx.\n", hr);
size = 1;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
size = 1;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0, "Got unexpected name \"%s\".\n", name);
}
@@ -454,31 +454,31 @@ static void test_MeshBuilder(void)
IUnknown *unk;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void **)&meshbuilder3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMMeshBuilder3, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
@@ -490,36 +490,36 @@ static void test_MeshBuilder(void)
info.lpMemory = data_bad_version;
info.dSize = strlen(data_bad_version);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
info.lpMemory = data_no_mesh;
info.dSize = strlen(data_no_mesh);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, "Object"), "Retrieved name '%s' instead of 'Object'\n", name);
size = strlen("Object"); /* No space for null character */
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, NULL);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
- ok(size == 0, "Size should be 0 instead of %u\n", size);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
+ ok(size == 0, "Size should be 0 instead of %lu.\n", size);
hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, "");
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, ""), "Retrieved name '%s' instead of ''\n", name);
val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
@@ -529,14 +529,14 @@ static void test_MeshBuilder(void)
ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, NULL, &val2, NULL, &val3, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
- ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2);
- ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
+ ok(val2 == 4, "Wrong number of normals %ld (must be 4)\n", val2);
+ ok(val3 == 22, "Wrong number of face data bytes %ld (must be 22)\n", val3);
/* Check that Load method generated default normals */
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
expect_vector(&n[0], 0.577350f, 0.577350f, 0.577350f, 32);
expect_vector(&n[1], -0.229416f, 0.688247f, 0.688247f, 32);
expect_vector(&n[2], -0.229416f, 0.688247f, 0.688247f, 32);
@@ -546,58 +546,58 @@ static void test_MeshBuilder(void)
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 2, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 3, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 4, &valu, &valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 0, valu, valv);
- ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 4, valu, valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 0.0f;
valv = 0.0f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
IDirect3DRMMeshBuilder_Release(pMeshBuilder);
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
/* No group in mesh when mesh builder is not loaded */
hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
- ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "CreateMesh failed returning hr %#lx.\n", hr);
if (hr == D3DRM_OK)
{
DWORD nb_groups;
nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(nb_groups == 0, "GetCroupCount returned %u\n", nb_groups);
+ ok(nb_groups == 0, "GetCroupCount returned %lu\n", nb_groups);
IDirect3DRMMesh_Release(mesh);
}
@@ -605,7 +605,7 @@ static void test_MeshBuilder(void)
info.lpMemory = data_full;
info.dSize = strlen(data_full);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
ok(val == 3, "Wrong number of vertices %d (must be 3)\n", val);
@@ -616,43 +616,43 @@ static void test_MeshBuilder(void)
/* Check no buffer size and too small buffer size errors */
val1 = 1; val2 = 3; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 1; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, NULL, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 3; val3 = 1;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, NULL, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 3; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
- ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
- ok(val3 == 8, "Wrong number of face data bytes %d (must be 8)\n", val3);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
+ ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+ ok(val3 == 8, "Wrong number of face data bytes %ld (must be 8)\n", val3);
expect_vector(&v[0], 0.1f, 0.2f, 0.3f, 32);
expect_vector(&v[1], 0.4f, 0.5f, 0.6f, 32);
expect_vector(&v[2], 0.7f, 0.8f, 0.9f, 32);
expect_vector(&n[0], 1.1f, 1.2f, 1.3f, 32);
expect_vector(&n[1], 1.4f, 1.5f, 1.6f, 32);
expect_vector(&n[2], 1.7f, 1.8f, 1.9f, 32);
- ok(f[0] == 3 , "Wrong component f[0] = %d (expected 3)\n", f[0]);
- ok(f[1] == 0 , "Wrong component f[1] = %d (expected 0)\n", f[1]);
- ok(f[2] == 0 , "Wrong component f[2] = %d (expected 0)\n", f[2]);
- ok(f[3] == 1 , "Wrong component f[3] = %d (expected 1)\n", f[3]);
- ok(f[4] == 1 , "Wrong component f[4] = %d (expected 1)\n", f[4]);
- ok(f[5] == 2 , "Wrong component f[5] = %d (expected 2)\n", f[5]);
- ok(f[6] == 2 , "Wrong component f[6] = %d (expected 2)\n", f[6]);
- ok(f[7] == 0 , "Wrong component f[7] = %d (expected 0)\n", f[7]);
+ ok(f[0] == 3 , "Wrong component f[0] = %ld (expected 3)\n", f[0]);
+ ok(f[1] == 0 , "Wrong component f[1] = %ld (expected 0)\n", f[1]);
+ ok(f[2] == 0 , "Wrong component f[2] = %ld (expected 0)\n", f[2]);
+ ok(f[3] == 1 , "Wrong component f[3] = %ld (expected 1)\n", f[3]);
+ ok(f[4] == 1 , "Wrong component f[4] = %ld (expected 1)\n", f[4]);
+ ok(f[5] == 2 , "Wrong component f[5] = %ld (expected 2)\n", f[5]);
+ ok(f[6] == 2 , "Wrong component f[6] = %ld (expected 2)\n", f[6]);
+ ok(f[7] == 0 , "Wrong component f[7] = %ld (expected 0)\n", f[7]);
hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
- ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
if (hr == D3DRM_OK)
{
DWORD nb_groups;
@@ -663,30 +663,30 @@ static void test_MeshBuilder(void)
D3DVALUE values[3];
nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups);
+ ok(nb_groups == 1, "GetCroupCount returned %lu.\n", nb_groups);
hr = IDirect3DRMMesh_GetGroup(mesh, 1, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
- ok(hr == D3DRMERR_BADVALUE, "GetCroup returned hr = %x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMesh_GetGroup(mesh, 0, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
- ok(hr == D3DRM_OK, "GetCroup failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(nb_vertices == 3, "Wrong number of vertices %u (must be 3)\n", nb_vertices);
ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces);
ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices);
- ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size);
+ ok(data_size == 3, "Wrong number of face data bytes %lu (must be 3)\n", data_size);
color = IDirect3DRMMesh_GetGroupColor(mesh, 0);
- ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00);
+ ok(color == 0xff00ff00, "Wrong color returned %#lx instead of %#x\n", color, 0xff00ff00);
hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture);
- ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(texture == NULL, "No texture should be present\n");
hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material);
- ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(material != NULL, "No material present\n");
hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);
- ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#lx.\n", hr);
ok(values[0] == 0.5f, "Got unexpected red component %.8e.\n", values[0]);
ok(values[1] == 0.5f, "Got unexpected green component %.8e.\n", values[1]);
ok(values[2] == 0.5f, "Got unexpected blue component %.8e.\n", values[2]);
hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]);
- ok(hr == D3DRM_OK, "Failed to get specular color, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to get specular color, hr %#lx.\n", hr);
ok(values[0] == 1.0f, "Got unexpected red component %.8e.\n", values[0]);
ok(values[1] == 0.0f, "Got unexpected green component %.8e.\n", values[1]);
ok(values[2] == 0.0f, "Got unexpected blue component %.8e.\n", values[2]);
@@ -698,12 +698,12 @@ static void test_MeshBuilder(void)
}
hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4);
- ok(hr == D3DRM_OK, "Scale failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Scale failed returning hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
- ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+ ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
expect_vector(&v[0], 0.1f * 2, 0.2f * 3, 0.3f * 4, 32);
expect_vector(&v[1], 0.4f * 2, 0.5f * 3, 0.6f * 4, 32);
@@ -730,17 +730,17 @@ static void test_MeshBuilder3(void)
D3DVALUE valu, valv;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &pMeshBuilder3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)pMeshBuilder3, "Builder");
test_object_name((IDirect3DRMObject *)pMeshBuilder3);
@@ -748,17 +748,17 @@ static void test_MeshBuilder3(void)
info.lpMemory = data_bad_version;
info.dSize = strlen(data_bad_version);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
info.lpMemory = data_no_mesh;
info.dSize = strlen(data_no_mesh);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
val = IDirect3DRMMeshBuilder3_GetVertexCount(pMeshBuilder3);
ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val);
@@ -767,48 +767,48 @@ static void test_MeshBuilder3(void)
ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
/* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 2, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 3, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 4, &valu, &valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 0, valu, valv);
- ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 4, valu, valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 0.0f;
valv = 0.0f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
@@ -825,20 +825,20 @@ static void test_Mesh(void)
IUnknown *unk;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateMesh(d3drm, &mesh);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)mesh, "Mesh");
test_object_name((IDirect3DRMObject *)mesh);
hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk);
hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk);
IDirect3DRMMesh_Release(mesh);
@@ -865,19 +865,19 @@ static void test_Face(void)
int icount;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFace(d3drm, &face1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
if (FAILED(hr))
{
- skip("Cannot get IDirect3DRMFace interface (hr = %x), skipping tests\n", hr);
+ skip("Cannot get IDirect3DRMFace interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRMFace_QueryInterface(face1, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
IDirect3DRMObject_Release(obj);
@@ -891,13 +891,13 @@ static void test_Face(void)
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2)))
{
- win_skip("Cannot get IDirect3DRM2 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM2 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM2_CreateMeshBuilder(d3drm2, &MeshBuilder2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
ok(!icount, "wrong FaceCount: %i\n", icount);
@@ -905,10 +905,10 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder2_CreateFace(MeshBuilder2, &face1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
todo_wine
@@ -917,16 +917,16 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
IDirect3DRMFace_Release(face);
IDirect3DRMFaceArray_Release(array1);
}
@@ -939,25 +939,25 @@ static void test_Face(void)
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &MeshBuilder3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3);
ok(!icount, "wrong FaceCount: %i\n", icount);
hr = IDirect3DRMMeshBuilder3_CreateFace(MeshBuilder3, &face2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMFace, (void **)&face1);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
IDirect3DRMFace_Release(face1);
@@ -973,16 +973,16 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
IDirect3DRMFace_Release(face);
IDirect3DRMFaceArray_Release(array1);
}
@@ -993,7 +993,7 @@ static void test_Face(void)
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder3_Load(MeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder3_GetVertexCount(MeshBuilder3);
ok(icount == 4, "Wrong number of vertices %d (must be 4)\n", icount);
@@ -1007,29 +1007,29 @@ static void test_Face(void)
count = 4;
hr = IDirect3DRMMeshBuilder3_GetVertices(MeshBuilder3, 0, &count, v1);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(count == 4, "Wrong number of vertices %d (must be 4)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(count == 4, "Wrong number of vertices %ld (must be 4)\n", count);
hr = IDirect3DRMMeshBuilder3_GetNormals(MeshBuilder3, 0, &count, n1);
- ok(hr == D3DRM_OK, "Cannot get normals information (hr = %x)\n", hr);
- ok(count == 4, "Wrong number of normals %d (must be 4)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get normals information, hr %#lx\n", hr);
+ ok(count == 4, "Wrong number of normals %ld (must be 4)\n", count);
array1 = NULL;
hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 4, "count = %u\n", count);
+ ok(count == 4, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
hr = IDirect3DRMFace_GetVertices(face, &count, v2, n2);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(count == 3, "Wrong number of vertices %ld (must be 3)\n", count);
vector_eq(&v1[0], &v2[0]);
vector_eq(&v1[1], &v2[1]);
@@ -1045,14 +1045,14 @@ static void test_Face(void)
/* Setting face color. */
hr = IDirect3DRMFace2_SetColor(face2, 0x1f180587);
- ok(SUCCEEDED(hr), "Failed to set face color, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set face color, hr %#lx.\n", hr);
color = IDirect3DRMFace2_GetColor(face2);
- ok(color == 0x1f180587, "Unexpected color %8x.\n", color);
+ ok(color == 0x1f180587, "Unexpected color %8lx.\n", color);
hr = IDirect3DRMFace2_SetColorRGB(face2, 0.5f, 0.5f, 0.5f);
- ok(SUCCEEDED(hr), "Failed to set color, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set color, hr %#lx.\n", hr);
color = IDirect3DRMFace2_GetColor(face2);
- ok(color == 0xff7f7f7f, "Unexpected color %8x.\n", color);
+ ok(color == 0xff7f7f7f, "Unexpected color %8lx.\n", color);
IDirect3DRMFace2_Release(face2);
IDirect3DRMMeshBuilder3_Release(MeshBuilder3);
@@ -1084,11 +1084,11 @@ static void test_Frame(void)
D3DCOLOR color;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
ref = get_refcount((IUnknown *)d3drm);
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 1);
ref2 = get_refcount((IUnknown *)d3drm);
ok(ref2 > ref, "Expected d3drm object to be referenced.\n");
@@ -1097,93 +1097,93 @@ static void test_Frame(void)
test_object_name((IDirect3DRMObject *)pFrameC);
hr = IDirect3DRMFrame_GetParent(pFrameC, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameC, 1);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameC, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
ok(!!frame_array, "frame_array = %p\n", frame_array);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
/* GetParent with NULL pointer */
hr = IDirect3DRMFrame_GetParent(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
/* [Add/Delete]Child with NULL pointer */
hr = IDirect3DRMFrame_AddChild(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
/* Add child to first parent */
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameP1, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
CHECK_REFCOUNT(pFrameC, 2);
hr = IDirect3DRMFrame_GetScene(pFrameC, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(scene_frame);
hr = IDirect3DRMFrame_GetScene(pFrameP1, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(scene_frame);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
/* In some older version of d3drm, creating IDirect3DRMFrameArray object with GetChildren does not increment refcount of children frames */
ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
- "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
ok((get_refcount((IUnknown*)pFrameC) == 4) || broken(get_refcount((IUnknown*)pFrameC) == 3),
- "Invalid refcount. Expected 4 (or 3) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 4 (or 3) got %ld\n", get_refcount((IUnknown*)pFrameC));
IDirect3DRMFrame_Release(pFrameTmp);
ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
- "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
IDirect3DRMFrameArray_Release(frame_array);
CHECK_REFCOUNT(pFrameC, 2);
}
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(pFrameTmp);
@@ -1191,21 +1191,21 @@ static void test_Frame(void)
/* Add child to second parent */
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1213,31 +1213,31 @@ static void test_Frame(void)
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
CHECK_REFCOUNT(pFrameP2, 2);
IDirect3DRMFrame_Release(scene_frame);
hr = IDirect3DRMFrame_GetScene(pFrameP2, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
CHECK_REFCOUNT(pFrameP2, 2);
IDirect3DRMFrame_Release(scene_frame);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameP2, 2);
CHECK_REFCOUNT(pFrameC, 2);
@@ -1246,18 +1246,18 @@ static void test_Frame(void)
/* Add child again */
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1265,50 +1265,50 @@ static void test_Frame(void)
/* Delete child */
hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 1);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
/* Add two children */
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 2, "count = %u\n", count);
+ ok(count == 2, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 1, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1316,33 +1316,33 @@ static void test_Frame(void)
/* [Add/Delete]Visual with NULL pointer */
hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
/* Create Visual */
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
visual1 = (IDirect3DRMVisual *)mesh_builder;
/* Add Visual to first parent */
hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1);
- ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add visual, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
CHECK_REFCOUNT(visual1, 2);
visual_array = NULL;
hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &visual_array);
- ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get visuals, hr %#lx\n", hr);
if (visual_array)
{
count = IDirect3DRMVisualArray_GetSize(visual_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMVisualArray_GetElement(visual_array, 0, &visual_tmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(visual_tmp == visual1, "visual_tmp = %p\n", visual_tmp);
IDirect3DRMVisual_Release(visual_tmp);
IDirect3DRMVisualArray_Release(visual_array);
@@ -1350,38 +1350,38 @@ static void test_Frame(void)
/* Delete Visual */
hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1);
- ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete visual, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMMeshBuilder_Release(mesh_builder);
/* [Add/Delete]Light with NULL pointer */
hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
/* Create Light */
hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &light1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
/* Add Light to first parent */
hr = IDirect3DRMFrame_AddLight(pFrameP1, light1);
- ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add light, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
CHECK_REFCOUNT(light1, 2);
light_array = NULL;
hr = IDirect3DRMFrame_GetLights(pFrameP1, &light_array);
- ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get lights, hr %#lx\n", hr);
if (light_array)
{
count = IDirect3DRMLightArray_GetSize(light_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMLightArray_GetElement(light_array, 0, &light_tmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(light_tmp == light1, "light_tmp = %p\n", light_tmp);
IDirect3DRMLight_Release(light_tmp);
IDirect3DRMLightArray_Release(light_array);
@@ -1389,57 +1389,57 @@ static void test_Frame(void)
/* Delete Light */
hr = IDirect3DRMFrame_DeleteLight(pFrameP1, light1);
- ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete light, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMLight_Release(light1);
/* Test SceneBackground on first parent */
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff000000, "wrong color (%x)\n", color);
+ ok(color == 0xff000000, "wrong color %lx.\n", color);
hr = IDirect3DRMFrame_SetSceneBackground(pFrameP1, 0xff180587);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff180587, "wrong color (%x)\n", color);
+ ok(color == 0xff180587, "wrong color %lx.\n", color);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(pFrameP1, 0.5, 0.5, 0.5);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
/* Traversal options. */
hr = IDirect3DRMFrame_QueryInterface(pFrameP2, &IID_IDirect3DRMFrame3, (void **)&frame3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = 0;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#lx.\n", options);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0);
- ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000 | D3DRMFRAME_PICKENABLE);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = 0xf;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == 0, "Unexpected traversal options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == 0, "Unexpected traversal options %#lx.\n", options);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, D3DRMFRAME_PICKENABLE);
- ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#lx.\n", hr);
options = 0;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#lx.\n", options);
IDirect3DRMFrame3_Release(frame3);
@@ -1495,12 +1495,12 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
int i;
hr = Direct3DRMCreate(&d3drm);
- ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface (hr = %x).\n", test_idx, hr);
+ ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
- ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IUnknown_Release(unknown);
context.called = 0;
@@ -1508,33 +1508,33 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
context.obj = obj;
hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[2].callback = &destroy_callback;
corder[2].context = &context;
/* same callback added twice */
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[1].callback = &destroy_callback;
corder[1].context = &context;
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, NULL);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
/* add one more */
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[0].callback = &destroy_callback1;
corder[0].context = &context;
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE, hr %#lx.\n", test_idx, hr);
context.called = 0;
IDirect3DRMObject_Release(obj);
@@ -1549,30 +1549,30 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
/* test this pattern - add cb1, add cb2, add cb1, delete cb1 */
hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
- ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IUnknown_Release(unknown);
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[1].callback = &destroy_callback;
corder[1].context = &context;
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[0].callback = &destroy_callback1;
corder[0].context = &context;
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
context.called = 0;
hr = IDirect3DRMObject_QueryInterface(obj, &IID_IDirect3DRMObject, (void**)&context.obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IDirect3DRMObject_Release(context.obj);
IUnknown_Release(unknown);
ok(context.called == 2, "Test %u: got %d, expected 2.\n", test_idx, context.called);
@@ -1631,92 +1631,92 @@ static void test_object(void)
int i;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown);
- ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr);
+ ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#lx.\n", hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
unknown = (IUnknown *)0xdeadbeef;
hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
unknown = (IUnknown *)0xdeadbeef;
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
if (SUCCEEDED(hr))
{
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
/* test Add/Destroy callbacks */
test_destroy_callback(i, tests[i].clsid, tests[i].iid);
hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
hr = IDirect3DRM3_CreateObject(d3drm3, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
}
}
@@ -1754,35 +1754,35 @@ static void test_Viewport(void)
GetClientRect(window, &rc);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
initial_ref1 = get_refcount((IUnknown *)d3drm1);
initial_ref2 = get_refcount((IUnknown *)d3drm2);
initial_ref3 = get_refcount((IUnknown *)d3drm3);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &tmp_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
@@ -1791,233 +1791,233 @@ static void test_Viewport(void)
frame_ref = get_refcount((IUnknown *)frame);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, 0, 0, 0, 0, &viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
IDirect3DRMFrame_Release(d3drm_frame);
hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
IDirect3DRMFrame_Release(d3drm_frame);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, 0, 0, 0, 0, &viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
IDirect3DRMFrame_Release(d3drm_frame);
hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
IDirect3DRMFrame_Release(d3drm_frame);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
device_ref = get_refcount((IUnknown *)device3);
frame_ref2 = get_refcount((IUnknown *)frame3);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, 0, 0, 0, 0, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice3_Release(d3drm_device3);
hr = IDirect3DRMViewport2_SetCamera(viewport2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame3 == d3drm_frame3, "Expected frame returned = %p, got %p.\n", frame3, d3drm_frame3);
IDirect3DRMFrame3_Release(d3drm_frame3);
hr = IDirect3DRMViewport2_SetCamera(viewport2, tmp_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame3 == tmp_frame3, "Got unexpected frame %p, expected %p.\n", d3drm_frame3, tmp_frame3);
IDirect3DRMFrame3_Release(d3drm_frame3);
IDirect3DRMViewport2_Release(viewport2);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
/* Test all failures together */
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2029,28 +2029,28 @@ static void test_Viewport(void)
IDirect3DRMViewport_Release(viewport);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2062,28 +2062,28 @@ static void test_Viewport(void)
IDirect3DRMViewport2_Release(viewport2);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2094,14 +2094,14 @@ static void test_Viewport(void)
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
ok((IDirect3DRMObject*)viewport == obj, "got object pointer %p, expected %p\n", obj, viewport);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&obj2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
ok(obj == obj2, "got object pointer %p, expected %p\n", obj2, obj);
ok((IUnknown*)viewport != (IUnknown*)viewport2, "got viewport1 %p, viewport2 %p\n", viewport, viewport2);
@@ -2114,22 +2114,22 @@ static void test_Viewport(void)
/* AppData */
hr = IDirect3DRMViewport_SetAppData(viewport, 0);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 0);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 1);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 1);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
data = IDirect3DRMViewport2_GetAppData(viewport2);
- ok(data == 1, "got %x\n", data);
+ ok(data == 1, "got %lx\n", data);
IDirect3DRMViewport2_Release(viewport2);
IDirect3DRMViewport_Release(viewport);
@@ -2139,25 +2139,25 @@ static void test_Viewport(void)
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport,
(void **)&viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
left = right = bottom = top = 10.0f;
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2170,71 +2170,71 @@ static void test_Viewport(void)
ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_SetCamera(viewport, frame);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetPlane(viewport, -0.5f, 0.5f, -0.5f, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, 1.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetBack(viewport, 100.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_PERSPECTIVE);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
/* Test all failures together */
hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, NULL, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
device_ref = get_refcount((IUnknown *)device1);
frame_ref = get_refcount((IUnknown *)frame);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2247,7 +2247,7 @@ static void test_Viewport(void)
field = IDirect3DRMViewport_GetField(viewport);
ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2260,97 +2260,97 @@ static void test_Viewport(void)
ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_SetField(viewport, 1.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport_SetPlane(viewport, 5.0f, 3.0f, 2.0f, 0.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport_SetFront(viewport, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport_GetFront(viewport);
ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
hr = IDirect3DRMViewport_SetBack(viewport, 200.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
back = IDirect3DRMViewport_GetBack(viewport);
ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_ORTHOGRAPHIC);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
projection = IDirect3DRMViewport_GetProjection(viewport);
ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDevice(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport_GetFront(viewport);
hr = IDirect3DRMViewport_SetBack(viewport, front);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetBack(viewport, front / 2.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateObject(d3drm2, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport2,
(void **)&viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
left = right = bottom = top = 10.0f;
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2363,64 +2363,64 @@ static void test_Viewport(void)
ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetPlane(viewport2, -0.5f, 0.5f, -0.5f, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, 1.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_PERSPECTIVE);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
device_ref = get_refcount((IUnknown *)device3);
frame_ref2 = get_refcount((IUnknown *)frame3);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice3_Release(d3drm_device3);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2433,7 +2433,7 @@ static void test_Viewport(void)
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2446,103 +2446,103 @@ static void test_Viewport(void)
ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_SetField(viewport2, 1.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport2_SetPlane(viewport2, 5.0f, 3.0f, 2.0f, 0.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport2_SetFront(viewport2, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport2_GetFront(viewport2);
ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
hr = IDirect3DRMViewport2_SetBack(viewport2, 200.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
back = IDirect3DRMViewport2_GetBack(viewport2);
ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_ORTHOGRAPHIC);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
projection = IDirect3DRMViewport2_GetProjection(viewport2);
ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport2_GetFront(viewport2);
hr = IDirect3DRMViewport2_SetBack(viewport2, front);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetBack(viewport2, front / 2.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
IDirect3DRMViewport2_Release(viewport2);
ref4 = get_refcount((IUnknown *)d3drm1);
- todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
IDirect3DRMDevice3_Release(device3);
IDirect3DRMDevice_Release(device1);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
IDirect3DRMFrame3_Release(tmp_frame3);
IDirect3DRMFrame3_Release(frame3);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
IDirect3DRMFrame3_Release(tmp_frame1);
IDirect3DRMFrame_Release(frame);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
IDirectDrawClipper_Release(clipper);
IDirect3DRM3_Release(d3drm3);
@@ -2561,13 +2561,13 @@ static void test_Light(void)
D3DCOLOR color;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
hr = IDirect3DRMLight_QueryInterface(light, &IID_IDirect3DRMObject, (void **)&object);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
IDirect3DRMObject_Release(object);
test_class_name((IDirect3DRMObject *)light, "Light");
@@ -2577,38 +2577,38 @@ static void test_Light(void)
ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
hr = IDirect3DRMLight_SetType(light, D3DRMLIGHT_POINT);
- ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set type, hr %#lx\n", hr);
type = IDirect3DRMLight_GetType(light);
- ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type);
+ ok(type == D3DRMLIGHT_POINT, "wrong type %u.\n", type);
hr = IDirect3DRMLight_SetColor(light, 0xff180587);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff180587, "wrong color (%x)\n", color);
+ ok(color == 0xff180587, "wrong color %#lx.\n", color);
hr = IDirect3DRMLight_SetColor(light, 0x00c0c0c0);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+ ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
hr = IDirect3DRMLight_SetColorRGB(light, 0.5, 0.5, 0.5);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %#lx.\n", color);
IDirect3DRMLight_Release(light);
hr = IDirect3DRM_CreateLight(d3drm, D3DRMLIGHT_SPOT, 0x00c0c0c0, &light);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
type = IDirect3DRMLight_GetType(light);
ok(type == D3DRMLIGHT_SPOT, "Got unexpected type %#x.\n", type);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+ ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
IDirect3DRMLight_Release(light);
@@ -2624,17 +2624,17 @@ static void test_Material2(void)
D3DVALUE r, g, b;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMaterial(d3drm3, 18.5f, &material2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)material2, "Material");
test_object_name((IDirect3DRMObject *)material2);
@@ -2643,38 +2643,38 @@ static void test_Material2(void)
ok(r == 18.5f, "wrong power (%f)\n", r);
hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong emissive r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b);
hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong ambient r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
hr = IDirect3DRMMaterial2_SetPower(material2, 5.87f);
- ok(hr == D3DRM_OK, "Cannot set power (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set power, hr %#lx\n", hr);
r = IDirect3DRMMaterial2_GetPower(material2);
ok(r == 5.87f, "wrong power (%f)\n", r);
hr = IDirect3DRMMaterial2_SetEmissive(material2, 0.5f, 0.5f, 0.5f);
- ok(hr == D3DRM_OK, "Cannot set emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set emissive, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.5f && g == 0.5f && b == 0.5f, "wrong emissive r=%f g=%f b=%f, expected r=0.5 g=0.5 b=0.5\n", r, g, b);
hr = IDirect3DRMMaterial2_SetSpecular(material2, 0.6f, 0.6f, 0.6f);
- ok(hr == D3DRM_OK, "Cannot set specular (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set specular, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get specular (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get specular, hr %#lx\n", hr);
ok(r == 0.6f && g == 0.6f && b == 0.6f, "wrong specular r=%f g=%f b=%f, expected r=0.6 g=0.6 b=0.6\n", r, g, b);
hr = IDirect3DRMMaterial2_SetAmbient(material2, 0.7f, 0.7f, 0.7f);
- ok(hr == D3DRM_OK, "Cannot set ambient (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set ambient, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get ambient (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get ambient, hr %#lx\n", hr);
ok(r == 0.7f && g == 0.7f && b == 0.7f, "wrong ambient r=%f g=%f b=%f, expected r=0.7 g=0.7 b=0.7\n", r, g, b);
IDirect3DRMMaterial2_Release(material2);
@@ -2712,44 +2712,44 @@ static void test_Texture(void)
ULONG ref1, ref2, ref3, ref4;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
/* Test NULL params */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTexture(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
hr = IDirect3DRM_CreateTexture(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
/* Tests for validation of D3DRMIMAGE struct */
hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2758,11 +2758,11 @@ static void test_Texture(void)
testimg.palette = (void *)0xdeadbeef;
testimg.palette_size = 0x39;
hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2770,81 +2770,81 @@ static void test_Texture(void)
initimg.rgb = 0;
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture1, "Expected texture == NULL, got %p.\n", texture1);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture2, "Expected texture == NULL, got %p.\n", texture2);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture3, "Expected texture == NULL, got %p.\n", texture3);
initimg.rgb = 1;
initimg.red_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.red_mask = 0x000000ff;
initimg.green_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.green_mask = 0x0000ff00;
initimg.blue_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.blue_mask = 0x00ff0000;
initimg.buffer1 = NULL;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.buffer1 = &pixel;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
/* Created from image, GetSurface() does not work. */
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "GetSurface() expected to fail, %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &surface);
- ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "GetSurface() expected to fail, %#x\n", hr);
+ ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "Unexpected hr %#lx.\n", hr);
/* Test all failures together */
test_class_name((IDirect3DRMObject *)texture1, "Texture");
@@ -2860,11 +2860,11 @@ static void test_Texture(void)
IDirect3DRMTexture_Release(texture1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
@@ -2873,11 +2873,11 @@ static void test_Texture(void)
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -2886,11 +2886,11 @@ static void test_Texture(void)
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
/* InitFromImage tests */
/* Tests for validation of D3DRMIMAGE struct */
@@ -2899,14 +2899,14 @@ static void test_Texture(void)
testimg.palette_size = 0;
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2915,78 +2915,78 @@ static void test_Texture(void)
testimg.palette_size = 0x39;
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)texture2);
hr = IDirect3DRMTexture2_InitFromImage(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)texture2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)texture3);
hr = IDirect3DRMTexture3_InitFromImage(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)texture3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
initimg.rgb = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.rgb = 1;
initimg.red_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.red_mask = 0x000000ff;
initimg.green_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.green_mask = 0x0000ff00;
initimg.blue_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.blue_mask = 0x00ff0000;
initimg.buffer1 = NULL;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.buffer1 = &pixel;
d3drm_img = NULL;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
/* Release leaked reference to d3drm1 */
IDirect3DRM_Release(d3drm1);
@@ -2995,24 +2995,24 @@ static void test_Texture(void)
ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -3020,11 +3020,11 @@ static void test_Texture(void)
ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM2_Release(d3drm2);
@@ -3046,17 +3046,17 @@ static void test_Device(void)
GetClientRect(window, &rc);
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = DirectDrawCreateClipper(0, &pClipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)device, "Device");
test_object_name((IDirect3DRMObject *)device);
@@ -3064,7 +3064,7 @@ static void test_Device(void)
/* WinDevice */
if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (void **)&win_device)))
{
- win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRMWinDevice interface, hr %#lx, skipping tests\n", hr);
goto cleanup;
}
@@ -3089,13 +3089,13 @@ static void test_frame_transform(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3113,9 +3113,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3128,9 +3128,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_BEFORE, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3143,9 +3143,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_AFTER, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3154,7 +3154,7 @@ static void test_frame_transform(void)
add_matrix[3][3] = 2.0f;
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
frame_set_transform(frame,
2.0f, 0.0f, 0.0f, 0.0f,
@@ -3162,9 +3162,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_REPLACE, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3177,9 +3177,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_BEFORE, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3192,9 +3192,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_AFTER, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3207,9 +3207,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_REPLACE, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3222,9 +3222,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_BEFORE, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3237,9 +3237,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_AFTER, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3252,7 +3252,7 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
matrix_sanitise(matrix);
expect_matrix(matrix,
@@ -3267,9 +3267,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_BEFORE, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3283,9 +3283,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_AFTER, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3294,9 +3294,9 @@ static void test_frame_transform(void)
3.0f, -3.0f, 3.0f, 1.0f, 1);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 1.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3305,9 +3305,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 0.0f, 1.0f, 1);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3321,7 +3321,7 @@ static void test_frame_transform(void)
0.0f, 0.0f, 8.0f, 0.0f,
64.0f, 64.0f, 64.0f, 1.0f);
hr = IDirect3DRM_CreateFrame(d3drm, frame, &subframe);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
frame_set_transform(subframe,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3330,11 +3330,11 @@ static void test_frame_transform(void)
set_vector(&v1, 3.0f, 5.0f, 7.0f);
hr = IDirect3DRMFrame_Transform(frame, &v2, &v1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_vector(&v2, 70.0f, 84.0f, 120.0f, 1);
hr = IDirect3DRMFrame_Transform(subframe, &v2, &v1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_vector(&v2, 92.0f, 128.0f, 208.0f, 1);
IDirect3DRMFrame_Release(subframe);
@@ -3367,13 +3367,13 @@ static void test_d3drm_load(void)
const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial };
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
info.lpMemory = data_d3drm_load;
info.dSize = strlen(data_d3drm_load);
hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID **)req_refiids, 3, D3DRMLOAD_FROMMEMORY,
object_load_callback, (void *)0xdeadbeef, NULL, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load data, hr %#lx\n", hr);
ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects);
IDirect3DRM_Release(d3drm);
@@ -3391,23 +3391,23 @@ static void __cdecl object_load_callback_frame(IDirect3DRMObject *object, REFIID
char name[128];
hr = IDirect3DRMObject_QueryInterface(object, &IID_IDirect3DRMFrame, (void**)&frame);
- ok(hr == D3DRM_OK, "IDirect3DRMObject_QueryInterface returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetVisuals(frame, &array);
- ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetVisuals returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = IDirect3DRMVisualArray_GetSize(array);
- ok(size == 1, "Wrong size %u returned, expected 1\n", size);
+ ok(size == 1, "Wrong size %lu returned, expected 1\n", size);
hr = IDirect3DRMVisualArray_GetElement(array, 0, &visual);
- ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetElement returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMVisual_QueryInterface(visual, &IID_IDirect3DRMMeshBuilder, (void**)&mesh_builder);
- ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetSize returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(mesh_builder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, "mesh1"), "Wrong name %s, expected mesh1\n", name);
IDirect3DRMVisual_Release(visual);
@@ -3443,18 +3443,18 @@ static void test_frame_mesh_materials(void)
int i;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Direct3DRMCreate returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
info.lpMemory = data_frame_mesh_materials;
info.dSize = strlen(data_frame_mesh_materials);
hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback_frame, (void*)0xdeadbeef, NULL, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_CreateMesh(mesh_builder, &mesh);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_CreateMesh returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(size == 3, "Wrong size %u returned, expected 3\n", size);
+ ok(size == 3, "Unexpected count %lu.\n", size);
for (i = 0; i < size; i++)
{
@@ -3464,33 +3464,33 @@ static void test_frame_mesh_materials(void)
DWORD face_data_size;
hr = IDirect3DRMMesh_GetGroup(mesh, i, &vertex_count, &face_count, &vertex_per_face, &face_data_size, NULL);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroup returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(vertex_count == groups[i].vertex_count, "Group %d: Wrong vertex count %d, expected %d\n", i, vertex_count, groups[i].vertex_count);
ok(face_count == groups[i].face_count, "Group %d: Wrong face count %d; expected %d\n", i, face_count, groups[i].face_count);
ok(vertex_per_face == groups[i].vertex_per_face, "Group %d: Wrong vertex per face %d, expected %d\n", i, vertex_per_face, groups[i].vertex_per_face);
- ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %d, expected %d\n", i, face_data_size, groups[i].face_data_size);
+ ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %ld, expected %d\n", i, face_data_size, groups[i].face_data_size);
color = IDirect3DRMMesh_GetGroupColor(mesh, i);
- ok(color == groups[i].color, "Group %d: Wrong color %x, expected %x\n", i, color, groups[i].color);
+ ok(color == groups[i].color, "Group %d: Wrong color %lx, expected %lx.\n", i, color, groups[i].color);
hr = IDirect3DRMMesh_GetGroupMaterial(mesh, i, &material);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupMaterial returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(material != NULL, "Group %d: No material\n", i);
power = IDirect3DRMMaterial_GetPower(material);
ok(power == groups[i].power, "Group %d: Wrong power %f, expected %f\n", i, power, groups[i].power);
hr = IDirect3DRMMaterial_GetSpecular(material, &red, &green, &blue);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetSpecular returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(red == groups[i].specular[0], "Group %d: Wrong specular red %f, expected %f\n", i, red, groups[i].specular[0]);
ok(green == groups[i].specular[1], "Group %d: Wrong specular green %f, pD3DRMexpected %f\n", i, green, groups[i].specular[1]);
ok(blue == groups[i].specular[2], "Group %d: Wrong specular blue %f, expected %f\n", i, blue, groups[i].specular[2]);
hr = IDirect3DRMMaterial_GetEmissive(material, &red, &green, &blue);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetEmissive returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(red == groups[i].emissive[0], "Group %d: Wrong emissive red %f, expected %f\n", i, red, groups[i].emissive[0]);
ok(green == groups[i].emissive[1], "Group %d: Wrong emissive green %f, expected %f\n", i, green, groups[i].emissive[1]);
ok(blue == groups[i].emissive[2], "Group %d: Wrong emissive blue %f, expected %f\n", i, blue, groups[i].emissive[2]);
hr = IDirect3DRMMesh_GetGroupTexture(mesh, i, &texture);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupTexture returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(!texture, "Group %d: Unexpected texture\n", i);
if (material)
@@ -3523,13 +3523,13 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
for (i = 0; i < entry_count; ++i)
{
hr = IUnknown_QueryInterface(base_iface, tests[i].iid, (void **)&iface1);
- ok(hr == tests[i].hr, "Got hr %#x for test \"%s\" %u.\n", hr, test_name, i);
+ ok(hr == tests[i].hr, "Got hr %#lx for test \"%s\" %u.\n", hr, test_name, i);
if (SUCCEEDED(hr))
{
for (j = 0; j < entry_count; ++j)
{
hr = IUnknown_QueryInterface(iface1, tests[j].iid, (void **)&iface2);
- ok(hr == tests[j].hr, "Got hr %#x for test \"%s\" %u, %u.\n", hr, test_name, i, j);
+ ok(hr == tests[j].hr, "Got hr %#lx for test \"%s\" %u, %u.\n", hr, test_name, i, j);
if (SUCCEEDED(hr))
{
expected_refcount = 0;
@@ -3538,7 +3538,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
if (IsEqualGUID(tests[i].refcount_iid, tests[j].refcount_iid))
++expected_refcount;
refcount = IUnknown_Release(iface2);
- ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n",
+ ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, %u, expected %lu.\n",
refcount, test_name, i, j, expected_refcount);
if (tests[i].vtable_iid && tests[j].vtable_iid && IsEqualGUID(tests[i].vtable_iid, tests[j].vtable_iid))
ok(iface1 == iface2,
@@ -3555,7 +3555,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
if (IsEqualGUID(refcount_iid, tests[i].refcount_iid))
++expected_refcount;
refcount = IUnknown_Release(iface1);
- ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n",
+ ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, expected %lu.\n",
refcount, test_name, i, expected_refcount);
}
}
@@ -3638,7 +3638,7 @@ static void test_d3drm_qi(void)
IDirect3DRM *d3drm;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, ARRAY_SIZE(tests));
@@ -3727,32 +3727,32 @@ static void test_frame_qi(void)
IUnknown *unknown;
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(hr == D3DRM_OK, "Failed to create frame1 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame1, hr %#lx\n", hr);
hr = IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1, hr %#lx\n", hr);
IDirect3DRMFrame_Release(frame1);
test_qi("frame1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateFrame(d3drm2, NULL, &frame2);
- ok(hr == D3DRM_OK, "Failed to create frame2 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame2, hr %#lx\n", hr);
hr = IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2, hr %#lx\n", hr);
IDirect3DRMFrame2_Release(frame2);
test_qi("frame2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(hr == D3DRM_OK, "Failed to create frame3 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame3, hr %#lx\n", hr);
hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3, hr %#lx\n", hr);
IDirect3DRMFrame3_Release(frame3);
test_qi("frame3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -3851,37 +3851,37 @@ static void test_device_qi(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice, hr %#lx\n", hr);
IDirect3DRMDevice_Release(device1);
test_qi("device1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2 (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2, hr %#lx\n", hr);
IDirect3DRMDevice2_Release(device2);
test_qi("device2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3 (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3, hr %#lx\n", hr);
IDirect3DRMDevice3_Release(device3);
test_qi("device3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -3930,60 +3930,60 @@ static void test_create_device_from_clipper1(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 0, 0, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, NULL, &driver, 300, 200, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, &device1);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -3994,37 +3994,37 @@ static void test_create_device_from_clipper1(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4035,37 +4035,37 @@ static void test_create_device_from_clipper1(void)
d3ddevice1 = NULL;
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
if (ds)
IDirectDrawSurface_Release(ds);
@@ -4101,66 +4101,66 @@ static void test_create_device_from_clipper2(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300, 200, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -4171,37 +4171,37 @@ static void test_create_device_from_clipper2(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Expected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4212,39 +4212,39 @@ static void test_create_device_from_clipper2(void)
d3ddevice2 = NULL;
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4280,70 +4280,70 @@ static void test_create_device_from_clipper3(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 0, 0, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300, 200, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, &device3);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice3, (void**)&d3ddevice3);
- ok(hr == S_OK, "got %x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IDirect3DDevice3_Release(d3ddevice3);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -4354,37 +4354,37 @@ static void test_create_device_from_clipper3(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4395,39 +4395,39 @@ static void test_create_device_from_clipper3(void)
d3ddevice2 = NULL;
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4457,16 +4457,16 @@ static void test_create_device_from_surface1(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
/* Create a surface and use it to create the retained mode device. */
@@ -4478,64 +4478,64 @@ static void test_create_device_from_surface1(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, NULL, &device1);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, NULL, surface, &device1);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice_Release(d3ddevice1);
@@ -4543,17 +4543,17 @@ static void test_create_device_from_surface1(void)
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4563,7 +4563,7 @@ static void test_create_device_from_surface1(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4573,23 +4573,23 @@ static void test_create_device_from_surface1(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4599,12 +4599,12 @@ static void test_create_device_from_surface1(void)
IDirect3DDevice_Release(d3ddevice1);
IDirect3DRMDevice_Release(device1);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
DestroyWindow(window);
@@ -4629,20 +4629,20 @@ static void test_create_device_from_surface2(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
/* Create a surface and use it to create the retained mode device. */
@@ -4654,66 +4654,66 @@ static void test_create_device_from_surface2(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, NULL, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, NULL, surface, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4721,20 +4721,20 @@ static void test_create_device_from_surface2(void)
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4744,7 +4744,7 @@ static void test_create_device_from_surface2(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4754,23 +4754,23 @@ static void test_create_device_from_surface2(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4780,12 +4780,12 @@ static void test_create_device_from_surface2(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice2_Release(device2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
@@ -4811,20 +4811,20 @@ static void test_create_device_from_surface3(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
/* Create a surface and use it to create the retained mode device. */
@@ -4836,66 +4836,66 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, NULL, 0, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, NULL, surface, 0, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4903,19 +4903,19 @@ static void test_create_device_from_surface3(void)
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
/* In version 3, d3drm will destroy all references of the depth surface it created internally. */
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x.\n", hr);
+ todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got hr %#lx.\n", hr);
if (SUCCEEDED(hr))
IDirectDrawSurface_Release(ds);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4925,7 +4925,7 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4935,23 +4935,23 @@ static void test_create_device_from_surface3(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4960,25 +4960,25 @@ static void test_create_device_from_surface3(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/* The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
/* What happens if we pass no flags and still attach our own depth surface? */
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4986,12 +4986,12 @@ static void test_create_device_from_surface3(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -5001,28 +5001,28 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* What happens if we don't pass D3DRMDEVICE_NOZBUFFER and still not attach our own depth surface? */
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x).\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
IDirectDrawSurface_Release(d3drm_surface);
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
@@ -5041,7 +5041,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -5051,7 +5051,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* We used to use EnumDevices() for this, but it seems
* D3DDEVICEDESC.dwDeviceZBufferBitDepth only has a very casual
@@ -5069,7 +5069,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
continue;
hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
if (FAILED(hr))
{
IDirectDrawSurface_Release(*ds);
@@ -5108,13 +5108,13 @@ static void test_create_device_from_d3d1(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d1);
/* Create the immediate mode device */
@@ -5129,83 +5129,83 @@ static void test_create_device_from_d3d1(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice1);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, NULL, d3ddevice1, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, NULL, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, &device1);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice2_Release(device2);
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5213,61 +5213,61 @@ static void test_create_device_from_d3d1(void)
IDirect3DDevice_Release(d3drm_d3ddevice1);
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice1);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d1);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref2);
while (IDirect3DDevice_Release(d3ddevice1) > device_ref2);
while (IDirect3D_Release(d3d1) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)temp_ddraw1);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D, (void **)&temp_d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
temp_d3ddevice1 = create_device1(temp_ddraw1, window, &surface);
hr = IDirect3DRMDevice_InitFromD3D(device1, temp_d3d1, temp_d3ddevice1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)temp_d3ddevice1);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d1);
- todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref2);
while (IDirect3DDevice_Release(temp_d3ddevice1) > 0);
@@ -5277,61 +5277,60 @@ static void test_create_device_from_d3d1(void)
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice2_Release(device2);
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice3_Release(device3);
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n",
d3ddevice1, d3drm_d3ddevice1);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps got %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5339,12 +5338,12 @@ static void test_create_device_from_d3d1(void)
IDirect3DDevice_Release(d3drm_d3ddevice1);
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1,
+ todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1,
d3d_ref2);
IDirect3DRM_Release(d3drm1);
@@ -5367,7 +5366,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
GetClientRect(window, &rc);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -5377,7 +5376,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
if (FAILED(hr))
@@ -5403,7 +5402,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
continue;
hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
if (FAILED(hr))
{
IDirectDrawSurface_Release(*ds);
@@ -5445,15 +5444,15 @@ static void test_create_device_from_d3d2(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d2);
/* Create the immediate mode device */
@@ -5469,74 +5468,74 @@ static void test_create_device_from_d3d2(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice2);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, NULL, d3ddevice2, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, NULL, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, &device2);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5544,94 +5543,94 @@ static void test_create_device_from_d3d2(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
{
hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, d3ddevice1);
- ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D(device2, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
IDirect3DRMDevice_Release(device1);
if (SUCCEEDED(hr))
{
IDirect3DRMDevice_Release(device1);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2,
(void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
}
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, NULL, d3ddevice2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice2);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d2);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
while (IDirect3D2_Release(d3d2) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
ref5 = get_refcount((IUnknown *)temp_d3d2);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, temp_d3d2, temp_d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d2);
- ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5643,44 +5642,43 @@ static void test_create_device_from_d3d2(void)
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5688,14 +5686,14 @@ static void test_create_device_from_d3d2(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
@@ -5728,15 +5726,15 @@ static void test_create_device_from_d3d3(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d2);
/* Create the immediate mode device */
@@ -5752,72 +5750,72 @@ static void test_create_device_from_d3d3(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice2);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, NULL, d3ddevice2, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, NULL, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, &device3);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5825,94 +5823,94 @@ static void test_create_device_from_d3d3(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
{
hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, d3ddevice1);
- ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D(device3, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
IDirect3DRMDevice_Release(device1);
if (SUCCEEDED(hr))
{
IDirect3DRMDevice_Release(device1);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3,
(void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
}
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, NULL, d3ddevice2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice2);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d2);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
while (IDirect3D2_Release(d3d2) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
ref5 = get_refcount((IUnknown *)temp_d3d2);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, temp_d3d2, temp_d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d2);
- ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5924,44 +5922,43 @@ static void test_create_device_from_d3d3(void)
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n",desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5969,14 +5966,14 @@ static void test_create_device_from_d3d3(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm1);
@@ -5994,13 +5991,13 @@ static void test_create_device_1(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, &device);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got hr %#lx.\n", hr);
ok(device == NULL, "Expected device returned == NULL, got %p.\n", device);
hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM_Release(d3drm);
}
@@ -6013,15 +6010,15 @@ static void test_create_device_2(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm);
@@ -6035,15 +6032,15 @@ static void test_create_device_3(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm);
@@ -6144,10 +6141,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
ok(img->rgb == TRUE, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
ok(img->bytes_per_line == w * 4, "Test %u: Got unexpected image bytes per line %u, expected %u.\n",
test_idx, img->bytes_per_line, w * 4);
- ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
- ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
- ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
- ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+ ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+ ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+ ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+ ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
ok(!img->palette_size, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size);
ok(!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
for (i = 0; i < h; ++i)
@@ -6171,10 +6168,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
ok(img->depth == 8, "Test %u: Got unexpected image depth %u.\n", test_idx, img->depth);
ok(!img->rgb, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
- ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
- ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
- ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
- ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+ ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+ ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+ ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+ ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
ok(!!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
if (!palettized)
{
@@ -6270,58 +6267,58 @@ static void test_load_texture(void)
};
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
/* Test all failures together. */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
ok(!texture1, "Got unexpected texture %p.\n", texture1);
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm1, "", &texture1);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture1, "Got unexpected texture %p.\n", texture1);
hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture2, "Got unexpected texture %p.\n", texture2);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_LoadTexture(d3drm2, "", &texture2);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture2, "Got unexpected texture %p.\n", texture2);
hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture3, "Got unexpected texture %p.\n", texture3);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm3, "", &texture3);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture3, "Got unexpected texture %p.\n", texture3);
hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized);
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
@@ -6329,56 +6326,56 @@ static void test_load_texture(void)
test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture, (void **)&texture1);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture2, (void **)&texture2);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture2_Release(texture2);
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
@@ -6386,24 +6383,24 @@ static void test_load_texture(void)
/* Test whether querying a version 1 texture from version 3 causes a
* change in the loading behavior. */
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#lx.\n", hr);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture3, (void **)&texture3);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
@@ -6504,34 +6501,34 @@ static void test_texture_qi(void)
BOOL check;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
filename = create_bitmap(1, 1, TRUE);
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture_QueryInterface(texture1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
test_qi("texture1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_QueryInterface(texture2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2 (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
test_qi("texture2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3 (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3, hr %#lx\n", hr);
IDirect3DRMTexture3_Release(texture3);
test_qi("texture3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6540,7 +6537,7 @@ static void test_texture_qi(void)
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
check = DeleteFileA(filename);
- ok(check, "Cannot delete image stored in %s (error = %d).\n", filename, GetLastError());
+ ok(check, "Cannot delete image stored in %s (error = %ld).\n", filename, GetLastError());
HeapFree(GetProcessHeap(), 0, filename);
}
@@ -6633,31 +6630,31 @@ static void test_viewport_qi(void)
};
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 640, 480, &device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, 640, 480, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport1);
test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, camera1, 0, 0, 640, 480, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport1);
test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6666,17 +6663,17 @@ static void test_viewport_qi(void)
IDirect3DRMFrame_Release(frame1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 640, 480, &device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, 640, 480, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport2);
test_qi("viewport2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6701,14 +6698,14 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface *surface, UINT x, UINT y)
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_Lock(surface, &rect, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL);
- ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to lock surface, hr %#lx.\n", hr);
if (FAILED(hr))
return 0xdeadbeef;
color = *((DWORD *)surface_desc.lpSurface) & 0x00ffffff;
hr = IDirectDrawSurface_Unlock(surface, NULL);
- ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#lx.\n", hr);
return color;
}
@@ -6724,7 +6721,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
GetClientRect(window, &rc);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -6734,7 +6731,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
if (FAILED(hr))
@@ -6760,7 +6757,7 @@ static void clear_depth_surface(IDirectDrawSurface *surface, DWORD value)
U5(fx).dwFillDepth = value;
hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx);
- ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
}
static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex_count, UINT offset, UINT len)
@@ -6774,7 +6771,7 @@ static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex
exec_data.dwInstructionOffset = offset;
exec_data.dwInstructionLength = len;
hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data);
- ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set execute data, hr %#lx.\n", hr);
}
static void emit_set_ts(void **ptr, D3DTRANSFORMSTATETYPE state, DWORD value)
@@ -6884,17 +6881,17 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
};
hr = IDirect3DDevice_CreateMatrix(device, &world_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, world_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_CreateMatrix(device, &view_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, view_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_CreateMatrix(device, &proj_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, proj_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
memset(&exec_desc, 0, sizeof(exec_desc));
exec_desc.dwSize = sizeof(exec_desc);
@@ -6903,10 +6900,10 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY;
hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL);
- ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#lx.\n", hr);
hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc);
- ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#lx.\n", hr);
memcpy(exec_desc.lpData, quad_strip, sizeof(quad_strip));
ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad_strip);
@@ -6927,14 +6924,14 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
inst_length -= sizeof(quad_strip);
hr = IDirect3DExecuteBuffer_Unlock(execute_buffer);
- ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#lx.\n", hr);
hr = IDirect3DDevice_BeginScene(device);
set_execute_data(execute_buffer, 4, sizeof(quad_strip), inst_length);
hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED);
- ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#lx.\n", hr);
hr = IDirect3DDevice_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
IDirect3DExecuteBuffer_Release(execute_buffer);
}
@@ -6961,87 +6958,87 @@ static void test_viewport_clear1(void)
GetClientRect(window, &rc);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = IDirectDraw_CreateClipper(ddraw, 0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, rc.right,
rc.bottom, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
/* Fetch immediate mode device and viewport */
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3d_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport1, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3d_device1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Clear uses the scene frame's background color. */
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
- ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+ ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(camera1, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(camera1);
- ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
CHECK_REFCOUNT(frame1, 1);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
CHECK_REFCOUNT(frame1, 1);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
- ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Fill the depth surface with a value lower than the quad's depth value. */
clear_depth_surface(ds, 0x7fff);
@@ -7049,38 +7046,38 @@ static void test_viewport_clear1(void)
/* Depth test passes here */
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Depth test fails here */
ret_color = get_surface_color(surface, 500, 400);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Check what happens if we release the depth surface that d3drm created, and clear the viewport */
hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
- ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
clear_depth_surface(ds, 0x7fff);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
IDirectDrawSurface_Release(ds);
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
ret_color = get_surface_color(surface, 500, 400);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
IDirect3DViewport_Release(d3d_viewport);
IDirectDrawSurface_Release(surface);
@@ -7115,29 +7112,29 @@ static void draw_quad2(IDirect3DDevice2 *device, IDirect3DViewport *viewport)
HRESULT hr;
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat);
- ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set world transform, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat);
- ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set view transform, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat);
- ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#lx.\n", hr);
hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport2, (void **)&viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2);
- ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#lx.\n", hr);
IDirect3DViewport2_Release(viewport2);
hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_TRUE);
- ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL);
- ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set the z function, hr %#lx.\n", hr);
hr = IDirect3DDevice2_BeginScene(device);
- ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to begin scene, hr %#lx.\n", hr);
hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, tquad, 4, 0);
- ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr);
hr = IDirect3DDevice2_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
}
static void test_viewport_clear2(void)
@@ -7165,156 +7162,156 @@ static void test_viewport_clear2(void)
GetClientRect(window, &rc);
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_SetCooperativeLevel(ddraw1, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = IDirectDraw_CreateClipper(ddraw1, 0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
rc.bottom, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
/* Fetch immediate mode device in order to access render target and test its color. */
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3d_device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Clear uses the scene frame's background color. */
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
ret_color = IDirect3DRMFrame3_GetSceneBackground(frame3);
- ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+ ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(camera3, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3);
- ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
CHECK_REFCOUNT(frame3, 1);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
CHECK_REFCOUNT(frame3, 1);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
/* d3drm seems to be calling BeginScene when Clear is called. */
hr = IDirect3DDevice2_BeginScene(d3d_device2);
- todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#x.\n", hr);
+ todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#lx.\n", hr);
hr = IDirect3DDevice2_EndScene(d3d_device2);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* We're using d3d to draw using IDirect3DDevice2 created from d3drm. */
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Without calling Configure, Clear doesn't work. */
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Fetch attached depth surface and see if viewport clears it if it's detached from the render target. */
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
clear_depth_surface(ds, 0x39);
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
- ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
clear_depth_surface(ds, 0x7fff);
/* This version of Clear still clears the depth surface even if it's deleted from the render target. */
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
ret_color = get_surface_color(surface, 500, 400);
- todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Remove old draw contents */
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
/* Clear with no flags */
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, 0);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
IDirect3DViewport_Release(d3d_viewport);
IDirectDrawSurface_Release(surface);
@@ -7325,28 +7322,28 @@ static void test_viewport_clear2(void)
/* Create device without depth surface attached */
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
d3d_device2 = create_device2_without_ds(ddraw2, window);
if (!d3d_device2)
goto cleanup;
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3d_device2, &device3);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
rc.bottom, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ZBUFFER);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DRMViewport2_Release(viewport2);
@@ -7389,22 +7386,22 @@ static void test_create_texture_from_surface(void)
RECT rc;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
/* Create a surface and use it to create a texture. */
memset(&desc, 0, sizeof(desc));
@@ -7415,82 +7412,82 @@ static void test_create_texture_from_surface(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface2, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* Test NULL params */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, surface, &texture1);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture_GetImage(texture1);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture_InitFromSurface(texture1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
IDirect3DRMTexture_Release(texture1);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, surface, &texture2);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture2_GetImage(texture2);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture2_InitFromSurface(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
IDirect3DRMTexture_Release(texture2);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, surface, &texture3);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture3_GetImage(texture3);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture3_InitFromSurface(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
- ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
ok(ds == surface, "Expected same surface back.\n");
IDirectDrawSurface_Release(ds);
/* Init already initialized texture with same surface. */
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
/* Init already initialized texture with different surface. */
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
- ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
ok(ds == surface, "Expected same surface back.\n");
IDirectDrawSurface_Release(ds);
@@ -7498,7 +7495,7 @@ static void test_create_texture_from_surface(void)
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7509,13 +7506,13 @@ static void test_create_texture_from_surface(void)
/* Create from image, initialize from surface. */
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7548,27 +7545,27 @@ static void test_animation(void)
D3DVECTOR v;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateAnimation(d3drm1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr 0x%08x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
CHECK_REFCOUNT(d3drm1, 1);
hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
- ok(SUCCEEDED(hr), "Failed to create animation hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
CHECK_REFCOUNT(d3drm1, 2);
test_class_name((IDirect3DRMObject *)animation, "Animation");
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMAnimation2, (void **)&animation2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr %#lx.\n", hr);
ok(animation != (void *)animation2, "Expected different interface pointer.\n");
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IDirect3DRMObject, (void **)&obj2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
ok(obj == obj2 && obj == (IDirect3DRMObject *)animation, "Unexpected object pointer.\n");
@@ -7577,35 +7574,35 @@ static void test_animation(void)
/* Set animated frame, get it back. */
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
- ok(SUCCEEDED(hr), "Failed to create a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create a frame, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
- ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame, 1);
hr = IDirect3DRMAnimation_SetFrame(animation, frame);
- ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame, 1);
hr = IDirect3DRMAnimation2_GetFrame(animation2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_GetFrame(animation2, &frame3);
- ok(SUCCEEDED(hr), "Failed to get the frame, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get the frame, hr %#lx.\n", hr);
ok(frame3 != (void *)frame, "Unexpected interface pointer.\n");
CHECK_REFCOUNT(frame, 2);
IDirect3DRMFrame3_Release(frame3);
hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
- ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&frame3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame3, 2);
hr = IDirect3DRMAnimation2_SetFrame(animation2, frame3);
- ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame3, 2);
IDirect3DRMFrame3_Release(frame3);
@@ -7614,70 +7611,70 @@ static void test_animation(void)
/* Animation options. */
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Undefined mask value */
hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Ambiguous mask */
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Mask contains undefined bits together with valid one. */
hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000 | D3DRMANIMATION_OPEN);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#x.\n", options);
+ ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, 0);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
/* Key management. */
hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 1.0f, 0.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
- ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 2.0f, 0.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 99.0f, 3.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 80.0f, 4.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
v.x = 1.0f;
v.y = 0.0f;
@@ -7686,20 +7683,20 @@ static void test_animation(void)
/* NULL quaternion pointer leads to a crash on Windows. */
hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
- ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 99.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
/* Relative order, keys are returned sorted by time. */
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7715,23 +7712,23 @@ static void test_animation(void)
for (i = 0; i < count; i++)
{
- ok(keys[i].dwSize == sizeof(*keys), "%u: unexpected dwSize value %u.\n", i, keys[i].dwSize);
+ ok(keys[i].dwSize == sizeof(*keys), "%lu: unexpected dwSize value %lu.\n", i, keys[i].dwSize);
todo_wine
{
switch (keys[i].dwKeyType)
{
case D3DRMANIMATION_ROTATEKEY:
- ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
case D3DRMANIMATION_POSITIONKEY:
- ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
case D3DRMANIMATION_SCALEKEY:
- ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
default:
- ok(0, "%u: unknown key type %d.\n", i, keys[i].dwKeyType);
+ ok(0, "%lu: unknown key type %ld.\n", i, keys[i].dwKeyType);
}
}
}
@@ -7739,86 +7736,86 @@ static void test_animation(void)
/* No keys in this range. */
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, NULL);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, keys);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 0.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 4, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 4, "Unexpected key count %lu.\n", count);
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
/* Time is 0-based. */
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, &count, NULL);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, 100.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
/* AddKey() tests. */
hr = IDirect3DRMAnimation2_AddKey(animation2, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key) - 1;
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key) + 1;
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key);
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
key.dvPositionKey.x = 8.0f;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(SUCCEEDED(hr), "Failed to add key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add key, hr %#lx.\n", hr);
/* Delete tests. */
hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
- ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
- ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, -1000.0f, 1000.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 9, "Unexpected key count %u.\n", count);
-
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
- ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[6].dwKeyType);
- ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[7].dwKeyType);
- ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[8].dwKeyType);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 9, "Unexpected key count %lu.\n", count);
+
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
+ ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[6].dwKeyType);
+ ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[7].dwKeyType);
+ ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[8].dwKeyType);
ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7831,27 +7828,27 @@ static void test_animation(void)
ok(keys[8].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[8].dvTime);
hr = IDirect3DRMAnimation_DeleteKey(animation, -100.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_DeleteKey(animation, 100.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
/* Only first Position keys are not removed. */
hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7861,12 +7858,12 @@ static void test_animation(void)
ok(keys[5].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[5].dvTime);
hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
count = 0;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 3, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 3, "Unexpected key count %lu.\n", count);
IDirect3DRMAnimation2_Release(animation2);
IDirect3DRMAnimation_Release(animation);
@@ -7950,26 +7947,26 @@ static void test_animation_qi(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
- ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
IDirect3DRMAnimation_Release(animation);
test_qi("animation_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateAnimation(d3drm3, &animation2);
- ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
IDirect3DRMAnimation2_Release(animation2);
test_qi("animation2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
@@ -7986,10 +7983,10 @@ static void test_wrap(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
- ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
test_class_name((IDirect3DRMObject *)wrap, "");
@@ -8072,13 +8069,13 @@ static void test_wrap_qi(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
- ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
hr = IDirect3DRMWrap_QueryInterface(wrap, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap, hr %#lx.\n", hr);
IDirect3DRMWrap_Release(wrap);
test_qi("wrap_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index 101a37e830d..1e8e6a83bee 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -236,7 +236,7 @@ static void ColorTest(void)
blue=0.55f;
expected_color=0xffcc4c8c;
got_color=D3DRMCreateColorRGB(red,green,blue);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/*___________D3DRMCreateColorRGBA________________________*/
red=0.1f;
@@ -245,7 +245,7 @@ static void ColorTest(void)
alpha=0.58f;
expected_color=0x931966b2;
got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/* if a component is <0 then, then one considers this component as 0. The following test proves this fact (test only with the red component). */
red=-0.88f;
@@ -254,7 +254,7 @@ static void ColorTest(void)
alpha=0.41f;
expected_color=0x68006699;
got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/* if a component is >1 then, then one considers this component as 1. The following test proves this fact (test only with the red component). */
red=2.37f;
@@ -263,7 +263,7 @@ static void ColorTest(void)
alpha=0.41f;
expected_color=0x68ff6699;
got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/*___________D3DRMColorGetAlpha_________________________*/
color=0x0e4921bf;
--
2.35.1
1
0
[PATCH 0/5] MR65: ntdll: More heap cleanup and RtlWalkHeap fixes.
by Rémi Bernon (ï¼ rbernon) 13 May '22
by Rémi Bernon (ï¼ rbernon) 13 May '22
13 May '22
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
v3: rebased
dlls/d3drm/tests/Makefile.in | 1 -
dlls/d3drm/tests/d3drm.c | 3117 +++++++++++++++++-----------------
dlls/d3drm/tests/vector.c | 8 +-
3 files changed, 1561 insertions(+), 1565 deletions(-)
diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in
index ec4a030e949..4b39989531c 100644
--- a/dlls/d3drm/tests/Makefile.in
+++ b/dlls/d3drm/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = d3drm.dll
IMPORTS = dxguid uuid d3drm ddraw user32
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 5e0acc14fcb..7b591958373 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -179,37 +179,37 @@ static void test_class_name_(unsigned int line, IDirect3DRMObject *object, const
HRESULT hr;
hr = IDirect3DRMObject_GetClassName(object, NULL, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetClassName(object, NULL, NULL);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
size = 0;
hr = IDirect3DRMObject_GetClassName(object, &size, NULL);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
size = size2 = !!*name;
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- ok_(__FILE__, line)(size == size2, "Got size %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == size2, "Got size %lu.\n", size);
size = sizeof(cname);
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
size = strlen(name) + 1;
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
size = strlen(name);
strcpy(cname, "XXX");
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, "XXX"), "Expected unchanged buffer, but got \"%s\".\n", cname);
}
@@ -221,70 +221,70 @@ static void test_object_name_(unsigned int line, IDirect3DRMObject *object)
DWORD size;
hr = IDirect3DRMObject_GetName(object, NULL, NULL);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, NULL, name);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected buffer contents, %#x.\n", name[0]);
/* Name is not set yet. */
size = 100;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
size = sizeof(name);
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0, "Unexpected name \"%s\".\n", name);
size = 0;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected name \"%s\".\n", name);
hr = IDirect3DRMObject_SetName(object, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMObject_SetName(object, "name");
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#lx.\n", hr);
size = 0;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
size = strlen("name") + 1;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(!strcmp(name, "name"), "Unexpected name \"%s\".\n", name);
size = 2;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 2, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 2, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0x1f, "Got unexpected name \"%s\".\n", name);
hr = IDirect3DRMObject_SetName(object, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#lx.\n", hr);
size = 1;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
size = 1;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0, "Got unexpected name \"%s\".\n", name);
}
@@ -454,31 +454,31 @@ static void test_MeshBuilder(void)
IUnknown *unk;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void **)&meshbuilder3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMMeshBuilder3, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
@@ -490,36 +490,36 @@ static void test_MeshBuilder(void)
info.lpMemory = data_bad_version;
info.dSize = strlen(data_bad_version);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
info.lpMemory = data_no_mesh;
info.dSize = strlen(data_no_mesh);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, "Object"), "Retrieved name '%s' instead of 'Object'\n", name);
size = strlen("Object"); /* No space for null character */
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, NULL);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
- ok(size == 0, "Size should be 0 instead of %u\n", size);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
+ ok(size == 0, "Size should be 0 instead of %lu.\n", size);
hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, "");
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, ""), "Retrieved name '%s' instead of ''\n", name);
val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
@@ -529,14 +529,14 @@ static void test_MeshBuilder(void)
ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, NULL, &val2, NULL, &val3, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
- ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2);
- ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
+ ok(val2 == 4, "Wrong number of normals %ld (must be 4)\n", val2);
+ ok(val3 == 22, "Wrong number of face data bytes %ld (must be 22)\n", val3);
/* Check that Load method generated default normals */
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
expect_vector(&n[0], 0.577350f, 0.577350f, 0.577350f, 32);
expect_vector(&n[1], -0.229416f, 0.688247f, 0.688247f, 32);
expect_vector(&n[2], -0.229416f, 0.688247f, 0.688247f, 32);
@@ -546,58 +546,58 @@ static void test_MeshBuilder(void)
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 2, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 3, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 4, &valu, &valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 0, valu, valv);
- ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 4, valu, valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 0.0f;
valv = 0.0f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
IDirect3DRMMeshBuilder_Release(pMeshBuilder);
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
/* No group in mesh when mesh builder is not loaded */
hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
- ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "CreateMesh failed returning hr %#lx.\n", hr);
if (hr == D3DRM_OK)
{
DWORD nb_groups;
nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(nb_groups == 0, "GetCroupCount returned %u\n", nb_groups);
+ ok(nb_groups == 0, "GetCroupCount returned %lu\n", nb_groups);
IDirect3DRMMesh_Release(mesh);
}
@@ -605,7 +605,7 @@ static void test_MeshBuilder(void)
info.lpMemory = data_full;
info.dSize = strlen(data_full);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
ok(val == 3, "Wrong number of vertices %d (must be 3)\n", val);
@@ -616,43 +616,43 @@ static void test_MeshBuilder(void)
/* Check no buffer size and too small buffer size errors */
val1 = 1; val2 = 3; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 1; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, NULL, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 3; val3 = 1;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, NULL, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 3; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
- ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
- ok(val3 == 8, "Wrong number of face data bytes %d (must be 8)\n", val3);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
+ ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+ ok(val3 == 8, "Wrong number of face data bytes %ld (must be 8)\n", val3);
expect_vector(&v[0], 0.1f, 0.2f, 0.3f, 32);
expect_vector(&v[1], 0.4f, 0.5f, 0.6f, 32);
expect_vector(&v[2], 0.7f, 0.8f, 0.9f, 32);
expect_vector(&n[0], 1.1f, 1.2f, 1.3f, 32);
expect_vector(&n[1], 1.4f, 1.5f, 1.6f, 32);
expect_vector(&n[2], 1.7f, 1.8f, 1.9f, 32);
- ok(f[0] == 3 , "Wrong component f[0] = %d (expected 3)\n", f[0]);
- ok(f[1] == 0 , "Wrong component f[1] = %d (expected 0)\n", f[1]);
- ok(f[2] == 0 , "Wrong component f[2] = %d (expected 0)\n", f[2]);
- ok(f[3] == 1 , "Wrong component f[3] = %d (expected 1)\n", f[3]);
- ok(f[4] == 1 , "Wrong component f[4] = %d (expected 1)\n", f[4]);
- ok(f[5] == 2 , "Wrong component f[5] = %d (expected 2)\n", f[5]);
- ok(f[6] == 2 , "Wrong component f[6] = %d (expected 2)\n", f[6]);
- ok(f[7] == 0 , "Wrong component f[7] = %d (expected 0)\n", f[7]);
+ ok(f[0] == 3 , "Wrong component f[0] = %ld (expected 3)\n", f[0]);
+ ok(f[1] == 0 , "Wrong component f[1] = %ld (expected 0)\n", f[1]);
+ ok(f[2] == 0 , "Wrong component f[2] = %ld (expected 0)\n", f[2]);
+ ok(f[3] == 1 , "Wrong component f[3] = %ld (expected 1)\n", f[3]);
+ ok(f[4] == 1 , "Wrong component f[4] = %ld (expected 1)\n", f[4]);
+ ok(f[5] == 2 , "Wrong component f[5] = %ld (expected 2)\n", f[5]);
+ ok(f[6] == 2 , "Wrong component f[6] = %ld (expected 2)\n", f[6]);
+ ok(f[7] == 0 , "Wrong component f[7] = %ld (expected 0)\n", f[7]);
hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
- ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
if (hr == D3DRM_OK)
{
DWORD nb_groups;
@@ -663,30 +663,30 @@ static void test_MeshBuilder(void)
D3DVALUE values[3];
nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups);
+ ok(nb_groups == 1, "GetCroupCount returned %lu.\n", nb_groups);
hr = IDirect3DRMMesh_GetGroup(mesh, 1, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
- ok(hr == D3DRMERR_BADVALUE, "GetCroup returned hr = %x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMesh_GetGroup(mesh, 0, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
- ok(hr == D3DRM_OK, "GetCroup failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(nb_vertices == 3, "Wrong number of vertices %u (must be 3)\n", nb_vertices);
ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces);
ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices);
- ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size);
+ ok(data_size == 3, "Wrong number of face data bytes %lu (must be 3)\n", data_size);
color = IDirect3DRMMesh_GetGroupColor(mesh, 0);
- ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00);
+ ok(color == 0xff00ff00, "Wrong color returned %#lx instead of %#x\n", color, 0xff00ff00);
hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture);
- ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(texture == NULL, "No texture should be present\n");
hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material);
- ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(material != NULL, "No material present\n");
hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);
- ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#lx.\n", hr);
ok(values[0] == 0.5f, "Got unexpected red component %.8e.\n", values[0]);
ok(values[1] == 0.5f, "Got unexpected green component %.8e.\n", values[1]);
ok(values[2] == 0.5f, "Got unexpected blue component %.8e.\n", values[2]);
hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]);
- ok(hr == D3DRM_OK, "Failed to get specular color, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to get specular color, hr %#lx.\n", hr);
ok(values[0] == 1.0f, "Got unexpected red component %.8e.\n", values[0]);
ok(values[1] == 0.0f, "Got unexpected green component %.8e.\n", values[1]);
ok(values[2] == 0.0f, "Got unexpected blue component %.8e.\n", values[2]);
@@ -698,12 +698,12 @@ static void test_MeshBuilder(void)
}
hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4);
- ok(hr == D3DRM_OK, "Scale failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Scale failed returning hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
- ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+ ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
expect_vector(&v[0], 0.1f * 2, 0.2f * 3, 0.3f * 4, 32);
expect_vector(&v[1], 0.4f * 2, 0.5f * 3, 0.6f * 4, 32);
@@ -730,17 +730,17 @@ static void test_MeshBuilder3(void)
D3DVALUE valu, valv;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &pMeshBuilder3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)pMeshBuilder3, "Builder");
test_object_name((IDirect3DRMObject *)pMeshBuilder3);
@@ -748,17 +748,17 @@ static void test_MeshBuilder3(void)
info.lpMemory = data_bad_version;
info.dSize = strlen(data_bad_version);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
info.lpMemory = data_no_mesh;
info.dSize = strlen(data_no_mesh);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
val = IDirect3DRMMeshBuilder3_GetVertexCount(pMeshBuilder3);
ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val);
@@ -767,48 +767,48 @@ static void test_MeshBuilder3(void)
ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
/* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 2, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 3, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 4, &valu, &valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 0, valu, valv);
- ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 4, valu, valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 0.0f;
valv = 0.0f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
@@ -825,20 +825,20 @@ static void test_Mesh(void)
IUnknown *unk;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateMesh(d3drm, &mesh);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)mesh, "Mesh");
test_object_name((IDirect3DRMObject *)mesh);
hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk);
hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk);
IDirect3DRMMesh_Release(mesh);
@@ -865,19 +865,19 @@ static void test_Face(void)
int icount;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFace(d3drm, &face1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
if (FAILED(hr))
{
- skip("Cannot get IDirect3DRMFace interface (hr = %x), skipping tests\n", hr);
+ skip("Cannot get IDirect3DRMFace interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRMFace_QueryInterface(face1, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
IDirect3DRMObject_Release(obj);
@@ -891,13 +891,13 @@ static void test_Face(void)
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2)))
{
- win_skip("Cannot get IDirect3DRM2 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM2 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM2_CreateMeshBuilder(d3drm2, &MeshBuilder2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
ok(!icount, "wrong FaceCount: %i\n", icount);
@@ -905,10 +905,10 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder2_CreateFace(MeshBuilder2, &face1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
todo_wine
@@ -917,16 +917,16 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
IDirect3DRMFace_Release(face);
IDirect3DRMFaceArray_Release(array1);
}
@@ -939,25 +939,25 @@ static void test_Face(void)
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &MeshBuilder3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3);
ok(!icount, "wrong FaceCount: %i\n", icount);
hr = IDirect3DRMMeshBuilder3_CreateFace(MeshBuilder3, &face2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMFace, (void **)&face1);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
IDirect3DRMFace_Release(face1);
@@ -973,16 +973,16 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
IDirect3DRMFace_Release(face);
IDirect3DRMFaceArray_Release(array1);
}
@@ -993,7 +993,7 @@ static void test_Face(void)
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder3_Load(MeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder3_GetVertexCount(MeshBuilder3);
ok(icount == 4, "Wrong number of vertices %d (must be 4)\n", icount);
@@ -1007,29 +1007,29 @@ static void test_Face(void)
count = 4;
hr = IDirect3DRMMeshBuilder3_GetVertices(MeshBuilder3, 0, &count, v1);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(count == 4, "Wrong number of vertices %d (must be 4)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(count == 4, "Wrong number of vertices %ld (must be 4)\n", count);
hr = IDirect3DRMMeshBuilder3_GetNormals(MeshBuilder3, 0, &count, n1);
- ok(hr == D3DRM_OK, "Cannot get normals information (hr = %x)\n", hr);
- ok(count == 4, "Wrong number of normals %d (must be 4)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get normals information, hr %#lx\n", hr);
+ ok(count == 4, "Wrong number of normals %ld (must be 4)\n", count);
array1 = NULL;
hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 4, "count = %u\n", count);
+ ok(count == 4, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
hr = IDirect3DRMFace_GetVertices(face, &count, v2, n2);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(count == 3, "Wrong number of vertices %ld (must be 3)\n", count);
vector_eq(&v1[0], &v2[0]);
vector_eq(&v1[1], &v2[1]);
@@ -1045,14 +1045,14 @@ static void test_Face(void)
/* Setting face color. */
hr = IDirect3DRMFace2_SetColor(face2, 0x1f180587);
- ok(SUCCEEDED(hr), "Failed to set face color, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set face color, hr %#lx.\n", hr);
color = IDirect3DRMFace2_GetColor(face2);
- ok(color == 0x1f180587, "Unexpected color %8x.\n", color);
+ ok(color == 0x1f180587, "Unexpected color %8lx.\n", color);
hr = IDirect3DRMFace2_SetColorRGB(face2, 0.5f, 0.5f, 0.5f);
- ok(SUCCEEDED(hr), "Failed to set color, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set color, hr %#lx.\n", hr);
color = IDirect3DRMFace2_GetColor(face2);
- ok(color == 0xff7f7f7f, "Unexpected color %8x.\n", color);
+ ok(color == 0xff7f7f7f, "Unexpected color %8lx.\n", color);
IDirect3DRMFace2_Release(face2);
IDirect3DRMMeshBuilder3_Release(MeshBuilder3);
@@ -1084,11 +1084,11 @@ static void test_Frame(void)
D3DCOLOR color;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
ref = get_refcount((IUnknown *)d3drm);
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 1);
ref2 = get_refcount((IUnknown *)d3drm);
ok(ref2 > ref, "Expected d3drm object to be referenced.\n");
@@ -1097,93 +1097,93 @@ static void test_Frame(void)
test_object_name((IDirect3DRMObject *)pFrameC);
hr = IDirect3DRMFrame_GetParent(pFrameC, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameC, 1);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameC, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
ok(!!frame_array, "frame_array = %p\n", frame_array);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
/* GetParent with NULL pointer */
hr = IDirect3DRMFrame_GetParent(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
/* [Add/Delete]Child with NULL pointer */
hr = IDirect3DRMFrame_AddChild(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
/* Add child to first parent */
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameP1, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
CHECK_REFCOUNT(pFrameC, 2);
hr = IDirect3DRMFrame_GetScene(pFrameC, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(scene_frame);
hr = IDirect3DRMFrame_GetScene(pFrameP1, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(scene_frame);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
/* In some older version of d3drm, creating IDirect3DRMFrameArray object with GetChildren does not increment refcount of children frames */
ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
- "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
ok((get_refcount((IUnknown*)pFrameC) == 4) || broken(get_refcount((IUnknown*)pFrameC) == 3),
- "Invalid refcount. Expected 4 (or 3) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 4 (or 3) got %ld\n", get_refcount((IUnknown*)pFrameC));
IDirect3DRMFrame_Release(pFrameTmp);
ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
- "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
IDirect3DRMFrameArray_Release(frame_array);
CHECK_REFCOUNT(pFrameC, 2);
}
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(pFrameTmp);
@@ -1191,21 +1191,21 @@ static void test_Frame(void)
/* Add child to second parent */
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1213,31 +1213,31 @@ static void test_Frame(void)
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
CHECK_REFCOUNT(pFrameP2, 2);
IDirect3DRMFrame_Release(scene_frame);
hr = IDirect3DRMFrame_GetScene(pFrameP2, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
CHECK_REFCOUNT(pFrameP2, 2);
IDirect3DRMFrame_Release(scene_frame);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameP2, 2);
CHECK_REFCOUNT(pFrameC, 2);
@@ -1246,18 +1246,18 @@ static void test_Frame(void)
/* Add child again */
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1265,50 +1265,50 @@ static void test_Frame(void)
/* Delete child */
hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 1);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
/* Add two children */
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 2, "count = %u\n", count);
+ ok(count == 2, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 1, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1316,33 +1316,33 @@ static void test_Frame(void)
/* [Add/Delete]Visual with NULL pointer */
hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
/* Create Visual */
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
visual1 = (IDirect3DRMVisual *)mesh_builder;
/* Add Visual to first parent */
hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1);
- ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add visual, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
CHECK_REFCOUNT(visual1, 2);
visual_array = NULL;
hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &visual_array);
- ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get visuals, hr %#lx\n", hr);
if (visual_array)
{
count = IDirect3DRMVisualArray_GetSize(visual_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMVisualArray_GetElement(visual_array, 0, &visual_tmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(visual_tmp == visual1, "visual_tmp = %p\n", visual_tmp);
IDirect3DRMVisual_Release(visual_tmp);
IDirect3DRMVisualArray_Release(visual_array);
@@ -1350,38 +1350,38 @@ static void test_Frame(void)
/* Delete Visual */
hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1);
- ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete visual, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMMeshBuilder_Release(mesh_builder);
/* [Add/Delete]Light with NULL pointer */
hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
/* Create Light */
hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &light1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
/* Add Light to first parent */
hr = IDirect3DRMFrame_AddLight(pFrameP1, light1);
- ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add light, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
CHECK_REFCOUNT(light1, 2);
light_array = NULL;
hr = IDirect3DRMFrame_GetLights(pFrameP1, &light_array);
- ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get lights, hr %#lx\n", hr);
if (light_array)
{
count = IDirect3DRMLightArray_GetSize(light_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMLightArray_GetElement(light_array, 0, &light_tmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(light_tmp == light1, "light_tmp = %p\n", light_tmp);
IDirect3DRMLight_Release(light_tmp);
IDirect3DRMLightArray_Release(light_array);
@@ -1389,57 +1389,57 @@ static void test_Frame(void)
/* Delete Light */
hr = IDirect3DRMFrame_DeleteLight(pFrameP1, light1);
- ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete light, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMLight_Release(light1);
/* Test SceneBackground on first parent */
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff000000, "wrong color (%x)\n", color);
+ ok(color == 0xff000000, "wrong color %lx.\n", color);
hr = IDirect3DRMFrame_SetSceneBackground(pFrameP1, 0xff180587);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff180587, "wrong color (%x)\n", color);
+ ok(color == 0xff180587, "wrong color %lx.\n", color);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(pFrameP1, 0.5, 0.5, 0.5);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
/* Traversal options. */
hr = IDirect3DRMFrame_QueryInterface(pFrameP2, &IID_IDirect3DRMFrame3, (void **)&frame3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = 0;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#lx.\n", options);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0);
- ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000 | D3DRMFRAME_PICKENABLE);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = 0xf;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == 0, "Unexpected traversal options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == 0, "Unexpected traversal options %#lx.\n", options);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, D3DRMFRAME_PICKENABLE);
- ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#lx.\n", hr);
options = 0;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#lx.\n", options);
IDirect3DRMFrame3_Release(frame3);
@@ -1495,12 +1495,12 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
int i;
hr = Direct3DRMCreate(&d3drm);
- ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface (hr = %x).\n", test_idx, hr);
+ ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
- ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IUnknown_Release(unknown);
context.called = 0;
@@ -1508,33 +1508,33 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
context.obj = obj;
hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[2].callback = &destroy_callback;
corder[2].context = &context;
/* same callback added twice */
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[1].callback = &destroy_callback;
corder[1].context = &context;
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, NULL);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
/* add one more */
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[0].callback = &destroy_callback1;
corder[0].context = &context;
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE, hr %#lx.\n", test_idx, hr);
context.called = 0;
IDirect3DRMObject_Release(obj);
@@ -1549,30 +1549,30 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
/* test this pattern - add cb1, add cb2, add cb1, delete cb1 */
hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
- ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IUnknown_Release(unknown);
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[1].callback = &destroy_callback;
corder[1].context = &context;
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[0].callback = &destroy_callback1;
corder[0].context = &context;
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
context.called = 0;
hr = IDirect3DRMObject_QueryInterface(obj, &IID_IDirect3DRMObject, (void**)&context.obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IDirect3DRMObject_Release(context.obj);
IUnknown_Release(unknown);
ok(context.called == 2, "Test %u: got %d, expected 2.\n", test_idx, context.called);
@@ -1631,92 +1631,92 @@ static void test_object(void)
int i;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown);
- ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr);
+ ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#lx.\n", hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
unknown = (IUnknown *)0xdeadbeef;
hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
unknown = (IUnknown *)0xdeadbeef;
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
if (SUCCEEDED(hr))
{
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
/* test Add/Destroy callbacks */
test_destroy_callback(i, tests[i].clsid, tests[i].iid);
hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
hr = IDirect3DRM3_CreateObject(d3drm3, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
}
}
@@ -1754,35 +1754,35 @@ static void test_Viewport(void)
GetClientRect(window, &rc);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
initial_ref1 = get_refcount((IUnknown *)d3drm1);
initial_ref2 = get_refcount((IUnknown *)d3drm2);
initial_ref3 = get_refcount((IUnknown *)d3drm3);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &tmp_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
@@ -1791,233 +1791,233 @@ static void test_Viewport(void)
frame_ref = get_refcount((IUnknown *)frame);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, 0, 0, 0, 0, &viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
IDirect3DRMFrame_Release(d3drm_frame);
hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
IDirect3DRMFrame_Release(d3drm_frame);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, 0, 0, 0, 0, &viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
IDirect3DRMFrame_Release(d3drm_frame);
hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
IDirect3DRMFrame_Release(d3drm_frame);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
device_ref = get_refcount((IUnknown *)device3);
frame_ref2 = get_refcount((IUnknown *)frame3);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, 0, 0, 0, 0, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice3_Release(d3drm_device3);
hr = IDirect3DRMViewport2_SetCamera(viewport2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame3 == d3drm_frame3, "Expected frame returned = %p, got %p.\n", frame3, d3drm_frame3);
IDirect3DRMFrame3_Release(d3drm_frame3);
hr = IDirect3DRMViewport2_SetCamera(viewport2, tmp_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame3 == tmp_frame3, "Got unexpected frame %p, expected %p.\n", d3drm_frame3, tmp_frame3);
IDirect3DRMFrame3_Release(d3drm_frame3);
IDirect3DRMViewport2_Release(viewport2);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
/* Test all failures together */
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2029,28 +2029,28 @@ static void test_Viewport(void)
IDirect3DRMViewport_Release(viewport);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2062,28 +2062,28 @@ static void test_Viewport(void)
IDirect3DRMViewport2_Release(viewport2);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2094,14 +2094,14 @@ static void test_Viewport(void)
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
ok((IDirect3DRMObject*)viewport == obj, "got object pointer %p, expected %p\n", obj, viewport);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&obj2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
ok(obj == obj2, "got object pointer %p, expected %p\n", obj2, obj);
ok((IUnknown*)viewport != (IUnknown*)viewport2, "got viewport1 %p, viewport2 %p\n", viewport, viewport2);
@@ -2114,22 +2114,22 @@ static void test_Viewport(void)
/* AppData */
hr = IDirect3DRMViewport_SetAppData(viewport, 0);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 0);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 1);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 1);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
data = IDirect3DRMViewport2_GetAppData(viewport2);
- ok(data == 1, "got %x\n", data);
+ ok(data == 1, "got %lx\n", data);
IDirect3DRMViewport2_Release(viewport2);
IDirect3DRMViewport_Release(viewport);
@@ -2139,25 +2139,25 @@ static void test_Viewport(void)
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport,
(void **)&viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
left = right = bottom = top = 10.0f;
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2170,71 +2170,71 @@ static void test_Viewport(void)
ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_SetCamera(viewport, frame);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetPlane(viewport, -0.5f, 0.5f, -0.5f, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, 1.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetBack(viewport, 100.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_PERSPECTIVE);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
/* Test all failures together */
hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, NULL, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
device_ref = get_refcount((IUnknown *)device1);
frame_ref = get_refcount((IUnknown *)frame);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2247,7 +2247,7 @@ static void test_Viewport(void)
field = IDirect3DRMViewport_GetField(viewport);
ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2260,97 +2260,97 @@ static void test_Viewport(void)
ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_SetField(viewport, 1.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport_SetPlane(viewport, 5.0f, 3.0f, 2.0f, 0.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport_SetFront(viewport, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport_GetFront(viewport);
ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
hr = IDirect3DRMViewport_SetBack(viewport, 200.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
back = IDirect3DRMViewport_GetBack(viewport);
ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_ORTHOGRAPHIC);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
projection = IDirect3DRMViewport_GetProjection(viewport);
ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDevice(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport_GetFront(viewport);
hr = IDirect3DRMViewport_SetBack(viewport, front);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetBack(viewport, front / 2.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateObject(d3drm2, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport2,
(void **)&viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
left = right = bottom = top = 10.0f;
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2363,64 +2363,64 @@ static void test_Viewport(void)
ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetPlane(viewport2, -0.5f, 0.5f, -0.5f, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, 1.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_PERSPECTIVE);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
device_ref = get_refcount((IUnknown *)device3);
frame_ref2 = get_refcount((IUnknown *)frame3);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice3_Release(d3drm_device3);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2433,7 +2433,7 @@ static void test_Viewport(void)
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2446,103 +2446,103 @@ static void test_Viewport(void)
ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_SetField(viewport2, 1.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport2_SetPlane(viewport2, 5.0f, 3.0f, 2.0f, 0.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport2_SetFront(viewport2, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport2_GetFront(viewport2);
ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
hr = IDirect3DRMViewport2_SetBack(viewport2, 200.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
back = IDirect3DRMViewport2_GetBack(viewport2);
ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_ORTHOGRAPHIC);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
projection = IDirect3DRMViewport2_GetProjection(viewport2);
ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport2_GetFront(viewport2);
hr = IDirect3DRMViewport2_SetBack(viewport2, front);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetBack(viewport2, front / 2.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
IDirect3DRMViewport2_Release(viewport2);
ref4 = get_refcount((IUnknown *)d3drm1);
- todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
IDirect3DRMDevice3_Release(device3);
IDirect3DRMDevice_Release(device1);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
IDirect3DRMFrame3_Release(tmp_frame3);
IDirect3DRMFrame3_Release(frame3);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
IDirect3DRMFrame3_Release(tmp_frame1);
IDirect3DRMFrame_Release(frame);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
IDirectDrawClipper_Release(clipper);
IDirect3DRM3_Release(d3drm3);
@@ -2561,13 +2561,13 @@ static void test_Light(void)
D3DCOLOR color;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
hr = IDirect3DRMLight_QueryInterface(light, &IID_IDirect3DRMObject, (void **)&object);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
IDirect3DRMObject_Release(object);
test_class_name((IDirect3DRMObject *)light, "Light");
@@ -2577,38 +2577,38 @@ static void test_Light(void)
ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
hr = IDirect3DRMLight_SetType(light, D3DRMLIGHT_POINT);
- ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set type, hr %#lx\n", hr);
type = IDirect3DRMLight_GetType(light);
- ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type);
+ ok(type == D3DRMLIGHT_POINT, "wrong type %u.\n", type);
hr = IDirect3DRMLight_SetColor(light, 0xff180587);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff180587, "wrong color (%x)\n", color);
+ ok(color == 0xff180587, "wrong color %#lx.\n", color);
hr = IDirect3DRMLight_SetColor(light, 0x00c0c0c0);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+ ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
hr = IDirect3DRMLight_SetColorRGB(light, 0.5, 0.5, 0.5);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %#lx.\n", color);
IDirect3DRMLight_Release(light);
hr = IDirect3DRM_CreateLight(d3drm, D3DRMLIGHT_SPOT, 0x00c0c0c0, &light);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
type = IDirect3DRMLight_GetType(light);
ok(type == D3DRMLIGHT_SPOT, "Got unexpected type %#x.\n", type);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+ ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
IDirect3DRMLight_Release(light);
@@ -2624,17 +2624,17 @@ static void test_Material2(void)
D3DVALUE r, g, b;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMaterial(d3drm3, 18.5f, &material2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)material2, "Material");
test_object_name((IDirect3DRMObject *)material2);
@@ -2643,38 +2643,38 @@ static void test_Material2(void)
ok(r == 18.5f, "wrong power (%f)\n", r);
hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong emissive r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b);
hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong ambient r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
hr = IDirect3DRMMaterial2_SetPower(material2, 5.87f);
- ok(hr == D3DRM_OK, "Cannot set power (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set power, hr %#lx\n", hr);
r = IDirect3DRMMaterial2_GetPower(material2);
ok(r == 5.87f, "wrong power (%f)\n", r);
hr = IDirect3DRMMaterial2_SetEmissive(material2, 0.5f, 0.5f, 0.5f);
- ok(hr == D3DRM_OK, "Cannot set emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set emissive, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.5f && g == 0.5f && b == 0.5f, "wrong emissive r=%f g=%f b=%f, expected r=0.5 g=0.5 b=0.5\n", r, g, b);
hr = IDirect3DRMMaterial2_SetSpecular(material2, 0.6f, 0.6f, 0.6f);
- ok(hr == D3DRM_OK, "Cannot set specular (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set specular, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get specular (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get specular, hr %#lx\n", hr);
ok(r == 0.6f && g == 0.6f && b == 0.6f, "wrong specular r=%f g=%f b=%f, expected r=0.6 g=0.6 b=0.6\n", r, g, b);
hr = IDirect3DRMMaterial2_SetAmbient(material2, 0.7f, 0.7f, 0.7f);
- ok(hr == D3DRM_OK, "Cannot set ambient (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set ambient, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get ambient (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get ambient, hr %#lx\n", hr);
ok(r == 0.7f && g == 0.7f && b == 0.7f, "wrong ambient r=%f g=%f b=%f, expected r=0.7 g=0.7 b=0.7\n", r, g, b);
IDirect3DRMMaterial2_Release(material2);
@@ -2712,44 +2712,44 @@ static void test_Texture(void)
ULONG ref1, ref2, ref3, ref4;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
/* Test NULL params */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTexture(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
hr = IDirect3DRM_CreateTexture(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
/* Tests for validation of D3DRMIMAGE struct */
hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2758,11 +2758,11 @@ static void test_Texture(void)
testimg.palette = (void *)0xdeadbeef;
testimg.palette_size = 0x39;
hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2770,81 +2770,81 @@ static void test_Texture(void)
initimg.rgb = 0;
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture1, "Expected texture == NULL, got %p.\n", texture1);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture2, "Expected texture == NULL, got %p.\n", texture2);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture3, "Expected texture == NULL, got %p.\n", texture3);
initimg.rgb = 1;
initimg.red_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.red_mask = 0x000000ff;
initimg.green_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.green_mask = 0x0000ff00;
initimg.blue_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.blue_mask = 0x00ff0000;
initimg.buffer1 = NULL;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.buffer1 = &pixel;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
/* Created from image, GetSurface() does not work. */
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "GetSurface() expected to fail, %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &surface);
- ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "GetSurface() expected to fail, %#x\n", hr);
+ ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "Unexpected hr %#lx.\n", hr);
/* Test all failures together */
test_class_name((IDirect3DRMObject *)texture1, "Texture");
@@ -2860,11 +2860,11 @@ static void test_Texture(void)
IDirect3DRMTexture_Release(texture1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
@@ -2873,11 +2873,11 @@ static void test_Texture(void)
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -2886,11 +2886,11 @@ static void test_Texture(void)
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
/* InitFromImage tests */
/* Tests for validation of D3DRMIMAGE struct */
@@ -2899,14 +2899,14 @@ static void test_Texture(void)
testimg.palette_size = 0;
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2915,78 +2915,78 @@ static void test_Texture(void)
testimg.palette_size = 0x39;
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)texture2);
hr = IDirect3DRMTexture2_InitFromImage(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)texture2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)texture3);
hr = IDirect3DRMTexture3_InitFromImage(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)texture3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
initimg.rgb = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.rgb = 1;
initimg.red_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.red_mask = 0x000000ff;
initimg.green_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.green_mask = 0x0000ff00;
initimg.blue_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.blue_mask = 0x00ff0000;
initimg.buffer1 = NULL;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.buffer1 = &pixel;
d3drm_img = NULL;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
/* Release leaked reference to d3drm1 */
IDirect3DRM_Release(d3drm1);
@@ -2995,24 +2995,24 @@ static void test_Texture(void)
ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -3020,11 +3020,11 @@ static void test_Texture(void)
ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM2_Release(d3drm2);
@@ -3046,17 +3046,17 @@ static void test_Device(void)
GetClientRect(window, &rc);
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = DirectDrawCreateClipper(0, &pClipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)device, "Device");
test_object_name((IDirect3DRMObject *)device);
@@ -3064,7 +3064,7 @@ static void test_Device(void)
/* WinDevice */
if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (void **)&win_device)))
{
- win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRMWinDevice interface, hr %#lx, skipping tests\n", hr);
goto cleanup;
}
@@ -3089,13 +3089,13 @@ static void test_frame_transform(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3113,9 +3113,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3128,9 +3128,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_BEFORE, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3143,9 +3143,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_AFTER, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3154,7 +3154,7 @@ static void test_frame_transform(void)
add_matrix[3][3] = 2.0f;
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
frame_set_transform(frame,
2.0f, 0.0f, 0.0f, 0.0f,
@@ -3162,9 +3162,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_REPLACE, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3177,9 +3177,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_BEFORE, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3192,9 +3192,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_AFTER, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3207,9 +3207,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_REPLACE, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3222,9 +3222,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_BEFORE, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3237,9 +3237,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_AFTER, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3252,7 +3252,7 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
matrix_sanitise(matrix);
expect_matrix(matrix,
@@ -3267,9 +3267,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_BEFORE, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3283,9 +3283,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_AFTER, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3294,9 +3294,9 @@ static void test_frame_transform(void)
3.0f, -3.0f, 3.0f, 1.0f, 1);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 1.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3305,9 +3305,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 0.0f, 1.0f, 1);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3321,7 +3321,7 @@ static void test_frame_transform(void)
0.0f, 0.0f, 8.0f, 0.0f,
64.0f, 64.0f, 64.0f, 1.0f);
hr = IDirect3DRM_CreateFrame(d3drm, frame, &subframe);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
frame_set_transform(subframe,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3330,11 +3330,11 @@ static void test_frame_transform(void)
set_vector(&v1, 3.0f, 5.0f, 7.0f);
hr = IDirect3DRMFrame_Transform(frame, &v2, &v1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_vector(&v2, 70.0f, 84.0f, 120.0f, 1);
hr = IDirect3DRMFrame_Transform(subframe, &v2, &v1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_vector(&v2, 92.0f, 128.0f, 208.0f, 1);
IDirect3DRMFrame_Release(subframe);
@@ -3367,13 +3367,13 @@ static void test_d3drm_load(void)
const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial };
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
info.lpMemory = data_d3drm_load;
info.dSize = strlen(data_d3drm_load);
hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID **)req_refiids, 3, D3DRMLOAD_FROMMEMORY,
object_load_callback, (void *)0xdeadbeef, NULL, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load data, hr %#lx\n", hr);
ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects);
IDirect3DRM_Release(d3drm);
@@ -3391,23 +3391,23 @@ static void __cdecl object_load_callback_frame(IDirect3DRMObject *object, REFIID
char name[128];
hr = IDirect3DRMObject_QueryInterface(object, &IID_IDirect3DRMFrame, (void**)&frame);
- ok(hr == D3DRM_OK, "IDirect3DRMObject_QueryInterface returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetVisuals(frame, &array);
- ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetVisuals returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = IDirect3DRMVisualArray_GetSize(array);
- ok(size == 1, "Wrong size %u returned, expected 1\n", size);
+ ok(size == 1, "Wrong size %lu returned, expected 1\n", size);
hr = IDirect3DRMVisualArray_GetElement(array, 0, &visual);
- ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetElement returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMVisual_QueryInterface(visual, &IID_IDirect3DRMMeshBuilder, (void**)&mesh_builder);
- ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetSize returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(mesh_builder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, "mesh1"), "Wrong name %s, expected mesh1\n", name);
IDirect3DRMVisual_Release(visual);
@@ -3443,18 +3443,18 @@ static void test_frame_mesh_materials(void)
int i;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Direct3DRMCreate returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
info.lpMemory = data_frame_mesh_materials;
info.dSize = strlen(data_frame_mesh_materials);
hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback_frame, (void*)0xdeadbeef, NULL, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_CreateMesh(mesh_builder, &mesh);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_CreateMesh returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(size == 3, "Wrong size %u returned, expected 3\n", size);
+ ok(size == 3, "Unexpected count %lu.\n", size);
for (i = 0; i < size; i++)
{
@@ -3464,33 +3464,33 @@ static void test_frame_mesh_materials(void)
DWORD face_data_size;
hr = IDirect3DRMMesh_GetGroup(mesh, i, &vertex_count, &face_count, &vertex_per_face, &face_data_size, NULL);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroup returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(vertex_count == groups[i].vertex_count, "Group %d: Wrong vertex count %d, expected %d\n", i, vertex_count, groups[i].vertex_count);
ok(face_count == groups[i].face_count, "Group %d: Wrong face count %d; expected %d\n", i, face_count, groups[i].face_count);
ok(vertex_per_face == groups[i].vertex_per_face, "Group %d: Wrong vertex per face %d, expected %d\n", i, vertex_per_face, groups[i].vertex_per_face);
- ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %d, expected %d\n", i, face_data_size, groups[i].face_data_size);
+ ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %ld, expected %d\n", i, face_data_size, groups[i].face_data_size);
color = IDirect3DRMMesh_GetGroupColor(mesh, i);
- ok(color == groups[i].color, "Group %d: Wrong color %x, expected %x\n", i, color, groups[i].color);
+ ok(color == groups[i].color, "Group %d: Wrong color %lx, expected %lx.\n", i, color, groups[i].color);
hr = IDirect3DRMMesh_GetGroupMaterial(mesh, i, &material);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupMaterial returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(material != NULL, "Group %d: No material\n", i);
power = IDirect3DRMMaterial_GetPower(material);
ok(power == groups[i].power, "Group %d: Wrong power %f, expected %f\n", i, power, groups[i].power);
hr = IDirect3DRMMaterial_GetSpecular(material, &red, &green, &blue);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetSpecular returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(red == groups[i].specular[0], "Group %d: Wrong specular red %f, expected %f\n", i, red, groups[i].specular[0]);
ok(green == groups[i].specular[1], "Group %d: Wrong specular green %f, pD3DRMexpected %f\n", i, green, groups[i].specular[1]);
ok(blue == groups[i].specular[2], "Group %d: Wrong specular blue %f, expected %f\n", i, blue, groups[i].specular[2]);
hr = IDirect3DRMMaterial_GetEmissive(material, &red, &green, &blue);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetEmissive returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(red == groups[i].emissive[0], "Group %d: Wrong emissive red %f, expected %f\n", i, red, groups[i].emissive[0]);
ok(green == groups[i].emissive[1], "Group %d: Wrong emissive green %f, expected %f\n", i, green, groups[i].emissive[1]);
ok(blue == groups[i].emissive[2], "Group %d: Wrong emissive blue %f, expected %f\n", i, blue, groups[i].emissive[2]);
hr = IDirect3DRMMesh_GetGroupTexture(mesh, i, &texture);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupTexture returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(!texture, "Group %d: Unexpected texture\n", i);
if (material)
@@ -3523,13 +3523,13 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
for (i = 0; i < entry_count; ++i)
{
hr = IUnknown_QueryInterface(base_iface, tests[i].iid, (void **)&iface1);
- ok(hr == tests[i].hr, "Got hr %#x for test \"%s\" %u.\n", hr, test_name, i);
+ ok(hr == tests[i].hr, "Got hr %#lx for test \"%s\" %u.\n", hr, test_name, i);
if (SUCCEEDED(hr))
{
for (j = 0; j < entry_count; ++j)
{
hr = IUnknown_QueryInterface(iface1, tests[j].iid, (void **)&iface2);
- ok(hr == tests[j].hr, "Got hr %#x for test \"%s\" %u, %u.\n", hr, test_name, i, j);
+ ok(hr == tests[j].hr, "Got hr %#lx for test \"%s\" %u, %u.\n", hr, test_name, i, j);
if (SUCCEEDED(hr))
{
expected_refcount = 0;
@@ -3538,7 +3538,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
if (IsEqualGUID(tests[i].refcount_iid, tests[j].refcount_iid))
++expected_refcount;
refcount = IUnknown_Release(iface2);
- ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n",
+ ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, %u, expected %lu.\n",
refcount, test_name, i, j, expected_refcount);
if (tests[i].vtable_iid && tests[j].vtable_iid && IsEqualGUID(tests[i].vtable_iid, tests[j].vtable_iid))
ok(iface1 == iface2,
@@ -3555,7 +3555,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
if (IsEqualGUID(refcount_iid, tests[i].refcount_iid))
++expected_refcount;
refcount = IUnknown_Release(iface1);
- ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n",
+ ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, expected %lu.\n",
refcount, test_name, i, expected_refcount);
}
}
@@ -3638,7 +3638,7 @@ static void test_d3drm_qi(void)
IDirect3DRM *d3drm;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, ARRAY_SIZE(tests));
@@ -3727,32 +3727,32 @@ static void test_frame_qi(void)
IUnknown *unknown;
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(hr == D3DRM_OK, "Failed to create frame1 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame1, hr %#lx\n", hr);
hr = IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1, hr %#lx\n", hr);
IDirect3DRMFrame_Release(frame1);
test_qi("frame1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateFrame(d3drm2, NULL, &frame2);
- ok(hr == D3DRM_OK, "Failed to create frame2 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame2, hr %#lx\n", hr);
hr = IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2, hr %#lx\n", hr);
IDirect3DRMFrame2_Release(frame2);
test_qi("frame2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(hr == D3DRM_OK, "Failed to create frame3 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame3, hr %#lx\n", hr);
hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3, hr %#lx\n", hr);
IDirect3DRMFrame3_Release(frame3);
test_qi("frame3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -3851,37 +3851,37 @@ static void test_device_qi(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice, hr %#lx\n", hr);
IDirect3DRMDevice_Release(device1);
test_qi("device1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2 (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2, hr %#lx\n", hr);
IDirect3DRMDevice2_Release(device2);
test_qi("device2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3 (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3, hr %#lx\n", hr);
IDirect3DRMDevice3_Release(device3);
test_qi("device3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -3930,60 +3930,60 @@ static void test_create_device_from_clipper1(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 0, 0, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, NULL, &driver, 300, 200, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, &device1);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -3994,37 +3994,37 @@ static void test_create_device_from_clipper1(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4035,37 +4035,37 @@ static void test_create_device_from_clipper1(void)
d3ddevice1 = NULL;
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
if (ds)
IDirectDrawSurface_Release(ds);
@@ -4101,66 +4101,66 @@ static void test_create_device_from_clipper2(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300, 200, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -4171,37 +4171,37 @@ static void test_create_device_from_clipper2(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Expected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4212,39 +4212,39 @@ static void test_create_device_from_clipper2(void)
d3ddevice2 = NULL;
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4280,70 +4280,70 @@ static void test_create_device_from_clipper3(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 0, 0, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300, 200, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, &device3);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice3, (void**)&d3ddevice3);
- ok(hr == S_OK, "got %x.\n", hr);
+ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IDirect3DDevice3_Release(d3ddevice3);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -4354,37 +4354,37 @@ static void test_create_device_from_clipper3(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4395,39 +4395,39 @@ static void test_create_device_from_clipper3(void)
d3ddevice2 = NULL;
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4457,16 +4457,16 @@ static void test_create_device_from_surface1(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
/* Create a surface and use it to create the retained mode device. */
@@ -4478,64 +4478,64 @@ static void test_create_device_from_surface1(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, NULL, &device1);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, NULL, surface, &device1);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice_Release(d3ddevice1);
@@ -4543,17 +4543,17 @@ static void test_create_device_from_surface1(void)
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4563,7 +4563,7 @@ static void test_create_device_from_surface1(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4573,23 +4573,23 @@ static void test_create_device_from_surface1(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4599,12 +4599,12 @@ static void test_create_device_from_surface1(void)
IDirect3DDevice_Release(d3ddevice1);
IDirect3DRMDevice_Release(device1);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
DestroyWindow(window);
@@ -4629,20 +4629,20 @@ static void test_create_device_from_surface2(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
/* Create a surface and use it to create the retained mode device. */
@@ -4654,66 +4654,66 @@ static void test_create_device_from_surface2(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, NULL, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, NULL, surface, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4721,20 +4721,20 @@ static void test_create_device_from_surface2(void)
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4744,7 +4744,7 @@ static void test_create_device_from_surface2(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4754,23 +4754,23 @@ static void test_create_device_from_surface2(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4780,12 +4780,12 @@ static void test_create_device_from_surface2(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice2_Release(device2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
@@ -4811,20 +4811,20 @@ static void test_create_device_from_surface3(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
/* Create a surface and use it to create the retained mode device. */
@@ -4836,66 +4836,66 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, NULL, 0, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, NULL, surface, 0, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4903,19 +4903,19 @@ static void test_create_device_from_surface3(void)
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
/* In version 3, d3drm will destroy all references of the depth surface it created internally. */
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x.\n", hr);
+ todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got hr %#lx.\n", hr);
if (SUCCEEDED(hr))
IDirectDrawSurface_Release(ds);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4925,7 +4925,7 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4935,23 +4935,23 @@ static void test_create_device_from_surface3(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4960,25 +4960,25 @@ static void test_create_device_from_surface3(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/* The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
/* What happens if we pass no flags and still attach our own depth surface? */
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4986,12 +4986,12 @@ static void test_create_device_from_surface3(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -5001,28 +5001,28 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* What happens if we don't pass D3DRMDEVICE_NOZBUFFER and still not attach our own depth surface? */
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x).\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
IDirectDrawSurface_Release(d3drm_surface);
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
@@ -5041,7 +5041,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -5051,7 +5051,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* We used to use EnumDevices() for this, but it seems
* D3DDEVICEDESC.dwDeviceZBufferBitDepth only has a very casual
@@ -5069,7 +5069,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
continue;
hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
if (FAILED(hr))
{
IDirectDrawSurface_Release(*ds);
@@ -5108,13 +5108,13 @@ static void test_create_device_from_d3d1(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d1);
/* Create the immediate mode device */
@@ -5129,83 +5129,83 @@ static void test_create_device_from_d3d1(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice1);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, NULL, d3ddevice1, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, NULL, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, &device1);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice2_Release(device2);
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5213,61 +5213,61 @@ static void test_create_device_from_d3d1(void)
IDirect3DDevice_Release(d3drm_d3ddevice1);
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice1);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d1);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref2);
while (IDirect3DDevice_Release(d3ddevice1) > device_ref2);
while (IDirect3D_Release(d3d1) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)temp_ddraw1);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D, (void **)&temp_d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
temp_d3ddevice1 = create_device1(temp_ddraw1, window, &surface);
hr = IDirect3DRMDevice_InitFromD3D(device1, temp_d3d1, temp_d3ddevice1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)temp_d3ddevice1);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d1);
- todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref2);
while (IDirect3DDevice_Release(temp_d3ddevice1) > 0);
@@ -5277,61 +5277,60 @@ static void test_create_device_from_d3d1(void)
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice2_Release(device2);
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice3_Release(device3);
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n",
d3ddevice1, d3drm_d3ddevice1);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps got %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5339,12 +5338,12 @@ static void test_create_device_from_d3d1(void)
IDirect3DDevice_Release(d3drm_d3ddevice1);
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1,
+ todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1,
d3d_ref2);
IDirect3DRM_Release(d3drm1);
@@ -5367,7 +5366,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
GetClientRect(window, &rc);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -5377,7 +5376,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
if (FAILED(hr))
@@ -5403,7 +5402,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
continue;
hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
if (FAILED(hr))
{
IDirectDrawSurface_Release(*ds);
@@ -5445,15 +5444,15 @@ static void test_create_device_from_d3d2(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d2);
/* Create the immediate mode device */
@@ -5469,74 +5468,74 @@ static void test_create_device_from_d3d2(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice2);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, NULL, d3ddevice2, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, NULL, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, &device2);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5544,94 +5543,94 @@ static void test_create_device_from_d3d2(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
{
hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, d3ddevice1);
- ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D(device2, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
IDirect3DRMDevice_Release(device1);
if (SUCCEEDED(hr))
{
IDirect3DRMDevice_Release(device1);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2,
(void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
}
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, NULL, d3ddevice2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice2);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d2);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
while (IDirect3D2_Release(d3d2) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
ref5 = get_refcount((IUnknown *)temp_d3d2);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, temp_d3d2, temp_d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d2);
- ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5643,44 +5642,43 @@ static void test_create_device_from_d3d2(void)
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5688,14 +5686,14 @@ static void test_create_device_from_d3d2(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
@@ -5728,15 +5726,15 @@ static void test_create_device_from_d3d3(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d2);
/* Create the immediate mode device */
@@ -5752,72 +5750,72 @@ static void test_create_device_from_d3d3(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice2);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, NULL, d3ddevice2, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, NULL, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, &device3);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5825,94 +5823,94 @@ static void test_create_device_from_d3d3(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
{
hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, d3ddevice1);
- ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D(device3, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
IDirect3DRMDevice_Release(device1);
if (SUCCEEDED(hr))
{
IDirect3DRMDevice_Release(device1);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3,
(void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
}
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, NULL, d3ddevice2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice2);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d2);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
while (IDirect3D2_Release(d3d2) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
ref5 = get_refcount((IUnknown *)temp_d3d2);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, temp_d3d2, temp_d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d2);
- ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5924,44 +5922,43 @@ static void test_create_device_from_d3d3(void)
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n",desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5969,14 +5966,14 @@ static void test_create_device_from_d3d3(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm1);
@@ -5994,13 +5991,13 @@ static void test_create_device_1(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, &device);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got hr %#lx.\n", hr);
ok(device == NULL, "Expected device returned == NULL, got %p.\n", device);
hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM_Release(d3drm);
}
@@ -6013,15 +6010,15 @@ static void test_create_device_2(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm);
@@ -6035,15 +6032,15 @@ static void test_create_device_3(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm);
@@ -6144,10 +6141,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
ok(img->rgb == TRUE, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
ok(img->bytes_per_line == w * 4, "Test %u: Got unexpected image bytes per line %u, expected %u.\n",
test_idx, img->bytes_per_line, w * 4);
- ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
- ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
- ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
- ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+ ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+ ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+ ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+ ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
ok(!img->palette_size, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size);
ok(!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
for (i = 0; i < h; ++i)
@@ -6171,10 +6168,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
ok(img->depth == 8, "Test %u: Got unexpected image depth %u.\n", test_idx, img->depth);
ok(!img->rgb, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
- ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
- ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
- ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
- ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+ ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+ ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+ ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+ ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
ok(!!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
if (!palettized)
{
@@ -6270,58 +6267,58 @@ static void test_load_texture(void)
};
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
/* Test all failures together. */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
ok(!texture1, "Got unexpected texture %p.\n", texture1);
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm1, "", &texture1);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture1, "Got unexpected texture %p.\n", texture1);
hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture2, "Got unexpected texture %p.\n", texture2);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_LoadTexture(d3drm2, "", &texture2);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture2, "Got unexpected texture %p.\n", texture2);
hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture3, "Got unexpected texture %p.\n", texture3);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm3, "", &texture3);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture3, "Got unexpected texture %p.\n", texture3);
hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized);
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
@@ -6329,56 +6326,56 @@ static void test_load_texture(void)
test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture, (void **)&texture1);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture2, (void **)&texture2);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture2_Release(texture2);
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
@@ -6386,24 +6383,24 @@ static void test_load_texture(void)
/* Test whether querying a version 1 texture from version 3 causes a
* change in the loading behavior. */
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#lx.\n", hr);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture3, (void **)&texture3);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
@@ -6504,34 +6501,34 @@ static void test_texture_qi(void)
BOOL check;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
filename = create_bitmap(1, 1, TRUE);
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture_QueryInterface(texture1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
test_qi("texture1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_QueryInterface(texture2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2 (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
test_qi("texture2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3 (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3, hr %#lx\n", hr);
IDirect3DRMTexture3_Release(texture3);
test_qi("texture3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6540,7 +6537,7 @@ static void test_texture_qi(void)
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
check = DeleteFileA(filename);
- ok(check, "Cannot delete image stored in %s (error = %d).\n", filename, GetLastError());
+ ok(check, "Cannot delete image stored in %s (error = %ld).\n", filename, GetLastError());
HeapFree(GetProcessHeap(), 0, filename);
}
@@ -6633,31 +6630,31 @@ static void test_viewport_qi(void)
};
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 640, 480, &device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, 640, 480, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport1);
test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, camera1, 0, 0, 640, 480, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport1);
test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6666,17 +6663,17 @@ static void test_viewport_qi(void)
IDirect3DRMFrame_Release(frame1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 640, 480, &device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, 640, 480, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport2);
test_qi("viewport2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6701,14 +6698,14 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface *surface, UINT x, UINT y)
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_Lock(surface, &rect, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL);
- ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to lock surface, hr %#lx.\n", hr);
if (FAILED(hr))
return 0xdeadbeef;
color = *((DWORD *)surface_desc.lpSurface) & 0x00ffffff;
hr = IDirectDrawSurface_Unlock(surface, NULL);
- ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#lx.\n", hr);
return color;
}
@@ -6724,7 +6721,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
GetClientRect(window, &rc);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -6734,7 +6731,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
if (FAILED(hr))
@@ -6760,7 +6757,7 @@ static void clear_depth_surface(IDirectDrawSurface *surface, DWORD value)
U5(fx).dwFillDepth = value;
hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx);
- ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
}
static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex_count, UINT offset, UINT len)
@@ -6774,7 +6771,7 @@ static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex
exec_data.dwInstructionOffset = offset;
exec_data.dwInstructionLength = len;
hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data);
- ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set execute data, hr %#lx.\n", hr);
}
static void emit_set_ts(void **ptr, D3DTRANSFORMSTATETYPE state, DWORD value)
@@ -6884,17 +6881,17 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
};
hr = IDirect3DDevice_CreateMatrix(device, &world_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, world_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_CreateMatrix(device, &view_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, view_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_CreateMatrix(device, &proj_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, proj_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
memset(&exec_desc, 0, sizeof(exec_desc));
exec_desc.dwSize = sizeof(exec_desc);
@@ -6903,10 +6900,10 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY;
hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL);
- ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#lx.\n", hr);
hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc);
- ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#lx.\n", hr);
memcpy(exec_desc.lpData, quad_strip, sizeof(quad_strip));
ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad_strip);
@@ -6927,14 +6924,14 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
inst_length -= sizeof(quad_strip);
hr = IDirect3DExecuteBuffer_Unlock(execute_buffer);
- ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#lx.\n", hr);
hr = IDirect3DDevice_BeginScene(device);
set_execute_data(execute_buffer, 4, sizeof(quad_strip), inst_length);
hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED);
- ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#lx.\n", hr);
hr = IDirect3DDevice_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
IDirect3DExecuteBuffer_Release(execute_buffer);
}
@@ -6961,87 +6958,87 @@ static void test_viewport_clear1(void)
GetClientRect(window, &rc);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = IDirectDraw_CreateClipper(ddraw, 0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, rc.right,
rc.bottom, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
/* Fetch immediate mode device and viewport */
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3d_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport1, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3d_device1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Clear uses the scene frame's background color. */
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
- ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+ ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(camera1, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(camera1);
- ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
CHECK_REFCOUNT(frame1, 1);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
CHECK_REFCOUNT(frame1, 1);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
- ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Fill the depth surface with a value lower than the quad's depth value. */
clear_depth_surface(ds, 0x7fff);
@@ -7049,38 +7046,38 @@ static void test_viewport_clear1(void)
/* Depth test passes here */
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Depth test fails here */
ret_color = get_surface_color(surface, 500, 400);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Check what happens if we release the depth surface that d3drm created, and clear the viewport */
hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
- ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
clear_depth_surface(ds, 0x7fff);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
IDirectDrawSurface_Release(ds);
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
ret_color = get_surface_color(surface, 500, 400);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
IDirect3DViewport_Release(d3d_viewport);
IDirectDrawSurface_Release(surface);
@@ -7115,29 +7112,29 @@ static void draw_quad2(IDirect3DDevice2 *device, IDirect3DViewport *viewport)
HRESULT hr;
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat);
- ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set world transform, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat);
- ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set view transform, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat);
- ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#lx.\n", hr);
hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport2, (void **)&viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2);
- ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#lx.\n", hr);
IDirect3DViewport2_Release(viewport2);
hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_TRUE);
- ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL);
- ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set the z function, hr %#lx.\n", hr);
hr = IDirect3DDevice2_BeginScene(device);
- ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to begin scene, hr %#lx.\n", hr);
hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, tquad, 4, 0);
- ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr);
hr = IDirect3DDevice2_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
}
static void test_viewport_clear2(void)
@@ -7165,156 +7162,156 @@ static void test_viewport_clear2(void)
GetClientRect(window, &rc);
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_SetCooperativeLevel(ddraw1, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = IDirectDraw_CreateClipper(ddraw1, 0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
rc.bottom, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
/* Fetch immediate mode device in order to access render target and test its color. */
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3d_device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Clear uses the scene frame's background color. */
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
ret_color = IDirect3DRMFrame3_GetSceneBackground(frame3);
- ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+ ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(camera3, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3);
- ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
CHECK_REFCOUNT(frame3, 1);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
CHECK_REFCOUNT(frame3, 1);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
/* d3drm seems to be calling BeginScene when Clear is called. */
hr = IDirect3DDevice2_BeginScene(d3d_device2);
- todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#x.\n", hr);
+ todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#lx.\n", hr);
hr = IDirect3DDevice2_EndScene(d3d_device2);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* We're using d3d to draw using IDirect3DDevice2 created from d3drm. */
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Without calling Configure, Clear doesn't work. */
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Fetch attached depth surface and see if viewport clears it if it's detached from the render target. */
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
clear_depth_surface(ds, 0x39);
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
- ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
clear_depth_surface(ds, 0x7fff);
/* This version of Clear still clears the depth surface even if it's deleted from the render target. */
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
ret_color = get_surface_color(surface, 500, 400);
- todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Remove old draw contents */
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
/* Clear with no flags */
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, 0);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
IDirect3DViewport_Release(d3d_viewport);
IDirectDrawSurface_Release(surface);
@@ -7325,28 +7322,28 @@ static void test_viewport_clear2(void)
/* Create device without depth surface attached */
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
d3d_device2 = create_device2_without_ds(ddraw2, window);
if (!d3d_device2)
goto cleanup;
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3d_device2, &device3);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
rc.bottom, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ZBUFFER);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DRMViewport2_Release(viewport2);
@@ -7389,22 +7386,22 @@ static void test_create_texture_from_surface(void)
RECT rc;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
/* Create a surface and use it to create a texture. */
memset(&desc, 0, sizeof(desc));
@@ -7415,82 +7412,82 @@ static void test_create_texture_from_surface(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface2, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* Test NULL params */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, surface, &texture1);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture_GetImage(texture1);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture_InitFromSurface(texture1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
IDirect3DRMTexture_Release(texture1);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, surface, &texture2);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture2_GetImage(texture2);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture2_InitFromSurface(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
IDirect3DRMTexture_Release(texture2);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, surface, &texture3);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture3_GetImage(texture3);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture3_InitFromSurface(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
- ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
ok(ds == surface, "Expected same surface back.\n");
IDirectDrawSurface_Release(ds);
/* Init already initialized texture with same surface. */
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
/* Init already initialized texture with different surface. */
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
- ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
ok(ds == surface, "Expected same surface back.\n");
IDirectDrawSurface_Release(ds);
@@ -7498,7 +7495,7 @@ static void test_create_texture_from_surface(void)
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7509,13 +7506,13 @@ static void test_create_texture_from_surface(void)
/* Create from image, initialize from surface. */
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7548,27 +7545,27 @@ static void test_animation(void)
D3DVECTOR v;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateAnimation(d3drm1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr 0x%08x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
CHECK_REFCOUNT(d3drm1, 1);
hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
- ok(SUCCEEDED(hr), "Failed to create animation hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
CHECK_REFCOUNT(d3drm1, 2);
test_class_name((IDirect3DRMObject *)animation, "Animation");
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMAnimation2, (void **)&animation2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr %#lx.\n", hr);
ok(animation != (void *)animation2, "Expected different interface pointer.\n");
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IDirect3DRMObject, (void **)&obj2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
ok(obj == obj2 && obj == (IDirect3DRMObject *)animation, "Unexpected object pointer.\n");
@@ -7577,35 +7574,35 @@ static void test_animation(void)
/* Set animated frame, get it back. */
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
- ok(SUCCEEDED(hr), "Failed to create a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create a frame, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
- ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame, 1);
hr = IDirect3DRMAnimation_SetFrame(animation, frame);
- ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame, 1);
hr = IDirect3DRMAnimation2_GetFrame(animation2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_GetFrame(animation2, &frame3);
- ok(SUCCEEDED(hr), "Failed to get the frame, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get the frame, hr %#lx.\n", hr);
ok(frame3 != (void *)frame, "Unexpected interface pointer.\n");
CHECK_REFCOUNT(frame, 2);
IDirect3DRMFrame3_Release(frame3);
hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
- ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&frame3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame3, 2);
hr = IDirect3DRMAnimation2_SetFrame(animation2, frame3);
- ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame3, 2);
IDirect3DRMFrame3_Release(frame3);
@@ -7614,70 +7611,70 @@ static void test_animation(void)
/* Animation options. */
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Undefined mask value */
hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Ambiguous mask */
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Mask contains undefined bits together with valid one. */
hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000 | D3DRMANIMATION_OPEN);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#x.\n", options);
+ ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, 0);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
/* Key management. */
hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 1.0f, 0.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
- ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 2.0f, 0.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 99.0f, 3.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 80.0f, 4.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
v.x = 1.0f;
v.y = 0.0f;
@@ -7686,20 +7683,20 @@ static void test_animation(void)
/* NULL quaternion pointer leads to a crash on Windows. */
hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
- ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 99.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
/* Relative order, keys are returned sorted by time. */
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7715,23 +7712,23 @@ static void test_animation(void)
for (i = 0; i < count; i++)
{
- ok(keys[i].dwSize == sizeof(*keys), "%u: unexpected dwSize value %u.\n", i, keys[i].dwSize);
+ ok(keys[i].dwSize == sizeof(*keys), "%lu: unexpected dwSize value %lu.\n", i, keys[i].dwSize);
todo_wine
{
switch (keys[i].dwKeyType)
{
case D3DRMANIMATION_ROTATEKEY:
- ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
case D3DRMANIMATION_POSITIONKEY:
- ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
case D3DRMANIMATION_SCALEKEY:
- ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
default:
- ok(0, "%u: unknown key type %d.\n", i, keys[i].dwKeyType);
+ ok(0, "%lu: unknown key type %ld.\n", i, keys[i].dwKeyType);
}
}
}
@@ -7739,86 +7736,86 @@ static void test_animation(void)
/* No keys in this range. */
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, NULL);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, keys);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 0.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 4, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 4, "Unexpected key count %lu.\n", count);
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
/* Time is 0-based. */
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, &count, NULL);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, 100.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
/* AddKey() tests. */
hr = IDirect3DRMAnimation2_AddKey(animation2, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key) - 1;
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key) + 1;
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key);
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
key.dvPositionKey.x = 8.0f;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(SUCCEEDED(hr), "Failed to add key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add key, hr %#lx.\n", hr);
/* Delete tests. */
hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
- ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
- ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, -1000.0f, 1000.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 9, "Unexpected key count %u.\n", count);
-
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
- ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[6].dwKeyType);
- ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[7].dwKeyType);
- ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[8].dwKeyType);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 9, "Unexpected key count %lu.\n", count);
+
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
+ ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[6].dwKeyType);
+ ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[7].dwKeyType);
+ ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[8].dwKeyType);
ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7831,27 +7828,27 @@ static void test_animation(void)
ok(keys[8].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[8].dvTime);
hr = IDirect3DRMAnimation_DeleteKey(animation, -100.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_DeleteKey(animation, 100.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
/* Only first Position keys are not removed. */
hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7861,12 +7858,12 @@ static void test_animation(void)
ok(keys[5].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[5].dvTime);
hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
count = 0;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 3, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 3, "Unexpected key count %lu.\n", count);
IDirect3DRMAnimation2_Release(animation2);
IDirect3DRMAnimation_Release(animation);
@@ -7950,26 +7947,26 @@ static void test_animation_qi(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
- ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
IDirect3DRMAnimation_Release(animation);
test_qi("animation_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateAnimation(d3drm3, &animation2);
- ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
IDirect3DRMAnimation2_Release(animation2);
test_qi("animation2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
@@ -7986,10 +7983,10 @@ static void test_wrap(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
- ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
test_class_name((IDirect3DRMObject *)wrap, "");
@@ -8072,13 +8069,13 @@ static void test_wrap_qi(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
- ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
hr = IDirect3DRMWrap_QueryInterface(wrap, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap, hr %#lx.\n", hr);
IDirect3DRMWrap_Release(wrap);
test_qi("wrap_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index 101a37e830d..1e8e6a83bee 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -236,7 +236,7 @@ static void ColorTest(void)
blue=0.55f;
expected_color=0xffcc4c8c;
got_color=D3DRMCreateColorRGB(red,green,blue);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/*___________D3DRMCreateColorRGBA________________________*/
red=0.1f;
@@ -245,7 +245,7 @@ static void ColorTest(void)
alpha=0.58f;
expected_color=0x931966b2;
got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/* if a component is <0 then, then one considers this component as 0. The following test proves this fact (test only with the red component). */
red=-0.88f;
@@ -254,7 +254,7 @@ static void ColorTest(void)
alpha=0.41f;
expected_color=0x68006699;
got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/* if a component is >1 then, then one considers this component as 1. The following test proves this fact (test only with the red component). */
red=2.37f;
@@ -263,7 +263,7 @@ static void ColorTest(void)
alpha=0.41f;
expected_color=0x68ff6699;
got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/*___________D3DRMColorGetAlpha_________________________*/
color=0x0e4921bf;
--
2.35.1
1
0
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/winevulkan/Makefile.in | 1 -
dlls/winevulkan/loader.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in
index a6df9d52c1f..38809211308 100644
--- a/dlls/winevulkan/Makefile.in
+++ b/dlls/winevulkan/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = winevulkan.dll
UNIXLIB = winevulkan.so
IMPORTLIB = winevulkan
diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c
index 3fa334d2a3e..61c583d5c13 100644
--- a/dlls/winevulkan/loader.c
+++ b/dlls/winevulkan/loader.c
@@ -363,7 +363,7 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2)
SetupDiDestroyDeviceInfoList(devinfo);
release_display_device_init_mutex(mutex);
- TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08x:%08x deviceNodeMask:%#x.\n",
+ TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08lx:%08lx deviceNodeMask:%#x.\n",
properties2->properties.deviceName, id->deviceLUIDValid, luid.HighPart, luid.LowPart,
id->deviceNodeMask);
}
@@ -409,7 +409,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
{
void **kernel_callback_table;
- TRACE("%p, %u, %p\n", hinst, reason, reserved);
+ TRACE("%p, %lu, %p\n", hinst, reason, reserved);
switch (reason)
{
1
0
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/winspool.drv/Makefile.in | 1
dlls/winspool.drv/info.c | 372 +++++++++++++++++++++--------------------
dlls/winspool.drv/wspool.c | 2
3 files changed, 187 insertions(+), 188 deletions(-)
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index cd70d13b6f9..cf3f8d7f6c2 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = winspool.drv
UNIXLIB = winspool.so
IMPORTLIB = winspool
diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index a89abd0ced9..574fe87da92 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -439,7 +439,7 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab)
(BYTE *)(driver + len), &size );
RegCloseKey(device_key);
if (res || type != REG_SZ) {
- WARN("no configuration file: %u\n", res);
+ WARN("no configuration file: %lu\n", res);
goto ret;
}
@@ -501,12 +501,12 @@ static DWORD get_dword_from_reg( HKEY hkey, const WCHAR *name )
if (ret != ERROR_SUCCESS)
{
- WARN( "Got ret = %d on name %s\n", ret, debugstr_w(name) );
+ WARN( "Got ret = %ld on name %s\n", ret, debugstr_w(name) );
return 0;
}
if (type != REG_DWORD)
{
- ERR( "Got type %d\n", type );
+ ERR( "Got type %ld\n", type );
return 0;
}
return value;
@@ -682,11 +682,11 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir )
di3.pConfigFile = driver_9x;
}
res = AddPrinterDriverExW( NULL, 3, (BYTE *)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY );
- TRACE( "got %d and %d for %s (%s)\n", res, GetLastError(), debugstr_w( name ), debugstr_w( di3.pEnvironment ) );
+ TRACE( "got %d and %ld for %s (%s)\n", res, GetLastError(), debugstr_w( name ), debugstr_w( di3.pEnvironment ) );
if (!res && (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED))
{
- ERR( "failed with %u for %s (%s) %s\n", GetLastError(), debugstr_w( name ),
+ ERR( "failed with %lu for %s (%s) %s\n", GetLastError(), debugstr_w( name ),
debugstr_w( di3.pEnvironment ), debugstr_w( di3.pDriverPath ) );
break;
}
@@ -793,7 +793,7 @@ static BOOL init_unix_printers( void )
added_printer = AddPrinterW( NULL, 2, (BYTE *)&pi2 );
if (added_printer) ClosePrinter( added_printer );
else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS)
- ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w( printer->name ), GetLastError() );
+ ERR( "printer '%s' not added by AddPrinter (error %ld)\n", debugstr_w( printer->name ), GetLastError() );
heap_free( port );
}
@@ -1206,7 +1206,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
LPSTR ptr;
INT len;
- TRACE("(%p, %p, %d, %u, %u)\n", out, pPrintersW, level, outlen, numentries);
+ TRACE("(%p, %p, %ld, %lu, %lu)\n", out, pPrintersW, level, outlen, numentries);
len = pi_sizeof[level] * numentries;
ptr = (LPSTR) out + len;
@@ -1222,7 +1222,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_1W * piW = (PRINTER_INFO_1W *) pPrintersW;
PRINTER_INFO_1A * piA = (PRINTER_INFO_1A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(piW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(piW->pName));
if (piW->pDescription) {
piA->pDescription = ptr;
len = WideCharToMultiByte(CP_ACP, 0, piW->pDescription, -1,
@@ -1253,7 +1253,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_2A * piA = (PRINTER_INFO_2A *) out;
LPDEVMODEA dmA;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(piW->pPrinterName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(piW->pPrinterName));
if (piW->pServerName) {
piA->pServerName = ptr;
len = WideCharToMultiByte(CP_ACP, 0, piW->pServerName, -1,
@@ -1360,7 +1360,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_4W * piW = (PRINTER_INFO_4W *) pPrintersW;
PRINTER_INFO_4A * piA = (PRINTER_INFO_4A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(piW->pPrinterName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(piW->pPrinterName));
if (piW->pPrinterName) {
piA->pPrinterName = ptr;
@@ -1384,7 +1384,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_5W * piW = (PRINTER_INFO_5W *) pPrintersW;
PRINTER_INFO_5A * piA = (PRINTER_INFO_5A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(piW->pPrinterName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(piW->pPrinterName));
if (piW->pPrinterName) {
piA->pPrinterName = ptr;
@@ -1411,7 +1411,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_7W * piW = (PRINTER_INFO_7W *) pPrintersW;
PRINTER_INFO_7A * piA = (PRINTER_INFO_7A *) out;
- TRACE("(%u) #%u\n", level, id);
+ TRACE("(%lu) #%lu\n", level, id);
if (piW->pszObjectGUID) {
piA->pszObjectGUID = ptr;
len = WideCharToMultiByte(CP_ACP, 0, piW->pszObjectGUID, -1,
@@ -1429,7 +1429,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
PRINTER_INFO_9A * piA = (PRINTER_INFO_9A *) out;
LPDEVMODEA dmA;
- TRACE("(%u) #%u\n", level, id);
+ TRACE("(%lu) #%lu\n", level, id);
dmA = DEVMODEdupWtoA(piW->pDevMode);
if (dmA) {
/* align DEVMODEA to a DWORD boundary */
@@ -1450,7 +1450,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW,
}
default:
- FIXME("for level %u\n", level);
+ FIXME("for level %lu\n", level);
}
pPrintersW += pi_sizeof[level];
out += pi_sizeof[level];
@@ -1469,7 +1469,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
LPSTR ptr;
INT len;
- TRACE("(%p, %p, %d, %u, %u)\n", out, pDriversW, level, outlen, numentries);
+ TRACE("(%p, %p, %ld, %lu, %lu)\n", out, pDriversW, level, outlen, numentries);
len = di_sizeof[level] * numentries;
ptr = (LPSTR) out + len;
@@ -1503,7 +1503,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_1W * diW = (DRIVER_INFO_1W *) pDriversW;
DRIVER_INFO_1A * diA = (DRIVER_INFO_1A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
break;
@@ -1513,7 +1513,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_2W * diW = (DRIVER_INFO_2W *) pDriversW;
DRIVER_INFO_2A * diA = (DRIVER_INFO_2A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1527,7 +1527,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_3W * diW = (DRIVER_INFO_3W *) pDriversW;
DRIVER_INFO_3A * diA = (DRIVER_INFO_3A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1545,7 +1545,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_4W * diW = (DRIVER_INFO_4W *) pDriversW;
DRIVER_INFO_4A * diA = (DRIVER_INFO_4A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1564,7 +1564,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_5W * diW = (DRIVER_INFO_5W *) pDriversW;
DRIVER_INFO_5A * diA = (DRIVER_INFO_5A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1578,7 +1578,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_6W * diW = (DRIVER_INFO_6W *) pDriversW;
DRIVER_INFO_6A * diA = (DRIVER_INFO_6A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1601,7 +1601,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
DRIVER_INFO_8W * diW = (DRIVER_INFO_8W *) pDriversW;
DRIVER_INFO_8A * diA = (DRIVER_INFO_8A *) out;
- TRACE("(%u) #%u: %s\n", level, id, debugstr_w(diW->pName));
+ TRACE("(%lu) #%lu: %s\n", level, id, debugstr_w(diW->pName));
COPY_STRING(pName);
COPY_STRING(pEnvironment);
@@ -1627,7 +1627,7 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW,
default:
- FIXME("for level %u\n", level);
+ FIXME("for level %lu\n", level);
}
pDriversW += di_sizeof[level];
@@ -1690,7 +1690,7 @@ static void *printer_info_AtoW( const void *data, DWORD level )
}
default:
- FIXME( "Unhandled level %d\n", level );
+ FIXME( "Unhandled level %ld\n", level );
HeapFree( GetProcessHeap(), 0, ret );
return NULL;
}
@@ -1736,7 +1736,7 @@ static void free_printer_info( void *data, DWORD level )
}
default:
- FIXME( "Unhandled level %d\n", level );
+ FIXME( "Unhandled level %ld\n", level );
}
HeapFree( GetProcessHeap(), 0, data );
@@ -1838,7 +1838,7 @@ LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DE
unsigned int len;
int ret;
- TRACE("(%p,%p,%s,%p,%p,%d)\n", hwnd, printer, debugstr_a(device_name), output, input, mode);
+ TRACE("(%p,%p,%s,%p,%p,%ld)\n", hwnd, printer, debugstr_a(device_name), output, input, mode);
len = MultiByteToWideChar(CP_ACP, 0, device_name, -1, NULL, 0);
if (len) {
@@ -1886,7 +1886,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
const WCHAR *device = NULL;
LONG ret;
- TRACE("(%p,%p,%s,%p,%p,%d)\n",
+ TRACE("(%p,%p,%s,%p,%p,%ld)\n",
hWnd, hPrinter, debugstr_w(pDeviceName), pDevModeOutput, pDevModeInput, fMode);
device = pDeviceName && pDeviceName[0] ? pDeviceName : get_opened_printer_name(hPrinter);
@@ -1917,7 +1917,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
*/
BOOL WINAPI IsValidDevmodeA(PDEVMODEA pDevMode, SIZE_T size)
{
- FIXME("(%p,%ld): stub\n", pDevMode, size);
+ FIXME("(%p,%Id): stub\n", pDevMode, size);
if(!pDevMode)
return FALSE;
@@ -2074,7 +2074,7 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU
RegCloseKey( key );
}
- TRACE("returning %d with %u and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter);
+ TRACE("returning %d with %lu and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter);
return (*phPrinter != 0);
}
@@ -2093,7 +2093,7 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors)
MONITOR_INFO_2W mi2w;
mi2a = (LPMONITOR_INFO_2A) pMonitors;
- TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_a(pName), Level, pMonitors,
+ TRACE("(%s, %ld, %p) : %s %s %s\n", debugstr_a(pName), Level, pMonitors,
debugstr_a(mi2a ? mi2a->pName : NULL),
debugstr_a(mi2a ? mi2a->pEnvironment : NULL),
debugstr_a(mi2a ? mi2a->pDLLName : NULL));
@@ -2164,7 +2164,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors)
LPMONITOR_INFO_2W mi2w;
mi2w = (LPMONITOR_INFO_2W) pMonitors;
- TRACE("(%s, %d, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors,
+ TRACE("(%s, %ld, %p) : %s %s %s\n", debugstr_w(pName), Level, pMonitors,
debugstr_w(mi2w ? mi2w->pName : NULL),
debugstr_w(mi2w ? mi2w->pEnvironment : NULL),
debugstr_w(mi2w ? mi2w->pDLLName : NULL));
@@ -2343,7 +2343,7 @@ BOOL WINAPI WritePrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pcWr
opened_printer_t *printer;
BOOL ret = FALSE;
- TRACE("(%p, %p, %d, %p)\n", hPrinter, pBuf, cbBuf, pcWritten);
+ TRACE("(%p, %p, %ld, %p)\n", hPrinter, pBuf, cbBuf, pcWritten);
EnterCriticalSection(&printer_handles_cs);
printer = get_opened_printer(hPrinter);
@@ -2370,7 +2370,7 @@ end:
*/
BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm)
{
- FIXME("(%p,%d,%p): stub\n", hPrinter, Level, pForm);
+ FIXME("(%p,%ld,%p): stub\n", hPrinter, Level, pForm);
return TRUE;
}
@@ -2381,7 +2381,7 @@ BOOL WINAPI AddFormW( HANDLE printer, DWORD level, BYTE *form )
{
HANDLE handle = get_backend_handle( printer );
- TRACE( "(%p, %d, %p)\n", printer, level, form );
+ TRACE( "(%p, %ld, %p)\n", printer, level, form );
if (!handle)
{
@@ -2438,7 +2438,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD
DWORD len;
ADDJOB_INFO_1W *addjob;
- TRACE("(%p,%d,%p,%d,%p)\n", hPrinter, Level, pData, cbBuf, pcbNeeded);
+ TRACE("(%p,%ld,%p,%ld,%p)\n", hPrinter, Level, pData, cbBuf, pcbNeeded);
EnterCriticalSection(&printer_handles_cs);
@@ -2508,9 +2508,9 @@ BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR env,
BOOL ret;
INT len;
- TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_a(server),
+ TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_a(server),
debugstr_a(env), level, Info, cbBuf, pcbNeeded);
-
+
if (server) {
len = MultiByteToWideChar(CP_ACP, 0, server, -1, NULL, 0);
@@ -2534,7 +2534,7 @@ BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR env,
cbBuf, NULL, NULL) > 0;
- TRACE(" required: 0x%x/%d\n", pcbNeeded ? *pcbNeeded : 0, pcbNeeded ? *pcbNeeded : 0);
+ TRACE(" required: 0x%lx/%ld\n", pcbNeeded ? *pcbNeeded : 0, pcbNeeded ? *pcbNeeded : 0);
HeapFree(GetProcessHeap(), 0, envW);
HeapFree(GetProcessHeap(), 0, serverW);
return ret;
@@ -2575,7 +2575,7 @@ BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR server, LPWSTR env,
DWORD cbBuf, LPDWORD pcbNeeded)
{
- TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(server), debugstr_w(env), level,
+ TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(server), debugstr_w(env), level,
Info, cbBuf, pcbNeeded);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -2646,7 +2646,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
HKEY printer_key, printers_key, hkeyDriver, hkeyDrivers;
LONG size;
- TRACE("(%s,%d,%p)\n", debugstr_w(pName), Level, pPrinter);
+ TRACE("(%s,%ld,%p)\n", debugstr_w(pName), Level, pPrinter);
if(pName && *pName) {
ERR("pName = %s - unsupported\n", debugstr_w(pName));
@@ -2654,7 +2654,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
return 0;
}
if(Level != 2) {
- ERR("Level = %d, unsupported!\n", Level);
+ ERR("Level = %ld, unsupported!\n", Level);
SetLastError(ERROR_INVALID_LEVEL);
return 0;
}
@@ -2782,9 +2782,9 @@ HANDLE WINAPI AddPrinterA(LPSTR pName, DWORD Level, LPBYTE pPrinter)
PRINTER_INFO_2A *piA = (PRINTER_INFO_2A*)pPrinter;
HANDLE ret;
- TRACE("(%s, %d, %p)\n", debugstr_a(pName), Level, pPrinter);
+ TRACE("(%s, %ld, %p)\n", debugstr_a(pName), Level, pPrinter);
if(Level != 2) {
- ERR("Level = %d, unsupported!\n", Level);
+ ERR("Level = %ld, unsupported!\n", Level);
SetLastError(ERROR_INVALID_LEVEL);
return 0;
}
@@ -2991,9 +2991,9 @@ BOOL WINAPI SetPrinterW( HANDLE printer, DWORD level, LPBYTE data, DWORD command
HKEY key;
BOOL ret = FALSE;
- TRACE( "(%p, %d, %p, %d)\n", printer, level, data, command );
+ TRACE( "(%p, %ld, %p, %ld)\n", printer, level, data, command );
- if (command != 0) FIXME( "Ignoring command %d\n", command );
+ if (command != 0) FIXME( "Ignoring command %ld\n", command );
if (WINSPOOL_GetOpenedPrinterRegKey( printer, &key ))
return FALSE;
@@ -3020,7 +3020,7 @@ BOOL WINAPI SetPrinterW( HANDLE printer, DWORD level, LPBYTE data, DWORD command
}
default:
- FIXME( "Unimplemented level %d\n", level );
+ FIXME( "Unimplemented level %ld\n", level );
SetLastError( ERROR_INVALID_LEVEL );
}
@@ -3038,7 +3038,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
LPBYTE JobW;
UNICODE_STRING usBuffer;
- TRACE("(%p, %d, %d, %p, %d)\n",hPrinter, JobId, Level, pJob, Command);
+ TRACE("(%p, %ld, %ld, %p, %ld)\n",hPrinter, JobId, Level, pJob, Command);
/* JobId, pPrinterName, pMachineName, pDriverName, Size, Submitted, Time and TotalPages
are all ignored by SetJob, so we don't bother copying them */
@@ -3136,7 +3136,7 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level,
BOOL ret = FALSE;
job_t *job;
- TRACE("(%p, %d, %d, %p, %d)\n", hPrinter, JobId, Level, pJob, Command);
+ TRACE("(%p, %ld, %ld, %p, %ld)\n", hPrinter, JobId, Level, pJob, Command);
FIXME("Ignoring everything other than document title\n");
EnterCriticalSection(&printer_handles_cs);
@@ -3274,7 +3274,7 @@ DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo)
WCHAR *filename;
job_t *job;
- TRACE("(hPrinter = %p, Level = %d, pDocInfo = %p {pDocName = %s, pOutputFile = %s, pDatatype = %s}):\n",
+ TRACE("(hPrinter = %p, Level = %ld, pDocInfo = %p {pDocName = %s, pOutputFile = %s, pDatatype = %s}):\n",
hPrinter, Level, doc, debugstr_w(doc->pDocName), debugstr_w(doc->pOutputFile),
debugstr_w(doc->pDatatype));
@@ -3303,7 +3303,7 @@ DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo)
if(!AddJobW(hPrinter, 1, addjob_buf, sizeof(addjob_buf), &needed))
{
- ERR("AddJob failed gle %u\n", GetLastError());
+ ERR("AddJob failed gle %lu\n", GetLastError());
goto end;
}
@@ -3369,7 +3369,7 @@ BOOL WINAPI GetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form, DWOR
{
HANDLE handle = get_backend_handle( printer );
- TRACE( "(%p, %s, %d, %p, %d, %p)\n", printer, debugstr_w( name ), level, form, size, needed );
+ TRACE( "(%p, %s, %ld, %p, %ld, %p)\n", printer, debugstr_w( name ), level, form, size, needed );
if (!handle)
{
@@ -3386,7 +3386,7 @@ BOOL WINAPI GetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form, DWOR
BOOL WINAPI SetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level,
LPBYTE pForm)
{
- FIXME("(%p,%s,%d,%p): stub\n",hPrinter,pFormName,Level,pForm);
+ FIXME("(%p,%s,%ld,%p): stub\n",hPrinter,pFormName,Level,pForm);
return FALSE;
}
@@ -3397,7 +3397,7 @@ BOOL WINAPI SetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form )
{
HANDLE handle = get_backend_handle( printer );
- TRACE( "(%p, %s, %d, %p)\n", printer, debugstr_w( name ), level, form );
+ TRACE( "(%p, %s, %ld, %p)\n", printer, debugstr_w( name ), level, form );
if (!handle)
{
@@ -3414,7 +3414,7 @@ BOOL WINAPI SetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form )
BOOL WINAPI ReadPrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf,
LPDWORD pNoBytesRead)
{
- FIXME("(%p,%p,%d,%p): stub\n",hPrinter,pBuf,cbBuf,pNoBytesRead);
+ FIXME("(%p,%p,%ld,%p): stub\n",hPrinter,pBuf,cbBuf,pNoBytesRead);
return FALSE;
}
@@ -3461,7 +3461,7 @@ static BOOL get_filename_from_reg(HKEY hkey, LPCWSTR driverdir, DWORD dirlen, LP
buffer[0] = '\0';
ret = RegQueryValueExW(hkey, ValueName, NULL, &type, (LPBYTE) buffer, &size);
if (ret == ERROR_MORE_DATA) {
- TRACE("need dynamic buffer: %u\n", size);
+ TRACE("need dynamic buffer: %lu\n", size);
buffer = HeapAlloc(GetProcessHeap(), 0, size);
if (!buffer) {
/* No Memory is bad */
@@ -3536,7 +3536,7 @@ static BOOL WINSPOOL_GetStringFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr,
ret = RegQueryValueExW(hkey, ValueName, 0, &type, ptr, &sz);
if(ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) {
- WARN("Got ret = %d\n", ret);
+ WARN("Got ret = %ld\n", ret);
*needed = 0;
return FALSE;
}
@@ -3587,7 +3587,7 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName,
if ((ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA)) sz = 0;
if (sz < sizeof(DEVMODEA))
{
- TRACE("corrupted registry for %s ( size %d)\n",debugstr_w(ValueName),sz);
+ TRACE("corrupted registry for %s ( size %ld)\n",debugstr_w(ValueName),sz);
return FALSE;
}
/* ensures that dmSize is not erratically bogus if registry is invalid */
@@ -3973,7 +3973,7 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
HKEY hkeyPrinter;
BOOL ret;
- TRACE("(%p,%d,%p,%d,%p)\n",hPrinter,Level,pPrinter,cbBuf, pcbNeeded);
+ TRACE("(%p,%ld,%p,%ld,%p)\n",hPrinter,Level,pPrinter,cbBuf, pcbNeeded);
err = WINSPOOL_GetOpenedPrinterRegKey( hPrinter, &hkeyPrinter );
if (err)
@@ -4120,7 +4120,7 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
default:
- FIXME("Unimplemented level %d\n", Level);
+ FIXME("Unimplemented level %ld\n", Level);
SetLastError(ERROR_INVALID_LEVEL);
RegCloseKey(hkeyPrinter);
return FALSE;
@@ -4128,7 +4128,7 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
RegCloseKey(hkeyPrinter);
- TRACE("returning %d needed = %d\n", ret, needed);
+ TRACE("returning %d needed = %ld\n", ret, needed);
if(pcbNeeded) *pcbNeeded = needed;
if(!ret)
SetLastError(ERROR_INSUFFICIENT_BUFFER);
@@ -4194,7 +4194,7 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName,
}
if (!((dwType & PRINTER_ENUM_LOCAL) || (dwType & PRINTER_ENUM_NAME))) {
- FIXME("dwType = %08x\n", dwType);
+ FIXME("dwType = %08lx\n", dwType);
SetLastError(ERROR_INVALID_FLAGS);
return FALSE;
}
@@ -4211,7 +4211,7 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName,
ERR("Can't query Printers key\n");
return FALSE;
}
- TRACE("Found %d printers\n", number);
+ TRACE("Found %ld printers\n", number);
switch(dwLevel) {
case 1:
@@ -4237,11 +4237,11 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName,
for(i = 0; i < number; i++) {
if (RegEnumKeyW( printers_key, i, PrinterName, ARRAY_SIZE(PrinterName) ))
{
- ERR("Can't enum key number %d\n", i);
+ ERR("Can't enum key number %ld\n", i);
RegCloseKey( printers_key );
return FALSE;
}
- TRACE("Printer %d is %s\n", i, debugstr_w(PrinterName));
+ TRACE("Printer %ld is %s\n", i, debugstr_w(PrinterName));
if (RegOpenKeyW( printers_key, PrinterName, &hkeyPrinter ))
{
ERR("Can't open key %s\n", debugstr_w(PrinterName));
@@ -4386,7 +4386,7 @@ BOOL WINAPI EnumPrintersA(DWORD flags, LPSTR pName, DWORD level, LPBYTE pPrinter
LPWSTR pNameW;
LPBYTE pPrintersW;
- TRACE("(0x%x, %s, %u, %p, %d, %p, %p)\n", flags, debugstr_a(pName), level,
+ TRACE("(0x%lx, %s, %lu, %p, %ld, %p, %p)\n", flags, debugstr_a(pName), level,
pPrinters, cbBuf, pcbNeeded, pcReturned);
pNameW = asciitounicode(&pNameU, pName);
@@ -4431,7 +4431,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
LPBYTE strPtr = pDriverStrings;
LPDRIVER_INFO_8W di = (LPDRIVER_INFO_8W) ptr;
- TRACE("(%p, %s, %p, %d, %p, %p, %d)\n", hkeyDrivers,
+ TRACE("(%p, %s, %p, %ld, %p, %p, %ld)\n", hkeyDrivers,
debugstr_w(DriverName), env,
Level, di, pDriverStrings, cbBuf);
@@ -4518,7 +4518,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
if (Level == 2 ) {
RegCloseKey(hkeyDriver);
- TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded);
+ TRACE("buffer space %ld required %ld\n", cbBuf, *pcbNeeded);
return TRUE;
}
@@ -4583,7 +4583,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
if (Level == 3 ) {
RegCloseKey(hkeyDriver);
- TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded);
+ TRACE("buffer space %ld required %ld\n", cbBuf, *pcbNeeded);
return TRUE;
}
@@ -4600,7 +4600,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
if (Level == 4 ) {
RegCloseKey(hkeyDriver);
- TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded);
+ TRACE("buffer space %ld required %ld\n", cbBuf, *pcbNeeded);
return TRUE;
}
@@ -4659,7 +4659,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
/* support is missing, but not important enough for a FIXME */
TRACE("level 8: incomplete\n");
- TRACE("buffer space %d required %d\n", cbBuf, *pcbNeeded);
+ TRACE("buffer space %ld required %ld\n", cbBuf, *pcbNeeded);
RegCloseKey(hkeyDriver);
return TRUE;
}
@@ -4678,7 +4678,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment,
HKEY hkeyPrinter, hkeyDrivers;
const printenv_t * env;
- TRACE("(%p,%s,%d,%p,%d,%p)\n",hPrinter,debugstr_w(pEnvironment),
+ TRACE("(%p,%s,%ld,%p,%ld,%p)\n",hPrinter,debugstr_w(pEnvironment),
Level,pDriverInfo,cbBuf, pcbNeeded);
if (cbBuf > 0)
@@ -4735,7 +4735,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment,
RegCloseKey(hkeyDrivers);
if(pcbNeeded) *pcbNeeded = size + needed;
- TRACE("buffer space %d required %d\n", cbBuf, size + needed);
+ TRACE("buffer space %ld required %ld\n", cbBuf, size + needed);
if(cbBuf >= size + needed) return TRUE;
SetLastError(ERROR_INSUFFICIENT_BUFFER);
return FALSE;
@@ -4805,7 +4805,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment,
DWORD Level, LPBYTE pDriverDirectory,
DWORD cbBuf, LPDWORD pcbNeeded)
{
- TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName),
+ TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName),
debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -4848,7 +4848,7 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment,
INT len = cbBuf * sizeof(WCHAR)/sizeof(CHAR);
WCHAR *driverDirectoryW = NULL;
- TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_a(pName),
+ TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_a(pName),
debugstr_a(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded);
if (len) driverDirectoryW = HeapAlloc( GetProcessHeap(), 0, len );
@@ -4870,7 +4870,7 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment,
} else
if(pcbNeeded) *pcbNeeded = pcbNeededW * sizeof(CHAR)/sizeof(WCHAR);
- TRACE("required: 0x%x/%d\n", pcbNeeded ? *pcbNeeded : 0, pcbNeeded ? *pcbNeeded : 0);
+ TRACE("required: 0x%lx/%ld\n", pcbNeeded ? *pcbNeeded : 0, pcbNeeded ? *pcbNeeded : 0);
HeapFree( GetProcessHeap(), 0, driverDirectoryW );
RtlFreeUnicodeString(&environmentW);
@@ -4887,7 +4887,7 @@ BOOL WINAPI GetPrinterDriverDirectoryA(LPSTR pName, LPSTR pEnvironment,
*/
BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD level, LPBYTE pDriverInfo)
{
- TRACE("(%s, %d, %p)\n", debugstr_a(pName), level, pDriverInfo);
+ TRACE("(%s, %ld, %p)\n", debugstr_a(pName), level, pDriverInfo);
return AddPrinterDriverExA(pName, level, pDriverInfo, APD_COPY_NEW_FILES);
}
@@ -4908,7 +4908,7 @@ BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD level, LPBYTE pDriverInfo)
*/
BOOL WINAPI AddPrinterDriverW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo)
{
- TRACE("(%s, %d, %p)\n", debugstr_w(pName), level, pDriverInfo);
+ TRACE("(%s, %ld, %p)\n", debugstr_w(pName), level, pDriverInfo);
return AddPrinterDriverExW(pName, level, pDriverInfo, APD_COPY_NEW_FILES);
}
@@ -4955,7 +4955,7 @@ BOOL WINAPI AddPrintProcessorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPathNa
*/
BOOL WINAPI AddPrintProvidorA(LPSTR pName, DWORD Level, LPBYTE pProviderInfo)
{
- FIXME("(%s,0x%08x,%p): stub\n", debugstr_a(pName), Level, pProviderInfo);
+ FIXME("(%s,0x%08lx,%p): stub\n", debugstr_a(pName), Level, pProviderInfo);
return FALSE;
}
@@ -4964,7 +4964,7 @@ BOOL WINAPI AddPrintProvidorA(LPSTR pName, DWORD Level, LPBYTE pProviderInfo)
*/
BOOL WINAPI AddPrintProvidorW(LPWSTR pName, DWORD Level, LPBYTE pProviderInfo)
{
- FIXME("(%s,0x%08x,%p): stub\n", debugstr_w(pName), Level, pProviderInfo);
+ FIXME("(%s,0x%08lx,%p): stub\n", debugstr_w(pName), Level, pProviderInfo);
return FALSE;
}
@@ -5017,7 +5017,7 @@ BOOL WINAPI EnumJobsA(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs,
DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded,
LPDWORD pcReturned)
{
- FIXME("(%p,first=%d,no=%d,level=%d,job=%p,cb=%d,%p,%p), stub!\n",
+ FIXME("(%p,first=%ld,no=%ld,level=%ld,job=%p,cb=%ld,%p,%p), stub!\n",
hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned
);
if(pcbNeeded) *pcbNeeded = 0;
@@ -5034,7 +5034,7 @@ BOOL WINAPI EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs,
DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded,
LPDWORD pcReturned)
{
- FIXME("(%p,first=%d,no=%d,level=%d,job=%p,cb=%d,%p,%p), stub!\n",
+ FIXME("(%p,first=%ld,no=%ld,level=%ld,job=%p,cb=%ld,%p,%p), stub!\n",
hPrinter, FirstJob, NoJobs, Level, pJob, cbBuf, pcbNeeded, pcReturned
);
if(pcbNeeded) *pcbNeeded = 0;
@@ -5065,7 +5065,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment,
DWORD i, size = 0;
const printenv_t * env;
- TRACE("%s,%s,%d,%p,%d,%d,%d\n",
+ TRACE("%s,%s,%ld,%p,%ld,%ld,%ld\n",
debugstr_w(pName), debugstr_w(pEnvironment),
Level, pDriverInfo, driver_index, cbBuf, data_offset);
@@ -5086,7 +5086,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment,
ERR("Can't query Drivers key\n");
return FALSE;
}
- TRACE("Found %d Drivers\n", *pcFound);
+ TRACE("Found %ld Drivers\n", *pcFound);
/* get size of single struct
* unicode and ascii structure have the same size
@@ -5104,7 +5104,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment,
DWORD needed = 0;
if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, ARRAY_SIZE(DriverNameW)) != ERROR_SUCCESS) {
- ERR("Can't enum key number %d\n", i);
+ ERR("Can't enum key number %ld\n", i);
RegCloseKey(hkeyDrivers);
return FALSE;
}
@@ -5265,7 +5265,7 @@ BOOL WINAPI EnumPortsA( LPSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf,
DWORD numentries = 0;
INT len;
- TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_a(pName), Level, pPorts,
+ TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_a(pName), Level, pPorts,
cbBuf, pcbNeeded, pcReturned);
/* convert servername to unicode */
@@ -5313,7 +5313,7 @@ BOOL WINAPI EnumPortsA( LPSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf,
while (index < numentries) {
index++;
needed += entrysize; /* PORT_INFO_?A */
- TRACE("%p: parsing #%d (%s)\n", pi2w, index, debugstr_w(pi2w->pPortName));
+ TRACE("%p: parsing #%ld (%s)\n", pi2w, index, debugstr_w(pi2w->pPortName));
needed += WideCharToMultiByte(CP_ACP, 0, pi2w->pPortName, -1,
NULL, 0, NULL, NULL);
@@ -5343,7 +5343,7 @@ BOOL WINAPI EnumPortsA( LPSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf,
/* Second Pass: Fill the User Buffer (if we have one) */
while ((index < numentries) && pPorts) {
index++;
- TRACE("%p: writing PORT_INFO_%dA #%d\n", pi2a, Level, index);
+ TRACE("%p: writing PORT_INFO_%ldA #%ld\n", pi2a, Level, index);
pi2a->pPortName = ptr;
len = WideCharToMultiByte(CP_ACP, 0, pi2w->pPortName, -1,
ptr, cbBuf , NULL, NULL);
@@ -5379,7 +5379,7 @@ cleanup:
HeapFree(GetProcessHeap(), 0, nameW);
HeapFree(GetProcessHeap(), 0, bufferW);
- TRACE("returning %d with %d (%d byte for %d of %d entries)\n",
+ TRACE("returning %d with %ld (%ld byte for %ld of %ld entries)\n",
(res), GetLastError(), needed, (res)? numentries : 0, numentries);
return (res);
@@ -5407,14 +5407,14 @@ cleanup:
BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pPorts,
+ TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pPorts,
cbBuf, pcbNeeded, pcReturned);
if ((backend == NULL) && !load_backend()) return FALSE;
/* Level is not checked in win9x */
if (!Level || (Level > 2)) {
- WARN("level (%d) is ignored in win9x\n", Level);
+ WARN("level (%ld) is ignored in win9x\n", Level);
SetLastError(ERROR_INVALID_LEVEL);
return FALSE;
}
@@ -5516,7 +5516,7 @@ BOOL WINAPI GetDefaultPrinterA(LPSTR name, LPDWORD namesize)
*namesize = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL);
retval = FALSE;
}
- TRACE("0x%08x/0x%08x:%s\n", *namesize, insize, debugstr_w(bufferW));
+ TRACE("0x%08lx/0x%08lx:%s\n", *namesize, insize, debugstr_w(bufferW));
end:
HeapFree( GetProcessHeap(), 0, bufferW);
@@ -5614,7 +5614,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter)
else
{
if (lres != ERROR_FILE_NOT_FOUND)
- FIXME("RegQueryValueExW failed with %d for %s\n", lres, debugstr_w(pszPrinter));
+ FIXME("RegQueryValueExW failed with %ld for %s\n", lres, debugstr_w(pszPrinter));
SetLastError(ERROR_INVALID_PRINTER_NAME);
}
@@ -5656,7 +5656,7 @@ DWORD WINAPI SetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
HKEY hkeyPrinter, hkeySubkey;
DWORD ret;
- TRACE("(%p, %s, %s %08x, %p, %08x)\n", hPrinter, debugstr_a(pKeyName),
+ TRACE("(%p, %s, %s %08lx, %p, %08lx)\n", hPrinter, debugstr_a(pKeyName),
debugstr_a(pValueName), Type, pData, cbData);
if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter))
@@ -5685,7 +5685,7 @@ DWORD WINAPI SetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
HKEY hkeyPrinter, hkeySubkey;
DWORD ret;
- TRACE("(%p, %s, %s %08x, %p, %08x)\n", hPrinter, debugstr_w(pKeyName),
+ TRACE("(%p, %s, %s %08lx, %p, %08lx)\n", hPrinter, debugstr_w(pKeyName),
debugstr_w(pValueName), Type, pData, cbData);
if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter))
@@ -5735,7 +5735,7 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
HKEY printers_key, hkeyPrinter = 0, hkeySubkey = 0;
DWORD ret;
- TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_a(pKeyName),
+ TRACE("(%p, %s, %s, %p, %p, %lu, %p)\n", hPrinter, debugstr_a(pKeyName),
debugstr_a(pValueName), pType, pData, nSize, pcbNeeded);
printer = get_opened_printer(hPrinter);
@@ -5755,7 +5755,7 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
return ret;
}
if((ret = RegOpenKeyA(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) {
- WARN("Can't open subkey %s: %d\n", debugstr_a(pKeyName), ret);
+ WARN("Can't open subkey %s: %ld\n", debugstr_a(pKeyName), ret);
RegCloseKey(hkeyPrinter);
RegCloseKey( printers_key );
return ret;
@@ -5771,7 +5771,7 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
RegCloseKey(hkeyPrinter);
RegCloseKey( printers_key );
- TRACE("--> %d\n", ret);
+ TRACE("--> %ld\n", ret);
return ret;
}
@@ -5786,7 +5786,7 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
HKEY printers_key, hkeyPrinter = 0, hkeySubkey = 0;
DWORD ret;
- TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_w(pKeyName),
+ TRACE("(%p, %s, %s, %p, %p, %lu, %p)\n", hPrinter, debugstr_w(pKeyName),
debugstr_w(pValueName), pType, pData, nSize, pcbNeeded);
printer = get_opened_printer(hPrinter);
@@ -5807,7 +5807,7 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
}
if ((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS)
{
- WARN("Can't open subkey %s: %d\n", debugstr_w(pKeyName), ret);
+ WARN("Can't open subkey %s: %ld\n", debugstr_w(pKeyName), ret);
RegCloseKey(hkeyPrinter);
RegCloseKey( printers_key );
return ret;
@@ -5823,7 +5823,7 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
RegCloseKey(hkeyPrinter);
RegCloseKey( printers_key );
- TRACE("--> %d\n", ret);
+ TRACE("--> %ld\n", ret);
return ret;
}
@@ -5871,7 +5871,7 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
ret = WINSPOOL_GetOpenedPrinterRegKey (hPrinter, &hkPrinter);
if (ret != ERROR_SUCCESS)
{
- TRACE ("WINSPOOL_GetOpenedPrinterRegKey (%p) returned %i\n",
+ TRACE ("WINSPOOL_GetOpenedPrinterRegKey (%p) returned %li\n",
hPrinter, ret);
return ret;
}
@@ -5881,8 +5881,8 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
{
r = RegCloseKey (hkPrinter);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("RegOpenKeyExW (%p, %s) returned %i\n", hPrinter,
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("RegOpenKeyExW (%p, %s) returned %li\n", hPrinter,
debugstr_w (pKeyName), ret);
return ret;
}
@@ -5890,10 +5890,10 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
ret = RegCloseKey (hkPrinter);
if (ret != ERROR_SUCCESS)
{
- ERR ("RegCloseKey returned %i\n", ret);
+ ERR ("RegCloseKey returned %li\n", ret);
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ret;
}
@@ -5903,19 +5903,19 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
{
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("RegQueryInfoKeyW (%p) returned %i\n", hkSubKey, ret);
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("RegQueryInfoKeyW (%p) returned %li\n", hkSubKey, ret);
return ret;
}
- TRACE ("RegQueryInfoKeyW returned cValues = %i, cbMaxValueNameLen = %i, "
- "cbMaxValueLen = %i\n", cValues, cbMaxValueNameLen, cbMaxValueLen);
+ TRACE ("RegQueryInfoKeyW returned cValues = %li, cbMaxValueNameLen = %li, "
+ "cbMaxValueLen = %li\n", cValues, cbMaxValueNameLen, cbMaxValueLen);
if (cValues == 0) /* empty key */
{
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
*pcbEnumValues = *pnEnumValues = 0;
return ERROR_SUCCESS;
}
@@ -5928,29 +5928,29 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
ERR ("GetProcessHeap failed\n");
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ERROR_OUTOFMEMORY;
}
lpValueName = HeapAlloc (hHeap, 0, cbMaxValueNameLen * sizeof (WCHAR));
if (lpValueName == NULL)
{
- ERR ("Failed to allocate %i WCHARs from process heap\n", cbMaxValueNameLen);
+ ERR ("Failed to allocate %li WCHARs from process heap\n", cbMaxValueNameLen);
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ERROR_OUTOFMEMORY;
}
lpValue = HeapAlloc (hHeap, 0, cbMaxValueLen);
if (lpValue == NULL)
{
- ERR ("Failed to allocate %i bytes from process heap\n", cbMaxValueLen);
+ ERR ("Failed to allocate %li bytes from process heap\n", cbMaxValueLen);
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ERROR_OUTOFMEMORY;
}
@@ -5958,7 +5958,7 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
cbBufSize = cValues * sizeof (PRINTER_ENUM_VALUESW);
- TRACE ("%i bytes required for %i headers\n", cbBufSize, cValues);
+ TRACE ("%li bytes required for %li headers\n", cbBufSize, cValues);
for (dwIndex = 0; dwIndex < cValues; ++dwIndex)
{
@@ -5968,17 +5968,17 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
if (ret != ERROR_SUCCESS)
{
if (HeapFree (hHeap, 0, lpValue) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("RegEnumValueW (%i) returned %i\n", dwIndex, ret);
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("RegEnumValueW (%li) returned %li\n", dwIndex, ret);
return ret;
}
- TRACE ("%s [%i]: name needs %i WCHARs, data needs %i bytes\n",
+ TRACE ("%s [%li]: name needs %li WCHARs, data needs %li bytes\n",
debugstr_w (lpValueName), dwIndex,
cbValueNameLen + 1, cbValueLen);
@@ -5986,7 +5986,7 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
cbBufSize += cbValueLen;
}
- TRACE ("%i bytes required for all %i values\n", cbBufSize, cValues);
+ TRACE ("%li bytes required for all %li values\n", cbBufSize, cValues);
*pcbEnumValues = cbBufSize;
*pnEnumValues = cValues;
@@ -5994,13 +5994,13 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
if (cbEnumValues < cbBufSize) /* buffer too small */
{
if (HeapFree (hHeap, 0, lpValue) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("%i byte buffer is not large enough\n", cbEnumValues);
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("%li byte buffer is not large enough\n", cbEnumValues);
return ERROR_MORE_DATA;
}
@@ -6017,13 +6017,13 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
if (ret != ERROR_SUCCESS)
{
if (HeapFree (hHeap, 0, lpValue) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
- TRACE ("RegEnumValueW (%i) returned %i\n", dwIndex, ret);
+ WARN ("RegCloseKey returned %li\n", r);
+ TRACE ("RegEnumValueW (%li) returned %li\n", dwIndex, ret);
return ret;
}
@@ -6043,36 +6043,36 @@ DWORD WINAPI EnumPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName,
ppev[dwIndex].cbData = cbValueLen;
- TRACE ("%s [%i]: copied name (%i bytes) and data (%i bytes)\n",
+ TRACE ("%s [%li]: copied name (%li bytes) and data (%li bytes)\n",
debugstr_w (lpValueName), dwIndex, cbValueNameLen, cbValueLen);
}
if (HeapFree (hHeap, 0, lpValue) == 0)
{
ret = GetLastError ();
- ERR ("HeapFree failed with code %i\n", ret);
+ ERR ("HeapFree failed with code %li\n", ret);
if (HeapFree (hHeap, 0, lpValueName) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ret;
}
if (HeapFree (hHeap, 0, lpValueName) == 0)
{
ret = GetLastError ();
- ERR ("HeapFree failed with code %i\n", ret);
+ ERR ("HeapFree failed with code %li\n", ret);
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
- WARN ("RegCloseKey returned %i\n", r);
+ WARN ("RegCloseKey returned %li\n", r);
return ret;
}
ret = RegCloseKey (hkSubKey);
if (ret != ERROR_SUCCESS)
{
- ERR ("RegCloseKey returned %i\n", ret);
+ ERR ("RegCloseKey returned %li\n", ret);
return ret;
}
@@ -6106,7 +6106,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (len == 0)
{
ret = GetLastError ();
- ERR ("MultiByteToWideChar failed with code %i\n", ret);
+ ERR ("MultiByteToWideChar failed with code %li\n", ret);
return ret;
}
@@ -6120,7 +6120,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
pKeyNameW = HeapAlloc (hHeap, 0, len * sizeof (WCHAR));
if (pKeyNameW == NULL)
{
- ERR ("Failed to allocate %i bytes from process heap\n",
+ ERR ("Failed to allocate %li bytes from process heap\n",
(LONG)(len * sizeof (WCHAR)));
return ERROR_OUTOFMEMORY;
}
@@ -6128,9 +6128,9 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (MultiByteToWideChar (CP_ACP, 0, pKeyName, -1, pKeyNameW, len) == 0)
{
ret = GetLastError ();
- ERR ("MultiByteToWideChar failed with code %i\n", ret);
+ ERR ("MultiByteToWideChar failed with code %li\n", ret);
if (HeapFree (hHeap, 0, pKeyNameW) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
return ret;
}
@@ -6139,15 +6139,15 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (ret != ERROR_SUCCESS)
{
if (HeapFree (hHeap, 0, pKeyNameW) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
- TRACE ("EnumPrinterDataExW returned %i\n", ret);
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
+ TRACE ("EnumPrinterDataExW returned %li\n", ret);
return ret;
}
if (HeapFree (hHeap, 0, pKeyNameW) == 0)
{
ret = GetLastError ();
- ERR ("HeapFree failed with code %i\n", ret);
+ ERR ("HeapFree failed with code %li\n", ret);
return ret;
}
@@ -6168,12 +6168,12 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
dwBufSize = ppev->cbData;
}
- TRACE ("Largest Unicode name or value is %i bytes\n", dwBufSize);
+ TRACE ("Largest Unicode name or value is %li bytes\n", dwBufSize);
pBuffer = HeapAlloc (hHeap, 0, dwBufSize);
if (pBuffer == NULL)
{
- ERR ("Failed to allocate %i bytes from process heap\n", dwBufSize);
+ ERR ("Failed to allocate %li bytes from process heap\n", dwBufSize);
return ERROR_OUTOFMEMORY;
}
@@ -6188,9 +6188,9 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (len == 0)
{
ret = GetLastError ();
- ERR ("WideCharToMultiByte failed with code %i\n", ret);
+ ERR ("WideCharToMultiByte failed with code %li\n", ret);
if (HeapFree (hHeap, 0, pBuffer) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
return ret;
}
@@ -6207,9 +6207,9 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (len == 0)
{
ret = GetLastError ();
- ERR ("WideCharToMultiByte failed with code %i\n", ret);
+ ERR ("WideCharToMultiByte failed with code %li\n", ret);
if (HeapFree (hHeap, 0, pBuffer) == 0)
- WARN ("HeapFree failed with code %i\n", GetLastError ());
+ WARN ("HeapFree failed with code %li\n", GetLastError ());
return ret;
}
@@ -6222,7 +6222,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName,
if (HeapFree (hHeap, 0, pBuffer) == 0)
{
ret = GetLastError ();
- ERR ("HeapFree failed with code %i\n", ret);
+ ERR ("HeapFree failed with code %li\n", ret);
return ret;
}
@@ -6316,7 +6316,7 @@ BOOL WINAPI AddPortExA(LPSTR pName, DWORD level, LPBYTE pBuffer, LPSTR pMonitorN
pi2A = (PORT_INFO_2A *) pBuffer;
- TRACE("(%s, %d, %p, %s): %s\n", debugstr_a(pName), level, pBuffer,
+ TRACE("(%s, %ld, %p, %s): %s\n", debugstr_a(pName), level, pBuffer,
debugstr_a(pMonitorName), debugstr_a(pi2A ? pi2A->pPortName : NULL));
if ((level < 1) || (level > 2)) {
@@ -6398,7 +6398,7 @@ BOOL WINAPI AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR pMonito
pi2 = (PORT_INFO_2W *) pBuffer;
- TRACE("(%s, %d, %p, %s): %s %s %s\n", debugstr_w(pName), level, pBuffer,
+ TRACE("(%s, %ld, %p, %s): %s %s %s\n", debugstr_w(pName), level, pBuffer,
debugstr_w(pMonitorName), debugstr_w(pi2 ? pi2->pPortName : NULL),
debugstr_w(((level > 1) && pi2) ? pi2->pMonitorName : NULL),
debugstr_w(((level > 1) && pi2) ? pi2->pDescription : NULL));
@@ -6449,7 +6449,7 @@ BOOL WINAPI AddPrinterConnectionW( LPWSTR pName )
*/
BOOL WINAPI AddPrinterDriverExW( LPWSTR pName, DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags)
{
- TRACE("(%s, %d, %p, 0x%x)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags);
+ TRACE("(%s, %ld, %p, 0x%lx)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -6481,7 +6481,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW
DWORD len;
BOOL res = FALSE;
- TRACE("(%s, %d, %p, 0x%x)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags);
+ TRACE("(%s, %ld, %p, 0x%lx)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags);
diA = (DRIVER_INFO_8A *) pDriverInfo;
ZeroMemory(&diW, sizeof(diW));
@@ -6636,7 +6636,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW
}
res = AddPrinterDriverExW(nameW, Level, (LPBYTE) &diW, dwFileCopyFlags);
- TRACE("got %u with %u\n", res, GetLastError());
+ TRACE("got %u with %lu\n", res, GetLastError());
HeapFree(GetProcessHeap(), 0, nameW);
HeapFree(GetProcessHeap(), 0, diW.pName);
HeapFree(GetProcessHeap(), 0, diW.pEnvironment);
@@ -6658,7 +6658,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW
HeapFree(GetProcessHeap(), 0, diW.pszInfPath);
HeapFree(GetProcessHeap(), 0, diW.pszzCoreDriverDependencies);
- TRACE("=> %u with %u\n", res, GetLastError());
+ TRACE("=> %u with %lu\n", res, GetLastError());
return res;
}
@@ -6732,7 +6732,7 @@ BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
*/
HANDLE WINAPI ConnectToPrinterDlg( HWND hWnd, DWORD Flags )
{
- FIXME("%p %x\n", hWnd, Flags);
+ FIXME("%p %lx\n", hWnd, Flags);
return NULL;
}
@@ -6763,7 +6763,7 @@ BOOL WINAPI DeletePrinterDriverExW( LPWSTR pName, LPWSTR pEnvironment,
HKEY hkey_drivers;
BOOL ret = FALSE;
- TRACE("%s %s %s %x %x\n", debugstr_w(pName), debugstr_w(pEnvironment),
+ TRACE("%s %s %s %lx %lx\n", debugstr_w(pName), debugstr_w(pEnvironment),
debugstr_w(pDriverName), dwDeleteFlag, dwVersionFlag);
if(pName && pName[0])
@@ -6775,7 +6775,7 @@ BOOL WINAPI DeletePrinterDriverExW( LPWSTR pName, LPWSTR pEnvironment,
if(dwDeleteFlag)
{
- FIXME("dwDeleteFlag = %x - unsupported\n", dwDeleteFlag);
+ FIXME("dwDeleteFlag = %lx - unsupported\n", dwDeleteFlag);
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
@@ -6906,7 +6906,7 @@ BOOL WINAPI EnumFormsW( HANDLE printer, DWORD level, BYTE *form, DWORD size, DWO
{
HANDLE handle = get_backend_handle( printer );
- TRACE( "(%p, %d, %p, %d, %p, %p)\n", printer, level, form, size, needed, count );
+ TRACE( "(%p, %ld, %p, %ld, %p, %p)\n", printer, level, form, size, needed, count );
if (!handle)
{
@@ -6945,7 +6945,7 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors,
DWORD numentries = 0;
INT len;
- TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_a(pName), Level, pMonitors,
+ TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_a(pName), Level, pMonitors,
cbBuf, pcbNeeded, pcReturned);
/* convert servername to unicode */
@@ -6992,7 +6992,7 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors,
while (index < numentries) {
index++;
needed += entrysize; /* MONITOR_INFO_?A */
- TRACE("%p: parsing #%d (%s)\n", mi2w, index, debugstr_w(mi2w->pName));
+ TRACE("%p: parsing #%ld (%s)\n", mi2w, index, debugstr_w(mi2w->pName));
needed += WideCharToMultiByte(CP_ACP, 0, mi2w->pName, -1,
NULL, 0, NULL, NULL);
@@ -7022,7 +7022,7 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors,
/* Second Pass: Fill the User Buffer (if we have one) */
while ((index < numentries) && pMonitors) {
index++;
- TRACE("%p: writing MONITOR_INFO_%dA #%d\n", mi2a, Level, index);
+ TRACE("%p: writing MONITOR_INFO_%ldA #%ld\n", mi2a, Level, index);
mi2a->pName = ptr;
len = WideCharToMultiByte(CP_ACP, 0, mi2w->pName, -1,
ptr, cbBuf , NULL, NULL);
@@ -7053,7 +7053,7 @@ emA_cleanup:
HeapFree(GetProcessHeap(), 0, nameW);
HeapFree(GetProcessHeap(), 0, bufferW);
- TRACE("returning %d with %d (%d byte for %d entries)\n",
+ TRACE("returning %d with %ld (%ld byte for %ld entries)\n",
(res), GetLastError(), needed, numentries);
return (res);
@@ -7082,7 +7082,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors,
DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pMonitors,
+ TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pMonitors,
cbBuf, pcbNeeded, pcReturned);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -7155,7 +7155,7 @@ BOOL WINAPI XcvDataW( HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData,
{
opened_printer_t *printer;
- TRACE("(%p, %s, %p, %d, %p, %d, %p, %p)\n", hXcv, debugstr_w(pszDataName),
+ TRACE("(%p, %s, %p, %ld, %p, %ld, %p, %p)\n", hXcv, debugstr_w(pszDataName),
pInputData, cbInputData, pOutputData,
cbOutputData, pcbOutputNeeded, pdwStatus);
@@ -7192,7 +7192,7 @@ DWORD WINAPI EnumPrinterDataA( HANDLE hPrinter, DWORD dwIndex, LPSTR pValueName,
DWORD cbValueName, LPDWORD pcbValueName, LPDWORD pType, LPBYTE pData,
DWORD cbData, LPDWORD pcbData )
{
- FIXME("%p %x %p %x %p %p %p %x %p\n", hPrinter, dwIndex, pValueName,
+ FIXME("%p %lx %p %lx %p %p %p %lx %p\n", hPrinter, dwIndex, pValueName,
cbValueName, pcbValueName, pType, pData, cbData, pcbData);
return ERROR_NO_MORE_ITEMS;
}
@@ -7205,7 +7205,7 @@ DWORD WINAPI EnumPrinterDataW( HANDLE hPrinter, DWORD dwIndex, LPWSTR pValueName
DWORD cbValueName, LPDWORD pcbValueName, LPDWORD pType, LPBYTE pData,
DWORD cbData, LPDWORD pcbData )
{
- FIXME("%p %x %p %x %p %p %p %x %p\n", hPrinter, dwIndex, pValueName,
+ FIXME("%p %lx %p %lx %p %p %p %lx %p\n", hPrinter, dwIndex, pValueName,
cbValueName, pcbValueName, pType, pData, cbData, pcbData);
return ERROR_NO_MORE_ITEMS;
}
@@ -7216,7 +7216,7 @@ DWORD WINAPI EnumPrinterDataW( HANDLE hPrinter, DWORD dwIndex, LPWSTR pValueName
*/
DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, CHAR *subkey, DWORD size, DWORD *needed)
{
- FIXME("%p %s %p %x %p\n", printer, debugstr_a(key), subkey, size, needed);
+ FIXME("%p %s %p %lx %p\n", printer, debugstr_a(key), subkey, size, needed);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -7226,7 +7226,7 @@ DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, CHAR *subkey, DWOR
*/
DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, WCHAR *subkey, DWORD size, DWORD *needed)
{
- FIXME("%p %s %p %x %p\n", printer, debugstr_w(key), subkey, size, needed);
+ FIXME("%p %s %p %lx %p\n", printer, debugstr_w(key), subkey, size, needed);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -7238,7 +7238,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesA(LPSTR pName, LPSTR pPrintProcessorName,
DWORD Level, LPBYTE pDatatypes, DWORD cbBuf,
LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- FIXME("Stub: %s %s %d %p %d %p %p\n", debugstr_a(pName),
+ FIXME("Stub: %s %s %ld %p %ld %p %p\n", debugstr_a(pName),
debugstr_a(pPrintProcessorName), Level, pDatatypes, cbBuf,
pcbNeeded, pcReturned);
return FALSE;
@@ -7252,7 +7252,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorNam
DWORD Level, LPBYTE pDatatypes, DWORD cbBuf,
LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- FIXME("Stub: %s %s %d %p %d %p %p\n", debugstr_w(pName),
+ FIXME("Stub: %s %s %ld %p %ld %p %p\n", debugstr_w(pName),
debugstr_w(pPrintProcessorName), Level, pDatatypes, cbBuf,
pcbNeeded, pcReturned);
return FALSE;
@@ -7275,7 +7275,7 @@ BOOL WINAPI EnumPrintProcessorsA(LPSTR pName, LPSTR pEnvironment, DWORD Level,
DWORD numentries = 0;
INT len;
- TRACE("(%s, %s, %d, %p, %d, %p, %p)\n", debugstr_a(pName), debugstr_a(pEnvironment),
+ TRACE("(%s, %s, %ld, %p, %ld, %p, %p)\n", debugstr_a(pName), debugstr_a(pEnvironment),
Level, pPPInfo, cbBuf, pcbNeeded, pcReturned);
/* convert names to unicode */
@@ -7321,7 +7321,7 @@ BOOL WINAPI EnumPrintProcessorsA(LPSTR pName, LPSTR pEnvironment, DWORD Level,
while (index < numentries) {
index++;
needed += sizeof(PRINTPROCESSOR_INFO_1A);
- TRACE("%p: parsing #%d (%s)\n", ppiw, index, debugstr_w(ppiw->pName));
+ TRACE("%p: parsing #%ld (%s)\n", ppiw, index, debugstr_w(ppiw->pName));
needed += WideCharToMultiByte(CP_ACP, 0, ppiw->pName, -1,
NULL, 0, NULL, NULL);
@@ -7346,7 +7346,7 @@ BOOL WINAPI EnumPrintProcessorsA(LPSTR pName, LPSTR pEnvironment, DWORD Level,
/* Second Pass: Fill the User Buffer (if we have one) */
while ((index < numentries) && pPPInfo) {
index++;
- TRACE("%p: writing PRINTPROCESSOR_INFO_1A #%d\n", ppia, index);
+ TRACE("%p: writing PRINTPROCESSOR_INFO_1A #%ld\n", ppia, index);
ppia->pName = ptr;
len = WideCharToMultiByte(CP_ACP, 0, ppiw->pName, -1,
ptr, cbBuf , NULL, NULL);
@@ -7366,7 +7366,7 @@ epp_cleanup:
HeapFree(GetProcessHeap(), 0, envW);
HeapFree(GetProcessHeap(), 0, bufferW);
- TRACE("returning %d with %d (%d byte for %d entries)\n",
+ TRACE("returning %d with %ld (%ld byte for %ld entries)\n",
(res), GetLastError(), needed, numentries);
return (res);
@@ -7395,7 +7395,7 @@ BOOL WINAPI EnumPrintProcessorsW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level,
LPBYTE pPPInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)
{
- TRACE("(%s, %s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment),
+ TRACE("(%s, %s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment),
Level, pPPInfo, cbBuf, pcbNeeded, pcReturned);
if ((backend == NULL) && !load_backend()) return FALSE;
@@ -7422,7 +7422,7 @@ LONG WINAPI ExtDeviceMode( HWND hWnd, HANDLE hInst, LPDEVMODEA pDevModeOutput,
LPSTR pDeviceName, LPSTR pPort, LPDEVMODEA pDevModeInput, LPSTR pProfile,
DWORD fMode)
{
- FIXME("Stub: %p %p %p %s %s %p %s %x\n", hWnd, hInst, pDevModeOutput,
+ FIXME("Stub: %p %p %p %s %s %p %s %lx\n", hWnd, hInst, pDevModeOutput,
debugstr_a(pDeviceName), debugstr_a(pPort), pDevModeInput,
debugstr_a(pProfile), fMode);
return -1;
@@ -7445,7 +7445,7 @@ BOOL WINAPI FindClosePrinterChangeNotification( HANDLE hChange )
HANDLE WINAPI FindFirstPrinterChangeNotification( HANDLE hPrinter,
DWORD fdwFlags, DWORD fdwOptions, LPVOID pPrinterNotifyOptions )
{
- FIXME("Stub: %p %x %x %p\n",
+ FIXME("Stub: %p %lx %lx %p\n",
hPrinter, fdwFlags, fdwOptions, pPrinterNotifyOptions);
return INVALID_HANDLE_VALUE;
}
@@ -7649,7 +7649,7 @@ static BOOL get_job_info(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob,
job_t *job;
LPBYTE ptr = pJob;
- TRACE("%p %d %d %p %d %p\n", hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded);
+ TRACE("%p %ld %ld %p %ld %p\n", hPrinter, JobId, Level, pJob, cbBuf, pcbNeeded);
EnterCriticalSection(&printer_handles_cs);
job = get_job(hPrinter, JobId);
@@ -7832,7 +7832,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID )
BOOL ret = FALSE;
struct list *cursor, *cursor2;
- TRACE("(%p, %x)\n", hPrinter, dwJobID);
+ TRACE("(%p, %lx)\n", hPrinter, dwJobID);
EnterCriticalSection(&printer_handles_cs);
printer = get_opened_printer(hPrinter);
if(!printer)
@@ -7862,7 +7862,7 @@ BOOL WINAPI ScheduleJob( HANDLE hPrinter, DWORD dwJobID )
GetPrinterW(hPrinter, 5, (LPBYTE)pi5, needed, &needed);
portname = pi5->pPortName;
}
- TRACE("need to schedule job %d filename %s to port %s\n", job->job_id, debugstr_w(job->filename),
+ TRACE("need to schedule job %ld filename %s to port %s\n", job->job_id, debugstr_w(job->filename),
debugstr_w(portname));
if (!wcsncmp( portname, L"FILE:", ARRAY_SIZE(L"FILE:") - 1 ))
@@ -8032,7 +8032,7 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc )
HRESULT WINAPI UploadPrinterDriverPackageA( LPCSTR server, LPCSTR path, LPCSTR env,
DWORD flags, HWND hwnd, LPSTR dst, PULONG dstlen )
{
- FIXME("%s, %s, %s, %x, %p, %p, %p\n", debugstr_a(server), debugstr_a(path), debugstr_a(env),
+ FIXME("%s, %s, %s, %lx, %p, %p, %p\n", debugstr_a(server), debugstr_a(path), debugstr_a(env),
flags, hwnd, dst, dstlen);
return E_NOTIMPL;
}
@@ -8043,7 +8043,7 @@ HRESULT WINAPI UploadPrinterDriverPackageA( LPCSTR server, LPCSTR path, LPCSTR e
HRESULT WINAPI UploadPrinterDriverPackageW( LPCWSTR server, LPCWSTR path, LPCWSTR env,
DWORD flags, HWND hwnd, LPWSTR dst, PULONG dstlen )
{
- FIXME("%s, %s, %s, %x, %p, %p, %p\n", debugstr_w(server), debugstr_w(path), debugstr_w(env),
+ FIXME("%s, %s, %s, %lx, %p, %p, %p\n", debugstr_w(server), debugstr_w(path), debugstr_w(env),
flags, hwnd, dst, dstlen);
return E_NOTIMPL;
}
diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c
index 2555692b097..ff0e4418719 100644
--- a/dlls/winspool.drv/wspool.c
+++ b/dlls/winspool.drv/wspool.c
@@ -97,7 +97,7 @@ BOOL load_backend(void)
LeaveCriticalSection(&backend_cs);
- WARN("failed to load the backend: %u\n", GetLastError());
+ WARN("failed to load the backend: %lu\n", GetLastError());
SetLastError(RPC_S_SERVER_UNAVAILABLE);
return FALSE;
}
1
0
[PATCH v2] d2d1: Stub and add ID2D1PathGeometry1 interface to d2d1_1.idl.
by James McDonnell 12 May '22
by James McDonnell 12 May '22
12 May '22
Signed-off-by: James McDonnell <topgamer7(a)gmail.com>
---
dlls/d2d1/factory.c | 14 ++++++--
dlls/d2d1/geometry.c | 82 +++++++++++++++++++++++++-------------------
include/d2d1_1.idl | 17 ++++++++-
3 files changed, 75 insertions(+), 38 deletions(-)
diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index f0f61674889..01dac8051c0 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -521,9 +521,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory3 *i
static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory3 *iface, ID2D1PathGeometry1 **geometry)
{
- FIXME("iface %p, geometry %p stub!\n", iface, geometry);
+ struct d2d_geometry *object;
- return E_NOTIMPL;
+ TRACE("iface %p, geometry %p.\n", iface, geometry);
+
+ if (!(object = heap_alloc_zero(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ d2d_path_geometry_init(object, (ID2D1Factory *)iface);
+
+ TRACE("Created path geometry %p.\n", object);
+ *geometry = (ID2D1PathGeometry1 *)&object->ID2D1Geometry_iface;
+
+ return S_OK;
}
static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory3 *iface,
diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index eb1bb353b4c..0ea6a0b1799 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -3354,21 +3354,22 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
d2d_geometry_sink_AddArc,
};
-static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface)
+static inline struct d2d_geometry *impl_from_ID2D1PathGeometry1(ID2D1PathGeometry1 *iface)
{
return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry1 *iface, REFIID iid, void **out)
{
TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
- if (IsEqualGUID(iid, &IID_ID2D1PathGeometry)
+ if (IsEqualGUID(iid, &IID_ID2D1PathGeometry1)
+ || IsEqualGUID(iid, &IID_ID2D1PathGeometry)
|| IsEqualGUID(iid, &IID_ID2D1Geometry)
|| IsEqualGUID(iid, &IID_ID2D1Resource)
|| IsEqualGUID(iid, &IID_IUnknown))
{
- ID2D1PathGeometry_AddRef(iface);
+ ID2D1PathGeometry1_AddRef(iface);
*out = iface;
return S_OK;
}
@@ -3379,9 +3380,9 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeome
return E_NOINTERFACE;
}
-static ULONG STDMETHODCALLTYPE d2d_path_geometry_AddRef(ID2D1PathGeometry *iface)
+static ULONG STDMETHODCALLTYPE d2d_path_geometry_AddRef(ID2D1PathGeometry1 *iface)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
ULONG refcount = InterlockedIncrement(&geometry->refcount);
TRACE("%p increasing refcount to %lu.\n", iface, refcount);
@@ -3389,9 +3390,9 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_AddRef(ID2D1PathGeometry *iface
return refcount;
}
-static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *iface)
+static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry1 *iface)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
ULONG refcount = InterlockedDecrement(&geometry->refcount);
TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
@@ -3406,19 +3407,19 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac
return refcount;
}
-static void STDMETHODCALLTYPE d2d_path_geometry_GetFactory(ID2D1PathGeometry *iface, ID2D1Factory **factory)
+static void STDMETHODCALLTYPE d2d_path_geometry_GetFactory(ID2D1PathGeometry1 *iface, ID2D1Factory **factory)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
TRACE("iface %p, factory %p.\n", iface, factory);
ID2D1Factory_AddRef(*factory = geometry->factory);
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
size_t i;
TRACE("iface %p, transform %p, bounds %p.\n", iface, transform, bounds);
@@ -3536,7 +3537,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry *
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetWidenedBounds(ID2D1PathGeometry *iface, float stroke_width,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetWidenedBounds(ID2D1PathGeometry1 *iface, float stroke_width,
ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform, float tolerance, D2D1_RECT_F *bounds)
{
FIXME("iface %p, stroke_width %.8e, stroke_style %p, transform %p, tolerance %.8e, bounds %p stub!\n",
@@ -3545,11 +3546,11 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetWidenedBounds(ID2D1PathGeo
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1PathGeometry1 *iface,
D2D1_POINT_2F point, float stroke_width, ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform,
float tolerance, BOOL *contains)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
enum d2d_vertex_type type = D2D_VERTEX_TYPE_NONE;
unsigned int i, j, bezier_idx;
D2D1_BEZIER_SEGMENT b;
@@ -3630,10 +3631,10 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1Path
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_FillContainsPoint(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_FillContainsPoint(ID2D1PathGeometry1 *iface,
D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
D2D1_MATRIX_3X2_F g_i;
TRACE("iface %p, point %s, transform %p, tolerance %.8e, contains %p.\n",
@@ -3653,7 +3654,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_FillContainsPoint(ID2D1PathGe
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CompareWithGeometry(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CompareWithGeometry(ID2D1PathGeometry1 *iface,
ID2D1Geometry *geometry, const D2D1_MATRIX_3X2_F *transform, float tolerance, D2D1_GEOMETRY_RELATION *relation)
{
FIXME("iface %p, geometry %p, transform %p, tolerance %.8e, relation %p stub!\n",
@@ -3707,11 +3708,11 @@ static void d2d_geometry_flatten_cubic(ID2D1SimplifiedGeometrySink *sink, const
ID2D1SimplifiedGeometrySink_SetSegmentFlags(sink, D2D1_PATH_SEGMENT_NONE);
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry1 *iface,
D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, const D2D1_MATRIX_3X2_F *transform, float tolerance,
ID2D1SimplifiedGeometrySink *sink)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
enum d2d_vertex_type type = D2D_VERTEX_TYPE_NONE;
unsigned int i, j, bezier_idx;
D2D1_FIGURE_BEGIN begin;
@@ -3795,7 +3796,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Tessellate(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Tessellate(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, float tolerance, ID2D1TessellationSink *sink)
{
FIXME("iface %p, transform %p, tolerance %.8e, sink %p stub!\n", iface, transform, tolerance, sink);
@@ -3803,7 +3804,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Tessellate(ID2D1PathGeometry
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CombineWithGeometry(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CombineWithGeometry(ID2D1PathGeometry1 *iface,
ID2D1Geometry *geometry, D2D1_COMBINE_MODE combine_mode, const D2D1_MATRIX_3X2_F *transform,
float tolerance, ID2D1SimplifiedGeometrySink *sink)
{
@@ -3813,7 +3814,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CombineWithGeometry(ID2D1Path
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Outline(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Outline(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, float tolerance, ID2D1SimplifiedGeometrySink *sink)
{
FIXME("iface %p, transform %p, tolerance %.8e, sink %p stub!\n", iface, transform, tolerance, sink);
@@ -3821,7 +3822,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Outline(ID2D1PathGeometry *if
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeArea(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeArea(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, float tolerance, float *area)
{
FIXME("iface %p, transform %p, tolerance %.8e, area %p stub!\n", iface, transform, tolerance, area);
@@ -3829,7 +3830,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeArea(ID2D1PathGeometry
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeLength(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeLength(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, float tolerance, float *length)
{
FIXME("iface %p, transform %p, tolerance %.8e, length %p stub!\n", iface, transform, tolerance, length);
@@ -3837,7 +3838,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeLength(ID2D1PathGeomet
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputePointAtLength(ID2D1PathGeometry *iface, float length,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputePointAtLength(ID2D1PathGeometry1 *iface, float length,
const D2D1_MATRIX_3X2_F *transform, float tolerance, D2D1_POINT_2F *point, D2D1_POINT_2F *tangent)
{
FIXME("iface %p, length %.8e, transform %p, tolerance %.8e, point %p, tangent %p stub!\n",
@@ -3846,7 +3847,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputePointAtLength(ID2D1Pat
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Widen(ID2D1PathGeometry *iface, float stroke_width,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Widen(ID2D1PathGeometry1 *iface, float stroke_width,
ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform, float tolerance,
ID2D1SimplifiedGeometrySink *sink)
{
@@ -3856,9 +3857,9 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Widen(ID2D1PathGeometry *ifac
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Open(ID2D1PathGeometry *iface, ID2D1GeometrySink **sink)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Open(ID2D1PathGeometry1 *iface, ID2D1GeometrySink **sink)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
TRACE("iface %p, sink %p.\n", iface, sink);
@@ -3873,16 +3874,16 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Open(ID2D1PathGeometry *iface
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Stream(ID2D1PathGeometry *iface, ID2D1GeometrySink *sink)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Stream(ID2D1PathGeometry1 *iface, ID2D1GeometrySink *sink)
{
FIXME("iface %p, sink %p stub!\n", iface, sink);
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetSegmentCount(ID2D1PathGeometry *iface, UINT32 *count)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetSegmentCount(ID2D1PathGeometry1 *iface, UINT32 *count)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
TRACE("iface %p, count %p.\n", iface, count);
@@ -3894,9 +3895,9 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetSegmentCount(ID2D1PathGeom
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetFigureCount(ID2D1PathGeometry *iface, UINT32 *count)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetFigureCount(ID2D1PathGeometry1 *iface, UINT32 *count)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
TRACE("iface %p, count %p.\n", iface, count);
@@ -3908,7 +3909,17 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetFigureCount(ID2D1PathGeome
return S_OK;
}
-static const struct ID2D1PathGeometryVtbl d2d_path_geometry_vtbl =
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry1_ComputePointAndSegmentAtLength(ID2D1PathGeometry1 *iface,
+ float length, UINT32 startSegment, const D2D1_MATRIX_3X2_F *transform, float tolerance,
+ D2D1_POINT_DESCRIPTION *pointDescription)
+{
+ FIXME("iface %p, length %.8e, startSegment %u, transform %p, tolerance %.8e, pointDescription %p",
+ iface, length, startSegment, transform, tolerance, pointDescription);
+
+ return E_NOTIMPL;
+}
+
+static const struct ID2D1PathGeometry1Vtbl d2d_path_geometry_vtbl =
{
d2d_path_geometry_QueryInterface,
d2d_path_geometry_AddRef,
@@ -3931,6 +3942,7 @@ static const struct ID2D1PathGeometryVtbl d2d_path_geometry_vtbl =
d2d_path_geometry_Stream,
d2d_path_geometry_GetSegmentCount,
d2d_path_geometry_GetFigureCount,
+ d2d_path_geometry1_ComputePointAndSegmentAtLength,
};
void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory)
diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl
index fdec8ae5f9c..3edbba84320 100644
--- a/include/d2d1_1.idl
+++ b/include/d2d1_1.idl
@@ -20,7 +20,6 @@ import "d2d1.idl";
import "d2d1effects.idl";
interface ID2D1DeviceContext;
-interface ID2D1PathGeometry1;
interface ID2D1Properties;
interface IPrintDocumentPackageTarget;
interface ID2D1PrintControl;
@@ -349,6 +348,22 @@ interface ID2D1GdiMetafile : ID2D1Resource
);
}
+[
+ object,
+ uuid(62baa2d2-ab54-41b7-b872-787e0106a421),
+ local,
+]
+interface ID2D1PathGeometry1 : ID2D1PathGeometry
+{
+ HRESULT ComputePointAndSegmentAtLength(
+ [in] float length,
+ [in] UINT32 startSegment,
+ [in, optional] const D2D1_MATRIX_3X2_F *transform,
+ [in] float tolerance,
+ [out] D2D1_POINT_DESCRIPTION *pointDescription
+ );
+}
+
[
object,
uuid(483473d7-cd46-4f9d-9d3a-3112aa80159d),
--
2.35.1
1
0
Re: [PATCH v2 0/1] MR52: include: Add TF_TMF/TMAW defines - approved
by Alexandre Julliard (ï¼ julliard) 12 May '22
by Alexandre Julliard (ï¼ julliard) 12 May '22
12 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/52
1
0
Re: [PATCH v3 0/5] MR64: win32u: Move more of default window proc from user32. - approved
by Alexandre Julliard (ï¼ julliard) 12 May '22
by Alexandre Julliard (ï¼ julliard) 12 May '22
12 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/64
1
0
Re: [PATCH v2 0/1] MR58: crypt32/tests: Handle CERT_NAME_SEARCH_ALL_NAMES_FLAG being unsupported before Win8. - approved
by Alexandre Julliard (ï¼ julliard) 12 May '22
by Alexandre Julliard (ï¼ julliard) 12 May '22
12 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/58
1
0
Re: [PATCH v3 0/6] MR55: ntdll: Factor out heap status handling and locking. - approved
by Alexandre Julliard (ï¼ julliard) 12 May '22
by Alexandre Julliard (ï¼ julliard) 12 May '22
12 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/55
1
0
[PATCH v2 0/1] MR60: d3drm: Support IDirect3D3 when creating device
by Alistair Leslie-Hughes (ï¼ alesliehughes) 12 May '22
by Alistair Leslie-Hughes (ï¼ alesliehughes) 12 May '22
12 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39346
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
--
v2: d3drm: Support IDirect3D3 when creating device.
https://gitlab.winehq.org/wine/wine/-/merge_requests/60
3
2
[PATCH 0/5] MR61: winegstreamer: Dynamic transform stream format change support.
by Rémi Bernon (ï¼ rbernon) 12 May '22
by Rémi Bernon (ï¼ rbernon) 12 May '22
12 May '22
Compared to last attempt, I moved the format pointer to a dedicated `wg_transform_read_data` parameter instead of a property of the sample. Most of the transforms use `NULL` there as they don't expect or support format change. H264 decoder passes a transform format member where it tracks the current stream format.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/61
3
11
[PATCH v2 0/9] MR34: windows.media.speech: Changes for IAsyncAction.
by Bernhard Kölbl (ï¼ besentv) 12 May '22
by Bernhard Kölbl (ï¼ besentv) 12 May '22
12 May '22
Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
--
v2: windows.media.speech/tests: Add some recognition tests.
windows.media.speech/tests: Make use of a helper function for IAsyncInfo checking.
windows.media.speech/tests: Add await helper for IAsyncOperation.
windows.media.speech/tests: Retype AsyncOperationCompletedHandler to IInspectable.
windows.media.speech: Rename impl_from_IAsyncInfo to async_inspectable_impl_from_IAsyncInfo.
windows.media.speech: Rename async_operation to async_inspectable.
windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed.
windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent.
windows.media.speech: Add a missing trace to async_operation_create.
https://gitlab.winehq.org/wine/wine/-/merge_requests/34
3
10
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/d2d1/bitmap.c | 65 ++++++++++++++++++++++++++++++++++++++--
dlls/d2d1/d2d1_private.h | 1 +
2 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index 971e3c7ff6b..bab3575c431 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -226,12 +226,73 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXG
return *surface ? S_OK : D2DERR_INVALID_CALL;
}
+static unsigned int d3d11_cpu_access_from_d2d1_map_options(map_options)
+{
+ unsigned int cpu_access = 0;
+
+ if (map_options & D2D1_MAP_OPTIONS_READ)
+ cpu_access |= D3D11_CPU_ACCESS_READ;
+ if (map_options & D2D1_MAP_OPTIONS_WRITE)
+ cpu_access |= D3D11_CPU_ACCESS_WRITE;
+ if (map_options &= ~(D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_WRITE))
+ FIXME("Unhandled map options flags %#x.\n", map_options);
+
+ return cpu_access;
+}
+
+static unsigned int d3d11_map_from_d2d1_map_options(map_options)
+{
+ unsigned int map = 0;
+
+ if (map_options & D2D1_MAP_OPTIONS_READ)
+ map |= D3D11_MAP_READ;
+ if (map_options & D2D1_MAP_OPTIONS_WRITE)
+ map |= D3D11_MAP_WRITE;
+ if (map_options &= ~(D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_WRITE))
+ FIXME("Unhandled map options flags %#x.\n", map_options);
+
+ return map;
+}
+
static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OPTIONS options,
D2D1_MAPPED_RECT *mapped_rect)
{
- FIXME("iface %p, options %#x, mapped_rect %p stub!\n", iface, options, mapped_rect);
+ struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface);
+ ID3D11Device *device;
+ ID3D11DeviceContext *context;
+ D3D11_TEXTURE2D_DESC texture_desc;
+ ID3D11Texture2D *staging_texture;
+ D3D11_MAPPED_SUBRESOURCE mapped_subresource;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, options %#x, mapped_rect %p.\n", iface, options, mapped_rect);
+
+ ID3D11Resource_GetDevice(bitmap->resource, &device);
+ ID3D11Device_GetImmediateContext(device, &context);
+ ID3D11Texture2D_GetDesc((ID3D11Texture2D *)bitmap->resource, &texture_desc);
+
+ texture_desc.Usage = D3D11_USAGE_STAGING;
+ texture_desc.BindFlags = 0;
+ texture_desc.CPUAccessFlags = d3d11_cpu_access_from_d2d1_map_options(options);
+ ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &staging_texture);
+ ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)staging_texture, bitmap->resource);
+ if (SUCCEEDED(hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)staging_texture, 0,
+ d3d11_map_from_d2d1_map_options(options), 0, &mapped_subresource)))
+ {
+ mapped_rect->pitch = mapped_subresource.RowPitch;
+ mapped_rect->bits = mapped_subresource.pData;
+ bitmap->staging_resource = (ID3D11Resource *)staging_texture;
+ }
+ else
+ {
+ WARN("Failed to map resource, hr %#lx.\n", hr);
+ ID3D11Texture2D_Release(staging_texture);
+ }
+
+ ID3D11DeviceContext_Release(context);
+ ID3D11Device_Release(device);
+
+ return hr;
}
static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface)
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index aa8e8569455..da5f9b5a90a 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -382,6 +382,7 @@ struct d2d_bitmap
ID3D11RenderTargetView *rtv;
IDXGISurface *surface;
ID3D11Resource *resource;
+ ID3D11Resource *staging_resource;
D2D1_SIZE_U pixel_size;
D2D1_PIXEL_FORMAT format;
float dpi_x;
--
2.35.3
2
7
[PATCH v2] oleacc: Add support for retrieving an HWND from accNavigate to WindowFromAccessibleObject.
by Connor McAdams 12 May '22
by Connor McAdams 12 May '22
12 May '22
Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>
---
-v2: Fix test failures on 32-bit, make commit subject more clear.
In the prior commit message I wrote about changing behavior around
get_accParent, that was inaccurate. The only difference here is that we
call the accNavigate method only on the initial IAccessible, and not on
any of the IAccessibles returned from get_accParent.
---
dlls/oleacc/main.c | 34 +++++++++--
dlls/oleacc/tests/main.c | 120 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 148 insertions(+), 6 deletions(-)
diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c
index dced84be7b5..0add9d9549d 100644
--- a/dlls/oleacc/main.c
+++ b/dlls/oleacc/main.c
@@ -402,20 +402,36 @@ HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd)
{
IDispatch *parent;
IOleWindow *ow;
+ VARIANT v, cid;
HRESULT hres;
TRACE("%p %p\n", acc, phwnd);
IAccessible_AddRef(acc);
- while(1) {
- hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow);
- if(SUCCEEDED(hres)) {
- hres = IOleWindow_GetWindow(ow, phwnd);
- IOleWindow_Release(ow);
+
+ ow = NULL;
+ hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow);
+ if(SUCCEEDED(hres)) {
+ hres = IOleWindow_GetWindow(ow, phwnd);
+ IOleWindow_Release(ow);
+ if(*phwnd) {
IAccessible_Release(acc);
return hres;
}
+ }
+
+ VariantInit(&v);
+ variant_init_i4(&cid, CHILDID_SELF);
+ hres = IAccessible_accNavigate(acc, 10, cid, &v);
+ if(SUCCEEDED(hres) && V_VT(&v) == VT_I4)
+ *phwnd = IntToPtr(V_I4(&v));
+
+ if(ow) {
+ IAccessible_Release(acc);
+ return S_OK;
+ }
+ while(1) {
hres = IAccessible_get_accParent(acc, &parent);
IAccessible_Release(acc);
if(FAILED(hres))
@@ -429,6 +445,14 @@ HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd)
IDispatch_Release(parent);
if(FAILED(hres))
return hres;
+
+ hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow);
+ if(SUCCEEDED(hres)) {
+ hres = IOleWindow_GetWindow(ow, phwnd);
+ IOleWindow_Release(ow);
+ IAccessible_Release(acc);
+ return hres;
+ }
}
}
diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c
index 7854764ec08..43dfa039f34 100644
--- a/dlls/oleacc/tests/main.c
+++ b/dlls/oleacc/tests/main.c
@@ -59,8 +59,10 @@ DEFINE_EXPECT(Accessible_get_accChildCount);
DEFINE_EXPECT(Accessible_get_accChild);
DEFINE_EXPECT(Accessible_get_accName);
DEFINE_EXPECT(Accessible_get_accParent);
+DEFINE_EXPECT(Accessible_accNavigate);
DEFINE_EXPECT(Accessible_child_get_accName);
DEFINE_EXPECT(Accessible_child_get_accParent);
+DEFINE_EXPECT(Accessible_child_accNavigate);
static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND);
@@ -91,7 +93,11 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2)
return unk1 == unk2;
}
+static IAccessible Accessible;
static IAccessible Accessible_child;
+static IOleWindow OleWindow;
+static HWND Accessible_accnav_hwnd = NULL;
+static HWND OleWindow_hwnd = NULL;
static HRESULT WINAPI Accessible_QueryInterface(
IAccessible *iface, REFIID riid, void **ppvObject)
@@ -104,6 +110,12 @@ static HRESULT WINAPI Accessible_QueryInterface(
return S_OK;
}
+ if(IsEqualIID(riid, &IID_IOleWindow) && (iface == &Accessible)) {
+ *ppvObject = &OleWindow;
+ IAccessible_AddRef(iface);
+ return S_OK;
+ }
+
if(IsEqualIID(riid, &IID_IEnumVARIANT)) {
CHECK_EXPECT(Accessible_QI_IEnumVARIANT);
return E_NOINTERFACE;
@@ -155,7 +167,12 @@ static HRESULT WINAPI Accessible_get_accParent(
IAccessible *iface, IDispatch **ppdispParent)
{
if(iface == &Accessible_child)
+ {
CHECK_EXPECT(Accessible_child_get_accParent);
+ if (OleWindow_hwnd)
+ return IAccessible_QueryInterface(&Accessible, &IID_IDispatch,
+ (void **)ppdispParent);
+ }
else
CHECK_EXPECT(Accessible_get_accParent);
@@ -295,7 +312,21 @@ static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *pxLeft,
static HRESULT WINAPI Accessible_accNavigate(IAccessible *iface,
LONG navDir, VARIANT varStart, VARIANT *pvarEnd)
{
- ok(0, "unexpected call\n");
+ if(iface == &Accessible_child)
+ CHECK_EXPECT(Accessible_child_accNavigate);
+ else
+ CHECK_EXPECT(Accessible_accNavigate);
+
+ /*
+ * Magic number value for retrieving an HWND. Used by DynamicAnnotation
+ * IAccessible wrapper.
+ */
+ if(navDir == 10) {
+ V_VT(pvarEnd) = VT_I4;
+ V_I4(pvarEnd) = HandleToULong(Accessible_accnav_hwnd);
+ return S_OK;
+ }
+
return E_NOTIMPL;
}
@@ -358,8 +389,44 @@ static IAccessibleVtbl AccessibleVtbl = {
Accessible_put_accValue
};
+static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **obj)
+{
+ return IAccessible_QueryInterface(&Accessible, riid, obj);
+}
+
+static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface)
+{
+ return IAccessible_AddRef(&Accessible);
+}
+
+static ULONG WINAPI OleWindow_Release(IOleWindow *iface)
+{
+ return IAccessible_Release(&Accessible);
+}
+
+static HRESULT WINAPI OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd)
+{
+ *hwnd = OleWindow_hwnd;
+ return S_OK;
+}
+
+static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL f_enter_mode)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static const IOleWindowVtbl OleWindowVtbl = {
+ OleWindow_QueryInterface,
+ OleWindow_AddRef,
+ OleWindow_Release,
+ OleWindow_GetWindow,
+ OleWindow_ContextSensitiveHelp
+};
+
static IAccessible Accessible = {&AccessibleVtbl};
static IAccessible Accessible_child = {&AccessibleVtbl};
+static IOleWindow OleWindow = {&OleWindowVtbl};
static void test_getroletext(void)
{
@@ -1826,6 +1893,56 @@ static void test_default_edit_accessible_object(void)
DestroyWindow(hwnd);
}
+static void test_WindowFromAccessibleObject(void)
+{
+ HRESULT hr;
+ HWND hwnd;
+
+ /* Successfully retrieve an HWND from the IOleWindow interface. */
+ Accessible_accnav_hwnd = NULL;
+ OleWindow_hwnd = (HWND)0xdeadf00d;
+ hwnd = (HWND)0xdeadbeef;
+ hr = WindowFromAccessibleObject(&Accessible, &hwnd);
+ ok(hr == S_OK, "got %lx\n", hr);
+ ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n");
+
+ /* Successfully retrieve an HWND from IAccessible::accNavigate. */
+ Accessible_accnav_hwnd = (HWND)0xdeadf00d;
+ OleWindow_hwnd = NULL;
+ hwnd = (HWND)0xdeadbeef;
+ SET_EXPECT(Accessible_accNavigate);
+ hr = WindowFromAccessibleObject(&Accessible, &hwnd);
+ ok(hr == S_OK, "got %lx\n", hr);
+ /* This value gets sign-extended on 64-bit. */
+ ok(hwnd == IntToPtr(0xdeadf00d), "hwnd != 0xdeadf00d!\n", hwnd);
+ CHECK_CALLED(Accessible_accNavigate);
+
+ /* Return a NULL HWND from both methods, no accParent call. */
+ Accessible_accnav_hwnd = NULL;
+ OleWindow_hwnd = NULL;
+ hwnd = (HWND)0xdeadbeef;
+ SET_EXPECT(Accessible_accNavigate);
+ hr = WindowFromAccessibleObject(&Accessible, &hwnd);
+ ok(hr == S_OK, "got %lx\n", hr);
+ ok(!hwnd, "hwnd %p\n", hwnd);
+ CHECK_CALLED(Accessible_accNavigate);
+
+ /* Successfully retrieve an HWND from a parent IAccessible's IOleWindow interface. */
+ Accessible_accnav_hwnd = NULL;
+ OleWindow_hwnd = (HWND)0xdeadf00d;
+ hwnd = (HWND)0xdeadbeef;
+ SET_EXPECT(Accessible_child_accNavigate);
+ SET_EXPECT(Accessible_child_get_accParent);
+ hr = WindowFromAccessibleObject(&Accessible_child, &hwnd);
+ ok(hr == S_OK, "got %lx\n", hr);
+ ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n");
+ CHECK_CALLED(Accessible_child_accNavigate);
+ CHECK_CALLED(Accessible_child_get_accParent);
+
+ Accessible_accnav_hwnd = NULL;
+ OleWindow_hwnd = NULL;
+}
+
START_TEST(main)
{
int argc;
@@ -1867,6 +1984,7 @@ START_TEST(main)
test_AccessibleObjectFromPoint();
test_CreateStdAccessibleObject_classes();
test_default_edit_accessible_object();
+ test_WindowFromAccessibleObject();
unregister_window_class();
CoUninitialize();
--
2.25.1
2
1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
MAINTAINERS | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index c569409be90..b012f3c4e09 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -58,7 +58,8 @@ F: dlls/comdlg32/itemdlg.c
F: dlls/comdlg32/tests/itemdlg.c
Direct2D
-M: Henri Verbeet <hverbeet(a)codeweavers.com>
+M: Nikolay Sivov <nsivov(a)codeweavers.com>
+P: Henri Verbeet <hverbeet(a)codeweavers.com>
F: dlls/d2d*/
Direct3D
--
2.30.2
1
0
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
As previously discussed. Although I think the events that prompted this
are regrettable, the truth is also that I likely would have handed this
over to Józef some years ago anyway if things had gone differently.
MAINTAINERS | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 14fe2e0cb9b..c569409be90 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -62,7 +62,9 @@ M: Henri Verbeet <hverbeet(a)codeweavers.com>
F: dlls/d2d*/
Direct3D
-M: Henri Verbeet <hverbeet(a)codeweavers.com>
+M: Zebediah Figura <z.figura12(a)gmail.com>
+M: Jan Sikorski <jsikorski(a)codeweavers.com>
+P: Henri Verbeet <hverbeet(a)codeweavers.com>
P: Stefan Dösinger <stefan(a)codeweavers.com>
P: Matteo Bruni <mbruni(a)codeweavers.com>
F: dlls/d3d10core/
--
2.30.2
1
0
[PATCH v2 0/5] MR64: win32u: Move more of default window proc from user32.
by Jacek Caban (ï¼ jacek) 12 May '22
by Jacek Caban (ï¼ jacek) 12 May '22
12 May '22
--
v2: win32u: Move default WM_WINDOWPOSCHANGING implementation from user32.
https://gitlab.winehq.org/wine/wine/-/merge_requests/64
4
9
12 May '22
v3: Add missing AddRef() to ::SetImage(). Thanks Nikolay.
v4: Fix a typo in ::GetImage implementation.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/d2d1/brush.c | 302 ++++++++++++++++++++++++++++++++++++++-
dlls/d2d1/d2d1_private.h | 11 ++
dlls/d2d1/device.c | 14 +-
3 files changed, 323 insertions(+), 4 deletions(-)
diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index 14d9cb54e92..758545cc5a3 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -1101,6 +1101,245 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
return S_OK;
}
+static inline struct d2d_brush *impl_from_ID2D1ImageBrush(ID2D1ImageBrush *iface)
+{
+ return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_image_brush_QueryInterface(ID2D1ImageBrush *iface,
+ REFIID iid, void **out)
+{
+ TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+ if (IsEqualGUID(iid, &IID_ID2D1ImageBrush)
+ || IsEqualGUID(iid, &IID_ID2D1Brush)
+ || IsEqualGUID(iid, &IID_ID2D1Resource)
+ || IsEqualGUID(iid, &IID_IUnknown))
+ {
+ ID2D1ImageBrush_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_AddRef(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedIncrement(&brush->refcount);
+
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_Release(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedDecrement(&brush->refcount);
+
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
+
+ if (!refcount)
+ {
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ d2d_brush_destroy(brush);
+ }
+
+ return refcount;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetFactory(ID2D1ImageBrush *iface,
+ ID2D1Factory **factory)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, factory %p.\n", iface, factory);
+
+ ID2D1Factory_AddRef(*factory = brush->factory);
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetOpacity(ID2D1ImageBrush *iface, float opacity)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, opacity %.8e.\n", iface, opacity);
+
+ brush->opacity = opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetTransform(ID2D1ImageBrush *iface,
+ const D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ brush->transform = *transform;
+}
+
+static float STDMETHODCALLTYPE d2d_image_brush_GetOpacity(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetTransform(ID2D1ImageBrush *iface,
+ D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ *transform = brush->transform;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetImage(ID2D1ImageBrush *iface, ID2D1Image *image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if (image)
+ ID2D1Image_AddRef(image);
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ brush->u.image.image = image;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeX(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_x = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeY(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_y = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetInterpolationMode(ID2D1ImageBrush *iface,
+ D2D1_INTERPOLATION_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.interpolation_mode = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetSourceRectangle(ID2D1ImageBrush *iface, const D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %s stub!\n", iface, debug_d2d_rect_f(rect));
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetImage(ID2D1ImageBrush *iface, ID2D1Image **image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if ((*image = (ID2D1Image *)brush->u.image.image))
+ ID2D1Image_AddRef(*image);
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeX(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_x;
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeY(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_y;
+}
+
+static D2D1_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_image_brush_GetInterpolationMode(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.interpolation_mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetSourceRectangle(ID2D1ImageBrush *iface, D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %p stub!\n", iface, rect);
+}
+
+static const struct ID2D1ImageBrushVtbl d2d_image_brush_vtbl =
+{
+ d2d_image_brush_QueryInterface,
+ d2d_image_brush_AddRef,
+ d2d_image_brush_Release,
+ d2d_image_brush_GetFactory,
+ d2d_image_brush_SetOpacity,
+ d2d_image_brush_SetTransform,
+ d2d_image_brush_GetOpacity,
+ d2d_image_brush_GetTransform,
+ d2d_image_brush_SetImage,
+ d2d_image_brush_SetExtendModeX,
+ d2d_image_brush_SetExtendModeY,
+ d2d_image_brush_SetInterpolationMode,
+ d2d_image_brush_SetSourceRectangle,
+ d2d_image_brush_GetImage,
+ d2d_image_brush_GetExtendModeX,
+ d2d_image_brush_GetExtendModeY,
+ d2d_image_brush_GetInterpolationMode,
+ d2d_image_brush_GetSourceRectangle
+};
+
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush)
+{
+ if (!(*brush = heap_alloc_zero(sizeof(**brush))))
+ return E_OUTOFMEMORY;
+
+ d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP,
+ brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
+ if (((*brush)->u.image.image = image))
+ ID2D1Image_AddRef((*brush)->u.image.image);
+ if (image_brush_desc)
+ {
+ (*brush)->u.image.extend_mode_x = image_brush_desc->extendModeX;
+ (*brush)->u.image.extend_mode_y = image_brush_desc->extendModeY;
+ (*brush)->u.image.interpolation_mode = image_brush_desc->interpolationMode;
+ }
+ else
+ {
+ (*brush)->u.image.extend_mode_x = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.extend_mode_y = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.interpolation_mode = D2D1_INTERPOLATION_MODE_LINEAR;
+ }
+
+ TRACE("Created brush %p.\n", *brush);
+ return S_OK;
+}
+
struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
{
if (!iface)
@@ -1108,7 +1347,8 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
assert(iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl
- || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl);
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
}
@@ -1288,6 +1528,62 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con
ID3D11DeviceContext_Release(d3d_context);
}
+static void d2d_brush_bind_image(struct d2d_brush *brush, struct d2d_device_context *context,
+ unsigned int brush_idx)
+{
+ ID3D11SamplerState **sampler_state;
+ ID3D11DeviceContext *d3d_context;
+ ID2D1Bitmap *bitmap;
+ struct d2d_bitmap *src_impl;
+ HRESULT hr;
+
+ hr = ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&bitmap);
+ if (FAILED(hr))
+ {
+ FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n");
+ return;
+ }
+
+ src_impl = unsafe_impl_from_ID2D1Bitmap(bitmap);
+
+ ID3D11Device1_GetImmediateContext(context->d3d_device, &d3d_context);
+ ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &src_impl->srv);
+
+ sampler_state = &context->sampler_states
+ [brush->u.image.interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT]
+ [brush->u.image.extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT]
+ [brush->u.image.extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT];
+
+ if (!*sampler_state)
+ {
+ D3D11_SAMPLER_DESC sampler_desc;
+
+ if (brush->u.image.interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR)
+ sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
+ else
+ sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+ sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.image.extend_mode_x);
+ sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.image.extend_mode_y);
+ sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
+ sampler_desc.MipLODBias = 0.0f;
+ sampler_desc.MaxAnisotropy = 0;
+ sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER;
+ sampler_desc.BorderColor[0] = 0.0f;
+ sampler_desc.BorderColor[1] = 0.0f;
+ sampler_desc.BorderColor[2] = 0.0f;
+ sampler_desc.BorderColor[3] = 0.0f;
+ sampler_desc.MinLOD = 0.0f;
+ sampler_desc.MaxLOD = 0.0f;
+
+ if (FAILED(hr = ID3D11Device1_CreateSamplerState(context->d3d_device, &sampler_desc, sampler_state)))
+ ERR("Failed to create sampler state, hr %#lx.\n", hr);
+ }
+
+ ID3D11DeviceContext_PSSetSamplers(d3d_context, brush_idx, 1, sampler_state);
+ ID3D11DeviceContext_Release(d3d_context);
+ ID2D1Bitmap_Release(bitmap);
+}
+
void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx)
{
switch (brush->type)
@@ -1307,6 +1603,10 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context
d2d_brush_bind_bitmap(brush, context, brush_idx);
break;
+ case D2D_BRUSH_TYPE_IMAGE:
+ d2d_brush_bind_image(brush, context, brush_idx);
+ break;
+
default:
FIXME("Unhandled brush type %#x.\n", brush->type);
break;
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index aa8e8569455..4d4fd16ac00 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -41,6 +41,7 @@ enum d2d_brush_type
D2D_BRUSH_TYPE_LINEAR,
D2D_BRUSH_TYPE_RADIAL,
D2D_BRUSH_TYPE_BITMAP,
+ D2D_BRUSH_TYPE_IMAGE,
D2D_BRUSH_TYPE_COUNT,
};
@@ -318,6 +319,13 @@ struct d2d_brush
D2D1_EXTEND_MODE extend_mode_y;
D2D1_INTERPOLATION_MODE interpolation_mode;
} bitmap;
+ struct
+ {
+ ID2D1Image *image;
+ D2D1_EXTEND_MODE extend_mode_x;
+ D2D1_EXTEND_MODE extend_mode_y;
+ D2D1_INTERPOLATION_MODE interpolation_mode;
+ } image;
} u;
};
@@ -332,6 +340,9 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
struct d2d_brush **brush) DECLSPEC_HIDDEN;
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush) DECLSPEC_HIDDEN;
void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context,
unsigned int brush_idx) DECLSPEC_HIDDEN;
BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) DECLSPEC_HIDDEN;
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 13c99458cfa..c047f781410 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1929,10 +1929,18 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device
ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc,
const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush)
{
- FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n",
- iface, image, image_brush_desc, brush_desc, brush);
+ struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
+ struct d2d_brush *object;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p.\n", iface, image, image_brush_desc,
+ brush_desc, brush);
+
+ if (SUCCEEDED(hr = d2d_image_brush_create(context->factory, image, image_brush_desc,
+ brush_desc, &object)))
+ *brush = (ID2D1ImageBrush *)&object->ID2D1Brush_iface;
+
+ return hr;
}
static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface,
--
2.35.3
2
3
[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Handle over/underflow when parsing integer literals.
by Matteo Bruni 12 May '22
by Matteo Bruni 12 May '22
12 May '22
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
This fixes arithmetic-int.shader_test on 32-bit Linux for
me.
libs/vkd3d-shader/hlsl.l | 38 +++++++++++++++++++++++++++++++++++---
1 file changed, 35 insertions(+), 3 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l
index 267c8c30..2c398bc8 100644
--- a/libs/vkd3d-shader/hlsl.l
+++ b/libs/vkd3d-shader/hlsl.l
@@ -31,6 +31,38 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *loc);
#define YY_USER_ACTION update_location(yyget_extra(yyscanner), yyget_lloc(yyscanner));
+static int char_to_int(char c)
+{
+ if ('0' <= c && c <= '9')
+ return c - '0';
+ if ('A' <= c && c <= 'F')
+ return c - 'A' + 10;
+ if ('a' <= c && c <= 'f')
+ return c - 'a' + 10;
+ return -1;
+}
+
+static uint32_t parse_integer(const char *s)
+{
+ uint32_t base = 10, ret = 0;
+ int digit;
+
+ if (*s == '0')
+ {
+ base = 8;
+ ++s;
+ if (*s == 'x' || *s == 'X')
+ {
+ base = 16;
+ ++s;
+ }
+ }
+
+ while ((digit = char_to_int(*s++)) >= 0)
+ ret = ret * base + (uint32_t)digit;
+ return ret;
+}
+
%}
%option bison-bridge
@@ -197,15 +229,15 @@ row_major {return KW_ROW_MAJOR; }
return C_FLOAT;
}
0x[0-9a-fA-F]+ {
- sscanf(yytext, "0x%x", &yylval->intval);
+ yylval->intval = parse_integer(yytext);
return C_INTEGER;
}
0[0-7]+ {
- sscanf(yytext, "0%o", &yylval->intval);
+ yylval->intval = parse_integer(yytext);
return C_INTEGER;
}
[0-9]+ {
- yylval->intval = (atoi(yytext));
+ yylval->intval = parse_integer(yytext);
return C_INTEGER;
}
--
2.35.1
5
22
12 May '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/wined3d/texture.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 49650f2839e..35688fcd0d9 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -3805,10 +3805,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc
HRESULT hr;
TRACE("texture %p, resource_type %s, format %s, multisample_type %#x, multisample_quality %#x, "
- "usage %s, access %s, width %u, height %u, depth %u, layer_count %u, level_count %u, "
+ "usage %s, bind_flags %s, access %s, width %u, height %u, depth %u, layer_count %u, level_count %u, "
"flags %#x, device %p, parent %p, parent_ops %p, sub_resources %p, texture_ops %p.\n",
- texture, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format),
- desc->multisample_type, desc->multisample_quality, debug_d3dusage(desc->usage),
+ texture, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), desc->multisample_type,
+ desc->multisample_quality, debug_d3dusage(desc->usage), wined3d_debug_bind_flags(desc->bind_flags),
wined3d_debug_resource_access(desc->access), desc->width, desc->height, desc->depth,
layer_count, level_count, flags, device, parent, parent_ops, sub_resources, texture_ops);
--
2.34.1
2
1
Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com>
---
v4: Don't trance strides.
dlls/d2d1/d2d1_private.h | 31 ++++-
dlls/d2d1/device.c | 18 +--
dlls/d2d1/effect.c | 289 ++++++++++++++++++++++++++++++++++++++-
3 files changed, 319 insertions(+), 19 deletions(-)
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index aa8e8569455..cb9ee6d5b80 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -34,6 +34,7 @@
#include "initguid.h"
#endif
#include "dwrite_2.h"
+#include "d2d1effectauthor.h"
enum d2d_brush_type
{
@@ -567,6 +568,17 @@ struct d2d_device
void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN;
+struct d2d_effect_context
+{
+ ID2D1EffectContext ID2D1EffectContext_iface;
+ LONG refcount;
+
+ struct d2d_device_context *device_context;
+};
+
+void d2d_effect_context_init(struct d2d_effect_context *effect_context,
+ struct d2d_device_context *device_context) DECLSPEC_HIDDEN;
+
struct d2d_effect_info
{
const CLSID *clsid;
@@ -583,13 +595,14 @@ struct d2d_effect
const struct d2d_effect_info *info;
- ID2D1Factory *factory;
+ struct d2d_effect_context *effect_context;
ID2D1Image **inputs;
size_t inputs_size;
size_t input_count;
};
-HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id) DECLSPEC_HIDDEN;
+HRESULT d2d_effect_init(struct d2d_effect *effect,
+ struct d2d_effect_context *effect_context, const CLSID *effect_id) DECLSPEC_HIDDEN;
static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size)
{
@@ -694,6 +707,13 @@ static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point)
return wine_dbg_sprintf("{%.8e, %.8e}", point->x, point->y);
}
+static inline const char *debug_d2d_point_2l(const D2D1_POINT_2L *point)
+{
+ if (!point)
+ return "(null)";
+ return wine_dbg_sprintf("{%ld, %ld}", point->x, point->y);
+}
+
static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect)
{
if (!rect)
@@ -701,6 +721,13 @@ static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect)
return wine_dbg_sprintf("(%.8e, %.8e)-(%.8e, %.8e)", rect->left, rect->top, rect->right, rect->bottom);
}
+static inline const char *debug_d2d_rect_l(const D2D1_RECT_L *rect)
+{
+ if (!rect)
+ return "(null)";
+ return wine_dbg_sprintf("(%ld, %ld)-(%ld, %ld)", rect->left, rect->top, rect->right, rect->bottom);
+}
+
static inline const char *debug_d2d_rounded_rect(const D2D1_ROUNDED_RECT *rounded_rect)
{
if (!rounded_rect)
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 13c99458cfa..80badcddaac 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1890,25 +1890,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont
REFCLSID effect_id, ID2D1Effect **effect)
{
struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
- struct d2d_effect *object;
+ struct d2d_effect_context *effect_context;
HRESULT hr;
FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect);
- if (!(object = heap_alloc_zero(sizeof(*object))))
+ if (!(effect_context = heap_alloc_zero(sizeof(*effect_context))))
return E_OUTOFMEMORY;
+ d2d_effect_context_init(effect_context, context);
- if (FAILED(hr = d2d_effect_init(object, context->factory, effect_id)))
- {
- WARN("Failed to initialise effect, hr %#lx.\n", hr);
- heap_free(object);
- return hr;
- }
+ hr = ID2D1EffectContext_CreateEffect(&effect_context->ID2D1EffectContext_iface, effect_id, effect);
- TRACE("Created effect %p.\n", object);
- *effect = &object->ID2D1Effect_iface;
-
- return S_OK;
+ ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface);
+ return hr;
}
static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateGradientStopCollection(
diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c
index 350ac3c7bbf..714e8a92fd5 100644
--- a/dlls/d2d1/effect.c
+++ b/dlls/d2d1/effect.c
@@ -17,7 +17,6 @@
*/
#include "d2d1_private.h"
-#include "d2d1effectauthor.h"
WINE_DEFAULT_DEBUG_CHANNEL(d2d);
@@ -31,6 +30,285 @@ static const struct d2d_effect_info builtin_effects[] =
{&CLSID_D2D1Grayscale, 1, 1, 1},
};
+static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1EffectContext *iface)
+{
+ return CONTAINING_RECORD(iface, struct d2d_effect_context, ID2D1EffectContext_iface);
+}
+
+static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context)
+{
+ ID2D1DeviceContext_Release(&effect_context->device_context->ID2D1DeviceContext_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out)
+{
+ TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+ if (IsEqualGUID(iid, &IID_ID2D1EffectContext)
+ || IsEqualGUID(iid, &IID_IUnknown))
+ {
+ ID2D1EffectContext_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_effect_context_AddRef(ID2D1EffectContext *iface)
+{
+ struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface);
+ ULONG refcount = InterlockedIncrement(&effect_context->refcount);
+
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *iface)
+{
+ struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface);
+ ULONG refcount = InterlockedDecrement(&effect_context->refcount);
+
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
+
+ if (!refcount)
+ {
+ d2d_effect_context_cleanup(effect_context);
+ heap_free(effect_context);
+ }
+
+ return refcount;
+}
+
+static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *iface, float *dpi_x, float *dpi_y)
+{
+ FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectContext *iface,
+ REFCLSID clsid, ID2D1Effect **effect)
+{
+ struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface);
+ struct d2d_effect *object;
+ HRESULT hr;
+
+ TRACE("iface %p, clsid %s, effect %p.\n", iface, debugstr_guid(clsid), effect);
+
+ if (!(object = heap_alloc_zero(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ if (FAILED(hr = d2d_effect_init(object, effect_context, clsid)))
+ {
+ WARN("Failed to initialise effect, hr %#lx.\n", hr);
+ heap_free(object);
+ return hr;
+ }
+
+ TRACE("Created effect %p.\n", object);
+ *effect = &object->ID2D1Effect_iface;
+
+ return S_OK;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_GetMaximumSupportedFeatureLevel(ID2D1EffectContext *iface,
+ const D3D_FEATURE_LEVEL *levels, UINT32 level_count, D3D_FEATURE_LEVEL *max_level)
+{
+ FIXME("iface %p, levels %p, level_count %u, max_level %p stub!\n", iface, levels, level_count, max_level);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateTransformNodeFromEffect(ID2D1EffectContext *iface,
+ ID2D1Effect *effect, ID2D1TransformNode **node)
+{
+ FIXME("iface %p, effect %p, node %p stub!\n", iface, effect, node);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBlendTransform(ID2D1EffectContext *iface,
+ UINT32 num_inputs, const D2D1_BLEND_DESCRIPTION *description, ID2D1BlendTransform **transform)
+{
+ FIXME("iface %p, num_inputs %u, description %p, transform %p stub!\n", iface, num_inputs, description, transform);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBorderTransform(ID2D1EffectContext *iface,
+ D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_MODE mode_y, ID2D1BorderTransform **transform)
+{
+ FIXME("iface %p, mode_x %#x, mode_y %#x, transform %p stub!\n", iface, mode_x, mode_y, transform);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateOffsetTransform(ID2D1EffectContext *iface,
+ D2D1_POINT_2L offset, ID2D1OffsetTransform **transform)
+{
+ FIXME("iface %p, offset %s, transform %p stub!\n", iface, debug_d2d_point_2l(&offset), transform);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBoundsAdjustmentTransform(ID2D1EffectContext *iface,
+ const D2D1_RECT_L *output_rect, ID2D1BoundsAdjustmentTransform **transform)
+{
+ FIXME("iface %p, output_rect %s, transform %p stub!\n", iface, debug_d2d_rect_l(output_rect), transform);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectContext *iface,
+ REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size)
+{
+ FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n",
+ iface, debugstr_guid(shader_id), buffer, buffer_size);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1EffectContext *iface,
+ REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size)
+{
+ FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n",
+ iface, debugstr_guid(shader_id), buffer, buffer_size);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface,
+ REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size)
+{
+ FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n",
+ iface, debugstr_guid(shader_id), buffer, buffer_size);
+
+ return E_NOTIMPL;
+}
+
+static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id)
+{
+ FIXME("iface %p, shader_id %s stub!\n", iface, debugstr_guid(shader_id));
+
+ return FALSE;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateResourceTexture(ID2D1EffectContext *iface,
+ const GUID *id, const D2D1_RESOURCE_TEXTURE_PROPERTIES *texture_properties,
+ const BYTE *data, const UINT32 *strides, UINT32 data_size, ID2D1ResourceTexture **texture)
+{
+ FIXME("iface %p, id %s, texture_properties %p, data %p, strides %p, data_size %u, texture %p stub!\n",
+ iface, debugstr_guid(id), texture_properties, data, strides, data_size, texture);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindResourceTexture(ID2D1EffectContext *iface,
+ const GUID *id, ID2D1ResourceTexture **texture)
+{
+ FIXME("iface %p, id %s, texture %p stub!\n", iface, debugstr_guid(id), texture);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateVertexBuffer(ID2D1EffectContext *iface,
+ const D2D1_VERTEX_BUFFER_PROPERTIES *buffer_properties, const GUID *id,
+ const D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES *custom_buffer_properties, ID2D1VertexBuffer **buffer)
+{
+ FIXME("iface %p, buffer_properties %p, id %s, custom_buffer_properties %p, buffer %p stub!\n",
+ iface, buffer_properties, debugstr_guid(id), custom_buffer_properties, buffer);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindVertexBuffer(ID2D1EffectContext *iface,
+ const GUID *id, ID2D1VertexBuffer **buffer)
+{
+ FIXME("iface %p, id %s, buffer %p stub!\n", iface, debugstr_guid(id), buffer);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1EffectContext *iface,
+ D2D1_COLOR_SPACE space, const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context)
+{
+ FIXME("iface %p, space %#x, profile %p, profile_size %u, color_context %p stub!\n",
+ iface, space, profile, profile_size, color_context);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilename(ID2D1EffectContext *iface,
+ const WCHAR *filename, ID2D1ColorContext **color_context)
+{
+ FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicColorContext(ID2D1EffectContext *iface,
+ IWICColorContext *wic_color_context, ID2D1ColorContext **color_context)
+{
+ FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1EffectContext *iface,
+ D2D1_FEATURE feature, void *data, UINT32 data_size)
+{
+ FIXME("iface %p, feature %#x, data %p, data_size %u stub!\n", iface, feature, data, data_size);
+
+ return E_NOTIMPL;
+}
+
+static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface,
+ D2D1_BUFFER_PRECISION precision)
+{
+ FIXME("iface %p, precision %#x stub!\n", iface, precision);
+
+ return FALSE;
+}
+
+static const ID2D1EffectContextVtbl d2d_effect_context_vtbl =
+{
+ d2d_effect_context_QueryInterface,
+ d2d_effect_context_AddRef,
+ d2d_effect_context_Release,
+ d2d_effect_context_GetDpi,
+ d2d_effect_context_CreateEffect,
+ d2d_effect_context_GetMaximumSupportedFeatureLevel,
+ d2d_effect_context_CreateTransformNodeFromEffect,
+ d2d_effect_context_CreateBlendTransform,
+ d2d_effect_context_CreateBorderTransform,
+ d2d_effect_context_CreateOffsetTransform,
+ d2d_effect_context_CreateBoundsAdjustmentTransform,
+ d2d_effect_context_LoadPixelShader,
+ d2d_effect_context_LoadVertexShader,
+ d2d_effect_context_LoadComputeShader,
+ d2d_effect_context_IsShaderLoaded,
+ d2d_effect_context_CreateResourceTexture,
+ d2d_effect_context_FindResourceTexture,
+ d2d_effect_context_CreateVertexBuffer,
+ d2d_effect_context_FindVertexBuffer,
+ d2d_effect_context_CreateColorContext,
+ d2d_effect_context_CreateColorContextFromFilename,
+ d2d_effect_context_CreateColorContextFromWicColorContext,
+ d2d_effect_context_CheckFeatureSupport,
+ d2d_effect_context_IsBufferPrecisionSupported,
+};
+
+void d2d_effect_context_init(struct d2d_effect_context *effect_context, struct d2d_device_context *device_context)
+{
+ effect_context->ID2D1EffectContext_iface.lpVtbl = &d2d_effect_context_vtbl;
+ effect_context->refcount = 1;
+ effect_context->device_context = device_context;
+ ID2D1DeviceContext_AddRef(&device_context->ID2D1DeviceContext_iface);
+}
+
static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface)
{
return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface);
@@ -46,7 +324,7 @@ static void d2d_effect_cleanup(struct d2d_effect *effect)
ID2D1Image_Release(effect->inputs[i]);
}
heap_free(effect->inputs);
- ID2D1Factory_Release(effect->factory);
+ ID2D1EffectContext_Release(&effect->effect_context->ID2D1EffectContext_iface);
}
static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out)
@@ -362,7 +640,7 @@ static void STDMETHODCALLTYPE d2d_effect_image_GetFactory(ID2D1Image *iface, ID2
TRACE("iface %p, factory %p.\n", iface, factory);
- ID2D1Factory_AddRef(*factory = effect->factory);
+ ID2D1Factory_AddRef(*factory = effect->effect_context->device_context->factory);
}
static const ID2D1ImageVtbl d2d_effect_image_vtbl =
@@ -373,7 +651,7 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl =
d2d_effect_image_GetFactory,
};
-HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id)
+HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *effect_context, const CLSID *effect_id)
{
unsigned int i;
@@ -387,7 +665,8 @@ HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const
{
effect->info = &builtin_effects[i];
d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, effect->info->default_input_count);
- ID2D1Factory_AddRef(effect->factory = factory);
+ effect->effect_context = effect_context;
+ ID2D1EffectContext_AddRef(&effect_context->ID2D1EffectContext_iface);
return S_OK;
}
}
--
2.25.1
3
6
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
v2: missed warnings from vector.c.
dlls/d3drm/tests/Makefile.in | 1 -
dlls/d3drm/tests/d3drm.c | 3115 +++++++++++++++++-----------------
dlls/d3drm/tests/vector.c | 8 +-
3 files changed, 1560 insertions(+), 1564 deletions(-)
diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in
index ec4a030e949..4b39989531c 100644
--- a/dlls/d3drm/tests/Makefile.in
+++ b/dlls/d3drm/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = d3drm.dll
IMPORTS = dxguid uuid d3drm ddraw user32
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 51d10d797bc..665c56ccdae 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -179,37 +179,37 @@ static void test_class_name_(unsigned int line, IDirect3DRMObject *object, const
HRESULT hr;
hr = IDirect3DRMObject_GetClassName(object, NULL, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetClassName(object, NULL, NULL);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
size = 0;
hr = IDirect3DRMObject_GetClassName(object, &size, NULL);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
size = size2 = !!*name;
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- ok_(__FILE__, line)(size == size2, "Got size %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == size2, "Got size %lu.\n", size);
size = sizeof(cname);
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
size = strlen(name) + 1;
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
size = strlen(name);
strcpy(cname, "XXX");
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, "XXX"), "Expected unchanged buffer, but got \"%s\".\n", cname);
}
@@ -221,70 +221,70 @@ static void test_object_name_(unsigned int line, IDirect3DRMObject *object)
DWORD size;
hr = IDirect3DRMObject_GetName(object, NULL, NULL);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, NULL, name);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected buffer contents, %#x.\n", name[0]);
/* Name is not set yet. */
size = 100;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
size = sizeof(name);
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0, "Unexpected name \"%s\".\n", name);
size = 0;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected name \"%s\".\n", name);
hr = IDirect3DRMObject_SetName(object, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMObject_SetName(object, "name");
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#lx.\n", hr);
size = 0;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
size = strlen("name") + 1;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(!strcmp(name, "name"), "Unexpected name \"%s\".\n", name);
size = 2;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 2, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 2, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0x1f, "Got unexpected name \"%s\".\n", name);
hr = IDirect3DRMObject_SetName(object, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#lx.\n", hr);
size = 1;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
size = 1;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0, "Got unexpected name \"%s\".\n", name);
}
@@ -454,31 +454,31 @@ static void test_MeshBuilder(void)
IUnknown *unk;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void **)&meshbuilder3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMMeshBuilder3, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
@@ -490,36 +490,36 @@ static void test_MeshBuilder(void)
info.lpMemory = data_bad_version;
info.dSize = strlen(data_bad_version);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
info.lpMemory = data_no_mesh;
info.dSize = strlen(data_no_mesh);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, "Object"), "Retrieved name '%s' instead of 'Object'\n", name);
size = strlen("Object"); /* No space for null character */
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, NULL);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
- ok(size == 0, "Size should be 0 instead of %u\n", size);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
+ ok(size == 0, "Size should be 0 instead of %lu.\n", size);
hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, "");
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, ""), "Retrieved name '%s' instead of ''\n", name);
val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
@@ -529,14 +529,14 @@ static void test_MeshBuilder(void)
ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, NULL, &val2, NULL, &val3, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
- ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2);
- ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
+ ok(val2 == 4, "Wrong number of normals %ld (must be 4)\n", val2);
+ ok(val3 == 22, "Wrong number of face data bytes %ld (must be 22)\n", val3);
/* Check that Load method generated default normals */
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
expect_vector(&n[0], 0.577350f, 0.577350f, 0.577350f, 32);
expect_vector(&n[1], -0.229416f, 0.688247f, 0.688247f, 32);
expect_vector(&n[2], -0.229416f, 0.688247f, 0.688247f, 32);
@@ -546,58 +546,58 @@ static void test_MeshBuilder(void)
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 2, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 3, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 4, &valu, &valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 0, valu, valv);
- ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 4, valu, valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 0.0f;
valv = 0.0f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
IDirect3DRMMeshBuilder_Release(pMeshBuilder);
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
/* No group in mesh when mesh builder is not loaded */
hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
- ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "CreateMesh failed returning hr %#lx.\n", hr);
if (hr == D3DRM_OK)
{
DWORD nb_groups;
nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(nb_groups == 0, "GetCroupCount returned %u\n", nb_groups);
+ ok(nb_groups == 0, "GetCroupCount returned %lu\n", nb_groups);
IDirect3DRMMesh_Release(mesh);
}
@@ -605,7 +605,7 @@ static void test_MeshBuilder(void)
info.lpMemory = data_full;
info.dSize = strlen(data_full);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
ok(val == 3, "Wrong number of vertices %d (must be 3)\n", val);
@@ -616,43 +616,43 @@ static void test_MeshBuilder(void)
/* Check no buffer size and too small buffer size errors */
val1 = 1; val2 = 3; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 1; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, NULL, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 3; val3 = 1;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, NULL, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 3; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
- ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
- ok(val3 == 8, "Wrong number of face data bytes %d (must be 8)\n", val3);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
+ ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+ ok(val3 == 8, "Wrong number of face data bytes %ld (must be 8)\n", val3);
expect_vector(&v[0], 0.1f, 0.2f, 0.3f, 32);
expect_vector(&v[1], 0.4f, 0.5f, 0.6f, 32);
expect_vector(&v[2], 0.7f, 0.8f, 0.9f, 32);
expect_vector(&n[0], 1.1f, 1.2f, 1.3f, 32);
expect_vector(&n[1], 1.4f, 1.5f, 1.6f, 32);
expect_vector(&n[2], 1.7f, 1.8f, 1.9f, 32);
- ok(f[0] == 3 , "Wrong component f[0] = %d (expected 3)\n", f[0]);
- ok(f[1] == 0 , "Wrong component f[1] = %d (expected 0)\n", f[1]);
- ok(f[2] == 0 , "Wrong component f[2] = %d (expected 0)\n", f[2]);
- ok(f[3] == 1 , "Wrong component f[3] = %d (expected 1)\n", f[3]);
- ok(f[4] == 1 , "Wrong component f[4] = %d (expected 1)\n", f[4]);
- ok(f[5] == 2 , "Wrong component f[5] = %d (expected 2)\n", f[5]);
- ok(f[6] == 2 , "Wrong component f[6] = %d (expected 2)\n", f[6]);
- ok(f[7] == 0 , "Wrong component f[7] = %d (expected 0)\n", f[7]);
+ ok(f[0] == 3 , "Wrong component f[0] = %ld (expected 3)\n", f[0]);
+ ok(f[1] == 0 , "Wrong component f[1] = %ld (expected 0)\n", f[1]);
+ ok(f[2] == 0 , "Wrong component f[2] = %ld (expected 0)\n", f[2]);
+ ok(f[3] == 1 , "Wrong component f[3] = %ld (expected 1)\n", f[3]);
+ ok(f[4] == 1 , "Wrong component f[4] = %ld (expected 1)\n", f[4]);
+ ok(f[5] == 2 , "Wrong component f[5] = %ld (expected 2)\n", f[5]);
+ ok(f[6] == 2 , "Wrong component f[6] = %ld (expected 2)\n", f[6]);
+ ok(f[7] == 0 , "Wrong component f[7] = %ld (expected 0)\n", f[7]);
hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
- ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
if (hr == D3DRM_OK)
{
DWORD nb_groups;
@@ -663,30 +663,30 @@ static void test_MeshBuilder(void)
D3DVALUE values[3];
nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups);
+ ok(nb_groups == 1, "GetCroupCount returned %lu.\n", nb_groups);
hr = IDirect3DRMMesh_GetGroup(mesh, 1, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
- ok(hr == D3DRMERR_BADVALUE, "GetCroup returned hr = %x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMesh_GetGroup(mesh, 0, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
- ok(hr == D3DRM_OK, "GetCroup failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(nb_vertices == 3, "Wrong number of vertices %u (must be 3)\n", nb_vertices);
ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces);
ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices);
- ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size);
+ ok(data_size == 3, "Wrong number of face data bytes %lu (must be 3)\n", data_size);
color = IDirect3DRMMesh_GetGroupColor(mesh, 0);
- ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00);
+ ok(color == 0xff00ff00, "Wrong color returned %#lx instead of %#x\n", color, 0xff00ff00);
hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture);
- ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(texture == NULL, "No texture should be present\n");
hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material);
- ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(material != NULL, "No material present\n");
hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);
- ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#lx.\n", hr);
ok(values[0] == 0.5f, "Got unexpected red component %.8e.\n", values[0]);
ok(values[1] == 0.5f, "Got unexpected green component %.8e.\n", values[1]);
ok(values[2] == 0.5f, "Got unexpected blue component %.8e.\n", values[2]);
hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]);
- ok(hr == D3DRM_OK, "Failed to get specular color, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to get specular color, hr %#lx.\n", hr);
ok(values[0] == 1.0f, "Got unexpected red component %.8e.\n", values[0]);
ok(values[1] == 0.0f, "Got unexpected green component %.8e.\n", values[1]);
ok(values[2] == 0.0f, "Got unexpected blue component %.8e.\n", values[2]);
@@ -698,12 +698,12 @@ static void test_MeshBuilder(void)
}
hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4);
- ok(hr == D3DRM_OK, "Scale failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Scale failed returning hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
- ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+ ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
expect_vector(&v[0], 0.1f * 2, 0.2f * 3, 0.3f * 4, 32);
expect_vector(&v[1], 0.4f * 2, 0.5f * 3, 0.6f * 4, 32);
@@ -730,17 +730,17 @@ static void test_MeshBuilder3(void)
D3DVALUE valu, valv;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &pMeshBuilder3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)pMeshBuilder3, "Builder");
test_object_name((IDirect3DRMObject *)pMeshBuilder3);
@@ -748,17 +748,17 @@ static void test_MeshBuilder3(void)
info.lpMemory = data_bad_version;
info.dSize = strlen(data_bad_version);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
info.lpMemory = data_no_mesh;
info.dSize = strlen(data_no_mesh);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
val = IDirect3DRMMeshBuilder3_GetVertexCount(pMeshBuilder3);
ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val);
@@ -767,48 +767,48 @@ static void test_MeshBuilder3(void)
ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
/* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 2, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 3, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 4, &valu, &valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 0, valu, valv);
- ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 4, valu, valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 0.0f;
valv = 0.0f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
@@ -825,20 +825,20 @@ static void test_Mesh(void)
IUnknown *unk;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateMesh(d3drm, &mesh);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)mesh, "Mesh");
test_object_name((IDirect3DRMObject *)mesh);
hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk);
hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk);
IDirect3DRMMesh_Release(mesh);
@@ -865,19 +865,19 @@ static void test_Face(void)
int icount;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFace(d3drm, &face1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
if (FAILED(hr))
{
- skip("Cannot get IDirect3DRMFace interface (hr = %x), skipping tests\n", hr);
+ skip("Cannot get IDirect3DRMFace interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRMFace_QueryInterface(face1, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
IDirect3DRMObject_Release(obj);
@@ -891,13 +891,13 @@ static void test_Face(void)
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2)))
{
- win_skip("Cannot get IDirect3DRM2 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM2 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM2_CreateMeshBuilder(d3drm2, &MeshBuilder2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
ok(!icount, "wrong FaceCount: %i\n", icount);
@@ -905,10 +905,10 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder2_CreateFace(MeshBuilder2, &face1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
todo_wine
@@ -917,16 +917,16 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
IDirect3DRMFace_Release(face);
IDirect3DRMFaceArray_Release(array1);
}
@@ -939,25 +939,25 @@ static void test_Face(void)
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &MeshBuilder3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3);
ok(!icount, "wrong FaceCount: %i\n", icount);
hr = IDirect3DRMMeshBuilder3_CreateFace(MeshBuilder3, &face2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMFace, (void **)&face1);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
IDirect3DRMFace_Release(face1);
@@ -973,16 +973,16 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
IDirect3DRMFace_Release(face);
IDirect3DRMFaceArray_Release(array1);
}
@@ -993,7 +993,7 @@ static void test_Face(void)
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder3_Load(MeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder3_GetVertexCount(MeshBuilder3);
ok(icount == 4, "Wrong number of vertices %d (must be 4)\n", icount);
@@ -1007,29 +1007,29 @@ static void test_Face(void)
count = 4;
hr = IDirect3DRMMeshBuilder3_GetVertices(MeshBuilder3, 0, &count, v1);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(count == 4, "Wrong number of vertices %d (must be 4)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(count == 4, "Wrong number of vertices %ld (must be 4)\n", count);
hr = IDirect3DRMMeshBuilder3_GetNormals(MeshBuilder3, 0, &count, n1);
- ok(hr == D3DRM_OK, "Cannot get normals information (hr = %x)\n", hr);
- ok(count == 4, "Wrong number of normals %d (must be 4)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get normals information, hr %#lx\n", hr);
+ ok(count == 4, "Wrong number of normals %ld (must be 4)\n", count);
array1 = NULL;
hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 4, "count = %u\n", count);
+ ok(count == 4, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
hr = IDirect3DRMFace_GetVertices(face, &count, v2, n2);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(count == 3, "Wrong number of vertices %ld (must be 3)\n", count);
vector_eq(&v1[0], &v2[0]);
vector_eq(&v1[1], &v2[1]);
@@ -1045,14 +1045,14 @@ static void test_Face(void)
/* Setting face color. */
hr = IDirect3DRMFace2_SetColor(face2, 0x1f180587);
- ok(SUCCEEDED(hr), "Failed to set face color, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set face color, hr %#lx.\n", hr);
color = IDirect3DRMFace2_GetColor(face2);
- ok(color == 0x1f180587, "Unexpected color %8x.\n", color);
+ ok(color == 0x1f180587, "Unexpected color %8lx.\n", color);
hr = IDirect3DRMFace2_SetColorRGB(face2, 0.5f, 0.5f, 0.5f);
- ok(SUCCEEDED(hr), "Failed to set color, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set color, hr %#lx.\n", hr);
color = IDirect3DRMFace2_GetColor(face2);
- ok(color == 0xff7f7f7f, "Unexpected color %8x.\n", color);
+ ok(color == 0xff7f7f7f, "Unexpected color %8lx.\n", color);
IDirect3DRMFace2_Release(face2);
IDirect3DRMMeshBuilder3_Release(MeshBuilder3);
@@ -1084,11 +1084,11 @@ static void test_Frame(void)
D3DCOLOR color;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
ref = get_refcount((IUnknown *)d3drm);
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 1);
ref2 = get_refcount((IUnknown *)d3drm);
ok(ref2 > ref, "Expected d3drm object to be referenced.\n");
@@ -1097,93 +1097,93 @@ static void test_Frame(void)
test_object_name((IDirect3DRMObject *)pFrameC);
hr = IDirect3DRMFrame_GetParent(pFrameC, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameC, 1);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameC, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
ok(!!frame_array, "frame_array = %p\n", frame_array);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
/* GetParent with NULL pointer */
hr = IDirect3DRMFrame_GetParent(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
/* [Add/Delete]Child with NULL pointer */
hr = IDirect3DRMFrame_AddChild(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
/* Add child to first parent */
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameP1, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
CHECK_REFCOUNT(pFrameC, 2);
hr = IDirect3DRMFrame_GetScene(pFrameC, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(scene_frame);
hr = IDirect3DRMFrame_GetScene(pFrameP1, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(scene_frame);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
/* In some older version of d3drm, creating IDirect3DRMFrameArray object with GetChildren does not increment refcount of children frames */
ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
- "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
ok((get_refcount((IUnknown*)pFrameC) == 4) || broken(get_refcount((IUnknown*)pFrameC) == 3),
- "Invalid refcount. Expected 4 (or 3) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 4 (or 3) got %ld\n", get_refcount((IUnknown*)pFrameC));
IDirect3DRMFrame_Release(pFrameTmp);
ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
- "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
IDirect3DRMFrameArray_Release(frame_array);
CHECK_REFCOUNT(pFrameC, 2);
}
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(pFrameTmp);
@@ -1191,21 +1191,21 @@ static void test_Frame(void)
/* Add child to second parent */
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1213,31 +1213,31 @@ static void test_Frame(void)
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
CHECK_REFCOUNT(pFrameP2, 2);
IDirect3DRMFrame_Release(scene_frame);
hr = IDirect3DRMFrame_GetScene(pFrameP2, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
CHECK_REFCOUNT(pFrameP2, 2);
IDirect3DRMFrame_Release(scene_frame);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameP2, 2);
CHECK_REFCOUNT(pFrameC, 2);
@@ -1246,18 +1246,18 @@ static void test_Frame(void)
/* Add child again */
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1265,50 +1265,50 @@ static void test_Frame(void)
/* Delete child */
hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 1);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
/* Add two children */
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 2, "count = %u\n", count);
+ ok(count == 2, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 1, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1316,33 +1316,33 @@ static void test_Frame(void)
/* [Add/Delete]Visual with NULL pointer */
hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
/* Create Visual */
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
visual1 = (IDirect3DRMVisual *)mesh_builder;
/* Add Visual to first parent */
hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1);
- ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add visual, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
CHECK_REFCOUNT(visual1, 2);
visual_array = NULL;
hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &visual_array);
- ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get visuals, hr %#lx\n", hr);
if (visual_array)
{
count = IDirect3DRMVisualArray_GetSize(visual_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMVisualArray_GetElement(visual_array, 0, &visual_tmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(visual_tmp == visual1, "visual_tmp = %p\n", visual_tmp);
IDirect3DRMVisual_Release(visual_tmp);
IDirect3DRMVisualArray_Release(visual_array);
@@ -1350,38 +1350,38 @@ static void test_Frame(void)
/* Delete Visual */
hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1);
- ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete visual, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMMeshBuilder_Release(mesh_builder);
/* [Add/Delete]Light with NULL pointer */
hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
/* Create Light */
hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &light1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
/* Add Light to first parent */
hr = IDirect3DRMFrame_AddLight(pFrameP1, light1);
- ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add light, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
CHECK_REFCOUNT(light1, 2);
light_array = NULL;
hr = IDirect3DRMFrame_GetLights(pFrameP1, &light_array);
- ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get lights, hr %#lx\n", hr);
if (light_array)
{
count = IDirect3DRMLightArray_GetSize(light_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMLightArray_GetElement(light_array, 0, &light_tmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(light_tmp == light1, "light_tmp = %p\n", light_tmp);
IDirect3DRMLight_Release(light_tmp);
IDirect3DRMLightArray_Release(light_array);
@@ -1389,57 +1389,57 @@ static void test_Frame(void)
/* Delete Light */
hr = IDirect3DRMFrame_DeleteLight(pFrameP1, light1);
- ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete light, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMLight_Release(light1);
/* Test SceneBackground on first parent */
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff000000, "wrong color (%x)\n", color);
+ ok(color == 0xff000000, "wrong color %lx.\n", color);
hr = IDirect3DRMFrame_SetSceneBackground(pFrameP1, 0xff180587);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff180587, "wrong color (%x)\n", color);
+ ok(color == 0xff180587, "wrong color %lx.\n", color);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(pFrameP1, 0.5, 0.5, 0.5);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
/* Traversal options. */
hr = IDirect3DRMFrame_QueryInterface(pFrameP2, &IID_IDirect3DRMFrame3, (void **)&frame3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = 0;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#lx.\n", options);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0);
- ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000 | D3DRMFRAME_PICKENABLE);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = 0xf;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == 0, "Unexpected traversal options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == 0, "Unexpected traversal options %#lx.\n", options);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, D3DRMFRAME_PICKENABLE);
- ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#lx.\n", hr);
options = 0;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#lx.\n", options);
IDirect3DRMFrame3_Release(frame3);
@@ -1495,12 +1495,12 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
int i;
hr = Direct3DRMCreate(&d3drm);
- ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface (hr = %x).\n", test_idx, hr);
+ ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
- ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IUnknown_Release(unknown);
context.called = 0;
@@ -1508,33 +1508,33 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
context.obj = obj;
hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[2].callback = &destroy_callback;
corder[2].context = &context;
/* same callback added twice */
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[1].callback = &destroy_callback;
corder[1].context = &context;
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, NULL);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
/* add one more */
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[0].callback = &destroy_callback1;
corder[0].context = &context;
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE, hr %#lx.\n", test_idx, hr);
context.called = 0;
IDirect3DRMObject_Release(obj);
@@ -1549,30 +1549,30 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
/* test this pattern - add cb1, add cb2, add cb1, delete cb1 */
hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
- ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IUnknown_Release(unknown);
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[1].callback = &destroy_callback;
corder[1].context = &context;
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[0].callback = &destroy_callback1;
corder[0].context = &context;
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
context.called = 0;
hr = IDirect3DRMObject_QueryInterface(obj, &IID_IDirect3DRMObject, (void**)&context.obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IDirect3DRMObject_Release(context.obj);
IUnknown_Release(unknown);
ok(context.called == 2, "Test %u: got %d, expected 2.\n", test_idx, context.called);
@@ -1631,92 +1631,92 @@ static void test_object(void)
int i;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown);
- ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr);
+ ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#lx.\n", hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
unknown = (IUnknown *)0xdeadbeef;
hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
unknown = (IUnknown *)0xdeadbeef;
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
if (SUCCEEDED(hr))
{
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
/* test Add/Destroy callbacks */
test_destroy_callback(i, tests[i].clsid, tests[i].iid);
hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
hr = IDirect3DRM3_CreateObject(d3drm3, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
}
}
@@ -1754,35 +1754,35 @@ static void test_Viewport(void)
GetClientRect(window, &rc);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
initial_ref1 = get_refcount((IUnknown *)d3drm1);
initial_ref2 = get_refcount((IUnknown *)d3drm2);
initial_ref3 = get_refcount((IUnknown *)d3drm3);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &tmp_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
@@ -1791,233 +1791,233 @@ static void test_Viewport(void)
frame_ref = get_refcount((IUnknown *)frame);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, 0, 0, 0, 0, &viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
IDirect3DRMFrame_Release(d3drm_frame);
hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
IDirect3DRMFrame_Release(d3drm_frame);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, 0, 0, 0, 0, &viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
IDirect3DRMFrame_Release(d3drm_frame);
hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
IDirect3DRMFrame_Release(d3drm_frame);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
device_ref = get_refcount((IUnknown *)device3);
frame_ref2 = get_refcount((IUnknown *)frame3);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, 0, 0, 0, 0, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice3_Release(d3drm_device3);
hr = IDirect3DRMViewport2_SetCamera(viewport2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame3 == d3drm_frame3, "Expected frame returned = %p, got %p.\n", frame3, d3drm_frame3);
IDirect3DRMFrame3_Release(d3drm_frame3);
hr = IDirect3DRMViewport2_SetCamera(viewport2, tmp_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame3 == tmp_frame3, "Got unexpected frame %p, expected %p.\n", d3drm_frame3, tmp_frame3);
IDirect3DRMFrame3_Release(d3drm_frame3);
IDirect3DRMViewport2_Release(viewport2);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
/* Test all failures together */
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2029,28 +2029,28 @@ static void test_Viewport(void)
IDirect3DRMViewport_Release(viewport);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2062,28 +2062,28 @@ static void test_Viewport(void)
IDirect3DRMViewport2_Release(viewport2);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2094,14 +2094,14 @@ static void test_Viewport(void)
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
ok((IDirect3DRMObject*)viewport == obj, "got object pointer %p, expected %p\n", obj, viewport);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&obj2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
ok(obj == obj2, "got object pointer %p, expected %p\n", obj2, obj);
ok((IUnknown*)viewport != (IUnknown*)viewport2, "got viewport1 %p, viewport2 %p\n", viewport, viewport2);
@@ -2114,22 +2114,22 @@ static void test_Viewport(void)
/* AppData */
hr = IDirect3DRMViewport_SetAppData(viewport, 0);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 0);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 1);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 1);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
data = IDirect3DRMViewport2_GetAppData(viewport2);
- ok(data == 1, "got %x\n", data);
+ ok(data == 1, "got %lx\n", data);
IDirect3DRMViewport2_Release(viewport2);
IDirect3DRMViewport_Release(viewport);
@@ -2139,25 +2139,25 @@ static void test_Viewport(void)
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport,
(void **)&viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
left = right = bottom = top = 10.0f;
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2170,71 +2170,71 @@ static void test_Viewport(void)
ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_SetCamera(viewport, frame);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetPlane(viewport, -0.5f, 0.5f, -0.5f, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, 1.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetBack(viewport, 100.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_PERSPECTIVE);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
/* Test all failures together */
hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, NULL, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
device_ref = get_refcount((IUnknown *)device1);
frame_ref = get_refcount((IUnknown *)frame);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2247,7 +2247,7 @@ static void test_Viewport(void)
field = IDirect3DRMViewport_GetField(viewport);
ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2260,97 +2260,97 @@ static void test_Viewport(void)
ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_SetField(viewport, 1.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport_SetPlane(viewport, 5.0f, 3.0f, 2.0f, 0.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport_SetFront(viewport, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport_GetFront(viewport);
ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
hr = IDirect3DRMViewport_SetBack(viewport, 200.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
back = IDirect3DRMViewport_GetBack(viewport);
ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_ORTHOGRAPHIC);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
projection = IDirect3DRMViewport_GetProjection(viewport);
ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDevice(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport_GetFront(viewport);
hr = IDirect3DRMViewport_SetBack(viewport, front);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetBack(viewport, front / 2.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateObject(d3drm2, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport2,
(void **)&viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
left = right = bottom = top = 10.0f;
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2363,64 +2363,64 @@ static void test_Viewport(void)
ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetPlane(viewport2, -0.5f, 0.5f, -0.5f, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, 1.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_PERSPECTIVE);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
device_ref = get_refcount((IUnknown *)device3);
frame_ref2 = get_refcount((IUnknown *)frame3);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice3_Release(d3drm_device3);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2433,7 +2433,7 @@ static void test_Viewport(void)
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2446,103 +2446,103 @@ static void test_Viewport(void)
ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_SetField(viewport2, 1.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport2_SetPlane(viewport2, 5.0f, 3.0f, 2.0f, 0.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport2_SetFront(viewport2, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport2_GetFront(viewport2);
ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
hr = IDirect3DRMViewport2_SetBack(viewport2, 200.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
back = IDirect3DRMViewport2_GetBack(viewport2);
ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_ORTHOGRAPHIC);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
projection = IDirect3DRMViewport2_GetProjection(viewport2);
ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport2_GetFront(viewport2);
hr = IDirect3DRMViewport2_SetBack(viewport2, front);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetBack(viewport2, front / 2.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
IDirect3DRMViewport2_Release(viewport2);
ref4 = get_refcount((IUnknown *)d3drm1);
- todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
IDirect3DRMDevice3_Release(device3);
IDirect3DRMDevice_Release(device1);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
IDirect3DRMFrame3_Release(tmp_frame3);
IDirect3DRMFrame3_Release(frame3);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
IDirect3DRMFrame3_Release(tmp_frame1);
IDirect3DRMFrame_Release(frame);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
IDirectDrawClipper_Release(clipper);
IDirect3DRM3_Release(d3drm3);
@@ -2561,13 +2561,13 @@ static void test_Light(void)
D3DCOLOR color;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
hr = IDirect3DRMLight_QueryInterface(light, &IID_IDirect3DRMObject, (void **)&object);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
IDirect3DRMObject_Release(object);
test_class_name((IDirect3DRMObject *)light, "Light");
@@ -2577,38 +2577,38 @@ static void test_Light(void)
ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
hr = IDirect3DRMLight_SetType(light, D3DRMLIGHT_POINT);
- ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set type, hr %#lx\n", hr);
type = IDirect3DRMLight_GetType(light);
- ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type);
+ ok(type == D3DRMLIGHT_POINT, "wrong type %u.\n", type);
hr = IDirect3DRMLight_SetColor(light, 0xff180587);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff180587, "wrong color (%x)\n", color);
+ ok(color == 0xff180587, "wrong color %#lx.\n", color);
hr = IDirect3DRMLight_SetColor(light, 0x00c0c0c0);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+ ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
hr = IDirect3DRMLight_SetColorRGB(light, 0.5, 0.5, 0.5);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %#lx.\n", color);
IDirect3DRMLight_Release(light);
hr = IDirect3DRM_CreateLight(d3drm, D3DRMLIGHT_SPOT, 0x00c0c0c0, &light);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
type = IDirect3DRMLight_GetType(light);
ok(type == D3DRMLIGHT_SPOT, "Got unexpected type %#x.\n", type);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+ ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
IDirect3DRMLight_Release(light);
@@ -2624,17 +2624,17 @@ static void test_Material2(void)
D3DVALUE r, g, b;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMaterial(d3drm3, 18.5f, &material2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)material2, "Material");
test_object_name((IDirect3DRMObject *)material2);
@@ -2643,38 +2643,38 @@ static void test_Material2(void)
ok(r == 18.5f, "wrong power (%f)\n", r);
hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong emissive r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b);
hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong ambient r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
hr = IDirect3DRMMaterial2_SetPower(material2, 5.87f);
- ok(hr == D3DRM_OK, "Cannot set power (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set power, hr %#lx\n", hr);
r = IDirect3DRMMaterial2_GetPower(material2);
ok(r == 5.87f, "wrong power (%f)\n", r);
hr = IDirect3DRMMaterial2_SetEmissive(material2, 0.5f, 0.5f, 0.5f);
- ok(hr == D3DRM_OK, "Cannot set emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set emissive, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.5f && g == 0.5f && b == 0.5f, "wrong emissive r=%f g=%f b=%f, expected r=0.5 g=0.5 b=0.5\n", r, g, b);
hr = IDirect3DRMMaterial2_SetSpecular(material2, 0.6f, 0.6f, 0.6f);
- ok(hr == D3DRM_OK, "Cannot set specular (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set specular, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get specular (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get specular, hr %#lx\n", hr);
ok(r == 0.6f && g == 0.6f && b == 0.6f, "wrong specular r=%f g=%f b=%f, expected r=0.6 g=0.6 b=0.6\n", r, g, b);
hr = IDirect3DRMMaterial2_SetAmbient(material2, 0.7f, 0.7f, 0.7f);
- ok(hr == D3DRM_OK, "Cannot set ambient (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set ambient, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get ambient (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get ambient, hr %#lx\n", hr);
ok(r == 0.7f && g == 0.7f && b == 0.7f, "wrong ambient r=%f g=%f b=%f, expected r=0.7 g=0.7 b=0.7\n", r, g, b);
IDirect3DRMMaterial2_Release(material2);
@@ -2712,44 +2712,44 @@ static void test_Texture(void)
ULONG ref1, ref2, ref3, ref4;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
/* Test NULL params */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTexture(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
hr = IDirect3DRM_CreateTexture(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
/* Tests for validation of D3DRMIMAGE struct */
hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2758,11 +2758,11 @@ static void test_Texture(void)
testimg.palette = (void *)0xdeadbeef;
testimg.palette_size = 0x39;
hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2770,81 +2770,81 @@ static void test_Texture(void)
initimg.rgb = 0;
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture1, "Expected texture == NULL, got %p.\n", texture1);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture2, "Expected texture == NULL, got %p.\n", texture2);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture3, "Expected texture == NULL, got %p.\n", texture3);
initimg.rgb = 1;
initimg.red_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.red_mask = 0x000000ff;
initimg.green_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.green_mask = 0x0000ff00;
initimg.blue_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.blue_mask = 0x00ff0000;
initimg.buffer1 = NULL;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.buffer1 = &pixel;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
/* Created from image, GetSurface() does not work. */
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "GetSurface() expected to fail, %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &surface);
- ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "GetSurface() expected to fail, %#x\n", hr);
+ ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "Unexpected hr %#lx.\n", hr);
/* Test all failures together */
test_class_name((IDirect3DRMObject *)texture1, "Texture");
@@ -2860,11 +2860,11 @@ static void test_Texture(void)
IDirect3DRMTexture_Release(texture1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
@@ -2873,11 +2873,11 @@ static void test_Texture(void)
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -2886,11 +2886,11 @@ static void test_Texture(void)
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
/* InitFromImage tests */
/* Tests for validation of D3DRMIMAGE struct */
@@ -2899,14 +2899,14 @@ static void test_Texture(void)
testimg.palette_size = 0;
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2915,78 +2915,78 @@ static void test_Texture(void)
testimg.palette_size = 0x39;
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)texture2);
hr = IDirect3DRMTexture2_InitFromImage(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)texture2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)texture3);
hr = IDirect3DRMTexture3_InitFromImage(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)texture3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
initimg.rgb = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.rgb = 1;
initimg.red_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.red_mask = 0x000000ff;
initimg.green_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.green_mask = 0x0000ff00;
initimg.blue_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.blue_mask = 0x00ff0000;
initimg.buffer1 = NULL;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.buffer1 = &pixel;
d3drm_img = NULL;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
/* Release leaked reference to d3drm1 */
IDirect3DRM_Release(d3drm1);
@@ -2995,24 +2995,24 @@ static void test_Texture(void)
ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -3020,11 +3020,11 @@ static void test_Texture(void)
ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM2_Release(d3drm2);
@@ -3046,17 +3046,17 @@ static void test_Device(void)
GetClientRect(window, &rc);
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = DirectDrawCreateClipper(0, &pClipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)device, "Device");
test_object_name((IDirect3DRMObject *)device);
@@ -3064,7 +3064,7 @@ static void test_Device(void)
/* WinDevice */
if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (void **)&win_device)))
{
- win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRMWinDevice interface, hr %#lx, skipping tests\n", hr);
goto cleanup;
}
@@ -3089,13 +3089,13 @@ static void test_frame_transform(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3113,9 +3113,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3128,9 +3128,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_BEFORE, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3143,9 +3143,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_AFTER, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3154,7 +3154,7 @@ static void test_frame_transform(void)
add_matrix[3][3] = 2.0f;
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
frame_set_transform(frame,
2.0f, 0.0f, 0.0f, 0.0f,
@@ -3162,9 +3162,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_REPLACE, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3177,9 +3177,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_BEFORE, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3192,9 +3192,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_AFTER, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3207,9 +3207,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_REPLACE, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3222,9 +3222,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_BEFORE, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3237,9 +3237,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_AFTER, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3252,7 +3252,7 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
matrix_sanitise(matrix);
expect_matrix(matrix,
@@ -3267,9 +3267,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_BEFORE, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3283,9 +3283,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_AFTER, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3294,9 +3294,9 @@ static void test_frame_transform(void)
3.0f, -3.0f, 3.0f, 1.0f, 1);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 1.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3305,9 +3305,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 0.0f, 1.0f, 1);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3321,7 +3321,7 @@ static void test_frame_transform(void)
0.0f, 0.0f, 8.0f, 0.0f,
64.0f, 64.0f, 64.0f, 1.0f);
hr = IDirect3DRM_CreateFrame(d3drm, frame, &subframe);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
frame_set_transform(subframe,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3330,11 +3330,11 @@ static void test_frame_transform(void)
set_vector(&v1, 3.0f, 5.0f, 7.0f);
hr = IDirect3DRMFrame_Transform(frame, &v2, &v1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_vector(&v2, 70.0f, 84.0f, 120.0f, 1);
hr = IDirect3DRMFrame_Transform(subframe, &v2, &v1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_vector(&v2, 92.0f, 128.0f, 208.0f, 1);
IDirect3DRMFrame_Release(subframe);
@@ -3367,13 +3367,13 @@ static void test_d3drm_load(void)
const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial };
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
info.lpMemory = data_d3drm_load;
info.dSize = strlen(data_d3drm_load);
hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID **)req_refiids, 3, D3DRMLOAD_FROMMEMORY,
object_load_callback, (void *)0xdeadbeef, NULL, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load data, hr %#lx\n", hr);
ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects);
IDirect3DRM_Release(d3drm);
@@ -3391,23 +3391,23 @@ static void __cdecl object_load_callback_frame(IDirect3DRMObject *object, REFIID
char name[128];
hr = IDirect3DRMObject_QueryInterface(object, &IID_IDirect3DRMFrame, (void**)&frame);
- ok(hr == D3DRM_OK, "IDirect3DRMObject_QueryInterface returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetVisuals(frame, &array);
- ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetVisuals returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = IDirect3DRMVisualArray_GetSize(array);
- ok(size == 1, "Wrong size %u returned, expected 1\n", size);
+ ok(size == 1, "Wrong size %lu returned, expected 1\n", size);
hr = IDirect3DRMVisualArray_GetElement(array, 0, &visual);
- ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetElement returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMVisual_QueryInterface(visual, &IID_IDirect3DRMMeshBuilder, (void**)&mesh_builder);
- ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetSize returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(mesh_builder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, "mesh1"), "Wrong name %s, expected mesh1\n", name);
IDirect3DRMVisual_Release(visual);
@@ -3443,18 +3443,18 @@ static void test_frame_mesh_materials(void)
int i;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Direct3DRMCreate returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
info.lpMemory = data_frame_mesh_materials;
info.dSize = strlen(data_frame_mesh_materials);
hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback_frame, (void*)0xdeadbeef, NULL, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_CreateMesh(mesh_builder, &mesh);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_CreateMesh returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(size == 3, "Wrong size %u returned, expected 3\n", size);
+ ok(size == 3, "Unexpected count %lu.\n", size);
for (i = 0; i < size; i++)
{
@@ -3464,33 +3464,33 @@ static void test_frame_mesh_materials(void)
DWORD face_data_size;
hr = IDirect3DRMMesh_GetGroup(mesh, i, &vertex_count, &face_count, &vertex_per_face, &face_data_size, NULL);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroup returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(vertex_count == groups[i].vertex_count, "Group %d: Wrong vertex count %d, expected %d\n", i, vertex_count, groups[i].vertex_count);
ok(face_count == groups[i].face_count, "Group %d: Wrong face count %d; expected %d\n", i, face_count, groups[i].face_count);
ok(vertex_per_face == groups[i].vertex_per_face, "Group %d: Wrong vertex per face %d, expected %d\n", i, vertex_per_face, groups[i].vertex_per_face);
- ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %d, expected %d\n", i, face_data_size, groups[i].face_data_size);
+ ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %ld, expected %d\n", i, face_data_size, groups[i].face_data_size);
color = IDirect3DRMMesh_GetGroupColor(mesh, i);
- ok(color == groups[i].color, "Group %d: Wrong color %x, expected %x\n", i, color, groups[i].color);
+ ok(color == groups[i].color, "Group %d: Wrong color %lx, expected %lx.\n", i, color, groups[i].color);
hr = IDirect3DRMMesh_GetGroupMaterial(mesh, i, &material);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupMaterial returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(material != NULL, "Group %d: No material\n", i);
power = IDirect3DRMMaterial_GetPower(material);
ok(power == groups[i].power, "Group %d: Wrong power %f, expected %f\n", i, power, groups[i].power);
hr = IDirect3DRMMaterial_GetSpecular(material, &red, &green, &blue);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetSpecular returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(red == groups[i].specular[0], "Group %d: Wrong specular red %f, expected %f\n", i, red, groups[i].specular[0]);
ok(green == groups[i].specular[1], "Group %d: Wrong specular green %f, pD3DRMexpected %f\n", i, green, groups[i].specular[1]);
ok(blue == groups[i].specular[2], "Group %d: Wrong specular blue %f, expected %f\n", i, blue, groups[i].specular[2]);
hr = IDirect3DRMMaterial_GetEmissive(material, &red, &green, &blue);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetEmissive returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(red == groups[i].emissive[0], "Group %d: Wrong emissive red %f, expected %f\n", i, red, groups[i].emissive[0]);
ok(green == groups[i].emissive[1], "Group %d: Wrong emissive green %f, expected %f\n", i, green, groups[i].emissive[1]);
ok(blue == groups[i].emissive[2], "Group %d: Wrong emissive blue %f, expected %f\n", i, blue, groups[i].emissive[2]);
hr = IDirect3DRMMesh_GetGroupTexture(mesh, i, &texture);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupTexture returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(!texture, "Group %d: Unexpected texture\n", i);
if (material)
@@ -3523,13 +3523,13 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
for (i = 0; i < entry_count; ++i)
{
hr = IUnknown_QueryInterface(base_iface, tests[i].iid, (void **)&iface1);
- ok(hr == tests[i].hr, "Got hr %#x for test \"%s\" %u.\n", hr, test_name, i);
+ ok(hr == tests[i].hr, "Got hr %#lx for test \"%s\" %u.\n", hr, test_name, i);
if (SUCCEEDED(hr))
{
for (j = 0; j < entry_count; ++j)
{
hr = IUnknown_QueryInterface(iface1, tests[j].iid, (void **)&iface2);
- ok(hr == tests[j].hr, "Got hr %#x for test \"%s\" %u, %u.\n", hr, test_name, i, j);
+ ok(hr == tests[j].hr, "Got hr %#lx for test \"%s\" %u, %u.\n", hr, test_name, i, j);
if (SUCCEEDED(hr))
{
expected_refcount = 0;
@@ -3538,7 +3538,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
if (IsEqualGUID(tests[i].refcount_iid, tests[j].refcount_iid))
++expected_refcount;
refcount = IUnknown_Release(iface2);
- ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n",
+ ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, %u, expected %lu.\n",
refcount, test_name, i, j, expected_refcount);
if (tests[i].vtable_iid && tests[j].vtable_iid && IsEqualGUID(tests[i].vtable_iid, tests[j].vtable_iid))
ok(iface1 == iface2,
@@ -3555,7 +3555,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
if (IsEqualGUID(refcount_iid, tests[i].refcount_iid))
++expected_refcount;
refcount = IUnknown_Release(iface1);
- ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n",
+ ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, expected %lu.\n",
refcount, test_name, i, expected_refcount);
}
}
@@ -3638,7 +3638,7 @@ static void test_d3drm_qi(void)
IDirect3DRM *d3drm;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, ARRAY_SIZE(tests));
@@ -3727,32 +3727,32 @@ static void test_frame_qi(void)
IUnknown *unknown;
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(hr == D3DRM_OK, "Failed to create frame1 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame1, hr %#lx\n", hr);
hr = IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1, hr %#lx\n", hr);
IDirect3DRMFrame_Release(frame1);
test_qi("frame1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateFrame(d3drm2, NULL, &frame2);
- ok(hr == D3DRM_OK, "Failed to create frame2 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame2, hr %#lx\n", hr);
hr = IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2, hr %#lx\n", hr);
IDirect3DRMFrame2_Release(frame2);
test_qi("frame2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(hr == D3DRM_OK, "Failed to create frame3 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame3, hr %#lx\n", hr);
hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3, hr %#lx\n", hr);
IDirect3DRMFrame3_Release(frame3);
test_qi("frame3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -3851,37 +3851,37 @@ static void test_device_qi(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice, hr %#lx\n", hr);
IDirect3DRMDevice_Release(device1);
test_qi("device1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2 (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2, hr %#lx\n", hr);
IDirect3DRMDevice2_Release(device2);
test_qi("device2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3 (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3, hr %#lx\n", hr);
IDirect3DRMDevice3_Release(device3);
test_qi("device3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -3930,60 +3930,60 @@ static void test_create_device_from_clipper1(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 0, 0, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, NULL, &driver, 300, 200, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, &device1);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -3994,37 +3994,37 @@ static void test_create_device_from_clipper1(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4035,37 +4035,37 @@ static void test_create_device_from_clipper1(void)
d3ddevice1 = NULL;
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
if (ds)
IDirectDrawSurface_Release(ds);
@@ -4101,66 +4101,66 @@ static void test_create_device_from_clipper2(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300, 200, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -4171,37 +4171,37 @@ static void test_create_device_from_clipper2(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Expected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4212,39 +4212,39 @@ static void test_create_device_from_clipper2(void)
d3ddevice2 = NULL;
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4279,66 +4279,66 @@ static void test_create_device_from_clipper3(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 0, 0, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300, 200, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, &device3);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -4349,37 +4349,37 @@ static void test_create_device_from_clipper3(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4390,39 +4390,39 @@ static void test_create_device_from_clipper3(void)
d3ddevice2 = NULL;
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4452,16 +4452,16 @@ static void test_create_device_from_surface1(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
/* Create a surface and use it to create the retained mode device. */
@@ -4473,64 +4473,64 @@ static void test_create_device_from_surface1(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, NULL, &device1);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, NULL, surface, &device1);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice_Release(d3ddevice1);
@@ -4538,17 +4538,17 @@ static void test_create_device_from_surface1(void)
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4558,7 +4558,7 @@ static void test_create_device_from_surface1(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4568,23 +4568,23 @@ static void test_create_device_from_surface1(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4594,12 +4594,12 @@ static void test_create_device_from_surface1(void)
IDirect3DDevice_Release(d3ddevice1);
IDirect3DRMDevice_Release(device1);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
DestroyWindow(window);
@@ -4624,20 +4624,20 @@ static void test_create_device_from_surface2(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
/* Create a surface and use it to create the retained mode device. */
@@ -4649,66 +4649,66 @@ static void test_create_device_from_surface2(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, NULL, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, NULL, surface, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4716,20 +4716,20 @@ static void test_create_device_from_surface2(void)
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4739,7 +4739,7 @@ static void test_create_device_from_surface2(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4749,23 +4749,23 @@ static void test_create_device_from_surface2(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4775,12 +4775,12 @@ static void test_create_device_from_surface2(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice2_Release(device2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
@@ -4806,20 +4806,20 @@ static void test_create_device_from_surface3(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
/* Create a surface and use it to create the retained mode device. */
@@ -4831,66 +4831,66 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, NULL, 0, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, NULL, surface, 0, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4898,19 +4898,19 @@ static void test_create_device_from_surface3(void)
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
/* In version 3, d3drm will destroy all references of the depth surface it created internally. */
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x.\n", hr);
+ todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got hr %#lx.\n", hr);
if (SUCCEEDED(hr))
IDirectDrawSurface_Release(ds);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4920,7 +4920,7 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4930,23 +4930,23 @@ static void test_create_device_from_surface3(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4955,25 +4955,25 @@ static void test_create_device_from_surface3(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/* The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
/* What happens if we pass no flags and still attach our own depth surface? */
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4981,12 +4981,12 @@ static void test_create_device_from_surface3(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4996,28 +4996,28 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* What happens if we don't pass D3DRMDEVICE_NOZBUFFER and still not attach our own depth surface? */
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x).\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
IDirectDrawSurface_Release(d3drm_surface);
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
@@ -5036,7 +5036,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -5046,7 +5046,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* We used to use EnumDevices() for this, but it seems
* D3DDEVICEDESC.dwDeviceZBufferBitDepth only has a very casual
@@ -5064,7 +5064,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
continue;
hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
if (FAILED(hr))
{
IDirectDrawSurface_Release(*ds);
@@ -5103,13 +5103,13 @@ static void test_create_device_from_d3d1(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d1);
/* Create the immediate mode device */
@@ -5124,83 +5124,83 @@ static void test_create_device_from_d3d1(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice1);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, NULL, d3ddevice1, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, NULL, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, &device1);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice2_Release(device2);
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5208,61 +5208,61 @@ static void test_create_device_from_d3d1(void)
IDirect3DDevice_Release(d3drm_d3ddevice1);
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice1);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d1);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref2);
while (IDirect3DDevice_Release(d3ddevice1) > device_ref2);
while (IDirect3D_Release(d3d1) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)temp_ddraw1);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D, (void **)&temp_d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
temp_d3ddevice1 = create_device1(temp_ddraw1, window, &surface);
hr = IDirect3DRMDevice_InitFromD3D(device1, temp_d3d1, temp_d3ddevice1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)temp_d3ddevice1);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d1);
- todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref2);
while (IDirect3DDevice_Release(temp_d3ddevice1) > 0);
@@ -5272,61 +5272,60 @@ static void test_create_device_from_d3d1(void)
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice2_Release(device2);
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice3_Release(device3);
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n",
d3ddevice1, d3drm_d3ddevice1);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps got %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5334,12 +5333,12 @@ static void test_create_device_from_d3d1(void)
IDirect3DDevice_Release(d3drm_d3ddevice1);
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1,
+ todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1,
d3d_ref2);
IDirect3DRM_Release(d3drm1);
@@ -5362,7 +5361,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
GetClientRect(window, &rc);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -5372,7 +5371,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
if (FAILED(hr))
@@ -5398,7 +5397,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
continue;
hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
if (FAILED(hr))
{
IDirectDrawSurface_Release(*ds);
@@ -5440,15 +5439,15 @@ static void test_create_device_from_d3d2(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d2);
/* Create the immediate mode device */
@@ -5464,74 +5463,74 @@ static void test_create_device_from_d3d2(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice2);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, NULL, d3ddevice2, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, NULL, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, &device2);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5539,94 +5538,94 @@ static void test_create_device_from_d3d2(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
{
hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, d3ddevice1);
- ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D(device2, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
IDirect3DRMDevice_Release(device1);
if (SUCCEEDED(hr))
{
IDirect3DRMDevice_Release(device1);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2,
(void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
}
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, NULL, d3ddevice2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice2);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d2);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
while (IDirect3D2_Release(d3d2) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
ref5 = get_refcount((IUnknown *)temp_d3d2);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, temp_d3d2, temp_d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d2);
- ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5638,44 +5637,43 @@ static void test_create_device_from_d3d2(void)
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5683,14 +5681,14 @@ static void test_create_device_from_d3d2(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
@@ -5723,15 +5721,15 @@ static void test_create_device_from_d3d3(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d2);
/* Create the immediate mode device */
@@ -5747,72 +5745,72 @@ static void test_create_device_from_d3d3(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice2);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, NULL, d3ddevice2, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, NULL, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, &device3);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5820,94 +5818,94 @@ static void test_create_device_from_d3d3(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
{
hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, d3ddevice1);
- ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D(device3, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
IDirect3DRMDevice_Release(device1);
if (SUCCEEDED(hr))
{
IDirect3DRMDevice_Release(device1);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3,
(void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
}
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, NULL, d3ddevice2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice2);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d2);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
while (IDirect3D2_Release(d3d2) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
ref5 = get_refcount((IUnknown *)temp_d3d2);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, temp_d3d2, temp_d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d2);
- ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5919,44 +5917,43 @@ static void test_create_device_from_d3d3(void)
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n",desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5964,14 +5961,14 @@ static void test_create_device_from_d3d3(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm1);
@@ -5989,13 +5986,13 @@ static void test_create_device_1(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, &device);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got hr %#lx.\n", hr);
ok(device == NULL, "Expected device returned == NULL, got %p.\n", device);
hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM_Release(d3drm);
}
@@ -6008,15 +6005,15 @@ static void test_create_device_2(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm);
@@ -6030,15 +6027,15 @@ static void test_create_device_3(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm);
@@ -6139,10 +6136,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
ok(img->rgb == TRUE, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
ok(img->bytes_per_line == w * 4, "Test %u: Got unexpected image bytes per line %u, expected %u.\n",
test_idx, img->bytes_per_line, w * 4);
- ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
- ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
- ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
- ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+ ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+ ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+ ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+ ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
ok(!img->palette_size, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size);
ok(!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
for (i = 0; i < h; ++i)
@@ -6166,10 +6163,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
ok(img->depth == 8, "Test %u: Got unexpected image depth %u.\n", test_idx, img->depth);
ok(!img->rgb, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
- ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
- ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
- ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
- ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+ ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+ ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+ ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+ ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
ok(!!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
if (!palettized)
{
@@ -6265,58 +6262,58 @@ static void test_load_texture(void)
};
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
/* Test all failures together. */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
ok(!texture1, "Got unexpected texture %p.\n", texture1);
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm1, "", &texture1);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture1, "Got unexpected texture %p.\n", texture1);
hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture2, "Got unexpected texture %p.\n", texture2);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_LoadTexture(d3drm2, "", &texture2);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture2, "Got unexpected texture %p.\n", texture2);
hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture3, "Got unexpected texture %p.\n", texture3);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm3, "", &texture3);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture3, "Got unexpected texture %p.\n", texture3);
hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized);
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
@@ -6324,56 +6321,56 @@ static void test_load_texture(void)
test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture, (void **)&texture1);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture2, (void **)&texture2);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture2_Release(texture2);
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
@@ -6381,24 +6378,24 @@ static void test_load_texture(void)
/* Test whether querying a version 1 texture from version 3 causes a
* change in the loading behavior. */
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#lx.\n", hr);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture3, (void **)&texture3);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
@@ -6499,34 +6496,34 @@ static void test_texture_qi(void)
BOOL check;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
filename = create_bitmap(1, 1, TRUE);
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture_QueryInterface(texture1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
test_qi("texture1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_QueryInterface(texture2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2 (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
test_qi("texture2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3 (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3, hr %#lx\n", hr);
IDirect3DRMTexture3_Release(texture3);
test_qi("texture3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6535,7 +6532,7 @@ static void test_texture_qi(void)
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
check = DeleteFileA(filename);
- ok(check, "Cannot delete image stored in %s (error = %d).\n", filename, GetLastError());
+ ok(check, "Cannot delete image stored in %s (error = %ld).\n", filename, GetLastError());
HeapFree(GetProcessHeap(), 0, filename);
}
@@ -6628,31 +6625,31 @@ static void test_viewport_qi(void)
};
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 640, 480, &device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, 640, 480, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport1);
test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, camera1, 0, 0, 640, 480, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport1);
test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6661,17 +6658,17 @@ static void test_viewport_qi(void)
IDirect3DRMFrame_Release(frame1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 640, 480, &device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, 640, 480, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport2);
test_qi("viewport2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6696,14 +6693,14 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface *surface, UINT x, UINT y)
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_Lock(surface, &rect, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL);
- ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to lock surface, hr %#lx.\n", hr);
if (FAILED(hr))
return 0xdeadbeef;
color = *((DWORD *)surface_desc.lpSurface) & 0x00ffffff;
hr = IDirectDrawSurface_Unlock(surface, NULL);
- ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#lx.\n", hr);
return color;
}
@@ -6719,7 +6716,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
GetClientRect(window, &rc);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -6729,7 +6726,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
if (FAILED(hr))
@@ -6755,7 +6752,7 @@ static void clear_depth_surface(IDirectDrawSurface *surface, DWORD value)
U5(fx).dwFillDepth = value;
hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx);
- ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
}
static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex_count, UINT offset, UINT len)
@@ -6769,7 +6766,7 @@ static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex
exec_data.dwInstructionOffset = offset;
exec_data.dwInstructionLength = len;
hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data);
- ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set execute data, hr %#lx.\n", hr);
}
static void emit_set_ts(void **ptr, D3DTRANSFORMSTATETYPE state, DWORD value)
@@ -6879,17 +6876,17 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
};
hr = IDirect3DDevice_CreateMatrix(device, &world_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, world_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_CreateMatrix(device, &view_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, view_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_CreateMatrix(device, &proj_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, proj_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
memset(&exec_desc, 0, sizeof(exec_desc));
exec_desc.dwSize = sizeof(exec_desc);
@@ -6898,10 +6895,10 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY;
hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL);
- ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#lx.\n", hr);
hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc);
- ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#lx.\n", hr);
memcpy(exec_desc.lpData, quad_strip, sizeof(quad_strip));
ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad_strip);
@@ -6922,14 +6919,14 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
inst_length -= sizeof(quad_strip);
hr = IDirect3DExecuteBuffer_Unlock(execute_buffer);
- ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#lx.\n", hr);
hr = IDirect3DDevice_BeginScene(device);
set_execute_data(execute_buffer, 4, sizeof(quad_strip), inst_length);
hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED);
- ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#lx.\n", hr);
hr = IDirect3DDevice_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
IDirect3DExecuteBuffer_Release(execute_buffer);
}
@@ -6956,87 +6953,87 @@ static void test_viewport_clear1(void)
GetClientRect(window, &rc);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = IDirectDraw_CreateClipper(ddraw, 0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, rc.right,
rc.bottom, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
/* Fetch immediate mode device and viewport */
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3d_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport1, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3d_device1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Clear uses the scene frame's background color. */
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
- ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+ ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(camera1, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(camera1);
- ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
CHECK_REFCOUNT(frame1, 1);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
CHECK_REFCOUNT(frame1, 1);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
- ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Fill the depth surface with a value lower than the quad's depth value. */
clear_depth_surface(ds, 0x7fff);
@@ -7044,38 +7041,38 @@ static void test_viewport_clear1(void)
/* Depth test passes here */
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Depth test fails here */
ret_color = get_surface_color(surface, 500, 400);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Check what happens if we release the depth surface that d3drm created, and clear the viewport */
hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
- ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
clear_depth_surface(ds, 0x7fff);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
IDirectDrawSurface_Release(ds);
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
ret_color = get_surface_color(surface, 500, 400);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
IDirect3DViewport_Release(d3d_viewport);
IDirectDrawSurface_Release(surface);
@@ -7110,29 +7107,29 @@ static void draw_quad2(IDirect3DDevice2 *device, IDirect3DViewport *viewport)
HRESULT hr;
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat);
- ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set world transform, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat);
- ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set view transform, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat);
- ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#lx.\n", hr);
hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport2, (void **)&viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2);
- ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#lx.\n", hr);
IDirect3DViewport2_Release(viewport2);
hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_TRUE);
- ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL);
- ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set the z function, hr %#lx.\n", hr);
hr = IDirect3DDevice2_BeginScene(device);
- ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to begin scene, hr %#lx.\n", hr);
hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, tquad, 4, 0);
- ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr);
hr = IDirect3DDevice2_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
}
static void test_viewport_clear2(void)
@@ -7160,156 +7157,156 @@ static void test_viewport_clear2(void)
GetClientRect(window, &rc);
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_SetCooperativeLevel(ddraw1, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = IDirectDraw_CreateClipper(ddraw1, 0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
rc.bottom, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
/* Fetch immediate mode device in order to access render target and test its color. */
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3d_device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Clear uses the scene frame's background color. */
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
ret_color = IDirect3DRMFrame3_GetSceneBackground(frame3);
- ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+ ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(camera3, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3);
- ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
CHECK_REFCOUNT(frame3, 1);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
CHECK_REFCOUNT(frame3, 1);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
/* d3drm seems to be calling BeginScene when Clear is called. */
hr = IDirect3DDevice2_BeginScene(d3d_device2);
- todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#x.\n", hr);
+ todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#lx.\n", hr);
hr = IDirect3DDevice2_EndScene(d3d_device2);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* We're using d3d to draw using IDirect3DDevice2 created from d3drm. */
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Without calling Configure, Clear doesn't work. */
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Fetch attached depth surface and see if viewport clears it if it's detached from the render target. */
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
clear_depth_surface(ds, 0x39);
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
- ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
clear_depth_surface(ds, 0x7fff);
/* This version of Clear still clears the depth surface even if it's deleted from the render target. */
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
ret_color = get_surface_color(surface, 500, 400);
- todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Remove old draw contents */
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
/* Clear with no flags */
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, 0);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
IDirect3DViewport_Release(d3d_viewport);
IDirectDrawSurface_Release(surface);
@@ -7320,28 +7317,28 @@ static void test_viewport_clear2(void)
/* Create device without depth surface attached */
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
d3d_device2 = create_device2_without_ds(ddraw2, window);
if (!d3d_device2)
goto cleanup;
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3d_device2, &device3);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
rc.bottom, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ZBUFFER);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DRMViewport2_Release(viewport2);
@@ -7384,22 +7381,22 @@ static void test_create_texture_from_surface(void)
RECT rc;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
/* Create a surface and use it to create a texture. */
memset(&desc, 0, sizeof(desc));
@@ -7410,82 +7407,82 @@ static void test_create_texture_from_surface(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface2, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* Test NULL params */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, surface, &texture1);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture_GetImage(texture1);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture_InitFromSurface(texture1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
IDirect3DRMTexture_Release(texture1);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, surface, &texture2);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture2_GetImage(texture2);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture2_InitFromSurface(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
IDirect3DRMTexture_Release(texture2);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, surface, &texture3);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture3_GetImage(texture3);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture3_InitFromSurface(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
- ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
ok(ds == surface, "Expected same surface back.\n");
IDirectDrawSurface_Release(ds);
/* Init already initialized texture with same surface. */
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
/* Init already initialized texture with different surface. */
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
- ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
ok(ds == surface, "Expected same surface back.\n");
IDirectDrawSurface_Release(ds);
@@ -7493,7 +7490,7 @@ static void test_create_texture_from_surface(void)
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7504,13 +7501,13 @@ static void test_create_texture_from_surface(void)
/* Create from image, initialize from surface. */
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7543,27 +7540,27 @@ static void test_animation(void)
D3DVECTOR v;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateAnimation(d3drm1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr 0x%08x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
CHECK_REFCOUNT(d3drm1, 1);
hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
- ok(SUCCEEDED(hr), "Failed to create animation hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
CHECK_REFCOUNT(d3drm1, 2);
test_class_name((IDirect3DRMObject *)animation, "Animation");
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMAnimation2, (void **)&animation2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr %#lx.\n", hr);
ok(animation != (void *)animation2, "Expected different interface pointer.\n");
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IDirect3DRMObject, (void **)&obj2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
ok(obj == obj2 && obj == (IDirect3DRMObject *)animation, "Unexpected object pointer.\n");
@@ -7572,35 +7569,35 @@ static void test_animation(void)
/* Set animated frame, get it back. */
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
- ok(SUCCEEDED(hr), "Failed to create a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create a frame, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
- ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame, 1);
hr = IDirect3DRMAnimation_SetFrame(animation, frame);
- ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame, 1);
hr = IDirect3DRMAnimation2_GetFrame(animation2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_GetFrame(animation2, &frame3);
- ok(SUCCEEDED(hr), "Failed to get the frame, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get the frame, hr %#lx.\n", hr);
ok(frame3 != (void *)frame, "Unexpected interface pointer.\n");
CHECK_REFCOUNT(frame, 2);
IDirect3DRMFrame3_Release(frame3);
hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
- ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&frame3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame3, 2);
hr = IDirect3DRMAnimation2_SetFrame(animation2, frame3);
- ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame3, 2);
IDirect3DRMFrame3_Release(frame3);
@@ -7609,70 +7606,70 @@ static void test_animation(void)
/* Animation options. */
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Undefined mask value */
hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Ambiguous mask */
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Mask contains undefined bits together with valid one. */
hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000 | D3DRMANIMATION_OPEN);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#x.\n", options);
+ ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, 0);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
/* Key management. */
hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 1.0f, 0.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
- ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 2.0f, 0.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 99.0f, 3.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 80.0f, 4.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
v.x = 1.0f;
v.y = 0.0f;
@@ -7681,20 +7678,20 @@ static void test_animation(void)
/* NULL quaternion pointer leads to a crash on Windows. */
hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
- ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 99.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
/* Relative order, keys are returned sorted by time. */
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7710,23 +7707,23 @@ static void test_animation(void)
for (i = 0; i < count; i++)
{
- ok(keys[i].dwSize == sizeof(*keys), "%u: unexpected dwSize value %u.\n", i, keys[i].dwSize);
+ ok(keys[i].dwSize == sizeof(*keys), "%lu: unexpected dwSize value %lu.\n", i, keys[i].dwSize);
todo_wine
{
switch (keys[i].dwKeyType)
{
case D3DRMANIMATION_ROTATEKEY:
- ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
case D3DRMANIMATION_POSITIONKEY:
- ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
case D3DRMANIMATION_SCALEKEY:
- ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
default:
- ok(0, "%u: unknown key type %d.\n", i, keys[i].dwKeyType);
+ ok(0, "%lu: unknown key type %ld.\n", i, keys[i].dwKeyType);
}
}
}
@@ -7734,86 +7731,86 @@ static void test_animation(void)
/* No keys in this range. */
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, NULL);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, keys);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 0.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 4, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 4, "Unexpected key count %lu.\n", count);
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
/* Time is 0-based. */
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, &count, NULL);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, 100.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
/* AddKey() tests. */
hr = IDirect3DRMAnimation2_AddKey(animation2, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key) - 1;
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key) + 1;
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key);
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
key.dvPositionKey.x = 8.0f;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(SUCCEEDED(hr), "Failed to add key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add key, hr %#lx.\n", hr);
/* Delete tests. */
hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
- ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
- ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, -1000.0f, 1000.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 9, "Unexpected key count %u.\n", count);
-
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
- ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[6].dwKeyType);
- ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[7].dwKeyType);
- ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[8].dwKeyType);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 9, "Unexpected key count %lu.\n", count);
+
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
+ ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[6].dwKeyType);
+ ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[7].dwKeyType);
+ ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[8].dwKeyType);
ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7826,27 +7823,27 @@ static void test_animation(void)
ok(keys[8].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[8].dvTime);
hr = IDirect3DRMAnimation_DeleteKey(animation, -100.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_DeleteKey(animation, 100.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
/* Only first Position keys are not removed. */
hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7856,12 +7853,12 @@ static void test_animation(void)
ok(keys[5].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[5].dvTime);
hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
count = 0;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 3, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 3, "Unexpected key count %lu.\n", count);
IDirect3DRMAnimation2_Release(animation2);
IDirect3DRMAnimation_Release(animation);
@@ -7945,26 +7942,26 @@ static void test_animation_qi(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
- ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
IDirect3DRMAnimation_Release(animation);
test_qi("animation_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateAnimation(d3drm3, &animation2);
- ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
IDirect3DRMAnimation2_Release(animation2);
test_qi("animation2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
@@ -7981,10 +7978,10 @@ static void test_wrap(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
- ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
test_class_name((IDirect3DRMObject *)wrap, "");
@@ -8067,13 +8064,13 @@ static void test_wrap_qi(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
- ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
hr = IDirect3DRMWrap_QueryInterface(wrap, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap, hr %#lx.\n", hr);
IDirect3DRMWrap_Release(wrap);
test_qi("wrap_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index 101a37e830d..1e8e6a83bee 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -236,7 +236,7 @@ static void ColorTest(void)
blue=0.55f;
expected_color=0xffcc4c8c;
got_color=D3DRMCreateColorRGB(red,green,blue);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/*___________D3DRMCreateColorRGBA________________________*/
red=0.1f;
@@ -245,7 +245,7 @@ static void ColorTest(void)
alpha=0.58f;
expected_color=0x931966b2;
got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/* if a component is <0 then, then one considers this component as 0. The following test proves this fact (test only with the red component). */
red=-0.88f;
@@ -254,7 +254,7 @@ static void ColorTest(void)
alpha=0.41f;
expected_color=0x68006699;
got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/* if a component is >1 then, then one considers this component as 1. The following test proves this fact (test only with the red component). */
red=2.37f;
@@ -263,7 +263,7 @@ static void ColorTest(void)
alpha=0.41f;
expected_color=0x68ff6699;
got_color=D3DRMCreateColorRGBA(red,green,blue,alpha);
- ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color);
+ ok((expected_color==got_color),"Expected color=%lx, Got color=%lx\n",expected_color,got_color);
/*___________D3DRMColorGetAlpha_________________________*/
color=0x0e4921bf;
--
2.35.1
2
1
[PATCH 0/5] MR64: win32u: Move more of default window proc from user32.
by Jacek Caban (ï¼ jacek) 12 May '22
by Jacek Caban (ï¼ jacek) 12 May '22
12 May '22
12 May '22
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcr110/tests/msvcr110.c | 2 +-
dlls/msvcrt/locale.c | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
1
0
[PATCH v3 1/2] msvcr110/tests: Fix setlocale test failure on systems with UTF-8 locales enabled.
by Piotr Caban 12 May '22
by Piotr Caban 12 May '22
12 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52937
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcr110/tests/msvcr110.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
1
0
[PATCH v2 vkd3d] vkd3d-shader/hlsl: Handle over/underflow when parsing integer literals.
by Matteo Bruni 12 May '22
by Matteo Bruni 12 May '22
12 May '22
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
v2: Don't duplicate parse_integer().
Supersedes 235242.
This fixes arithmetic-int.shader_test on 32-bit Linux for
me.
libs/vkd3d-shader/hlsl.l | 6 ++---
libs/vkd3d-shader/preproc.y | 34 +-----------------------
libs/vkd3d-shader/vkd3d_shader_main.c | 32 ++++++++++++++++++++++
libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++
4 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l
index 267c8c30..ff7b712f 100644
--- a/libs/vkd3d-shader/hlsl.l
+++ b/libs/vkd3d-shader/hlsl.l
@@ -197,15 +197,15 @@ row_major {return KW_ROW_MAJOR; }
return C_FLOAT;
}
0x[0-9a-fA-F]+ {
- sscanf(yytext, "0x%x", &yylval->intval);
+ yylval->intval = vkd3d_parse_integer(yytext);
return C_INTEGER;
}
0[0-7]+ {
- sscanf(yytext, "0%o", &yylval->intval);
+ yylval->intval = vkd3d_parse_integer(yytext);
return C_INTEGER;
}
[0-9]+ {
- yylval->intval = (atoi(yytext));
+ yylval->intval = vkd3d_parse_integer(yytext);
return C_INTEGER;
}
diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y
index 3f02ac03..009c35ff 100644
--- a/libs/vkd3d-shader/preproc.y
+++ b/libs/vkd3d-shader/preproc.y
@@ -165,38 +165,6 @@ static bool preproc_push_if(struct preproc_ctx *ctx, bool condition)
return true;
}
-static int char_to_int(char c)
-{
- if ('0' <= c && c <= '9')
- return c - '0';
- if ('A' <= c && c <= 'F')
- return c - 'A' + 10;
- if ('a' <= c && c <= 'f')
- return c - 'a' + 10;
- return -1;
-}
-
-static uint32_t preproc_parse_integer(const char *s)
-{
- uint32_t base = 10, ret = 0;
- int digit;
-
- if (*s == '0')
- {
- base = 8;
- ++s;
- if (*s == 'x' || *s == 'X')
- {
- base = 16;
- ++s;
- }
- }
-
- while ((digit = char_to_int(*s++)) >= 0)
- ret = ret * base + (uint32_t)digit;
- return ret;
-}
-
static int default_open_include(const char *filename, bool local,
const char *parent_data, void *context, struct vkd3d_shader_code *out)
{
@@ -691,7 +659,7 @@ directive
primary_expr
: T_INTEGER
{
- $$ = preproc_parse_integer($1);
+ $$ = vkd3d_parse_integer($1);
vkd3d_free($1);
}
| T_IDENTIFIER
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 62baf17f..6fd32435 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -24,6 +24,38 @@
VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG");
+static inline int char_to_int(char c)
+{
+ if ('0' <= c && c <= '9')
+ return c - '0';
+ if ('A' <= c && c <= 'F')
+ return c - 'A' + 10;
+ if ('a' <= c && c <= 'f')
+ return c - 'a' + 10;
+ return -1;
+}
+
+uint32_t vkd3d_parse_integer(const char *s)
+{
+ uint32_t base = 10, ret = 0;
+ int digit;
+
+ if (*s == '0')
+ {
+ base = 8;
+ ++s;
+ if (*s == 'x' || *s == 'X')
+ {
+ base = 16;
+ ++s;
+ }
+ }
+
+ while ((digit = char_to_int(*s++)) >= 0)
+ ret = ret * base + (uint32_t)digit;
+ return ret;
+}
+
void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer)
{
buffer->buffer_size = 16;
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 29e178cc..8bde5523 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -1035,6 +1035,8 @@ static inline size_t bytecode_get_size(struct vkd3d_bytecode_buffer *buffer)
return buffer->size;
}
+uint32_t vkd3d_parse_integer(const char *s);
+
struct vkd3d_shader_message_context
{
enum vkd3d_shader_log_level log_level;
--
2.35.1
4
3
12 May '22
Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com>
---
include/vkd3d_d3d12.idl | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl
index 2d0800b9..5190b9d7 100644
--- a/include/vkd3d_d3d12.idl
+++ b/include/vkd3d_d3d12.idl
@@ -916,6 +916,11 @@ typedef enum D3D12_ROOT_SIGNATURE_FLAGS
D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS = 0x10,
D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20,
D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40,
+ D3D12_ROOT_SIGNATURE_FLAG_LOCAL_ROOT_SIGNATURE = 0x80,
+ D3D12_ROOT_SIGNATURE_FLAG_DENY_AMPLIFICATION_SHADER_ROOT_ACCESS = 0x100,
+ D3D12_ROOT_SIGNATURE_FLAG_DENY_MESH_SHADER_ROOT_ACCESS = 0x200,
+ D3D12_ROOT_SIGNATURE_FLAG_CBV_SRV_UAV_HEAP_DIRECTLY_INDEXED = 0x400,
+ D3D12_ROOT_SIGNATURE_FLAG_SAMPLER_HEAP_DIRECTLY_INDEXED = 0x800,
} D3D12_ROOT_SIGNATURE_FLAGS;
cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_ROOT_SIGNATURE_FLAGS);")
--
2.35.3
2
1
[PATCH 0/5] MR62: windows.gaming.input: More force feedback implementation.
by Rémi Bernon (ï¼ rbernon) 12 May '22
by Rémi Bernon (ï¼ rbernon) 12 May '22
12 May '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/d2d1/bitmap.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
index bab3575c431..579f942b919 100644
--- a/dlls/d2d1/bitmap.c
+++ b/dlls/d2d1/bitmap.c
@@ -297,9 +297,23 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP
static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface)
{
- FIXME("iface %p stub!\n", iface);
+ struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface);
+ ID3D11Device *device;
+ ID3D11DeviceContext *context;
- return E_NOTIMPL;
+ TRACE("iface %p.\n", iface);
+
+ if (!bitmap->staging_resource)
+ return E_INVALIDARG;
+
+ ID3D11Resource_GetDevice(bitmap->resource, &device);
+ ID3D11Device_GetImmediateContext(device, &context);
+ ID3D11DeviceContext_Unmap(context, bitmap->staging_resource, 0);
+ bitmap->staging_resource = NULL;
+ ID3D11DeviceContext_Release(context);
+ ID3D11Device_Release(device);
+
+ return S_OK;
}
static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl =
--
2.35.3
1
0
[PATCH 0/1] MR58: crypt32/tests: Handle CERT_NAME_SEARCH_ALL_NAMES_FLAG being unsupported before Win8.
by Paul Gofman (ï¼ gofman) 12 May '22
by Paul Gofman (ï¼ gofman) 12 May '22
12 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52961
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/58
3
2
[PATCH v2] mshtml/tests: Fix Number toLocaleString test on updated Win 8.1.
by Jacek Caban 12 May '22
by Jacek Caban 12 May '22
12 May '22
From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52969
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
v2: use broken()
dlls/mshtml/tests/es5.js | 21 ++++++++++++++-------
dlls/mshtml/tests/winetest.js | 5 +++++
2 files changed, 19 insertions(+), 7 deletions(-)
1
0
[PATCH 0/1] MR60: d3drm: Support IDirect3D3 when creating device
by Alistair Leslie-Hughes (ï¼ alesliehughes) 12 May '22
by Alistair Leslie-Hughes (ï¼ alesliehughes) 12 May '22
12 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39346
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/60
3
3
[PATCH] dbghelp: Use RtlGetVersion() for system version detection instead.
by Jactry Zeng 12 May '22
by Jactry Zeng 12 May '22
12 May '22
Inspired by patch 235260, I tested MiniDumpWriteDump() on Windows 10
and it always returns its real system version.
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
dlls/dbghelp/minidump.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c
index 172847529f1..4d3818a8f54 100644
--- a/dlls/dbghelp/minidump.c
+++ b/dlls/dbghelp/minidump.c
@@ -607,7 +607,7 @@ static unsigned dump_system_info(struct dump_context* dc)
{
MINIDUMP_SYSTEM_INFO mdSysInfo;
SYSTEM_INFO sysInfo;
- OSVERSIONINFOW osInfo;
+ RTL_OSVERSIONINFOEXW osInfo;
DWORD written;
ULONG slen;
DWORD wine_extra = 0;
@@ -620,7 +620,7 @@ static unsigned dump_system_info(struct dump_context* dc)
GetSystemInfo(&sysInfo);
osInfo.dwOSVersionInfoSize = sizeof(osInfo);
- GetVersionExW(&osInfo);
+ RtlGetVersion(&osInfo);
wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id");
wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version");
--
2.35.1
1
0
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/capi2032/Makefile.in | 1 -
dlls/capi2032/cap20wxx.c | 20 ++++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in
index cf9bf97ce5c..9e9ba285498 100644
--- a/dlls/capi2032/Makefile.in
+++ b/dlls/capi2032/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = capi2032.dll
UNIXLIB = capi2032.so
IMPORTLIB = capi2032
diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c
index 4983dc0e480..96007f51e96 100644
--- a/dlls/capi2032/cap20wxx.c
+++ b/dlls/capi2032/cap20wxx.c
@@ -55,7 +55,7 @@ DWORD WINAPI CAPI_REGISTER (DWORD MessageBufferSize, DWORD maxLogicalConnection,
DWORD fret;
fret = CAPI_CALL( register, ¶ms );
- TRACE ( "(%x) -> %x\n", *pApplID, fret);
+ TRACE ( "(%lx) -> %lx\n", *pApplID, fret);
return fret;
}
@@ -66,7 +66,7 @@ DWORD WINAPI CAPI_RELEASE (DWORD ApplID) {
DWORD fret;
fret = CAPI_CALL( release, ¶ms );
- TRACE ("(%x) -> %x\n", ApplID, fret);
+ TRACE ("(%lx) -> %lx\n", ApplID, fret);
return fret;
}
@@ -77,7 +77,7 @@ DWORD WINAPI CAPI_PUT_MESSAGE (DWORD ApplID, PVOID pCAPIMessage) {
DWORD fret;
fret = CAPI_CALL( put_message, ¶ms );
- TRACE ("(%x) -> %x\n", ApplID, fret);
+ TRACE ("(%lx) -> %lx\n", ApplID, fret);
return fret;
}
@@ -88,7 +88,7 @@ DWORD WINAPI CAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage) {
DWORD fret;
fret = CAPI_CALL( get_message, ¶ms );
- TRACE ("(%x) -> %x\n", ApplID, fret);
+ TRACE ("(%lx) -> %lx\n", ApplID, fret);
return fret;
}
@@ -96,7 +96,7 @@ DWORD WINAPI CAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage) {
\*---------------------------------------------------------------------------*/
DWORD WINAPI CAPI_WAIT_FOR_SIGNAL (DWORD ApplID) {
struct waitformessage_params params = { ApplID };
- TRACE ("(%x)\n", ApplID);
+ TRACE ("(%lx)\n", ApplID);
return CAPI_CALL( waitformessage, ¶ms );
}
@@ -111,7 +111,7 @@ DWORD WINAPI CAPI_GET_MANUFACTURER (char *SzBuffer) {
if (!strncmp (SzBuffer, "AVM", 3)) {
strcpy (SzBuffer, "AVM-GmbH");
}
- TRACE ("(%s) -> %x\n", SzBuffer, fret);
+ TRACE ("(%s) -> %lx\n", SzBuffer, fret);
return fret;
}
@@ -122,7 +122,7 @@ DWORD WINAPI CAPI_GET_VERSION (DWORD *pCAPIMajor, DWORD *pCAPIMinor, DWORD *pMan
DWORD fret;
fret = CAPI_CALL( get_version, ¶ms );
- TRACE ("(%x.%x,%x.%x) -> %x\n", *pCAPIMajor, *pCAPIMinor, *pManufacturerMajor,
+ TRACE ("(%lx.%lx,%lx.%lx) -> %lx\n", *pCAPIMajor, *pCAPIMinor, *pManufacturerMajor,
*pManufacturerMinor, fret);
return fret;
}
@@ -134,7 +134,7 @@ DWORD WINAPI CAPI_GET_SERIAL_NUMBER (char *SzBuffer) {
DWORD fret;
fret = CAPI_CALL( get_serial_number, ¶ms );
- TRACE ("(%s) -> %x\n", SzBuffer, fret);
+ TRACE ("(%s) -> %lx\n", SzBuffer, fret);
return fret;
}
@@ -145,7 +145,7 @@ DWORD WINAPI CAPI_GET_PROFILE (PVOID SzBuffer, DWORD CtlrNr) {
DWORD fret;
fret = CAPI_CALL( get_profile, ¶ms );
- TRACE ("(%x,%x) -> %x\n", CtlrNr, *(unsigned short *)SzBuffer, fret);
+ TRACE ("(%lx,%x) -> %lx\n", CtlrNr, *(unsigned short *)SzBuffer, fret);
return fret;
}
@@ -155,7 +155,7 @@ DWORD WINAPI CAPI_INSTALLED (void) {
DWORD fret;
fret = CAPI_CALL( isinstalled, NULL );
- TRACE ("() -> %x\n", fret);
+ TRACE ("() -> %lx\n", fret);
return fret;
}
1
0
[PATCH] mfplat: Allow NULL size pointer in IMFAttributes::GetAllocatedBlob().
by Nikolay Sivov 12 May '22
by Nikolay Sivov 12 May '22
12 May '22
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/mfplat/main.c | 3 ++-
dlls/mfplat/tests/mfplat.c | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 08195bca448..24d39d81b62 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -2743,7 +2743,8 @@ HRESULT attributes_GetAllocatedBlob(struct attributes *attributes, REFGUID key,
if (SUCCEEDED(hr))
{
*buf = attrval.caub.pElems;
- *size = attrval.caub.cElems;
+ if (size)
+ *size = attrval.caub.cElems;
}
return hr;
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 8f18fcb293d..3f7ab161b59 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -1749,6 +1749,11 @@ static void test_attributes(void)
ok(!memcmp(blob_buf, blob, size), "Unexpected blob.\n");
CoTaskMemFree(blob_buf);
+ hr = IMFAttributes_GetAllocatedBlob(attributes, &DUMMY_GUID1, &blob_buf, NULL);
+ ok(hr == S_OK, "Failed to get allocated blob, hr %#lx.\n", hr);
+ ok(!memcmp(blob_buf, blob, size), "Unexpected blob.\n");
+ CoTaskMemFree(blob_buf);
+
hr = IMFAttributes_GetAllocatedBlob(attributes, &DUMMY_GUID2, &blob_buf, &size);
ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr);
--
2.35.1
2
1
12 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52970
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/kernelbase/tests/process.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c
index 077ee1082dd..bacf9057836 100644
--- a/dlls/kernelbase/tests/process.c
+++ b/dlls/kernelbase/tests/process.c
@@ -96,6 +96,7 @@ static void test_MapViewOfFile3(void)
static const char testfile[] = "testfile.xxx";
HANDLE file, mapping;
void *ptr;
+ BOOL ret;
if (!pMapViewOfFile3)
{
@@ -118,8 +119,10 @@ static void test_MapViewOfFile3(void)
ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %lu\n", GetLastError() );
UnmapViewOfFile( ptr );
+ CloseHandle( mapping );
CloseHandle( file );
- DeleteFileA( testfile );
+ ret = DeleteFileA( testfile );
+ ok(ret, "Failed to delete a test file.\n");
}
START_TEST(process)
--
2.35.1
1
0
[PATCH] d2d1: Stub and add ID2D1PathGeometry1 interface to d2d1_1.idl.
by James McDonnell 12 May '22
by James McDonnell 12 May '22
12 May '22
Signed-off-by: James McDonnell <topgamer7(a)gmail.com>
---
dlls/d2d1/device.c | 22 ++++++------
dlls/d2d1/factory.c | 4 +--
dlls/d2d1/geometry.c | 80 +++++++++++++++++++++++++-------------------
include/d2d1_1.idl | 17 +++++++++-
4 files changed, 75 insertions(+), 48 deletions(-)
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 13c99458cfa..f6a664c2e33 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -563,23 +563,23 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawLine(ID2D1DeviceContext *if
D2D1_POINT_2F p0, D2D1_POINT_2F p1, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style)
{
struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface);
- ID2D1PathGeometry *geometry;
+ ID2D1PathGeometry1 *geometry;
ID2D1GeometrySink *sink;
HRESULT hr;
TRACE("iface %p, p0 %s, p1 %s, brush %p, stroke_width %.8e, stroke_style %p.\n",
iface, debug_d2d_point_2f(&p0), debug_d2d_point_2f(&p1), brush, stroke_width, stroke_style);
- if (FAILED(hr = ID2D1Factory_CreatePathGeometry(render_target->factory, &geometry)))
+ if (FAILED(hr = ID2D1Factory1_CreatePathGeometry(render_target->factory, &geometry)))
{
WARN("Failed to create path geometry, hr %#lx.\n", hr);
return;
}
- if (FAILED(hr = ID2D1PathGeometry_Open(geometry, &sink)))
+ if (FAILED(hr = ID2D1PathGeometry1_Open(geometry, &sink)))
{
WARN("Failed to open geometry sink, hr %#lx.\n", hr);
- ID2D1PathGeometry_Release(geometry);
+ ID2D1PathGeometry1_Release(geometry);
return;
}
@@ -591,7 +591,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawLine(ID2D1DeviceContext *if
ID2D1GeometrySink_Release(sink);
ID2D1DeviceContext_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style);
- ID2D1PathGeometry_Release(geometry);
+ ID2D1PathGeometry1_Release(geometry);
}
static void STDMETHODCALLTYPE d2d_device_context_DrawRectangle(ID2D1DeviceContext *iface,
@@ -1226,20 +1226,20 @@ static void d2d_device_context_draw_glyph_run_outline(struct d2d_device_context
{
D2D1_MATRIX_3X2_F *transform, prev_transform;
D2D1_ANTIALIAS_MODE prev_antialias_mode;
- ID2D1PathGeometry *geometry;
+ ID2D1PathGeometry1 *geometry;
ID2D1GeometrySink *sink;
HRESULT hr;
- if (FAILED(hr = ID2D1Factory_CreatePathGeometry(render_target->factory, &geometry)))
+ if (FAILED(hr = ID2D1Factory1_CreatePathGeometry(render_target->factory, &geometry)))
{
ERR("Failed to create geometry, hr %#lx.\n", hr);
return;
}
- if (FAILED(hr = ID2D1PathGeometry_Open(geometry, &sink)))
+ if (FAILED(hr = ID2D1PathGeometry1_Open(geometry, &sink)))
{
ERR("Failed to open geometry sink, hr %#lx.\n", hr);
- ID2D1PathGeometry_Release(geometry);
+ ID2D1PathGeometry1_Release(geometry);
return;
}
@@ -1249,7 +1249,7 @@ static void d2d_device_context_draw_glyph_run_outline(struct d2d_device_context
{
ERR("Failed to get glyph run outline, hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
- ID2D1PathGeometry_Release(geometry);
+ ID2D1PathGeometry1_Release(geometry);
return;
}
@@ -1267,7 +1267,7 @@ static void d2d_device_context_draw_glyph_run_outline(struct d2d_device_context
render_target->drawing_state.antialiasMode = prev_antialias_mode;
*transform = prev_transform;
- ID2D1PathGeometry_Release(geometry);
+ ID2D1PathGeometry1_Release(geometry);
}
static void d2d_device_context_draw_glyph_run_bitmap(struct d2d_device_context *render_target,
diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
index f0f61674889..754975544e5 100644
--- a/dlls/d2d1/factory.c
+++ b/dlls/d2d1/factory.c
@@ -521,9 +521,9 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory3 *i
static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory3 *iface, ID2D1PathGeometry1 **geometry)
{
- FIXME("iface %p, geometry %p stub!\n", iface, geometry);
+ TRACE("iface %p, geometry %p.\n", iface, geometry);
- return E_NOTIMPL;
+ return d2d_factory_CreatePathGeometry(iface, (ID2D1PathGeometry **)geometry);
}
static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory3 *iface,
diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index eb1bb353b4c..bc032399fad 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -3354,21 +3354,22 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
d2d_geometry_sink_AddArc,
};
-static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface)
+static inline struct d2d_geometry *impl_from_ID2D1PathGeometry1(ID2D1PathGeometry1 *iface)
{
return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry1 *iface, REFIID iid, void **out)
{
TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
if (IsEqualGUID(iid, &IID_ID2D1PathGeometry)
+ || IsEqualGUID(iid, &IID_ID2D1PathGeometry1)
|| IsEqualGUID(iid, &IID_ID2D1Geometry)
|| IsEqualGUID(iid, &IID_ID2D1Resource)
|| IsEqualGUID(iid, &IID_IUnknown))
{
- ID2D1PathGeometry_AddRef(iface);
+ ID2D1PathGeometry1_AddRef(iface);
*out = iface;
return S_OK;
}
@@ -3379,9 +3380,9 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeome
return E_NOINTERFACE;
}
-static ULONG STDMETHODCALLTYPE d2d_path_geometry_AddRef(ID2D1PathGeometry *iface)
+static ULONG STDMETHODCALLTYPE d2d_path_geometry_AddRef(ID2D1PathGeometry1 *iface)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
ULONG refcount = InterlockedIncrement(&geometry->refcount);
TRACE("%p increasing refcount to %lu.\n", iface, refcount);
@@ -3389,9 +3390,9 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_AddRef(ID2D1PathGeometry *iface
return refcount;
}
-static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *iface)
+static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry1 *iface)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
ULONG refcount = InterlockedDecrement(&geometry->refcount);
TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
@@ -3406,19 +3407,19 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac
return refcount;
}
-static void STDMETHODCALLTYPE d2d_path_geometry_GetFactory(ID2D1PathGeometry *iface, ID2D1Factory **factory)
+static void STDMETHODCALLTYPE d2d_path_geometry_GetFactory(ID2D1PathGeometry1 *iface, ID2D1Factory **factory)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
TRACE("iface %p, factory %p.\n", iface, factory);
ID2D1Factory_AddRef(*factory = geometry->factory);
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
size_t i;
TRACE("iface %p, transform %p, bounds %p.\n", iface, transform, bounds);
@@ -3536,7 +3537,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry *
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetWidenedBounds(ID2D1PathGeometry *iface, float stroke_width,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetWidenedBounds(ID2D1PathGeometry1 *iface, float stroke_width,
ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform, float tolerance, D2D1_RECT_F *bounds)
{
FIXME("iface %p, stroke_width %.8e, stroke_style %p, transform %p, tolerance %.8e, bounds %p stub!\n",
@@ -3545,11 +3546,11 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetWidenedBounds(ID2D1PathGeo
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1PathGeometry1 *iface,
D2D1_POINT_2F point, float stroke_width, ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform,
float tolerance, BOOL *contains)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
enum d2d_vertex_type type = D2D_VERTEX_TYPE_NONE;
unsigned int i, j, bezier_idx;
D2D1_BEZIER_SEGMENT b;
@@ -3630,10 +3631,10 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1Path
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_FillContainsPoint(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_FillContainsPoint(ID2D1PathGeometry1 *iface,
D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
D2D1_MATRIX_3X2_F g_i;
TRACE("iface %p, point %s, transform %p, tolerance %.8e, contains %p.\n",
@@ -3653,7 +3654,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_FillContainsPoint(ID2D1PathGe
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CompareWithGeometry(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CompareWithGeometry(ID2D1PathGeometry1 *iface,
ID2D1Geometry *geometry, const D2D1_MATRIX_3X2_F *transform, float tolerance, D2D1_GEOMETRY_RELATION *relation)
{
FIXME("iface %p, geometry %p, transform %p, tolerance %.8e, relation %p stub!\n",
@@ -3707,11 +3708,11 @@ static void d2d_geometry_flatten_cubic(ID2D1SimplifiedGeometrySink *sink, const
ID2D1SimplifiedGeometrySink_SetSegmentFlags(sink, D2D1_PATH_SEGMENT_NONE);
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry1 *iface,
D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, const D2D1_MATRIX_3X2_F *transform, float tolerance,
ID2D1SimplifiedGeometrySink *sink)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
enum d2d_vertex_type type = D2D_VERTEX_TYPE_NONE;
unsigned int i, j, bezier_idx;
D2D1_FIGURE_BEGIN begin;
@@ -3795,7 +3796,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Tessellate(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Tessellate(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, float tolerance, ID2D1TessellationSink *sink)
{
FIXME("iface %p, transform %p, tolerance %.8e, sink %p stub!\n", iface, transform, tolerance, sink);
@@ -3803,7 +3804,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Tessellate(ID2D1PathGeometry
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CombineWithGeometry(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CombineWithGeometry(ID2D1PathGeometry1 *iface,
ID2D1Geometry *geometry, D2D1_COMBINE_MODE combine_mode, const D2D1_MATRIX_3X2_F *transform,
float tolerance, ID2D1SimplifiedGeometrySink *sink)
{
@@ -3813,7 +3814,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_CombineWithGeometry(ID2D1Path
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Outline(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Outline(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, float tolerance, ID2D1SimplifiedGeometrySink *sink)
{
FIXME("iface %p, transform %p, tolerance %.8e, sink %p stub!\n", iface, transform, tolerance, sink);
@@ -3821,7 +3822,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Outline(ID2D1PathGeometry *if
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeArea(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeArea(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, float tolerance, float *area)
{
FIXME("iface %p, transform %p, tolerance %.8e, area %p stub!\n", iface, transform, tolerance, area);
@@ -3829,7 +3830,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeArea(ID2D1PathGeometry
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeLength(ID2D1PathGeometry *iface,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeLength(ID2D1PathGeometry1 *iface,
const D2D1_MATRIX_3X2_F *transform, float tolerance, float *length)
{
FIXME("iface %p, transform %p, tolerance %.8e, length %p stub!\n", iface, transform, tolerance, length);
@@ -3837,7 +3838,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputeLength(ID2D1PathGeomet
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputePointAtLength(ID2D1PathGeometry *iface, float length,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputePointAtLength(ID2D1PathGeometry1 *iface, float length,
const D2D1_MATRIX_3X2_F *transform, float tolerance, D2D1_POINT_2F *point, D2D1_POINT_2F *tangent)
{
FIXME("iface %p, length %.8e, transform %p, tolerance %.8e, point %p, tangent %p stub!\n",
@@ -3846,7 +3847,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_ComputePointAtLength(ID2D1Pat
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Widen(ID2D1PathGeometry *iface, float stroke_width,
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Widen(ID2D1PathGeometry1 *iface, float stroke_width,
ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform, float tolerance,
ID2D1SimplifiedGeometrySink *sink)
{
@@ -3856,9 +3857,9 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Widen(ID2D1PathGeometry *ifac
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Open(ID2D1PathGeometry *iface, ID2D1GeometrySink **sink)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Open(ID2D1PathGeometry1 *iface, ID2D1GeometrySink **sink)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
TRACE("iface %p, sink %p.\n", iface, sink);
@@ -3873,16 +3874,16 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Open(ID2D1PathGeometry *iface
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Stream(ID2D1PathGeometry *iface, ID2D1GeometrySink *sink)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Stream(ID2D1PathGeometry1 *iface, ID2D1GeometrySink *sink)
{
FIXME("iface %p, sink %p stub!\n", iface, sink);
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetSegmentCount(ID2D1PathGeometry *iface, UINT32 *count)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetSegmentCount(ID2D1PathGeometry1 *iface, UINT32 *count)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
TRACE("iface %p, count %p.\n", iface, count);
@@ -3894,9 +3895,9 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetSegmentCount(ID2D1PathGeom
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetFigureCount(ID2D1PathGeometry *iface, UINT32 *count)
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetFigureCount(ID2D1PathGeometry1 *iface, UINT32 *count)
{
- struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
+ struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry1(iface);
TRACE("iface %p, count %p.\n", iface, count);
@@ -3908,7 +3909,17 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetFigureCount(ID2D1PathGeome
return S_OK;
}
-static const struct ID2D1PathGeometryVtbl d2d_path_geometry_vtbl =
+static HRESULT STDMETHODCALLTYPE d2d_path_geometry1_ComputePointAndSegmentAtLength(ID2D1PathGeometry1 *iface,
+ float length, UINT32 startSegment, const D2D1_MATRIX_3X2_F *transform, float tolerance,
+ D2D1_POINT_DESCRIPTION *pointDescription)
+{
+ FIXME("iface %p, length %.8e, startSegment %u, transform %p, tolerance %.8e, pointDescription %p",
+ iface, length, startSegment, transform, tolerance, pointDescription);
+
+ return E_NOTIMPL;
+}
+
+static const struct ID2D1PathGeometry1Vtbl d2d_path_geometry_vtbl =
{
d2d_path_geometry_QueryInterface,
d2d_path_geometry_AddRef,
@@ -3931,6 +3942,7 @@ static const struct ID2D1PathGeometryVtbl d2d_path_geometry_vtbl =
d2d_path_geometry_Stream,
d2d_path_geometry_GetSegmentCount,
d2d_path_geometry_GetFigureCount,
+ d2d_path_geometry1_ComputePointAndSegmentAtLength,
};
void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory)
diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl
index fdec8ae5f9c..f86ac8748a4 100644
--- a/include/d2d1_1.idl
+++ b/include/d2d1_1.idl
@@ -20,7 +20,6 @@ import "d2d1.idl";
import "d2d1effects.idl";
interface ID2D1DeviceContext;
-interface ID2D1PathGeometry1;
interface ID2D1Properties;
interface IPrintDocumentPackageTarget;
interface ID2D1PrintControl;
@@ -349,6 +348,22 @@ interface ID2D1GdiMetafile : ID2D1Resource
);
}
+[
+ object,
+ uuid(62baa2d2-ab54-41b7-b872-787e0106a421),
+ local,
+]
+interface ID2D1PathGeometry1 : ID2D1PathGeometry
+{
+ HRESULT ComputePointAndSegmentAtLength(
+ [in] float length,
+ [in] UINT32 startSegment,
+ [in, optional] const D2D1_MATRIX_3X2_F *worldTransform,
+ [in] float flatteningTolerance,
+ [out] D2D1_POINT_DESCRIPTION *pointDescription
+ );
+};
+
[
object,
uuid(483473d7-cd46-4f9d-9d3a-3112aa80159d),
--
2.35.1
2
1
12 May '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/wineusb.sys/wineusb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c
index 976aa9ca189..e816e0d8c6b 100644
--- a/dlls/wineusb.sys/wineusb.c
+++ b/dlls/wineusb.sys/wineusb.c
@@ -486,7 +486,7 @@ static NTSTATUS usbd_status_from_libusb(enum libusb_transfer_status status)
}
}
-static void transfer_cb(struct libusb_transfer *transfer)
+static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer)
{
IRP *irp = transfer->user_data;
URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1;
--
2.35.1
1
3
[PATCH v2 0/1] MR59: Draft: hnetcfg/tests: Add firewall tests
by Fabian Maurer (ï¼ DarkShadow44) 11 May '22
by Fabian Maurer (ï¼ DarkShadow44) 11 May '22
11 May '22
--
v2: hnetcfg/tests: Add firewall tests
https://gitlab.winehq.org/wine/wine/-/merge_requests/59
3
2
[PATCH v4 0/1] MR59: Draft: hnetcfg/tests: Add firewall tests
by Fabian Maurer (ï¼ DarkShadow44) 11 May '22
by Fabian Maurer (ï¼ DarkShadow44) 11 May '22
11 May '22
--
v4: hnetcfg/tests: Add firewall tests
https://gitlab.winehq.org/wine/wine/-/merge_requests/59
2
2
[PATCH 1/4] include: Add WINE_ALLOC_SIZE attribute to CoTaskMemRealloc().
by Brendan Shanks 11 May '22
by Brendan Shanks 11 May '22
11 May '22
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
include/objbase.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/objbase.h b/include/objbase.h
index 8bf6ad9da84..11bfc95d989 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -319,7 +319,7 @@ HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsi
HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC* lpMalloc);
LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) __WINE_ALLOC_SIZE(1);
void WINAPI CoTaskMemFree(LPVOID ptr);
-LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, SIZE_T size);
+LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, SIZE_T size) __WINE_ALLOC_SIZE(2);
HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy);
HRESULT WINAPI CoRevokeMallocSpy(void);
--
2.35.1
1
3
11 May '22
This also fixes the build with external libxml2 but bundled libxslt.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 9808b67e991..fb277e5e534 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1142,7 +1142,7 @@ WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png")
WINE_EXTLIB_FLAGS(TIFF, tiff, "tiff \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/tiff/libtiff")
WINE_EXTLIB_FLAGS(VKD3D, vkd3d, vkd3d, "-I\$(top_srcdir)/libs/vkd3d/include")
WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC")
-WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC")
+WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt/libxslt -I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC")
WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO")
dnl **** Check for pthread ****
--
2.35.1
1
0
[PATCH 0/1] MR59: Draft: hnetcfg/tests: Add firewall tests
by Fabian Maurer (ï¼ DarkShadow44) 11 May '22
by Fabian Maurer (ï¼ DarkShadow44) 11 May '22
11 May '22
Re: [PATCH v3 0/5] MR49: MPEG audio decoder - approved
by Alexandre Julliard (ï¼ julliard) 11 May '22
by Alexandre Julliard (ï¼ julliard) 11 May '22
11 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/49
1
0
Re: [PATCH v3 0/2] MR54: winecoreaudio: Enable compilation with long types. - approved
by Alexandre Julliard (ï¼ julliard) 11 May '22
by Alexandre Julliard (ï¼ julliard) 11 May '22
11 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/54
1
0
[PATCH v2 0/2] MR57: winevulkan: Update to VK spec version 1.3.213.
by Georg Lehmann (ï¼ DadSchoorse) 11 May '22
by Georg Lehmann (ï¼ DadSchoorse) 11 May '22
11 May '22
Not a trivial update this time, two extensions are blocked by a Vulkan xml bug.
--
v2: winevulkan: Update to VK spec version 1.3.213.
winevulkan: Prevent infinite recursion in make_vulkan.
https://gitlab.winehq.org/wine/wine/-/merge_requests/57
3
3
Re: [PATCH v2 0/2] MR56: ntdll: Fix minor typos in signal_arm.c - approved
by Alexandre Julliard (ï¼ julliard) 11 May '22
by Alexandre Julliard (ï¼ julliard) 11 May '22
11 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/56
1
0
Re: [PATCH v2 0/6] MR53: windows.gaming.input: Test fixes and being implementing FF classes. - approved
by Alexandre Julliard (ï¼ julliard) 11 May '22
by Alexandre Julliard (ï¼ julliard) 11 May '22
11 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/53
1
0
[PATCH v2 0/4] MR41: mf: Register video processor transform and fix a few broken tests.
by Rémi Bernon (ï¼ rbernon) 11 May '22
by Rémi Bernon (ï¼ rbernon) 11 May '22
11 May '22
--
v2: mf/tests: Update a broken IMFMediaSink_AddStreamSink result check.
mf/tests: Tweak topology loader tests results based on the video processor presence.
winegstreamer: Register the video processor transform.
winegstreamer: Move MFT registration list out of static scope.
https://gitlab.winehq.org/wine/wine/-/merge_requests/41
3
5
Re: [PATCH v2 0/1] MR50: mfplat: Allow NULL length pointer in IMFAttributes::GetAllocatedString - approved
by Alexandre Julliard (ï¼ julliard) 11 May '22
by Alexandre Julliard (ï¼ julliard) 11 May '22
11 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/50
1
0
[PATCH] mshtml/tests: Fix Number toLocaleString test on updated Win 8.1.
by Gabriel Ivăncescu 11 May '22
by Gabriel Ivăncescu 11 May '22
11 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52969
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
dlls/mshtml/tests/es5.js | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js
index 8238e5d..7545ef2 100644
--- a/dlls/mshtml/tests/es5.js
+++ b/dlls/mshtml/tests/es5.js
@@ -150,10 +150,14 @@ sync_test("Number toLocaleString", function() {
];
if(external.isEnglish) {
- for(var i = 0; i < tests.length; i++) {
- r = Number.prototype.toLocaleString.call(tests[i][0]);
- ok(r === tests[i][1], "[" + i + "] got " + r);
- }
+ /* Some recent Win8.1 updates have old jscript behavior */
+ if(Number.prototype.toLocaleString.call(0.0) === "0.00")
+ win_skip("skipping tests due to old behavior");
+ else
+ for(var i = 0; i < tests.length; i++) {
+ r = Number.prototype.toLocaleString.call(tests[i][0]);
+ ok(r === tests[i][1], "[" + i + "] got " + r);
+ }
}
try {
@@ -161,21 +165,21 @@ sync_test("Number toLocaleString", function() {
ok(false, "expected exception calling it on string");
}catch(ex) {
var n = ex.number >>> 0;
- ok(n === JS_E_WRONG_THIS, "called on string threw " + n);
+ ok(n === JS_E_WRONG_THIS || n === JS_E_NUMBER_EXPECTED /* newer Win8.1 */, "called on string threw " + n);
}
try {
Number.prototype.toLocaleString.call(undefined);
ok(false, "expected exception calling it on undefined");
}catch(ex) {
var n = ex.number >>> 0;
- ok(n === JS_E_WRONG_THIS, "called on undefined threw " + n);
+ ok(n === JS_E_WRONG_THIS || n === JS_E_NUMBER_EXPECTED /* newer Win8.1 */, "called on undefined threw " + n);
}
try {
Number.prototype.toLocaleString.call(external.nullDisp);
ok(false, "expected exception calling it on nullDisp");
}catch(ex) {
var n = ex.number >>> 0;
- ok(n === JS_E_WRONG_THIS, "called on nullDisp threw " + n);
+ ok(n === JS_E_WRONG_THIS || n === JS_E_NUMBER_EXPECTED /* newer Win8.1 */, "called on nullDisp threw " + n);
}
});
--
2.34.1
2
1
11 May '22
Add support for using the accNavigate method to retrieve an HWND for an
IAccessible, and also only recursively go up the parent chain if the
initial IAccessible didn't have an IOleWindow implementation.
Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>
---
dlls/oleacc/main.c | 34 +++++++++--
dlls/oleacc/tests/main.c | 123 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 151 insertions(+), 6 deletions(-)
diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c
index dced84be7b5..641f4b22419 100644
--- a/dlls/oleacc/main.c
+++ b/dlls/oleacc/main.c
@@ -402,20 +402,36 @@ HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd)
{
IDispatch *parent;
IOleWindow *ow;
+ VARIANT v, cid;
HRESULT hres;
TRACE("%p %p\n", acc, phwnd);
IAccessible_AddRef(acc);
- while(1) {
- hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow);
- if(SUCCEEDED(hres)) {
- hres = IOleWindow_GetWindow(ow, phwnd);
- IOleWindow_Release(ow);
+
+ ow = NULL;
+ hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow);
+ if(SUCCEEDED(hres)) {
+ hres = IOleWindow_GetWindow(ow, phwnd);
+ IOleWindow_Release(ow);
+ if(*phwnd) {
IAccessible_Release(acc);
return hres;
}
+ }
+
+ VariantInit(&v);
+ variant_init_i4(&cid, CHILDID_SELF);
+ hres = IAccessible_accNavigate(acc, 10, cid, &v);
+ if(SUCCEEDED(hres) && V_VT(&v) == VT_I4)
+ *phwnd = ULongToHandle(V_I4(&v));
+
+ if(ow) {
+ IAccessible_Release(acc);
+ return S_OK;
+ }
+ while(1) {
hres = IAccessible_get_accParent(acc, &parent);
IAccessible_Release(acc);
if(FAILED(hres))
@@ -429,6 +445,14 @@ HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd)
IDispatch_Release(parent);
if(FAILED(hres))
return hres;
+
+ hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow);
+ if(SUCCEEDED(hres)) {
+ hres = IOleWindow_GetWindow(ow, phwnd);
+ IOleWindow_Release(ow);
+ IAccessible_Release(acc);
+ return hres;
+ }
}
}
diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c
index 7854764ec08..0bf49056a04 100644
--- a/dlls/oleacc/tests/main.c
+++ b/dlls/oleacc/tests/main.c
@@ -59,8 +59,10 @@ DEFINE_EXPECT(Accessible_get_accChildCount);
DEFINE_EXPECT(Accessible_get_accChild);
DEFINE_EXPECT(Accessible_get_accName);
DEFINE_EXPECT(Accessible_get_accParent);
+DEFINE_EXPECT(Accessible_accNavigate);
DEFINE_EXPECT(Accessible_child_get_accName);
DEFINE_EXPECT(Accessible_child_get_accParent);
+DEFINE_EXPECT(Accessible_child_accNavigate);
static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND);
@@ -91,7 +93,11 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2)
return unk1 == unk2;
}
+static IAccessible Accessible;
static IAccessible Accessible_child;
+static IOleWindow OleWindow;
+static HWND Accessible_accnav_hwnd = NULL;
+static HWND OleWindow_hwnd = NULL;
static HRESULT WINAPI Accessible_QueryInterface(
IAccessible *iface, REFIID riid, void **ppvObject)
@@ -104,6 +110,12 @@ static HRESULT WINAPI Accessible_QueryInterface(
return S_OK;
}
+ if(IsEqualIID(riid, &IID_IOleWindow) && (iface == &Accessible)) {
+ *ppvObject = &OleWindow;
+ IAccessible_AddRef(iface);
+ return S_OK;
+ }
+
if(IsEqualIID(riid, &IID_IEnumVARIANT)) {
CHECK_EXPECT(Accessible_QI_IEnumVARIANT);
return E_NOINTERFACE;
@@ -155,7 +167,12 @@ static HRESULT WINAPI Accessible_get_accParent(
IAccessible *iface, IDispatch **ppdispParent)
{
if(iface == &Accessible_child)
+ {
CHECK_EXPECT(Accessible_child_get_accParent);
+ if (OleWindow_hwnd)
+ return IAccessible_QueryInterface(&Accessible, &IID_IDispatch,
+ (void **)ppdispParent);
+ }
else
CHECK_EXPECT(Accessible_get_accParent);
@@ -295,7 +312,21 @@ static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *pxLeft,
static HRESULT WINAPI Accessible_accNavigate(IAccessible *iface,
LONG navDir, VARIANT varStart, VARIANT *pvarEnd)
{
- ok(0, "unexpected call\n");
+ if(iface == &Accessible_child)
+ CHECK_EXPECT(Accessible_child_accNavigate);
+ else
+ CHECK_EXPECT(Accessible_accNavigate);
+
+ /*
+ * Magic number value for retrieving an HWND. Used by DynamicAnnotation
+ * IAccessible wrapper.
+ */
+ if(navDir == 10) {
+ V_VT(pvarEnd) = VT_I4;
+ V_I4(pvarEnd) = HandleToUlong(Accessible_accnav_hwnd);
+ return S_OK;
+ }
+
return E_NOTIMPL;
}
@@ -358,8 +389,44 @@ static IAccessibleVtbl AccessibleVtbl = {
Accessible_put_accValue
};
+static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **obj)
+{
+ return IAccessible_QueryInterface(&Accessible, riid, obj);
+}
+
+static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface)
+{
+ return IAccessible_AddRef(&Accessible);
+}
+
+static ULONG WINAPI OleWindow_Release(IOleWindow *iface)
+{
+ return IAccessible_Release(&Accessible);
+}
+
+static HRESULT WINAPI OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd)
+{
+ *hwnd = OleWindow_hwnd;
+ return S_OK;
+}
+
+static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL f_enter_mode)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static const IOleWindowVtbl OleWindowVtbl = {
+ OleWindow_QueryInterface,
+ OleWindow_AddRef,
+ OleWindow_Release,
+ OleWindow_GetWindow,
+ OleWindow_ContextSensitiveHelp
+};
+
static IAccessible Accessible = {&AccessibleVtbl};
static IAccessible Accessible_child = {&AccessibleVtbl};
+static IOleWindow OleWindow = {&OleWindowVtbl};
static void test_getroletext(void)
{
@@ -1826,6 +1893,59 @@ static void test_default_edit_accessible_object(void)
DestroyWindow(hwnd);
}
+static void test_WindowFromAccessibleObject(void)
+{
+ HWND hwnd;
+ HRESULT hr;
+
+ hwnd = CreateWindowA("oleacc_test", "test", WS_OVERLAPPEDWINDOW,
+ 0, 0, 0, 0, NULL, NULL, NULL, NULL);
+ ok(hwnd != NULL, "CreateWindow failed\n");
+
+ /* Successfully retrieve an HWND from the IOleWindow interface. */
+ Accessible_accnav_hwnd = NULL;
+ OleWindow_hwnd = (HWND)0xdeadf00d;
+ hwnd = (HWND)0xdeadbeef;
+ hr = WindowFromAccessibleObject(&Accessible, &hwnd);
+ ok(hr == S_OK, "got %lx\n", hr);
+ ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n");
+
+ /* Successfully retrieve an HWND from IAccessible::accNavigate. */
+ Accessible_accnav_hwnd = (HWND)0xdeadf00d;
+ OleWindow_hwnd = NULL;
+ hwnd = (HWND)0xdeadbeef;
+ SET_EXPECT(Accessible_accNavigate);
+ hr = WindowFromAccessibleObject(&Accessible, &hwnd);
+ ok(hr == S_OK, "got %lx\n", hr);
+ ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n");
+ CHECK_CALLED(Accessible_accNavigate);
+
+ /* Return a NULL HWND from both methods, no accParent call. */
+ Accessible_accnav_hwnd = NULL;
+ OleWindow_hwnd = NULL;
+ hwnd = (HWND)0xdeadbeef;
+ SET_EXPECT(Accessible_accNavigate);
+ hr = WindowFromAccessibleObject(&Accessible, &hwnd);
+ ok(hr == S_OK, "got %lx\n", hr);
+ ok(!hwnd, "hwnd %p\n", hwnd);
+ CHECK_CALLED(Accessible_accNavigate);
+
+ /* Successfully retrieve an HWND from a parent IAccessible's IOleWindow interface. */
+ Accessible_accnav_hwnd = NULL;
+ OleWindow_hwnd = (HWND)0xdeadf00d;
+ hwnd = (HWND)0xdeadbeef;
+ SET_EXPECT(Accessible_child_accNavigate);
+ SET_EXPECT(Accessible_child_get_accParent);
+ hr = WindowFromAccessibleObject(&Accessible_child, &hwnd);
+ ok(hr == S_OK, "got %lx\n", hr);
+ ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n");
+ CHECK_CALLED(Accessible_child_accNavigate);
+ CHECK_CALLED(Accessible_child_get_accParent);
+
+ Accessible_accnav_hwnd = NULL;
+ OleWindow_hwnd = NULL;
+}
+
START_TEST(main)
{
int argc;
@@ -1867,6 +1987,7 @@ START_TEST(main)
test_AccessibleObjectFromPoint();
test_CreateStdAccessibleObject_classes();
test_default_edit_accessible_object();
+ test_WindowFromAccessibleObject();
unregister_window_class();
CoUninitialize();
--
2.25.1
2
2
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52892
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
dlls/ntdll/tests/thread.c | 42 ++++++++++++++++++++++++++++++---------
1 file changed, 33 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c
index 7a47486a3b6..3086247d5f4 100644
--- a/dlls/ntdll/tests/thread.c
+++ b/dlls/ntdll/tests/thread.c
@@ -118,16 +118,25 @@ static void test_dbg_hidden_thread_creation(void)
CloseHandle( thread );
}
+struct unique_teb_thread_args
+{
+ TEB *teb;
+ HANDLE running_event;
+ HANDLE quit_event;
+};
+
static void CALLBACK test_unique_teb_proc(void *param)
{
- TEB **teb = param;
- *teb = NtCurrentTeb();
+ struct unique_teb_thread_args *args = param;
+ args->teb = NtCurrentTeb();
+ SetEvent( args->running_event );
+ WaitForSingleObject( args->quit_event, INFINITE );
}
static void test_unique_teb(void)
{
- HANDLE threads[2];
- TEB *teb1, *teb2;
+ HANDLE threads[2], running_events[2];
+ struct unique_teb_thread_args args1, args2;
NTSTATUS status;
if (!pNtCreateThreadEx)
@@ -136,21 +145,36 @@ static void test_unique_teb(void)
return;
}
+ args1.running_event = running_events[0] = CreateEventW( NULL, FALSE, FALSE, NULL );
+ ok( args1.running_event != NULL, "CreateEventW failed %lu.\n", GetLastError() );
+
+ args2.running_event = running_events[1] = CreateEventW( NULL, FALSE, FALSE, NULL );
+ ok( args2.running_event != NULL, "CreateEventW failed %lu.\n", GetLastError() );
+
+ args1.quit_event = args2.quit_event = CreateEventW( NULL, TRUE, FALSE, NULL );
+ ok( args1.quit_event != NULL, "CreateEventW failed %lu.\n", GetLastError() );
+
status = pNtCreateThreadEx( &threads[0], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc,
- &teb1, 0, 0, 0, 0, NULL );
+ &args1, 0, 0, 0, 0, NULL );
ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status );
status = pNtCreateThreadEx( &threads[1], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc,
- &teb2, 0, 0, 0, 0, NULL );
+ &args2, 0, 0, 0, 0, NULL );
ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status );
+ WaitForMultipleObjects( 2, running_events, TRUE, INFINITE );
+ SetEvent( args1.quit_event );
+
WaitForMultipleObjects( 2, threads, TRUE, INFINITE );
CloseHandle( threads[0] );
CloseHandle( threads[1] );
+ CloseHandle( args1.running_event );
+ CloseHandle( args2.running_event );
+ CloseHandle( args1.quit_event );
- ok( NtCurrentTeb() != teb1, "Multiple threads have TEB %p.\n", teb1 );
- ok( NtCurrentTeb() != teb2, "Multiple threads have TEB %p.\n", teb2 );
- ok( teb1 != teb2, "Multiple threads have TEB %p.\n", teb1 );
+ ok( NtCurrentTeb() != args1.teb, "Multiple threads have TEB %p.\n", args1.teb );
+ ok( NtCurrentTeb() != args2.teb, "Multiple threads have TEB %p.\n", args2.teb );
+ ok( args1.teb != args2.teb, "Multiple threads have TEB %p.\n", args1.teb );
}
START_TEST(thread)
--
2.35.1
1
0
[PATCH v2 0/2] MR54: winecoreaudio: Enable compilation with long types.
by Huw Davies (ï¼ huw) 11 May '22
by Huw Davies (ï¼ huw) 11 May '22
11 May '22
--
v2: winecoreaudio: Enable compilation with long types.
winecoreaudio: Remove DWORDs from the midi syscall interface.
https://gitlab.winehq.org/wine/wine/-/merge_requests/54
4
4
[PATCH 0/2] MR54: winecoreaudio: Enable compilation with long types.
by Huw Davies (ï¼ huw) 11 May '22
by Huw Davies (ï¼ huw) 11 May '22
11 May '22
[PATCH 0/2] MR57: winevulkan: Update to VK spec version 1.3.213.
by Georg Lehmann (ï¼ DadSchoorse) 11 May '22
by Georg Lehmann (ï¼ DadSchoorse) 11 May '22
11 May '22
Not a trivial update this time, two extensions are blocked by a Vulkan xml bug.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/57
2
2
v2: Do not add an extra manifest file
(Thanks Piotr for hint)
https://bugs.winehq.org/show_bug.cgi?id=52975
Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com>
---
dlls/msvcr80/msvcr80.manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/msvcr80/msvcr80.manifest b/dlls/msvcr80/msvcr80.manifest
index 5f3daed5827..99b818c2030 100644
--- a/dlls/msvcr80/msvcr80.manifest
+++ b/dlls/msvcr80/msvcr80.manifest
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.4053" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/>
+ <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.9672" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/>
<file name="msvcr80.dll"/>
<file name="msvcp80.dll"/>
<file name="msvcm80.dll"/>
--
2.36.1
2
1
https://bugs.winehq.org/show_bug.cgi?id=52975
Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com>
---
dlls/msvcr80/msvcr80.rc | 3 +++
dlls/msvcr80/msvcr80_61.manifest | 7 +++++++
2 files changed, 10 insertions(+)
create mode 100644 dlls/msvcr80/msvcr80_61.manifest
diff --git a/dlls/msvcr80/msvcr80.rc b/dlls/msvcr80/msvcr80.rc
index 458c5df6f98..2d9f5457569 100644
--- a/dlls/msvcr80/msvcr80.rc
+++ b/dlls/msvcr80/msvcr80.rc
@@ -20,3 +20,6 @@
/* @makedep: msvcr80.manifest */
WINE_MANIFEST 24 msvcr80.manifest
+
+/* @makedep: msvcr80.manifest */
+WINE_MANIFEST61 24 msvcr80_61.manifest
diff --git a/dlls/msvcr80/msvcr80_61.manifest b/dlls/msvcr80/msvcr80_61.manifest
new file mode 100644
index 00000000000..4298d242046
--- /dev/null
+++ b/dlls/msvcr80/msvcr80_61.manifest
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.6195" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/>
+ <file name="msvcr80.dll"/>
+ <file name="msvcp80.dll"/>
+ <file name="msvcm80.dll"/>
+</assembly>
--
2.36.0
3
4
From: Angelo Haller <angelo(a)szanni.org>
The following patches fix sending of the LVN_ODSTATECHANGED notification for
LVS_OWNERDATA list views, adding more refined tests in the process and
fixing various bugs.
Warning: I have had access to the Windows Research Kernel (WRK) 1.2
~10 years ago. These changes are regarding comctrl32 & tests which are NOT
part of the WRK. As outlined in https://wiki.winehq.org/Developer_FAQ this
should therefore satisfy the requirement of ONLY submitting patches to
components I have NOT had access to.
Angelo Haller (6):
comctl32/tests: Expand ownerdata listview tests.
comctl32/listview: Move LVN_ODSTATECHANGED notification to function.
comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists.
comctl32/listview: Send LVN_ODSTATECHANGED notification.
comctl32/listview: Send LVN_ODSTATECHANGED only for true ranges.
comctl32/listview: Fix deselect on LVS_OWNERDATA.
dlls/comctl32/listview.c | 71 ++++++++++++++++++++++++++--------
dlls/comctl32/tests/listview.c | 59 ++++++++++++++++++++++++----
2 files changed, 105 insertions(+), 25 deletions(-)
Signed-off-by: Angelo Haller <angelo(a)szanni.org>
--
2.36.0
2
10
[PATCH v2 0/6] MR55: ntdll: Factor out heap status handling and locking.
by Rémi Bernon (ï¼ rbernon) 11 May '22
by Rémi Bernon (ï¼ rbernon) 11 May '22
11 May '22
--
v2: ntdll: Split RtlSizeHeap to a separate heap_size helper.
ntdll: Split RtlReAllocateHeap to a separate heap_reallocate helper.
ntdll: Split RtlFreeHeap to a separate heap_free helper.
ntdll: Split RtlAllocateHeap to a separate heap_allocate helper.
ntdll: Split HEAP_IsRealArena to heap_validate and heap_validate_ptr.
ntdll: Lock heap critical section outside of HEAP_IsRealArena.
https://gitlab.winehq.org/wine/wine/-/merge_requests/55
2
7
[PATCH 0/2] MR56: ntdll: Fix minor typos in signal_arm.c
by Martin Storsjö (ï¼ mstorsjo) 11 May '22
by Martin Storsjö (ï¼ mstorsjo) 11 May '22
11 May '22
[PATCH 0/6] MR55: ntdll: Factor out heap status handling and locking.
by Rémi Bernon (ï¼ rbernon) 11 May '22
by Rémi Bernon (ï¼ rbernon) 11 May '22
11 May '22
[PATCH 0/6] MR53: windows.gaming.input: Test fixes and being implementing FF classes.
by Rémi Bernon (ï¼ rbernon) 11 May '22
by Rémi Bernon (ï¼ rbernon) 11 May '22
11 May '22
Folks,
Here's a description of the envisioned workflow for using Gitlab as the
primary platform for Wine development, should we decide to adopt it.
This will probably evolve as we experiment and find out what
works or doesn't work for us. All feedback/suggestions are welcome.
1. All patch series are submitted as Merge Requests, so that the
proper information can be captured. The usual rules apply (small
patches, small number of patches per MR, sign-off by submitter).
There are various methods available for creating merge requests:
- using the web interface
- directly when pushing: git push -o merge_request.create
cf. https://docs.gitlab.com/ee/user/project/push_options.html
- from the command line, eg. 'glab mr create'
cf. https://glab.readthedocs.io/en/latest/mr/create.html
- by email
cf. https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_reque…
2. The merge request will run through the CI pipeline, ideally
including a testbot run (not implemented yet).
3. The patches of the merge request will be forwarded to wine-devel
by the mail gateway, for people who prefer to use their existing
email tools to manage patches.
4. Reviewers will be automatically assigned to the merge request
based on the MAINTAINERS file (not implemented yet). Reviewers
can also be assigned manually. People assigned as reviewers
should receive a notification from gitlab.
5. When someone starts reviewing a patch, they can optionally assign
the patch to themselves, so that the submitter is aware that
someone is working on their patch.
6. Feedback on patches can be sent by replying to the wine-devel
email, or by adding a comment on gitlab. The mail gateway will
bridge things so that all comments are reflected both on gitlab
and on wine-devel.
Note: if you subscribe to gitlab notifications (recommended)
currently you'll get many duplicate emails. There are mail
headers that can be used for filtering, but we may want to
handle this differently, suggestions are welcome.
7. If there are comments, the submitter can address them and update
the merge request by pushing to the MR branch. The mail gateway
will send the new version of the patches to wine-devel (except
for trivial changes) for further review.
8. Once a reviewer approves a merge request, they should mark it
approved in gitlab. The idea is that this will replace the
existing "send a signoff by email" mechanism. Note that an
approval applies to the whole merge request, not to individual
patches. This should be one more reason to keep patch series
small.
Approvals can be sent by:
- using the approve button on the web interface
- replying to a gitlab notification with "/approve"
(note: replying to a wine-devel mail won't work, it needs the
magic gitlab headers)
cf. https://docs.gitlab.com/ee/user/project/quick_actions.html
- from the command line, eg. 'glab mr approve'
cf. https://glab.readthedocs.io/en/latest/mr/approve.html
9. Once a merge request has been approved by all reviewers, I'll
merge it into my tree, do a full testbot run to make sure it
doesn't break anything, then push the results and mark the merge
request as 'merged'.
10. If a merge request is no longer relevant, the submitter should
close it. We may want to add an auto-close process for stale
merge requests at some point.
--
Alexandre Julliard
julliard(a)winehq.org
6
9
Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com>
---
include/winerror.h | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/include/winerror.h b/include/winerror.h
index d51d5648cdb..fb44eaacbed 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -3884,6 +3884,47 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
#define WINCODEC_ERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88982f94)
#define WINCODEC_ERR_INVALIDPROGRESSIVELEVEL _HRESULT_TYPEDEF_(0x88982f95)
+#define MILERR_OBJECTBUSY _HRESULT_TYPEDEF_(0x88980001)
+#define MILERR_INSUFFICIENTBUFFER _HRESULT_TYPEDEF_(0x88980002)
+#define MILERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88980003)
+#define MILERR_SCANNER_FAILED _HRESULT_TYPEDEF_(0x88980004)
+#define MILERR_SCREENACCESSDENIED _HRESULT_TYPEDEF_(0x88980005)
+#define MILERR_DISPLAYSTATEINVALID _HRESULT_TYPEDEF_(0x88980006)
+#define MILERR_NONINVERTIBLEMATRIX _HRESULT_TYPEDEF_(0x88980007)
+#define MILERR_ZEROVECTOR _HRESULT_TYPEDEF_(0x88980008)
+#define MILERR_TERMINATED _HRESULT_TYPEDEF_(0x88980009)
+#define MILERR_BADNUMBER _HRESULT_TYPEDEF_(0x8898000a)
+#define MILERR_INTERNALERROR _HRESULT_TYPEDEF_(0x88980080)
+#define MILERR_DISPLAYFORMATNOTSUPPORTED _HRESULT_TYPEDEF_(0x88980084)
+#define MILERR_INVALIDCALL _HRESULT_TYPEDEF_(0x88980085)
+#define MILERR_ALREADYLOCKED _HRESULT_TYPEDEF_(0x88980086)
+#define MILERR_NOTLOCKED _HRESULT_TYPEDEF_(0x88980087)
+#define MILERR_DEVICECANNOTRENDERTEXT _HRESULT_TYPEDEF_(0x88980088)
+#define MILERR_GLYPHBITMAPMISSED _HRESULT_TYPEDEF_(0x88980089)
+#define MILERR_MALFORMEDGLYPHCACHE _HRESULT_TYPEDEF_(0x8898008a)
+#define MILERR_GENERIC_IGNORE _HRESULT_TYPEDEF_(0x8898008b)
+#define MILERR_MALFORMED_GUIDELINE_DATA _HRESULT_TYPEDEF_(0x8898008c)
+#define MILERR_NO_HARDWARE_DEVICE _HRESULT_TYPEDEF_(0x8898008d)
+#define MILERR_NEED_RECREATE_AND_PRESENT _HRESULT_TYPEDEF_(0x8898008e)
+#define MILERR_ALREADY_INITIALIZED _HRESULT_TYPEDEF_(0x8898008f)
+#define MILERR_MISMATCHED_SIZE _HRESULT_TYPEDEF_(0x88980090)
+#define MILERR_NO_REDIRECTION_SURFACE_AVAILABLE _HRESULT_TYPEDEF_(0x88980091)
+#define MILERR_REMOTING_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x88980092)
+#define MILERR_QUEUED_PRESENT_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x88980093)
+#define MILERR_NOT_QUEUING_PRESENTS _HRESULT_TYPEDEF_(0x88980094)
+#define MILERR_NO_REDIRECTION_SURFACE_RETRY_LATER _HRESULT_TYPEDEF_(0x88980095)
+#define MILERR_TOOMANYSHADERELEMNTS _HRESULT_TYPEDEF_(0x88980096)
+#define MILERR_MROW_READLOCK_FAILED _HRESULT_TYPEDEF_(0x88980097)
+#define MILERR_MROW_UPDATE_FAILED _HRESULT_TYPEDEF_(0x88980098)
+#define MILERR_SHADER_COMPILE_FAILED _HRESULT_TYPEDEF_(0x88980099)
+#define MILERR_MAX_TEXTURE_SIZE_EXCEEDED _HRESULT_TYPEDEF_(0x8898009a)
+#define MILERR_QPC_TIME_WENT_BACKWARD _HRESULT_TYPEDEF_(0x8898009b)
+#define MILERR_DXGI_ENUMERATION_OUT_OF_SYNC _HRESULT_TYPEDEF_(0x8898009d)
+#define MILERR_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x8898009e)
+#define MILERR_COLORSPACE_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8898009f)
+#define MILERR_PREFILTER_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x889800a0)
+#define MILERR_DISPLAYID_ACCESS_DENIED _HRESULT_TYPEDEF_(0x889800a1)
+
#define DWRITE_E_FILEFORMAT _HRESULT_TYPEDEF_(0x88985000)
#define DWRITE_E_UNEXPECTED _HRESULT_TYPEDEF_(0x88985001)
#define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)
--
2.35.1
1
2
[PATCH 0/1] MR52: include: Add TF_TMF/TMAW defines
by Alistair Leslie-Hughes (ï¼ alesliehughes) 10 May '22
by Alistair Leslie-Hughes (ï¼ alesliehughes) 10 May '22
10 May '22
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/52
2
1
[PATCH 0/1] MR46: d3dx10/tests: Fix d3dx10_34 test failures on all Windows versions.
by Sven Baars (ï¼ sbaars) 10 May '22
by Sven Baars (ï¼ sbaars) 10 May '22
10 May '22
Should fix https://bugs.winehq.org/show_bug.cgi?id=51827
I tested this on a Windows 10 VM. With last=4 it failed about 50% of the time, with last=3 it passed 100 tests without any failures.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/46
3
4
--
v2: winegstreamer: Set sample timestamps in MPEG audio decoder.
quartz/tests: Add tests for MPEG audio decoder sample timestamps.
winegstreamer: Register MPEG audio decoder.
winegstreamer: Add IMpegAudioDecoder stub to MPEG audio decoder.
include: Add IMpegAudioDecoder definition.
https://gitlab.winehq.org/wine/wine/-/merge_requests/49
3
7
[PATCH] wineusb.sys: Remove erroneous call to LeaveCriticalSection() in add_usb_device.
by Jinoh Kang 10 May '22
by Jinoh Kang 10 May '22
10 May '22
Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com>
---
dlls/wineusb.sys/wineusb.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c
index cca0257bb02..c41ea580137 100644
--- a/dlls/wineusb.sys/wineusb.c
+++ b/dlls/wineusb.sys/wineusb.c
@@ -114,7 +114,6 @@ static void add_usb_device(libusb_device *libusb_device)
FILE_DEVICE_USB, 0, FALSE, &device_obj)))
{
ERR("Failed to create device, status %#x.\n", status);
- LeaveCriticalSection(&wineusb_cs);
libusb_close(handle);
return;
}
--
2.34.1
2
1
[PATCH 1/2] evr/sample: Avoid a race condition when releasing a tracked sample.
by Nikolay Sivov 10 May '22
by Nikolay Sivov 10 May '22
10 May '22
Same as b1807751219e256867eaac5cc4d8b97a5482978f.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/evr/sample.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c
index 1d29b6cdc2c..738f803fe66 100644
--- a/dlls/evr/sample.c
+++ b/dlls/evr/sample.c
@@ -920,19 +920,21 @@ static ULONG WINAPI video_sample_AddRef(IMFSample *iface)
static ULONG WINAPI video_sample_Release(IMFSample *iface)
{
struct video_sample *sample = impl_from_IMFSample(iface);
- ULONG refcount;
+ ULONG refcount = InterlockedDecrement(&sample->refcount);
+ IMFAsyncResult *tracked_result = NULL;
IMFSample_LockStore(sample->sample);
- if (sample->tracked_result && sample->tracked_refcount == (sample->refcount - 1))
+ if (sample->tracked_result && sample->tracked_refcount == refcount)
{
- video_sample_tracking_thread_invoke(sample->tracked_result);
- IMFAsyncResult_Release(sample->tracked_result);
+ tracked_result = sample->tracked_result;
+ video_sample_tracking_thread_invoke(tracked_result);
sample->tracked_result = NULL;
sample->tracked_refcount = 0;
}
IMFSample_UnlockStore(sample->sample);
- refcount = InterlockedDecrement(&sample->refcount);
+ if (tracked_result)
+ IMFAsyncResult_Release(tracked_result);
TRACE("%p, refcount %lu.\n", iface, refcount);
--
2.35.1
1
1
10 May '22
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/mfplat/sample.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c
index ed39b5f7297..687ada1a477 100644
--- a/dlls/mfplat/sample.c
+++ b/dlls/mfplat/sample.c
@@ -183,22 +183,25 @@ static ULONG WINAPI sample_tracked_Release(IMFSample *iface)
{
struct sample *sample = impl_from_IMFSample(iface);
ULONG refcount = InterlockedDecrement(&sample->attributes.ref);
+ IRtwqAsyncResult *tracked_result = NULL;
HRESULT hr;
EnterCriticalSection(&sample->attributes.cs);
if (sample->tracked_result && sample->tracked_refcount == refcount)
{
- IRtwqAsyncResult *tracked_result = sample->tracked_result;
+ tracked_result = sample->tracked_result;
sample->tracked_result = NULL;
sample->tracked_refcount = 0;
/* Call could fail if queue system is not initialized, it's not critical. */
if (FAILED(hr = RtwqInvokeCallback(tracked_result)))
WARN("Failed to invoke tracking callback, hr %#lx.\n", hr);
- IRtwqAsyncResult_Release(tracked_result);
}
LeaveCriticalSection(&sample->attributes.cs);
+ if (tracked_result)
+ IRtwqAsyncResult_Release(tracked_result);
+
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
--
2.35.1
1
0
[PATCH] mf/session: Do not request more samples when SA sample becomes available.
by Nikolay Sivov 10 May '22
by Nikolay Sivov 10 May '22
10 May '22
The issue here is that upstream nodes get their request counters increased
while sink hasn't requested any. This causes desync between sink request
counters and upstream node counters, potentially causing sample drops and
sink waiting forever for samples that will never come. Case like that
is easy to reproduce with mfplay-based player, where occasionally
end-of-presentation condition does not trigger, but new samples are coming in.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/mf/session.c | 71 +++++++++++++++++++++++++++++++++++++++++------
1 file changed, 62 insertions(+), 9 deletions(-)
diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 85b63f767fe..a78e7cfc473 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -2369,6 +2369,8 @@ static HRESULT WINAPI session_commands_callback_GetParameters(IMFAsyncCallback *
return E_NOTIMPL;
}
+static void session_deliver_pending_samples(struct media_session *session, IMFTopologyNode *node);
+
static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)
{
struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result));
@@ -2411,7 +2413,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface,
{
if (SUCCEEDED(IMFTopologyNode_GetInput(topo_node->node, 0, &upstream_node, &upstream_output)))
{
- session_request_sample_from_node(session, upstream_node, upstream_output);
+ session_deliver_pending_samples(session, upstream_node);
IMFTopologyNode_Release(upstream_node);
}
}
@@ -2952,19 +2954,19 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop
switch (node_type)
{
case MF_TOPOLOGY_OUTPUT_NODE:
- if (sample)
+ if (topo_node->u.sink.requests)
{
- if (topo_node->u.sink.requests)
+ if (sample)
{
if (FAILED(hr = IMFStreamSink_ProcessSample(topo_node->object.sink_stream, sample)))
WARN("Stream sink failed to process sample, hr %#lx.\n", hr);
- topo_node->u.sink.requests--;
}
- }
- else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT,
- NULL, NULL)))
- {
- WARN("Failed to place sink marker, hr %#lx.\n", hr);
+ else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT,
+ NULL, NULL)))
+ {
+ WARN("Failed to place sink marker, hr %#lx.\n", hr);
+ }
+ topo_node->u.sink.requests--;
}
break;
case MF_TOPOLOGY_TRANSFORM_NODE:
@@ -3048,6 +3050,57 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop
}
}
+static void session_deliver_pending_samples(struct media_session *session, IMFTopologyNode *node)
+{
+ struct sample *sample_entry, *sample_entry2;
+ IMFTopologyNode *downstream_node;
+ struct topo_node *topo_node;
+ MF_TOPOLOGY_TYPE node_type;
+ DWORD downstream_input;
+ TOPOID node_id;
+ unsigned int i;
+
+ IMFTopologyNode_GetNodeType(node, &node_type);
+ IMFTopologyNode_GetTopoNodeID(node, &node_id);
+
+ topo_node = session_get_node_by_id(session, node_id);
+
+ switch (node_type)
+ {
+ case MF_TOPOLOGY_TRANSFORM_NODE:
+
+ transform_node_pull_samples(session, topo_node);
+
+ /* Push down all available output. */
+ for (i = 0; i < topo_node->u.transform.output_count; ++i)
+ {
+ if (FAILED(IMFTopologyNode_GetOutput(node, i, &downstream_node, &downstream_input)))
+ {
+ WARN("Failed to get connected node for output %u.\n", i);
+ continue;
+ }
+
+ LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.outputs[i].samples,
+ struct sample, entry)
+ {
+ if (!topo_node->u.transform.outputs[i].requests)
+ break;
+
+ session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample);
+ topo_node->u.transform.outputs[i].requests--;
+
+ transform_release_sample(sample_entry);
+ }
+
+ IMFTopologyNode_Release(downstream_node);
+ }
+ break;
+ default:
+ FIXME("Unexpected node type %u.\n", node_type);
+ }
+}
+
+
static HRESULT session_request_sample_from_node(struct media_session *session, IMFTopologyNode *node, DWORD output)
{
IMFTopologyNode *downstream_node, *upstream_node;
--
2.35.1
1
0
10 May '22
Wine's dbghelp's implementation differ from native regarding basic types' handling
(the basic types like char, int, long...)
- Wine's dbghelp exposes a name for such a type, while native doesn't
- parsing of basic type from dwarf & pdb don't always exactly return the correct
information. Two examples (among others) of discrepancies:
- in C, under Windows assumption, char, signed char and unsigned char are mapped
to 2 types (as char = signed char); while in C++, they are mapped to three
different types (char and signed char are two different types). Wine's dbhelp
doesn't report correctly the C++ char types, and the char/signed char is broken
too.
- MS compiler shamelessly maps WCHAR to btWChar (basic type), while it's a
typedef to unsigned short (which is mapped to btInt of size 2)
This series's result is that Wine dbghelp's now returns the same basic types as native.
(Tested with most of the C & C++ basic types)
This requires:
- to implement the re-generation of the basic types' name in WineDbg. This is done
by adding data model tables (ILP32, LP64 and LLP64), and picking up the right one
depending on current executable. Option is also added in WineDbg to force a(nother)
data model. This is only used when printing types, not when reading/writing integer
values as this (mostly) relies on the size of the integer.
- fixing the pdb and dwarf backends in dbghelp to retarget the correct base types
(for C and C++ basic types)
- removing the name field from dbghelp's struct symt_basic allowed some simplification
inside dbghelp:
+ all basic types are now only allocated once across every compilation unit and module)
(small speed and memory consumption gain)
+ dwarf's backend used a basic type cache which is also removed
Note: when using a basic type in WineDbg (like casting an integral value to another
integral value), this serie doesn't change the data model used for getting the type's size.
The data model used is currently ILP32 on 32 bit, and always LP64 on 64 bit.
Yet to come serie shall use the current data model instead.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/51
2
5
Re: [PATCH v2 0/1] MR29: mfplat: Avoid a race condition when releasing a tracked sample.
by Nikolay Sivov (ï¼ nsivov) 10 May '22
by Nikolay Sivov (ï¼ nsivov) 10 May '22
10 May '22
On Tue May 10 13:43:09 2022 +0000, Giovanni Mascellani wrote:
> That patch looks sensible to me. Did you actually manage to get a crash
> out of that?
It's always reproducible if you run e.g. test_sample_allocator_sysmem() alone, without initializing queues. I'll send something for this.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/29#note_755
1
0
Re: [PATCH v2 0/1] MR29: mfplat: Avoid a race condition when releasing a tracked sample.
by Giovanni Mascellani (ï¼ giomasce) 10 May '22
by Giovanni Mascellani (ï¼ giomasce) 10 May '22
10 May '22
On Tue May 10 13:43:09 2022 +0000, Nikolay Sivov wrote:
> Turns out I missed a problem with this. When queues are shut down,
> releasing result object reenters sample release method, and potentially
> destroys it. On return original call continues, and uses critical
> section that has been just destroyed.
> Attaching a possible fix for this.
> [2.diff](/uploads/94a959648e483587b11172a6cc34b015/2.diff)
That patch looks sensible to me. Did you actually manage to get a crash out of that?
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/29#note_754
1
0
I want to compile Wine in 64 bit Windows (Windows Vista and later).
I want to compile it with Open Watcom (Win32 C/C++ Installer):
http://openwatcom.org/download.php
How to do that? Any ideas?
2
1
This happens because the llvmpipe virtual GPU is not in the RandR provider list
when there is a hardware GPU driving the screen. So LUID for the llvmpipe is
not generated in such cases.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52931
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
Another way of handling this is hiding the llvmpipe Vulkan device when there is a hardware GPU.
dlls/vulkan-1/tests/vulkan.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c
index 11d20120d1d..b9a36a55653 100644
--- a/dlls/vulkan-1/tests/vulkan.c
+++ b/dlls/vulkan-1/tests/vulkan.c
@@ -212,11 +212,16 @@ static void test_enumerate_physical_device2(void)
trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08lx:%08lx.\n",
properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID),
wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart);
+ todo_wine_if(!id.deviceLUIDValid && strstr(properties2.properties.deviceName, "llvmpipe"))
ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n");
- /* If deviceLUIDValid is VK_TRUE, deviceNodeMask must contain exactly one bit according
- * to the Vulkan specification */
- ok(id.deviceNodeMask && !(id.deviceNodeMask & (id.deviceNodeMask - 1)),
- "Expect deviceNodeMask to have only one bit set, got %#x.\n", id.deviceNodeMask);
+ if (id.deviceLUIDValid == VK_TRUE)
+ {
+ /* If deviceLUIDValid is VK_TRUE, deviceNodeMask must contain exactly one bit
+ * according to the Vulkan specification */
+ ok(id.deviceNodeMask && !(id.deviceNodeMask & (id.deviceNodeMask - 1)),
+ "Expect deviceNodeMask to have only one bit set, got %#x.\n",
+ id.deviceNodeMask);
+ }
}
}
--
2.34.1
1
0
[PATCH 0/4] MR41: mf: Register video processor transform and fix a few broken tests.
by Rémi Bernon (ï¼ rbernon) 10 May '22
by Rémi Bernon (ï¼ rbernon) 10 May '22
10 May '22
[PATCH 0/1] MR50: mfplat: Allow NULL length pointer in IMFAttributes::GetAllocatedString
by Andrew Eikum (ï¼ aeikum) 10 May '22
by Andrew Eikum (ï¼ aeikum) 10 May '22
10 May '22
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/50
3
2
[PATCH vkd3d 1/8] tests: Add additional subtests to implicit array initialization.
by Giovanni Mascellani 09 May '22
by Giovanni Mascellani 09 May '22
09 May '22
From: Francisco Casas <fcasas(a)codeweavers.com>
Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
---
v3:
- Simplified tests that are expected to fail.
- Addeed a tests for implicit arrays in a typedef.
- Added a test for an array of complex elements.
- Moved all tests not expected to fail to the top.
- Removed the 'Implicit array of elements of size 0
with broadcast initialization' test. Replaced with a
simple 'Broadcast to an implicit array' test from zf.
- Calling 'implicit arrays' as 'implicit size arrays' now.
---
...lsl-initializer-implicit-array.shader_test | 223 +++++++++++++++++-
1 file changed, 222 insertions(+), 1 deletion(-)
diff --git a/tests/hlsl-initializer-implicit-array.shader_test b/tests/hlsl-initializer-implicit-array.shader_test
index d2b94da4..648825eb 100644
--- a/tests/hlsl-initializer-implicit-array.shader_test
+++ b/tests/hlsl-initializer-implicit-array.shader_test
@@ -2,6 +2,7 @@
float4 main() : SV_TARGET
{
float4 arr[] = {10, 20, 30, 40, 50, 60, 70, 80};
+
return arr[1];
}
@@ -10,9 +11,229 @@ todo draw quad
todo probe all rgba (50, 60, 70, 80)
+[pixel shader]
+float4 main() : sv_target
+{
+ float4 arr1[2] = {1, 2, 3, 4, 5, 6, 7, 8};
+ float4 arr2[] = arr1;
+
+ return arr2[1];
+}
+
+[test]
+todo draw quad
+todo probe all rgba (5.0, 6.0, 7.0, 8.0)
+
+
+[pixel shader]
+float4 main() : sv_target
+{
+ float2 arr[][3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
+
+ return float4(arr[1][0], arr[1][1]);
+}
+
+[test]
+todo draw quad
+todo probe all rgba (7.0, 8.0, 9.0, 10.0)
+
+
+[pixel shader]
+struct foo
+{
+ float3 foo1;
+ float4 foo2;
+};
+
+struct bar
+{
+ struct foo aa;
+ int2 bb;
+ float4 cc[2];
+};
+
+float4 main() : SV_TARGET
+{
+ struct bar p[] = {
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ };
+ return p[0].aa.foo2 + p[1].cc[1];
+}
+
+[test]
+todo draw quad
+todo probe all rgba (318.0, 320.0, 322.0, 324.0)
+
+
[pixel shader fail]
+// Incompatible number of arguments in implicit size array initializer
float4 main() : SV_TARGET
{
float4 arr[] = {10, 20, 30, 40, 50, 60, 70};
- return arr[0];
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Incompatible number of arguments in implicit size array initializer
+float4 main() : SV_TARGET
+{
+ float4 arr[] = {10, 20, 30, 40, 50, 60, 70, 80, 90};
+
+ return 0.0;
+}
+
+[pixel shader fail]
+// Implicit size inner array
+float4 main() : sv_target
+{
+ float2 arr[3][] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Implicit size array without initializer
+float4 main() : sv_target
+{
+ float4 arr[];
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Implicit size array as struct member
+struct foobar
+{
+ int a;
+ float4 arr[];
+};
+
+float4 main() : sv_target
+{
+ struct foobar s;
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Implicit size array as function argument
+float4 fun(float4 arr[])
+{
+ return 1.0;
+}
+float4 main() : sv_target
+{
+ float4 arr[3] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
+ return fun(arr);
+}
+
+
+[pixel shader fail]
+// Implicit size array as function return type
+// Note: explicit size arrays are not allowed either.
+float4[] fun()
+{
+ float4 ret[2] = {1, 2, 3, 4, 5, 6, 7, 8};
+
+ return ret;
+}
+
+float4 main() : sv_target
+{ fun();
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Implicit size array as a cast
+float4 main() : sv_target
+{
+ float2 arr1[4] = {1, 2, 3, 4, 5, 6, 7, 8};
+ float4 arr2[2] = (float4 []) arr1;
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Implicit size array as a typedef
+typedef float4 arrtype[];
+
+float4 main() : sv_target
+{
+ arrtype arr1 = {1, 2, 3, 4, 5, 6, 7, 8};
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Implicit size array of elements of size 0
+struct emp
+{
+};
+
+float4 main() : sv_target
+{
+ struct emp arr[] = {1, 2, 3, 4};
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Implicit size array of elements of size 0, without initializer
+struct emp
+{
+};
+
+float4 main() : sv_target
+{
+ struct emp arr[];
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Broadcast to an implicit size array
+float4 main() : sv_target
+{
+ int a[4] = (int[]) 0;
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Implicit size array with an initializer of size 0
+struct emp
+{
+};
+
+float4 main() : sv_target
+{
+ float4 arr[] = (struct emp) 42;
+
+ return 0.0;
+}
+
+
+[pixel shader fail]
+// Implicit size array of elements of size 0 with initializer of size 0
+struct emp
+{
+};
+
+float4 main() : sv_target
+{
+ struct emp arr[] = (struct emp) 42;
+
+ return 0.0;
}
--
2.36.0
2
16
2
1
09 May '22
avoiding as much as possible long types in unixlib part
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/winepulse.drv/mmdevdrv.c | 2 +-
dlls/winepulse.drv/pulse.c | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 18009435f1f2..e97a04d6a8d7 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -250,7 +250,7 @@ typedef struct tagLANGANDCODEPAGE
WORD wCodePage;
} LANGANDCODEPAGE;
-static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, DWORD *len)
+static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, UINT *len)
{
WCHAR pn[37];
swprintf(pn, ARRAY_SIZE(pn), L"\\StringFileInfo\\%04x%04x\\ProductName", lang->wLanguage, lang->wCodePage);
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
index f685e2047e74..6309a27f42b0 100644
--- a/dlls/winepulse.drv/pulse.c
+++ b/dlls/winepulse.drv/pulse.c
@@ -87,7 +87,7 @@ typedef struct _PhysDevice {
enum phys_device_bus_type bus_type;
USHORT vendor_id, product_id;
EndpointFormFactor form;
- DWORD channel_mask;
+ UINT channel_mask;
UINT index;
char pulse_name[0];
} PhysDevice;
@@ -252,7 +252,7 @@ static NTSTATUS pulse_get_endpoint_ids(void *args)
struct get_endpoint_ids_params *params = args;
struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources;
struct endpoint *endpoint = params->endpoints;
- DWORD len, name_len, needed;
+ size_t len, name_len, needed;
unsigned int offset;
PhysDevice *dev;
@@ -393,10 +393,10 @@ fail:
return E_FAIL;
}
-static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map)
+static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map)
{
int i;
- DWORD mask = 0;
+ UINT mask = 0;
for (i = 0; i < map->channels; ++i) {
switch (map->map[i]) {
@@ -452,9 +452,9 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p)
}
static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form,
- DWORD channel_mask, const char *pulse_name, const char *name)
+ UINT channel_mask, const char *pulse_name, const char *name)
{
- DWORD len = strlen(pulse_name), name_len = strlen(name);
+ size_t len = strlen(pulse_name), name_len = strlen(name);
PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1]));
WCHAR *wname;
@@ -485,7 +485,7 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index
static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata)
{
struct list *speaker;
- DWORD channel_mask;
+ UINT channel_mask;
if (!i || !i->name || !i->name[0])
return;
@@ -516,7 +516,7 @@ static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eo
* would report for a given channel layout. */
static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIBLE *fmt)
{
- DWORD pa_mask = pulse_channel_map_to_channel_mask(pa_map);
+ UINT pa_mask = pulse_channel_map_to_channel_mask(pa_map);
TRACE("got mask for PA: 0x%x\n", pa_mask);
@@ -772,7 +772,7 @@ fail:
return STATUS_SUCCESS;
}
-static DWORD get_channel_mask(unsigned int channels)
+static UINT get_channel_mask(unsigned int channels)
{
switch(channels) {
case 0:
@@ -845,8 +845,8 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV
break;
case WAVE_FORMAT_EXTENSIBLE: {
WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE*)fmt;
- DWORD mask = wfe->dwChannelMask;
- DWORD i = 0, j;
+ UINT mask = wfe->dwChannelMask;
+ unsigned i = 0, j;
if (fmt->cbSize != (sizeof(*wfe) - sizeof(*fmt)) && fmt->cbSize != sizeof(*wfe))
break;
if (IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) &&
2
3
08 May '22
This is a split off resend of Zebediah's original patch.
v3: original patch by Zebediah Figura
v3 -> v4: split patch
v4 -> v5: fix author
Zebediah Figura (3):
server: Don't set error in find_object_index if the object is not
found.
ntdll: Implement reading multiple entries in NtQueryDirectoryObject.
server: Generalize get_directory_entries to single_entry case.
dlls/ntdll/tests/om.c | 57 +++++++++-----------
dlls/ntdll/unix/sync.c | 116 +++++++++++++++++++++++++++--------------
server/directory.c | 76 +++++++++++++++++++++------
server/object.c | 1 -
server/protocol.def | 20 ++++---
server/trace.c | 34 ++++++++++++
6 files changed, 209 insertions(+), 95 deletions(-)
--
2.34.1
2
4
08 May '22
This is a split off resend of Zebediah's original patch.
Jinoh Kang (2):
server: Don't set error in find_object_index if the object is not
found.
server: Generalize get_directory_entries to single_entry case.
Zebediah Figura (1):
ntdll: Implement reading multiple entries in NtQueryDirectoryObject.
dlls/ntdll/tests/om.c | 57 +++++++++-----------
dlls/ntdll/unix/sync.c | 116 +++++++++++++++++++++++++++--------------
server/directory.c | 76 +++++++++++++++++++++------
server/object.c | 1 -
server/protocol.def | 20 ++++---
server/trace.c | 34 ++++++++++++
6 files changed, 209 insertions(+), 95 deletions(-)
--
2.34.1
1
3
[PATCH 0/4] MR47: kernel32/tests: Add tests for CancelSynchronousIo.
by Daniel Lehman (ï¼ dlehman25) 07 May '22
by Daniel Lehman (ï¼ dlehman25) 07 May '22
07 May '22
Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/47
2
4
Re: [PATCH v2 0/1] MR29: mfplat: Avoid a race condition when releasing a tracked sample.
by Nikolay Sivov (ï¼ nsivov) 07 May '22
by Nikolay Sivov (ï¼ nsivov) 07 May '22
07 May '22
Turns out I missed a problem with this. When queues are shut down, releasing result object reenters sample release method, and potentially destroys it. On return original call continues, and uses critical section that has been just destroyed.
Attaching a possible fix for this.
[2.diff](/uploads/94a959648e483587b11172a6cc34b015/2.diff)
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/29#note_743
1
0
[PATCH 0/1] MR45: ntdll: Always prefer native signal restorer over the custom one.
by Jinoh Kang (ï¼ iamahuman) 07 May '22
by Jinoh Kang (ï¼ iamahuman) 07 May '22
07 May '22
A few months after commit 1b1ea639cd6 (ntdll: Use a custom signal
restorer for Android., 2014-07-17) has been introduced, bionic rolled
its own signal restorer. The patch is at:
https://android-review.googlesource.com/c/platform/bionic/+/107692
In general, rolling our own signal restorer is not a good idea since it
interferes with unwinding. GDB seems especially unhappy when the signal
restorer's name isn't exactly "__restore_rt".
Fix this by using the custom signal restorer only if the vDSO has
disappeared and libc doesn't supply its own signal restorer. This also
removes Android-specific code, although there aren't many libcs out
there that lack a backup signal restorer.
Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/45
2
1
Binary packages for various distributions will be available from:
https://www.winehq.org/download
Summary since last release
* Rebased to current wine 7.8 (550 patches are applied to wine vanilla)
Upstreamed (Either directly from staging or fixed with a similar patch).
* server: Create message queue and thread input in set_key_state.
* server: Lock thread input keystate whenever it is modified.
* server: Create message queue and thread input in get_key_state.
Added:
* [48121] Improve Alt+tab for unity games.
Updated:
* winex11-_NET_ACTIVE_WINDOW
* user32-Mouse_Message_Hwnd
* user32-rawinput-mouse
* api-iteration-tokens
Where can you help
* Run Steam/Battle.net/GOG/UPlay/Epic
* Test your favorite game.
* Test your favorite applications.
* Improve staging patches and get them accepted upstream.
As always, if you find a bug, please report it via
https://bugs.winehq.org
Best Regards
Alistair.
1
0
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
v2: Fix format string for DWORD parameter.
dlls/kernel32/kernel32.spec | 2 +-
dlls/kernelbase/debug.c | 8 ++++++++
dlls/kernelbase/kernelbase.spec | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index bc5913b6d7d..b7da3b68db7 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1197,7 +1197,7 @@
@ stdcall -import QueueUserAPC(ptr long long)
@ stdcall -import QueueUserWorkItem(ptr ptr long)
@ stdcall -import RaiseException(long long long ptr)
-# @ stub RaiseFailFastException
+@ stdcall -import RaiseFailFastException(ptr ptr long)
@ stdcall -import ReadConsoleA(long ptr long ptr ptr)
@ stdcall -import ReadConsoleInputA(long ptr long ptr)
@ stub ReadConsoleInputExA
diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
index 6848d5af125..9e954e3ffbe 100644
--- a/dlls/kernelbase/debug.c
+++ b/dlls/kernelbase/debug.c
@@ -303,6 +303,14 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou
}
__ASM_STDCALL_IMPORT(RaiseException,16)
+/*******************************************************************
+ * RaiseFailFastException (kernelbase.@)
+ */
+void WINAPI DECLSPEC_HOTPATCH RaiseFailFastException( EXCEPTION_RECORD *record, CONTEXT *context, DWORD flags )
+{
+ FIXME( "(%p, %p, %ld) stub\n", record, context, flags );
+ TerminateProcess( GetCurrentProcess(), STATUS_FAIL_FAST_EXCEPTION );
+}
/***********************************************************************
* SetUnhandledExceptionFilter (kernelbase.@)
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 854797ddeb0..ab580e03594 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1264,7 +1264,7 @@
# @ stub QuirkIsEnabledForPackage4
# @ stub QuirkIsEnabledForProcess
@ stdcall RaiseException(long long long ptr)
-# @ stub RaiseFailFastException
+@ stdcall RaiseFailFastException(ptr ptr long)
@ stdcall ReOpenFile(ptr long long long)
@ stdcall ReadConsoleA(long ptr long ptr ptr)
@ stdcall ReadConsoleInputA(long ptr long ptr)
--
2.32.0 (Apple Git-132)
1
0
I had these in my patch repo for quite a while.
Patch 1 shouldn't need explanation.
The problem fixed by patch 2 and 3 is that
sizeof(KEY_{BASIC,VALUE_PARTIAL,FULL}_INFORMATION) are all slightly bigger
than the actual minimum size required to get all the requested info, because
those structs include an array of size 1 as their last member, which is
intended to be a variable length array.
Fixing these size calculations removes one allocation in wineserver and
reduces the amount of data transmitted by 1 - 2 bytes.
Patch 4 just reduces the amount of data transmitted from wineserver for each
update_display_cache_from_registry call, which is called every time the
display device lists are locked.
Torge Matthies (4):
ntdll: Use correct output buffer size in RtlpNtEnumerateSubKey.
ntdll: Calculate buffer sizes from registry structs correctly.
win32u: Calculate buffer sizes from registry structs correctly.
win32u: Query basic instead of full key information to get the
LastWriteTime.
dlls/ntdll/reg.c | 10 +++++-----
dlls/ntdll/unix/system.c | 2 +-
dlls/win32u/sysparams.c | 7 ++++---
3 files changed, 10 insertions(+), 9 deletions(-)
--
2.36.0
1
4
[PATCH v2 1/2] jscript: Handle detached scope objects 'this' in all calls.
by Gabriel Ivăncescu 06 May '22
by Gabriel Ivăncescu 06 May '22
06 May '22
Not just for interpreted functions. And set to undefined in ES5+ modes.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
Supersedes 234852-234853.
dlls/jscript/engine.c | 12 ++++--------
dlls/jscript/function.c | 30 ++++++++++++++++++++++++------
dlls/jscript/tests/api.js | 2 ++
dlls/jscript/tests/lang.js | 3 +++
dlls/mshtml/tests/es5.js | 15 +++++++++++++++
5 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 73b9d86..83005eb 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -3300,16 +3300,12 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi
}
}
- /* ECMA-262 3rd Edition 11.2.3.7 */
+ /* FIXME: Workaround for ES5 mode because we don't have the JS global == window yet */
if(this_obj) {
- jsdisp_t *jsthis;
+ jsdisp_t *jsthis = to_jsdisp(this_obj);
- jsthis = iface_to_jsdisp(this_obj);
- if(jsthis) {
- if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE)
- this_obj = NULL;
- jsdisp_release(jsthis);
- }
+ if(jsthis && jsthis->builtin_info->class == JSCLASS_GLOBAL)
+ this_obj = NULL;
}
if(ctx->call_ctx && (flags & EXEC_EVAL)) {
diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index 12511bb..942ec9d 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -247,6 +247,24 @@ void detach_arguments_object(jsdisp_t *args_disp)
jsdisp_release(frame->arguments_obj);
}
+/* ECMA-262 3rd Edition 11.2.3.7
+ ECMA-262 5.1 Edition 11.2.3.6 */
+static inline HRESULT call(script_ctx_t *ctx, FunctionInstance *function, jsval_t vthis, unsigned flags,
+ unsigned argc, jsval_t *argv, jsval_t *r)
+{
+ jsdisp_t *jsthis;
+
+ if(is_object_instance(vthis) && (jsthis = to_jsdisp(get_object(vthis)))) {
+ if(ctx->version < SCRIPTLANGUAGEVERSION_ES5) {
+ if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE)
+ vthis = jsval_null();
+ }else if(jsthis->builtin_info->class == JSCLASS_NONE)
+ vthis = jsval_undefined();
+ }
+
+ return function->vtbl->call(ctx, function, vthis, flags, argc, argv, r);
+}
+
HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)
{
FunctionInstance *function;
@@ -256,7 +274,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi
assert(is_class(func_this, JSCLASS_FUNCTION));
function = function_from_jsdisp(func_this);
- return function->vtbl->call(function->dispex.ctx, function, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r);
+ return call(function->dispex.ctx, function, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r);
}
static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
@@ -378,7 +396,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi
if(SUCCEEDED(hres)) {
if(function) {
- hres = function->vtbl->call(ctx, function, this_val, flags, cnt, args, r);
+ hres = call(ctx, function, this_val, flags, cnt, args, r);
}else {
jsval_t res;
hres = disp_call_value(ctx, get_object(vthis), is_object_instance(this_val) ? get_object(this_val) : NULL,
@@ -429,7 +447,7 @@ static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig
cnt = argc-1;
}
- hres = function->vtbl->call(ctx, function, this_val, flags, cnt, argv + 1, r);
+ hres = call(ctx, function, this_val, flags, cnt, argv + 1, r);
jsval_release(this_val);
return hres;
@@ -483,7 +501,7 @@ HRESULT Function_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar
return E_FAIL;
}
- return function->vtbl->call(ctx, function, vthis, flags, argc, argv, r);
+ return call(ctx, function, vthis, flags, argc, argv, r);
}
HRESULT Function_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
@@ -839,8 +857,8 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsva
memcpy(call_args + function->argc, argv, argc * sizeof(*call_args));
}
- hres = function->target->vtbl->call(ctx, function->target, function->this ? jsval_disp(function->this) : jsval_null(),
- flags, call_argc, call_args, r);
+ hres = call(ctx, function->target, function->this ? jsval_disp(function->this) : jsval_null(),
+ flags, call_argc, call_args, r);
heap_free(call_args);
return hres;
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index e81bbea..1368f39 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -2634,6 +2634,8 @@ testException(function() {null.toString();}, "E_OBJECT_EXPECTED");
testException(function() {RegExp.prototype.toString.call(new Object());}, "E_REGEXP_EXPECTED");
testException(function() {/a/.lastIndex();}, "E_NOT_FUNC");
testException(function() {"a".length();}, "E_NOT_FUNC");
+testException(function() {((function() { var f = Number.prototype.toString; return (function() { return f(); }); })())();}, "E_NOT_NUM");
+testException(function() {((function() { var f = Object.prototype.hasOwnProperty; return (function() { return f("f"); }); })())();}, "E_OBJECT_EXPECTED");
testException(function() { return arguments.callee(); }, "E_STACK_OVERFLOW");
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index cf08423..67e4576 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -310,6 +310,9 @@ argumentsTest();
ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments);
})(1,2);
+tmp = ((function() { var f = function() {return this}; return (function() { return f(); }); })())();
+ok(tmp === this, "detached scope function call this != global this");
+
tmp = (function() {1;})();
ok(tmp === undefined, "tmp = " + tmp);
tmp = eval("1;");
diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js
index 8238e5d..fb756ac 100644
--- a/dlls/mshtml/tests/es5.js
+++ b/dlls/mshtml/tests/es5.js
@@ -1784,6 +1784,21 @@ sync_test("let scope instances", function() {
ok(f() == 2, "f() = " + f());
});
+sync_test("builtins detached scope this", function() {
+ try {
+ ((function() { var f = Number.prototype.toString; return (function() { return f(); }); })())();
+ }catch(ex) {
+ var n = ex.number >>> 0;
+ ok(n === JS_E_NUMBER_EXPECTED, "Number.toString threw " + n);
+ }
+
+ var r = ((function() { var f = Object.prototype.toString; return (function() { return f(); }); })())();
+ ok(r === "[object Undefined]", "Object.toString returned " + r);
+
+ var r = ((function() { return (function() { return this; }); })())();
+ ok(r === window, "detached scope this = " + r);
+});
+
sync_test("functions scope", function() {
function f(){ return 1; }
function f(){ return 2; }
--
2.34.1
2
3
Re: [PATCH v3 0/9] MR44: winex11: PE conversion - approved
by Alexandre Julliard (ï¼ julliard) 06 May '22
by Alexandre Julliard (ï¼ julliard) 06 May '22
06 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/44
1
0
Re: [PATCH v2 0/1] MR42: dllhost: Try to load the dll server's factory at the start. - approved
by Alexandre Julliard (ï¼ julliard) 06 May '22
by Alexandre Julliard (ï¼ julliard) 06 May '22
06 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/42
1
0
Re: [PATCH v6 0/10] MR22: winegstreamer: Implement more sample attributes and timestamps. - approved
by Alexandre Julliard (ï¼ julliard) 06 May '22
by Alexandre Julliard (ï¼ julliard) 06 May '22
06 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/22
1
0
06 May '22
v3:
Add missing AddRef() to ::SetImage(). Thanks Nikolay.
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/d2d1/brush.c | 302 ++++++++++++++++++++++++++++++++++++++-
dlls/d2d1/d2d1_private.h | 11 ++
dlls/d2d1/device.c | 14 +-
3 files changed, 323 insertions(+), 4 deletions(-)
diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index 14d9cb54e92..c4ca8775df2 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -1101,6 +1101,245 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
return S_OK;
}
+static inline struct d2d_brush *impl_from_ID2D1ImageBrush(ID2D1ImageBrush *iface)
+{
+ return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_image_brush_QueryInterface(ID2D1ImageBrush *iface,
+ REFIID iid, void **out)
+{
+ TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+ if (IsEqualGUID(iid, &IID_ID2D1ImageBrush)
+ || IsEqualGUID(iid, &IID_ID2D1Brush)
+ || IsEqualGUID(iid, &IID_ID2D1Resource)
+ || IsEqualGUID(iid, &IID_IUnknown))
+ {
+ ID2D1ImageBrush_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_AddRef(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedIncrement(&brush->refcount);
+
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_Release(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedDecrement(&brush->refcount);
+
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
+
+ if (!refcount)
+ {
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ d2d_brush_destroy(brush);
+ }
+
+ return refcount;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetFactory(ID2D1ImageBrush *iface,
+ ID2D1Factory **factory)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, factory %p.\n", iface, factory);
+
+ ID2D1Factory_AddRef(*factory = brush->factory);
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetOpacity(ID2D1ImageBrush *iface, float opacity)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, opacity %.8e.\n", iface, opacity);
+
+ brush->opacity = opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetTransform(ID2D1ImageBrush *iface,
+ const D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ brush->transform = *transform;
+}
+
+static float STDMETHODCALLTYPE d2d_image_brush_GetOpacity(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetTransform(ID2D1ImageBrush *iface,
+ D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ *transform = brush->transform;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetImage(ID2D1ImageBrush *iface, ID2D1Image *image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if (image)
+ ID2D1Image_AddRef(image);
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ brush->u.image.image = image;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeX(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_x = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeY(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_y = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetInterpolationMode(ID2D1ImageBrush *iface,
+ D2D1_INTERPOLATION_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.interpolation_mode = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetSourceRectangle(ID2D1ImageBrush *iface, const D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %s stub!\n", iface, debug_d2d_rect_f(rect));
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetImage(ID2D1ImageBrush *iface, ID2D1Image **image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if ((*image = (ID2D1Image *)&brush->u.image.image))
+ ID2D1Image_AddRef(*image);
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeX(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_x;
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeY(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_y;
+}
+
+static D2D1_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_image_brush_GetInterpolationMode(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.interpolation_mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetSourceRectangle(ID2D1ImageBrush *iface, D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %p stub!\n", iface, rect);
+}
+
+static const struct ID2D1ImageBrushVtbl d2d_image_brush_vtbl =
+{
+ d2d_image_brush_QueryInterface,
+ d2d_image_brush_AddRef,
+ d2d_image_brush_Release,
+ d2d_image_brush_GetFactory,
+ d2d_image_brush_SetOpacity,
+ d2d_image_brush_SetTransform,
+ d2d_image_brush_GetOpacity,
+ d2d_image_brush_GetTransform,
+ d2d_image_brush_SetImage,
+ d2d_image_brush_SetExtendModeX,
+ d2d_image_brush_SetExtendModeY,
+ d2d_image_brush_SetInterpolationMode,
+ d2d_image_brush_SetSourceRectangle,
+ d2d_image_brush_GetImage,
+ d2d_image_brush_GetExtendModeX,
+ d2d_image_brush_GetExtendModeY,
+ d2d_image_brush_GetInterpolationMode,
+ d2d_image_brush_GetSourceRectangle
+};
+
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush)
+{
+ if (!(*brush = heap_alloc_zero(sizeof(**brush))))
+ return E_OUTOFMEMORY;
+
+ d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP,
+ brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
+ if (((*brush)->u.image.image = image))
+ ID2D1Image_AddRef((*brush)->u.image.image);
+ if (image_brush_desc)
+ {
+ (*brush)->u.image.extend_mode_x = image_brush_desc->extendModeX;
+ (*brush)->u.image.extend_mode_y = image_brush_desc->extendModeY;
+ (*brush)->u.image.interpolation_mode = image_brush_desc->interpolationMode;
+ }
+ else
+ {
+ (*brush)->u.image.extend_mode_x = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.extend_mode_y = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.interpolation_mode = D2D1_INTERPOLATION_MODE_LINEAR;
+ }
+
+ TRACE("Created brush %p.\n", *brush);
+ return S_OK;
+}
+
struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
{
if (!iface)
@@ -1108,7 +1347,8 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
assert(iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl
- || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl);
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
}
@@ -1288,6 +1528,62 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con
ID3D11DeviceContext_Release(d3d_context);
}
+static void d2d_brush_bind_image(struct d2d_brush *brush, struct d2d_device_context *context,
+ unsigned int brush_idx)
+{
+ ID3D11SamplerState **sampler_state;
+ ID3D11DeviceContext *d3d_context;
+ ID2D1Bitmap *bitmap;
+ struct d2d_bitmap *src_impl;
+ HRESULT hr;
+
+ hr = ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&bitmap);
+ if (FAILED(hr))
+ {
+ FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n");
+ return;
+ }
+
+ src_impl = unsafe_impl_from_ID2D1Bitmap(bitmap);
+
+ ID3D11Device1_GetImmediateContext(context->d3d_device, &d3d_context);
+ ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &src_impl->srv);
+
+ sampler_state = &context->sampler_states
+ [brush->u.image.interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT]
+ [brush->u.image.extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT]
+ [brush->u.image.extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT];
+
+ if (!*sampler_state)
+ {
+ D3D11_SAMPLER_DESC sampler_desc;
+
+ if (brush->u.image.interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR)
+ sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
+ else
+ sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+ sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.image.extend_mode_x);
+ sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.image.extend_mode_y);
+ sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
+ sampler_desc.MipLODBias = 0.0f;
+ sampler_desc.MaxAnisotropy = 0;
+ sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER;
+ sampler_desc.BorderColor[0] = 0.0f;
+ sampler_desc.BorderColor[1] = 0.0f;
+ sampler_desc.BorderColor[2] = 0.0f;
+ sampler_desc.BorderColor[3] = 0.0f;
+ sampler_desc.MinLOD = 0.0f;
+ sampler_desc.MaxLOD = 0.0f;
+
+ if (FAILED(hr = ID3D11Device1_CreateSamplerState(context->d3d_device, &sampler_desc, sampler_state)))
+ ERR("Failed to create sampler state, hr %#lx.\n", hr);
+ }
+
+ ID3D11DeviceContext_PSSetSamplers(d3d_context, brush_idx, 1, sampler_state);
+ ID3D11DeviceContext_Release(d3d_context);
+ ID2D1Bitmap_Release(bitmap);
+}
+
void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx)
{
switch (brush->type)
@@ -1307,6 +1603,10 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context
d2d_brush_bind_bitmap(brush, context, brush_idx);
break;
+ case D2D_BRUSH_TYPE_IMAGE:
+ d2d_brush_bind_image(brush, context, brush_idx);
+ break;
+
default:
FIXME("Unhandled brush type %#x.\n", brush->type);
break;
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index aa8e8569455..4d4fd16ac00 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -41,6 +41,7 @@ enum d2d_brush_type
D2D_BRUSH_TYPE_LINEAR,
D2D_BRUSH_TYPE_RADIAL,
D2D_BRUSH_TYPE_BITMAP,
+ D2D_BRUSH_TYPE_IMAGE,
D2D_BRUSH_TYPE_COUNT,
};
@@ -318,6 +319,13 @@ struct d2d_brush
D2D1_EXTEND_MODE extend_mode_y;
D2D1_INTERPOLATION_MODE interpolation_mode;
} bitmap;
+ struct
+ {
+ ID2D1Image *image;
+ D2D1_EXTEND_MODE extend_mode_x;
+ D2D1_EXTEND_MODE extend_mode_y;
+ D2D1_INTERPOLATION_MODE interpolation_mode;
+ } image;
} u;
};
@@ -332,6 +340,9 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
struct d2d_brush **brush) DECLSPEC_HIDDEN;
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush) DECLSPEC_HIDDEN;
void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context,
unsigned int brush_idx) DECLSPEC_HIDDEN;
BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) DECLSPEC_HIDDEN;
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 13c99458cfa..c047f781410 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1929,10 +1929,18 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device
ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc,
const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush)
{
- FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n",
- iface, image, image_brush_desc, brush_desc, brush);
+ struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
+ struct d2d_brush *object;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p.\n", iface, image, image_brush_desc,
+ brush_desc, brush);
+
+ if (SUCCEEDED(hr = d2d_image_brush_create(context->factory, image, image_brush_desc,
+ brush_desc, &object)))
+ *brush = (ID2D1ImageBrush *)&object->ID2D1Brush_iface;
+
+ return hr;
}
static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface,
--
2.35.3
1
0
[PATCH v5 0/10] MR22: winegstreamer: Implement more sample attributes and timestamps.
by Rémi Bernon (ï¼ rbernon) 06 May '22
by Rémi Bernon (ï¼ rbernon) 06 May '22
06 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183
--
v5: winegstreamer: Implement Receive() for MPEG audio decoder sink.
quartz/tests: Add tests for MPEG audio decoder sample processing.
winegstreamer: Create wg_transform in MPEG audio decoder.
winegstreamer: Check whether transform is supported when creating MPEG audio decoder.
quartz/tests: Don't fail tests when MPEG audio decoder creation fails.
winegstreamer: Support MPEG-1 audio in wg_transform.
winegstreamer: Convert MPEG-1 audio to a major type.
winegstreamer: Only resize buffer when read is incomplete.
winegstreamer: Support the MFSampleExtension_CleanPoint sample attribute.
winegstreamer: Add timestamp and duration to struct wg_sample.
https://gitlab.winehq.org/wine/wine/-/merge_requests/22
4
14
06 May '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/d2d1/brush.c | 300 ++++++++++++++++++++++++++++++++++++++-
dlls/d2d1/d2d1_private.h | 11 ++
dlls/d2d1/device.c | 14 +-
3 files changed, 321 insertions(+), 4 deletions(-)
diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index 14d9cb54e92..704e6275fd5 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -1101,6 +1101,243 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
return S_OK;
}
+static inline struct d2d_brush *impl_from_ID2D1ImageBrush(ID2D1ImageBrush *iface)
+{
+ return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d2d_image_brush_QueryInterface(ID2D1ImageBrush *iface,
+ REFIID iid, void **out)
+{
+ TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
+
+ if (IsEqualGUID(iid, &IID_ID2D1ImageBrush)
+ || IsEqualGUID(iid, &IID_ID2D1Brush)
+ || IsEqualGUID(iid, &IID_ID2D1Resource)
+ || IsEqualGUID(iid, &IID_IUnknown))
+ {
+ ID2D1ImageBrush_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_AddRef(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedIncrement(&brush->refcount);
+
+ TRACE("%p increasing refcount to %lu.\n", iface, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d2d_image_brush_Release(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+ ULONG refcount = InterlockedDecrement(&brush->refcount);
+
+ TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
+
+ if (!refcount)
+ {
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ d2d_brush_destroy(brush);
+ }
+
+ return refcount;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetFactory(ID2D1ImageBrush *iface,
+ ID2D1Factory **factory)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, factory %p.\n", iface, factory);
+
+ ID2D1Factory_AddRef(*factory = brush->factory);
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetOpacity(ID2D1ImageBrush *iface, float opacity)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, opacity %.8e.\n", iface, opacity);
+
+ brush->opacity = opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetTransform(ID2D1ImageBrush *iface,
+ const D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ brush->transform = *transform;
+}
+
+static float STDMETHODCALLTYPE d2d_image_brush_GetOpacity(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->opacity;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetTransform(ID2D1ImageBrush *iface,
+ D2D1_MATRIX_3X2_F *transform)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, transform %p.\n", iface, transform);
+
+ *transform = brush->transform;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetImage(ID2D1ImageBrush *iface, ID2D1Image *image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if (brush->u.image.image)
+ ID2D1Image_Release(brush->u.image.image);
+ brush->u.image.image = image;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeX(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_x = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeY(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.extend_mode_y = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetInterpolationMode(ID2D1ImageBrush *iface,
+ D2D1_INTERPOLATION_MODE mode)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, mode %#x.\n", iface, mode);
+
+ brush->u.image.interpolation_mode = mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_SetSourceRectangle(ID2D1ImageBrush *iface, const D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %s stub!\n", iface, debug_d2d_rect_f(rect));
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetImage(ID2D1ImageBrush *iface, ID2D1Image **image)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p, image %p.\n", iface, image);
+
+ if ((*image = (ID2D1Image *)&brush->u.image.image))
+ ID2D1Image_AddRef(*image);
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeX(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_x;
+}
+
+static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeY(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.extend_mode_y;
+}
+
+static D2D1_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_image_brush_GetInterpolationMode(ID2D1ImageBrush *iface)
+{
+ struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return brush->u.image.interpolation_mode;
+}
+
+static void STDMETHODCALLTYPE d2d_image_brush_GetSourceRectangle(ID2D1ImageBrush *iface, D2D1_RECT_F *rect)
+{
+ FIXME("iface %p, rect %p stub!\n", iface, rect);
+}
+
+static const struct ID2D1ImageBrushVtbl d2d_image_brush_vtbl =
+{
+ d2d_image_brush_QueryInterface,
+ d2d_image_brush_AddRef,
+ d2d_image_brush_Release,
+ d2d_image_brush_GetFactory,
+ d2d_image_brush_SetOpacity,
+ d2d_image_brush_SetTransform,
+ d2d_image_brush_GetOpacity,
+ d2d_image_brush_GetTransform,
+ d2d_image_brush_SetImage,
+ d2d_image_brush_SetExtendModeX,
+ d2d_image_brush_SetExtendModeY,
+ d2d_image_brush_SetInterpolationMode,
+ d2d_image_brush_SetSourceRectangle,
+ d2d_image_brush_GetImage,
+ d2d_image_brush_GetExtendModeX,
+ d2d_image_brush_GetExtendModeY,
+ d2d_image_brush_GetInterpolationMode,
+ d2d_image_brush_GetSourceRectangle
+};
+
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush)
+{
+ if (!(*brush = heap_alloc_zero(sizeof(**brush))))
+ return E_OUTOFMEMORY;
+
+ d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP,
+ brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
+ if (((*brush)->u.image.image = image))
+ ID2D1Image_AddRef((*brush)->u.image.image);
+ if (image_brush_desc)
+ {
+ (*brush)->u.image.extend_mode_x = image_brush_desc->extendModeX;
+ (*brush)->u.image.extend_mode_y = image_brush_desc->extendModeY;
+ (*brush)->u.image.interpolation_mode = image_brush_desc->interpolationMode;
+ }
+ else
+ {
+ (*brush)->u.image.extend_mode_x = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.extend_mode_y = D2D1_EXTEND_MODE_CLAMP;
+ (*brush)->u.image.interpolation_mode = D2D1_INTERPOLATION_MODE_LINEAR;
+ }
+
+ TRACE("Created brush %p.\n", *brush);
+ return S_OK;
+}
+
struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
{
if (!iface)
@@ -1108,7 +1345,8 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
assert(iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl
|| iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl
- || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl);
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl
+ || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_image_brush_vtbl);
return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
}
@@ -1288,6 +1526,62 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con
ID3D11DeviceContext_Release(d3d_context);
}
+static void d2d_brush_bind_image(struct d2d_brush *brush, struct d2d_device_context *context,
+ unsigned int brush_idx)
+{
+ ID3D11SamplerState **sampler_state;
+ ID3D11DeviceContext *d3d_context;
+ ID2D1Bitmap *bitmap;
+ struct d2d_bitmap *src_impl;
+ HRESULT hr;
+
+ hr = ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&bitmap);
+ if (FAILED(hr))
+ {
+ FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n");
+ return;
+ }
+
+ src_impl = unsafe_impl_from_ID2D1Bitmap(bitmap);
+
+ ID3D11Device1_GetImmediateContext(context->d3d_device, &d3d_context);
+ ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &src_impl->srv);
+
+ sampler_state = &context->sampler_states
+ [brush->u.image.interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT]
+ [brush->u.image.extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT]
+ [brush->u.image.extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT];
+
+ if (!*sampler_state)
+ {
+ D3D11_SAMPLER_DESC sampler_desc;
+
+ if (brush->u.image.interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR)
+ sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
+ else
+ sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+ sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.image.extend_mode_x);
+ sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.image.extend_mode_y);
+ sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
+ sampler_desc.MipLODBias = 0.0f;
+ sampler_desc.MaxAnisotropy = 0;
+ sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER;
+ sampler_desc.BorderColor[0] = 0.0f;
+ sampler_desc.BorderColor[1] = 0.0f;
+ sampler_desc.BorderColor[2] = 0.0f;
+ sampler_desc.BorderColor[3] = 0.0f;
+ sampler_desc.MinLOD = 0.0f;
+ sampler_desc.MaxLOD = 0.0f;
+
+ if (FAILED(hr = ID3D11Device1_CreateSamplerState(context->d3d_device, &sampler_desc, sampler_state)))
+ ERR("Failed to create sampler state, hr %#lx.\n", hr);
+ }
+
+ ID3D11DeviceContext_PSSetSamplers(d3d_context, brush_idx, 1, sampler_state);
+ ID3D11DeviceContext_Release(d3d_context);
+ ID2D1Bitmap_Release(bitmap);
+}
+
void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx)
{
switch (brush->type)
@@ -1307,6 +1601,10 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context
d2d_brush_bind_bitmap(brush, context, brush_idx);
break;
+ case D2D_BRUSH_TYPE_IMAGE:
+ d2d_brush_bind_image(brush, context, brush_idx);
+ break;
+
default:
FIXME("Unhandled brush type %#x.\n", brush->type);
break;
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index aa8e8569455..4d4fd16ac00 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -41,6 +41,7 @@ enum d2d_brush_type
D2D_BRUSH_TYPE_LINEAR,
D2D_BRUSH_TYPE_RADIAL,
D2D_BRUSH_TYPE_BITMAP,
+ D2D_BRUSH_TYPE_IMAGE,
D2D_BRUSH_TYPE_COUNT,
};
@@ -318,6 +319,13 @@ struct d2d_brush
D2D1_EXTEND_MODE extend_mode_y;
D2D1_INTERPOLATION_MODE interpolation_mode;
} bitmap;
+ struct
+ {
+ ID2D1Image *image;
+ D2D1_EXTEND_MODE extend_mode_x;
+ D2D1_EXTEND_MODE extend_mode_y;
+ D2D1_INTERPOLATION_MODE interpolation_mode;
+ } image;
} u;
};
@@ -332,6 +340,9 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
struct d2d_brush **brush) DECLSPEC_HIDDEN;
+HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
+ const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc,
+ struct d2d_brush **brush) DECLSPEC_HIDDEN;
void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context,
unsigned int brush_idx) DECLSPEC_HIDDEN;
BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) DECLSPEC_HIDDEN;
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 13c99458cfa..c047f781410 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1929,10 +1929,18 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device
ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc,
const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush)
{
- FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n",
- iface, image, image_brush_desc, brush_desc, brush);
+ struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
+ struct d2d_brush *object;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p.\n", iface, image, image_brush_desc,
+ brush_desc, brush);
+
+ if (SUCCEEDED(hr = d2d_image_brush_create(context->factory, image, image_brush_desc,
+ brush_desc, &object)))
+ *brush = (ID2D1ImageBrush *)&object->ID2D1Brush_iface;
+
+ return hr;
}
static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface,
--
2.35.3
2
2
[PATCH v2] msvcr110/tests: Fix setlocale test failure on systems with UTF-8 encoding enabled.
by Piotr Caban 06 May '22
by Piotr Caban 06 May '22
06 May '22
It's a BETA setting so I'm not sure if it's a valid test configuration.
The result makes sense since msvcr110 explicitly rejects UTF-8 encoding.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52937
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
v2:
- mark the test as todo_wine
dlls/msvcr110/tests/msvcr110.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
1
0
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
dlls/kernel32/kernel32.spec | 2 +-
dlls/kernelbase/debug.c | 8 ++++++++
dlls/kernelbase/kernelbase.spec | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index bc5913b6d7d..b7da3b68db7 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1197,7 +1197,7 @@
@ stdcall -import QueueUserAPC(ptr long long)
@ stdcall -import QueueUserWorkItem(ptr ptr long)
@ stdcall -import RaiseException(long long long ptr)
-# @ stub RaiseFailFastException
+@ stdcall -import RaiseFailFastException(ptr ptr long)
@ stdcall -import ReadConsoleA(long ptr long ptr ptr)
@ stdcall -import ReadConsoleInputA(long ptr long ptr)
@ stub ReadConsoleInputExA
diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
index 6848d5af125..9e9c53ccdfc 100644
--- a/dlls/kernelbase/debug.c
+++ b/dlls/kernelbase/debug.c
@@ -303,6 +303,14 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou
}
__ASM_STDCALL_IMPORT(RaiseException,16)
+/*******************************************************************
+ * RaiseFailFastException (kernelbase.@)
+ */
+void WINAPI DECLSPEC_HOTPATCH RaiseFailFastException( EXCEPTION_RECORD *record, CONTEXT *context, DWORD flags )
+{
+ FIXME( "(%p, %p, %d) stub\n", record, context, flags );
+ TerminateProcess( GetCurrentProcess(), STATUS_FAIL_FAST_EXCEPTION );
+}
/***********************************************************************
* SetUnhandledExceptionFilter (kernelbase.@)
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 854797ddeb0..ab580e03594 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1264,7 +1264,7 @@
# @ stub QuirkIsEnabledForPackage4
# @ stub QuirkIsEnabledForProcess
@ stdcall RaiseException(long long long ptr)
-# @ stub RaiseFailFastException
+@ stdcall RaiseFailFastException(ptr ptr long)
@ stdcall ReOpenFile(ptr long long long)
@ stdcall ReadConsoleA(long ptr long ptr ptr)
@ stdcall ReadConsoleInputA(long ptr long ptr)
--
2.32.0 (Apple Git-132)
2
1
[PATCH] msvcr110/tests: Fix setlocale test failure on systems with UTF-8 encoding enabled.
by Piotr Caban 06 May '22
by Piotr Caban 06 May '22
06 May '22
It's a BETA setting so I'm not sure if it's a valid test configuration.
The result makes sense since msvcr110 explicitly rejects UTF-8 encoding.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52937
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
dlls/msvcr110/tests/msvcr110.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
2
1
[PATCH v2 0/6] MR43: windows.gaming.input: Fixes and more FF implementation.
by Rémi Bernon (ï¼ rbernon) 06 May '22
by Rémi Bernon (ï¼ rbernon) 06 May '22
06 May '22
--
v2: windows.gaming.input: Implement stub ConstantForceEffect runtimeclass factory.
windows.gaming.input: Register Windows.Gaming.Input.ForceFeedback classes.
windows.gaming.input: Use case insensitive compare when looking for devices.
windows.gaming.input: Reset spare CS pointer before deleting it.
windows.gaming.input: AddRef on the returned async handler in get_Completed.
dinput/tests: Wait for the expected report to actually be pending.
https://gitlab.winehq.org/wine/wine/-/merge_requests/43
3
9
[PATCH v4 0/3] MR22: winegstreamer: Implement more sample attributes and timestamps.
by Rémi Bernon (ï¼ rbernon) 06 May '22
by Rémi Bernon (ï¼ rbernon) 06 May '22
06 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183
--
v4: winegstreamer: Only resize buffer when read is incomplete.
winegstreamer: Support the MFSampleExtension_CleanPoint sample attribute.
winegstreamer: Add timestamp and duration to struct wg_sample.
https://gitlab.winehq.org/wine/wine/-/merge_requests/22
4
7
The first patch is a bit of a shortcut. I have a better solution in works, but it's not yet ready. It shouldn't matter until we use 32on64 for NtUserCreateWindowEx anyway.
--
v2: winex11: Don't use unicode.h.
winex11: Build with msvcrt.
winex11: Move user driver to unixlib.
winex11: Use wcsicmp for string comparison.
include: Don't use DECLSPEC_HIDDEN for WINGDIAPI and WINUSERAPI in unuxlibs.
winex11: Move LoadIcon call to dllmain.
winex11: Use unixlib interface for x11drv_is_system_module.
winex11: Directly use NtUserCreateWindowEx.
win32u: Allow NULL cbtc in NtUserCreateWindowEx.
https://gitlab.winehq.org/wine/wine/-/merge_requests/44
3
10
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/kernel32/kernel32.spec | 1 +
dlls/kernelbase/kernelbase.spec | 2 +-
dlls/kernelbase/memory.c | 9 +++++++++
include/winbase.h | 1 +
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index bc5913b6d7d..ca339181e32 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1557,6 +1557,7 @@
@ stdcall -import UnlockFile(long long long long long)
@ stdcall -import UnlockFileEx(long long long long ptr)
@ stdcall -import UnmapViewOfFile(ptr)
+@ stdcall -import UnmapViewOfFileEx(ptr long)
# @ stub UnregisterApplicationRecoveryCallback
@ stdcall UnregisterApplicationRestart()
# @ stub UnregisterConsoleIME
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 854797ddeb0..791c3603918 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1654,7 +1654,7 @@
@ stdcall UnlockFileEx(long long long long ptr)
@ stdcall UnmapViewOfFile(ptr)
@ stdcall UnmapViewOfFile2(long ptr long)
-# @ stub UnmapViewOfFileEx
+@ stdcall UnmapViewOfFileEx(ptr long)
# @ stub UnregisterBadMemoryNotification
# @ stub UnregisterGPNotificationInternal
# @ stub UnregisterStateChangeNotification
diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index 87c07887482..35e6d4e3b8c 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -312,6 +312,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFile2( HANDLE process, void *addr, ULON
}
+/***********************************************************************
+ * UnmapViewOfFileEx (kernelbase.@)
+ */
+BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFileEx( void *addr, ULONG flags )
+{
+ return set_ntstatus( NtUnmapViewOfSectionEx( GetCurrentProcess(), addr, flags ));
+}
+
+
/***********************************************************************
* VirtualAlloc (kernelbase.@)
*/
diff --git a/include/winbase.h b/include/winbase.h
index 2b109af19df..9fbaa466b54 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -2742,6 +2742,7 @@ WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED
#define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle))
WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID);
WINBASEAPI BOOL WINAPI UnmapViewOfFile2(HANDLE,PVOID,ULONG);
+WINBASEAPI BOOL WINAPI UnmapViewOfFileEx(PVOID,ULONG);
WINBASEAPI BOOL WINAPI UmsThreadYield(void *);
WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void);
WINBASEAPI BOOL WINAPI UnregisterWait(HANDLE);
--
2.35.1
1
0
V2: cast to UINT* instead of UINT32*
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/winealsa.drv/alsa.c | 4 ++--
dlls/winealsa.drv/mmdevdrv.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 8b6a87aa864c..33b405a884cf 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -637,7 +637,7 @@ static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt)
return format;
}
-static int alsa_channel_index(DWORD flag)
+static int alsa_channel_index(UINT flag)
{
switch(flag){
case SPEAKER_FRONT_LEFT:
@@ -702,7 +702,7 @@ static HRESULT map_channels(EDataFlow flow, const WAVEFORMATEX *fmt, int *alsa_c
if(flow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){
WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt;
- DWORD mask, flag = SPEAKER_FRONT_LEFT;
+ UINT mask, flag = SPEAKER_FRONT_LEFT;
UINT i = 0;
if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 1a99f0ac26c9..c2ccfe0000e8 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -1363,7 +1363,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface,
params.stream = This->stream;
params.data = data;
params.frames = frames;
- params.flags = flags;
+ params.flags = (UINT*)flags;
params.devpos = devpos;
params.qpcpos = qpcpos;
2
3
06 May '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/wineoss.drv/mmdevdrv.c | 2 +-
dlls/wineoss.drv/ossmidi.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 9c1261ce05cc..0a7c2011c63f 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -1315,7 +1315,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface,
params.stream = This->stream;
params.data = data;
params.frames = frames;
- params.flags = flags;
+ params.flags = (UINT*)flags;
params.devpos = devpos;
params.qpcpos = qpcpos;
OSS_CALL(get_capture_buffer, ¶ms);
diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c
index 09eed8085c42..b6fde8175ae8 100644
--- a/dlls/wineoss.drv/ossmidi.c
+++ b/dlls/wineoss.drv/ossmidi.c
@@ -396,8 +396,8 @@ static UINT midi_init(void)
if (sinfo.capabilities & SYNTH_CAP_INPUT)
FIXME("Synthesizer supports MIDI in. Not yet supported.\n");
- TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%lx\n",
- i, sinfo.synth_type, sinfo.synth_subtype, (long)sinfo.capabilities);
+ TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%x\n",
+ i, sinfo.synth_type, sinfo.synth_subtype, sinfo.capabilities);
}
TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n",
@@ -489,10 +489,10 @@ static UINT midi_init(void)
}
src->caps.dwSupport = 0; /* mandatory with MIDIINCAPS */
- TRACE("OSS info: midi[%d] dev-type=%d capa=%lx\n"
+ TRACE("OSS info: midi[%d] dev-type=%d capa=%x\n"
"\tMidiOut[%d] name='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n"
"\tMidiIn [%d] name='%s' support=%d\n",
- i, minfo.dev_type, (long)minfo.capabilities,
+ i, minfo.dev_type, minfo.capabilities,
synth_devs + i, wine_dbgstr_w(dest->caps.szPname), dest->caps.wTechnology,
dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, dest->caps.dwSupport,
i, wine_dbgstr_w(src->caps.szPname), src->caps.dwSupport);
2
3
Implementation of the _StructuredTaskCollection class in dlls/msvcrt/concurrency.c
by Alexis Belmonte 06 May '22
by Alexis Belmonte 06 May '22
06 May '22
Hello everyone,
I was just wondering if someone was actively working on the
implementation of the _StructuredTaskCollection class as I've seen
someone implement a stub constructor for this class in
dlls/msvcrt/concurrency.c (L1751).
I'm currently working on making Clip Studio Paint work on Wine, and it
requires some functions of this class to be implemented -- this is why
I'm asking here if it's already in the work or not!
Thanks for your time and have a nice day,
Alexis
2
2
[PATCH] user32/tests: Make the test_char_from_pos() failures more informative.
by Francois Gouget 06 May '22
by Francois Gouget 06 May '22
06 May '22
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
I guess one could also assume that getting a single "expected 1 got 0"
means only the test with the lower bound failed. So it's probably a
matter of taste but I personally prefer traces to be unambiguous.
---
dlls/user32/tests/edit.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c
index 1607e9d84d9..1e5ed8dbfa0 100644
--- a/dlls/user32/tests/edit.c
+++ b/dlls/user32/tests/edit.c
@@ -1154,11 +1154,11 @@ static void test_char_from_pos(void)
for (i = lo; i < mid; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok(0 == ret, "expected 0 got %d\n", ret);
+ ok(0 == ret, "%d/%d/%d: expected 0 got %d\n", lo, i, mid, ret);
}
for (i = mid; i <= hi; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok(1 == ret, "expected 1 got %d\n", ret);
+ ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret);
}
ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0);
ok(-1 == ret, "expected -1 got %d\n", ret);
@@ -1172,11 +1172,11 @@ static void test_char_from_pos(void)
for (i = lo; i < mid; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok(0 == ret, "expected 0 got %d\n", ret);
+ ok(0 == ret, "%d/%d/%d: expected 0 got %d\n", lo, i, mid, ret);
}
for (i = mid; i <= hi; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok(1 == ret, "expected 1 got %d\n", ret);
+ ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret);
}
ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0);
ok(-1 == ret, "expected -1 got %d\n", ret);
@@ -1190,11 +1190,11 @@ static void test_char_from_pos(void)
for (i = lo; i < mid; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok(0 == ret, "expected 0 got %d\n", ret);
+ ok(0 == ret, "%d/%d/%d: expected 0 got %d\n", lo, i, mid, ret);
}
for (i = mid; i <= hi; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok(1 == ret, "expected 1 got %d\n", ret);
+ ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret);
}
ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0);
ok(-1 == ret, "expected -1 got %d\n", ret);
@@ -1208,11 +1208,12 @@ static void test_char_from_pos(void)
for (i = lo; i < mid; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret);
+ ok(0 == ret || 1 == ret /* Vista */,
+ "%d/%d/%d: expected 0 or 1 got %d\n", lo, i, mid, ret);
}
for (i = mid; i <= hi; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok(1 == ret, "expected 1 got %d\n", ret);
+ ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret);
}
ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0);
ok(-1 == ret, "expected -1 got %d\n", ret);
@@ -1226,11 +1227,12 @@ static void test_char_from_pos(void)
for (i = lo; i < mid; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret);
+ ok(0 == ret || 1 == ret /* Vista */,
+ "%d/%d/%d: expected 0 or 1 got %d\n", lo, i, mid, ret);
}
for (i = mid; i <= hi; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok(1 == ret, "expected 1 got %d\n", ret);
+ ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret);
}
ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0);
ok(-1 == ret, "expected -1 got %d\n", ret);
@@ -1244,11 +1246,12 @@ static void test_char_from_pos(void)
for (i = lo; i < mid; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret);
+ ok(0 == ret || 1 == ret /* Vista */,
+ "%d/%d/%d: expected 0 or 1 got %d\n", lo, i, mid, ret);
}
for (i = mid; i <= hi; i++) {
ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));
- ok(1 == ret, "expected 1 got %d\n", ret);
+ ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret);
}
ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0);
ok(-1 == ret, "expected -1 got %d\n", ret);
--
2.30.2
2
1
06 May '22
It looks like Windows tries to work around the timer granularity by
sometimes returning early such that the total may be a bit less than
requested.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
Based on the failures on record 70% should be low enough (crossing
fingers).
---
dlls/kernelbase/tests/sync.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c
index ecbff6d5707..4dfcfde3f26 100644
--- a/dlls/kernelbase/tests/sync.c
+++ b/dlls/kernelbase/tests/sync.c
@@ -213,8 +213,11 @@ static void test_Sleep(void)
min = 50.0 * (r1 < r2 ? r1 : r2) / 10000000.0;
max = 50.0 * (r1 < r2 ? r2 : r1) / 10000000.0;
- /* Add an extra 1s to account for potential scheduling delays */
- ok(0.9 * min <= elapsed_time && elapsed_time <= 1.0 + max,
+ /* Windows tries to work around the timer resolution by sometimes
+ * returning early such that the total may be a bit less than requested!
+ * Also add an extra 1s to account for potential scheduling delays.
+ */
+ ok(0.7 * min <= elapsed_time && elapsed_time <= 1.0 + max,
"got %f, expected between %f and %f\n", elapsed_time, min, max);
}
--
2.30.2
1
0
Signed-off-by: Francois Gouget <fgouget(a)free.fr>
---
dlls/kernel32/tests/heap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index b039bf524b2..cc02140f453 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -2285,7 +2285,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags
}
- /* between the two thesholds, tail may still be set but block position is inconsistent */
+ /* between the two thresholds, tail may still be set but block position is inconsistent */
alloc_size = 0x20000 * sizeof(void *) - 0x2000;
winetest_push_context( "size %#Ix", alloc_size );
--
2.30.2
1
0
The first patch is a bit of a shortcut. I have a better solution in works, but it's not yet ready. It shouldn't matter until we use 32on64 for NtUserCreateWindowEx anyway.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/44
2
9
[PATCH 0/5] MR43: windows.gaming.input: Fixes and more FF implementation.
by Rémi Bernon (ï¼ rbernon) 06 May '22
by Rémi Bernon (ï¼ rbernon) 06 May '22
06 May '22
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/dinput/dinput_main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index a7ab3b7a9e2..0cd5eb59588 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -1439,7 +1439,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved )
if (reserved) break;
dinput_thread_stop();
unregister_di_em_win_class();
- DeleteCriticalSection(&dinput_hook_crit);
break;
}
return TRUE;
--
2.35.1
2
1
[PATCH v7 0/9] MR6: Draft: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (ï¼ iamahuman) 06 May '22
by Jinoh Kang (ï¼ iamahuman) 06 May '22
06 May '22
Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it
conflicts with reserved ranges:
> Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page
> is in one of our reserved ranges.
However, missing vDSO leads to performance issues on some syscalls (e.g.
clock_gettime, gettimeofday) and may even lead to crash when run with
some ancient C libraries that does not supply a custom signal restorer.
vDSO pages can clash with reserved ranges especially in a 32-bit address
space with address space layout randomization (ASLR) turned on.
Recent versions of the Linux kernel introduced support for mremap()-ping
vDSO pages, partly in an effort to support checkpoint restore in
userspace (CRIU). Special programs that require specific memory layout
constraints (such as Wine preloader) can take advantage of this support
to modify the address space to meet its requirements.
The following test script has been used to test each changes (use with
`git rebase --exec=...`):
```sh
set -e
make -C ../wine64-build -j5
make -C ../wine32-build -j5
cd ../wine64-build
export WINEPRELOADREMAPSTACK
export WINEPRELOADREMAPVDSO
for WINEPRELOADREMAPSTACK in skip never always force auto on-demand ''
do
for WINEPRELOADREMAPVDSO in skip never always force auto on-demand ''
do
./loader/wine64 wineboot
./loader/wine wineboot
done
done
```
--
v7: loader: Switch stack if the old stack address is in reserved range.
loader: Relocate sigpage on conflict with reserved ranges in ARM.
loader: Relocate vDSO on conflict with reserved ranges.
https://gitlab.winehq.org/wine/wine/-/merge_requests/6
2
9
[PATCH 0/1] MR42: dllhost: Try to load the dll server's factory at the start.
by Huw Davies (ï¼ huw) 06 May '22
by Huw Davies (ï¼ huw) 06 May '22
06 May '22
This lets dllhost quit early if the factory cannot be loaded.
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/42
2
1
06 May '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/d2d1/device.c | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 13c99458cfa..fbee558d087 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1929,10 +1929,33 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device
ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc,
const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush)
{
- FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n",
- iface, image, image_brush_desc, brush_desc, brush);
+ struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
+ struct d2d_brush *object;
+ ID2D1Bitmap *bitmap;
+ D2D1_BITMAP_BRUSH_PROPERTIES1 bitmap_brush_desc;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p.\n", iface, image, image_brush_desc,
+ brush_desc, brush);
+
+ hr = ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap);
+ if (FAILED(hr))
+ {
+ FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n");
+ return hr;
+ }
+
+ bitmap_brush_desc.extendModeX = image_brush_desc->extendModeX;
+ bitmap_brush_desc.extendModeY = image_brush_desc->extendModeY;
+ bitmap_brush_desc.interpolationMode = image_brush_desc->interpolationMode;
+
+ if (SUCCEEDED(hr = d2d_bitmap_brush_create(context->factory, bitmap, &bitmap_brush_desc,
+ brush_desc, &object)))
+ *brush = (ID2D1ImageBrush *)&object->ID2D1Brush_iface;
+
+ ID2D1Bitmap_Release(bitmap);
+
+ return hr;
}
static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface,
--
2.35.3
2
2
Required for Iragon: Prologue.
Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
v3: Supersede 233207. Add tests.
v4: Supersede 233864. Link to combase function directly.
v5: Supersede 234405. Use if (0) instead of macros.
configure.ac | 1 +
dlls/wintypes/main.c | 207 +++++++++++++++
dlls/wintypes/tests/Makefile.in | 5 +
dlls/wintypes/tests/wintypes.c | 437 ++++++++++++++++++++++++++++++++
4 files changed, 650 insertions(+)
create mode 100644 dlls/wintypes/tests/Makefile.in
create mode 100644 dlls/wintypes/tests/wintypes.c
diff --git a/configure.ac b/configure.ac
index 98f56fc849f..a405bf1773f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3142,6 +3142,7 @@ WINE_CONFIG_MAKEFILE(dlls/wintab32/tests)
WINE_CONFIG_MAKEFILE(dlls/wintrust)
WINE_CONFIG_MAKEFILE(dlls/wintrust/tests)
WINE_CONFIG_MAKEFILE(dlls/wintypes)
+WINE_CONFIG_MAKEFILE(dlls/wintypes/tests)
WINE_CONFIG_MAKEFILE(dlls/winusb)
WINE_CONFIG_MAKEFILE(dlls/wlanapi)
WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests)
diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c
index e5fea2f7d30..1ca8d94cd67 100644
--- a/dlls/wintypes/main.c
+++ b/dlls/wintypes/main.c
@@ -28,6 +28,9 @@
#include "activation.h"
+#define WIDL_using_Windows_Foundation_Metadata
+#include "windows.foundation.metadata.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(wintypes);
static const char *debugstr_hstring(HSTRING hstr)
@@ -43,6 +46,7 @@ static const char *debugstr_hstring(HSTRING hstr)
struct wintypes
{
IActivationFactory IActivationFactory_iface;
+ IApiInformationStatics IApiInformationStatics_iface;
LONG ref;
};
@@ -51,9 +55,16 @@ static inline struct wintypes *impl_from_IActivationFactory(IActivationFactory *
return CONTAINING_RECORD(iface, struct wintypes, IActivationFactory_iface);
}
+static inline struct wintypes *impl_from_IApiInformationStatics(IApiInformationStatics *iface)
+{
+ return CONTAINING_RECORD(iface, struct wintypes, IApiInformationStatics_iface);
+}
+
static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *iface, REFIID iid,
void **out)
{
+ struct wintypes *impl = impl_from_IActivationFactory(iface);
+
TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out);
if (IsEqualGUID(iid, &IID_IUnknown)
@@ -66,6 +77,13 @@ static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *ifa
return S_OK;
}
+ if (IsEqualGUID(iid, &IID_IApiInformationStatics))
+ {
+ IUnknown_AddRef(iface);
+ *out = &impl->IApiInformationStatics_iface;
+ return S_OK;
+ }
+
FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
*out = NULL;
return E_NOINTERFACE;
@@ -128,9 +146,198 @@ static const struct IActivationFactoryVtbl activation_factory_vtbl =
wintypes_ActivateInstance,
};
+static HRESULT STDMETHODCALLTYPE api_information_statics_QueryInterface(
+ IApiInformationStatics *iface, REFIID iid, void **out)
+{
+ struct wintypes *impl = impl_from_IApiInformationStatics(iface);
+ return wintypes_QueryInterface(&impl->IActivationFactory_iface, iid, out);
+}
+
+static ULONG STDMETHODCALLTYPE api_information_statics_AddRef(
+ IApiInformationStatics *iface)
+{
+ struct wintypes *impl = impl_from_IApiInformationStatics(iface);
+ return wintypes_AddRef(&impl->IActivationFactory_iface);
+}
+
+static ULONG STDMETHODCALLTYPE api_information_statics_Release(
+ IApiInformationStatics *iface)
+{
+ struct wintypes *impl = impl_from_IApiInformationStatics(iface);
+ return wintypes_Release(&impl->IActivationFactory_iface);
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_GetIids(
+ IApiInformationStatics *iface, ULONG *iid_count, IID **iids)
+{
+ FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids);
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_GetRuntimeClassName(
+ IApiInformationStatics *iface, HSTRING *class_name)
+{
+ FIXME("iface %p, class_name %p stub!\n", iface, class_name);
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_GetTrustLevel(
+ IApiInformationStatics *iface, TrustLevel *trust_level)
+{
+ FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsTypePresent(
+ IApiInformationStatics *iface, HSTRING type_name, BOOLEAN *value)
+{
+ FIXME("iface %p, type_name %s, value %p stub!\n", iface, debugstr_hstring(type_name), value);
+
+ if (!type_name)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresent(
+ IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name, BOOLEAN *value)
+{
+ FIXME("iface %p, type_name %s, method_name %s, value %p stub!\n", iface,
+ debugstr_hstring(type_name), debugstr_hstring(method_name), value);
+
+ if (!type_name)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresentWithArity(
+ IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name,
+ UINT32 input_parameter_count, BOOLEAN *value)
+{
+ FIXME("iface %p, type_name %s, method_name %s, input_parameter_count %u, value %p stub!\n",
+ iface, debugstr_hstring(type_name), debugstr_hstring(method_name),
+ input_parameter_count, value);
+
+ if (!type_name)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsEventPresent(
+ IApiInformationStatics *iface, HSTRING type_name, HSTRING event_name, BOOLEAN *value)
+{
+ FIXME("iface %p, type_name %s, event_name %s, value %p stub!\n", iface,
+ debugstr_hstring(type_name), debugstr_hstring(event_name), value);
+
+ if (!type_name)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsPropertyPresent(
+ IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value)
+{
+ FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface,
+ debugstr_hstring(type_name), debugstr_hstring(property_name), value);
+
+ if (!type_name)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsReadOnlyPropertyPresent(
+ IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name,
+ BOOLEAN *value)
+{
+ FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface,
+ debugstr_hstring(type_name), debugstr_hstring(property_name), value);
+
+ if (!type_name)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsWriteablePropertyPresent(
+ IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value)
+{
+ FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface,
+ debugstr_hstring(type_name), debugstr_hstring(property_name), value);
+
+ if (!type_name)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsEnumNamedValuePresent(
+ IApiInformationStatics *iface, HSTRING enum_type_name, HSTRING value_name, BOOLEAN *value)
+{
+ FIXME("iface %p, enum_type_name %s, value_name %s, value %p stub!\n", iface,
+ debugstr_hstring(enum_type_name), debugstr_hstring(value_name), value);
+
+ if (!enum_type_name)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajor(
+ IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, BOOLEAN *value)
+{
+ FIXME("iface %p, contract_name %s, major_version %u, value %p stub!\n", iface,
+ debugstr_hstring(contract_name), major_version, value);
+
+ if (!contract_name)
+ return E_INVALIDARG;
+
+ *value = FALSE;
+ return S_OK;
+}
+
+static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajorAndMinor(
+ IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version,
+ UINT16 minor_version, BOOLEAN *value)
+{
+ FIXME("iface %p, contract_name %s, major_version %u, minor_version %u, value %p stub!\n", iface,
+ debugstr_hstring(contract_name), major_version, minor_version, value);
+
+ if (!contract_name)
+ return E_INVALIDARG;
+
+ return E_NOTIMPL;
+}
+
+static const struct IApiInformationStaticsVtbl api_information_statics_vtbl =
+{
+ api_information_statics_QueryInterface,
+ api_information_statics_AddRef,
+ api_information_statics_Release,
+ /* IInspectable methods */
+ api_information_statics_GetIids,
+ api_information_statics_GetRuntimeClassName,
+ api_information_statics_GetTrustLevel,
+ /* IApiInformationStatics methods */
+ api_information_statics_IsTypePresent,
+ api_information_statics_IsMethodPresent,
+ api_information_statics_IsMethodPresentWithArity,
+ api_information_statics_IsEventPresent,
+ api_information_statics_IsPropertyPresent,
+ api_information_statics_IsReadOnlyPropertyPresent,
+ api_information_statics_IsWriteablePropertyPresent,
+ api_information_statics_IsEnumNamedValuePresent,
+ api_information_statics_IsApiContractPresentByMajor,
+ api_information_statics_IsApiContractPresentByMajorAndMinor
+};
+
static struct wintypes wintypes =
{
{&activation_factory_vtbl},
+ {&api_information_statics_vtbl},
1
};
diff --git a/dlls/wintypes/tests/Makefile.in b/dlls/wintypes/tests/Makefile.in
new file mode 100644
index 00000000000..457551548f9
--- /dev/null
+++ b/dlls/wintypes/tests/Makefile.in
@@ -0,0 +1,5 @@
+TESTDLL = wintypes.dll
+IMPORTS = combase uuid
+
+C_SRCS = \
+ wintypes.c
diff --git a/dlls/wintypes/tests/wintypes.c b/dlls/wintypes/tests/wintypes.c
new file mode 100644
index 00000000000..dd6401c212b
--- /dev/null
+++ b/dlls/wintypes/tests/wintypes.c
@@ -0,0 +1,437 @@
+/*
+ * Copyright 2022 Zhiyi Zhang for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+#define COBJMACROS
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winstring.h"
+
+#include "initguid.h"
+#include "roapi.h"
+
+#define WIDL_using_Windows_Foundation_Metadata
+#include "windows.foundation.metadata.h"
+
+#include "wine/test.h"
+
+static void test_IApiInformationStatics(void)
+{
+ static const WCHAR *class_name = L"Windows.Foundation.Metadata.ApiInformation";
+ IAgileObject *agile_object = NULL, *tmp_agile_object = NULL;
+ IInspectable *inspectable = NULL, *tmp_inspectable = NULL;
+ IApiInformationStatics *statics = NULL;
+ IActivationFactory *factory = NULL;
+ HSTRING str, str2;
+ BOOLEAN ret;
+ HRESULT hr;
+
+ hr = RoInitialize(RO_INIT_MULTITHREADED);
+ ok(hr == S_OK, "RoInitialize failed, hr %#lx.\n", hr);
+
+ hr = WindowsCreateString(class_name, wcslen(class_name), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory);
+ ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx.\n", hr);
+ WindowsDeleteString(str);
+ if (hr == REGDB_E_CLASSNOTREG)
+ {
+ win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name));
+ RoUninitialize();
+ return;
+ }
+
+ hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable);
+ ok(hr == S_OK, "QueryInterface IID_IInspectable failed, hr %#lx.\n", hr);
+
+ hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object);
+ ok(hr == S_OK, "QueryInterface IID_IAgileObject failed, hr %#lx.\n", hr);
+
+ hr = IActivationFactory_QueryInterface(factory, &IID_IApiInformationStatics, (void **)&statics);
+ ok(hr == S_OK, "QueryInterface IID_IApiInformationStatics failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_QueryInterface(statics, &IID_IInspectable, (void **)&tmp_inspectable);
+ ok(hr == S_OK, "QueryInterface IID_IInspectable failed, hr %#lx.\n", hr);
+ ok(tmp_inspectable == inspectable, "QueryInterface IID_IInspectable returned %p, expected %p.\n",
+ tmp_inspectable, inspectable);
+ IInspectable_Release(tmp_inspectable);
+
+ hr = IApiInformationStatics_QueryInterface(statics, &IID_IAgileObject, (void **)&tmp_agile_object);
+ ok(hr == S_OK, "QueryInterface IID_IAgileObject failed, hr %#lx.\n", hr);
+ ok(tmp_agile_object == agile_object, "QueryInterface IID_IAgileObject returned %p, expected %p.\n",
+ tmp_agile_object, agile_object);
+ IAgileObject_Release(tmp_agile_object);
+
+ /* IsTypePresent() */
+ hr = WindowsCreateString(L"Windows.Foundation.FoundationContract",
+ wcslen(L"Windows.Foundation.FoundationContract"), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_IsTypePresent(statics, NULL, &ret);
+ ok(hr == E_INVALIDARG, "IsTypePresent failed, hr %#lx.\n", hr);
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsTypePresent(statics, str, NULL);
+ ok(hr == E_INVALIDARG, "IsTypePresent failed, hr %#lx.\n", hr);
+ }
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsTypePresent(statics, str, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsTypePresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsTypePresent returned FALSE.\n");
+
+ WindowsDeleteString(str);
+
+ /* IsMethodPresent() */
+ hr = WindowsCreateString(L"Windows.Foundation.Metadata.IApiInformationStatics",
+ wcslen(L"Windows.Foundation.Metadata.IApiInformationStatics"), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+ hr = WindowsCreateString(L"IsTypePresent", wcslen(L"IsTypePresent"), &str2);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_IsMethodPresent(statics, NULL, str2, &ret);
+ ok(hr == E_INVALIDARG, "IsMethodPresent failed, hr %#lx.\n", hr);
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsMethodPresent(statics, str, NULL, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsMethodPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsMethodPresent returned TRUE.\n");
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsMethodPresent(statics, str, str2, NULL);
+ ok(hr == E_INVALIDARG, "IsMethodPresent failed, hr %#lx.\n", hr);
+ }
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsMethodPresent(statics, str, str2, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsMethodPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsMethodPresent returned FALSE.\n");
+
+ /* IsMethodPresentWithArity() */
+ hr = IApiInformationStatics_IsMethodPresentWithArity(statics, NULL, str2, 1, &ret);
+ ok(hr == E_INVALIDARG, "IsMethodPresentWithArity failed, hr %#lx.\n", hr);
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, NULL, 1, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsMethodPresentWithArity returned FALSE.\n");
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 0, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsMethodPresentWithArity returned FALSE.\n");
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 2, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsMethodPresentWithArity returned FALSE.\n");
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 1, NULL);
+ ok(hr == E_INVALIDARG, "IsMethodPresentWithArity failed, hr %#lx.\n", hr);
+ }
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 1, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsMethodPresentWithArity returned FALSE.\n");
+
+ WindowsDeleteString(str2);
+ WindowsDeleteString(str);
+
+ /* IsEventPresent() */
+ hr = WindowsCreateString(L"Windows.Devices.Enumeration.IDeviceWatcher",
+ wcslen(L"Windows.Devices.Enumeration.IDeviceWatcher"), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+ hr = WindowsCreateString(L"Added", wcslen(L"Added"), &str2);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_IsEventPresent(statics, NULL, str2, &ret);
+ ok(hr == E_INVALIDARG, "IsEventPresent failed, hr %#lx.\n", hr);
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsEventPresent(statics, str, NULL, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsEventPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsEventPresent returned FALSE.\n");
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsEventPresent(statics, str, str2, NULL);
+ ok(hr == E_INVALIDARG, "IsEventPresent failed, hr %#lx.\n", hr);
+ }
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsEventPresent(statics, str, str2, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsEventPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsEventPresent returned FALSE.\n");
+
+ WindowsDeleteString(str2);
+ WindowsDeleteString(str);
+
+ /* IsPropertyPresent() */
+ hr = WindowsCreateString(L"Windows.Devices.Enumeration.IDeviceWatcher",
+ wcslen(L"Windows.Devices.Enumeration.IDeviceWatcher"), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+ hr = WindowsCreateString(L"Status", wcslen(L"Status"), &str2);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_IsPropertyPresent(statics, NULL, str2, &ret);
+ ok(hr == E_INVALIDARG, "IsPropertyPresent failed, hr %#lx.\n", hr);
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsPropertyPresent(statics, str, NULL, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsPropertyPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsPropertyPresent returned TRUE.\n");
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsPropertyPresent(statics, str, str2, NULL);
+ ok(hr == E_INVALIDARG, "IsPropertyPresent failed, hr %#lx.\n", hr);
+ }
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsPropertyPresent(statics, str, str2, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsPropertyPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsPropertyPresent returned FALSE.\n");
+
+ WindowsDeleteString(str2);
+ WindowsDeleteString(str);
+
+ /* IsReadOnlyPropertyPresent() */
+ hr = WindowsCreateString(L"Windows.Devices.Enumeration.IDeviceWatcher",
+ wcslen(L"Windows.Devices.Enumeration.IDeviceWatcher"), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+ hr = WindowsCreateString(L"Id", wcslen(L"Id"), &str2);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, NULL, str2, &ret);
+ ok(hr == E_INVALIDARG, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr);
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, str, NULL, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsReadOnlyPropertyPresent returned TRUE.\n");
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, str, str2, NULL);
+ ok(hr == E_INVALIDARG, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr);
+ }
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, str, str2, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsReadOnlyPropertyPresent returned TRUE.\n");
+
+ WindowsDeleteString(str2);
+ WindowsDeleteString(str);
+
+ /* IsWriteablePropertyPresent() */
+ hr = WindowsCreateString(L"Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect",
+ wcslen(L"Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect"), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+ hr = WindowsCreateString(L"Gain", wcslen(L"Gain"), &str2);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, NULL, str2, &ret);
+ ok(hr == E_INVALIDARG, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr);
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, str, NULL, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsWriteablePropertyPresent returned TRUE.\n");
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, str, str2, NULL);
+ ok(hr == E_INVALIDARG, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr);
+ }
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, str, str2, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE || broken(ret == FALSE) /* Win10 1507 */,
+ "IsWriteablePropertyPresent returned FALSE.\n");
+
+ WindowsDeleteString(str2);
+ WindowsDeleteString(str);
+
+ /* IsEnumNamedValuePresent */
+ hr = WindowsCreateString(L"Windows.Foundation.Metadata.GCPressureAmount",
+ wcslen(L"Windows.Foundation.Metadata.GCPressureAmount"), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+ hr = WindowsCreateString(L"Low", wcslen(L"Low"), &str2);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, NULL, str2, &ret);
+ ok(hr == E_INVALIDARG, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr);
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, NULL, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsEnumNamedValuePresent returned TRUE.\n");
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, str2, NULL);
+ ok(hr == E_INVALIDARG, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr);
+ }
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, str2, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsEnumNamedValuePresent returned FALSE.\n");
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, str, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsEnumNamedValuePresent returned TRUE.\n");
+
+ WindowsDeleteString(str2);
+ WindowsDeleteString(str);
+
+ /* IsApiContractPresentByMajor */
+ hr = WindowsCreateString(L"Windows.Foundation.FoundationContract",
+ wcslen(L"Windows.Foundation.FoundationContract"), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, NULL, 1, &ret);
+ ok(hr == E_INVALIDARG, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr);
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 1, NULL);
+ ok(hr == E_INVALIDARG, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr);
+ }
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 1, &ret);
+ ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsApiContractPresentByMajor returned FALSE.\n");
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 0, &ret);
+ ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsApiContractPresentByMajor returned FALSE.\n");
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 999, &ret);
+ ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr);
+ ok(ret == FALSE, "IsApiContractPresentByMajor returned TRUE.\n");
+
+ WindowsDeleteString(str);
+
+ /* IsApiContractPresentByMajorAndMinor */
+ hr = WindowsCreateString(L"Windows.Foundation.FoundationContract",
+ wcslen(L"Windows.Foundation.FoundationContract"), &str);
+ ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);
+
+ hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, NULL, 1, 0, &ret);
+ ok(hr == E_INVALIDARG, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr);
+
+ if (0) /* Crash on Windows */
+ {
+ hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 1, 0, NULL);
+ ok(hr == E_INVALIDARG, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr);
+ }
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 1, 0, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsApiContractPresentByMajorAndMinor returned FALSE.\n");
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 0, 999, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE, "IsApiContractPresentByMajorAndMinor returned FALSE.\n");
+
+ ret = FALSE;
+ hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 1, 999, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == TRUE || broken(ret == FALSE) /* Win10 1507 */,
+ "IsApiContractPresentByMajorAndMinor returned FALSE.\n");
+
+ ret = TRUE;
+ hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 999, 999, &ret);
+ todo_wine
+ ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr);
+ todo_wine
+ ok(ret == FALSE, "IsApiContractPresentByMajorAndMinor returned TRUE.\n");
+
+ WindowsDeleteString(str);
+
+ IApiInformationStatics_Release(statics);
+ IAgileObject_Release(agile_object);
+ IInspectable_Release(inspectable);
+ IActivationFactory_Release(factory);
+ RoUninitialize();
+}
+
+START_TEST(wintypes)
+{
+ test_IApiInformationStatics();
+}
--
2.34.1
1
0
[PATCH 0/1] MR4: wined3d: Don't transition GENERAL layouts for blits.
by Stefan Dösinger (ï¼ stefan) 06 May '22
by Stefan Dösinger (ï¼ stefan) 06 May '22
06 May '22
On Radeon GPUs VK_IMAGE_LAYOUT_GENERAL images don't use Delta Color
Compression, but SRC/DST optimal images do. Transitioning from GENERAL
to SRC/DST causes a big performance hit.
As a next step we should try harder to avoid VK_IMAGE_LAYOUT_GENERAL.
Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com>
---
This improves Rocket League from 50fps to 67fps when it is GPU limited.
Using VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL instead of GENERAL
further improves it to 80 fps. Switching from COLOR_ATTACHMENT_OPTIMAL
to SRC/DST optimal seems cheap (it just stays compressed), but first we
need logic to transition BIND_RENDER_TARGET | BIND_SHADER_RESOURCE
textures between COLOR_ATTACHMENT_OPTIMAL and SHADER_READ_ONLY_OPTIMAL.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/4
3
2
06 May '22
From: Anton Baskanov <baskanov(a)gmail.com>
Signed-off-by: Anton Baskanov <baskanov(a)gmail.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/winegstreamer/mfplat.c | 1 +
dlls/winegstreamer/quartz_parser.c | 149 ++++++++++++++++-------------
dlls/winegstreamer/unixlib.h | 11 ++-
dlls/winegstreamer/wg_format.c | 22 ++---
dlls/winegstreamer/wg_transform.c | 2 +
dlls/winegstreamer/wm_reader.c | 4 +
6 files changed, 104 insertions(+), 85 deletions(-)
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 97e27bb7301..4d8476d7b49 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -661,6 +661,7 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format)
{
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_WMA:
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
FIXME("Format %u not implemented!\n", format->major_type);
/* fallthrough */
case WG_MAJOR_TYPE_UNKNOWN:
diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c
index 7b82f3efbc9..34848c0b503 100644
--- a/dlls/winegstreamer/quartz_parser.c
+++ b/dlls/winegstreamer/quartz_parser.c
@@ -111,50 +111,6 @@ static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format *
case WG_AUDIO_FORMAT_UNKNOWN:
return false;
- case WG_AUDIO_FORMAT_MPEG1_LAYER1:
- case WG_AUDIO_FORMAT_MPEG1_LAYER2:
- {
- MPEG1WAVEFORMAT *wave_format;
-
- if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format))))
- return false;
- memset(wave_format, 0, sizeof(*wave_format));
-
- mt->subtype = MEDIASUBTYPE_MPEG1AudioPayload;
- mt->cbFormat = sizeof(*wave_format);
- mt->pbFormat = (BYTE *)wave_format;
- wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEG;
- wave_format->wfx.nChannels = format->u.audio.channels;
- wave_format->wfx.nSamplesPerSec = format->u.audio.rate;
- wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
- wave_format->fwHeadLayer = (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER1 ? 1 : 2);
- return true;
- }
-
- case WG_AUDIO_FORMAT_MPEG1_LAYER3:
- {
- MPEGLAYER3WAVEFORMAT *wave_format;
-
- if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format))))
- return false;
- memset(wave_format, 0, sizeof(*wave_format));
-
- mt->subtype = MEDIASUBTYPE_MP3;
- mt->cbFormat = sizeof(*wave_format);
- mt->pbFormat = (BYTE *)wave_format;
- wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3;
- wave_format->wfx.nChannels = format->u.audio.channels;
- wave_format->wfx.nSamplesPerSec = format->u.audio.rate;
- wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
- /* FIXME: We can't get most of the MPEG data from the caps. We may have
- * to manually parse the header. */
- wave_format->wID = MPEGLAYER3_ID_MPEG;
- wave_format->fdwFlags = MPEGLAYER3_FLAG_PADDING_ON;
- wave_format->nFramesPerBlock = 1;
- wave_format->nCodecDelay = 1393;
- return true;
- }
-
case WG_AUDIO_FORMAT_U8:
case WG_AUDIO_FORMAT_S16LE:
case WG_AUDIO_FORMAT_S24LE:
@@ -238,6 +194,62 @@ static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format *
return false;
}
+static bool amt_from_wg_format_mpeg1_audio(AM_MEDIA_TYPE *mt, const struct wg_format *format)
+{
+ mt->majortype = MEDIATYPE_Audio;
+ mt->formattype = FORMAT_WaveFormatEx;
+
+ switch (format->u.mpeg1_audio.layer)
+ {
+ case 1:
+ case 2:
+ {
+ MPEG1WAVEFORMAT *wave_format;
+
+ if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format))))
+ return false;
+ memset(wave_format, 0, sizeof(*wave_format));
+
+ mt->subtype = MEDIASUBTYPE_MPEG1AudioPayload;
+ mt->cbFormat = sizeof(*wave_format);
+ mt->pbFormat = (BYTE *)wave_format;
+ wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEG;
+ wave_format->wfx.nChannels = format->u.mpeg1_audio.channels;
+ wave_format->wfx.nSamplesPerSec = format->u.mpeg1_audio.rate;
+ wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
+ wave_format->fwHeadLayer = format->u.mpeg1_audio.layer;
+ return true;
+ }
+
+ case 3:
+ {
+ MPEGLAYER3WAVEFORMAT *wave_format;
+
+ if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format))))
+ return false;
+ memset(wave_format, 0, sizeof(*wave_format));
+
+ mt->subtype = MEDIASUBTYPE_MP3;
+ mt->cbFormat = sizeof(*wave_format);
+ mt->pbFormat = (BYTE *)wave_format;
+ wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3;
+ wave_format->wfx.nChannels = format->u.mpeg1_audio.channels;
+ wave_format->wfx.nSamplesPerSec = format->u.mpeg1_audio.rate;
+ wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
+ /* FIXME: We can't get most of the MPEG data from the caps. We may have
+ * to manually parse the header. */
+ wave_format->wID = MPEGLAYER3_ID_MPEG;
+ wave_format->fdwFlags = MPEGLAYER3_FLAG_PADDING_ON;
+ wave_format->nFramesPerBlock = 1;
+ wave_format->nCodecDelay = 1393;
+ return true;
+ }
+ }
+
+ assert(0);
+ return false;
+}
+
#define ALIGN(n, alignment) (((n) + (alignment) - 1) & ~((alignment) - 1))
unsigned int wg_format_get_max_size(const struct wg_format *format)
@@ -312,15 +324,6 @@ unsigned int wg_format_get_max_size(const struct wg_format *format)
case WG_AUDIO_FORMAT_F64LE:
return rate * channels * 8;
- case WG_AUDIO_FORMAT_MPEG1_LAYER1:
- return 56000;
-
- case WG_AUDIO_FORMAT_MPEG1_LAYER2:
- return 48000;
-
- case WG_AUDIO_FORMAT_MPEG1_LAYER3:
- return 40000;
-
case WG_AUDIO_FORMAT_UNKNOWN:
FIXME("Cannot guess maximum sample size for unknown audio format.\n");
return 0;
@@ -328,6 +331,20 @@ unsigned int wg_format_get_max_size(const struct wg_format *format)
break;
}
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
+ switch (format->u.mpeg1_audio.layer)
+ {
+ case 1:
+ return 56000;
+
+ case 2:
+ return 48000;
+
+ case 3:
+ return 40000;
+ }
+ break;
+
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_WMA:
FIXME("Format %u not implemented!\n", format->major_type);
@@ -431,6 +448,9 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool
case WG_MAJOR_TYPE_UNKNOWN:
return false;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
+ return amt_from_wg_format_mpeg1_audio(mt, format);
+
case WG_MAJOR_TYPE_AUDIO:
return amt_from_wg_format_audio(mt, format);
@@ -526,17 +546,10 @@ static bool amt_to_wg_format_audio_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_form
return false;
}
- format->major_type = WG_MAJOR_TYPE_AUDIO;
- format->u.audio.channels = audio_format->wfx.nChannels;
- format->u.audio.rate = audio_format->wfx.nSamplesPerSec;
- if (audio_format->fwHeadLayer == 1)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER1;
- else if (audio_format->fwHeadLayer == 2)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER2;
- else if (audio_format->fwHeadLayer == 3)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3;
- else
- return false;
+ format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO;
+ format->u.mpeg1_audio.channels = audio_format->wfx.nChannels;
+ format->u.mpeg1_audio.rate = audio_format->wfx.nSamplesPerSec;
+ format->u.mpeg1_audio.layer = audio_format->fwHeadLayer;
return true;
}
@@ -555,10 +568,10 @@ static bool amt_to_wg_format_audio_mpeg1_layer3(const AM_MEDIA_TYPE *mt, struct
return false;
}
- format->major_type = WG_MAJOR_TYPE_AUDIO;
- format->u.audio.channels = audio_format->wfx.nChannels;
- format->u.audio.rate = audio_format->wfx.nSamplesPerSec;
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3;
+ format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO;
+ format->u.mpeg1_audio.channels = audio_format->wfx.nChannels;
+ format->u.mpeg1_audio.rate = audio_format->wfx.nSamplesPerSec;
+ format->u.mpeg1_audio.layer = 3;
return true;
}
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index f4e2ea4966b..881eb720b6c 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -37,6 +37,7 @@ struct wg_format
WG_MAJOR_TYPE_UNKNOWN,
WG_MAJOR_TYPE_VIDEO,
WG_MAJOR_TYPE_AUDIO,
+ WG_MAJOR_TYPE_MPEG1_AUDIO,
WG_MAJOR_TYPE_WMA,
WG_MAJOR_TYPE_H264,
} major_type;
@@ -80,10 +81,6 @@ struct wg_format
WG_AUDIO_FORMAT_S32LE,
WG_AUDIO_FORMAT_F32LE,
WG_AUDIO_FORMAT_F64LE,
-
- WG_AUDIO_FORMAT_MPEG1_LAYER1,
- WG_AUDIO_FORMAT_MPEG1_LAYER2,
- WG_AUDIO_FORMAT_MPEG1_LAYER3,
} format;
uint32_t channels;
@@ -91,6 +88,12 @@ struct wg_format
uint32_t rate;
} audio;
struct
+ {
+ uint32_t layer;
+ uint32_t rate;
+ uint32_t channels;
+ } mpeg1_audio;
+ struct
{
uint32_t version;
uint32_t bitrate;
diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
index 7f3b2b0a7dd..582bee2d38c 100644
--- a/dlls/winegstreamer/wg_format.c
+++ b/dlls/winegstreamer/wg_format.c
@@ -177,7 +177,7 @@ static void wg_format_from_video_info(struct wg_format *format, const GstVideoIn
format->u.video.fps_d = GST_VIDEO_INFO_FPS_D(info);
}
-static void wg_format_from_caps_audio_mpeg(struct wg_format *format, const GstCaps *caps)
+static void wg_format_from_caps_audio_mpeg1(struct wg_format *format, const GstCaps *caps)
{
const GstStructure *structure = gst_caps_get_structure(caps, 0);
gint layer, channels, rate;
@@ -198,17 +198,10 @@ static void wg_format_from_caps_audio_mpeg(struct wg_format *format, const GstCa
return;
}
- format->major_type = WG_MAJOR_TYPE_AUDIO;
-
- if (layer == 1)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER1;
- else if (layer == 2)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER2;
- else if (layer == 3)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3;
-
- format->u.audio.channels = channels;
- format->u.audio.rate = rate;
+ format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO;
+ format->u.mpeg1_audio.layer = layer;
+ format->u.mpeg1_audio.channels = channels;
+ format->u.mpeg1_audio.rate = rate;
}
static void wg_format_from_caps_video_cinepak(struct wg_format *format, const GstCaps *caps)
@@ -263,7 +256,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps)
}
else if (!strcmp(name, "audio/mpeg"))
{
- wg_format_from_caps_audio_mpeg(format, caps);
+ wg_format_from_caps_audio_mpeg1(format, caps);
}
else if (!strcmp(name, "video/x-cinepak"))
{
@@ -505,6 +498,8 @@ GstCaps *wg_format_to_caps(const struct wg_format *format)
{
case WG_MAJOR_TYPE_UNKNOWN:
return gst_caps_new_any();
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
+ return NULL;
case WG_MAJOR_TYPE_WMA:
return wg_format_to_caps_wma(format);
case WG_MAJOR_TYPE_H264:
@@ -525,6 +520,7 @@ bool wg_format_compare(const struct wg_format *a, const struct wg_format *b)
switch (a->major_type)
{
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_H264:
GST_FIXME("Format %u not implemented!", a->major_type);
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 49c7bfaa927..dca85e7366e 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -233,6 +233,7 @@ NTSTATUS wg_transform_create(void *args)
}
break;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_AUDIO:
case WG_MAJOR_TYPE_VIDEO:
case WG_MAJOR_TYPE_UNKNOWN:
@@ -266,6 +267,7 @@ NTSTATUS wg_transform_create(void *args)
case WG_MAJOR_TYPE_VIDEO:
break;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_UNKNOWN:
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 57ba8633a84..03adea8a318 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1686,6 +1686,7 @@ HRESULT wm_reader_get_output_format_count(struct wm_reader *reader, DWORD output
*count = ARRAY_SIZE(video_formats);
break;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_H264:
FIXME("Format %u not implemented!\n", format.major_type);
@@ -1736,6 +1737,7 @@ HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output,
format.u.audio.format = WG_AUDIO_FORMAT_S16LE;
break;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_H264:
FIXME("Format %u not implemented!\n", format.major_type);
@@ -1815,6 +1817,8 @@ static const char *get_major_type_string(enum wg_major_type type)
return "video";
case WG_MAJOR_TYPE_UNKNOWN:
return "unknown";
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
+ return "mpeg1-audio";
case WG_MAJOR_TYPE_WMA:
return "wma";
case WG_MAJOR_TYPE_H264:
--
2.36.0
2
7
06 May '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/wineoss.drv/mmdevdrv.c | 2 +-
dlls/wineoss.drv/ossmidi.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 9c1261ce05cc..0a7c2011c63f 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -1315,7 +1315,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface,
params.stream = This->stream;
params.data = data;
params.frames = frames;
- params.flags = flags;
+ params.flags = (UINT*)flags;
params.devpos = devpos;
params.qpcpos = qpcpos;
OSS_CALL(get_capture_buffer, ¶ms);
diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c
index 09eed8085c42..b6fde8175ae8 100644
--- a/dlls/wineoss.drv/ossmidi.c
+++ b/dlls/wineoss.drv/ossmidi.c
@@ -396,8 +396,8 @@ static UINT midi_init(void)
if (sinfo.capabilities & SYNTH_CAP_INPUT)
FIXME("Synthesizer supports MIDI in. Not yet supported.\n");
- TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%lx\n",
- i, sinfo.synth_type, sinfo.synth_subtype, (long)sinfo.capabilities);
+ TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%x\n",
+ i, sinfo.synth_type, sinfo.synth_subtype, sinfo.capabilities);
}
TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n",
@@ -489,10 +489,10 @@ static UINT midi_init(void)
}
src->caps.dwSupport = 0; /* mandatory with MIDIINCAPS */
- TRACE("OSS info: midi[%d] dev-type=%d capa=%lx\n"
+ TRACE("OSS info: midi[%d] dev-type=%d capa=%x\n"
"\tMidiOut[%d] name='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n"
"\tMidiIn [%d] name='%s' support=%d\n",
- i, minfo.dev_type, (long)minfo.capabilities,
+ i, minfo.dev_type, minfo.capabilities,
synth_devs + i, wine_dbgstr_w(dest->caps.szPname), dest->caps.wTechnology,
dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, dest->caps.dwSupport,
i, wine_dbgstr_w(src->caps.szPname), src->caps.dwSupport);
1
1
06 May '22
We will always call set_fd_events() again in sock_reselect().
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
server/sock.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/server/sock.c b/server/sock.c
index 2230f58554e..247780a3b71 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -1120,9 +1120,6 @@ static void sock_poll_event( struct fd *fd, int event )
if (debug_level)
fprintf(stderr, "socket %p select event: %x\n", sock, event);
- /* we may change event later, remove from loop here */
- if (event & (POLLERR|POLLHUP)) set_fd_events( sock->fd, -1 );
-
switch (sock->state)
{
case SOCK_UNCONNECTED:
--
2.34.1
1
0
05 May '22
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/mf/tests/mf.c | 48 ++++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 37520d48292..6f6213b1e26 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -6999,33 +6999,31 @@ static void test_h264_decoder(void)
ok(output.dwStatus == 0, "got dwStatus %#lx\n", output.dwStatus);
ok(!output.pEvents, "got pEvents %p\n", output.pEvents);
ok(status == 0, "got status %#lx\n", status);
- if (hr == S_OK)
- {
- /* Win8 and before pad the data with garbage instead of original
- * buffer data, make sure it's consistent. */
- hr = IMFSample_ConvertToContiguousBuffer(output.pSample, &media_buffer);
- ok(hr == S_OK, "ConvertToContiguousBuffer returned %#lx\n", hr);
- hr = IMFMediaBuffer_Lock(media_buffer, &data, NULL, &length);
- ok(hr == S_OK, "Lock returned %#lx\n", hr);
- todo_wine
- ok(length == nv12_frame_len, "got length %lu\n", length);
- if (length == nv12_frame_len)
- {
- for (i = 0; i < actual_aperture.Area.cy; ++i)
- {
- memset(data + actual_width * i + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx);
- memset(data + actual_width * (actual_height + i) + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx);
- }
- memset(data + actual_width * actual_aperture.Area.cy, 0xcd, (actual_height - actual_aperture.Area.cy) * actual_width);
- memset(data + actual_width * (actual_height + actual_aperture.Area.cy / 2), 0xcd, (actual_height - actual_aperture.Area.cy) / 2 * actual_width);
- }
- hr = IMFMediaBuffer_Unlock(media_buffer);
- ok(hr == S_OK, "Unlock returned %#lx\n", hr);
- IMFMediaBuffer_Release(media_buffer);
+ if (hr != S_OK) goto skip_nv12_tests;
- if (length == nv12_frame_len)
- check_sample(output.pSample, nv12_frame_data, output_file);
+ /* Win8 and before pad the data with garbage instead of original
+ * buffer data, make sure it's consistent. */
+ hr = IMFSample_ConvertToContiguousBuffer(output.pSample, &media_buffer);
+ ok(hr == S_OK, "ConvertToContiguousBuffer returned %#lx\n", hr);
+ hr = IMFMediaBuffer_Lock(media_buffer, &data, NULL, &length);
+ ok(hr == S_OK, "Lock returned %#lx\n", hr);
+ ok(length == nv12_frame_len, "got length %lu\n", length);
+
+ for (i = 0; i < actual_aperture.Area.cy; ++i)
+ {
+ memset(data + actual_width * i + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx);
+ memset(data + actual_width * (actual_height + i) + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx);
}
+ memset(data + actual_width * actual_aperture.Area.cy, 0xcd, (actual_height - actual_aperture.Area.cy) * actual_width);
+ memset(data + actual_width * (actual_height + actual_aperture.Area.cy / 2), 0xcd, (actual_height - actual_aperture.Area.cy) / 2 * actual_width);
+
+ hr = IMFMediaBuffer_Unlock(media_buffer);
+ ok(hr == S_OK, "Unlock returned %#lx\n", hr);
+ IMFMediaBuffer_Release(media_buffer);
+
+ check_sample(output.pSample, nv12_frame_data, output_file);
+
+skip_nv12_tests:
ret = IMFSample_Release(output.pSample);
ok(ret == 0, "Release returned %lu\n", ret);
--
2.35.1
3
10
[PATCH 0/5] MR22: winegstreamer: Implement more sample attributes and timestamps.
by Rémi Bernon (ï¼ rbernon) 05 May '22
by Rémi Bernon (ï¼ rbernon) 05 May '22
05 May '22
05 May '22
Signed-off-by: Anton Baskanov <baskanov(a)gmail.com>
---
v2:
* Added "parsed" field to MPEG-1 audio caps.
* Allow mpg123audiodec to be used.
* Use WG_MAJOR_TYPE_AUDIO instead of WG_MAJOR_TYPE_MPEG1_AUDIO.
---
dlls/winegstreamer/wg_format.c | 29 +++++++++++++++++++++++++++++
dlls/winegstreamer/wg_transform.c | 13 +++++++++++++
2 files changed, 42 insertions(+)
diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
index ff9238a6a69..038ec956a42 100644
--- a/dlls/winegstreamer/wg_format.c
+++ b/dlls/winegstreamer/wg_format.c
@@ -338,12 +338,41 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t
}
}
+static GstCaps *wg_format_to_caps_mpeg1_audio(const struct wg_format *format)
+{
+ GstCaps *caps;
+ int layer;
+
+ if (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER1)
+ layer = 1;
+ else if (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER2)
+ layer = 2;
+ else if (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER3)
+ layer = 3;
+
+ if (!(caps = gst_caps_new_empty_simple("audio/mpeg")))
+ return NULL;
+
+ gst_caps_set_simple(caps, "mpegversion", G_TYPE_INT, 1, NULL);
+ gst_caps_set_simple(caps, "layer", G_TYPE_INT, layer, NULL);
+ gst_caps_set_simple(caps, "rate", G_TYPE_INT, format->u.audio.rate, NULL);
+ gst_caps_set_simple(caps, "channels", G_TYPE_INT, format->u.audio.channels, NULL);
+ gst_caps_set_simple(caps, "parsed", G_TYPE_BOOLEAN, TRUE, NULL);
+
+ return caps;
+}
+
static GstCaps *wg_format_to_caps_audio(const struct wg_format *format)
{
GstAudioChannelPosition positions[32];
GstAudioFormat audio_format;
GstAudioInfo info;
+ if (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER1
+ || format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER2
+ || format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER3)
+ return wg_format_to_caps_mpeg1_audio(format);
+
if ((audio_format = wg_audio_format_to_gst(format->u.audio.format)) == GST_AUDIO_FORMAT_UNKNOWN)
return NULL;
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 49c7bfaa927..d8fe896f31e 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -234,6 +234,19 @@ NTSTATUS wg_transform_create(void *args)
break;
case WG_MAJOR_TYPE_AUDIO:
+ if (input_format.u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER1
+ || input_format.u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER2
+ || input_format.u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER3)
+ {
+ if (!(element = transform_find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, src_caps, raw_caps))
+ || !transform_append_element(transform, element, &first, &last))
+ {
+ gst_caps_unref(raw_caps);
+ goto out;
+ }
+ break;
+ }
+ /* fallthrough */
case WG_MAJOR_TYPE_VIDEO:
case WG_MAJOR_TYPE_UNKNOWN:
GST_FIXME("Format %u not implemented!", input_format.major_type);
--
2.34.1
2
6
05 May '22
Signed-off-by: Anton Baskanov <baskanov(a)gmail.com>
---
dlls/winegstreamer/mfplat.c | 1 +
dlls/winegstreamer/quartz_parser.c | 151 ++++++++++++++++-------------
dlls/winegstreamer/unixlib.h | 11 ++-
dlls/winegstreamer/wg_format.c | 22 ++---
dlls/winegstreamer/wg_transform.c | 2 +
dlls/winegstreamer/wm_reader.c | 4 +
6 files changed, 106 insertions(+), 85 deletions(-)
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 97e27bb7301..4d8476d7b49 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -661,6 +661,7 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format)
{
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_WMA:
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
FIXME("Format %u not implemented!\n", format->major_type);
/* fallthrough */
case WG_MAJOR_TYPE_UNKNOWN:
diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c
index 7b82f3efbc9..3e00813ae75 100644
--- a/dlls/winegstreamer/quartz_parser.c
+++ b/dlls/winegstreamer/quartz_parser.c
@@ -111,50 +111,6 @@ static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format *
case WG_AUDIO_FORMAT_UNKNOWN:
return false;
- case WG_AUDIO_FORMAT_MPEG1_LAYER1:
- case WG_AUDIO_FORMAT_MPEG1_LAYER2:
- {
- MPEG1WAVEFORMAT *wave_format;
-
- if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format))))
- return false;
- memset(wave_format, 0, sizeof(*wave_format));
-
- mt->subtype = MEDIASUBTYPE_MPEG1AudioPayload;
- mt->cbFormat = sizeof(*wave_format);
- mt->pbFormat = (BYTE *)wave_format;
- wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEG;
- wave_format->wfx.nChannels = format->u.audio.channels;
- wave_format->wfx.nSamplesPerSec = format->u.audio.rate;
- wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
- wave_format->fwHeadLayer = (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER1 ? 1 : 2);
- return true;
- }
-
- case WG_AUDIO_FORMAT_MPEG1_LAYER3:
- {
- MPEGLAYER3WAVEFORMAT *wave_format;
-
- if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format))))
- return false;
- memset(wave_format, 0, sizeof(*wave_format));
-
- mt->subtype = MEDIASUBTYPE_MP3;
- mt->cbFormat = sizeof(*wave_format);
- mt->pbFormat = (BYTE *)wave_format;
- wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3;
- wave_format->wfx.nChannels = format->u.audio.channels;
- wave_format->wfx.nSamplesPerSec = format->u.audio.rate;
- wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
- /* FIXME: We can't get most of the MPEG data from the caps. We may have
- * to manually parse the header. */
- wave_format->wID = MPEGLAYER3_ID_MPEG;
- wave_format->fdwFlags = MPEGLAYER3_FLAG_PADDING_ON;
- wave_format->nFramesPerBlock = 1;
- wave_format->nCodecDelay = 1393;
- return true;
- }
-
case WG_AUDIO_FORMAT_U8:
case WG_AUDIO_FORMAT_S16LE:
case WG_AUDIO_FORMAT_S24LE:
@@ -238,6 +194,62 @@ static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format *
return false;
}
+static bool amt_from_wg_format_mpeg1_audio(AM_MEDIA_TYPE *mt, const struct wg_format *format)
+{
+ mt->majortype = MEDIATYPE_Audio;
+ mt->formattype = FORMAT_WaveFormatEx;
+
+ switch (format->u.mpeg1_audio.layer)
+ {
+ case 1:
+ case 2:
+ {
+ MPEG1WAVEFORMAT *wave_format;
+
+ if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format))))
+ return false;
+ memset(wave_format, 0, sizeof(*wave_format));
+
+ mt->subtype = MEDIASUBTYPE_MPEG1AudioPayload;
+ mt->cbFormat = sizeof(*wave_format);
+ mt->pbFormat = (BYTE *)wave_format;
+ wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEG;
+ wave_format->wfx.nChannels = format->u.mpeg1_audio.channels;
+ wave_format->wfx.nSamplesPerSec = format->u.mpeg1_audio.rate;
+ wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
+ wave_format->fwHeadLayer = format->u.mpeg1_audio.layer;
+ return true;
+ }
+
+ case 3:
+ {
+ MPEGLAYER3WAVEFORMAT *wave_format;
+
+ if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format))))
+ return false;
+ memset(wave_format, 0, sizeof(*wave_format));
+
+ mt->subtype = MEDIASUBTYPE_MP3;
+ mt->cbFormat = sizeof(*wave_format);
+ mt->pbFormat = (BYTE *)wave_format;
+ wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3;
+ wave_format->wfx.nChannels = format->u.mpeg1_audio.channels;
+ wave_format->wfx.nSamplesPerSec = format->u.mpeg1_audio.rate;
+ wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX);
+ /* FIXME: We can't get most of the MPEG data from the caps. We may have
+ * to manually parse the header. */
+ wave_format->wID = MPEGLAYER3_ID_MPEG;
+ wave_format->fdwFlags = MPEGLAYER3_FLAG_PADDING_ON;
+ wave_format->nFramesPerBlock = 1;
+ wave_format->nCodecDelay = 1393;
+ return true;
+ }
+ }
+
+ assert(0);
+ return false;
+}
+
#define ALIGN(n, alignment) (((n) + (alignment) - 1) & ~((alignment) - 1))
unsigned int wg_format_get_max_size(const struct wg_format *format)
@@ -312,15 +324,6 @@ unsigned int wg_format_get_max_size(const struct wg_format *format)
case WG_AUDIO_FORMAT_F64LE:
return rate * channels * 8;
- case WG_AUDIO_FORMAT_MPEG1_LAYER1:
- return 56000;
-
- case WG_AUDIO_FORMAT_MPEG1_LAYER2:
- return 48000;
-
- case WG_AUDIO_FORMAT_MPEG1_LAYER3:
- return 40000;
-
case WG_AUDIO_FORMAT_UNKNOWN:
FIXME("Cannot guess maximum sample size for unknown audio format.\n");
return 0;
@@ -328,6 +331,22 @@ unsigned int wg_format_get_max_size(const struct wg_format *format)
break;
}
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
+ switch (format->u.mpeg1_audio.layer)
+ {
+ case 1:
+ return 56000;
+
+ case 2:
+ return 48000;
+
+ case 3:
+ return 40000;
+ }
+ assert(0);
+ return 0;
+
+
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_WMA:
FIXME("Format %u not implemented!\n", format->major_type);
@@ -431,6 +450,9 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool
case WG_MAJOR_TYPE_UNKNOWN:
return false;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
+ return amt_from_wg_format_mpeg1_audio(mt, format);
+
case WG_MAJOR_TYPE_AUDIO:
return amt_from_wg_format_audio(mt, format);
@@ -526,17 +548,10 @@ static bool amt_to_wg_format_audio_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_form
return false;
}
- format->major_type = WG_MAJOR_TYPE_AUDIO;
- format->u.audio.channels = audio_format->wfx.nChannels;
- format->u.audio.rate = audio_format->wfx.nSamplesPerSec;
- if (audio_format->fwHeadLayer == 1)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER1;
- else if (audio_format->fwHeadLayer == 2)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER2;
- else if (audio_format->fwHeadLayer == 3)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3;
- else
- return false;
+ format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO;
+ format->u.mpeg1_audio.channels = audio_format->wfx.nChannels;
+ format->u.mpeg1_audio.rate = audio_format->wfx.nSamplesPerSec;
+ format->u.mpeg1_audio.layer = audio_format->fwHeadLayer;
return true;
}
@@ -555,10 +570,10 @@ static bool amt_to_wg_format_audio_mpeg1_layer3(const AM_MEDIA_TYPE *mt, struct
return false;
}
- format->major_type = WG_MAJOR_TYPE_AUDIO;
- format->u.audio.channels = audio_format->wfx.nChannels;
- format->u.audio.rate = audio_format->wfx.nSamplesPerSec;
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3;
+ format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO;
+ format->u.mpeg1_audio.channels = audio_format->wfx.nChannels;
+ format->u.mpeg1_audio.rate = audio_format->wfx.nSamplesPerSec;
+ format->u.mpeg1_audio.layer = 3;
return true;
}
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index f4e2ea4966b..881eb720b6c 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -37,6 +37,7 @@ struct wg_format
WG_MAJOR_TYPE_UNKNOWN,
WG_MAJOR_TYPE_VIDEO,
WG_MAJOR_TYPE_AUDIO,
+ WG_MAJOR_TYPE_MPEG1_AUDIO,
WG_MAJOR_TYPE_WMA,
WG_MAJOR_TYPE_H264,
} major_type;
@@ -80,10 +81,6 @@ struct wg_format
WG_AUDIO_FORMAT_S32LE,
WG_AUDIO_FORMAT_F32LE,
WG_AUDIO_FORMAT_F64LE,
-
- WG_AUDIO_FORMAT_MPEG1_LAYER1,
- WG_AUDIO_FORMAT_MPEG1_LAYER2,
- WG_AUDIO_FORMAT_MPEG1_LAYER3,
} format;
uint32_t channels;
@@ -91,6 +88,12 @@ struct wg_format
uint32_t rate;
} audio;
struct
+ {
+ uint32_t layer;
+ uint32_t rate;
+ uint32_t channels;
+ } mpeg1_audio;
+ struct
{
uint32_t version;
uint32_t bitrate;
diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
index ff9238a6a69..608070b78e8 100644
--- a/dlls/winegstreamer/wg_format.c
+++ b/dlls/winegstreamer/wg_format.c
@@ -177,7 +177,7 @@ static void wg_format_from_video_info(struct wg_format *format, const GstVideoIn
format->u.video.fps_d = GST_VIDEO_INFO_FPS_D(info);
}
-static void wg_format_from_caps_audio_mpeg(struct wg_format *format, const GstCaps *caps)
+static void wg_format_from_caps_audio_mpeg1(struct wg_format *format, const GstCaps *caps)
{
const GstStructure *structure = gst_caps_get_structure(caps, 0);
gint layer, channels, rate;
@@ -198,17 +198,10 @@ static void wg_format_from_caps_audio_mpeg(struct wg_format *format, const GstCa
return;
}
- format->major_type = WG_MAJOR_TYPE_AUDIO;
-
- if (layer == 1)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER1;
- else if (layer == 2)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER2;
- else if (layer == 3)
- format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3;
-
- format->u.audio.channels = channels;
- format->u.audio.rate = rate;
+ format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO;
+ format->u.mpeg1_audio.layer = layer;
+ format->u.mpeg1_audio.channels = channels;
+ format->u.mpeg1_audio.rate = rate;
}
static void wg_format_from_caps_video_cinepak(struct wg_format *format, const GstCaps *caps)
@@ -263,7 +256,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps)
}
else if (!strcmp(name, "audio/mpeg"))
{
- wg_format_from_caps_audio_mpeg(format, caps);
+ wg_format_from_caps_audio_mpeg1(format, caps);
}
else if (!strcmp(name, "video/x-cinepak"))
{
@@ -501,6 +494,8 @@ GstCaps *wg_format_to_caps(const struct wg_format *format)
{
case WG_MAJOR_TYPE_UNKNOWN:
return gst_caps_new_any();
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
+ return NULL;
case WG_MAJOR_TYPE_WMA:
return wg_format_to_caps_wma(format);
case WG_MAJOR_TYPE_H264:
@@ -521,6 +516,7 @@ bool wg_format_compare(const struct wg_format *a, const struct wg_format *b)
switch (a->major_type)
{
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_H264:
GST_FIXME("Format %u not implemented!", a->major_type);
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 49c7bfaa927..dca85e7366e 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -233,6 +233,7 @@ NTSTATUS wg_transform_create(void *args)
}
break;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_AUDIO:
case WG_MAJOR_TYPE_VIDEO:
case WG_MAJOR_TYPE_UNKNOWN:
@@ -266,6 +267,7 @@ NTSTATUS wg_transform_create(void *args)
case WG_MAJOR_TYPE_VIDEO:
break;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_H264:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_UNKNOWN:
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 57ba8633a84..03adea8a318 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1686,6 +1686,7 @@ HRESULT wm_reader_get_output_format_count(struct wm_reader *reader, DWORD output
*count = ARRAY_SIZE(video_formats);
break;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_H264:
FIXME("Format %u not implemented!\n", format.major_type);
@@ -1736,6 +1737,7 @@ HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output,
format.u.audio.format = WG_AUDIO_FORMAT_S16LE;
break;
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
case WG_MAJOR_TYPE_WMA:
case WG_MAJOR_TYPE_H264:
FIXME("Format %u not implemented!\n", format.major_type);
@@ -1815,6 +1817,8 @@ static const char *get_major_type_string(enum wg_major_type type)
return "video";
case WG_MAJOR_TYPE_UNKNOWN:
return "unknown";
+ case WG_MAJOR_TYPE_MPEG1_AUDIO:
+ return "mpeg1-audio";
case WG_MAJOR_TYPE_WMA:
return "wma";
case WG_MAJOR_TYPE_H264:
--
2.34.1
3
17
Re: [PATCH v3 0/2] MR17: programs/cmd: test that read is successful before using its result - approved
by Alexandre Julliard (ï¼ julliard) 05 May '22
by Alexandre Julliard (ï¼ julliard) 05 May '22
05 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/17
1
0
Re: [PATCH v2 0/5] MR33: windows.gaming.input: Split async info to a separate struct. - approved
by Alexandre Julliard (ï¼ julliard) 05 May '22
by Alexandre Julliard (ï¼ julliard) 05 May '22
05 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/33
1
0
Re: [PATCH v3 0/9] MR39: winex11: PE conversion preparation - approved
by Alexandre Julliard (ï¼ julliard) 05 May '22
by Alexandre Julliard (ï¼ julliard) 05 May '22
05 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/39
1
0
Re: [PATCH v2 0/8] MR38: kernel32/tests: Add some more heap tests. - approved
by Alexandre Julliard (ï¼ julliard) 05 May '22
by Alexandre Julliard (ï¼ julliard) 05 May '22
05 May '22
This merge request was approved by Alexandre Julliard.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/38
1
0
Re: [PATCH v6 0/9] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (ï¼ iamahuman) 05 May '22
by Jinoh Kang (ï¼ iamahuman) 05 May '22
05 May '22
Fixed a bug where `free_vma_list` would inadvertently leave a hole in preload reserved ranges.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/6#note_698
1
0
[PATCH v5 0/9] MR6: Draft: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (ï¼ iamahuman) 05 May '22
by Jinoh Kang (ï¼ iamahuman) 05 May '22
05 May '22
Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it
conflicts with reserved ranges:
> Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page
> is in one of our reserved ranges.
However, missing vDSO leads to performance issues on some syscalls (e.g.
clock_gettime, gettimeofday) and may even lead to crash when run with
some ancient C libraries that does not supply a custom signal restorer.
vDSO pages can clash with reserved ranges especially in a 32-bit address
space with address space layout randomization (ASLR) turned on.
Recent versions of the Linux kernel introduced support for mremap()-ping
vDSO pages, partly in an effort to support checkpoint restore in
userspace (CRIU). Special programs that require specific memory layout
constraints (such as Wine preloader) can take advantage of this support
to modify the address space to meet its requirements.
The following test script has been used to test each changes (use with
`git rebase --exec=...`):
```sh
set -e
make -C ../wine64-build -j5
make -C ../wine32-build -j5
cd ../wine64-build
export WINEPRELOADREMAPSTACK
export WINEPRELOADREMAPVDSO
for WINEPRELOADREMAPSTACK in skip never always force auto on-demand ''
do
for WINEPRELOADREMAPVDSO in skip never always force auto on-demand ''
do
./loader/wine64 wineboot
./loader/wine wineboot
done
done
```
--
v5: loader: Switch stack if the old stack address is in reserved range.
loader: Relocate sigpage on conflict with reserved ranges in ARM.
loader: Relocate vDSO on conflict with reserved ranges.
loader: Fix return type of get_auxiliary().
loader: Don't clobber existing memory mappings when reserving addresses.
https://gitlab.winehq.org/wine/wine/-/merge_requests/6
2
9
05 May '22
--
v2: win32u: Use KeUserModeCallback interface for CopyImage.
winex11: Directly use win32u in more places.
winex11: Directly use NtUserGetIconInfo.
win32u: Move NtUserCallMsgFilter implementation from user32.
https://gitlab.winehq.org/wine/wine/-/merge_requests/39
3
10
[tools 1/3] winetest/build-patterns: Use CSS to highlight the new failure modes.
by Francois Gouget 05 May '22
by Francois Gouget 05 May '22
05 May '22
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
winetest/build-patterns | 20 ++++++++++++--------
winetest/report.css | 4 ++++
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/winetest/build-patterns b/winetest/build-patterns
index aa6a6e495..b6e5531e1 100755
--- a/winetest/build-patterns
+++ b/winetest/build-patterns
@@ -999,7 +999,7 @@ sub write_newmodes_line($$)
foreach my $status (sort cmpstatus keys %{$test->{newmodes}})
{
my ($symbol, $class, $title, $_link, $attrs) = get_status_html($status, $test->{colors});
- print $html " <span class='pat$class'$attrs title='$title'><b><i>$symbol</i></b></span>";
+ print $html " <span class='pat$class newM'$attrs title='$title'>$symbol</span>";
}
print $html "\n";
}
@@ -1016,7 +1016,7 @@ sub write_pattern_line($$$)
my ($range_start, $range_end, $range_title);
foreach my $build (@sortedbuilds)
{
- my ($symbol, $class, $title);
+ my ($symbol, $class, $title, $is_new_mode);
my ($tag, $attrs) = ("span", "");
my $status = $testreport->{status}->{$build->{name}};
@@ -1066,11 +1066,7 @@ sub write_pattern_line($$$)
$attrs .= sprintf " href='%s/%s/%s.html#%s'",
$build->{name}, $reportdir, $link, $dll;
}
- if ($test->{newmodes}->{$status})
- {
- $symbol = "<b><i>$symbol</i></b>";
- $has_newmode = 1;
- }
+ $is_new_mode = $test->{newmodes}->{$status};
}
if ($range_symbol eq $symbol)
@@ -1091,7 +1087,15 @@ sub write_pattern_line($$$)
}
# Start a new pattern range
- $class = " class='pat$class'" if ($class);
+ if ($is_new_mode)
+ {
+ $class = $class ? " class='pat$class newM'" : " class='newM'";
+ $has_newmode = 1;
+ }
+ elsif ($class)
+ {
+ $class = " class='pat$class'";
+ }
print $html "<$tag$class$attrs";
if ($tag eq "a")
{
diff --git a/winetest/report.css b/winetest/report.css
index 25f156d6f..4b2d126ad 100644
--- a/winetest/report.css
+++ b/winetest/report.css
@@ -134,6 +134,10 @@ div.pattern :hover { color: black; text-decoration: underline; }
.patV { /* test blocked by the anti-virus */
background-color: #99e6ff;
}
+.newM { /* new failure mode */
+ font-style: italic;
+ font-weight: bold;
+}
.commitR {
color: #cc0000;
--
2.30.2
1
2
05 May '22
This patchset implements delayed clears in the Vulkan renderer with
arbitrary colors. The Vulkan side of it is fairly simple - most of the
patches extend the CPU fallback path to support those colors.
The final patch adds a d3d9 test to exercise the fallback code. The Vk
renderer is functional enough in d3d9 to run this particular test. I
don't see a way to reliably test this codepath through d3d10/11 without
quirky assumptions about CopyResource. Dynamic and staging resources
can't be written by the GPU, and default resources can't be read by the
CPU.
Stefan Dösinger (9):
wined3d: Separate mapping from data writing in
surface_cpu_blt_colour_fill.
wined3d: Prepare wined3d_format_convert_from_float for > 32bpp
formats.
wined3d: Add support for sysmem-clearing float32 formats.
wined3d: Support CPU clear of float16 formats.
wined3d: Add 16 bit per channel UNORM formats to
wined3d_format_convert_from_float.
wined3d: Add a memory_colour_fill for clearing the entire level to
zero.
wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors.
wined3d: Store clear colors in subresources.
d3d9/tests: Extend color_fill_test.
dlls/d3d9/tests/visual.c | 132 ++++++++++++++++++++++------
dlls/wined3d/context_vk.c | 57 ++++++++++--
dlls/wined3d/device.c | 7 +-
dlls/wined3d/resource.c | 112 +++++++++++++++++++++++
dlls/wined3d/surface.c | 139 +----------------------------
dlls/wined3d/texture.c | 52 +++++++----
dlls/wined3d/utils.c | 156 +++++++++++++++++++++++++--------
dlls/wined3d/wined3d_private.h | 91 +++++++++++++++++--
8 files changed, 514 insertions(+), 232 deletions(-)
--
2.35.1
4
19
05 May '22
[PATCH v3 0/6] MR22: winegstreamer: Implement more sample attributes and timestamps.
by Rémi Bernon (ï¼ rbernon) 05 May '22
by Rémi Bernon (ï¼ rbernon) 05 May '22
05 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183
--
v3: winegstreamer: Support dynamic wg_transform output format change.
winegstreamer: Track caps changes and keep them with the output buffers.
winegstreamer: Remove width/height from caps when format uses 0.
winegstreamer: Only resize buffer when read is incomplete.
winegstreamer: Support the MFSampleExtension_CleanPoint sample attribute.
winegstreamer: Add timestamp and duration to struct wg_sample.
https://gitlab.winehq.org/wine/wine/-/merge_requests/22
4
12
[PATCH] mountmgr.sys: Avoid passing a stack pointer to the run_loop thread.
by Rémi Bernon 05 May '22
by Rémi Bernon 05 May '22
05 May '22
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
dlls/mountmgr.sys/mountmgr.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
index 1f9bd56a384..66034621b44 100644
--- a/dlls/mountmgr.sys/mountmgr.c
+++ b/dlls/mountmgr.sys/mountmgr.c
@@ -609,7 +609,8 @@ static DWORD WINAPI device_op_thread( void *arg )
static DWORD WINAPI run_loop_thread( void *arg )
{
- return MOUNTMGR_CALL( run_loop, arg );
+ struct run_loop_params params = {.op_thread = arg, .op_apc = device_op};
+ return MOUNTMGR_CALL( run_loop, ¶ms );
}
@@ -624,7 +625,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
DEVICE_OBJECT *device;
HKEY devicemap_key;
NTSTATUS status;
- struct run_loop_params params;
+ HANDLE thread;
TRACE( "%s\n", debugstr_w(path->Buffer) );
@@ -655,9 +656,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
RtlInitUnicodeString( &nameW, L"\\Driver\\Harddisk" );
status = IoCreateDriver( &nameW, harddisk_driver_entry );
- params.op_thread = CreateThread( NULL, 0, device_op_thread, NULL, 0, NULL );
- params.op_apc = device_op;
- CloseHandle( CreateThread( NULL, 0, run_loop_thread, ¶ms, 0, NULL ));
+ thread = CreateThread( NULL, 0, device_op_thread, NULL, 0, NULL );
+ CloseHandle( CreateThread( NULL, 0, run_loop_thread, thread, 0, NULL ));
#ifdef _WIN64
/* create a symlink so that the Wine port overrides key can be edited with 32-bit reg or regedit */
--
2.35.1
1
0
05 May '22
Re: [PATCH v2 0/1] MR13: kernelbase: Add support for progress callback in CopyFileEx.
by Alistair Leslie-Hughes (ï¼ alesliehughes) 05 May '22
by Alistair Leslie-Hughes (ï¼ alesliehughes) 05 May '22
05 May '22
On 5/5/22 17:40, Nikolay Sivov (@nsivov) wrote:
> Thank you. It's actually possible to test access mode through the callback, and it does look like DELETE is used internally, so that's good.
>
> My only concern now is whether we need stream-switch call at all? Have you tested if it's used for regular files, or on filesystems where streams are not supported. Maybe it could be dropped.
>
I've only tested on NTFS and ext4.
On Windows, I can confirm that the callback is called multiple times, as parts of the file are copied. Beyond that nothing besides confirming the progress bar on the application in question works.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/13#note_630
1
0
[PATCH v2 0/6] MR22: winegstreamer: Implement more sample attributes and timestamps.
by Rémi Bernon (ï¼ rbernon) 05 May '22
by Rémi Bernon (ï¼ rbernon) 05 May '22
05 May '22
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183
--
v2: winegstreamer: Support dynamic wg_transform output format change.
winegstreamer: Track caps changes and keep them with the output buffers.
winegstreamer: Remove width/height from caps when format uses 0.
winegstreamer: Only resize buffer when read is incomplete.
winegstreamer: Support the MFSampleExtension_CleanPoint sample attribute.
winegstreamer: Add timestamp and duration to struct wg_sample.
https://gitlab.winehq.org/wine/wine/-/merge_requests/22
3
8
Re: [PATCH v2 0/1] MR13: kernelbase: Add support for progress callback in CopyFileEx.
by Nikolay Sivov (ï¼ nsivov) 05 May '22
by Nikolay Sivov (ï¼ nsivov) 05 May '22
05 May '22
Thank you. It's actually possible to test access mode through the callback, and it does look like DELETE is used internally, so that's good.
My only concern now is whether we need stream-switch call at all? Have you tested if it's used for regular files, or on filesystems where streams are not supported. Maybe it could be dropped.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/13#note_626
1
0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/d3drm/tests/Makefile.in | 1 -
dlls/d3drm/tests/d3drm.c | 3115 +++++++++++++++++-----------------
2 files changed, 1556 insertions(+), 1560 deletions(-)
diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in
index ec4a030e949..4b39989531c 100644
--- a/dlls/d3drm/tests/Makefile.in
+++ b/dlls/d3drm/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = d3drm.dll
IMPORTS = dxguid uuid d3drm ddraw user32
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 51d10d797bc..665c56ccdae 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -179,37 +179,37 @@ static void test_class_name_(unsigned int line, IDirect3DRMObject *object, const
HRESULT hr;
hr = IDirect3DRMObject_GetClassName(object, NULL, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetClassName(object, NULL, NULL);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
size = 0;
hr = IDirect3DRMObject_GetClassName(object, &size, NULL);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
size = size2 = !!*name;
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- ok_(__FILE__, line)(size == size2, "Got size %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == size2, "Got size %lu.\n", size);
size = sizeof(cname);
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
size = strlen(name) + 1;
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %u\n", size);
+ ok_(__FILE__, line)(hr == D3DRM_OK, "Failed to get classname, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name) + 1, "wrong size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, name), "Expected cname to be \"%s\", but got \"%s\".\n", name, cname);
size = strlen(name);
strcpy(cname, "XXX");
hr = IDirect3DRMObject_GetClassName(object, &size, cname);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen(name), "Wrong classname size: %lu.\n", size);
ok_(__FILE__, line)(!strcmp(cname, "XXX"), "Expected unchanged buffer, but got \"%s\".\n", cname);
}
@@ -221,70 +221,70 @@ static void test_object_name_(unsigned int line, IDirect3DRMObject *object)
DWORD size;
hr = IDirect3DRMObject_GetName(object, NULL, NULL);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, NULL, name);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected buffer contents, %#x.\n", name[0]);
/* Name is not set yet. */
size = 100;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
size = sizeof(name);
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0, "Unexpected name \"%s\".\n", name);
size = 0;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0x1f, "Unexpected name \"%s\".\n", name);
hr = IDirect3DRMObject_SetName(object, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMObject_SetName(object, "name");
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set a name, hr %#lx.\n", hr);
size = 0;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
size = strlen("name") + 1;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == strlen("name") + 1, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(!strcmp(name, "name"), "Unexpected name \"%s\".\n", name);
size = 2;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 2, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(hr == E_INVALIDARG, "Failed to get object name, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 2, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0x1f, "Got unexpected name \"%s\".\n", name);
hr = IDirect3DRMObject_SetName(object, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to set object name, hr %#lx.\n", hr);
size = 1;
hr = IDirect3DRMObject_GetName(object, &size, NULL);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
size = 1;
name[0] = 0x1f;
hr = IDirect3DRMObject_GetName(object, &size, name);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#x.\n", hr);
- ok_(__FILE__, line)(size == 0, "Unexpected size %u.\n", size);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get name size, hr %#lx.\n", hr);
+ ok_(__FILE__, line)(size == 0, "Unexpected size %lu.\n", size);
ok_(__FILE__, line)(name[0] == 0, "Got unexpected name \"%s\".\n", name);
}
@@ -454,31 +454,31 @@ static void test_MeshBuilder(void)
IUnknown *unk;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void **)&meshbuilder3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMMeshBuilder3, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder3, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(unk == (IUnknown *)pMeshBuilder, "Unexpected interface pointer.\n");
IUnknown_Release(unk);
@@ -490,36 +490,36 @@ static void test_MeshBuilder(void)
info.lpMemory = data_bad_version;
info.dSize = strlen(data_bad_version);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
info.lpMemory = data_no_mesh;
info.dSize = strlen(data_no_mesh);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, "Object"), "Retrieved name '%s' instead of 'Object'\n", name);
size = strlen("Object"); /* No space for null character */
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, NULL);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
- ok(size == 0, "Size should be 0 instead of %u\n", size);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
+ ok(size == 0, "Size should be 0 instead of %lu.\n", size);
hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, "");
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, ""), "Retrieved name '%s' instead of ''\n", name);
val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
@@ -529,14 +529,14 @@ static void test_MeshBuilder(void)
ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, NULL, &val2, NULL, &val3, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
- ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2);
- ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
+ ok(val2 == 4, "Wrong number of normals %ld (must be 4)\n", val2);
+ ok(val3 == 22, "Wrong number of face data bytes %ld (must be 22)\n", val3);
/* Check that Load method generated default normals */
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
expect_vector(&n[0], 0.577350f, 0.577350f, 0.577350f, 32);
expect_vector(&n[1], -0.229416f, 0.688247f, 0.688247f, 32);
expect_vector(&n[2], -0.229416f, 0.688247f, 0.688247f, 32);
@@ -546,58 +546,58 @@ static void test_MeshBuilder(void)
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 2, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 3, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 4, &valu, &valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 0, valu, valv);
- ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 4, valu, valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 0.0f;
valv = 0.0f;
hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
IDirect3DRMMeshBuilder_Release(pMeshBuilder);
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
/* No group in mesh when mesh builder is not loaded */
hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
- ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "CreateMesh failed returning hr %#lx.\n", hr);
if (hr == D3DRM_OK)
{
DWORD nb_groups;
nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(nb_groups == 0, "GetCroupCount returned %u\n", nb_groups);
+ ok(nb_groups == 0, "GetCroupCount returned %lu\n", nb_groups);
IDirect3DRMMesh_Release(mesh);
}
@@ -605,7 +605,7 @@ static void test_MeshBuilder(void)
info.lpMemory = data_full;
info.dSize = strlen(data_full);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder);
ok(val == 3, "Wrong number of vertices %d (must be 3)\n", val);
@@ -616,43 +616,43 @@ static void test_MeshBuilder(void)
/* Check no buffer size and too small buffer size errors */
val1 = 1; val2 = 3; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 1; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, NULL, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 3; val3 = 1;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, NULL, f);
- ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
val1 = 3; val2 = 3; val3 = 8;
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
- ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
- ok(val3 == 8, "Wrong number of face data bytes %d (must be 8)\n", val3);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
+ ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+ ok(val3 == 8, "Wrong number of face data bytes %ld (must be 8)\n", val3);
expect_vector(&v[0], 0.1f, 0.2f, 0.3f, 32);
expect_vector(&v[1], 0.4f, 0.5f, 0.6f, 32);
expect_vector(&v[2], 0.7f, 0.8f, 0.9f, 32);
expect_vector(&n[0], 1.1f, 1.2f, 1.3f, 32);
expect_vector(&n[1], 1.4f, 1.5f, 1.6f, 32);
expect_vector(&n[2], 1.7f, 1.8f, 1.9f, 32);
- ok(f[0] == 3 , "Wrong component f[0] = %d (expected 3)\n", f[0]);
- ok(f[1] == 0 , "Wrong component f[1] = %d (expected 0)\n", f[1]);
- ok(f[2] == 0 , "Wrong component f[2] = %d (expected 0)\n", f[2]);
- ok(f[3] == 1 , "Wrong component f[3] = %d (expected 1)\n", f[3]);
- ok(f[4] == 1 , "Wrong component f[4] = %d (expected 1)\n", f[4]);
- ok(f[5] == 2 , "Wrong component f[5] = %d (expected 2)\n", f[5]);
- ok(f[6] == 2 , "Wrong component f[6] = %d (expected 2)\n", f[6]);
- ok(f[7] == 0 , "Wrong component f[7] = %d (expected 0)\n", f[7]);
+ ok(f[0] == 3 , "Wrong component f[0] = %ld (expected 3)\n", f[0]);
+ ok(f[1] == 0 , "Wrong component f[1] = %ld (expected 0)\n", f[1]);
+ ok(f[2] == 0 , "Wrong component f[2] = %ld (expected 0)\n", f[2]);
+ ok(f[3] == 1 , "Wrong component f[3] = %ld (expected 1)\n", f[3]);
+ ok(f[4] == 1 , "Wrong component f[4] = %ld (expected 1)\n", f[4]);
+ ok(f[5] == 2 , "Wrong component f[5] = %ld (expected 2)\n", f[5]);
+ ok(f[6] == 2 , "Wrong component f[6] = %ld (expected 2)\n", f[6]);
+ ok(f[7] == 0 , "Wrong component f[7] = %ld (expected 0)\n", f[7]);
hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh);
- ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
if (hr == D3DRM_OK)
{
DWORD nb_groups;
@@ -663,30 +663,30 @@ static void test_MeshBuilder(void)
D3DVALUE values[3];
nb_groups = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups);
+ ok(nb_groups == 1, "GetCroupCount returned %lu.\n", nb_groups);
hr = IDirect3DRMMesh_GetGroup(mesh, 1, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
- ok(hr == D3DRMERR_BADVALUE, "GetCroup returned hr = %x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMesh_GetGroup(mesh, 0, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL);
- ok(hr == D3DRM_OK, "GetCroup failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(nb_vertices == 3, "Wrong number of vertices %u (must be 3)\n", nb_vertices);
ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces);
ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices);
- ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size);
+ ok(data_size == 3, "Wrong number of face data bytes %lu (must be 3)\n", data_size);
color = IDirect3DRMMesh_GetGroupColor(mesh, 0);
- ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00);
+ ok(color == 0xff00ff00, "Wrong color returned %#lx instead of %#x\n", color, 0xff00ff00);
hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture);
- ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(texture == NULL, "No texture should be present\n");
hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material);
- ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(material != NULL, "No material present\n");
hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);
- ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#lx.\n", hr);
ok(values[0] == 0.5f, "Got unexpected red component %.8e.\n", values[0]);
ok(values[1] == 0.5f, "Got unexpected green component %.8e.\n", values[1]);
ok(values[2] == 0.5f, "Got unexpected blue component %.8e.\n", values[2]);
hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]);
- ok(hr == D3DRM_OK, "Failed to get specular color, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to get specular color, hr %#lx.\n", hr);
ok(values[0] == 1.0f, "Got unexpected red component %.8e.\n", values[0]);
ok(values[1] == 0.0f, "Got unexpected green component %.8e.\n", values[1]);
ok(values[2] == 0.0f, "Got unexpected blue component %.8e.\n", values[2]);
@@ -698,12 +698,12 @@ static void test_MeshBuilder(void)
}
hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4);
- ok(hr == D3DRM_OK, "Scale failed returning hr = %x\n", hr);
+ ok(hr == D3DRM_OK, "Scale failed returning hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2);
- ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val2 == 3, "Wrong number of normals %ld (must be 3)\n", val2);
+ ok(val1 == 3, "Wrong number of vertices %ld (must be 3)\n", val1);
expect_vector(&v[0], 0.1f * 2, 0.2f * 3, 0.3f * 4, 32);
expect_vector(&v[1], 0.4f * 2, 0.5f * 3, 0.6f * 4, 32);
@@ -730,17 +730,17 @@ static void test_MeshBuilder3(void)
D3DVALUE valu, valv;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &pMeshBuilder3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)pMeshBuilder3, "Builder");
test_object_name((IDirect3DRMObject *)pMeshBuilder3);
@@ -748,17 +748,17 @@ static void test_MeshBuilder3(void)
info.lpMemory = data_bad_version;
info.dSize = strlen(data_bad_version);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE, hr %#lx\n", hr);
info.lpMemory = data_no_mesh;
info.dSize = strlen(data_no_mesh);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND, hr %#lx\n", hr);
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
val = IDirect3DRMMeshBuilder3_GetVertexCount(pMeshBuilder3);
ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val);
@@ -767,48 +767,48 @@ static void test_MeshBuilder3(void)
ok(val == 3, "Wrong number of faces %d (must be 3)\n", val);
hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(val1 == 4, "Wrong number of vertices %ld (must be 4)\n", val1);
/* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 2, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 3, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu);
ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv);
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 4, &valu, &valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 1.23f;
valv = 3.21f;
hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 0, valu, valv);
- ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set texture coordinates, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 4, valu, valv);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
valu = 0.0f;
valv = 0.0f;
hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv);
- ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get texture coordinates, hr %#lx\n", hr);
ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu);
ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv);
@@ -825,20 +825,20 @@ static void test_Mesh(void)
IUnknown *unk;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateMesh(d3drm, &mesh);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)mesh, "Mesh");
test_object_name((IDirect3DRMObject *)mesh);
hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMObject, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk);
hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMVisual, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk);
IDirect3DRMMesh_Release(mesh);
@@ -865,19 +865,19 @@ static void test_Face(void)
int icount;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFace(d3drm, &face1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
if (FAILED(hr))
{
- skip("Cannot get IDirect3DRMFace interface (hr = %x), skipping tests\n", hr);
+ skip("Cannot get IDirect3DRMFace interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRMFace_QueryInterface(face1, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
IDirect3DRMObject_Release(obj);
@@ -891,13 +891,13 @@ static void test_Face(void)
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2)))
{
- win_skip("Cannot get IDirect3DRM2 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM2 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM2_CreateMeshBuilder(d3drm2, &MeshBuilder2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
ok(!icount, "wrong FaceCount: %i\n", icount);
@@ -905,10 +905,10 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
hr = IDirect3DRMMeshBuilder2_CreateFace(MeshBuilder2, &face1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2);
todo_wine
@@ -917,16 +917,16 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
IDirect3DRMFace_Release(face);
IDirect3DRMFaceArray_Release(array1);
}
@@ -939,25 +939,25 @@ static void test_Face(void)
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &MeshBuilder3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3);
ok(!icount, "wrong FaceCount: %i\n", icount);
hr = IDirect3DRMMeshBuilder3_CreateFace(MeshBuilder3, &face2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %lx.\n", hr);
hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFace2_QueryInterface(face2, &IID_IDirect3DRMFace, (void **)&face1);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
ok(obj == (IDirect3DRMObject *)face1, "Unexpected interface pointer.\n");
IDirect3DRMFace_Release(face1);
@@ -973,16 +973,16 @@ static void test_Face(void)
array1 = NULL;
hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
IDirect3DRMFace_Release(face);
IDirect3DRMFaceArray_Release(array1);
}
@@ -993,7 +993,7 @@ static void test_Face(void)
info.lpMemory = data_ok;
info.dSize = strlen(data_ok);
hr = IDirect3DRMMeshBuilder3_Load(MeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load mesh data, hr %#lx\n", hr);
icount = IDirect3DRMMeshBuilder3_GetVertexCount(MeshBuilder3);
ok(icount == 4, "Wrong number of vertices %d (must be 4)\n", icount);
@@ -1007,29 +1007,29 @@ static void test_Face(void)
count = 4;
hr = IDirect3DRMMeshBuilder3_GetVertices(MeshBuilder3, 0, &count, v1);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(count == 4, "Wrong number of vertices %d (must be 4)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(count == 4, "Wrong number of vertices %ld (must be 4)\n", count);
hr = IDirect3DRMMeshBuilder3_GetNormals(MeshBuilder3, 0, &count, n1);
- ok(hr == D3DRM_OK, "Cannot get normals information (hr = %x)\n", hr);
- ok(count == 4, "Wrong number of normals %d (must be 4)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get normals information, hr %#lx\n", hr);
+ ok(count == 4, "Wrong number of normals %ld (must be 4)\n", count);
array1 = NULL;
hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1);
todo_wine
- ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get FaceArray, hr %#lx\n", hr);
todo_wine
ok(array1 != NULL, "pArray = %p\n", array1);
if (array1)
{
IDirect3DRMFace *face;
count = IDirect3DRMFaceArray_GetSize(array1);
- ok(count == 4, "count = %u\n", count);
+ ok(count == 4, "count = %lu\n", count);
hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face);
- ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get face, hr %#lx\n", hr);
hr = IDirect3DRMFace_GetVertices(face, &count, v2, n2);
- ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr);
- ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count);
+ ok(hr == D3DRM_OK, "Cannot get vertices information, hr %#lx\n", hr);
+ ok(count == 3, "Wrong number of vertices %ld (must be 3)\n", count);
vector_eq(&v1[0], &v2[0]);
vector_eq(&v1[1], &v2[1]);
@@ -1045,14 +1045,14 @@ static void test_Face(void)
/* Setting face color. */
hr = IDirect3DRMFace2_SetColor(face2, 0x1f180587);
- ok(SUCCEEDED(hr), "Failed to set face color, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set face color, hr %#lx.\n", hr);
color = IDirect3DRMFace2_GetColor(face2);
- ok(color == 0x1f180587, "Unexpected color %8x.\n", color);
+ ok(color == 0x1f180587, "Unexpected color %8lx.\n", color);
hr = IDirect3DRMFace2_SetColorRGB(face2, 0.5f, 0.5f, 0.5f);
- ok(SUCCEEDED(hr), "Failed to set color, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set color, hr %#lx.\n", hr);
color = IDirect3DRMFace2_GetColor(face2);
- ok(color == 0xff7f7f7f, "Unexpected color %8x.\n", color);
+ ok(color == 0xff7f7f7f, "Unexpected color %8lx.\n", color);
IDirect3DRMFace2_Release(face2);
IDirect3DRMMeshBuilder3_Release(MeshBuilder3);
@@ -1084,11 +1084,11 @@ static void test_Frame(void)
D3DCOLOR color;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
ref = get_refcount((IUnknown *)d3drm);
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 1);
ref2 = get_refcount((IUnknown *)d3drm);
ok(ref2 > ref, "Expected d3drm object to be referenced.\n");
@@ -1097,93 +1097,93 @@ static void test_Frame(void)
test_object_name((IDirect3DRMObject *)pFrameC);
hr = IDirect3DRMFrame_GetParent(pFrameC, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE, hr %#lx\n", hr);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameC, 1);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameC, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
ok(!!frame_array, "frame_array = %p\n", frame_array);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
/* GetParent with NULL pointer */
hr = IDirect3DRMFrame_GetParent(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
/* [Add/Delete]Child with NULL pointer */
hr = IDirect3DRMFrame_AddChild(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
/* Add child to first parent */
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameP1, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 1);
CHECK_REFCOUNT(pFrameC, 2);
hr = IDirect3DRMFrame_GetScene(pFrameC, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(scene_frame);
hr = IDirect3DRMFrame_GetScene(pFrameP1, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(scene_frame);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
/* In some older version of d3drm, creating IDirect3DRMFrameArray object with GetChildren does not increment refcount of children frames */
ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
- "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
ok((get_refcount((IUnknown*)pFrameC) == 4) || broken(get_refcount((IUnknown*)pFrameC) == 3),
- "Invalid refcount. Expected 4 (or 3) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 4 (or 3) got %ld\n", get_refcount((IUnknown*)pFrameC));
IDirect3DRMFrame_Release(pFrameTmp);
ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2),
- "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC));
+ "Invalid refcount. Expected 3 (or 2) got %ld\n", get_refcount((IUnknown*)pFrameC));
IDirect3DRMFrameArray_Release(frame_array);
CHECK_REFCOUNT(pFrameC, 2);
}
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMFrame_Release(pFrameTmp);
@@ -1191,21 +1191,21 @@ static void test_Frame(void)
/* Add child to second parent */
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1213,31 +1213,31 @@ static void test_Frame(void)
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
CHECK_REFCOUNT(pFrameP2, 2);
IDirect3DRMFrame_Release(scene_frame);
hr = IDirect3DRMFrame_GetScene(pFrameP2, &scene_frame);
- ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get scene, hr %#lx.\n", hr);
ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame);
CHECK_REFCOUNT(pFrameP2, 2);
IDirect3DRMFrame_Release(scene_frame);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp);
CHECK_REFCOUNT(pFrameP2, 2);
CHECK_REFCOUNT(pFrameC, 2);
@@ -1246,18 +1246,18 @@ static void test_Frame(void)
/* Add child again */
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1265,50 +1265,50 @@ static void test_Frame(void)
/* Delete child */
hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 1);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 0, "count = %u\n", count);
+ ok(count == 0, "count = %lu\n", count);
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
}
pFrameTmp = (void*)0xdeadbeef;
hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get parent frame, hr %#lx\n", hr);
ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp);
/* Add two children */
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameC, 2);
hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1);
- ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add child frame, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
frame_array = NULL;
hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array);
- ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get children, hr %#lx\n", hr);
if (frame_array)
{
count = IDirect3DRMFrameArray_GetSize(frame_array);
- ok(count == 2, "count = %u\n", count);
+ ok(count == 2, "count = %lu\n", count);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
hr = IDirect3DRMFrameArray_GetElement(frame_array, 1, &pFrameTmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp);
IDirect3DRMFrame_Release(pFrameTmp);
IDirect3DRMFrameArray_Release(frame_array);
@@ -1316,33 +1316,33 @@ static void test_Frame(void)
/* [Add/Delete]Visual with NULL pointer */
hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
/* Create Visual */
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface, hr %#lx\n", hr);
visual1 = (IDirect3DRMVisual *)mesh_builder;
/* Add Visual to first parent */
hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1);
- ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add visual, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
CHECK_REFCOUNT(visual1, 2);
visual_array = NULL;
hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &visual_array);
- ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get visuals, hr %#lx\n", hr);
if (visual_array)
{
count = IDirect3DRMVisualArray_GetSize(visual_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMVisualArray_GetElement(visual_array, 0, &visual_tmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(visual_tmp == visual1, "visual_tmp = %p\n", visual_tmp);
IDirect3DRMVisual_Release(visual_tmp);
IDirect3DRMVisualArray_Release(visual_array);
@@ -1350,38 +1350,38 @@ static void test_Frame(void)
/* Delete Visual */
hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1);
- ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete visual, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMMeshBuilder_Release(mesh_builder);
/* [Add/Delete]Light with NULL pointer */
hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
/* Create Light */
hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &light1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
/* Add Light to first parent */
hr = IDirect3DRMFrame_AddLight(pFrameP1, light1);
- ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot add light, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
CHECK_REFCOUNT(light1, 2);
light_array = NULL;
hr = IDirect3DRMFrame_GetLights(pFrameP1, &light_array);
- ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get lights, hr %#lx\n", hr);
if (light_array)
{
count = IDirect3DRMLightArray_GetSize(light_array);
- ok(count == 1, "count = %u\n", count);
+ ok(count == 1, "count = %lu\n", count);
hr = IDirect3DRMLightArray_GetElement(light_array, 0, &light_tmp);
- ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get element, hr %#lx\n", hr);
ok(light_tmp == light1, "light_tmp = %p\n", light_tmp);
IDirect3DRMLight_Release(light_tmp);
IDirect3DRMLightArray_Release(light_array);
@@ -1389,57 +1389,57 @@ static void test_Frame(void)
/* Delete Light */
hr = IDirect3DRMFrame_DeleteLight(pFrameP1, light1);
- ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot delete light, hr %#lx\n", hr);
CHECK_REFCOUNT(pFrameP1, 2);
IDirect3DRMLight_Release(light1);
/* Test SceneBackground on first parent */
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff000000, "wrong color (%x)\n", color);
+ ok(color == 0xff000000, "wrong color %lx.\n", color);
hr = IDirect3DRMFrame_SetSceneBackground(pFrameP1, 0xff180587);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff180587, "wrong color (%x)\n", color);
+ ok(color == 0xff180587, "wrong color %lx.\n", color);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(pFrameP1, 0.5, 0.5, 0.5);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMFrame_GetSceneBackground(pFrameP1);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
/* Traversal options. */
hr = IDirect3DRMFrame_QueryInterface(pFrameP2, &IID_IDirect3DRMFrame3, (void **)&frame3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = 0;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#lx.\n", options);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0);
- ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000 | D3DRMFRAME_PICKENABLE);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = 0xf;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == 0, "Unexpected traversal options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == 0, "Unexpected traversal options %#lx.\n", options);
hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, D3DRMFRAME_PICKENABLE);
- ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#lx.\n", hr);
options = 0;
hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options);
- ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr);
- ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#x.\n", options);
+ ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#lx.\n", hr);
+ ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#lx.\n", options);
IDirect3DRMFrame3_Release(frame3);
@@ -1495,12 +1495,12 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
int i;
hr = Direct3DRMCreate(&d3drm);
- ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface (hr = %x).\n", test_idx, hr);
+ ok(SUCCEEDED(hr), "Test %u: Cannot get IDirect3DRM interface, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
- ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IUnknown_Release(unknown);
context.called = 0;
@@ -1508,33 +1508,33 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
context.obj = obj;
hr = IDirect3DRMObject_AddDestroyCallback(obj, NULL, &context);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRMERR_BADVALUE, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[2].callback = &destroy_callback;
corder[2].context = &context;
/* same callback added twice */
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[1].callback = &destroy_callback;
corder[1].context = &context;
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, NULL);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
/* add one more */
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[0].callback = &destroy_callback1;
corder[0].context = &context;
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected D3DRM_BADVALUE, hr %#lx.\n", test_idx, hr);
context.called = 0;
IDirect3DRMObject_Release(obj);
@@ -1549,30 +1549,30 @@ static void test_destroy_callback(unsigned int test_idx, REFCLSID clsid, REFIID
/* test this pattern - add cb1, add cb2, add cb1, delete cb1 */
hr = IDirect3DRM_CreateObject(d3drm, clsid, NULL, iid, (void **)&unknown);
- ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: Cannot get IDirect3DRMObject interface, hr %#lx.\n", test_idx, hr);
hr = IUnknown_QueryInterface(unknown, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IUnknown_Release(unknown);
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[1].callback = &destroy_callback;
corder[1].context = &context;
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback1, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
corder[0].callback = &destroy_callback1;
corder[0].context = &context;
hr = IDirect3DRMObject_AddDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
hr = IDirect3DRMObject_DeleteDestroyCallback(obj, destroy_callback, &context);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
context.called = 0;
hr = IDirect3DRMObject_QueryInterface(obj, &IID_IDirect3DRMObject, (void**)&context.obj);
- ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK (hr = %x).\n", test_idx, hr);
+ ok(hr == D3DRM_OK, "Test %u: expected D3DRM_OK, hr %#lx.\n", test_idx, hr);
IDirect3DRMObject_Release(context.obj);
IUnknown_Release(unknown);
ok(context.called == 2, "Test %u: got %d, expected 2.\n", test_idx, context.called);
@@ -1631,92 +1631,92 @@ static void test_object(void)
int i;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown);
- ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr);
+ ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#lx.\n", hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
unknown = (IUnknown *)0xdeadbeef;
hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
unknown = (IUnknown *)0xdeadbeef;
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown);
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr);
hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
if (SUCCEEDED(hr))
{
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
/* test Add/Destroy callbacks */
test_destroy_callback(i, tests[i].clsid, tests[i].iid);
hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
hr = IDirect3DRM3_CreateObject(d3drm3, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown);
- ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
if (tests[i].takes_d3drm_ref)
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
else
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
IUnknown_Release(unknown);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3);
+ ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4);
+ ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4);
}
}
@@ -1754,35 +1754,35 @@ static void test_Viewport(void)
GetClientRect(window, &rc);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
initial_ref1 = get_refcount((IUnknown *)d3drm1);
initial_ref2 = get_refcount((IUnknown *)d3drm2);
initial_ref3 = get_refcount((IUnknown *)d3drm3);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &tmp_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
@@ -1791,233 +1791,233 @@ static void test_Viewport(void)
frame_ref = get_refcount((IUnknown *)frame);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, 0, 0, 0, 0, &viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
IDirect3DRMFrame_Release(d3drm_frame);
hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
IDirect3DRMFrame_Release(d3drm_frame);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, 0, 0, 0, 0, &viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device1, d3drm_device1);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_SetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame == d3drm_frame, "Expected frame returned = %p, got %p.\n", frame, d3drm_frame);
IDirect3DRMFrame_Release(d3drm_frame);
hr = IDirect3DRMViewport_SetCamera(viewport, tmp_frame1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame == tmp_frame1, "Got unexpected frame %p, expected %p.\n", d3drm_frame, tmp_frame1);
IDirect3DRMFrame_Release(d3drm_frame);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
device_ref = get_refcount((IUnknown *)device3);
frame_ref2 = get_refcount((IUnknown *)frame3);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, 0, 0, 0, 0, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice3_Release(d3drm_device3);
hr = IDirect3DRMViewport2_SetCamera(viewport2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(frame3 == d3drm_frame3, "Expected frame returned = %p, got %p.\n", frame3, d3drm_frame3);
IDirect3DRMFrame3_Release(d3drm_frame3);
hr = IDirect3DRMViewport2_SetCamera(viewport2, tmp_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(d3drm_frame3 == tmp_frame3, "Got unexpected frame %p, expected %p.\n", d3drm_frame3, tmp_frame3);
IDirect3DRMFrame3_Release(d3drm_frame3);
IDirect3DRMViewport2_Release(viewport2);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
/* Test all failures together */
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
viewport = (IDirect3DRMViewport *)0xdeadbeef;
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport, "Expected viewport returned == NULL, got %p.\n", viewport);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, NULL, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef;
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!viewport2, "Expected viewport returned == NULL, got %p.\n", viewport2);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2029,28 +2029,28 @@ static void test_Viewport(void)
IDirect3DRMViewport_Release(viewport);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2062,28 +2062,28 @@ static void test_Viewport(void)
IDirect3DRMViewport2_Release(viewport2);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2094,14 +2094,14 @@ static void test_Viewport(void)
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
ok((IDirect3DRMObject*)viewport == obj, "got object pointer %p, expected %p\n", obj, viewport);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&obj2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
ok(obj == obj2, "got object pointer %p, expected %p\n", obj2, obj);
ok((IUnknown*)viewport != (IUnknown*)viewport2, "got viewport1 %p, viewport2 %p\n", viewport, viewport2);
@@ -2114,22 +2114,22 @@ static void test_Viewport(void)
/* AppData */
hr = IDirect3DRMViewport_SetAppData(viewport, 0);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 0);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 1);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_SetAppData(viewport, 1);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2);
- ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "expected D3DRM_OK, hr %#lx\n", hr);
data = IDirect3DRMViewport2_GetAppData(viewport2);
- ok(data == 1, "got %x\n", data);
+ ok(data == 1, "got %lx\n", data);
IDirect3DRMViewport2_Release(viewport2);
IDirect3DRMViewport_Release(viewport);
@@ -2139,25 +2139,25 @@ static void test_Viewport(void)
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport,
(void **)&viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, &d3drm_frame);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
left = right = bottom = top = 10.0f;
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2170,71 +2170,71 @@ static void test_Viewport(void)
ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_SetCamera(viewport, frame);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetPlane(viewport, -0.5f, 0.5f, -0.5f, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, 1.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetBack(viewport, 100.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_PERSPECTIVE);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
/* Test all failures together */
hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, NULL, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right + 1, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
device_ref = get_refcount((IUnknown *)device1);
frame_ref = get_refcount((IUnknown *)frame);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice_Release(d3drm_device1);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2247,7 +2247,7 @@ static void test_Viewport(void)
field = IDirect3DRMViewport_GetField(viewport);
ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2260,97 +2260,97 @@ static void test_Viewport(void)
ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_SetField(viewport, 1.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport_SetPlane(viewport, 5.0f, 3.0f, 2.0f, 0.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport_GetField(viewport);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport_GetPlane(viewport, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport_SetFront(viewport, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport_GetFront(viewport);
ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
hr = IDirect3DRMViewport_SetBack(viewport, 200.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
back = IDirect3DRMViewport_GetBack(viewport);
ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
hr = IDirect3DRMViewport_SetProjection(viewport, D3DRMPROJECT_ORTHOGRAPHIC);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
projection = IDirect3DRMViewport_GetProjection(viewport);
ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDevice(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetCamera(viewport, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetField(viewport, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetFront(viewport, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport_GetFront(viewport);
hr = IDirect3DRMViewport_SetBack(viewport, front);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport_SetBack(viewport, front / 2.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport);
ref4 = get_refcount((IUnknown *)d3drm1);
- todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device1);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame);
- todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateObject(d3drm2, &CLSID_CDirect3DRMViewport, NULL, &IID_IDirect3DRMViewport2,
(void **)&viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "Expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, &d3drm_frame3);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
left = right = bottom = top = 10.0f;
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
ok(left == 10.0f, "Got unexpected left %.8e.\n", left);
ok(right == 10.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 10.0f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2363,64 +2363,64 @@ static void test_Viewport(void)
ok(projection == ~0u, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_SetCamera(viewport2, frame3);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetPlane(viewport2, -0.5f, 0.5f, -0.5f, 0.5f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, 1.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetBack(viewport2, 100.0f);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_PERSPECTIVE);
- ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right + 1, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
device_ref = get_refcount((IUnknown *)device3);
frame_ref2 = get_refcount((IUnknown *)frame3);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3);
IDirect3DRMDevice3_Release(d3drm_device3);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
viewport_ref = get_refcount((IUnknown *)d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 > viewport_ref, "Expected ref4 > viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
ref4 = get_refcount((IUnknown *)d3d_viewport);
- ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %u, viewport_ref = %u.\n", ref4, viewport_ref);
+ ok(ref4 == viewport_ref, "Expected ref4 == viewport_ref, got ref4 = %lu, viewport_ref = %lu.\n", ref4, viewport_ref);
IDirect3DViewport_Release(d3d_viewport);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
vp.dwSize = sizeof(vp);
hr = IDirect3DViewport_GetViewport(d3d_viewport, &vp);
- ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct (hr = %#x).\n", hr);
- ok(vp.dwWidth == rc.right, "Expected viewport width = %u, got %u.\n", rc.right, vp.dwWidth);
- ok(vp.dwHeight == rc.bottom, "Expected viewport height = %u, got %u.\n", rc.bottom, vp.dwHeight);
- ok(vp.dwX == rc.left, "Expected viewport X position = %u, got %u.\n", rc.left, vp.dwX);
- ok(vp.dwY == rc.top, "Expected viewport Y position = %u, got %u.\n", rc.top, vp.dwY);
+ ok(SUCCEEDED(hr), "Cannot get D3DVIEWPORT struct, hr %#lx.\n", hr);
+ ok(vp.dwWidth == rc.right, "Expected viewport width = %lu, got %lu.\n", rc.right, vp.dwWidth);
+ ok(vp.dwHeight == rc.bottom, "Expected viewport height = %lu, got %lu.\n", rc.bottom, vp.dwHeight);
+ ok(vp.dwX == rc.left, "Expected viewport X position = %lu, got %lu.\n", rc.left, vp.dwX);
+ ok(vp.dwY == rc.top, "Expected viewport Y position = %lu, got %lu.\n", rc.top, vp.dwY);
expected_val = (rc.right > rc.bottom) ? (rc.right / 2.0f) : (rc.bottom / 2.0f);
ok(vp.dvScaleX == expected_val, "Expected dvScaleX = %f, got %f.\n", expected_val, vp.dvScaleX);
ok(vp.dvScaleY == expected_val, "Expected dvScaleY = %f, got %f.\n", expected_val, vp.dvScaleY);
@@ -2433,7 +2433,7 @@ static void test_Viewport(void)
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == 0.5f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -0.5f, "Got unexpected left %.8e.\n", left);
ok(right == 0.5f, "Got unexpected right %.8e.\n", right);
ok(bottom == -0.5f, "Got unexpected bottom %.8e.\n", bottom);
@@ -2446,103 +2446,103 @@ static void test_Viewport(void)
ok(projection == D3DRMPROJECT_PERSPECTIVE, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_SetField(viewport2, 1.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == 1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == -1.0f, "Got unexpected left %.8e.\n", left);
ok(right == 1.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == -1.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 1.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport2_SetPlane(viewport2, 5.0f, 3.0f, 2.0f, 0.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
field = IDirect3DRMViewport2_GetField(viewport2);
ok(field == -1.0f, "Got unexpected field %.8e.\n", field);
hr = IDirect3DRMViewport2_GetPlane(viewport2, &left, &right, &bottom, &top);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
ok(left == 5.0f, "Got unexpected left %.8e.\n", left);
ok(right == 3.0f, "Got unexpected right %.8e.\n", right);
ok(bottom == 2.0f, "Got unexpected bottom %.8e.\n", bottom);
ok(top == 0.0f, "Got unexpected top %.8e.\n", top);
hr = IDirect3DRMViewport2_SetFront(viewport2, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport2_GetFront(viewport2);
ok(front == 2.0f, "Got unexpected front %.8e.\n", front);
hr = IDirect3DRMViewport2_SetBack(viewport2, 200.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
back = IDirect3DRMViewport2_GetBack(viewport2);
ok(back == 200.0f, "Got unexpected back %.8e.\n", back);
hr = IDirect3DRMViewport2_SetProjection(viewport2, D3DRMPROJECT_ORTHOGRAPHIC);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
projection = IDirect3DRMViewport2_GetProjection(viewport2);
ok(projection == D3DRMPROJECT_ORTHOGRAPHIC, "Got unexpected projection type %#x.\n", projection);
hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_GetCamera(viewport2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetField(viewport2, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, 0.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetFront(viewport2, -1.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
front = IDirect3DRMViewport2_GetFront(viewport2);
hr = IDirect3DRMViewport2_SetBack(viewport2, front);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_SetBack(viewport2, front / 2.0f);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
IDirect3DRMViewport2_Release(viewport2);
ref4 = get_refcount((IUnknown *)d3drm1);
- todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ todo_wine ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %u, ref4 = %u.\n", ref2, ref4);
+ ok(ref4 == ref2, "Expected ref4 == ref2, got ref2 = %lu, ref4 = %lu.\n", ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4);
+ ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %lu, ref4 = %lu.\n", ref3, ref4);
ref4 = get_refcount((IUnknown *)device3);
- ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %u, ref4 = %u.\n", device_ref, ref4);
+ ok(ref4 == device_ref, "Expected ref4 == device_ref, got device_ref = %lu, ref4 = %lu.\n", device_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
IDirect3DRMDevice3_Release(device3);
IDirect3DRMDevice_Release(device1);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
ref4 = get_refcount((IUnknown *)frame);
- ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4);
+ ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %lu, ref4 = %lu.\n", frame_ref, ref4);
ref4 = get_refcount((IUnknown *)frame3);
- ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4);
+ ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %lu, ref4 = %lu.\n", frame_ref2, ref4);
IDirect3DRMFrame3_Release(tmp_frame3);
IDirect3DRMFrame3_Release(frame3);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
IDirect3DRMFrame3_Release(tmp_frame1);
IDirect3DRMFrame_Release(frame);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4);
+ ok(ref4 == initial_ref1, "Expected ref4 == initial_ref1, got initial_ref1 = %lu, ref4 = %lu.\n", initial_ref1, ref4);
ref4 = get_refcount((IUnknown *)d3drm2);
- ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4);
+ ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %lu, ref4 = %lu.\n", initial_ref2, ref4);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %u, ref4 = %u.\n", initial_ref3, ref4);
+ ok(ref4 == initial_ref3, "Expected ref4 == initial_ref3, got initial_ref3 = %lu, ref4 = %lu.\n", initial_ref3, ref4);
IDirectDrawClipper_Release(clipper);
IDirect3DRM3_Release(d3drm3);
@@ -2561,13 +2561,13 @@ static void test_Light(void)
D3DCOLOR color;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface, hr %#lx\n", hr);
hr = IDirect3DRMLight_QueryInterface(light, &IID_IDirect3DRMObject, (void **)&object);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
IDirect3DRMObject_Release(object);
test_class_name((IDirect3DRMObject *)light, "Light");
@@ -2577,38 +2577,38 @@ static void test_Light(void)
ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %lx.\n", color);
hr = IDirect3DRMLight_SetType(light, D3DRMLIGHT_POINT);
- ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set type, hr %#lx\n", hr);
type = IDirect3DRMLight_GetType(light);
- ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type);
+ ok(type == D3DRMLIGHT_POINT, "wrong type %u.\n", type);
hr = IDirect3DRMLight_SetColor(light, 0xff180587);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff180587, "wrong color (%x)\n", color);
+ ok(color == 0xff180587, "wrong color %#lx.\n", color);
hr = IDirect3DRMLight_SetColor(light, 0x00c0c0c0);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+ ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
hr = IDirect3DRMLight_SetColorRGB(light, 0.5, 0.5, 0.5);
- ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set color, hr %#lx\n", hr);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xff7f7f7f, "wrong color (%x)\n", color);
+ ok(color == 0xff7f7f7f, "wrong color %#lx.\n", color);
IDirect3DRMLight_Release(light);
hr = IDirect3DRM_CreateLight(d3drm, D3DRMLIGHT_SPOT, 0x00c0c0c0, &light);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
type = IDirect3DRMLight_GetType(light);
ok(type == D3DRMLIGHT_SPOT, "Got unexpected type %#x.\n", type);
color = IDirect3DRMLight_GetColor(light);
- ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color);
+ ok(color == 0xffc0c0c0, "Got unexpected color 0x%08lx.\n", color);
IDirect3DRMLight_Release(light);
@@ -2624,17 +2624,17 @@ static void test_Material2(void)
D3DVALUE r, g, b;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3)))
{
- win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRM3 interface, hr %#lx, skipping tests\n", hr);
IDirect3DRM_Release(d3drm);
return;
}
hr = IDirect3DRM3_CreateMaterial(d3drm3, 18.5f, &material2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)material2, "Material");
test_object_name((IDirect3DRMObject *)material2);
@@ -2643,38 +2643,38 @@ static void test_Material2(void)
ok(r == 18.5f, "wrong power (%f)\n", r);
hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong emissive r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b);
hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong ambient r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b);
hr = IDirect3DRMMaterial2_SetPower(material2, 5.87f);
- ok(hr == D3DRM_OK, "Cannot set power (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set power, hr %#lx\n", hr);
r = IDirect3DRMMaterial2_GetPower(material2);
ok(r == 5.87f, "wrong power (%f)\n", r);
hr = IDirect3DRMMaterial2_SetEmissive(material2, 0.5f, 0.5f, 0.5f);
- ok(hr == D3DRM_OK, "Cannot set emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set emissive, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get emissive, hr %#lx\n", hr);
ok(r == 0.5f && g == 0.5f && b == 0.5f, "wrong emissive r=%f g=%f b=%f, expected r=0.5 g=0.5 b=0.5\n", r, g, b);
hr = IDirect3DRMMaterial2_SetSpecular(material2, 0.6f, 0.6f, 0.6f);
- ok(hr == D3DRM_OK, "Cannot set specular (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set specular, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get specular (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get specular, hr %#lx\n", hr);
ok(r == 0.6f && g == 0.6f && b == 0.6f, "wrong specular r=%f g=%f b=%f, expected r=0.6 g=0.6 b=0.6\n", r, g, b);
hr = IDirect3DRMMaterial2_SetAmbient(material2, 0.7f, 0.7f, 0.7f);
- ok(hr == D3DRM_OK, "Cannot set ambient (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot set ambient, hr %#lx\n", hr);
hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b);
- ok(hr == D3DRM_OK, "Cannot get ambient (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get ambient, hr %#lx\n", hr);
ok(r == 0.7f && g == 0.7f && b == 0.7f, "wrong ambient r=%f g=%f b=%f, expected r=0.7 g=0.7 b=0.7\n", r, g, b);
IDirect3DRMMaterial2_Release(material2);
@@ -2712,44 +2712,44 @@ static void test_Texture(void)
ULONG ref1, ref2, ref3, ref4;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
/* Test NULL params */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTexture(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
hr = IDirect3DRM_CreateTexture(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
hr = IDirect3DRM2_CreateTexture(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
hr = IDirect3DRM3_CreateTexture(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
/* Tests for validation of D3DRMIMAGE struct */
hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2758,11 +2758,11 @@ static void test_Texture(void)
testimg.palette = (void *)0xdeadbeef;
testimg.palette_size = 0x39;
hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2770,81 +2770,81 @@ static void test_Texture(void)
initimg.rgb = 0;
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture1, "Expected texture == NULL, got %p.\n", texture1);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture2, "Expected texture == NULL, got %p.\n", texture2);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(!texture3, "Expected texture == NULL, got %p.\n", texture3);
initimg.rgb = 1;
initimg.red_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.red_mask = 0x000000ff;
initimg.green_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.green_mask = 0x0000ff00;
initimg.blue_mask = 0;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.blue_mask = 0x00ff0000;
initimg.buffer1 = NULL;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
initimg.buffer1 = &pixel;
hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
/* Created from image, GetSurface() does not work. */
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "GetSurface() expected to fail, %#x\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &surface);
- ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "GetSurface() expected to fail, %#x\n", hr);
+ ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "Unexpected hr %#lx.\n", hr);
/* Test all failures together */
test_class_name((IDirect3DRMObject *)texture1, "Texture");
@@ -2860,11 +2860,11 @@ static void test_Texture(void)
IDirect3DRMTexture_Release(texture1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
@@ -2873,11 +2873,11 @@ static void test_Texture(void)
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -2886,11 +2886,11 @@ static void test_Texture(void)
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
/* InitFromImage tests */
/* Tests for validation of D3DRMIMAGE struct */
@@ -2899,14 +2899,14 @@ static void test_Texture(void)
testimg.palette_size = 0;
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
@@ -2915,78 +2915,78 @@ static void test_Texture(void)
testimg.palette_size = 0x39;
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 interface, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
IDirect3DRMTexture3_Release(texture3);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2,
(void **)&texture2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)texture2);
hr = IDirect3DRMTexture2_InitFromImage(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)texture2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3,
(void **)&texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)texture3);
hr = IDirect3DRMTexture3_InitFromImage(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)texture3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
initimg.rgb = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.rgb = 1;
initimg.red_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.red_mask = 0x000000ff;
initimg.green_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.green_mask = 0x0000ff00;
initimg.blue_mask = 0;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.blue_mask = 0x00ff0000;
initimg.buffer1 = NULL;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Unexpected hr %#lx.\n", hr);
initimg.buffer1 = &pixel;
d3drm_img = NULL;
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
/* Release leaked reference to d3drm1 */
IDirect3DRM_Release(d3drm1);
@@ -2995,24 +2995,24 @@ static void test_Texture(void)
ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
d3drm_img = NULL;
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
@@ -3020,11 +3020,11 @@ static void test_Texture(void)
ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img);
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref4 = get_refcount((IUnknown *)d3drm3);
- ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4);
+ ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM2_Release(d3drm2);
@@ -3046,17 +3046,17 @@ static void test_Device(void)
GetClientRect(window, &rc);
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = DirectDrawCreateClipper(0, &pClipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
test_class_name((IDirect3DRMObject *)device, "Device");
test_object_name((IDirect3DRMObject *)device);
@@ -3064,7 +3064,7 @@ static void test_Device(void)
/* WinDevice */
if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (void **)&win_device)))
{
- win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr);
+ win_skip("Cannot get IDirect3DRMWinDevice interface, hr %#lx, skipping tests\n", hr);
goto cleanup;
}
@@ -3089,13 +3089,13 @@ static void test_frame_transform(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3113,9 +3113,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3128,9 +3128,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_BEFORE, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3143,9 +3143,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_AFTER, add_matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3154,7 +3154,7 @@ static void test_frame_transform(void)
add_matrix[3][3] = 2.0f;
hr = IDirect3DRMFrame_AddTransform(frame, D3DRMCOMBINE_REPLACE, add_matrix);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
frame_set_transform(frame,
2.0f, 0.0f, 0.0f, 0.0f,
@@ -3162,9 +3162,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_REPLACE, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3177,9 +3177,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_BEFORE, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3192,9 +3192,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 2.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);
hr = IDirect3DRMFrame_AddTranslation(frame, D3DRMCOMBINE_AFTER, 3.0f, 3.0f, 3.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3207,9 +3207,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_REPLACE, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3222,9 +3222,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_BEFORE, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3237,9 +3237,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_AFTER, 2.0f, 2.0f, 2.0f);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_matrix(matrix,
2.0f, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f, 0.0f, 0.0f,
@@ -3252,7 +3252,7 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
matrix_sanitise(matrix);
expect_matrix(matrix,
@@ -3267,9 +3267,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_BEFORE, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3283,9 +3283,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 1.0f, 0.0f,
3.0f, 3.0f, 3.0f, 1.0f);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_AFTER, 1.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3294,9 +3294,9 @@ static void test_frame_transform(void)
3.0f, -3.0f, 3.0f, 1.0f, 1);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 1.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3305,9 +3305,9 @@ static void test_frame_transform(void)
0.0f, 0.0f, 0.0f, 1.0f, 1);
hr = IDirect3DRMFrame_AddRotation(frame, D3DRMCOMBINE_REPLACE, 0.0f, 0.0f, 0.0f, M_PI_2);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetTransform(frame, matrix);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
matrix_sanitise(matrix);
expect_matrix(matrix,
1.0f, 0.0f, 0.0f, 0.0f,
@@ -3321,7 +3321,7 @@ static void test_frame_transform(void)
0.0f, 0.0f, 8.0f, 0.0f,
64.0f, 64.0f, 64.0f, 1.0f);
hr = IDirect3DRM_CreateFrame(d3drm, frame, &subframe);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
frame_set_transform(subframe,
1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
@@ -3330,11 +3330,11 @@ static void test_frame_transform(void)
set_vector(&v1, 3.0f, 5.0f, 7.0f);
hr = IDirect3DRMFrame_Transform(frame, &v2, &v1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_vector(&v2, 70.0f, 84.0f, 120.0f, 1);
hr = IDirect3DRMFrame_Transform(subframe, &v2, &v1);
- ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Got unexpected hr %#lx.\n", hr);
expect_vector(&v2, 92.0f, 128.0f, 208.0f, 1);
IDirect3DRMFrame_Release(subframe);
@@ -3367,13 +3367,13 @@ static void test_d3drm_load(void)
const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial };
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
info.lpMemory = data_d3drm_load;
info.dSize = strlen(data_d3drm_load);
hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID **)req_refiids, 3, D3DRMLOAD_FROMMEMORY,
object_load_callback, (void *)0xdeadbeef, NULL, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot load data, hr %#lx\n", hr);
ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects);
IDirect3DRM_Release(d3drm);
@@ -3391,23 +3391,23 @@ static void __cdecl object_load_callback_frame(IDirect3DRMObject *object, REFIID
char name[128];
hr = IDirect3DRMObject_QueryInterface(object, &IID_IDirect3DRMFrame, (void**)&frame);
- ok(hr == D3DRM_OK, "IDirect3DRMObject_QueryInterface returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMFrame_GetVisuals(frame, &array);
- ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetVisuals returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = IDirect3DRMVisualArray_GetSize(array);
- ok(size == 1, "Wrong size %u returned, expected 1\n", size);
+ ok(size == 1, "Wrong size %lu returned, expected 1\n", size);
hr = IDirect3DRMVisualArray_GetElement(array, 0, &visual);
- ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetElement returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMVisual_QueryInterface(visual, &IID_IDirect3DRMMeshBuilder, (void**)&mesh_builder);
- ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetSize returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = sizeof(name);
hr = IDirect3DRMMeshBuilder_GetName(mesh_builder, &size, name);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
ok(!strcmp(name, "mesh1"), "Wrong name %s, expected mesh1\n", name);
IDirect3DRMVisual_Release(visual);
@@ -3443,18 +3443,18 @@ static void test_frame_mesh_materials(void)
int i;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Direct3DRMCreate returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
info.lpMemory = data_frame_mesh_materials;
info.dSize = strlen(data_frame_mesh_materials);
hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback_frame, (void*)0xdeadbeef, NULL, NULL, NULL);
- ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMMeshBuilder_CreateMesh(mesh_builder, &mesh);
- ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_CreateMesh returned %x\n", hr);
+ ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr);
size = IDirect3DRMMesh_GetGroupCount(mesh);
- ok(size == 3, "Wrong size %u returned, expected 3\n", size);
+ ok(size == 3, "Unexpected count %lu.\n", size);
for (i = 0; i < size; i++)
{
@@ -3464,33 +3464,33 @@ static void test_frame_mesh_materials(void)
DWORD face_data_size;
hr = IDirect3DRMMesh_GetGroup(mesh, i, &vertex_count, &face_count, &vertex_per_face, &face_data_size, NULL);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroup returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(vertex_count == groups[i].vertex_count, "Group %d: Wrong vertex count %d, expected %d\n", i, vertex_count, groups[i].vertex_count);
ok(face_count == groups[i].face_count, "Group %d: Wrong face count %d; expected %d\n", i, face_count, groups[i].face_count);
ok(vertex_per_face == groups[i].vertex_per_face, "Group %d: Wrong vertex per face %d, expected %d\n", i, vertex_per_face, groups[i].vertex_per_face);
- ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %d, expected %d\n", i, face_data_size, groups[i].face_data_size);
+ ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %ld, expected %d\n", i, face_data_size, groups[i].face_data_size);
color = IDirect3DRMMesh_GetGroupColor(mesh, i);
- ok(color == groups[i].color, "Group %d: Wrong color %x, expected %x\n", i, color, groups[i].color);
+ ok(color == groups[i].color, "Group %d: Wrong color %lx, expected %lx.\n", i, color, groups[i].color);
hr = IDirect3DRMMesh_GetGroupMaterial(mesh, i, &material);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupMaterial returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(material != NULL, "Group %d: No material\n", i);
power = IDirect3DRMMaterial_GetPower(material);
ok(power == groups[i].power, "Group %d: Wrong power %f, expected %f\n", i, power, groups[i].power);
hr = IDirect3DRMMaterial_GetSpecular(material, &red, &green, &blue);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetSpecular returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(red == groups[i].specular[0], "Group %d: Wrong specular red %f, expected %f\n", i, red, groups[i].specular[0]);
ok(green == groups[i].specular[1], "Group %d: Wrong specular green %f, pD3DRMexpected %f\n", i, green, groups[i].specular[1]);
ok(blue == groups[i].specular[2], "Group %d: Wrong specular blue %f, expected %f\n", i, blue, groups[i].specular[2]);
hr = IDirect3DRMMaterial_GetEmissive(material, &red, &green, &blue);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetEmissive returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(red == groups[i].emissive[0], "Group %d: Wrong emissive red %f, expected %f\n", i, red, groups[i].emissive[0]);
ok(green == groups[i].emissive[1], "Group %d: Wrong emissive green %f, expected %f\n", i, green, groups[i].emissive[1]);
ok(blue == groups[i].emissive[2], "Group %d: Wrong emissive blue %f, expected %f\n", i, blue, groups[i].emissive[2]);
hr = IDirect3DRMMesh_GetGroupTexture(mesh, i, &texture);
- ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupTexture returned %x\n", i, hr);
+ ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr);
ok(!texture, "Group %d: Unexpected texture\n", i);
if (material)
@@ -3523,13 +3523,13 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
for (i = 0; i < entry_count; ++i)
{
hr = IUnknown_QueryInterface(base_iface, tests[i].iid, (void **)&iface1);
- ok(hr == tests[i].hr, "Got hr %#x for test \"%s\" %u.\n", hr, test_name, i);
+ ok(hr == tests[i].hr, "Got hr %#lx for test \"%s\" %u.\n", hr, test_name, i);
if (SUCCEEDED(hr))
{
for (j = 0; j < entry_count; ++j)
{
hr = IUnknown_QueryInterface(iface1, tests[j].iid, (void **)&iface2);
- ok(hr == tests[j].hr, "Got hr %#x for test \"%s\" %u, %u.\n", hr, test_name, i, j);
+ ok(hr == tests[j].hr, "Got hr %#lx for test \"%s\" %u, %u.\n", hr, test_name, i, j);
if (SUCCEEDED(hr))
{
expected_refcount = 0;
@@ -3538,7 +3538,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
if (IsEqualGUID(tests[i].refcount_iid, tests[j].refcount_iid))
++expected_refcount;
refcount = IUnknown_Release(iface2);
- ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n",
+ ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, %u, expected %lu.\n",
refcount, test_name, i, j, expected_refcount);
if (tests[i].vtable_iid && tests[j].vtable_iid && IsEqualGUID(tests[i].vtable_iid, tests[j].vtable_iid))
ok(iface1 == iface2,
@@ -3555,7 +3555,7 @@ static void test_qi(const char *test_name, IUnknown *base_iface,
if (IsEqualGUID(refcount_iid, tests[i].refcount_iid))
++expected_refcount;
refcount = IUnknown_Release(iface1);
- ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n",
+ ok(refcount == expected_refcount, "Got refcount %lu for test \"%s\" %u, expected %lu.\n",
refcount, test_name, i, expected_refcount);
}
}
@@ -3638,7 +3638,7 @@ static void test_d3drm_qi(void)
IDirect3DRM *d3drm;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, ARRAY_SIZE(tests));
@@ -3727,32 +3727,32 @@ static void test_frame_qi(void)
IUnknown *unknown;
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(hr == D3DRM_OK, "Failed to create frame1 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame1, hr %#lx\n", hr);
hr = IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1, hr %#lx\n", hr);
IDirect3DRMFrame_Release(frame1);
test_qi("frame1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateFrame(d3drm2, NULL, &frame2);
- ok(hr == D3DRM_OK, "Failed to create frame2 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame2, hr %#lx\n", hr);
hr = IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2, hr %#lx\n", hr);
IDirect3DRMFrame2_Release(frame2);
test_qi("frame2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(hr == D3DRM_OK, "Failed to create frame3 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create frame3, hr %#lx\n", hr);
hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown);
- ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3, hr %#lx\n", hr);
IDirect3DRMFrame3_Release(frame3);
test_qi("frame3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -3851,37 +3851,37 @@ static void test_device_qi(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice, hr %#lx\n", hr);
IDirect3DRMDevice_Release(device1);
test_qi("device1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2 (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2, hr %#lx\n", hr);
IDirect3DRMDevice2_Release(device2);
test_qi("device2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3 (hr = %x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3, hr %#lx\n", hr);
IDirect3DRMDevice3_Release(device3);
test_qi("device3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -3930,60 +3930,60 @@ static void test_create_device_from_clipper1(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 0, 0, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, NULL, &driver, 300, 200, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, &device1);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -3994,37 +3994,37 @@ static void test_create_device_from_clipper1(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4035,37 +4035,37 @@ static void test_create_device_from_clipper1(void)
d3ddevice1 = NULL;
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
if (ds)
IDirectDrawSurface_Release(ds);
@@ -4101,66 +4101,66 @@ static void test_create_device_from_clipper2(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300, 200, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -4171,37 +4171,37 @@ static void test_create_device_from_clipper2(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Expected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4212,39 +4212,39 @@ static void test_create_device_from_clipper2(void)
d3ddevice2 = NULL;
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4279,66 +4279,66 @@ static void test_create_device_from_clipper3(void)
window = create_window();
GetClientRect(window, &rc);
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
cref1 = get_refcount((IUnknown *)clipper);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 0, 0, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
/* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300, 200, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, &device3);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2);
+ ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %lu , cref2 = %lu.\n", cref1, cref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == 300, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == 300, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == 200, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == 200, "Expected device height == 200, got %lu.\n", ret_val);
/* Fetch immediate mode device in order to access render target */
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper);
- ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr);
+ ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got hr %#lx.\n", hr);
/* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */
hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7);
- ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface, hr %#lx.\n", hr);
IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown);
hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
IUnknown_Release(unknown);
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_primary, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_primary != NULL, "No primary surface was enumerated.\n");
hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper);
- ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached clipper from primary surface, hr %#lx.\n", hr);
ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper);
IDirectDrawClipper_Release(d3drm_clipper);
@@ -4349,37 +4349,37 @@ static void test_create_device_from_clipper3(void)
/* Check properties of render target and depth surface */
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
surface_desc.dwWidth, surface_desc.dwHeight);
ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", surface_desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags);
+ ok(surface_desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, surface_desc.dwFlags);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n",
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %lu bpp, got %lu bpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n",
+ ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %lu, %lu.\n",
desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
- ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth);
- ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %lu.\n", desc.dwZBufferBitDepth);
+ ok(!desc.ddpfPixelFormat.dwStencilBitMask, "Unexpected stencil mask %#lx.\n", desc.ddpfPixelFormat.dwStencilBitMask);
/* Release old objects and check refcount of device and clipper */
IDirectDrawSurface_Release(ds);
@@ -4390,39 +4390,39 @@ static void test_create_device_from_clipper3(void)
d3ddevice2 = NULL;
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
cref2 = get_refcount((IUnknown *)clipper);
- ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2);
+ ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %lu, cref2 = %lu.\n", cref1, cref2);
/* Test if render target format follows the screen format */
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16);
- ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot set display mode to 16bpp, hr %#lx.\n", hr);
hr = IDirectDraw_GetDisplayMode(ddraw, &desc);
- ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr);
- ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount);
+ ok(hr == DD_OK, "Cannot get IDirectDraw display mode, hr %#lx\n", hr);
+ ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %lu.\n", desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
- ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n",
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
+ ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %lubpp.\n",
surface_desc.ddpfPixelFormat.dwRGBBitCount);
hr = IDirectDraw2_RestoreDisplayMode(ddraw);
- ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4452,16 +4452,16 @@ static void test_create_device_from_surface1(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
/* Create a surface and use it to create the retained mode device. */
@@ -4473,64 +4473,64 @@ static void test_create_device_from_surface1(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, NULL, &device1);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, NULL, surface, &device1);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu , ref2 = %lu.\n", ref1, ref2);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice_Release(d3ddevice1);
@@ -4538,17 +4538,17 @@ static void test_create_device_from_surface1(void)
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4558,7 +4558,7 @@ static void test_create_device_from_surface1(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4568,23 +4568,23 @@ static void test_create_device_from_surface1(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice(device1, &d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3ddevice1, &IID_IDirectDrawSurface, (void **)&d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4594,12 +4594,12 @@ static void test_create_device_from_surface1(void)
IDirect3DDevice_Release(d3ddevice1);
IDirect3DRMDevice_Release(device1);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
DestroyWindow(window);
@@ -4624,20 +4624,20 @@ static void test_create_device_from_surface2(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
/* Create a surface and use it to create the retained mode device. */
@@ -4649,66 +4649,66 @@ static void test_create_device_from_surface2(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, NULL, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, NULL, surface, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4716,20 +4716,20 @@ static void test_create_device_from_surface2(void)
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4739,7 +4739,7 @@ static void test_create_device_from_surface2(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4749,23 +4749,23 @@ static void test_create_device_from_surface2(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4775,12 +4775,12 @@ static void test_create_device_from_surface2(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice2_Release(device2);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
@@ -4806,20 +4806,20 @@ static void test_create_device_from_surface3(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
/* Create a surface and use it to create the retained mode device. */
@@ -4831,66 +4831,66 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr);
+ ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got hr %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
IDirectDrawSurface_Release(surface);
desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
surface_ref1 = get_refcount((IUnknown *)surface);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == DDERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, NULL, 0, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, NULL, surface, 0, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == DDERR_BADDEVICE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n", surface_ref1, surface_ref2);
+ ok(surface_ref2 > surface_ref1, "Expected surface_ref2 > surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n", surface_ref1, surface_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
/* Check if CreateDeviceFromSurface creates a primary surface */
hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &d3drm_surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(d3drm_surface == NULL, "No primary surface should have enumerated (%p).\n", d3drm_surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check properties of attached depth surface */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY;
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(ds);
IDirect3DDevice2_Release(d3ddevice2);
@@ -4898,19 +4898,19 @@ static void test_create_device_from_surface3(void)
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
surface_ref2 = get_refcount((IUnknown *)surface);
- ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %u, surface_ref2 = %u.\n",
+ ok(surface_ref2 == surface_ref1, "Expected surface_ref2 == surface_ref1, got surface_ref1 = %lu, surface_ref2 = %lu.\n",
surface_ref1, surface_ref2);
/* In version 3, d3drm will destroy all references of the depth surface it created internally. */
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x.\n", hr);
+ todo_wine ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got hr %#lx.\n", hr);
if (SUCCEEDED(hr))
IDirectDrawSurface_Release(ds);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4920,7 +4920,7 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4930,23 +4930,23 @@ static void test_create_device_from_surface3(void)
desc.dwWidth = rc.right;
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &ds, NULL);
- ok(hr == DD_OK, "Cannot create depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot create depth surface, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4955,25 +4955,25 @@ static void test_create_device_from_surface3(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/* The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
/* What happens if we pass no flags and still attach our own depth surface? */
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
IDirectDrawSurface_Release(d3drm_ds);
@@ -4981,12 +4981,12 @@ static void test_create_device_from_surface3(void)
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
/*The render target still holds a reference to ds as the depth surface remains attached to it, so refcount will be 1*/
ref1 = IDirectDrawSurface_Release(ds);
- ok(ref1 == 1, "Expected ref1 == 1, got %u.\n", ref1);
+ ok(ref1 == 1, "Unexpected refcount %lu.\n", ref1);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
@@ -4996,28 +4996,28 @@ static void test_create_device_from_surface3(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* What happens if we don't pass D3DRMDEVICE_NOZBUFFER and still not attach our own depth surface? */
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3);
- ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &d3drm_surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
ok(surface == d3drm_surface, "Expected surface returned == %p, got %p.\n", surface, d3drm_surface);
/* Check if depth surface matches the one we created */
hr = IDirectDrawSurface_GetAttachedSurface(d3drm_surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %x).\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
IDirectDrawSurface_Release(d3drm_surface);
IDirect3DDevice2_Release(d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref1 = IDirectDrawSurface_Release(surface);
- ok(ref1 == 0, "Expected Render target refcount == 0, got %u.\n", ref1);
+ ok(!ref1, "Unexpected refcount %lu.\n", ref1);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm1);
IDirectDraw_Release(ddraw);
@@ -5036,7 +5036,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -5046,7 +5046,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* We used to use EnumDevices() for this, but it seems
* D3DDEVICEDESC.dwDeviceZBufferBitDepth only has a very casual
@@ -5064,7 +5064,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD
continue;
hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
if (FAILED(hr))
{
IDirectDrawSurface_Release(*ds);
@@ -5103,13 +5103,13 @@ static void test_create_device_from_d3d1(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d1);
/* Create the immediate mode device */
@@ -5124,83 +5124,83 @@ static void test_create_device_from_d3d1(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice1);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, NULL, d3ddevice1, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, NULL, &device1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, &device1);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice2_Release(device2);
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice3_Release(device3);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5208,61 +5208,61 @@ static void test_create_device_from_d3d1(void)
IDirect3DDevice_Release(d3drm_d3ddevice1);
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice interface, hr %#lx\n", hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
+ ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice_GetWidth(device1);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice_GetHeight(device1);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice1);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d1);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref2);
while (IDirect3DDevice_Release(d3ddevice1) > device_ref2);
while (IDirect3D_Release(d3d1) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
ref4 = get_refcount((IUnknown *)temp_ddraw1);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D, (void **)&temp_d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
temp_d3ddevice1 = create_device1(temp_ddraw1, window, &surface);
hr = IDirect3DRMDevice_InitFromD3D(device1, temp_d3d1, temp_d3ddevice1);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref2, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)temp_d3ddevice1);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d1);
- todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ todo_wine ok(ref3 < d3d_ref2, "Expected ref3 < d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref2);
while (IDirect3DDevice_Release(temp_d3ddevice1) > 0);
@@ -5272,61 +5272,60 @@ static void test_create_device_from_d3d1(void)
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2);
- ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice2_Release(device2);
d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef;
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 Interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2);
IDirect3DRMDevice3_Release(device3);
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n",
d3ddevice1, d3drm_d3ddevice1);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps got %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5334,12 +5333,12 @@ static void test_create_device_from_d3d1(void)
IDirect3DDevice_Release(d3drm_d3ddevice1);
IDirect3DRMDevice_Release(device1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);
+ ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2);
device_ref2 = get_refcount((IUnknown *)d3ddevice1);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d1);
- todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1,
+ todo_wine ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1,
d3d_ref2);
IDirect3DRM_Release(d3drm1);
@@ -5362,7 +5361,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
GetClientRect(window, &rc);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -5372,7 +5371,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
if (FAILED(hr))
@@ -5398,7 +5397,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec
continue;
hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
if (FAILED(hr))
{
IDirectDrawSurface_Release(*ds);
@@ -5440,15 +5439,15 @@ static void test_create_device_from_d3d2(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d2);
/* Create the immediate mode device */
@@ -5464,74 +5463,74 @@ static void test_create_device_from_d3d2(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice2);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm2);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, NULL, d3ddevice2, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, NULL, &device2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDeviceFromD3D(d3drm2, d3d2, d3ddevice2, &device2);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5539,94 +5538,94 @@ static void test_create_device_from_d3d2(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2, (void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
{
hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, d3ddevice1);
- ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D(device2, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D(device2, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
IDirect3DRMDevice_Release(device1);
if (SUCCEEDED(hr))
{
IDirect3DRMDevice_Release(device1);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice2,
(void **)&device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 interface, hr %#lx.\n", hr);
}
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, NULL, d3ddevice2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice2_GetWidth(device2);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice2_GetHeight(device2);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, d3d2, d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice2);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d2);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
while (IDirect3D2_Release(d3d2) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
ref5 = get_refcount((IUnknown *)temp_d3d2);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
hr = IDirect3DRMDevice2_InitFromD3D2(device2, temp_d3d2, temp_d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d2);
- ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5638,44 +5637,43 @@ static void test_create_device_from_d3d2(void)
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %#x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5683,14 +5681,14 @@ static void test_create_device_from_d3d2(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice2_Release(device2);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
- ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "Expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
@@ -5723,15 +5721,15 @@ static void test_create_device_from_d3d3(void)
HRESULT hr;
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(hr == DD_OK, "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(hr == DD_OK, "Cannot get IDirectDraw2 interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
d3d_ref1 = get_refcount((IUnknown *)d3d2);
/* Create the immediate mode device */
@@ -5747,72 +5745,72 @@ static void test_create_device_from_d3d3(void)
device_ref1 = get_refcount((IUnknown *)d3ddevice2);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref2 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, NULL, d3ddevice2, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, NULL, &device3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3ddevice2, &device3);
- ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface (hr = %x)\n", hr);
+ ok(hr == DD_OK, "Failed to create IDirect3DRMDevice3 interface, hr %#lx\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE),
- "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %lx for flags, got %lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5820,94 +5818,94 @@ static void test_create_device_from_d3d3(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2);
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n", device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
/* InitFromD3D tests */
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3, (void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D interface, hr %#lx.\n", hr);
if (SUCCEEDED(hr = IDirect3DDevice2_QueryInterface(d3ddevice2, &IID_IDirect3DDevice, (void **)&d3ddevice1)))
{
hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, d3ddevice1);
- ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D(device3, NULL, d3ddevice1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D(device3, d3d1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice, (void **)&device1);
- ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot obtain IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMDevice_InitFromD3D(device1, d3d1, d3ddevice1);
- todo_wine ok(hr == E_NOINTERFACE, "Expected hr == E_NOINTERFACE, got %#x.\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
IDirect3DRMDevice_Release(device1);
if (SUCCEEDED(hr))
{
IDirect3DRMDevice_Release(device1);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMDevice, NULL, &IID_IDirect3DRMDevice3,
(void **)&device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
}
}
IDirect3D_Release(d3d1);
IDirect3DDevice_Release(d3ddevice1);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, NULL, d3ddevice2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
- ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to initialise IDirect3DRMDevice2 interface, hr %#lx\n", hr);
ref4 = get_refcount((IUnknown *)d3drm1);
- ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4);
+ ok(ref4 > ref1, "Expected ref4 > ref1, got ref1 = %lu , ref4 = %lu.\n", ref1, ref4);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 > d3d_ref1, "Expected d3d_ref2 > d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
ret_val = IDirect3DRMDevice3_GetWidth(device3);
- ok(ret_val == rc.right, "Expected device width = 300, got %u.\n", ret_val);
+ ok(ret_val == rc.right, "Expected device width = 300, got %lu.\n", ret_val);
ret_val = IDirect3DRMDevice3_GetHeight(device3);
- ok(ret_val == rc.bottom, "Expected device height == 200, got %u.\n", ret_val);
+ ok(ret_val == rc.bottom, "Expected device height == 200, got %lu.\n", ret_val);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, d3d2, d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
+ ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %lu , ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3ddevice2);
- ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 > device_ref2, "Expected ref3 > device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)d3d2);
- ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 > d3d_ref2, "Expected ref3 > d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(d3ddevice2) > device_ref2);
while (IDirect3D2_Release(d3d2) > d3d_ref2);
hr = DirectDrawCreate(NULL, &temp_ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirect3D2, (void **)&temp_d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
ref5 = get_refcount((IUnknown *)temp_d3d2);
hr = IDirectDraw_QueryInterface(temp_ddraw1, &IID_IDirectDraw2, (void **)&temp_ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
temp_d3ddevice2 = create_device2(temp_ddraw2, window, &surface);
hr = IDirect3DRMDevice3_InitFromD3D2(device3, temp_d3d2, temp_d3ddevice2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %u , ref4 = %u.\n", ref3, ref4);
+ ok(ref3 > ref4, "expected ref3 > ref4, got ref3 = %lu , ref4 = %lu.\n", ref3, ref4);
ref3 = get_refcount((IUnknown *)temp_d3ddevice2);
- ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %u, device_ref2 = %u.\n", ref3, device_ref2);
+ ok(ref3 == device_ref2, "Expected ref3 == device_ref2, got ref3 = %lu, device_ref2 = %lu.\n", ref3, device_ref2);
ref3 = get_refcount((IUnknown *)temp_d3d2);
- ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %u, d3d_ref2 = %u.\n", ref3, d3d_ref2);
+ ok(ref3 == d3d_ref2, "Expected ref3 == d3d_ref2, got ref3 = %lu, d3d_ref2 = %lu.\n", ref3, d3d_ref2);
/* Release leaked references */
while (IDirect3DRM_Release(d3drm1) > ref4);
while (IDirect3DDevice2_Release(temp_d3ddevice2) > 0);
@@ -5919,44 +5917,43 @@ static void test_create_device_from_d3d3(void)
surface = NULL;
hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST,
NULL, &surface, surface_callback);
- ok(SUCCEEDED(hr), "Failed to enumerate surfaces (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#lx.\n", hr);
ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface);
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2,
d3drm_d3ddevice2);
/* Check properties of render target and depth surfaces */
hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
- ok(SUCCEEDED(hr), "Cannot get surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN|DDSCAPS_3DDEVICE),
- "Expected caps containing %#x, got %#x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps);
+ "Unexpected caps %#lx.\n", desc.ddsCaps.dwCaps);
expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
ok(ds == d3drm_ds, "Expected depth surface (%p) == surface created internally (%p).\n", ds, d3drm_ds);
desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc);
- ok(SUCCEEDED(hr), "Cannot get z surface desc structure (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get z surface desc structure, hr %#lx.\n", hr);
- ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n",
+ ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %lu, %lu, got %lu, %lu.\n",
rc.right, rc.bottom, desc.dwWidth, desc.dwHeight);
- ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %#x.\n",
- DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps);
+ ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Unexpected caps %#lx.\n",desc.ddsCaps.dwCaps);
expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH;
- ok(desc.dwFlags == expected_flags, "Expected %#x for flags, got %#x.\n", expected_flags, desc.dwFlags);
+ ok(desc.dwFlags == expected_flags, "Expected %#lx for flags, got %#lx.\n", expected_flags, desc.dwFlags);
IDirectDrawSurface_Release(d3drm_ds);
IDirectDrawSurface_Release(ds);
@@ -5964,14 +5961,14 @@ static void test_create_device_from_d3d3(void)
IDirect3DDevice2_Release(d3drm_d3ddevice2);
IDirect3DRMDevice3_Release(device3);
ref3 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3);
+ ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
- ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3);
+ ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %lu , ref3 = %lu.\n", ref2, ref3);
device_ref2 = get_refcount((IUnknown *)d3ddevice2);
- ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %u, device_ref2 = %u.\n",
+ ok(device_ref2 == device_ref1, "Expected device_ref2 == device_ref1, got device_ref1 = %lu, device_ref2 = %lu.\n",
device_ref1, device_ref2);
d3d_ref2 = get_refcount((IUnknown *)d3d2);
- ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %u, d3d_ref2 = %u.\n", d3d_ref1, d3d_ref2);
+ ok(d3d_ref2 == d3d_ref1, "Expected d3d_ref2 == d3d_ref1, got d3d_ref1 = %lu, d3d_ref2 = %lu.\n", d3d_ref1, d3d_ref2);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm1);
@@ -5989,13 +5986,13 @@ static void test_create_device_1(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, &device);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got hr %#lx.\n", hr);
ok(device == NULL, "Expected device returned == NULL, got %p.\n", device);
hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM_Release(d3drm);
}
@@ -6008,15 +6005,15 @@ static void test_create_device_2(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, &device2);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2);
hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm);
@@ -6030,15 +6027,15 @@ static void test_create_device_3(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, &device3);
- ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %#lx.\n", hr);
ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3);
hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
IDirect3DRM3_Release(d3drm3);
IDirect3DRM_Release(d3drm);
@@ -6139,10 +6136,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
ok(img->rgb == TRUE, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
ok(img->bytes_per_line == w * 4, "Test %u: Got unexpected image bytes per line %u, expected %u.\n",
test_idx, img->bytes_per_line, w * 4);
- ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
- ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
- ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
- ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+ ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+ ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+ ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+ ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
ok(!img->palette_size, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size);
ok(!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
for (i = 0; i < h; ++i)
@@ -6166,10 +6163,10 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
ok(img->depth == 8, "Test %u: Got unexpected image depth %u.\n", test_idx, img->depth);
ok(!img->rgb, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb);
- ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask);
- ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask);
- ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask);
- ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask);
+ ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#lx.\n", test_idx, img->red_mask);
+ ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#lx.\n", test_idx, img->green_mask);
+ ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#lx.\n", test_idx, img->blue_mask);
+ ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#lx.\n", test_idx, img->alpha_mask);
ok(!!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette);
if (!palettized)
{
@@ -6265,58 +6262,58 @@ static void test_load_texture(void)
};
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#x.\n", hr);
+ ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
/* Test all failures together. */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
ok(!texture1, "Got unexpected texture %p.\n", texture1);
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm1, "", &texture1);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture1, "Got unexpected texture %p.\n", texture1);
hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture2, "Got unexpected texture %p.\n", texture2);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_LoadTexture(d3drm2, "", &texture2);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture2, "Got unexpected texture %p.\n", texture2);
hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture3, "Got unexpected texture %p.\n", texture3);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM_LoadTexture(d3drm3, "", &texture3);
- ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#lx.\n", hr);
ok(!texture3, "Got unexpected texture %p.\n", texture3);
hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized);
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
@@ -6324,56 +6321,56 @@ static void test_load_texture(void)
test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture, (void **)&texture1);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture2_Release(texture2);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture2, (void **)&texture2);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture2_Release(texture2);
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
- ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %u, ref2 %u.\n", i, ref1, ref2);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2);
hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IDirect3DRM_Release(d3drm1);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
@@ -6381,24 +6378,24 @@ static void test_load_texture(void)
/* Test whether querying a version 1 texture from version 3 causes a
* change in the loading behavior. */
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#lx.\n", hr);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture3_Release(texture3);
ref2 = get_refcount((IUnknown *)d3drm1);
- ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2);
hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture,
NULL, &IID_IDirect3DRMTexture3, (void **)&texture3);
- ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, "");
- ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
- ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#lx.\n", i, hr);
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
@@ -6499,34 +6496,34 @@ static void test_texture_qi(void)
BOOL check;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
filename = create_bitmap(1, 1, TRUE);
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture_QueryInterface(texture1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture, hr %#lx\n", hr);
IDirect3DRMTexture_Release(texture1);
test_qi("texture1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
hr = IDirect3DRMTexture2_QueryInterface(texture2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2 (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2, hr %#lx\n", hr);
IDirect3DRMTexture2_Release(texture2);
test_qi("texture2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
- ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr);
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3 (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3, hr %#lx\n", hr);
IDirect3DRMTexture3_Release(texture3);
test_qi("texture3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6535,7 +6532,7 @@ static void test_texture_qi(void)
IDirect3DRM2_Release(d3drm2);
IDirect3DRM_Release(d3drm1);
check = DeleteFileA(filename);
- ok(check, "Cannot delete image stored in %s (error = %d).\n", filename, GetLastError());
+ ok(check, "Cannot delete image stored in %s (error = %ld).\n", filename, GetLastError());
HeapFree(GetProcessHeap(), 0, filename);
}
@@ -6628,31 +6625,31 @@ static void test_viewport_qi(void)
};
hr = DirectDrawCreateClipper(0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDrawClipper interface, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 640, 480, &device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, 640, 480, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport1);
test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM2_CreateViewport(d3drm2, device1, camera1, 0, 0, 640, 480, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport1);
test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6661,17 +6658,17 @@ static void test_viewport_qi(void)
IDirect3DRMFrame_Release(frame1);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 640, 480, &device3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, 640, 480, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IUnknown interface, hr %#lx.\n", hr);
IDirect3DRMViewport_Release(viewport2);
test_qi("viewport2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
@@ -6696,14 +6693,14 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface *surface, UINT x, UINT y)
surface_desc.dwSize = sizeof(surface_desc);
hr = IDirectDrawSurface_Lock(surface, &rect, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL);
- ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to lock surface, hr %#lx.\n", hr);
if (FAILED(hr))
return 0xdeadbeef;
color = *((DWORD *)surface_desc.lpSurface) & 0x00ffffff;
hr = IDirectDrawSurface_Unlock(surface, NULL);
- ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#lx.\n", hr);
return color;
}
@@ -6719,7 +6716,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
GetClientRect(window, &rc);
hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -6729,7 +6726,7 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win
surface_desc.dwHeight = rc.bottom;
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw2_QueryInterface(ddraw, &IID_IDirect3D2, (void **)&d3d);
if (FAILED(hr))
@@ -6755,7 +6752,7 @@ static void clear_depth_surface(IDirectDrawSurface *surface, DWORD value)
U5(fx).dwFillDepth = value;
hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx);
- ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
}
static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex_count, UINT offset, UINT len)
@@ -6769,7 +6766,7 @@ static void set_execute_data(IDirect3DExecuteBuffer *execute_buffer, UINT vertex
exec_data.dwInstructionOffset = offset;
exec_data.dwInstructionLength = len;
hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data);
- ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set execute data, hr %#lx.\n", hr);
}
static void emit_set_ts(void **ptr, D3DTRANSFORMSTATETYPE state, DWORD value)
@@ -6879,17 +6876,17 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
};
hr = IDirect3DDevice_CreateMatrix(device, &world_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, world_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_CreateMatrix(device, &view_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, view_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_CreateMatrix(device, &proj_handle);
- ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Creating a matrix object failed, hr %#lx.\n", hr);
hr = IDirect3DDevice_SetMatrix(device, proj_handle, &mat);
- ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr);
+ ok(hr == D3D_OK, "Setting a matrix object failed, hr %#lx.\n", hr);
memset(&exec_desc, 0, sizeof(exec_desc));
exec_desc.dwSize = sizeof(exec_desc);
@@ -6898,10 +6895,10 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY;
hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL);
- ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#lx.\n", hr);
hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc);
- ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#lx.\n", hr);
memcpy(exec_desc.lpData, quad_strip, sizeof(quad_strip));
ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad_strip);
@@ -6922,14 +6919,14 @@ static void d3d_draw_quad1(IDirect3DDevice *device, IDirect3DViewport *viewport)
inst_length -= sizeof(quad_strip);
hr = IDirect3DExecuteBuffer_Unlock(execute_buffer);
- ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#lx.\n", hr);
hr = IDirect3DDevice_BeginScene(device);
set_execute_data(execute_buffer, 4, sizeof(quad_strip), inst_length);
hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED);
- ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#lx.\n", hr);
hr = IDirect3DDevice_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
IDirect3DExecuteBuffer_Release(execute_buffer);
}
@@ -6956,87 +6953,87 @@ static void test_viewport_clear1(void)
GetClientRect(window, &rc);
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = IDirectDraw_CreateClipper(ddraw, 0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateFrame(d3drm1, frame1, &camera1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame interface, hr %#lx\n", hr);
hr = IDirect3DRM_CreateViewport(d3drm1, device1, camera1, 0, 0, rc.right,
rc.bottom, &viewport1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx\n", hr);
/* Fetch immediate mode device and viewport */
hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3d_device1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_GetDirect3DViewport(viewport1, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
hr = IDirect3DDevice_QueryInterface(d3d_device1, &IID_IDirectDrawSurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Clear uses the scene frame's background color. */
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
- ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+ ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(camera1, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(camera1);
- ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
CHECK_REFCOUNT(frame1, 1);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
CHECK_REFCOUNT(frame1, 1);
hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx\n", hr);
ret_color = IDirect3DRMFrame_GetSceneBackground(frame1);
- ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff0000ff, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Fill the depth surface with a value lower than the quad's depth value. */
clear_depth_surface(ds, 0x7fff);
@@ -7044,38 +7041,38 @@ static void test_viewport_clear1(void)
/* Depth test passes here */
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Depth test fails here */
ret_color = get_surface_color(surface, 500, 400);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Check what happens if we release the depth surface that d3drm created, and clear the viewport */
hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
- ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
clear_depth_surface(ds, 0x7fff);
hr = IDirect3DRMViewport_Configure(viewport1, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport_Clear(viewport1);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
IDirectDrawSurface_Release(ds);
d3d_draw_quad1(d3d_device1, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
ret_color = get_surface_color(surface, 500, 400);
- ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x000000ff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
IDirect3DViewport_Release(d3d_viewport);
IDirectDrawSurface_Release(surface);
@@ -7110,29 +7107,29 @@ static void draw_quad2(IDirect3DDevice2 *device, IDirect3DViewport *viewport)
HRESULT hr;
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat);
- ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set world transform, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat);
- ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set view transform, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat);
- ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#lx.\n", hr);
hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport2, (void **)&viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2);
- ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#lx.\n", hr);
IDirect3DViewport2_Release(viewport2);
hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_TRUE);
- ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#lx.\n", hr);
hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL);
- ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set the z function, hr %#lx.\n", hr);
hr = IDirect3DDevice2_BeginScene(device);
- ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to begin scene, hr %#lx.\n", hr);
hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, tquad, 4, 0);
- ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr);
hr = IDirect3DDevice2_EndScene(device);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
}
static void test_viewport_clear2(void)
@@ -7160,156 +7157,156 @@ static void test_viewport_clear2(void)
GetClientRect(window, &rc);
hr = DirectDrawCreate(NULL, &ddraw1, NULL);
- ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create IDirectDraw interface, hr %#lx.\n", hr);
hr = IDirectDraw_SetCooperativeLevel(ddraw1, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = IDirectDraw_CreateClipper(ddraw1, 0, &clipper, NULL);
- ok(SUCCEEDED(hr), "Cannot create clipper (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot create clipper, hr %#lx.\n", hr);
hr = IDirectDrawClipper_SetHWnd(clipper, 0, window);
- ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set HWnd to Clipper, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface (hr = %#x)\n", hr);
+ ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateFrame(d3drm3, frame3, &camera3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMFrame3 interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
rc.bottom, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
/* Fetch immediate mode device in order to access render target and test its color. */
hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3d_device2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DDevice2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Clear uses the scene frame's background color. */
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
ret_color = IDirect3DRMFrame3_GetSceneBackground(frame3);
- ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#x.\n", ret_color);
+ ok(ret_color == 0xffffffff, "Expected scene color returned == 0xffffffff, got %#lx.\n", ret_color);
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(camera3, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3);
- ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color);
+ ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#lx.\n", ret_color);
CHECK_REFCOUNT(frame3, 1);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
CHECK_REFCOUNT(frame3, 1);
hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
/* d3drm seems to be calling BeginScene when Clear is called. */
hr = IDirect3DDevice2_BeginScene(d3d_device2);
- todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#x.\n", hr);
+ todo_wine ok(hr == D3DERR_SCENE_IN_SCENE, "Expected hr == D3DERR_SCENE_IN_SCENE, got %#lx.\n", hr);
hr = IDirect3DDevice2_EndScene(d3d_device2);
- ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* We're using d3d to draw using IDirect3DDevice2 created from d3drm. */
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Without calling Configure, Clear doesn't work. */
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Fetch attached depth surface and see if viewport clears it if it's detached from the render target. */
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds);
- ok(SUCCEEDED(hr), "Cannot get attached depth surface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get attached depth surface, hr %#lx.\n", hr);
clear_depth_surface(ds, 0x39);
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
- ok(SUCCEEDED(hr), "Cannot delete attached surface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot delete attached surface, hr %#lx.\n", hr);
d3drm_ds = (IDirectDrawSurface *)0xdeadbeef;
hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &d3drm_ds);
- ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#x.\n", hr);
+ ok(hr == DDERR_NOTFOUND, "Expected hr == DDERR_NOTFOUND, got %#lx.\n", hr);
ok(d3drm_ds == NULL, "Expected NULL z-surface, got %p.\n", d3drm_ds);
clear_depth_surface(ds, 0x7fff);
/* This version of Clear still clears the depth surface even if it's deleted from the render target. */
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
hr = IDirectDrawSurface_AddAttachedSurface(surface, ds);
- ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
draw_quad2(d3d_device2, d3d_viewport);
ret_color = get_surface_color(surface, 100, 200);
- ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
ret_color = get_surface_color(surface, 500, 400);
- todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08lx.\n", ret_color);
/* Remove old draw contents */
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 0.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
- ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot set scene background RGB, hr %#lx.\n", hr);
/* Clear with no flags */
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, 0);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
- todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+ todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
IDirect3DViewport_Release(d3d_viewport);
IDirectDrawSurface_Release(surface);
@@ -7320,28 +7317,28 @@ static void test_viewport_clear2(void)
/* Create device without depth surface attached */
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2);
- ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirectDraw2 interface, hr %#lx.\n", hr);
hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D2, (void **)&d3d2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3D2 interface, hr %#lx.\n", hr);
d3d_device2 = create_device2_without_ds(ddraw2, window);
if (!d3d_device2)
goto cleanup;
hr = IDirect3DRM3_CreateDeviceFromD3D(d3drm3, d3d2, d3d_device2, &device3);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRMDevice interface, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateViewport(d3drm3, device3, camera3, 0, 0, rc.right,
rc.bottom, &viewport2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface, hr %#lx.\n", hr);
hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface);
- ok(SUCCEEDED(hr), "Cannot get surface to the render target (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get surface to the render target, hr %#lx.\n", hr);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
ret_color = get_surface_color(surface, 320, 240);
- ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color);
+ ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08lx.\n", ret_color);
hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ZBUFFER);
- ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot clear viewport, hr %#lx.\n", hr);
IDirectDrawSurface_Release(surface);
IDirect3DRMViewport2_Release(viewport2);
@@ -7384,22 +7381,22 @@ static void test_create_texture_from_surface(void)
RECT rc;
hr = DirectDrawCreate(NULL, &ddraw, NULL);
- ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr);
+ ok(hr == DD_OK, "Cannot get IDirectDraw interface, hr %#lx.\n", hr);
window = create_window();
GetClientRect(window, &rc);
hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
- ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#lx.\n", hr);
hr = Direct3DRMCreate(&d3drm1);
- ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface, hr %#lx.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface, hr %#lx.\n", hr);
/* Create a surface and use it to create a texture. */
memset(&desc, 0, sizeof(desc));
@@ -7410,82 +7407,82 @@ static void test_create_texture_from_surface(void)
desc.dwHeight = rc.bottom;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface2, NULL);
- ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create surface, hr %#lx.\n", hr);
/* Test NULL params */
texture1 = (IDirect3DRMTexture *)0xdeadbeef;
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, &texture1);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1);
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
texture2 = (IDirect3DRMTexture2 *)0xdeadbeef;
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, &texture2);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2);
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
texture3 = (IDirect3DRMTexture3 *)0xdeadbeef;
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, &texture3);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3);
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, surface, &texture1);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture_GetImage(texture1);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture_InitFromSurface(texture1, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
IDirect3DRMTexture_Release(texture1);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, surface, &texture2);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture2_GetImage(texture2);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture2_InitFromSurface(texture2, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#lx.\n", hr);
IDirect3DRMTexture_Release(texture2);
ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n");
hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, surface, &texture3);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr);
ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n");
image = IDirect3DRMTexture3_GetImage(texture3);
ok(image == NULL, "Unexpected image, %p.\n", image);
hr = IDirect3DRMTexture3_InitFromSurface(texture3, NULL);
- ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
- ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
ok(ds == surface, "Expected same surface back.\n");
IDirectDrawSurface_Release(ds);
/* Init already initialized texture with same surface. */
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
/* Init already initialized texture with different surface. */
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface2);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds);
- ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get surface, hr %#lx.\n", hr);
ok(ds == surface, "Expected same surface back.\n");
IDirectDrawSurface_Release(ds);
@@ -7493,7 +7490,7 @@ static void test_create_texture_from_surface(void)
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7504,13 +7501,13 @@ static void test_create_texture_from_surface(void)
/* Create from image, initialize from surface. */
hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3);
- ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx.\n", hr);
ref1 = get_refcount((IUnknown *)d3drm1);
ref2 = get_refcount((IUnknown *)d3drm2);
ref3 = get_refcount((IUnknown *)d3drm3);
hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface);
- ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#lx.\n", hr);
ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n");
ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n");
ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n");
@@ -7543,27 +7540,27 @@ static void test_animation(void)
D3DVECTOR v;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateAnimation(d3drm1, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr 0x%08x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
CHECK_REFCOUNT(d3drm1, 1);
hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
- ok(SUCCEEDED(hr), "Failed to create animation hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
CHECK_REFCOUNT(d3drm1, 2);
test_class_name((IDirect3DRMObject *)animation, "Animation");
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMAnimation2, (void **)&animation2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMAnimation2, hr %#lx.\n", hr);
ok(animation != (void *)animation2, "Expected different interface pointer.\n");
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IDirect3DRMObject, (void **)&obj);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IDirect3DRMObject, (void **)&obj2);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr 0x%08x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#lx.\n", hr);
ok(obj == obj2 && obj == (IDirect3DRMObject *)animation, "Unexpected object pointer.\n");
@@ -7572,35 +7569,35 @@ static void test_animation(void)
/* Set animated frame, get it back. */
hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame);
- ok(SUCCEEDED(hr), "Failed to create a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create a frame, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
- ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame, 1);
hr = IDirect3DRMAnimation_SetFrame(animation, frame);
- ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame, 1);
hr = IDirect3DRMAnimation2_GetFrame(animation2, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_GetFrame(animation2, &frame3);
- ok(SUCCEEDED(hr), "Failed to get the frame, %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get the frame, hr %#lx.\n", hr);
ok(frame3 != (void *)frame, "Unexpected interface pointer.\n");
CHECK_REFCOUNT(frame, 2);
IDirect3DRMFrame3_Release(frame3);
hr = IDirect3DRMAnimation_SetFrame(animation, NULL);
- ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to reset frame, hr %#lx.\n", hr);
hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&frame3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame3, 2);
hr = IDirect3DRMAnimation2_SetFrame(animation2, frame3);
- ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set a frame, hr %#lx.\n", hr);
CHECK_REFCOUNT(frame3, 2);
IDirect3DRMFrame3_Release(frame3);
@@ -7609,70 +7606,70 @@ static void test_animation(void)
/* Animation options. */
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Undefined mask value */
hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Ambiguous mask */
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION),
- "Unexpected default options %#x.\n", options);
+ "Unexpected default options %#lx.\n", options);
/* Mask contains undefined bits together with valid one. */
hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000 | D3DRMANIMATION_OPEN);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#x.\n", options);
+ ok(options == (0xf0000000 | D3DRMANIMATION_OPEN), "Unexpected animation options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN);
- ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to set animation options, hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
hr = IDirect3DRMAnimation_SetOptions(animation, 0);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
options = IDirect3DRMAnimation_GetOptions(animation);
- ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options);
+ ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#lx.\n", options);
/* Key management. */
hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 1.0f, 0.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
- ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 0.0f, 2.0f, 0.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 99.0f, 3.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddPositionKey(animation, 80.0f, 4.0f, 1.0f, 0.0f);
- ok(SUCCEEDED(hr), "Failed to add position key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add position key, hr %#lx.\n", hr);
v.x = 1.0f;
v.y = 0.0f;
@@ -7681,20 +7678,20 @@ static void test_animation(void)
/* NULL quaternion pointer leads to a crash on Windows. */
hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
- ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 99.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
/* Relative order, keys are returned sorted by time. */
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7710,23 +7707,23 @@ static void test_animation(void)
for (i = 0; i < count; i++)
{
- ok(keys[i].dwSize == sizeof(*keys), "%u: unexpected dwSize value %u.\n", i, keys[i].dwSize);
+ ok(keys[i].dwSize == sizeof(*keys), "%lu: unexpected dwSize value %lu.\n", i, keys[i].dwSize);
todo_wine
{
switch (keys[i].dwKeyType)
{
case D3DRMANIMATION_ROTATEKEY:
- ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
case D3DRMANIMATION_POSITIONKEY:
- ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
case D3DRMANIMATION_SCALEKEY:
- ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%u: unexpected id mask %#x.\n", i, keys[i].dwID);
+ ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID);
break;
default:
- ok(0, "%u: unknown key type %d.\n", i, keys[i].dwKeyType);
+ ok(0, "%lu: unknown key type %ld.\n", i, keys[i].dwKeyType);
}
}
}
@@ -7734,86 +7731,86 @@ static void test_animation(void)
/* No keys in this range. */
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, NULL);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 100.0f, 200.0f, &count, keys);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 0.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 4, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 4, "Unexpected key count %lu.\n", count);
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
/* Time is 0-based. */
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, NULL, NULL);
- ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, -50.0f, &count, NULL);
- ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#x.\n", hr);
- ok(count == 0, "Unexpected key count %u.\n", count);
+ ok(hr == D3DRMERR_NOSUCHKEY, "Unexpected hr %#lx.\n", hr);
+ ok(count == 0, "Unexpected key count %lu.\n", count);
count = 10;
hr = IDirect3DRMAnimation2_GetKeys(animation2, -100.0f, 100.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get animation keys, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
/* AddKey() tests. */
hr = IDirect3DRMAnimation2_AddKey(animation2, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key) - 1;
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key) + 1;
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
memset(&key, 0, sizeof(key));
key.dwSize = sizeof(key);
key.dwKeyType = D3DRMANIMATION_POSITIONKEY;
key.dvPositionKey.x = 8.0f;
hr = IDirect3DRMAnimation2_AddKey(animation2, &key);
- ok(SUCCEEDED(hr), "Failed to add key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add key, hr %#lx.\n", hr);
/* Delete tests. */
hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q);
- ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f);
- ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to add scale key, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, -1000.0f, 1000.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 9, "Unexpected key count %u.\n", count);
-
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
- ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[6].dwKeyType);
- ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[7].dwKeyType);
- ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[8].dwKeyType);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 9, "Unexpected key count %lu.\n", count);
+
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
+ ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[6].dwKeyType);
+ ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[7].dwKeyType);
+ ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[8].dwKeyType);
ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7826,27 +7823,27 @@ static void test_animation(void)
ok(keys[8].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[8].dvTime);
hr = IDirect3DRMAnimation_DeleteKey(animation, -100.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_DeleteKey(animation, 100.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
/* Only first Position keys are not removed. */
hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
count = 0;
memset(keys, 0, sizeof(keys));
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, keys);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 6, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 6, "Unexpected key count %lu.\n", count);
- ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType);
- ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType);
- ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType);
- ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType);
- ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType);
- ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType);
+ ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %lu.\n", keys[0].dwKeyType);
+ ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[1].dwKeyType);
+ ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[2].dwKeyType);
+ ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[3].dwKeyType);
+ ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %lu.\n", keys[4].dwKeyType);
+ ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %lu.\n", keys[5].dwKeyType);
ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime);
ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime);
@@ -7856,12 +7853,12 @@ static void test_animation(void)
ok(keys[5].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[5].dvTime);
hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f);
- ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to delete keys, hr %#lx.\n", hr);
count = 0;
hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, NULL);
- ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr);
- ok(count == 3, "Unexpected key count %u.\n", count);
+ ok(SUCCEEDED(hr), "Failed to get key count, hr %#lx.\n", hr);
+ ok(count == 3, "Unexpected key count %lu.\n", count);
IDirect3DRMAnimation2_Release(animation2);
IDirect3DRMAnimation_Release(animation);
@@ -7945,26 +7942,26 @@ static void test_animation_qi(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateAnimation(d3drm1, &animation);
- ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
IDirect3DRMAnimation_Release(animation);
test_qi("animation_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
- ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#lx.\n", hr);
hr = IDirect3DRM3_CreateAnimation(d3drm3, &animation2);
- ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create animation hr %#lx.\n", hr);
hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#lx.\n", hr);
IDirect3DRMAnimation2_Release(animation2);
test_qi("animation2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
@@ -7981,10 +7978,10 @@ static void test_wrap(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create IDirect3DRM instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
- ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
test_class_name((IDirect3DRMObject *)wrap, "");
@@ -8067,13 +8064,13 @@ static void test_wrap_qi(void)
HRESULT hr;
hr = Direct3DRMCreate(&d3drm1);
- ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#lx.\n", hr);
hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMWrap, NULL, &IID_IDirect3DRMWrap, (void **)&wrap);
- ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create wrap instance, hr %#lx.\n", hr);
hr = IDirect3DRMWrap_QueryInterface(wrap, &IID_IUnknown, (void **)&unknown);
- ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap (hr = %#x)\n", hr);
+ ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap, hr %#lx.\n", hr);
IDirect3DRMWrap_Release(wrap);
test_qi("wrap_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests));
IUnknown_Release(unknown);
--
2.35.1
1
0
05 May '22
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/ntdll/ntdll.spec | 2 ++
dlls/ntdll/unix/loader.c | 1 +
dlls/ntdll/unix/virtual.c | 9 +++++++++
dlls/wow64/syscall.h | 1 +
dlls/wow64/virtual.c | 13 +++++++++++++
include/winternl.h | 1 +
6 files changed, 27 insertions(+)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index a7a39a0bce2..b1650ab4306 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -427,6 +427,7 @@
@ stdcall -syscall NtUnlockFile(long ptr ptr ptr ptr)
@ stdcall -syscall NtUnlockVirtualMemory(long ptr ptr long)
@ stdcall -syscall NtUnmapViewOfSection(long ptr)
+@ stdcall -syscall NtUnmapViewOfSectionEx(long ptr long)
# @ stub NtVdmControl
# @ stub NtW32Call
@ stdcall -syscall NtWaitForAlertByThreadId(ptr ptr)
@@ -1454,6 +1455,7 @@
@ stdcall -private -syscall ZwUnlockFile(long ptr ptr ptr ptr) NtUnlockFile
@ stdcall -private -syscall ZwUnlockVirtualMemory(long ptr ptr long) NtUnlockVirtualMemory
@ stdcall -private -syscall ZwUnmapViewOfSection(long ptr) NtUnmapViewOfSection
+@ stdcall -private -syscall ZwUnmapViewOfSectionEx(long ptr long) NtUnmapViewOfSectionEx
# @ stub ZwVdmControl
# @ stub ZwW32Call
@ stdcall -private -syscall ZwWaitForAlertByThreadId(ptr ptr) NtWaitForAlertByThreadId
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index cad760a1445..7f85582adf3 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -336,6 +336,7 @@ static void * const syscalls[] =
NtUnlockFile,
NtUnlockVirtualMemory,
NtUnmapViewOfSection,
+ NtUnmapViewOfSectionEx,
NtWaitForAlertByThreadId,
NtWaitForDebugEvent,
NtWaitForKeyedEvent,
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 02478cceb06..6ecca9cb98a 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -4610,6 +4610,15 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr )
return status;
}
+/***********************************************************************
+ * NtUnmapViewOfSectionEx (NTDLL.@)
+ * ZwUnmapViewOfSectionEx (NTDLL.@)
+ */
+NTSTATUS WINAPI NtUnmapViewOfSectionEx( HANDLE process, PVOID addr, ULONG flags )
+{
+ if (flags) FIXME("Ignoring flags %#x.\n", flags);
+ return NtUnmapViewOfSection( process, addr );
+}
/******************************************************************************
* virtual_fill_image_information
diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h
index 3b364d909d7..bd107ce0ef5 100644
--- a/dlls/wow64/syscall.h
+++ b/dlls/wow64/syscall.h
@@ -237,6 +237,7 @@
SYSCALL_ENTRY( NtUnlockFile ) \
SYSCALL_ENTRY( NtUnlockVirtualMemory ) \
SYSCALL_ENTRY( NtUnmapViewOfSection ) \
+ SYSCALL_ENTRY( NtUnmapViewOfSectionEx ) \
SYSCALL_ENTRY( NtWaitForAlertByThreadId ) \
SYSCALL_ENTRY( NtWaitForDebugEvent ) \
SYSCALL_ENTRY( NtWaitForKeyedEvent ) \
diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c
index 61c84e5d7be..c21464857fa 100644
--- a/dlls/wow64/virtual.c
+++ b/dlls/wow64/virtual.c
@@ -525,6 +525,19 @@ NTSTATUS WINAPI wow64_NtUnmapViewOfSection( UINT *args )
}
+/**********************************************************************
+ * wow64_NtUnmapViewOfSectionEx
+ */
+NTSTATUS WINAPI wow64_NtUnmapViewOfSectionEx( UINT *args )
+{
+ HANDLE process = get_handle( &args );
+ void *addr = get_ptr( &args );
+ ULONG flags = get_ulong( &args );
+
+ return NtUnmapViewOfSectionEx( process, addr, flags );
+}
+
+
/**********************************************************************
* wow64_NtWow64AllocateVirtualMemory64
*/
diff --git a/include/winternl.h b/include/winternl.h
index 1d358fc0b2d..84babcbb0e9 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -4160,6 +4160,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnloadKeyEx(POBJECT_ATTRIBUTES,HANDLE);
NTSYSAPI NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,PULONG);
NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG);
NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID);
+NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSectionEx(HANDLE,PVOID,ULONG);
NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID);
NTSYSAPI NTSTATUS WINAPI NtWaitForAlertByThreadId(const void*,const LARGE_INTEGER*);
NTSYSAPI NTSTATUS WINAPI NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*);
--
2.35.1
1
1
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/winealsa.drv/alsa.c | 4 ++--
dlls/winealsa.drv/mmdevdrv.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 8b6a87aa864c..33b405a884cf 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -637,7 +637,7 @@ static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt)
return format;
}
-static int alsa_channel_index(DWORD flag)
+static int alsa_channel_index(UINT flag)
{
switch(flag){
case SPEAKER_FRONT_LEFT:
@@ -702,7 +702,7 @@ static HRESULT map_channels(EDataFlow flow, const WAVEFORMATEX *fmt, int *alsa_c
if(flow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){
WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt;
- DWORD mask, flag = SPEAKER_FRONT_LEFT;
+ UINT mask, flag = SPEAKER_FRONT_LEFT;
UINT i = 0;
if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 1a99f0ac26c9..855fb68f457a 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -1363,7 +1363,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface,
params.stream = This->stream;
params.data = data;
params.frames = frames;
- params.flags = flags;
+ params.flags = (UINT32*)flags;
params.devpos = devpos;
params.qpcpos = qpcpos;
1
1
[PATCH 1/6] server: Do not signal read/write bits if there are read/write asyncs waiting.
by Zebediah Figura 05 May '22
by Zebediah Figura 05 May '22
05 May '22
This is validated by tests introduced in
59beffb46c813a3de2eae6f28e3f7f321f666e89 etc. This commit alone doesn't fix said
tests, because:
* on this poll, we will alert the waiting async;
* when reselecting, we will still request POLLIN, because the AFD_POLL_READ
request is still active,
* when POLLIN is subsequently signaled, we do not remove it in
sock_dispatch_asyncs(), because we check async_waiting(), not async_queued().
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
server/sock.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/server/sock.c b/server/sock.c
index 29dd1ca7fa8..db0df5ecf79 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -1179,10 +1179,9 @@ static void sock_poll_event( struct fd *fd, int event )
break;
}
- complete_async_polls( sock, event, error );
-
event = sock_dispatch_asyncs( sock, event, error );
sock_dispatch_events( sock, prevstate, event, error );
+ complete_async_polls( sock, event, error );
sock_reselect( sock );
}
--
2.34.1
1
5
Needed by winusb.h.
Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com>
---
include/Makefile.in | 1 +
include/ddk/winusbio.h | 66 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+)
create mode 100644 include/ddk/winusbio.h
diff --git a/include/Makefile.in b/include/Makefile.in
index f3e62c4bb5a..58bf7db1e13 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -211,6 +211,7 @@ SOURCES = \
ddk/wdm.h \
ddk/winddiui.h \
ddk/winsplp.h \
+ ddk/winusbio.h \
ddk/wsk.h \
ddraw.h \
ddrawgdi.h \
diff --git a/include/ddk/winusbio.h b/include/ddk/winusbio.h
new file mode 100644
index 00000000000..14d8230d87f
--- /dev/null
+++ b/include/ddk/winusbio.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2022 Mohamad Al-Jaf
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef _WINUSBIO_H_
+#define _WINUSBIO_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+DEFINE_GUID(WinUSB_TestGuid, 0XDA812BFF, 0X12C3, 0X46A2, 0X8E, 0X2B, 0XDB, 0XD3, 0XB7, 0X83, 0X4C, 0X43);
+
+#define SHORT_PACKET_TERMINATE 0x01
+#define AUTO_CLEAR_STALL 0x02
+#define PIPE_TRANSFER_TIMEOUT 0x03
+#define IGNORE_SHORT_PACKETS 0x04
+#define ALLOW_PARTIAL_READS 0x05
+#define AUTO_FLUSH 0x06
+#define RAW_IO 0x07
+#define MAXIMUM_TRANSFER_SIZE 0x08
+#define RESET_PIPE_ON_RESUME 0x09
+
+typedef struct _WINUSB_PIPE_INFORMATION {
+ USBD_PIPE_TYPE PipeType;
+ UCHAR PipeId;
+ USHORT MaximumPacketSize;
+ UCHAR Interval;
+} WINUSB_PIPE_INFORMATION, *PWINUSB_PIPE_INFORMATION;
+
+#define AUTO_SUSPEND 0x81
+#define SUSPEND_DELAY 0x83
+
+#define DEVICE_SPEED 0x01
+
+#define LowSpeed 0x01
+#define FullSpeed 0x02
+#define HighSpeed 0x03
+
+typedef struct _WINUSB_PIPE_INFORMATION_EX {
+ USBD_PIPE_TYPE PipeType;
+ UCHAR PipeId;
+ USHORT MaximumPacketSize;
+ UCHAR Interval;
+ ULONG MaximumBytesPerInterval;
+} WINUSB_PIPE_INFORMATION_EX, *PWINUSB_PIPE_INFORMATION_EX;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINUSBIO_H_ */
--
2.36.0
1
5
[PATCH v2 resend] ntdll: Avoid the lower 2GB region for large allocations on win64.
by Elaine Lefler 05 May '22
by Elaine Lefler 05 May '22
05 May '22
Fixes a crash in PaintTool SAI when allocating more than 2GB of memory.
Signed-off-by: Elaine Lefler <elaineclefler(a)gmail.com>
---
v2: Removed todo_wine from appropriate tests, along with a note about
why that test is broken on win32.
---
dlls/ntdll/tests/info.c | 16 ++++++++++++----
dlls/ntdll/unix/virtual.c | 6 +++++-
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index 89503093b17..4f2441d95d8 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -1839,8 +1839,13 @@ static void test_query_process_vm(void)
ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage );
if (winetest_debug > 1)
dump_vm_counters("VM counters after VirtualAlloc", &pvi);
- todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size,
- "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize);
+#ifndef _WIN64
+ /* Fails on win32 due to mapping in reserved areas. The unused regions
+ * should be subtracted from VirtualSize for it to succeed. */
+ todo_wine
+#endif
+ ok( pvi.VirtualSize >= prev_size + alloc_size,
+ "Expected to be at least %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize);
VirtualFree( ptr, 0, MEM_RELEASE);
status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL);
@@ -1856,8 +1861,11 @@ static void test_query_process_vm(void)
ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage );
if (winetest_debug > 1)
dump_vm_counters("VM counters after VirtualAlloc(MEM_RESERVE)", &pvi);
- todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size,
- "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize);
+#ifndef _WIN64
+ todo_wine
+#endif
+ ok( pvi.VirtualSize >= prev_size + alloc_size,
+ "Expected to be at least %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize);
prev_size = pvi.VirtualSize;
ptr = VirtualAlloc(ptr, alloc_size, MEM_COMMIT, PAGE_READWRITE);
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 02478cceb06..93a4495adb9 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -1917,7 +1917,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
alloc.top_down = top_down;
alloc.limit = (void*)(get_zero_bits_mask( zero_bits ) & (UINT_PTR)user_space_limit);
- if (mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down ))
+ if (
+#ifdef _WIN64
+ size < 2 * 1024 * 1024 &&
+#endif
+ mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down ))
{
ptr = alloc.result;
TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size );
--
2.32.0 (Apple Git-132)
2
1
04 May '22
Called by IE11.
Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com>
---
dlls/shell32/pidl.c | 9 +++++++++
dlls/shell32/shell32.spec | 1 +
include/shlobj.h | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 4c66a14c700..a87a8762a26 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1285,6 +1285,15 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si
return SUCCEEDED(hr);
}
+/*************************************************************************
+ * SHBindToFolderIDListParent [SHELL32.@]
+ */
+HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast)
+{
+ FIXME("(%p, %p, %s, %p, %p) - semi-stub\n", psf, pidl, debugstr_guid(riid), ppv, ppidlLast);
+ return SHBindToParent(pidl, riid, ppv, ppidlLast);
+}
+
/*************************************************************************
* SHBindToParent [shell version 5.0]
*/
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index f8bf8f246e8..6348fcb3a6d 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -333,6 +333,7 @@
@ stdcall SHAppBarMessage(long ptr)
@ stdcall SHAssocEnumHandlers(wstr long ptr)
@ stdcall SHBindToObject(ptr ptr ptr ptr ptr)
+@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr)
@ stdcall SHBindToParent(ptr ptr ptr ptr)
@ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA
@ stdcall SHBrowseForFolderA(ptr)
diff --git a/include/shlobj.h b/include/shlobj.h
index d30944662f7..f4ef2edf76b 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1639,6 +1639,11 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwF
*/
HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *);
+/****************************************************************************
+ * SHBindToFolderIDListParent API
+ */
+HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast);
+
/****************************************************************************
* SHBindToParent API
*/
--
2.36.0
2
6
[PATCH v3 1/2] ntdll/tests: Test NtMapViewOfSection with a 64-bit DLL and zero_bits > 31.
by Brendan Shanks 04 May '22
by Brendan Shanks 04 May '22
04 May '22
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
v3: Only run test on 64-bit (it can never fail on 32-bit).
dlls/ntdll/tests/virtual.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c
index 30a97ba9d94..5d6a7d1eac0 100644
--- a/dlls/ntdll/tests/virtual.c
+++ b/dlls/ntdll/tests/virtual.c
@@ -904,6 +904,33 @@ static void test_NtMapViewOfSection(void)
CloseHandle(file);
DeleteFileA(testfile);
+ /* test zero_bits > 31 with a 64-bit DLL file image mapping */
+ if (is_win64)
+ {
+ file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0);
+ ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n");
+
+ mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL);
+ ok(mapping != 0, "CreateFileMapping failed\n");
+
+ ptr = NULL;
+ size = 0;
+ offset.QuadPart = 0;
+ zero_bits = 0x7fffffff;
+ status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY);
+
+ ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status);
+ ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr);
+ todo_wine
+ ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr);
+
+ status = NtUnmapViewOfSection(process, ptr);
+ ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status);
+
+ NtClose(mapping);
+ CloseHandle(file);
+ }
+
TerminateProcess(process, 0);
CloseHandle(process);
}
--
2.35.1
2
2
[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Use a more sensible source location in add_constructor().
by Giovanni Mascellani 04 May '22
by Giovanni Mascellani 04 May '22
04 May '22
Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
libs/vkd3d-shader/hlsl.y | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 905dbfc5..e518430f 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -2049,7 +2049,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type
continue;
}
- initialize_var_components(ctx, params->instrs, var, &idx, arg, &loc);
+ initialize_var_components(ctx, params->instrs, var, &idx, arg, &arg->loc);
}
if (!(load = hlsl_new_var_load(ctx, var, loc)))
--
2.36.0
4
28
[PATCH 0/5] MR34: windows.media.speech: Changes for IAsyncAction.
by Bernhard Kölbl (ï¼ besentv) 04 May '22
by Bernhard Kölbl (ï¼ besentv) 04 May '22
04 May '22
Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/34
3
6
04 May '22
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/wineoss.drv/oss.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c
index 0c9fef90d58..e9616a84b36 100644
--- a/dlls/wineoss.drv/oss.c
+++ b/dlls/wineoss.drv/oss.c
@@ -1961,6 +1961,29 @@ static NTSTATUS wow64_set_event_handle(void *args)
return STATUS_SUCCESS;
}
+static NTSTATUS wow64_aux_message(void *args)
+{
+ struct
+ {
+ UINT dev_id;
+ UINT msg;
+ UINT user;
+ UINT param_1;
+ UINT param_2;
+ PTR32 err;
+ } *params32 = args;
+ struct aux_message_params params =
+ {
+ .dev_id = params32->dev_id,
+ .msg = params32->msg,
+ .user = params32->user,
+ .param_1 = params32->param_1,
+ .param_2 = params32->param_2,
+ .err = ULongToPtr(params32->err),
+ };
+ return aux_message(¶ms);
+}
+
unixlib_entry_t __wine_unix_call_wow64_funcs[] =
{
test_connect,
@@ -1990,7 +2013,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] =
wow64_midi_out_message,
wow64_midi_in_message,
wow64_midi_notify_wait,
- aux_message,
+ wow64_aux_message,
};
#endif /* _WIN64 */
--
2.25.1
2
1
[PATCH 6/7] wineoss: Implement Wow64 midi entry points in the Unix library.
by Huw Davies 04 May '22
by Huw Davies 04 May '22
04 May '22
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/wineoss.drv/oss.c | 6 +-
dlls/wineoss.drv/ossmidi.c | 354 +++++++++++++++++++++++++++++++++++++
dlls/wineoss.drv/unixlib.h | 6 +
3 files changed, 363 insertions(+), 3 deletions(-)
diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c
index 9f2cba68f86..0c9fef90d58 100644
--- a/dlls/wineoss.drv/oss.c
+++ b/dlls/wineoss.drv/oss.c
@@ -1987,9 +1987,9 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] =
wow64_set_event_handle,
is_started,
midi_release,
- midi_out_message,
- midi_in_message,
- midi_notify_wait,
+ wow64_midi_out_message,
+ wow64_midi_in_message,
+ wow64_midi_notify_wait,
aux_message,
};
diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c
index 6677609a5a6..09eed8085c4 100644
--- a/dlls/wineoss.drv/ossmidi.c
+++ b/dlls/wineoss.drv/ossmidi.c
@@ -1771,3 +1771,357 @@ NTSTATUS midi_notify_wait(void *args)
return STATUS_SUCCESS;
}
+
+#ifdef _WIN64
+
+typedef UINT PTR32;
+
+struct notify_context32
+{
+ BOOL send_notify;
+ WORD dev_id;
+ WORD msg;
+ UINT param_1;
+ UINT param_2;
+ UINT callback;
+ UINT flags;
+ PTR32 device;
+ UINT instance;
+};
+
+static void notify_to_notify32(struct notify_context32 *notify32,
+ const struct notify_context *notify)
+{
+ notify32->send_notify = notify->send_notify;
+ notify32->dev_id = notify->dev_id;
+ notify32->msg = notify->msg;
+ notify32->param_1 = notify->param_1;
+ notify32->param_2 = notify->param_2;
+ notify32->callback = notify->callback;
+ notify32->flags = notify->flags;
+ notify32->device = PtrToUlong(notify->device);
+ notify32->instance = notify->instance;
+}
+
+struct midi_open_desc32
+{
+ PTR32 hMidi;
+ UINT dwCallback;
+ UINT dwInstance;
+ UINT dnDevNode;
+ UINT cIds;
+ MIDIOPENSTRMID rgIds;
+};
+
+struct midi_hdr32
+{
+ PTR32 lpData;
+ UINT dwBufferLength;
+ UINT dwBytesRecorded;
+ UINT dwUser;
+ UINT dwFlags;
+ PTR32 lpNext;
+ UINT reserved;
+ UINT dwOffset;
+ UINT dwReserved[8];
+};
+
+static UINT wow64_midi_out_prepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size)
+{
+ TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
+
+ if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData)
+ return MMSYSERR_INVALPARAM;
+ if (hdr->dwFlags & MHDR_PREPARED)
+ return MMSYSERR_NOERROR;
+
+ hdr->lpNext = 0;
+ hdr->dwFlags |= MHDR_PREPARED;
+ hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE);
+ return MMSYSERR_NOERROR;
+}
+
+static UINT wow64_midi_out_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size)
+{
+ TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
+
+ if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData)
+ return MMSYSERR_INVALPARAM;
+ if (!(hdr->dwFlags & MHDR_PREPARED))
+ return MMSYSERR_NOERROR;
+ if (hdr->dwFlags & MHDR_INQUEUE)
+ return MIDIERR_STILLPLAYING;
+
+ hdr->dwFlags &= ~MHDR_PREPARED;
+ return MMSYSERR_NOERROR;
+}
+
+NTSTATUS wow64_midi_out_message(void *args)
+{
+ struct
+ {
+ UINT dev_id;
+ UINT msg;
+ UINT user;
+ UINT param_1;
+ UINT param_2;
+ PTR32 err;
+ PTR32 notify;
+ } *params32 = args;
+ struct notify_context32 *notify32 = ULongToPtr(params32->notify);
+ struct midi_open_desc32 *desc32;
+ struct midi_hdr32 *hdr32;
+ struct notify_context notify;
+ MIDIOPENDESC open_desc;
+ MIDIHDR hdr;
+ struct midi_out_message_params params =
+ {
+ .dev_id = params32->dev_id,
+ .msg = params32->msg,
+ .user = params32->user,
+ .param_1 = params32->param_1,
+ .param_2 = params32->param_2,
+ .err = ULongToPtr(params32->err),
+ .notify = ¬ify
+ };
+ notify32->send_notify = FALSE;
+
+ switch (params32->msg)
+ {
+ case MODM_OPEN:
+ desc32 = ULongToPtr(params32->param_1);
+
+ open_desc.hMidi = ULongToPtr(desc32->hMidi);
+ open_desc.dwCallback = desc32->dwCallback;
+ open_desc.dwInstance = desc32->dwInstance;
+ open_desc.dnDevNode = desc32->dnDevNode;
+ open_desc.cIds = desc32->cIds;
+ open_desc.rgIds.dwStreamID = desc32->rgIds.dwStreamID;
+ open_desc.rgIds.wDeviceID = desc32->rgIds.wDeviceID;
+
+ params.param_1 = (UINT_PTR)&open_desc;
+ break;
+
+ case MODM_LONGDATA:
+ hdr32 = ULongToPtr(params32->param_1);
+
+ memset(&hdr, 0, sizeof(hdr));
+ hdr.lpData = ULongToPtr(hdr32->lpData);
+ hdr.dwBufferLength = hdr32->dwBufferLength;
+ hdr.dwFlags = hdr32->dwFlags;
+
+ params.param_1 = (UINT_PTR)&hdr;
+ params.param_2 = sizeof(hdr);
+ break;
+
+ case MODM_PREPARE: /* prepare and unprepare are easier to handle explicitly */
+ hdr32 = ULongToPtr(params32->param_1);
+
+ *params.err = wow64_midi_out_prepare(params32->dev_id, hdr32, params32->param_2);
+ return STATUS_SUCCESS;
+
+ case MODM_UNPREPARE:
+ hdr32 = ULongToPtr(params32->param_1);
+
+ *params.err = wow64_midi_out_unprepare(params32->dev_id, hdr32, params32->param_2);
+ return STATUS_SUCCESS;
+ }
+
+ midi_out_message(¶ms);
+
+ switch (params32->msg)
+ {
+ case MODM_LONGDATA:
+ hdr32 = ULongToPtr(params32->param_1);
+
+ hdr32->dwFlags = hdr.dwFlags;
+ break;
+ }
+
+ if (notify.send_notify)
+ {
+ notify_to_notify32(notify32, ¬ify);
+
+ if (notify.msg == MOM_DONE)
+ notify32->param_1 = params32->param_1; /* restore the 32-bit hdr */
+ }
+ return STATUS_SUCCESS;
+}
+
+static UINT wow64_midi_in_prepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size)
+{
+ TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
+
+ if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData)
+ return MMSYSERR_INVALPARAM;
+ if (hdr->dwFlags & MHDR_PREPARED)
+ return MMSYSERR_NOERROR;
+
+ hdr->lpNext = 0;
+ hdr->dwFlags |= MHDR_PREPARED;
+ hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE);
+
+ return MMSYSERR_NOERROR;
+}
+
+static UINT wow64_midi_in_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size)
+{
+ TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size);
+
+ if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData)
+ return MMSYSERR_INVALPARAM;
+ if (!(hdr->dwFlags & MHDR_PREPARED))
+ return MMSYSERR_NOERROR;
+ if (hdr->dwFlags & MHDR_INQUEUE)
+ return MIDIERR_STILLPLAYING;
+
+ hdr->dwFlags &= ~MHDR_PREPARED;
+
+ return MMSYSERR_NOERROR;
+}
+
+NTSTATUS wow64_midi_in_message(void *args)
+{
+ struct
+ {
+ UINT dev_id;
+ UINT msg;
+ UINT user;
+ UINT param_1;
+ UINT param_2;
+ PTR32 err;
+ PTR32 notify;
+ } *params32 = args;
+ struct notify_context32 *notify32 = ULongToPtr(params32->notify);
+ struct midi_open_desc32 *desc32;
+ struct midi_hdr32 *hdr32;
+ struct notify_context notify;
+ MIDIOPENDESC open_desc;
+ MIDIHDR *hdr = NULL;
+ struct midi_in_message_params params =
+ {
+ .dev_id = params32->dev_id,
+ .msg = params32->msg,
+ .user = params32->user,
+ .param_1 = params32->param_1,
+ .param_2 = params32->param_2,
+ .err = ULongToPtr(params32->err),
+ .notify = ¬ify
+ };
+ notify32->send_notify = FALSE;
+
+ switch (params32->msg)
+ {
+ case MIDM_OPEN:
+ desc32 = ULongToPtr(params32->param_1);
+
+ open_desc.hMidi = ULongToPtr(desc32->hMidi);
+ open_desc.dwCallback = desc32->dwCallback;
+ open_desc.dwInstance = desc32->dwInstance;
+ open_desc.dnDevNode = desc32->dnDevNode;
+ open_desc.cIds = desc32->cIds;
+ open_desc.rgIds.dwStreamID = desc32->rgIds.dwStreamID;
+ open_desc.rgIds.wDeviceID = desc32->rgIds.wDeviceID;
+
+ params.param_1 = (UINT_PTR)&open_desc;
+ break;
+
+ case MIDM_ADDBUFFER:
+ hdr32 = ULongToPtr(params32->param_1);
+
+ hdr = calloc(1, sizeof(*hdr));
+ hdr->lpData = ULongToPtr(hdr32->lpData);
+ hdr->dwBufferLength = hdr32->dwBufferLength;
+ hdr->dwFlags = hdr32->dwFlags;
+ hdr->dwReserved[7] = params32->param_1; /* keep hdr32 for MIM_LONGDATA notification */
+
+ params.param_1 = (UINT_PTR)hdr;
+ params.param_2 = sizeof(*hdr);
+ break;
+
+ case MIDM_PREPARE: /* prepare and unprepare are easier to handle explicitly */
+ hdr32 = ULongToPtr(params32->param_1);
+
+ *params.err = wow64_midi_in_prepare(params32->dev_id, hdr32, params32->param_2);
+ return STATUS_SUCCESS;
+
+ case MIDM_UNPREPARE:
+ hdr32 = ULongToPtr(params32->param_1);
+
+ *params.err = wow64_midi_in_unprepare(params32->dev_id, hdr32, params32->param_2);
+ return STATUS_SUCCESS;
+ }
+
+ midi_in_message(¶ms);
+
+ switch (params32->msg)
+ {
+ case MIDM_ADDBUFFER:
+ hdr32 = ULongToPtr(params32->param_1);
+
+ if (!*params.err)
+ {
+ hdr32->dwFlags = hdr->dwFlags;
+ hdr32->dwBytesRecorded = hdr->dwBytesRecorded;
+ hdr32->lpNext = 0;
+ }
+ else
+ free(hdr);
+ break;
+ }
+
+ if (notify.send_notify)
+ {
+ notify_to_notify32(notify32, ¬ify);
+
+ if (notify.msg == MIM_LONGDATA)
+ {
+ hdr = (MIDIHDR *)notify.param_1;
+ notify32->param_1 = hdr->dwReserved[7];
+ hdr32 = ULongToPtr(notify32->param_1);
+ hdr32->dwBytesRecorded = hdr->dwBytesRecorded;
+ hdr32->dwFlags = hdr->dwFlags;
+ free(hdr);
+ }
+ }
+ return STATUS_SUCCESS;
+}
+
+NTSTATUS wow64_midi_notify_wait(void *args)
+{
+ struct
+ {
+ PTR32 quit;
+ PTR32 notify;
+ } *params32 = args;
+ struct notify_context32 *notify32 = ULongToPtr(params32->notify);
+ struct midi_hdr32 *hdr32;
+ struct notify_context notify;
+ MIDIHDR *hdr;
+ struct midi_notify_wait_params params =
+ {
+ .quit = ULongToPtr(params32->quit),
+ .notify = ¬ify
+ };
+ notify32->send_notify = FALSE;
+
+ midi_notify_wait(¶ms);
+
+ if (!*params.quit && notify.send_notify)
+ {
+ notify_to_notify32(notify32, ¬ify);
+
+ if (notify.msg == MIM_LONGDATA)
+ {
+ hdr = (MIDIHDR *)notify.param_1;
+ notify32->param_1 = hdr->dwReserved[7];
+ hdr32 = ULongToPtr(notify32->param_1);
+ hdr32->dwBytesRecorded = hdr->dwBytesRecorded;
+ hdr32->dwFlags = hdr->dwFlags;
+ free(hdr);
+ }
+ }
+ return STATUS_SUCCESS;
+}
+
+#endif /* _WIN64 */
diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h
index 208dec7f69d..e36c82ff35b 100644
--- a/dlls/wineoss.drv/unixlib.h
+++ b/dlls/wineoss.drv/unixlib.h
@@ -297,6 +297,12 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN;
NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN;
+#ifdef _WIN64
+NTSTATUS wow64_midi_out_message(void *args) DECLSPEC_HIDDEN;
+NTSTATUS wow64_midi_in_message(void *args) DECLSPEC_HIDDEN;
+NTSTATUS wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN;
+#endif
+
extern unixlib_handle_t oss_handle;
#define OSS_CALL(func, params) __wine_unix_call(oss_handle, oss_ ## func, params)
--
2.25.1
2
1
[PATCH 5/7] wineoss: Implement Wow64 mmdevapi entry points in the Unix libraray.
by Huw Davies 04 May '22
by Huw Davies 04 May '22
04 May '22
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/wineoss.drv/oss.c | 353 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 353 insertions(+)
diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c
index 40b8879ef47..9f2cba68f86 100644
--- a/dlls/wineoss.drv/oss.c
+++ b/dlls/wineoss.drv/oss.c
@@ -1641,3 +1641,356 @@ unixlib_entry_t __wine_unix_call_funcs[] =
midi_notify_wait,
aux_message,
};
+
+#ifdef _WIN64
+
+typedef UINT PTR32;
+
+static NTSTATUS wow64_get_endpoint_ids(void *args)
+{
+ struct
+ {
+ EDataFlow flow;
+ PTR32 endpoints;
+ unsigned int size;
+ HRESULT result;
+ unsigned int num;
+ unsigned int default_idx;
+ } *params32 = args;
+ struct get_endpoint_ids_params params =
+ {
+ .flow = params32->flow,
+ .endpoints = ULongToPtr(params32->endpoints),
+ .size = params32->size
+ };
+ get_endpoint_ids(¶ms);
+ params32->size = params.size;
+ params32->result = params.result;
+ params32->num = params.num;
+ params32->default_idx = params.default_idx;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_create_stream(void *args)
+{
+ struct
+ {
+ PTR32 device;
+ EDataFlow flow;
+ AUDCLNT_SHAREMODE share;
+ UINT flags;
+ REFERENCE_TIME duration;
+ REFERENCE_TIME period;
+ PTR32 fmt;
+ HRESULT result;
+ PTR32 stream;
+ } *params32 = args;
+ struct create_stream_params params =
+ {
+ .device = ULongToPtr(params32->device),
+ .flow = params32->flow,
+ .share = params32->share,
+ .flags = params32->flags,
+ .duration = params32->duration,
+ .period = params32->period,
+ .fmt = ULongToPtr(params32->fmt),
+ .stream = ULongToPtr(params32->stream)
+ };
+ create_stream(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_release_stream(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ PTR32 timer_thread;
+ HRESULT result;
+ } *params32 = args;
+ struct release_stream_params params =
+ {
+ .stream = params32->stream,
+ .timer_thread = ULongToHandle(params32->timer_thread)
+ };
+ release_stream(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_get_render_buffer(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ UINT32 frames;
+ HRESULT result;
+ PTR32 data;
+ } *params32 = args;
+ BYTE *data = NULL;
+ struct get_render_buffer_params params =
+ {
+ .stream = params32->stream,
+ .frames = params32->frames,
+ .data = &data
+ };
+ get_render_buffer(¶ms);
+ params32->result = params.result;
+ *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data);
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_get_capture_buffer(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ HRESULT result;
+ PTR32 data;
+ PTR32 frames;
+ PTR32 flags;
+ PTR32 devpos;
+ PTR32 qpcpos;
+ } *params32 = args;
+ BYTE *data = NULL;
+ struct get_capture_buffer_params params =
+ {
+ .stream = params32->stream,
+ .data = &data,
+ .frames = ULongToPtr(params32->frames),
+ .flags = ULongToPtr(params32->flags),
+ .devpos = ULongToPtr(params32->devpos),
+ .qpcpos = ULongToPtr(params32->qpcpos)
+ };
+ get_capture_buffer(¶ms);
+ params32->result = params.result;
+ *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data);
+ return STATUS_SUCCESS;
+};
+
+static NTSTATUS wow64_is_format_supported(void *args)
+{
+ struct
+ {
+ PTR32 device;
+ EDataFlow flow;
+ AUDCLNT_SHAREMODE share;
+ PTR32 fmt_in;
+ PTR32 fmt_out;
+ HRESULT result;
+ } *params32 = args;
+ struct is_format_supported_params params =
+ {
+ .device = ULongToPtr(params32->device),
+ .flow = params32->flow,
+ .share = params32->share,
+ .fmt_in = ULongToPtr(params32->fmt_in),
+ .fmt_out = ULongToPtr(params32->fmt_out)
+ };
+ is_format_supported(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_get_mix_format(void *args)
+{
+ struct
+ {
+ PTR32 device;
+ EDataFlow flow;
+ PTR32 fmt;
+ HRESULT result;
+ } *params32 = args;
+ struct get_mix_format_params params =
+ {
+ .device = ULongToPtr(params32->device),
+ .flow = params32->flow,
+ .fmt = ULongToPtr(params32->fmt)
+ };
+ get_mix_format(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_get_buffer_size(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ HRESULT result;
+ PTR32 size;
+ } *params32 = args;
+ struct get_buffer_size_params params =
+ {
+ .stream = params32->stream,
+ .size = ULongToPtr(params32->size)
+ };
+ get_buffer_size(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_get_latency(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ HRESULT result;
+ PTR32 latency;
+ } *params32 = args;
+ struct get_latency_params params =
+ {
+ .stream = params32->stream,
+ .latency = ULongToPtr(params32->latency)
+ };
+ get_latency(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_get_current_padding(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ HRESULT result;
+ PTR32 padding;
+ } *params32 = args;
+ struct get_current_padding_params params =
+ {
+ .stream = params32->stream,
+ .padding = ULongToPtr(params32->padding)
+ };
+ get_current_padding(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_get_next_packet_size(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ HRESULT result;
+ PTR32 frames;
+ } *params32 = args;
+ struct get_next_packet_size_params params =
+ {
+ .stream = params32->stream,
+ .frames = ULongToPtr(params32->frames)
+ };
+ get_next_packet_size(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_get_frequency(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ HRESULT result;
+ PTR32 frequency;
+ } *params32 = args;
+ struct get_frequency_params params =
+ {
+ .stream = params32->stream,
+ .frequency = ULongToPtr(params32->frequency)
+ };
+ get_frequency(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_get_position(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ HRESULT result;
+ PTR32 position;
+ PTR32 qpctime;
+ } *params32 = args;
+ struct get_position_params params =
+ {
+ .stream = params32->stream,
+ .position = ULongToPtr(params32->position),
+ .qpctime = ULongToPtr(params32->qpctime)
+ };
+ get_position(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+static NTSTATUS wow64_set_volumes(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ float master_volume;
+ PTR32 volumes;
+ PTR32 session_volumes;
+ } *params32 = args;
+ struct set_volumes_params params =
+ {
+ .stream = params32->stream,
+ .master_volume = params32->master_volume,
+ .volumes = ULongToPtr(params32->volumes),
+ .session_volumes = ULongToPtr(params32->session_volumes)
+ };
+ return set_volumes(¶ms);
+}
+
+static NTSTATUS wow64_set_event_handle(void *args)
+{
+ struct
+ {
+ stream_handle stream;
+ PTR32 event;
+ HRESULT result;
+ } *params32 = args;
+ struct set_event_handle_params params =
+ {
+ .stream = params32->stream,
+ .event = ULongToHandle(params32->event)
+ };
+
+ set_event_handle(¶ms);
+ params32->result = params.result;
+ return STATUS_SUCCESS;
+}
+
+unixlib_entry_t __wine_unix_call_wow64_funcs[] =
+{
+ test_connect,
+ wow64_get_endpoint_ids,
+ wow64_create_stream,
+ wow64_release_stream,
+ start,
+ stop,
+ reset,
+ timer_loop,
+ wow64_get_render_buffer,
+ release_render_buffer,
+ wow64_get_capture_buffer,
+ release_capture_buffer,
+ wow64_is_format_supported,
+ wow64_get_mix_format,
+ wow64_get_buffer_size,
+ wow64_get_latency,
+ wow64_get_current_padding,
+ wow64_get_next_packet_size,
+ wow64_get_frequency,
+ wow64_get_position,
+ wow64_set_volumes,
+ wow64_set_event_handle,
+ is_started,
+ midi_release,
+ midi_out_message,
+ midi_in_message,
+ midi_notify_wait,
+ aux_message,
+};
+
+#endif /* _WIN64 */
--
2.25.1
2
2
04 May '22
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/wineoss.drv/oss.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c
index 986ed274445..40b8879ef47 100644
--- a/dlls/wineoss.drv/oss.c
+++ b/dlls/wineoss.drv/oss.c
@@ -535,6 +535,15 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd,
return ret;
}
+static ULONG_PTR zero_bits(void)
+{
+#ifdef _WIN64
+ return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff;
+#else
+ return 0;
+#endif
+}
+
static NTSTATUS create_stream(void *args)
{
struct create_stream_params *params = args;
@@ -597,8 +606,8 @@ static NTSTATUS create_stream(void *args)
if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE)
stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames;
size = stream->bufsize_frames * params->fmt->nBlockAlign;
- if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size,
- MEM_COMMIT, PAGE_READWRITE)){
+ if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(),
+ &size, MEM_COMMIT, PAGE_READWRITE)){
params->result = E_OUTOFMEMORY;
goto exit;
}
@@ -931,8 +940,8 @@ static NTSTATUS get_render_buffer(void *args)
stream->tmp_buffer = NULL;
}
size = frames * stream->fmt->nBlockAlign;
- if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size,
- MEM_COMMIT, PAGE_READWRITE)){
+ if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(),
+ &size, MEM_COMMIT, PAGE_READWRITE)){
stream->tmp_buffer_frames = 0;
return oss_unlock_result(stream, ¶ms->result, E_OUTOFMEMORY);
}
@@ -1041,8 +1050,8 @@ static NTSTATUS get_capture_buffer(void *args)
stream->tmp_buffer = NULL;
}
size = *frames * stream->fmt->nBlockAlign;
- if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size,
- MEM_COMMIT, PAGE_READWRITE)){
+ if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(),
+ &size, MEM_COMMIT, PAGE_READWRITE)){
stream->tmp_buffer_frames = 0;
return oss_unlock_result(stream, ¶ms->result, E_OUTOFMEMORY);
}
--
2.25.1
2
1
04 May '22
This will make the Wow64 syscall rather simpler.
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/wineoss.drv/mmdevdrv.c | 12 +++++++-----
dlls/wineoss.drv/oss.c | 18 ++++++++----------
dlls/wineoss.drv/unixlib.h | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index c9aae98ec2e..9c1261ce05c 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -390,8 +390,10 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu
}
for(i = 0; i < params.num; i++){
- unsigned int name_size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR);
- unsigned int dev_size = strlen(params.endpoints[i].device) + 1;
+ WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name);
+ char *device = (char *)params.endpoints + params.endpoints[i].device;
+ unsigned int name_size = (wcslen(name) + 1) * sizeof(WCHAR);
+ unsigned int dev_size = strlen(device) + 1;
OSSDevice *oss_dev;
ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size);
@@ -401,12 +403,12 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu
params.result = E_OUTOFMEMORY;
goto end;
}
- memcpy(ids[i], params.endpoints[i].name, name_size);
- get_device_guid(flow, params.endpoints[i].device, guids + i);
+ memcpy(ids[i], name, name_size);
+ get_device_guid(flow, device, guids + i);
oss_dev->flow = flow;
oss_dev->guid = guids[i];
- memcpy(oss_dev->devnode, params.endpoints[i].device, dev_size);
+ memcpy(oss_dev->devnode, device, dev_size);
device_add(oss_dev);
}
*def_index = params.default_idx;
diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c
index a628548ddcd..986ed274445 100644
--- a/dlls/wineoss.drv/oss.c
+++ b/dlls/wineoss.drv/oss.c
@@ -226,11 +226,10 @@ static NTSTATUS get_endpoint_ids(void *args)
WCHAR name[ARRAY_SIZE(ai.name) + ARRAY_SIZE(outW)];
char device[OSS_DEVNODE_SIZE];
} *info;
- unsigned int i, j, num, needed, name_len, device_len, default_idx = 0;
+ unsigned int i, j, num, needed, name_len, device_len, offset, default_idx = 0;
char default_device[OSS_DEVNODE_SIZE];
struct endpoint *endpoint;
int mixer_fd;
- char *ptr;
mixer_fd = open("/dev/mixer", O_RDONLY, 0);
if(mixer_fd < 0){
@@ -333,9 +332,8 @@ static NTSTATUS get_endpoint_ids(void *args)
}
close(mixer_fd);
- needed = num * sizeof(*params->endpoints);
+ offset = needed = num * sizeof(*params->endpoints);
endpoint = params->endpoints;
- ptr = (char *)(endpoint + num);
for(i = 0; i < num; i++){
name_len = wcslen(info[i].name) + 1;
@@ -343,12 +341,12 @@ static NTSTATUS get_endpoint_ids(void *args)
needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1);
if(needed <= params->size){
- endpoint->name = (WCHAR *)ptr;
- memcpy(endpoint->name, info[i].name, name_len * sizeof(WCHAR));
- ptr += name_len * sizeof(WCHAR);
- endpoint->device = ptr;
- memcpy(endpoint->device, info[i].device, device_len);
- ptr += (device_len + 1) & ~1;
+ endpoint->name = offset;
+ memcpy((char *)params->endpoints + offset, info[i].name, name_len * sizeof(WCHAR));
+ offset += name_len * sizeof(WCHAR);
+ endpoint->device = offset;
+ memcpy((char *)params->endpoints + offset, info[i].device, device_len);
+ offset += (device_len + 1) & ~1;
endpoint++;
}
}
diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h
index 278dfdbe612..208dec7f69d 100644
--- a/dlls/wineoss.drv/unixlib.h
+++ b/dlls/wineoss.drv/unixlib.h
@@ -36,8 +36,8 @@ struct test_connect_params
struct endpoint
{
- WCHAR *name;
- char *device;
+ unsigned int name;
+ unsigned int device;
};
struct get_endpoint_ids_params
--
2.25.1
2
1
04 May '22
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/wineoss.drv/mmdevdrv.c | 6 +++---
dlls/wineoss.drv/oss.c | 43 +++++++++++++++++++++----------------
dlls/wineoss.drv/unixlib.h | 40 +++++++++++++++++-----------------
3 files changed, 47 insertions(+), 42 deletions(-)
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 93bf775ebc8..c9aae98ec2e 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -96,7 +96,7 @@ struct ACImpl {
EDataFlow dataflow;
float *vols;
UINT32 channel_count;
- struct oss_stream *stream;
+ stream_handle stream;
HANDLE timer_thread;
@@ -239,7 +239,7 @@ int WINAPI AUDDRV_GetPriority(void)
return params.priority;
}
-static HRESULT stream_release(struct oss_stream *stream, HANDLE timer_thread)
+static HRESULT stream_release(stream_handle stream, HANDLE timer_thread)
{
struct release_stream_params params;
@@ -651,7 +651,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
{
ACImpl *This = impl_from_IAudioClient3(iface);
struct create_stream_params params;
- struct oss_stream *stream;
+ stream_handle stream;
unsigned int i;
TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags,
diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c
index 6490081e069..a628548ddcd 100644
--- a/dlls/wineoss.drv/oss.c
+++ b/dlls/wineoss.drv/oss.c
@@ -111,6 +111,11 @@ static NTSTATUS oss_unlock_result(struct oss_stream *stream,
return STATUS_SUCCESS;
}
+static struct oss_stream *handle_get_stream(stream_handle h)
+{
+ return (struct oss_stream *)(UINT_PTR)h;
+}
+
static NTSTATUS test_connect(void *args)
{
struct test_connect_params *params = args;
@@ -615,7 +620,7 @@ exit:
free(stream->fmt);
free(stream);
}else{
- *params->stream = stream;
+ *params->stream = (stream_handle)(UINT_PTR)stream;
}
return STATUS_SUCCESS;
@@ -624,7 +629,7 @@ exit:
static NTSTATUS release_stream(void *args)
{
struct release_stream_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
SIZE_T size;
if(params->timer_thread){
@@ -653,7 +658,7 @@ static NTSTATUS release_stream(void *args)
static NTSTATUS start(void *args)
{
struct start_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
oss_lock(stream);
@@ -671,7 +676,7 @@ static NTSTATUS start(void *args)
static NTSTATUS stop(void *args)
{
struct stop_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
oss_lock(stream);
@@ -687,7 +692,7 @@ static NTSTATUS stop(void *args)
static NTSTATUS reset(void *args)
{
struct reset_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
oss_lock(stream);
@@ -860,7 +865,7 @@ static void oss_read_data(struct oss_stream *stream)
static NTSTATUS timer_loop(void *args)
{
struct timer_loop_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
LARGE_INTEGER delay, now, next;
int adjust;
@@ -902,7 +907,7 @@ static NTSTATUS timer_loop(void *args)
static NTSTATUS get_render_buffer(void *args)
{
struct get_render_buffer_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
UINT32 write_pos, frames = params->frames;
BYTE **data = params->data;
SIZE_T size;
@@ -968,7 +973,7 @@ static void oss_wrap_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 writ
static NTSTATUS release_render_buffer(void *args)
{
struct release_render_buffer_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
UINT32 written_frames = params->written_frames;
UINT flags = params->flags;
BYTE *buffer;
@@ -1008,7 +1013,7 @@ static NTSTATUS release_render_buffer(void *args)
static NTSTATUS get_capture_buffer(void *args)
{
struct get_capture_buffer_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
UINT64 *devpos = params->devpos, *qpcpos = params->qpcpos;
UINT32 *frames = params->frames;
UINT *flags = params->flags;
@@ -1074,7 +1079,7 @@ static NTSTATUS get_capture_buffer(void *args)
static NTSTATUS release_capture_buffer(void *args)
{
struct release_capture_buffer_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
UINT32 done = params->done;
oss_lock(stream);
@@ -1231,7 +1236,7 @@ static NTSTATUS get_mix_format(void *args)
static NTSTATUS get_buffer_size(void *args)
{
struct get_buffer_size_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
oss_lock(stream);
@@ -1243,7 +1248,7 @@ static NTSTATUS get_buffer_size(void *args)
static NTSTATUS get_latency(void *args)
{
struct get_latency_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
oss_lock(stream);
@@ -1257,7 +1262,7 @@ static NTSTATUS get_latency(void *args)
static NTSTATUS get_current_padding(void *args)
{
struct get_current_padding_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
oss_lock(stream);
@@ -1269,7 +1274,7 @@ static NTSTATUS get_current_padding(void *args)
static NTSTATUS get_next_packet_size(void *args)
{
struct get_next_packet_size_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
UINT32 *frames = params->frames;
oss_lock(stream);
@@ -1282,7 +1287,7 @@ static NTSTATUS get_next_packet_size(void *args)
static NTSTATUS get_frequency(void *args)
{
struct get_frequency_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
UINT64 *freq = params->frequency;
oss_lock(stream);
@@ -1298,7 +1303,7 @@ static NTSTATUS get_frequency(void *args)
static NTSTATUS get_position(void *args)
{
struct get_position_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
UINT64 *pos = params->position, *qpctime = params->qpctime;
oss_lock(stream);
@@ -1342,7 +1347,7 @@ static NTSTATUS get_position(void *args)
static NTSTATUS set_volumes(void *args)
{
struct set_volumes_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
oss_lock(stream);
stream->mute = !params->master_volume;
@@ -1354,7 +1359,7 @@ static NTSTATUS set_volumes(void *args)
static NTSTATUS set_event_handle(void *args)
{
struct set_event_handle_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
oss_lock(stream);
@@ -1374,7 +1379,7 @@ static NTSTATUS set_event_handle(void *args)
static NTSTATUS is_started(void *args)
{
struct is_started_params *params = args;
- struct oss_stream *stream = params->stream;
+ struct oss_stream *stream = handle_get_stream(params->stream);
oss_lock(stream);
diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h
index 25e9a7007b3..278dfdbe612 100644
--- a/dlls/wineoss.drv/unixlib.h
+++ b/dlls/wineoss.drv/unixlib.h
@@ -18,7 +18,7 @@
#include "mmdeviceapi.h"
-struct stream_oss;
+typedef UINT64 stream_handle;
/* From <dlls/mmdevapi/mmdevapi.h> */
enum DriverPriority
@@ -60,42 +60,42 @@ struct create_stream_params
REFERENCE_TIME period;
const WAVEFORMATEX *fmt;
HRESULT result;
- struct oss_stream **stream;
+ stream_handle *stream;
};
struct release_stream_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HANDLE timer_thread;
HRESULT result;
};
struct start_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
};
struct stop_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
};
struct reset_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
};
struct timer_loop_params
{
- struct oss_stream *stream;
+ stream_handle stream;
};
struct get_render_buffer_params
{
- struct oss_stream *stream;
+ stream_handle stream;
UINT32 frames;
HRESULT result;
BYTE **data;
@@ -103,7 +103,7 @@ struct get_render_buffer_params
struct release_render_buffer_params
{
- struct oss_stream *stream;
+ stream_handle stream;
UINT32 written_frames;
UINT flags;
HRESULT result;
@@ -111,7 +111,7 @@ struct release_render_buffer_params
struct get_capture_buffer_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
BYTE **data;
UINT32 *frames;
@@ -122,7 +122,7 @@ struct get_capture_buffer_params
struct release_capture_buffer_params
{
- struct oss_stream *stream;
+ stream_handle stream;
UINT32 done;
HRESULT result;
};
@@ -147,42 +147,42 @@ struct get_mix_format_params
struct get_buffer_size_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
UINT32 *size;
};
struct get_latency_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
REFERENCE_TIME *latency;
};
struct get_current_padding_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
UINT32 *padding;
};
struct get_next_packet_size_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
UINT32 *frames;
};
struct get_frequency_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
UINT64 *frequency;
};
struct get_position_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
UINT64 *position;
UINT64 *qpctime;
@@ -190,7 +190,7 @@ struct get_position_params
struct set_volumes_params
{
- struct oss_stream *stream;
+ stream_handle stream;
float master_volume;
const float *volumes;
const float *session_volumes;
@@ -198,14 +198,14 @@ struct set_volumes_params
struct set_event_handle_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HANDLE event;
HRESULT result;
};
struct is_started_params
{
- struct oss_stream *stream;
+ stream_handle stream;
HRESULT result;
};
--
2.25.1
2
1
[PATCH 1/7] wineoss: Pass a client ptr to the callback instead of a stream.
by Huw Davies 04 May '22
by Huw Davies 04 May '22
04 May '22
This is to allow stream handles to be larger than sizeof(void *).
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
dlls/wineoss.drv/mmdevdrv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index c282ff14f01..93bf775ebc8 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -252,10 +252,10 @@ static HRESULT stream_release(struct oss_stream *stream, HANDLE timer_thread)
static DWORD WINAPI timer_thread(void *user)
{
- struct oss_stream *stream = user;
struct timer_loop_params params;
+ struct ACImpl *This = user;
- params.stream = stream;
+ params.stream = This->stream;
OSS_CALL(timer_loop, ¶ms);
return 0;
@@ -913,7 +913,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
OSS_CALL(start, ¶ms);
if(SUCCEEDED(params.result) && !This->timer_thread){
- This->timer_thread = CreateThread(NULL, 0, timer_thread, This->stream, 0, NULL);
+ This->timer_thread = CreateThread(NULL, 0, timer_thread, This, 0, NULL);
SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
}
--
2.25.1
2
1
[PATCH 0/1] MR29: mfplat: Avoid a race condition when releasing a tracked sample.
by Giovanni Mascellani (ï¼ giomasce) 04 May '22
by Giovanni Mascellani (ï¼ giomasce) 04 May '22
04 May '22
Right now, if the same tracked sample is released at the same time
from two different threads it might happen that neither of them calls
the callback, because they might go through the critical section at
the same time (while neither has decremented the reference count yet).
Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/29
3
4
04 May '22
[PATCH 1/2] ntdll: Add a partial implementation of NtMapViewOfSectionEx().
by Nikolay Sivov 04 May '22
by Nikolay Sivov 04 May '22
04 May '22
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/ntdll/ntdll.spec | 2 +
dlls/ntdll/tests/virtual.c | 149 +++++++++++++++++++++++++++++++++++++
dlls/ntdll/unix/loader.c | 1 +
dlls/ntdll/unix/virtual.c | 12 +++
dlls/wow64/syscall.h | 1 +
dlls/wow64/virtual.c | 34 +++++++++
include/winternl.h | 1 +
7 files changed, 200 insertions(+)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index ba29b21d61d..a7a39a0bce2 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -253,6 +253,7 @@
# @ stub NtMapUserPhysicalPages
# @ stub NtMapUserPhysicalPagesScatter
@ stdcall -syscall NtMapViewOfSection(long long ptr long long ptr ptr long long long)
+@ stdcall -syscall NtMapViewOfSectionEx(long long ptr ptr ptr long long ptr long)
# @ stub NtModifyBootEntry
@ stdcall -syscall NtNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long)
@ stdcall -syscall NtNotifyChangeKey(long long ptr ptr ptr long long ptr long long)
@@ -1279,6 +1280,7 @@
# @ stub ZwMapUserPhysicalPages
# @ stub ZwMapUserPhysicalPagesScatter
@ stdcall -private -syscall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection
+@ stdcall -private -syscall ZwMapViewOfSectionEx(long long ptr ptr ptr long long ptr long) NtMapViewOfSectionEx
# @ stub ZwModifyBootEntry
@ stdcall -private -syscall ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile
@ stdcall -private -syscall ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey
diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c
index 30a97ba9d94..aeef2ed8fb9 100644
--- a/dlls/ntdll/tests/virtual.c
+++ b/dlls/ntdll/tests/virtual.c
@@ -39,6 +39,9 @@ static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*);
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG,
MEM_EXTENDED_PARAMETER *, ULONG);
+static NTSTATUS (WINAPI *pNtMapViewOfSectionEx)(HANDLE, HANDLE, PVOID *, const LARGE_INTEGER *, SIZE_T *,
+ ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG);
+
static const BOOL is_win64 = sizeof(void*) != sizeof(int);
static BOOL is_wow64;
@@ -908,6 +911,150 @@ static void test_NtMapViewOfSection(void)
CloseHandle(process);
}
+static void test_NtMapViewOfSectionEx(void)
+{
+ static const char testfile[] = "testfile.xxx";
+ static const char data[] = "test data for NtMapViewOfSectionEx";
+ char buffer[sizeof(data)];
+ HANDLE file, mapping, process;
+ DWORD status, written;
+ SIZE_T size, result;
+ LARGE_INTEGER offset;
+ void *ptr, *ptr2;
+ BOOL ret;
+
+ if (!pNtMapViewOfSectionEx)
+ {
+ win_skip("NtMapViewOfSectionEx() is not supported.\n");
+ return;
+ }
+
+ if (!pIsWow64Process || !pIsWow64Process(NtCurrentProcess(), &is_wow64)) is_wow64 = FALSE;
+
+ file = CreateFileA(testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
+ ok(file != INVALID_HANDLE_VALUE, "Failed to create test file\n");
+ WriteFile(file, data, sizeof(data), &written, NULL);
+ SetFilePointer(file, 4096, NULL, FILE_BEGIN);
+ SetEndOfFile(file);
+
+ /* read/write mapping */
+
+ mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, 4096, NULL);
+ ok(mapping != 0, "CreateFileMapping failed\n");
+
+ process = create_target_process("sleep");
+ ok(process != NULL, "Can't start process\n");
+
+ ptr = NULL;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr, &offset, &size, 0, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status);
+ ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr);
+
+ ret = ReadProcessMemory(process, ptr, buffer, sizeof(buffer), &result);
+ ok(ret, "ReadProcessMemory failed\n");
+ ok(result == sizeof(buffer), "ReadProcessMemory didn't read all data (%Ix)\n", result);
+ ok(!memcmp(buffer, data, sizeof(buffer)), "Wrong data read\n");
+
+ /* mapping at the same page conflicts */
+ ptr2 = ptr;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status);
+
+ /* offset has to be aligned */
+ ptr2 = ptr;
+ size = 0;
+ offset.QuadPart = 1;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_MAPPED_ALIGNMENT, "Unexpected status %08lx\n", status);
+
+ /* ptr has to be aligned */
+ ptr2 = (char *)ptr + 42;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_MAPPED_ALIGNMENT, "Unexpected status %08lx\n", status);
+
+ /* still not 64k aligned */
+ ptr2 = (char *)ptr + 0x1000;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, 0, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_MAPPED_ALIGNMENT, "Unexpected status %08lx\n", status);
+
+ if (!is_win64 && !is_wow64)
+ {
+ /* new memory region conflicts with previous mapping */
+ ptr2 = ptr;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status);
+
+ ptr2 = (char *)ptr + 42;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_CONFLICTING_ADDRESSES, "Unexpected status %08lx\n", status);
+
+ /* in contrary to regular NtMapViewOfSection, only 4kb align is enforced */
+ ptr2 = (char *)ptr + 0x1000;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status);
+ ok((char *)ptr2 == (char *)ptr + 0x1000,
+ "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2);
+ status = NtUnmapViewOfSection(process, ptr2);
+ ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status);
+
+ /* the address is rounded down if not on a page boundary */
+ ptr2 = (char *)ptr + 0x1001;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status);
+ ok((char *)ptr2 == (char *)ptr + 0x1000,
+ "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2);
+ status = NtUnmapViewOfSection(process, ptr2);
+ ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status);
+
+ ptr2 = (char *)ptr + 0x2000;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0);
+ ok(status == STATUS_SUCCESS, "Unexpected status %08lx\n", status);
+ ok((char *)ptr2 == (char *)ptr + 0x2000,
+ "expected address %p, got %p\n", (char *)ptr + 0x2000, ptr2);
+ status = NtUnmapViewOfSection(process, ptr2);
+ ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status);
+ }
+ else
+ {
+ ptr2 = (char *)ptr + 0x1000;
+ size = 0;
+ offset.QuadPart = 0;
+ status = pNtMapViewOfSectionEx(mapping, process, &ptr2, &offset, &size, AT_ROUND_TO_PAGE, PAGE_READWRITE, NULL, 0);
+ todo_wine
+ ok(status == STATUS_INVALID_PARAMETER_9 || status == STATUS_INVALID_PARAMETER,
+ "NtMapViewOfSection returned %08lx\n", status);
+ }
+
+ status = NtUnmapViewOfSection(process, ptr);
+ ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status);
+
+ NtClose(mapping);
+
+ CloseHandle(file);
+ DeleteFileA(testfile);
+
+ TerminateProcess(process, 0);
+ CloseHandle(process);
+}
+
#define SUPPORTED_XSTATE_FEATURES ((1 << XSTATE_LEGACY_FLOATING_POINT) | (1 << XSTATE_LEGACY_SSE) | (1 << XSTATE_AVX))
static void test_user_shared_data(void)
@@ -1160,6 +1307,7 @@ START_TEST(virtual)
pRtlFindExportedRoutineByName = (void *)GetProcAddress(mod, "RtlFindExportedRoutineByName");
pRtlGetEnabledExtendedFeatures = (void *)GetProcAddress(mod, "RtlGetEnabledExtendedFeatures");
pNtAllocateVirtualMemoryEx = (void *)GetProcAddress(mod, "NtAllocateVirtualMemoryEx");
+ pNtMapViewOfSectionEx = (void *)GetProcAddress(mod, "NtMapViewOfSectionEx");
NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL);
trace("system page size %#lx\n", sbi.PageSize);
@@ -1169,6 +1317,7 @@ START_TEST(virtual)
test_NtAllocateVirtualMemory();
test_RtlCreateUserStack();
test_NtMapViewOfSection();
+ test_NtMapViewOfSectionEx();
test_user_shared_data();
test_syscalls();
}
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index d1c42ddc0f3..cad760a1445 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -207,6 +207,7 @@ static void * const syscalls[] =
NtLockVirtualMemory,
NtMakeTemporaryObject,
NtMapViewOfSection,
+ NtMapViewOfSectionEx,
NtNotifyChangeDirectoryFile,
NtNotifyChangeKey,
NtNotifyChangeMultipleKeys,
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 94b300c5057..02478cceb06 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -4536,6 +4536,18 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p
offset_ptr, size_ptr, alloc_type, protect );
}
+/***********************************************************************
+ * NtMapViewOfSectionEx (NTDLL.@)
+ * ZwMapViewOfSectionEx (NTDLL.@)
+ */
+NTSTATUS WINAPI NtMapViewOfSectionEx( HANDLE handle, HANDLE process, PVOID *addr_ptr, const LARGE_INTEGER *offset_ptr,
+ SIZE_T *size_ptr, ULONG alloc_type, ULONG protect, MEM_EXTENDED_PARAMETER *params, ULONG params_count )
+{
+ if (params)
+ FIXME("Ignoring extended parameters.\n");
+
+ return NtMapViewOfSection( handle, process, addr_ptr, 0, 0, offset_ptr, size_ptr, ViewShare, alloc_type, protect );
+}
/***********************************************************************
* NtUnmapViewOfSection (NTDLL.@)
diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h
index a3af9174c49..3b364d909d7 100644
--- a/dlls/wow64/syscall.h
+++ b/dlls/wow64/syscall.h
@@ -108,6 +108,7 @@
SYSCALL_ENTRY( NtLockVirtualMemory ) \
SYSCALL_ENTRY( NtMakeTemporaryObject ) \
SYSCALL_ENTRY( NtMapViewOfSection ) \
+ SYSCALL_ENTRY( NtMapViewOfSectionEx ) \
SYSCALL_ENTRY( NtNotifyChangeDirectoryFile ) \
SYSCALL_ENTRY( NtNotifyChangeKey ) \
SYSCALL_ENTRY( NtNotifyChangeMultipleKeys ) \
diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c
index e89373f4239..61c84e5d7be 100644
--- a/dlls/wow64/virtual.c
+++ b/dlls/wow64/virtual.c
@@ -287,6 +287,40 @@ NTSTATUS WINAPI wow64_NtMapViewOfSection( UINT *args )
return status;
}
+/**********************************************************************
+ * wow64_NtMapViewOfSectionEx
+ */
+NTSTATUS WINAPI wow64_NtMapViewOfSectionEx( UINT *args )
+{
+ HANDLE handle = get_handle( &args );
+ HANDLE process = get_handle( &args );
+ ULONG *addr32 = get_ptr( &args );
+ const LARGE_INTEGER *offset = get_ptr( &args );
+ ULONG *size32 = get_ptr( &args );
+ ULONG alloc = get_ulong( &args );
+ ULONG protect = get_ulong( &args );
+ MEM_EXTENDED_PARAMETER *params = get_ptr( &args );
+ ULONG params_count = get_ulong( &args );
+
+ void *addr;
+ SIZE_T size;
+ NTSTATUS status;
+
+ status = NtMapViewOfSectionEx( handle, process, addr_32to64( &addr, addr32 ), offset, size_32to64( &size, size32 ), alloc,
+ protect, params, params_count );
+ if (NT_SUCCESS(status))
+ {
+ SECTION_IMAGE_INFORMATION info;
+
+ if (!NtQuerySection( handle, SectionImageInformation, &info, sizeof(info), NULL ))
+ {
+ if (info.Machine == current_machine) init_image_mapping( addr );
+ }
+ put_addr( addr32, addr );
+ put_size( size32, size );
+ }
+ return status;
+}
/**********************************************************************
* wow64_NtProtectVirtualMemory
diff --git a/include/winternl.h b/include/winternl.h
index b4942d86b4c..1d358fc0b2d 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -4007,6 +4007,7 @@ NTSYSAPI NTSTATUS WINAPI NtLockFile(HANDLE,HANDLE,PIO_APC_ROUTINE,void*,PIO_STA
NTSYSAPI NTSTATUS WINAPI NtLockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG);
NTSYSAPI NTSTATUS WINAPI NtMakeTemporaryObject(HANDLE);
NTSYSAPI NTSTATUS WINAPI NtMapViewOfSection(HANDLE,HANDLE,PVOID*,ULONG_PTR,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG);
+NTSYSAPI NTSTATUS WINAPI NtMapViewOfSectionEx(HANDLE,HANDLE,PVOID*,const LARGE_INTEGER*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG);
NTSYSAPI NTSTATUS WINAPI NtNotifyChangeDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN);
NTSYSAPI NTSTATUS WINAPI NtNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN);
NTSYSAPI NTSTATUS WINAPI NtNotifyChangeMultipleKeys(HANDLE,ULONG,OBJECT_ATTRIBUTES*,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN);
--
2.35.1
1
1