- resending last 5 patches from yesterday's serie (git am seems more picky
that what I use)
- a bunch of new ones
A+
---
Eric Pouech (17):
dlls/gdiplus: use correct integral type
dlls/ole32: use correct integral type
dlls/quartz: use correct integral type
dlls/riched20: use correct integral type
dlls/windowscodec: removes useless casts to long
dlls/mf: use correct integral type
dlls/mfreadwrite: use correct integral type
dlls/mfmediaengine: use correct integral type
dlls/mfplat: use correct integral type
dlls/mfplay: use correct integral type
dlls/scrobj: use correct integral type
dlls/setupapi: use correct integral type
dlls/shell32: use correct integral type
dlls/taskschd: use correct integral type
dlls/user32: use correct integral type
dlls/uxtheme: use correct integral type
dlls/vbscript: use correct integral type
dlls/gdiplus/image.c | 21 ++++++++++++---------
dlls/mf/copier.c | 4 ++--
dlls/mf/evr.c | 4 ++--
dlls/mf/main.c | 3 ++-
dlls/mf/sar.c | 7 ++++---
dlls/mf/session.c | 29 ++++++++++++++++-------------
dlls/mf/topology.c | 5 +++--
dlls/mfmediaengine/main.c | 2 +-
dlls/mfplat/buffer.c | 7 ++++---
dlls/mfplat/main.c | 8 +++++---
dlls/mfplat/mediatype.c | 16 ++++++++++------
dlls/mfplay/player.c | 7 ++++---
dlls/mfreadwrite/reader.c | 32 +++++++++++++++++---------------
dlls/ole32/compobj.c | 2 +-
dlls/quartz/systemclock.c | 5 +++--
dlls/riched20/caret.c | 8 ++++----
dlls/riched20/editor.c | 33 +++++++++++++++++++--------------
dlls/riched20/editor.h | 2 +-
dlls/riched20/editstr.h | 2 +-
dlls/riched20/paint.c | 4 ++--
dlls/riched20/richole.c | 6 ++++--
dlls/riched20/writer.c | 2 +-
dlls/scrobj/scrobj.c | 2 +-
dlls/setupapi/install.c | 7 ++++---
dlls/setupapi/queue.c | 2 +-
dlls/shell32/iconcache.c | 10 +++++++---
dlls/shell32/shellpath.c | 8 ++++----
dlls/shell32/shlview.c | 2 +-
dlls/taskschd/regtask.c | 2 +-
dlls/user32/input.c | 2 +-
dlls/user32/spy.c | 2 +-
dlls/user32/user_private.h | 2 +-
dlls/user32/win.c | 3 ++-
dlls/uxtheme/msstyles.c | 18 ++++++++++++------
dlls/vbscript/interp.c | 2 +-
dlls/vbscript/vbdisp.c | 2 +-
dlls/windowscodecs/ungif.c | 3 +--
37 files changed, 157 insertions(+), 119 deletions(-)
5
29
msvcrt has been split in several patches for easier review
(not over yet)
A+
---
Eric Pouech (11):
dlls/wbemprox: use correct integral type
dlls/windowscodecs,wmphoto: use correct integral type
dlls/winegstreamer: use correct integral type
dlls/winhttp: use correct integral type
dlls/winmm: use correct integral type
dlls/wldap32: use correct integral type
dlls/xaudio2_7: use correct integral type
dlls/msvc* and al.: use correct integral types
dlls/msvc* and al.: use correct integral type
dlls/msvc* and al.: user correct integral types
dlls/msvcrt: use correct integral type
dlls/msvcp60/ios.c | 4 +--
dlls/msvcp60/msvcp.h | 2 +-
dlls/msvcp90/exception.c | 2 +-
dlls/msvcp90/ios.c | 4 +--
dlls/msvcp90/locale.c | 6 ++--
dlls/msvcp90/msvcp90.h | 2 +-
dlls/msvcrt/concurrency.c | 6 ++--
dlls/msvcrt/cpp.c | 2 +-
dlls/msvcrt/locale.c | 40 +++++++++++++-------------
dlls/msvcrt/msvcrt.h | 4 +--
dlls/msvcrt/thread.c | 2 +-
dlls/wbemprox/builtin.c | 10 ++++---
dlls/windowscodecs/bmpdecode.c | 3 +-
dlls/windowscodecs/ddsformat.c | 3 +-
dlls/windowscodecs/decoder.c | 2 +-
dlls/windowscodecs/info.c | 26 +++++++++--------
dlls/windowscodecs/wincodecs_private.h | 4 +--
dlls/winegstreamer/audioconvert.c | 4 +--
dlls/winhttp/request.c | 5 ++--
dlls/winmm/waveform.c | 5 ++--
dlls/wldap32/ber.c | 8 +++---
dlls/wldap32/libldap.h | 2 +-
dlls/xaudio2_7/xaudio_dll.c | 2 +-
23 files changed, 78 insertions(+), 70 deletions(-)
5
21
04 Feb '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/d2d1/tests/d2d1.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index be97c7f4c6a..a2abf3629da 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -161,9 +161,10 @@ static void run_queued_tests(void)
SYSTEM_INFO si;
LONG test_idx;
- /* Running the tests multithreaded on 32-bit maps too much memory in Wine,
- * even with only 2 threads. */
- if (!use_mt || sizeof(void *) == 4)
+ /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when
+ * requested. When using the chunk allocator, running the tests with more
+ * than one thread can exceed the 32-bit virtual address space. */
+ if (!use_mt || (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")))
{
for (i = 0; i < mt_test_count; ++i)
{
--
2.34.1
2
7
04 Feb '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/d2d1/tests/d2d1.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 4d129023fe2..a2abf3629da 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -161,7 +161,10 @@ static void run_queued_tests(void)
SYSTEM_INFO si;
LONG test_idx;
- if (!use_mt)
+ /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when
+ * requested. When using the chunk allocator, running the tests with more
+ * than one thread can exceed the 32-bit virtual address space. */
+ if (!use_mt || (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")))
{
for (i = 0; i < mt_test_count; ++i)
{
--
2.34.1
2
6
[RFC PATCH v4 0/5] Fix sock_recv reordering issue (#52401): unknown_status + wineserver call approach
by Jinoh Kang 04 Feb '22
by Jinoh Kang 04 Feb '22
04 Feb '22
<preamble>
This is my forth attempt to tackle the issue #52401 [1]: "Improper
synchronization in sock_recv/sock_send leads to arbitrary reordering of
completion of I/O requests", which was initially reported (outside Bugzilla)
by Dongwan Kim [2].
Basically, the old process of sock_recv is:
1. Perform the I/O synchronously.
2. Report the result back to the server,
or queue up the request in the server.
3. If blocking, wait for I/O to complete.
The new process of sock_recv would be:
1. Queue up the request in the server.
2. Perform the I/O synchronously.
3. Report the result back to the server,
4. If blocking, wait for I/O to complete.
Everything except the actual I/O requires communicating with wineserver.
My goal here is to fix the issue without introducing extra calls to wineserver.
(However, if it turns out that this goal is not of utmost significance, then
this patch serie can be easily modified so that it issues separate server
calls.)
The previous approaches are listed here:
- Add a new select type called SELECT_SIGNAL_WAIT_ASYNC [3].
Zebediah has pointed out [4] that it is not very elegant to (ab-)use
the synchronization machinery for communicating the async result.
- Use APC_ASYNC_IO to perform the synchronous I/O [5].
This ended up with a total of 11 patches, and turned out to be
rather too complicated for a simple task.
- Add a new wineserver call, and use "add_queue" hook to save a round
trip to the server [6].
</preamble>
Each of the above turned out to be either too intrusive, complicated, or
hard to verify. Per suggestion by Zebediah [7], this is my (hopefully)
last approach: keep the new wineserver call, but keep out the implicit
STATUS_PENDING transition from "add_queue"; also, (re-)use the
"unknown_status" field.
Changelog:
- v1 -> v2: fix async queue hang on synchronous failure
- v2 -> v3: rewrite handling of pending/failed asyncs.
- v3 -> v4: don't set IOSB on synchronous failure, make more robust
[1] https://bugs.winehq.org/show_bug.cgi?id=52401
[2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html
[3] https://www.winehq.org/pipermail/wine-devel/2022-January/204695.html
[4] https://www.winehq.org/pipermail/wine-devel/2022-January/204710.html
[5] https://www.winehq.org/pipermail/wine-devel/2022-January/205168.html
[6] https://www.winehq.org/pipermail/wine-devel/2022-January/205193.html
[7] https://www.winehq.org/pipermail/wine-devel/2022-January/205738.html
Jinoh Kang (5):
server: Allow calling async_handoff() with status code STATUS_ALERTED.
server: Add a new server request "notify_async_direct_result."
server: Attempt to complete I/O request immediately in recv_socket.
ntdll: Don't call try_recv before server call in sock_recv.
server: Replace redundant recv_socket status fields with force_async
boolean field.
dlls/ntdll/unix/socket.c | 37 ++++++++-------
dlls/ntdll/unix/sync.c | 22 +++++++++
dlls/ntdll/unix/unix_private.h | 1 +
dlls/ws2_32/tests/sock.c | 8 ++--
server/async.c | 86 ++++++++++++++++++++++++++++++++++
server/protocol.def | 14 +++++-
server/sock.c | 40 +++++++++++-----
7 files changed, 173 insertions(+), 35 deletions(-)
--
2.34.1
2
20
04 Feb '22
This works fine currently, but won't once we start suballocating GL buffers.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
This is a bit of a sledgehammer solution (and actually d2d1 and d3d10core at
least seem to be fine with just limiting the thread count to 4). We could
instead use separate processes, but it doesn't seem particularly worthwhile to
write that code when we might end up being limited by VRAM anyway.
dlls/d2d1/tests/d2d1.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 6bc6a99274c..d0fee842ed5 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -161,7 +161,9 @@ static void run_queued_tests(void)
SYSTEM_INFO si;
LONG test_idx;
- if (!use_mt)
+ /* Running the tests multithreaded on 32-bit maps too much memory in Wine,
+ * even with only 2 threads. */
+ if (!use_mt || sizeof(void *) == 4)
{
for (i = 0; i < mt_test_count; ++i)
{
--
2.34.1
3
8
04 Feb '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/opencl/make_opencl | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl
index 088120c8081..a93946b2d2b 100755
--- a/dlls/opencl/make_opencl
+++ b/dlls/opencl/make_opencl
@@ -297,8 +297,8 @@ sub generate_spec_entry($$)
}
my %core_functions;
-my %cl_enums;
-my (%cl_types, @cl_types); # also use an array to preserve declaration order
+my %header_enums;
+my (%header_types, @header_types); # also use an array to preserve declaration order
# some functions need a hand-written wrapper
sub needs_pe_wrapper($)
@@ -440,13 +440,13 @@ sub parse_file($)
}
foreach my $enum ($feature->findnodes("./require/enum"))
{
- $cl_enums{$enum->{name}} = $enums{$enum->{name}};
+ $header_enums{$enum->{name}} = $enums{$enum->{name}};
}
foreach my $type ($feature->findnodes("./require/type"))
{
next unless $types{$type->{name}};
- push @cl_types, $type->{name} unless $cl_types{$type->{name}};
- $cl_types{$type->{name}} = $types{$type->{name}};
+ push @header_types, $type->{name} unless $header_types{$type->{name}};
+ $header_types{$type->{name}} = $types{$type->{name}};
}
}
@@ -588,9 +588,9 @@ typedef uint64_t DECLSPEC_ALIGN(8) cl_ulong;
END
;
-foreach (@cl_types)
+foreach (@header_types)
{
- my $type = $cl_types{$_};
+ my $type = $header_types{$_};
if ($type->{category} eq "define")
{
print TYPES $type->textContent() . "\n";
@@ -603,9 +603,9 @@ foreach (@cl_types)
print TYPES "\n";
-foreach (sort keys %cl_enums)
+foreach (sort keys %header_enums)
{
- printf TYPES "#define %s %s\n", $_, $cl_enums{$_};
+ printf TYPES "#define %s %s\n", $_, $header_enums{$_};
}
close(TYPES);
--
2.34.1
3
4
I have a question How do I get GM.DLS working my current setup is Linux
Mint 2.0.3 and Wine 7.0 GM.DLS is already in
.wine/drive_c/windows/system32/drivers but it doesn't work so whats
wrong and why doesn't it work I would like help
2
1
[PATCH vkd3d 3/3] vkd3d-utils: Implement the event functions for Windows.
by Alexandre Julliard 04 Feb '22
by Alexandre Julliard 04 Feb '22
04 Feb '22
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
libs/vkd3d-utils/vkd3d_utils_main.c | 37 ++++++++++++++++++++++++++
libs/vkd3d-utils/vkd3d_utils_private.h | 8 ------
2 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c
index 9c968cc65334..7fb042cc3cbc 100644
--- a/libs/vkd3d-utils/vkd3d_utils_main.c
+++ b/libs/vkd3d-utils/vkd3d_utils_main.c
@@ -327,6 +327,41 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename
}
/* Events */
+
+#ifdef _WIN32
+
+HANDLE vkd3d_create_event(void)
+{
+ return CreateEventA(NULL, FALSE, FALSE, NULL);
+}
+
+HRESULT vkd3d_signal_event(HANDLE event)
+{
+ SetEvent(event);
+ return S_OK;
+}
+
+unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds)
+{
+ return WaitForSingleObject(event, milliseconds);
+}
+
+void vkd3d_destroy_event(HANDLE event)
+{
+ CloseHandle(event);
+}
+
+#else /* _WIN32 */
+
+#include <pthread.h>
+
+struct vkd3d_event
+{
+ pthread_mutex_t mutex;
+ pthread_cond_t cond;
+ BOOL is_signaled;
+};
+
HANDLE vkd3d_create_event(void)
{
struct vkd3d_event *event;
@@ -434,6 +469,8 @@ void vkd3d_destroy_event(HANDLE event)
vkd3d_free(impl);
}
+#endif /* _WIN32 */
+
HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob)
{
HRESULT hr;
diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h
index 06ac7e6bbfa2..1b8254b67b1a 100644
--- a/libs/vkd3d-utils/vkd3d_utils_private.h
+++ b/libs/vkd3d-utils/vkd3d_utils_private.h
@@ -23,7 +23,6 @@
#define NONAMELESSUNION
#define VK_NO_PROTOTYPES
-#include <pthread.h>
#include <vkd3d.h>
#include <vkd3d_shader.h>
#include <vkd3d_d3dcompiler.h>
@@ -32,11 +31,4 @@
#include "vkd3d_memory.h"
#include <vkd3d_utils.h>
-struct vkd3d_event
-{
- pthread_mutex_t mutex;
- pthread_cond_t cond;
- BOOL is_signaled;
-};
-
#endif /* __VKD3D_UTILS_PRIVATE_H */
--
2.34.1
2
1
[PATCH vkd3d 2/3] vkd3d: Implement the synchronization wrappers for Windows.
by Alexandre Julliard 04 Feb '22
by Alexandre Julliard 04 Feb '22
04 Feb '22
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
libs/vkd3d/vkd3d_private.h | 72 ++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index bb7be99e7efc..ece111325e77 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -23,6 +23,10 @@
#define NONAMELESSUNION
#define VK_NO_PROTOTYPES
+#ifdef _WIN32
+# define _WIN32_WINNT 0x0600 /* for condition variables */
+#endif
+
#include "vkd3d_common.h"
#include "vkd3d_blob.h"
#include "vkd3d_memory.h"
@@ -171,6 +175,72 @@ union vkd3d_thread_handle
void *handle;
};
+#ifdef _WIN32
+
+struct vkd3d_mutex
+{
+ CRITICAL_SECTION lock;
+};
+
+struct vkd3d_cond
+{
+ CONDITION_VARIABLE cond;
+};
+
+static inline int vkd3d_mutex_init(struct vkd3d_mutex *lock)
+{
+ InitializeCriticalSection(&lock->lock);
+ return 0;
+}
+
+static inline int vkd3d_mutex_lock(struct vkd3d_mutex *lock)
+{
+ EnterCriticalSection(&lock->lock);
+ return 0;
+}
+
+static inline int vkd3d_mutex_unlock(struct vkd3d_mutex *lock)
+{
+ LeaveCriticalSection(&lock->lock);
+ return 0;
+}
+
+static inline int vkd3d_mutex_destroy(struct vkd3d_mutex *lock)
+{
+ DeleteCriticalSection(&lock->lock);
+ return 0;
+}
+
+static inline int vkd3d_cond_init(struct vkd3d_cond *cond)
+{
+ InitializeConditionVariable(&cond->cond);
+ return 0;
+}
+
+static inline int vkd3d_cond_signal(struct vkd3d_cond *cond)
+{
+ WakeConditionVariable(&cond->cond);
+ return 0;
+}
+
+static inline int vkd3d_cond_broadcast(struct vkd3d_cond *cond)
+{
+ WakeAllConditionVariable(&cond->cond);
+ return 0;
+}
+
+static inline int vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock)
+{
+ return !SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE);
+}
+
+static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond)
+{
+ return 0;
+}
+
+#else /* _WIN32 */
+
struct vkd3d_mutex
{
pthread_mutex_t lock;
@@ -227,6 +297,8 @@ static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond)
return pthread_cond_destroy(&cond->cond);
}
+#endif /* _WIN32 */
+
HRESULT vkd3d_create_thread(struct vkd3d_instance *instance,
PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread);
HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread);
--
2.34.1
2
1
[PATCH vkd3d 1/3] vkd3d: Add inline wrappers for the pthread synchronization functions.
by Alexandre Julliard 04 Feb '22
by Alexandre Julliard 04 Feb '22
04 Feb '22
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
libs/vkd3d/command.c | 134 ++++++++++++++++++-------------------
libs/vkd3d/device.c | 52 +++++++-------
libs/vkd3d/resource.c | 28 ++++----
libs/vkd3d/state.c | 12 ++--
libs/vkd3d/utils.c | 12 ++--
libs/vkd3d/vkd3d_private.h | 86 +++++++++++++++++++-----
6 files changed, 190 insertions(+), 134 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index f1ec6be3fd20..61e18105ee12 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -32,7 +32,7 @@ HRESULT vkd3d_queue_create(struct d3d12_device *device,
if (!(object = vkd3d_malloc(sizeof(*object))))
return E_OUTOFMEMORY;
- if ((rc = pthread_mutex_init(&object->mutex, NULL)))
+ if ((rc = vkd3d_mutex_init(&object->mutex)))
{
ERR("Failed to initialize mutex, error %d.\n", rc);
vkd3d_free(object);
@@ -67,7 +67,7 @@ void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device)
unsigned int i;
int rc;
- if ((rc = pthread_mutex_lock(&queue->mutex)))
+ if ((rc = vkd3d_mutex_lock(&queue->mutex)))
ERR("Failed to lock mutex, error %d.\n", rc);
for (i = 0; i < queue->semaphore_count; ++i)
@@ -82,9 +82,9 @@ void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device)
}
if (!rc)
- pthread_mutex_unlock(&queue->mutex);
+ vkd3d_mutex_unlock(&queue->mutex);
- pthread_mutex_destroy(&queue->mutex);
+ vkd3d_mutex_destroy(&queue->mutex);
vkd3d_free(queue);
}
@@ -94,7 +94,7 @@ VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue)
TRACE("queue %p.\n", queue);
- if ((rc = pthread_mutex_lock(&queue->mutex)))
+ if ((rc = vkd3d_mutex_lock(&queue->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return VK_NULL_HANDLE;
@@ -108,7 +108,7 @@ void vkd3d_queue_release(struct vkd3d_queue *queue)
{
TRACE("queue %p.\n", queue);
- pthread_mutex_unlock(&queue->mutex);
+ vkd3d_mutex_unlock(&queue->mutex);
}
static VkResult vkd3d_queue_wait_idle(struct vkd3d_queue *queue,
@@ -144,7 +144,7 @@ static void vkd3d_queue_update_sequence_number(struct vkd3d_queue *queue,
unsigned int i, j;
int rc;
- if ((rc = pthread_mutex_lock(&queue->mutex)))
+ if ((rc = vkd3d_mutex_lock(&queue->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return;
@@ -189,7 +189,7 @@ static void vkd3d_queue_update_sequence_number(struct vkd3d_queue *queue,
if (destroyed_semaphore_count)
TRACE("Destroyed %u Vulkan semaphores.\n", destroyed_semaphore_count);
- pthread_mutex_unlock(&queue->mutex);
+ vkd3d_mutex_unlock(&queue->mutex);
}
static uint64_t vkd3d_queue_reset_sequence_number_locked(struct vkd3d_queue *queue)
@@ -253,7 +253,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker,
TRACE("worker %p, fence %p, value %#"PRIx64".\n", worker, fence, value);
- if ((rc = pthread_mutex_lock(&worker->mutex)))
+ if ((rc = vkd3d_mutex_lock(&worker->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return hresult_from_errno(rc);
@@ -263,7 +263,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker,
worker->enqueued_fence_count + 1, sizeof(*worker->enqueued_fences)))
{
ERR("Failed to add GPU fence.\n");
- pthread_mutex_unlock(&worker->mutex);
+ vkd3d_mutex_unlock(&worker->mutex);
return E_OUTOFMEMORY;
}
@@ -277,8 +277,8 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker,
InterlockedIncrement(&fence->pending_worker_operation_count);
- pthread_cond_signal(&worker->cond);
- pthread_mutex_unlock(&worker->mutex);
+ vkd3d_cond_signal(&worker->cond);
+ vkd3d_mutex_unlock(&worker->mutex);
return S_OK;
}
@@ -293,7 +293,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s
WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence);
- if ((rc = pthread_mutex_lock(&worker->mutex)))
+ if ((rc = vkd3d_mutex_lock(&worker->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return;
@@ -304,14 +304,14 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s
TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence);
worker->pending_fence_destruction = true;
- pthread_cond_signal(&worker->cond);
+ vkd3d_cond_signal(&worker->cond);
- pthread_cond_wait(&worker->fence_destruction_cond, &worker->mutex);
+ vkd3d_cond_wait(&worker->fence_destruction_cond, &worker->mutex);
}
TRACE("Removed fence %p.\n", fence);
- pthread_mutex_unlock(&worker->mutex);
+ vkd3d_mutex_unlock(&worker->mutex);
}
static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_worker *worker)
@@ -412,7 +412,7 @@ static void *vkd3d_fence_worker_main(void *arg)
if (!worker->fence_count || InterlockedAdd(&worker->enqueued_fence_count, 0))
{
- if ((rc = pthread_mutex_lock(&worker->mutex)))
+ if ((rc = vkd3d_mutex_lock(&worker->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
break;
@@ -420,7 +420,7 @@ static void *vkd3d_fence_worker_main(void *arg)
if (worker->pending_fence_destruction)
{
- pthread_cond_broadcast(&worker->fence_destruction_cond);
+ vkd3d_cond_broadcast(&worker->fence_destruction_cond);
worker->pending_fence_destruction = false;
}
@@ -432,19 +432,19 @@ static void *vkd3d_fence_worker_main(void *arg)
{
if (worker->should_exit)
{
- pthread_mutex_unlock(&worker->mutex);
+ vkd3d_mutex_unlock(&worker->mutex);
break;
}
- if ((rc = pthread_cond_wait(&worker->cond, &worker->mutex)))
+ if ((rc = vkd3d_cond_wait(&worker->cond, &worker->mutex)))
{
ERR("Failed to wait on condition variable, error %d.\n", rc);
- pthread_mutex_unlock(&worker->mutex);
+ vkd3d_mutex_unlock(&worker->mutex);
break;
}
}
- pthread_mutex_unlock(&worker->mutex);
+ vkd3d_mutex_unlock(&worker->mutex);
}
}
@@ -474,33 +474,33 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker,
worker->fences = NULL;
worker->fences_size = 0;
- if ((rc = pthread_mutex_init(&worker->mutex, NULL)))
+ if ((rc = vkd3d_mutex_init(&worker->mutex)))
{
ERR("Failed to initialize mutex, error %d.\n", rc);
return hresult_from_errno(rc);
}
- if ((rc = pthread_cond_init(&worker->cond, NULL)))
+ if ((rc = vkd3d_cond_init(&worker->cond)))
{
ERR("Failed to initialize condition variable, error %d.\n", rc);
- pthread_mutex_destroy(&worker->mutex);
+ vkd3d_mutex_destroy(&worker->mutex);
return hresult_from_errno(rc);
}
- if ((rc = pthread_cond_init(&worker->fence_destruction_cond, NULL)))
+ if ((rc = vkd3d_cond_init(&worker->fence_destruction_cond)))
{
ERR("Failed to initialize condition variable, error %d.\n", rc);
- pthread_mutex_destroy(&worker->mutex);
- pthread_cond_destroy(&worker->cond);
+ vkd3d_mutex_destroy(&worker->mutex);
+ vkd3d_cond_destroy(&worker->cond);
return hresult_from_errno(rc);
}
if (FAILED(hr = vkd3d_create_thread(device->vkd3d_instance,
vkd3d_fence_worker_main, worker, &worker->thread)))
{
- pthread_mutex_destroy(&worker->mutex);
- pthread_cond_destroy(&worker->cond);
- pthread_cond_destroy(&worker->fence_destruction_cond);
+ vkd3d_mutex_destroy(&worker->mutex);
+ vkd3d_cond_destroy(&worker->cond);
+ vkd3d_cond_destroy(&worker->fence_destruction_cond);
}
return hr;
@@ -514,23 +514,23 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker,
TRACE("worker %p.\n", worker);
- if ((rc = pthread_mutex_lock(&worker->mutex)))
+ if ((rc = vkd3d_mutex_lock(&worker->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return hresult_from_errno(rc);
}
worker->should_exit = true;
- pthread_cond_signal(&worker->cond);
+ vkd3d_cond_signal(&worker->cond);
- pthread_mutex_unlock(&worker->mutex);
+ vkd3d_mutex_unlock(&worker->mutex);
if (FAILED(hr = vkd3d_join_thread(device->vkd3d_instance, &worker->thread)))
return hr;
- pthread_mutex_destroy(&worker->mutex);
- pthread_cond_destroy(&worker->cond);
- pthread_cond_destroy(&worker->fence_destruction_cond);
+ vkd3d_mutex_destroy(&worker->mutex);
+ vkd3d_cond_destroy(&worker->cond);
+ vkd3d_cond_destroy(&worker->fence_destruction_cond);
vkd3d_free(worker->enqueued_fences);
vkd3d_free(worker->vk_fences);
@@ -589,7 +589,7 @@ static VkResult d3d12_fence_create_vk_fence(struct d3d12_fence *fence, VkFence *
*vk_fence = VK_NULL_HANDLE;
- if ((rc = pthread_mutex_lock(&fence->mutex)))
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
goto create_fence;
@@ -604,7 +604,7 @@ static VkResult d3d12_fence_create_vk_fence(struct d3d12_fence *fence, VkFence *
}
}
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
if (*vk_fence)
return VK_SUCCESS;
@@ -668,7 +668,7 @@ static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence)
unsigned int i;
int rc;
- if ((rc = pthread_mutex_lock(&fence->mutex)))
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return;
@@ -685,7 +685,7 @@ static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence)
d3d12_fence_garbage_collect_vk_semaphores_locked(fence, true);
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
}
static struct vkd3d_signaled_semaphore *d3d12_fence_acquire_vk_semaphore(struct d3d12_fence *fence,
@@ -698,7 +698,7 @@ static struct vkd3d_signaled_semaphore *d3d12_fence_acquire_vk_semaphore(struct
TRACE("fence %p, value %#"PRIx64".\n", fence, value);
- if ((rc = pthread_mutex_lock(&fence->mutex)))
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return VK_NULL_HANDLE;
@@ -724,7 +724,7 @@ static struct vkd3d_signaled_semaphore *d3d12_fence_acquire_vk_semaphore(struct
*completed_value = fence->value;
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
return semaphore;
}
@@ -733,7 +733,7 @@ static void d3d12_fence_remove_vk_semaphore(struct d3d12_fence *fence, struct vk
{
int rc;
- if ((rc = pthread_mutex_lock(&fence->mutex)))
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return;
@@ -746,14 +746,14 @@ static void d3d12_fence_remove_vk_semaphore(struct d3d12_fence *fence, struct vk
--fence->semaphore_count;
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
}
static void d3d12_fence_release_vk_semaphore(struct d3d12_fence *fence, struct vkd3d_signaled_semaphore *semaphore)
{
int rc;
- if ((rc = pthread_mutex_lock(&fence->mutex)))
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return;
@@ -762,7 +762,7 @@ static void d3d12_fence_release_vk_semaphore(struct d3d12_fence *fence, struct v
assert(semaphore->is_acquired);
semaphore->is_acquired = false;
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
}
static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence,
@@ -780,7 +780,7 @@ static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence,
return E_OUTOFMEMORY;
}
- if ((rc = pthread_mutex_lock(&fence->mutex)))
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
vkd3d_free(semaphore);
@@ -797,7 +797,7 @@ static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence,
list_add_tail(&fence->semaphores, &semaphore->entry);
++fence->semaphore_count;
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
return hr;
}
@@ -810,7 +810,7 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF
unsigned int i, j;
int rc;
- if ((rc = pthread_mutex_lock(&fence->mutex)))
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return hresult_from_errno(rc);
@@ -844,7 +844,7 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF
fence->event_count = j;
if (signal_null_event_cond)
- pthread_cond_broadcast(&fence->null_event_cond);
+ vkd3d_cond_broadcast(&fence->null_event_cond);
if (vk_fence)
{
@@ -870,7 +870,7 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF
VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL));
}
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
return S_OK;
}
@@ -926,9 +926,9 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface)
d3d12_fence_destroy_vk_objects(fence);
vkd3d_free(fence->events);
- if ((rc = pthread_mutex_destroy(&fence->mutex)))
+ if ((rc = vkd3d_mutex_destroy(&fence->mutex)))
ERR("Failed to destroy mutex, error %d.\n", rc);
- pthread_cond_destroy(&fence->null_event_cond);
+ vkd3d_cond_destroy(&fence->null_event_cond);
vkd3d_free(fence);
d3d12_device_release(device);
@@ -995,13 +995,13 @@ static UINT64 STDMETHODCALLTYPE d3d12_fence_GetCompletedValue(ID3D12Fence *iface
TRACE("iface %p.\n", iface);
- if ((rc = pthread_mutex_lock(&fence->mutex)))
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return 0;
}
completed_value = fence->value;
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
return completed_value;
}
@@ -1015,7 +1015,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event);
- if ((rc = pthread_mutex_lock(&fence->mutex)))
+ if ((rc = vkd3d_mutex_lock(&fence->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return hresult_from_errno(rc);
@@ -1025,7 +1025,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
{
if (event)
fence->device->signal_event(event);
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
return S_OK;
}
@@ -1036,7 +1036,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
{
WARN("Event completion for (%p, %#"PRIx64") is already in the list.\n",
event, value);
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
return S_OK;
}
}
@@ -1045,7 +1045,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
fence->event_count + 1, sizeof(*fence->events)))
{
WARN("Failed to add event.\n");
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
return E_OUTOFMEMORY;
}
@@ -1062,10 +1062,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
if (!event)
{
while (!*latch)
- pthread_cond_wait(&fence->null_event_cond, &fence->mutex);
+ vkd3d_cond_wait(&fence->null_event_cond, &fence->mutex);
}
- pthread_mutex_unlock(&fence->mutex);
+ vkd3d_mutex_unlock(&fence->mutex);
return S_OK;
}
@@ -1116,16 +1116,16 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *
fence->value = initial_value;
- if ((rc = pthread_mutex_init(&fence->mutex, NULL)))
+ if ((rc = vkd3d_mutex_init(&fence->mutex)))
{
ERR("Failed to initialize mutex, error %d.\n", rc);
return hresult_from_errno(rc);
}
- if ((rc = pthread_cond_init(&fence->null_event_cond, NULL)))
+ if ((rc = vkd3d_cond_init(&fence->null_event_cond)))
{
ERR("Failed to initialize cond variable, error %d.\n", rc);
- pthread_mutex_destroy(&fence->mutex);
+ vkd3d_mutex_destroy(&fence->mutex);
return hresult_from_errno(rc);
}
@@ -1145,8 +1145,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *
if (FAILED(hr = vkd3d_private_store_init(&fence->private_store)))
{
- pthread_mutex_destroy(&fence->mutex);
- pthread_cond_destroy(&fence->null_event_cond);
+ vkd3d_mutex_destroy(&fence->mutex);
+ vkd3d_cond_destroy(&fence->null_event_cond);
return hr;
}
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 4bcb5efcbba9..fe90eb37ef00 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -1878,7 +1878,7 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device)
VkResult vr;
int rc;
- if ((rc = pthread_mutex_init(&device->mutex, NULL)))
+ if ((rc = vkd3d_mutex_init(&device->mutex)))
{
ERR("Failed to initialize mutex, error %d.\n", rc);
return hresult_from_errno(rc);
@@ -1906,7 +1906,7 @@ static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device)
if (device->vk_pipeline_cache)
VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL));
- pthread_mutex_destroy(&device->mutex);
+ vkd3d_mutex_destroy(&device->mutex);
}
#define VKD3D_VA_FALLBACK_BASE 0x8000000000000000ull
@@ -1979,7 +1979,7 @@ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_al
return 0;
size = align(size, alignment);
- if ((rc = pthread_mutex_lock(&allocator->mutex)))
+ if ((rc = vkd3d_mutex_lock(&allocator->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return 0;
@@ -1990,7 +1990,7 @@ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_al
else
address = vkd3d_gpu_va_allocator_allocate_fallback(allocator, alignment, size, ptr);
- pthread_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
return address;
}
@@ -2061,7 +2061,7 @@ void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocato
return vkd3d_gpu_va_allocator_dereference_slab(allocator, address);
/* Slow fallback. */
- if ((rc = pthread_mutex_lock(&allocator->mutex)))
+ if ((rc = vkd3d_mutex_lock(&allocator->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return NULL;
@@ -2069,7 +2069,7 @@ void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocato
ret = vkd3d_gpu_va_allocator_dereference_fallback(allocator, address);
- pthread_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
return ret;
}
@@ -2124,7 +2124,7 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12
{
int rc;
- if ((rc = pthread_mutex_lock(&allocator->mutex)))
+ if ((rc = vkd3d_mutex_lock(&allocator->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return;
@@ -2133,13 +2133,13 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12
if (address < VKD3D_VA_FALLBACK_BASE)
{
vkd3d_gpu_va_allocator_free_slab(allocator, address);
- pthread_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
return;
}
vkd3d_gpu_va_allocator_free_fallback(allocator, address);
- pthread_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
}
static bool vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator)
@@ -2165,7 +2165,7 @@ static bool vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator
allocator->slabs[i].ptr = &allocator->slabs[i + 1];
}
- if ((rc = pthread_mutex_init(&allocator->mutex, NULL)))
+ if ((rc = vkd3d_mutex_init(&allocator->mutex)))
{
ERR("Failed to initialize mutex, error %d.\n", rc);
vkd3d_free(allocator->slabs);
@@ -2179,15 +2179,15 @@ static void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *alloca
{
int rc;
- if ((rc = pthread_mutex_lock(&allocator->mutex)))
+ if ((rc = vkd3d_mutex_lock(&allocator->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return;
}
vkd3d_free(allocator->slabs);
vkd3d_free(allocator->fallback_allocations);
- pthread_mutex_unlock(&allocator->mutex);
- pthread_mutex_destroy(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_destroy(&allocator->mutex);
}
/* We could use bsearch() or recursion here, but it probably helps to omit
@@ -2223,7 +2223,7 @@ bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_a
struct vkd3d_gpu_descriptor_allocation *allocation;
int rc;
- if ((rc = pthread_mutex_lock(&allocator->mutex)))
+ if ((rc = vkd3d_mutex_lock(&allocator->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return false;
@@ -2232,7 +2232,7 @@ bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_a
if (!vkd3d_array_reserve((void **)&allocator->allocations, &allocator->allocations_size,
allocator->allocation_count + 1, sizeof(*allocator->allocations)))
{
- pthread_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
return false;
}
@@ -2247,7 +2247,7 @@ bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_a
allocation->base = base;
allocation->count = count;
- pthread_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
return true;
}
@@ -2259,7 +2259,7 @@ bool vkd3d_gpu_descriptor_allocator_unregister_range(
size_t i;
int rc;
- if ((rc = pthread_mutex_lock(&allocator->mutex)))
+ if ((rc = vkd3d_mutex_lock(&allocator->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return false;
@@ -2277,7 +2277,7 @@ bool vkd3d_gpu_descriptor_allocator_unregister_range(
break;
}
- pthread_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
return found;
}
@@ -2301,7 +2301,7 @@ size_t vkd3d_gpu_descriptor_allocator_range_size_from_descriptor(
assert(allocator->allocation_count);
- if ((rc = pthread_mutex_lock(&allocator->mutex)))
+ if ((rc = vkd3d_mutex_lock(&allocator->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return 0;
@@ -2311,7 +2311,7 @@ size_t vkd3d_gpu_descriptor_allocator_range_size_from_descriptor(
if ((allocation = vkd3d_gpu_descriptor_allocator_allocation_from_descriptor(allocator, desc)))
remaining = allocation->count - (desc - allocation->base);
- pthread_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
return remaining;
}
@@ -2325,7 +2325,7 @@ struct d3d12_descriptor_heap *vkd3d_gpu_descriptor_allocator_heap_from_descripto
if (!allocator->allocation_count)
return NULL;
- if ((rc = pthread_mutex_lock(&allocator->mutex)))
+ if ((rc = vkd3d_mutex_lock(&allocator->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return NULL;
@@ -2333,7 +2333,7 @@ struct d3d12_descriptor_heap *vkd3d_gpu_descriptor_allocator_heap_from_descripto
allocation = vkd3d_gpu_descriptor_allocator_allocation_from_descriptor(allocator, desc);
- pthread_mutex_unlock(&allocator->mutex);
+ vkd3d_mutex_unlock(&allocator->mutex);
return allocation ? CONTAINING_RECORD(allocation->base, struct d3d12_descriptor_heap, descriptors)
: NULL;
@@ -2344,7 +2344,7 @@ static bool vkd3d_gpu_descriptor_allocator_init(struct vkd3d_gpu_descriptor_allo
int rc;
memset(allocator, 0, sizeof(*allocator));
- if ((rc = pthread_mutex_init(&allocator->mutex, NULL)))
+ if ((rc = vkd3d_mutex_init(&allocator->mutex)))
{
ERR("Failed to initialise mutex, error %d.\n", rc);
return false;
@@ -2356,7 +2356,7 @@ static bool vkd3d_gpu_descriptor_allocator_init(struct vkd3d_gpu_descriptor_allo
static void vkd3d_gpu_descriptor_allocator_cleanup(struct vkd3d_gpu_descriptor_allocator *allocator)
{
vkd3d_free(allocator->allocations);
- pthread_mutex_destroy(&allocator->mutex);
+ vkd3d_mutex_destroy(&allocator->mutex);
}
static bool have_vk_time_domain(VkTimeDomainEXT *domains, unsigned int count, VkTimeDomainEXT domain)
@@ -2479,7 +2479,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface)
d3d12_device_destroy_pipeline_cache(device);
d3d12_device_destroy_vkd3d_queues(device);
for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i)
- pthread_mutex_destroy(&device->desc_mutex[i]);
+ vkd3d_mutex_destroy(&device->desc_mutex[i]);
VK_CALL(vkDestroyDevice(device->vk_device, NULL));
if (device->parent)
IUnknown_Release(device->parent);
@@ -3977,7 +3977,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device,
vkd3d_time_domains_init(device);
for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i)
- pthread_mutex_init(&device->desc_mutex[i], NULL);
+ vkd3d_mutex_init(&device->desc_mutex[i]);
if ((device->parent = create_info->parent))
IUnknown_AddRef(device->parent);
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 19a163beead4..7b94ac926f28 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -326,7 +326,7 @@ static void d3d12_heap_destroy(struct d3d12_heap *heap)
VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL));
- pthread_mutex_destroy(&heap->mutex);
+ vkd3d_mutex_destroy(&heap->mutex);
if (heap->is_private)
device = NULL;
@@ -443,7 +443,7 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset,
VkResult vr;
int rc;
- if ((rc = pthread_mutex_lock(&heap->mutex)))
+ if ((rc = vkd3d_mutex_lock(&heap->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
if (data)
@@ -491,7 +491,7 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset,
*data = NULL;
}
- pthread_mutex_unlock(&heap->mutex);
+ vkd3d_mutex_unlock(&heap->mutex);
return hr;
}
@@ -501,7 +501,7 @@ static void d3d12_heap_unmap(struct d3d12_heap *heap, struct d3d12_resource *res
struct d3d12_device *device = heap->device;
int rc;
- if ((rc = pthread_mutex_lock(&heap->mutex)))
+ if ((rc = vkd3d_mutex_lock(&heap->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return;
@@ -535,7 +535,7 @@ static void d3d12_heap_unmap(struct d3d12_heap *heap, struct d3d12_resource *res
}
done:
- pthread_mutex_unlock(&heap->mutex);
+ vkd3d_mutex_unlock(&heap->mutex);
}
static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc, const struct d3d12_resource *resource)
@@ -594,7 +594,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap,
if (FAILED(hr = validate_heap_desc(&heap->desc, resource)))
return hr;
- if ((rc = pthread_mutex_init(&heap->mutex, NULL)))
+ if ((rc = vkd3d_mutex_init(&heap->mutex)))
{
ERR("Failed to initialize mutex, error %d.\n", rc);
return hresult_from_errno(rc);
@@ -602,7 +602,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap,
if (FAILED(hr = vkd3d_private_store_init(&heap->private_store)))
{
- pthread_mutex_destroy(&heap->mutex);
+ vkd3d_mutex_destroy(&heap->mutex);
return hr;
}
@@ -636,7 +636,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap,
if (FAILED(hr))
{
vkd3d_private_store_destroy(&heap->private_store);
- pthread_mutex_destroy(&heap->mutex);
+ vkd3d_mutex_destroy(&heap->mutex);
return hr;
}
@@ -2126,10 +2126,10 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr
struct d3d12_device *device)
{
struct vkd3d_view *defunct_view = NULL;
- pthread_mutex_t *mutex;
+ struct vkd3d_mutex *mutex;
mutex = d3d12_device_get_descriptor_mutex(device, dst);
- pthread_mutex_lock(mutex);
+ vkd3d_mutex_lock(mutex);
/* Nothing to do for VKD3D_DESCRIPTOR_MAGIC_CBV. */
if ((dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW)
@@ -2138,7 +2138,7 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr
*dst = *src;
- pthread_mutex_unlock(mutex);
+ vkd3d_mutex_unlock(mutex);
/* Destroy the view after unlocking to reduce wait time. */
if (defunct_view)
@@ -2156,21 +2156,21 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src,
struct d3d12_device *device)
{
struct d3d12_desc tmp;
- pthread_mutex_t *mutex;
+ struct vkd3d_mutex *mutex;
assert(dst != src);
/* Shadow of the Tomb Raider and possibly other titles sometimes destroy
* and rewrite a descriptor in another thread while it is being copied. */
mutex = d3d12_device_get_descriptor_mutex(device, src);
- pthread_mutex_lock(mutex);
+ vkd3d_mutex_lock(mutex);
if (src->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW)
vkd3d_view_incref(src->u.view);
tmp = *src;
- pthread_mutex_unlock(mutex);
+ vkd3d_mutex_unlock(mutex);
d3d12_desc_write_atomic(dst, &tmp, device);
}
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index b54a6527c016..12c7a9e8f65c 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -1432,7 +1432,7 @@ HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache,
unsigned int i;
int rc;
- if ((rc = pthread_mutex_lock(&device->mutex)))
+ if ((rc = vkd3d_mutex_lock(&device->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
*vk_render_pass = VK_NULL_HANDLE;
@@ -1454,7 +1454,7 @@ HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache,
if (!found)
hr = vkd3d_render_pass_cache_create_pass_locked(cache, device, key, vk_render_pass);
- pthread_mutex_unlock(&device->mutex);
+ vkd3d_mutex_unlock(&device->mutex);
return hr;
}
@@ -3078,7 +3078,7 @@ static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12
*vk_render_pass = VK_NULL_HANDLE;
- if (!(rc = pthread_mutex_lock(&device->mutex)))
+ if (!(rc = vkd3d_mutex_lock(&device->mutex)))
{
LIST_FOR_EACH_ENTRY(current, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry)
{
@@ -3089,7 +3089,7 @@ static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12
break;
}
}
- pthread_mutex_unlock(&device->mutex);
+ vkd3d_mutex_unlock(&device->mutex);
}
else
{
@@ -3114,7 +3114,7 @@ static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_sta
compiled_pipeline->vk_pipeline = vk_pipeline;
compiled_pipeline->vk_render_pass = vk_render_pass;
- if ((rc = pthread_mutex_lock(&device->mutex)))
+ if ((rc = vkd3d_mutex_lock(&device->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
vkd3d_free(compiled_pipeline);
@@ -3134,7 +3134,7 @@ static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_sta
if (compiled_pipeline)
list_add_tail(&graphics->compiled_pipelines, &compiled_pipeline->entry);
- pthread_mutex_unlock(&device->mutex);
+ vkd3d_mutex_unlock(&device->mutex);
return compiled_pipeline;
}
diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c
index cdb81f671b94..873f840ccf56 100644
--- a/libs/vkd3d/utils.c
+++ b/libs/vkd3d/utils.c
@@ -948,7 +948,7 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store,
if (!out_size)
return E_INVALIDARG;
- if ((rc = pthread_mutex_lock(&store->mutex)))
+ if ((rc = vkd3d_mutex_lock(&store->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return hresult_from_errno(rc);
@@ -977,7 +977,7 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store,
memcpy(out, data->u.data, data->size);
done:
- pthread_mutex_unlock(&store->mutex);
+ vkd3d_mutex_unlock(&store->mutex);
return hr;
}
@@ -987,7 +987,7 @@ HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store,
HRESULT hr;
int rc;
- if ((rc = pthread_mutex_lock(&store->mutex)))
+ if ((rc = vkd3d_mutex_lock(&store->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return hresult_from_errno(rc);
@@ -995,7 +995,7 @@ HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store,
hr = vkd3d_private_store_set_private_data(store, tag, data, data_size, false);
- pthread_mutex_unlock(&store->mutex);
+ vkd3d_mutex_unlock(&store->mutex);
return hr;
}
@@ -1006,7 +1006,7 @@ HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store,
HRESULT hr;
int rc;
- if ((rc = pthread_mutex_lock(&store->mutex)))
+ if ((rc = vkd3d_mutex_lock(&store->mutex)))
{
ERR("Failed to lock mutex, error %d.\n", rc);
return hresult_from_errno(rc);
@@ -1014,7 +1014,7 @@ HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store,
hr = vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object);
- pthread_mutex_unlock(&store->mutex);
+ vkd3d_mutex_unlock(&store->mutex);
return hr;
}
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index d21cd411ec8a..bb7be99e7efc 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -171,6 +171,62 @@ union vkd3d_thread_handle
void *handle;
};
+struct vkd3d_mutex
+{
+ pthread_mutex_t lock;
+};
+
+struct vkd3d_cond
+{
+ pthread_cond_t cond;
+};
+
+
+static inline int vkd3d_mutex_init(struct vkd3d_mutex *lock)
+{
+ return pthread_mutex_init(&lock->lock, NULL);
+}
+
+static inline int vkd3d_mutex_lock(struct vkd3d_mutex *lock)
+{
+ return pthread_mutex_lock(&lock->lock);
+}
+
+static inline int vkd3d_mutex_unlock(struct vkd3d_mutex *lock)
+{
+ return pthread_mutex_unlock(&lock->lock);
+}
+
+static inline int vkd3d_mutex_destroy(struct vkd3d_mutex *lock)
+{
+ return pthread_mutex_destroy(&lock->lock);
+}
+
+static inline int vkd3d_cond_init(struct vkd3d_cond *cond)
+{
+ return pthread_cond_init(&cond->cond, NULL);
+}
+
+static inline int vkd3d_cond_signal(struct vkd3d_cond *cond)
+{
+ return pthread_cond_signal(&cond->cond);
+}
+
+static inline int vkd3d_cond_broadcast(struct vkd3d_cond *cond)
+{
+ return pthread_cond_broadcast(&cond->cond);
+}
+
+static inline int vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock)
+{
+ return pthread_cond_wait(&cond->cond, &lock->lock);
+}
+
+static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond)
+{
+ return pthread_cond_destroy(&cond->cond);
+}
+
HRESULT vkd3d_create_thread(struct vkd3d_instance *instance,
PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread);
HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread);
@@ -186,9 +242,9 @@ struct vkd3d_waiting_fence
struct vkd3d_fence_worker
{
union vkd3d_thread_handle thread;
- pthread_mutex_t mutex;
- pthread_cond_t cond;
- pthread_cond_t fence_destruction_cond;
+ struct vkd3d_mutex mutex;
+ struct vkd3d_cond cond;
+ struct vkd3d_cond fence_destruction_cond;
bool should_exit;
bool pending_fence_destruction;
@@ -227,7 +283,7 @@ struct vkd3d_gpu_va_slab
struct vkd3d_gpu_va_allocator
{
- pthread_mutex_t mutex;
+ struct vkd3d_mutex mutex;
D3D12_GPU_VIRTUAL_ADDRESS fallback_floor;
struct vkd3d_gpu_va_allocation *fallback_allocations;
@@ -251,7 +307,7 @@ struct vkd3d_gpu_descriptor_allocation
struct vkd3d_gpu_descriptor_allocator
{
- pthread_mutex_t mutex;
+ struct vkd3d_mutex mutex;
struct vkd3d_gpu_descriptor_allocation *allocations;
size_t allocations_size;
@@ -294,7 +350,7 @@ void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache);
struct vkd3d_private_store
{
- pthread_mutex_t mutex;
+ struct vkd3d_mutex mutex;
struct list content;
};
@@ -327,7 +383,7 @@ static inline HRESULT vkd3d_private_store_init(struct vkd3d_private_store *store
list_init(&store->content);
- if ((rc = pthread_mutex_init(&store->mutex, NULL)))
+ if ((rc = vkd3d_mutex_init(&store->mutex)))
ERR("Failed to initialize mutex, error %d.\n", rc);
return hresult_from_errno(rc);
@@ -342,7 +398,7 @@ static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store
vkd3d_private_data_destroy(data);
}
- pthread_mutex_destroy(&store->mutex);
+ vkd3d_mutex_destroy(&store->mutex);
}
HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int *out_size, void *out);
@@ -366,8 +422,8 @@ struct d3d12_fence
LONG refcount;
uint64_t value;
- pthread_mutex_t mutex;
- pthread_cond_t null_event_cond;
+ struct vkd3d_mutex mutex;
+ struct vkd3d_cond null_event_cond;
struct vkd3d_waiting_event
{
@@ -402,7 +458,7 @@ struct d3d12_heap
bool is_private;
D3D12_HEAP_DESC desc;
- pthread_mutex_t mutex;
+ struct vkd3d_mutex mutex;
VkDeviceMemory vk_memory;
void *map_ptr;
@@ -1041,7 +1097,7 @@ HRESULT d3d12_command_list_create(struct d3d12_device *device,
struct vkd3d_queue
{
/* Access to VkQueue must be externally synchronized. */
- pthread_mutex_t mutex;
+ struct vkd3d_mutex mutex;
VkQueue vk_queue;
@@ -1181,8 +1237,8 @@ struct d3d12_device
struct vkd3d_gpu_va_allocator gpu_va_allocator;
struct vkd3d_fence_worker fence_worker;
- pthread_mutex_t mutex;
- pthread_mutex_t desc_mutex[8];
+ struct vkd3d_mutex mutex;
+ struct vkd3d_mutex desc_mutex[8];
struct vkd3d_render_pass_cache render_pass_cache;
VkPipelineCache vk_pipeline_cache;
@@ -1249,7 +1305,7 @@ static inline unsigned int d3d12_device_get_descriptor_handle_increment_size(str
return ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, descriptor_type);
}
-static inline pthread_mutex_t *d3d12_device_get_descriptor_mutex(struct d3d12_device *device,
+static inline struct vkd3d_mutex *d3d12_device_get_descriptor_mutex(struct d3d12_device *device,
const struct d3d12_desc *descriptor)
{
STATIC_ASSERT(!(ARRAY_SIZE(device->desc_mutex) & (ARRAY_SIZE(device->desc_mutex) - 1)));
--
2.34.1
2
1
From: Francisco Casas <fcasas(a)codeweavers.com>
Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
v4: Tweak style a tiny bit.
Makefile.am | 2 +
tests/hlsl-initializer-struct.shader_test | 84 +++++++++++++++++++++++
2 files changed, 86 insertions(+)
create mode 100644 tests/hlsl-initializer-struct.shader_test
diff --git a/Makefile.am b/Makefile.am
index 84c7b859..8cedf208 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,7 @@ vkd3d_shader_tests = \
tests/hlsl-gather.shader_test \
tests/hlsl-initializer-local-array.shader_test \
tests/hlsl-initializer-static-array.shader_test \
+ tests/hlsl-initializer-struct.shader_test \
tests/hlsl-intrinsic-override.shader_test \
tests/hlsl-invalid.shader_test \
tests/hlsl-majority-pragma.shader_test \
@@ -299,6 +300,7 @@ XFAIL_TESTS = \
tests/hlsl-array-dimension.shader_test \
tests/hlsl-initializer-local-array.shader_test \
tests/hlsl-initializer-static-array.shader_test \
+ tests/hlsl-initializer-struct.shader_test \
tests/hlsl-bool-cast.shader_test \
tests/hlsl-duplicate-modifiers.shader_test \
tests/hlsl-for.shader_test \
diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl-initializer-struct.shader_test
new file mode 100644
index 00000000..f4028b5b
--- /dev/null
+++ b/tests/hlsl-initializer-struct.shader_test
@@ -0,0 +1,84 @@
+[pixel shader]
+struct stu
+{
+ int3 aaa;
+ float3 bbb;
+ int2 ccc;
+ float4 ddd;
+ int eee;
+};
+
+float4 main() : sv_target
+{
+ struct stu val =
+ {
+ 11, 12, 13,
+ 21, 22, 23,
+ 31, 32,
+ 41, 42, 43, 44,
+ 51
+ };
+ return val.ddd;
+}
+
+[test]
+draw quad
+probe all rgba (41, 42, 43, 44)
+
+
+[pixel shader]
+struct stu
+{
+ int3 aaa;
+ float3 bbb[2];
+ int2 ccc;
+ float4 ddd[3][2];
+ int eee;
+};
+
+float4 main() : sv_target
+{
+ struct stu val =
+ {
+ 11, 12, 13,
+ 211, 212, 213, 221, 222, 223,
+ 31, 32,
+ 4111, 4112, 4113, 4114, 4121, 4122, 4123, 4124,
+ 4211, 4212, 4213, 4214, 4221, 4222, 4223, 4224,
+ 4311, 4312, 4313, 4314, 4321, 4322, 4323, 4324,
+ 51
+ };
+ return val.ddd[2][0];
+}
+
+[test]
+draw quad
+probe all rgba (4311, 4312, 4313, 4314)
+
+
+[pixel shader]
+struct stu
+{
+ int3 aaa;
+ struct
+ {
+ float4 foo;
+ int2 bar;
+ } bbb[3];
+};
+
+float4 main() : sv_target
+{
+ struct stu val =
+ {
+ 1, 2, 3,
+ 11, 12, 13, 14, 15, 16,
+ 21, 22, 23, 24, 25, 26,
+ 31, 32, 33, 34, 35, 36
+ };
+ return val.bbb[1].foo;
+}
+
+[test]
+draw quad
+probe all rgba (21, 22, 23, 24)
--
2.34.1
2
13
2
1
04 Feb '22
Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com>
---
v2: Updated spec entries.
configure.ac | 1 +
dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in | 1 +
.../api-ms-win-security-lsalookup-ansi-l2-1-0.spec | 5 +++++
tools/make_specfiles | 1 +
4 files changed, 8 insertions(+)
create mode 100644 dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in
create mode 100644 dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec
diff --git a/configure.ac b/configure.ac
index 63e7aa7f5dd..e51e114c45e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2545,6 +2545,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-private-l1-1-1)
WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-credentials-l1-1-0)
WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-cryptoapi-l1-1-0)
WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-grouppolicy-l1-1-0)
+WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-ansi-l2-1-0)
WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-0)
WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-1)
WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l2-1-0)
diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in
new file mode 100644
index 00000000000..3a880198bd7
--- /dev/null
+++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in
@@ -0,0 +1 @@
+MODULE = api-ms-win-security-lsalookup-ansi-l2-1-0.dll
diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec
new file mode 100644
index 00000000000..fcb48049250
--- /dev/null
+++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec
@@ -0,0 +1,5 @@
+@ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) advapi32.LookupAccountNameA
+@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidA
+@ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) advapi32.LookupPrivilegeDisplayNameA
+@ stdcall LookupPrivilegeNameA(str ptr ptr ptr) advapi32.LookupPrivilegeNameA
+@ stdcall LookupPrivilegeValueA(str str ptr) advapi32.LookupPrivilegeValueA
diff --git a/tools/make_specfiles b/tools/make_specfiles
index b5e6443dd3c..594e01396db 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -137,6 +137,7 @@ my @dll_groups =
"api-ms-win-security-base-private-l1-1-1",
"api-ms-win-security-credentials-l1-1-0",
"api-ms-win-security-cryptoapi-l1-1-0",
+ "api-ms-win-security-lsalookup-ansi-l2-1-0",
"api-ms-win-security-lsalookup-l1-1-0",
"api-ms-win-security-lsalookup-l1-1-1",
"api-ms-win-security-lsalookup-l2-1-0",
--
2.34.1
1
0
32 bit compilation has been broken by 8db1662d749991a77b8945c752ab024d2d6b1244
(failing on C_ASSERT)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/wldap32/libldap.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c
index 8872421dabc..03b71f3db87 100644
--- a/dlls/wldap32/libldap.c
+++ b/dlls/wldap32/libldap.c
@@ -53,7 +53,14 @@ C_ASSERT( sizeof(LDAPSortKeyU) == sizeof(LDAPSortKey) );
C_ASSERT( sizeof(LDAPVLVInfoU) == sizeof(LDAPVLVInfo) );
C_ASSERT( sizeof(LDAPAPIInfoU) == sizeof(LDAPAPIInfo) );
C_ASSERT( sizeof(LDAPAPIFeatureInfoU) == sizeof(LDAPAPIFeatureInfo) );
-C_ASSERT( sizeof(struct timevalU) == sizeof(struct timeval) );
+
+static struct timeval *cconvert_timeval(const struct timevalU *tvu, struct timeval *tv)
+{
+ if (!tvu) return NULL;
+ tv->tv_sec = tvu->tv_sec;
+ tv->tv_usec = tvu->tv_usec;
+ return tv;
+}
#define WLDAP32_LBER_ERROR (~0l)
@@ -488,8 +495,9 @@ static NTSTATUS wrap_ldap_rename_s( void *args )
static NTSTATUS wrap_ldap_result( void *args )
{
struct ldap_result_params *params = args;
+ struct timeval tv;
return ldap_result( params->ld, params->msgid, params->all,
- (struct timeval *)params->timeout, (LDAPMessage **)params->result );
+ convert_timeval(params->timeout, &tv), (LDAPMessage **)params->result );
}
static NTSTATUS wrap_ldap_sasl_bind( void *args )
@@ -555,18 +563,20 @@ static NTSTATUS wrap_ldap_sasl_interactive_bind_s( void *args )
static NTSTATUS wrap_ldap_search_ext( void *args )
{
struct ldap_search_ext_params *params = args;
+ struct timeval tv;
return ldap_search_ext( params->ld, params->base, params->scope, params->filter, params->attrs,
params->attrsonly, (LDAPControl **)params->serverctrls,
- (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout,
+ (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv),
params->sizelimit, (int *)params->msg );
}
static NTSTATUS wrap_ldap_search_ext_s( void *args )
{
struct ldap_search_ext_s_params *params = args;
+ struct timeval tv;
return ldap_search_ext_s( params->ld, params->base, params->scope, params->filter, params->attrs,
params->attrsonly, (LDAPControl **)params->serverctrls,
- (LDAPControl **)params->clientctrls, (struct timeval *)params->timeout,
+ (LDAPControl **)params->clientctrls, convert_timeval(params->timeout, &tv),
params->sizelimit, (LDAPMessage **)params->result );
}
4
4
04 Feb '22
A bunch of them... nothing fancy
A+
---
Eric Pouech (19):
programs/attrib: enable compilation with long types
programs/cabarc: enable compilation with long types
programs/chcp.com: enable compilation with long types
programs/conhost: enable compilation with long types
programs/[cw]script: enable compilation with long types
programs/dxdiag: enable compilation with long types
programs/eject: enable compilation with long types
programs/explorer: enable compilation with long types
programs/fsutil: enable compilation with long types
programs/msiexec: enable compilation with long types
programs/net: enable compilation with long types
programs/netstat: enable compilation with long types
programs/ping: enable compilation with long types
programs/plugplay: enable compilation with long types
programs/presentationfontcache: enable compilation with long types
programs/regedit: enable compilation with long types
programs/reg: enable compilation with long types
programs/regsvr32: enable compilation with long types
programs/rpcss: enable compilation with long types
programs/attrib/Makefile.in | 1 -
programs/attrib/attrib.c | 6 +--
programs/cabarc/Makefile.in | 1 -
programs/cabarc/cabarc.c | 2 +-
programs/chcp.com/Makefile.in | 1 -
programs/chcp.com/main.c | 4 +-
programs/conhost/Makefile.in | 1 -
programs/conhost/conhost.c | 18 ++++----
programs/conhost/window.c | 10 ++---
programs/cscript/Makefile.in | 2 +-
programs/dxdiag/Makefile.in | 1 -
programs/dxdiag/information.c | 2 +-
programs/dxdiag/output.c | 6 +--
programs/eject/Makefile.in | 1 -
programs/eject/eject.c | 6 +--
programs/explorer/Makefile.in | 1 -
programs/explorer/appbar.c | 2 +-
programs/explorer/desktop.c | 52 +++++++++++-----------
programs/explorer/explorer.c | 4 +-
programs/explorer/systray.c | 2 +-
programs/fsutil/Makefile.in | 1 -
programs/fsutil/main.c | 2 +-
programs/msiexec/Makefile.in | 1 -
programs/msiexec/msiexec.c | 12 ++---
programs/msiexec/service.c | 4 +-
programs/net/Makefile.in | 1 -
programs/net/net.c | 4 +-
programs/netstat/Makefile.in | 1 -
programs/netstat/netstat.c | 2 +-
programs/ping/Makefile.in | 1 -
programs/ping/ping_main.c | 2 +-
programs/plugplay/Makefile.in | 1 -
programs/plugplay/main.c | 8 ++--
programs/presentationfontcache/Makefile.in | 1 -
programs/presentationfontcache/main.c | 2 +-
programs/reg/Makefile.in | 1 -
programs/reg/import.c | 2 +-
programs/reg/reg.c | 4 +-
programs/regedit/Makefile.in | 1 -
programs/regedit/edit.c | 2 +-
programs/regedit/framewnd.c | 2 +-
programs/regedit/main.c | 2 +-
programs/regedit/regedit.c | 6 +--
programs/regsvr32/Makefile.in | 1 -
programs/regsvr32/regsvr32.c | 6 +--
programs/rpcss/Makefile.in | 1 -
programs/rpcss/epmp.c | 10 ++---
programs/rpcss/irotp.c | 8 ++--
programs/rpcss/rpcss_main.c | 4 +-
programs/wscript/Makefile.in | 1 -
programs/wscript/arguments.c | 8 ++--
programs/wscript/host.c | 10 ++---
programs/wscript/main.c | 6 +--
53 files changed, 111 insertions(+), 130 deletions(-)
1
19
1
0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/dxva2/Makefile.in | 1 -
dlls/dxva2/main.c | 38 +++++++++++++++++++-------------------
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
index 66add06535b..8f7a62bb902 100644
--- a/dlls/dxva2/Makefile.in
+++ b/dlls/dxva2/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dxva2.dll
IMPORTS = uuid ole32
IMPORTLIB = dxva2
diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
index 5beac4164a6..b262990e0f7 100644
--- a/dlls/dxva2/main.c
+++ b/dlls/dxva2/main.c
@@ -163,7 +163,7 @@ static ULONG WINAPI video_processor_AddRef(IDirectXVideoProcessor *iface)
struct video_processor *processor = impl_from_IDirectXVideoProcessor(iface);
ULONG refcount = InterlockedIncrement(&processor->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -173,7 +173,7 @@ static ULONG WINAPI video_processor_Release(IDirectXVideoProcessor *iface)
struct video_processor *processor = impl_from_IDirectXVideoProcessor(iface);
ULONG refcount = InterlockedDecrement(&processor->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -314,7 +314,7 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if
if (FAILED(hr = IDirect3DSurface9_GetDevice(rt, &device)))
{
- WARN("Failed to get surface device, hr %#x.\n", hr);
+ WARN("Failed to get surface device, hr %#lx.\n", hr);
return hr;
}
@@ -330,7 +330,7 @@ static HRESULT WINAPI video_processor_VideoProcessBlt(IDirectXVideoProcessor *if
if (FAILED(hr = IDirect3DDevice9_StretchRect(device, samples[i].SrcSurface, &samples[i].SrcRect,
rt, &dst_rect, D3DTEXF_POINT)))
{
- WARN("Failed to copy sample %u, hr %#x.\n", i, hr);
+ WARN("Failed to copy sample %u, hr %#lx.\n", i, hr);
}
}
@@ -398,7 +398,7 @@ static HRESULT WINAPI device_manager_processor_service_CreateSurface(IDirectXVid
unsigned int i, j;
HRESULT hr;
- TRACE("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType,
+ TRACE("%p, %u, %u, %u, %u, %u, %lu, %lu, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType,
surfaces, shared_handle);
if (backbuffers >= UINT_MAX)
@@ -679,7 +679,7 @@ static HRESULT WINAPI device_manager_decoder_service_CreateSurface(IDirectXVideo
UINT width, UINT height, UINT backbuffers, D3DFORMAT format, D3DPOOL pool, DWORD usage, DWORD dxvaType,
IDirect3DSurface9 **surfaces, HANDLE *shared_handle)
{
- FIXME("%p, %u, %u, %u, %#x, %d, %d, %d, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage,
+ FIXME("%p, %u, %u, %u, %#x, %d, %ld, %ld, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage,
dxvaType, surfaces, shared_handle);
return E_NOTIMPL;
@@ -753,7 +753,7 @@ static ULONG WINAPI device_manager_AddRef(IDirect3DDeviceManager9 *iface)
struct device_manager *manager = impl_from_IDirect3DDeviceManager9(iface);
ULONG refcount = InterlockedIncrement(&manager->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -764,7 +764,7 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface)
ULONG refcount = InterlockedDecrement(&manager->refcount);
size_t i;
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -1037,7 +1037,7 @@ static const IDirect3DDeviceManager9Vtbl device_manager_vtbl =
BOOL WINAPI CapabilitiesRequestAndCapabilitiesReply( HMONITOR monitor, LPSTR buffer, DWORD length )
{
- FIXME("(%p, %p, %d): stub\n", monitor, buffer, length);
+ FIXME("%p, %p, %ld: stub.\n", monitor, buffer, length);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -1113,7 +1113,7 @@ BOOL WINAPI DestroyPhysicalMonitor( HMONITOR monitor )
BOOL WINAPI DestroyPhysicalMonitors( DWORD arraySize, LPPHYSICAL_MONITOR array )
{
- FIXME("(0x%x, %p): stub\n", arraySize, array);
+ FIXME("%lu, %p: stub.\n", arraySize, array);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -1221,7 +1221,7 @@ HRESULT WINAPI GetNumberOfPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9
BOOL WINAPI GetPhysicalMonitorsFromHMONITOR( HMONITOR monitor, DWORD arraySize, LPPHYSICAL_MONITOR array )
{
- FIXME("(%p, 0x%x, %p): stub\n", monitor, arraySize, array);
+ FIXME("%p, %lu, %p: stub.\n", monitor, arraySize, array);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -1229,7 +1229,7 @@ BOOL WINAPI GetPhysicalMonitorsFromHMONITOR( HMONITOR monitor, DWORD arraySize,
HRESULT WINAPI GetPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9 *device, DWORD arraySize, LPPHYSICAL_MONITOR array )
{
- FIXME("(%p, 0x%x, %p): stub\n", device, arraySize, array);
+ FIXME("%p, %lu, %p: stub.\n", device, arraySize, array);
return E_NOTIMPL;
}
@@ -1301,7 +1301,7 @@ BOOL WINAPI SaveCurrentSettings( HMONITOR monitor )
BOOL WINAPI SetMonitorBrightness( HMONITOR monitor, DWORD brightness )
{
- FIXME("(%p, 0x%x): stub\n", monitor, brightness);
+ FIXME("%p, %#lx: stub.\n", monitor, brightness);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -1317,7 +1317,7 @@ BOOL WINAPI SetMonitorColorTemperature( HMONITOR monitor, MC_COLOR_TEMPERATURE t
BOOL WINAPI SetMonitorContrast( HMONITOR monitor, DWORD contrast )
{
- FIXME("(%p, 0x%x): stub\n", monitor, contrast);
+ FIXME("%p, %#lx: stub.\n", monitor, contrast);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -1325,7 +1325,7 @@ BOOL WINAPI SetMonitorContrast( HMONITOR monitor, DWORD contrast )
BOOL WINAPI SetMonitorDisplayAreaPosition( HMONITOR monitor, MC_POSITION_TYPE type, DWORD position )
{
- FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, position);
+ FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, position);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -1333,7 +1333,7 @@ BOOL WINAPI SetMonitorDisplayAreaPosition( HMONITOR monitor, MC_POSITION_TYPE ty
BOOL WINAPI SetMonitorDisplayAreaSize( HMONITOR monitor, MC_SIZE_TYPE type, DWORD size )
{
- FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, size);
+ FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, size);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -1341,7 +1341,7 @@ BOOL WINAPI SetMonitorDisplayAreaSize( HMONITOR monitor, MC_SIZE_TYPE type, DWOR
BOOL WINAPI SetMonitorRedGreenOrBlueDrive( HMONITOR monitor, MC_DRIVE_TYPE type, DWORD drive )
{
- FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, drive);
+ FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, drive);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -1349,7 +1349,7 @@ BOOL WINAPI SetMonitorRedGreenOrBlueDrive( HMONITOR monitor, MC_DRIVE_TYPE type,
BOOL WINAPI SetMonitorRedGreenOrBlueGain( HMONITOR monitor, MC_GAIN_TYPE type, DWORD gain )
{
- FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, gain);
+ FIXME("%p, 0x%x, %#lx: stub.\n", monitor, type, gain);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -1357,7 +1357,7 @@ BOOL WINAPI SetMonitorRedGreenOrBlueGain( HMONITOR monitor, MC_GAIN_TYPE type, D
BOOL WINAPI SetVCPFeature( HMONITOR monitor, BYTE vcpCode, DWORD value )
{
- FIXME("(%p, 0x%02x, 0x%x): stub\n", monitor, vcpCode, value);
+ FIXME("%p, 0x%02x, %#lx: stub.\n", monitor, vcpCode, value);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
--
2.34.1
1
0
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/d3dx9_24/d3dx9_24.spec | 2 +-
dlls/d3dx9_25/d3dx9_25.spec | 2 +-
dlls/d3dx9_26/d3dx9_26.spec | 2 +-
dlls/d3dx9_27/d3dx9_27.spec | 2 +-
dlls/d3dx9_28/d3dx9_28.spec | 2 +-
dlls/d3dx9_29/d3dx9_29.spec | 2 +-
dlls/d3dx9_30/d3dx9_30.spec | 2 +-
dlls/d3dx9_31/d3dx9_31.spec | 2 +-
dlls/d3dx9_32/d3dx9_32.spec | 2 +-
dlls/d3dx9_33/d3dx9_33.spec | 2 +-
dlls/d3dx9_34/d3dx9_34.spec | 2 +-
dlls/d3dx9_35/d3dx9_35.spec | 2 +-
dlls/d3dx9_36/d3dx9_36.spec | 2 +-
dlls/d3dx9_36/d3dx9_private.h | 2 +
dlls/d3dx9_36/math.c | 143 ++++++++++++++++++++++++
dlls/d3dx9_36/surface.c | 2 +-
dlls/d3dx9_36/tests/math.c | 199 ++++++++++++++++++++++++++++++++++
dlls/d3dx9_37/d3dx9_37.spec | 2 +-
dlls/d3dx9_38/d3dx9_38.spec | 2 +-
dlls/d3dx9_39/d3dx9_39.spec | 2 +-
dlls/d3dx9_40/d3dx9_40.spec | 2 +-
dlls/d3dx9_41/d3dx9_41.spec | 2 +-
dlls/d3dx9_42/d3dx9_42.spec | 2 +-
dlls/d3dx9_43/d3dx9_43.spec | 2 +-
include/d3dx9math.h | 1 +
25 files changed, 366 insertions(+), 21 deletions(-)
diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
index d617d766f85..8791e4ec044 100644
--- a/dlls/d3dx9_24/d3dx9_24.spec
+++ b/dlls/d3dx9_24/d3dx9_24.spec
@@ -256,7 +256,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
index f13923dcb3a..0431a9f7f75 100644
--- a/dlls/d3dx9_25/d3dx9_25.spec
+++ b/dlls/d3dx9_25/d3dx9_25.spec
@@ -256,7 +256,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
index 286a9a094a0..5ab0a1d9fea 100644
--- a/dlls/d3dx9_26/d3dx9_26.spec
+++ b/dlls/d3dx9_26/d3dx9_26.spec
@@ -260,7 +260,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
index 286a9a094a0..5ab0a1d9fea 100644
--- a/dlls/d3dx9_27/d3dx9_27.spec
+++ b/dlls/d3dx9_27/d3dx9_27.spec
@@ -260,7 +260,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
index 06ced20df61..af5b6077202 100644
--- a/dlls/d3dx9_28/d3dx9_28.spec
+++ b/dlls/d3dx9_28/d3dx9_28.spec
@@ -265,7 +265,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
index 06ced20df61..af5b6077202 100644
--- a/dlls/d3dx9_29/d3dx9_29.spec
+++ b/dlls/d3dx9_29/d3dx9_29.spec
@@ -265,7 +265,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
index 06ced20df61..af5b6077202 100644
--- a/dlls/d3dx9_30/d3dx9_30.spec
+++ b/dlls/d3dx9_30/d3dx9_30.spec
@@ -265,7 +265,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
index c9aca309a35..8f77dc666a2 100644
--- a/dlls/d3dx9_31/d3dx9_31.spec
+++ b/dlls/d3dx9_31/d3dx9_31.spec
@@ -262,7 +262,7 @@
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
index f541f6f2ef1..2fdd2a00615 100644
--- a/dlls/d3dx9_32/d3dx9_32.spec
+++ b/dlls/d3dx9_32/d3dx9_32.spec
@@ -267,7 +267,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
index f541f6f2ef1..2fdd2a00615 100644
--- a/dlls/d3dx9_33/d3dx9_33.spec
+++ b/dlls/d3dx9_33/d3dx9_33.spec
@@ -267,7 +267,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
index f541f6f2ef1..2fdd2a00615 100644
--- a/dlls/d3dx9_34/d3dx9_34.spec
+++ b/dlls/d3dx9_34/d3dx9_34.spec
@@ -267,7 +267,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
index f541f6f2ef1..2fdd2a00615 100644
--- a/dlls/d3dx9_35/d3dx9_35.spec
+++ b/dlls/d3dx9_35/d3dx9_35.spec
@@ -267,7 +267,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
index c3308b04d44..2d286b04694 100644
--- a/dlls/d3dx9_36/d3dx9_private.h
+++ b/dlls/d3dx9_36/d3dx9_private.h
@@ -100,6 +100,8 @@ HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPE
const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN;
const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN;
+void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst);
+
void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch,
BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size,
const struct pixel_format_desc *format) DECLSPEC_HIDDEN;
diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c
index a7b0a018680..0dde552d45f 100644
--- a/dlls/d3dx9_36/math.c
+++ b/dlls/d3dx9_36/math.c
@@ -2969,6 +2969,149 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in)
out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35];
}
+static void set_vec3(D3DXVECTOR3 *v, float x, float y, float z)
+{
+ v->x = x;
+ v->y = y;
+ v->z = z;
+}
+
+/*
+ * The following implementation of D3DXSHProjectCubeMap is based on the
+ * SHProjectCubeMap() implementation from Microsoft's DirectXMath library,
+ * covered under the following copyright:
+ *
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ */
+HRESULT WINAPI D3DXSHProjectCubeMap(unsigned int order, IDirect3DCubeTexture9 *texture, float *red, float *green, float *blue)
+{
+ const unsigned int order_square = order * order;
+ const struct pixel_format_desc *format;
+ unsigned int x, y, i, face;
+ float B, S, proj_normal;
+ D3DSURFACE_DESC desc;
+ float Wt = 0.0f;
+ float *temp;
+ HRESULT hr;
+
+ TRACE("order %u, texture %p, red %p, green %p, blue %p.\n", order, texture, red, green, blue);
+
+ if (!texture || !red || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER)
+ return D3DERR_INVALIDCALL;
+
+ memset(red, 0, order_square * sizeof(float));
+ if (green)
+ memset(green, 0, order_square * sizeof(float));
+ if (blue)
+ memset(blue, 0, order_square * sizeof(float));
+
+ if (FAILED(hr = IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &desc)))
+ {
+ ERR("Failed to get level desc, hr %#x.\n", hr);
+ return hr;
+ }
+
+ format = get_format_info(desc.Format);
+ if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF)
+ {
+ FIXME("Unsupported texture format %#x.\n", desc.Format);
+ return D3DERR_INVALIDCALL;
+ }
+
+ if (!(temp = malloc(order_square * sizeof(*temp))))
+ return E_OUTOFMEMORY;
+
+ B = -1.0f + 1.0f / desc.Width;
+ if (desc.Width > 1)
+ S = 2.0f * (1.0f - 1.0f / desc.Width) / (desc.Width - 1.0f);
+ else
+ S = 0.0f;
+
+ for (face = 0; face < 6; ++face)
+ {
+ D3DLOCKED_RECT map_desc;
+
+ if (FAILED(hr = IDirect3DCubeTexture9_LockRect(texture, face, 0, &map_desc, NULL, D3DLOCK_READONLY)))
+ {
+ ERR("Failed to map texture, hr %#x.\n", hr);
+ return hr;
+ }
+
+ for (y = 0; y < desc.Height; ++y)
+ {
+ const BYTE *row = (const BYTE *)map_desc.pBits + y * map_desc.Pitch;
+
+ for (x = 0; x < desc.Width; ++x)
+ {
+ float diff_solid, x_3d, y_3d;
+ const float u = x * S + B;
+ const float v = y * S + B;
+ struct vec4 colour;
+ D3DXVECTOR3 dir;
+
+ x_3d = (x * 2.0f + 1.0f) / desc.Width - 1.0f;
+ y_3d = (y * 2.0f + 1.0f) / desc.Width - 1.0f;
+
+ switch (face)
+ {
+ case D3DCUBEMAP_FACE_POSITIVE_X:
+ set_vec3(&dir, 1.0f, -y_3d, -x_3d);
+ break;
+
+ case D3DCUBEMAP_FACE_NEGATIVE_X:
+ set_vec3(&dir, -1.0f, -y_3d, x_3d);
+ break;
+
+ case D3DCUBEMAP_FACE_POSITIVE_Y:
+ set_vec3(&dir, x_3d, 1.0f, y_3d);
+ break;
+
+ case D3DCUBEMAP_FACE_NEGATIVE_Y:
+ set_vec3(&dir, x_3d, -1.0f, -y_3d);
+ break;
+
+ case D3DCUBEMAP_FACE_POSITIVE_Z:
+ set_vec3(&dir, x_3d, -y_3d, 1.0f);
+ break;
+
+ case D3DCUBEMAP_FACE_NEGATIVE_Z:
+ set_vec3(&dir, -x_3d, -y_3d, -1.0f);
+ break;
+ }
+
+ diff_solid = 4.0f / ((1.0f + u * u + v * v) * sqrtf(1.0f + u * u + v * v));
+ Wt += diff_solid;
+
+ D3DXVec3Normalize(&dir, &dir);
+ D3DXSHEvalDirection(temp, order, &dir);
+
+ format_to_vec4(format, &row[x * format->block_byte_count], &colour);
+
+ for (i = 0; i < order_square; ++i)
+ {
+ red[i] += temp[i] * colour.x * diff_solid;
+ if (green)
+ green[i] += temp[i] * colour.y * diff_solid;
+ if (blue)
+ blue[i] += temp[i] * colour.z * diff_solid;
+ }
+ }
+ }
+
+ IDirect3DCubeTexture9_UnlockRect(texture, face, 0);
+ }
+
+ proj_normal = (4.0f * M_PI) / Wt;
+ D3DXSHScale(red, order, red, proj_normal);
+ if (green)
+ D3DXSHScale(green, order, green, proj_normal);
+ if (blue)
+ D3DXSHScale(blue, order, blue, proj_normal);
+
+ return D3D_OK;
+}
+
FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in)
{
FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36];
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index c3f9f84a789..2ca6f093b55 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -1564,7 +1564,7 @@ static DWORD make_argb_color(const struct argb_conversion_info *info, const DWOR
}
/* It doesn't work for components bigger than 32 bits (or somewhat smaller but unaligned). */
-static void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst)
+void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst)
{
DWORD mask, tmp;
unsigned int c;
diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c
index 6f64e25d200..40193f50fcc 100644
--- a/dlls/d3dx9_36/tests/math.c
+++ b/dlls/d3dx9_36/tests/math.c
@@ -22,6 +22,7 @@
#include "wine/test.h"
#include "d3dx9.h"
#include <math.h>
+#include <stdint.h>
static BOOL compare_float(float f, float g, unsigned int ulps)
{
@@ -205,6 +206,53 @@ static void set_matrix(D3DXMATRIX* mat,
U(mat)->m[3][0] = m30; U(mat)->m[3][1] = m31; U(mat)->m[3][2] = m32; U(mat)->m[3][3] = m33;
}
+static HWND create_window(void)
+{
+ RECT r = {0, 0, 640, 480};
+
+ AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE);
+
+ return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+ 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL);
+}
+
+static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window)
+{
+ D3DPRESENT_PARAMETERS present_parameters = {0};
+ unsigned int adapter_ordinal;
+ IDirect3DDevice9 *device;
+ DWORD behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING;
+
+ adapter_ordinal = D3DADAPTER_DEFAULT;
+ present_parameters.BackBufferWidth = 640;
+ present_parameters.BackBufferHeight = 480;
+ present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8;
+ present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD;
+ present_parameters.hDeviceWindow = focus_window;
+ present_parameters.Windowed = TRUE;
+ present_parameters.EnableAutoDepthStencil = TRUE;
+ present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8;
+
+ if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window,
+ behavior_flags, &present_parameters, &device)))
+ return device;
+
+ present_parameters.AutoDepthStencilFormat = D3DFMT_D16;
+ if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window,
+ behavior_flags, &present_parameters, &device)))
+ return device;
+
+ behavior_flags = (behavior_flags
+ & ~(D3DCREATE_MIXED_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING))
+ | D3DCREATE_HARDWARE_VERTEXPROCESSING;
+
+ if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, adapter_ordinal, D3DDEVTYPE_HAL, focus_window,
+ behavior_flags, &present_parameters, &device)))
+ return device;
+
+ return NULL;
+}
+
static void D3DXColorTest(void)
{
D3DXCOLOR color, color1, color2, expected, got;
@@ -4364,6 +4412,156 @@ static void test_D3DXSHScale(void)
}
}
+static void test_D3DXSHProjectCubeMap(void)
+{
+ float red[4], green[4], blue[4];
+ IDirect3DCubeTexture9 *texture;
+ unsigned int i, j, face, x, y;
+ IDirect3DDevice9 *device;
+ D3DLOCKED_RECT map_desc;
+ IDirect3D9 *d3d;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+
+ static const struct
+ {
+ D3DFORMAT format;
+ float red[4];
+ float green[4];
+ float blue[4];
+ }
+ tests[] =
+ {
+ {D3DFMT_A8R8G8B8,
+ {1.77656245f, -1.11197047e-2f, 2.08763797e-2f, -2.10229922e-2f},
+ {1.75811982f, -4.82511893e-2f, 1.67397819e-2f, -1.71497762e-2f},
+ {1.75515056f, -4.07523997e-2f, 1.05397226e-2f, -2.46812664e-2f}},
+ {D3DFMT_X8R8G8B8,
+ {1.77656245f, -1.11197047e-2f, 2.08763797e-2f, -2.10229922e-2f},
+ {1.75811982f, -4.82511893e-2f, 1.67397819e-2f, -1.71497762e-2f},
+ {1.75515056f, -4.07523997e-2f, 1.05397226e-2f, -2.46812664e-2f}},
+ {D3DFMT_A8B8G8R8,
+ {1.75515056f, -4.07523997e-2f, 1.05397226e-2f, -2.46812664e-2f},
+ {1.75811982f, -4.82511893e-2f, 1.67397819e-2f, -1.71497762e-2f},
+ {1.77656245f, -1.11197047e-2f, 2.08763797e-2f, -2.10229922e-2f}},
+ {D3DFMT_R5G6B5,
+ {1.77099848f, -3.88867334e-2f, 6.73775524e-2f, -1.26888147e-2f},
+ {1.77244151f, -5.64723741e-4f, -2.77878426e-4f, -9.10691451e-3f},
+ {1.78902030f, 2.79005636e-2f, 1.62461456e-2f, 2.21668324e-3f}},
+ {D3DFMT_A1R5G5B5,
+ {1.78022826f, 1.46923587e-2f, 3.58058624e-2f, 2.51076911e-2f},
+ {1.77233493f, -7.58088892e-4f, -2.03727093e-3f, -1.34809706e-2f},
+ {1.78902030f, 2.79005636e-2f, 1.62461456e-2f, 2.21668324e-3f}},
+ {D3DFMT_X1R5G5B5,
+ {1.78022826f, 1.46923587e-2f, 3.58058624e-2f, 2.51076911e-2f},
+ {1.77233493f, -7.58088892e-4f, -2.03727093e-3f, -1.34809706e-2f},
+ {1.78902030f, 2.79005636e-2f, 1.62461456e-2f, 2.21668324e-3f}},
+ {D3DFMT_A2R10G10B10,
+ {1.79359019f, -7.74506712e-4f, 8.65613017e-3f, 5.75336441e-3f},
+ {1.77067971f, 6.42523961e-3f, 1.35379164e-2f, 2.24088971e-3f},
+ {1.76601243f, -4.94002625e-2f, 1.28124524e-2f, -7.69229094e-3f}},
+ {D3DFMT_A2B10G10R10,
+ {1.76601243f, -4.94002625e-2f, 1.28124524e-2f, -7.69229094e-3f},
+ {1.77067971f, 6.42523961e-3f, 1.35379164e-2f, 2.24088971e-3f},
+ {1.79359019f, -7.74506712e-4f, 8.65613017e-3f, 5.75336441e-3f}},
+ {D3DFMT_A16B16G16R16,
+ {1.75979614f, 1.44450525e-2f, -3.25212209e-3f, 2.98178056e-3f},
+ {1.78080165f, -2.63770130e-2f, 6.31967233e-3f, 3.66022950e-3f},
+ {1.77588308f, -1.93727610e-3f, -3.22831096e-3f, -6.18841546e-3f}},
+ {D3DFMT_A16B16G16R16F,
+ { 5.17193642e+1f, -3.41681671e+2f, -8.82221741e+2f, 7.77049316e+2f},
+ {-2.08198950e+3f, 5.24323584e+3f, -3.42663379e+3f, 3.80999243e+3f},
+ {-1.10743945e+3f, -9.43649292e+2f, 5.48424316e+2f, 1.65352710e+3f}},
+ };
+
+ window = create_window();
+ d3d = Direct3DCreate9(D3D_SDK_VERSION);
+ ok(!!d3d, "Failed to create a D3D object.\n");
+ if (!(device = create_device(d3d, window)))
+ {
+ skip("Failed to create a D3D device, skipping tests.\n");
+ IDirect3D9_Release(d3d);
+ DestroyWindow(window);
+ return;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(tests); ++i)
+ {
+ winetest_push_context("Format %#x", tests[i].format);
+
+ hr = IDirect3DDevice9_CreateCubeTexture(device, 8, 1, D3DUSAGE_DYNAMIC,
+ tests[i].format, D3DPOOL_DEFAULT, &texture, NULL);
+ if (FAILED(hr))
+ {
+ skip("Failed to create cube texture.\n");
+ winetest_pop_context();
+ continue;
+ }
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (face = 0; face < 6; ++face)
+ {
+ hr = IDirect3DCubeTexture9_LockRect(texture, face, 0, &map_desc, NULL, 0);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (y = 0; y < 8; ++y)
+ {
+ uint8_t *row = (uint8_t *)map_desc.pBits + y * map_desc.Pitch;
+
+ for (x = 0; x < map_desc.Pitch; ++x)
+ row[x] = face * 111 + y * 39 + x * 7;
+ }
+
+ hr = IDirect3DCubeTexture9_UnlockRect(texture, face, 0);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ }
+
+ hr = D3DXSHProjectCubeMap(1, texture, red, green, blue);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DXSHProjectCubeMap(7, texture, red, green, blue);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DXSHProjectCubeMap(2, NULL, red, green, blue);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ memset(red, 0, sizeof(red));
+ memset(green, 0, sizeof(green));
+ memset(blue, 0, sizeof(blue));
+ hr = D3DXSHProjectCubeMap(2, texture, red, green, blue);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ for (j = 0; j < 4; ++j)
+ {
+ ok(compare_float(red[j], tests[i].red[j], 1024),
+ "Got unexpected value %.8e for red coefficient %u.\n", red[j], j);
+ ok(compare_float(green[j], tests[i].green[j], 1024),
+ "Got unexpected value %.8e for green coefficient %u.\n", green[j], j);
+ ok(compare_float(blue[j], tests[i].blue[j], 1024),
+ "Got unexpected value %.8e for blue coefficient %u.\n", blue[j], j);
+ }
+
+ hr = D3DXSHProjectCubeMap(2, texture, red, NULL, NULL);
+ ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DXSHProjectCubeMap(2, texture, NULL, green, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ hr = D3DXSHProjectCubeMap(2, texture, NULL, NULL, blue);
+ ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+
+ IDirect3DCubeTexture9_Release(texture);
+
+ winetest_pop_context();
+ }
+
+ refcount = IDirect3DDevice9_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ IDirect3D9_Release(d3d);
+ DestroyWindow(window);
+}
+
START_TEST(math)
{
D3DXColorTest();
@@ -4393,4 +4591,5 @@ START_TEST(math)
test_D3DXSHRotate();
test_D3DXSHRotateZ();
test_D3DXSHScale();
+ test_D3DXSHProjectCubeMap();
}
diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_37/d3dx9_37.spec
+++ b/dlls/d3dx9_37/d3dx9_37.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_38/d3dx9_38.spec
+++ b/dlls/d3dx9_38/d3dx9_38.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_39/d3dx9_39.spec
+++ b/dlls/d3dx9_39/d3dx9_39.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_40/d3dx9_40.spec
+++ b/dlls/d3dx9_40/d3dx9_40.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
index e1f44261610..5b7070145de 100644
--- a/dlls/d3dx9_41/d3dx9_41.spec
+++ b/dlls/d3dx9_41/d3dx9_41.spec
@@ -269,7 +269,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
index 0851945d36b..4a418d1508a 100644
--- a/dlls/d3dx9_42/d3dx9_42.spec
+++ b/dlls/d3dx9_42/d3dx9_42.spec
@@ -262,7 +262,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
index 0851945d36b..4a418d1508a 100644
--- a/dlls/d3dx9_43/d3dx9_43.spec
+++ b/dlls/d3dx9_43/d3dx9_43.spec
@@ -262,7 +262,7 @@
@ stub D3DXSHMultiply6(ptr ptr ptr)
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
@ stdcall D3DXSHRotate(ptr long ptr ptr)
@ stdcall D3DXSHRotateZ(ptr long float ptr)
@ stdcall D3DXSHScale(ptr long ptr float)
diff --git a/include/d3dx9math.h b/include/d3dx9math.h
index bf03ca3abaa..32d894f9fed 100644
--- a/include/d3dx9math.h
+++ b/include/d3dx9math.h
@@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA
FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b);
FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b);
FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b);
+HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *texture, FLOAT *red, FLOAT *green, FLOAT *blue);
FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in);
FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in);
FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale);
--
2.34.1
2
2
[PATCH 1/3] shlwapi: Use the public definition of shared shell memory allocation functions.
by Zebediah Figura 04 Feb '22
by Zebediah Figura 04 Feb '22
04 Feb '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/shell32/changenotify.c | 1 +
dlls/shell32/shellord.c | 2 +-
dlls/shell32/undocshell.h | 24 ------------------------
include/shlwapi.h | 7 ++++++-
4 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 40ccb891589..35c090ceb67 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -27,6 +27,7 @@
#include "wine/debug.h"
#include "shell32_main.h"
#include "pidl.h"
+#include "shlwapi.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 57308e1c988..af00f125662 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -1353,7 +1353,7 @@ BOOL WINAPI IsUserAnAdmin(VOID)
*
* See shlwapi.SHAllocShared
*/
-HANDLE WINAPI SHAllocShared(LPVOID lpvData, DWORD dwSize, DWORD dwProcId)
+HANDLE WINAPI SHAllocShared(const void *lpvData, DWORD dwSize, DWORD dwProcId)
{
GET_FUNC(pSHAllocShared, shlwapi, (char*)7, NULL);
return pSHAllocShared(lpvData, dwSize, dwProcId);
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index 61c2ff4069f..f5c5ed8d43a 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -31,30 +31,6 @@
extern "C" {
#endif /* defined(__cplusplus) */
-/****************************************************************************
- * Memory Routines
- */
-
-/* The Platform SDK's shlobj.h header defines similar functions with a
- * leading underscore. However those are unusable because of the leading
- * underscore, because they have an incorrect calling convention, and
- * because these functions are not exported by name anyway.
- */
-HANDLE WINAPI SHAllocShared(
- LPVOID pv,
- ULONG cb,
- DWORD pid);
-
-BOOL WINAPI SHFreeShared(
- HANDLE hMem,
- DWORD pid);
-
-LPVOID WINAPI SHLockShared(
- HANDLE hMem,
- DWORD pid);
-
-BOOL WINAPI SHUnlockShared(LPVOID pv);
-
/****************************************************************************
* System Imagelist Routines
*/
diff --git a/include/shlwapi.h b/include/shlwapi.h
index ca15bd20777..07ca0fac837 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -1171,7 +1171,12 @@ HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bagname,
BOOL WINAPI SHIsLowMemoryMachine(DWORD type);
-#include <poppack.h>
+#include <poppack.h>
+
+HANDLE WINAPI SHAllocShared(const void *data, DWORD size, DWORD pid);
+BOOL WINAPI SHFreeShared(HANDLE handle, DWORD pid);
+void * WINAPI SHLockShared(HANDLE handle, DWORD pid);
+BOOL WINAPI SHUnlockShared(void *data);
#ifdef __cplusplus
} /* extern "C" */
--
2.34.1
1
2
04 Feb '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/winegstreamer/Makefile.in | 1 -
dlls/winegstreamer/audioconvert.c | 44 ++++-----
dlls/winegstreamer/media_source.c | 60 ++++++-------
dlls/winegstreamer/mfplat.c | 34 +++----
dlls/winegstreamer/quartz_parser.c | 36 ++++----
dlls/winegstreamer/wm_asyncreader.c | 133 +++++++++++++++++-----------
dlls/winegstreamer/wm_reader.c | 74 ++++++++--------
dlls/winegstreamer/wm_syncreader.c | 24 ++---
dlls/winegstreamer/wma_decoder.c | 72 +++++++--------
9 files changed, 253 insertions(+), 225 deletions(-)
diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 1706effbd20..c53e914e246 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = winegstreamer.dll
UNIXLIB = winegstreamer.so
IMPORTLIB = winegstreamer
diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c
index 33350fb3566..d5723cdf58f 100644
--- a/dlls/winegstreamer/audioconvert.c
+++ b/dlls/winegstreamer/audioconvert.c
@@ -64,7 +64,7 @@ static ULONG WINAPI audio_converter_AddRef(IMFTransform *iface)
struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface);
ULONG refcount = InterlockedIncrement(&transform->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -74,7 +74,7 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface)
struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface);
ULONG refcount = InterlockedDecrement(&transform->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -108,21 +108,21 @@ static HRESULT WINAPI audio_converter_GetStreamCount(IMFTransform *iface, DWORD
static HRESULT WINAPI audio_converter_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs,
DWORD output_size, DWORD *outputs)
{
- TRACE("%p %u %p %u %p.\n", iface, input_size, inputs, output_size, outputs);
+ TRACE("%p, %lu, %p, %lu, %p.\n", iface, input_size, inputs, output_size, outputs);
return E_NOTIMPL;
}
static HRESULT WINAPI audio_converter_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info)
{
- FIXME("%p %u %p.\n", iface, id, info);
+ FIXME("%p, %lu, %p.\n", iface, id, info);
return E_NOTIMPL;
}
static HRESULT WINAPI audio_converter_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)
{
- FIXME("%p %u %p.\n", iface, id, info);
+ FIXME("%p. %lu, %p.\n", iface, id, info);
return E_NOTIMPL;
}
@@ -137,7 +137,7 @@ static HRESULT WINAPI audio_converter_GetAttributes(IMFTransform *iface, IMFAttr
static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *iface, DWORD id,
IMFAttributes **attributes)
{
- FIXME("%p, %u, %p.\n", iface, id, attributes);
+ FIXME("%p, %lu, %p.\n", iface, id, attributes);
return E_NOTIMPL;
}
@@ -145,21 +145,21 @@ static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *ifa
static HRESULT WINAPI audio_converter_GetOutputStreamAttributes(IMFTransform *iface, DWORD id,
IMFAttributes **attributes)
{
- FIXME("%p, %u, %p.\n", iface, id, attributes);
+ FIXME("%p, %lu, %p.\n", iface, id, attributes);
return E_NOTIMPL;
}
static HRESULT WINAPI audio_converter_DeleteInputStream(IMFTransform *iface, DWORD id)
{
- TRACE("%p, %u.\n", iface, id);
+ TRACE("%p, %lu.\n", iface, id);
return E_NOTIMPL;
}
static HRESULT WINAPI audio_converter_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids)
{
- TRACE("%p, %u, %p.\n", iface, streams, ids);
+ TRACE("%p, %lu, %p.\n", iface, streams, ids);
return E_NOTIMPL;
}
@@ -170,7 +170,7 @@ static HRESULT WINAPI audio_converter_GetInputAvailableType(IMFTransform *iface,
IMFMediaType *ret;
HRESULT hr;
- TRACE("%p, %u, %u, %p.\n", iface, id, index, type);
+ TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type);
if (id != 0)
return MF_E_INVALIDSTREAMNUMBER;
@@ -222,7 +222,7 @@ static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface
const GUID *subtype;
DWORD rate, channels, bps;
- TRACE("%p, %u, %u, %p.\n", iface, id, index, type);
+ TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type);
if (id != 0)
return MF_E_INVALIDSTREAMNUMBER;
@@ -272,12 +272,12 @@ fail:
static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
{
GUID major_type, subtype;
- DWORD unused;
+ UINT32 unused;
HRESULT hr;
struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface);
- TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags);
+ TRACE("%p, %lu, %p, %#lx.\n", iface, id, type, flags);
if (id != 0)
return MF_E_INVALIDSTREAMNUMBER;
@@ -345,10 +345,10 @@ static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD i
{
struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface);
GUID major_type, subtype;
- DWORD unused;
+ UINT32 unused;
HRESULT hr;
- TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags);
+ TRACE("%p, %lu, %p, %#lx.\n", iface, id, type, flags);
if (id != 0)
return MF_E_INVALIDSTREAMNUMBER;
@@ -421,7 +421,7 @@ static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, D
IMFMediaType *ret;
HRESULT hr;
- TRACE("%p, %u, %p.\n", converter, id, type);
+ TRACE("%p, %lu, %p.\n", converter, id, type);
if (id != 0)
return MF_E_INVALIDSTREAMNUMBER;
@@ -452,7 +452,7 @@ static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface,
IMFMediaType *ret;
HRESULT hr;
- TRACE("%p, %u, %p.\n", converter, id, type);
+ TRACE("%p, %lu, %p.\n", converter, id, type);
if (id != 0)
return MF_E_INVALIDSTREAMNUMBER;
@@ -479,7 +479,7 @@ static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface,
static HRESULT WINAPI audio_converter_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)
{
- FIXME("%p, %u, %p.\n", iface, id, flags);
+ FIXME("%p, %lu, %p.\n", iface, id, flags);
return E_NOTIMPL;
}
@@ -500,14 +500,14 @@ static HRESULT WINAPI audio_converter_SetOutputBounds(IMFTransform *iface, LONGL
static HRESULT WINAPI audio_converter_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event)
{
- TRACE("%p, %u, %p.\n", iface, id, event);
+ TRACE("%p, %lu, %p.\n", iface, id, event);
return E_NOTIMPL;
}
static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
{
- TRACE("%p, %u %lu.\n", iface, message, param);
+ TRACE("%p, %u, %Iu.\n", iface, message, param);
switch(message)
{
@@ -521,7 +521,7 @@ static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_ME
static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)
{
- FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags);
+ FIXME("%p, %lu, %p, %#lx.\n", iface, id, sample, flags);
return E_NOTIMPL;
}
@@ -529,7 +529,7 @@ static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id
static HRESULT WINAPI audio_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status)
{
- FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status);
+ FIXME("%p, %#lx, %lu, %p, %p.\n", iface, flags, count, samples, status);
return E_NOTIMPL;
}
diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
index 6ecd345cb73..85ec31d2498 100644
--- a/dlls/winegstreamer/media_source.c
+++ b/dlls/winegstreamer/media_source.c
@@ -304,7 +304,7 @@ static void flush_token_queue(struct media_stream *stream, BOOL send)
&stream->parent_source->async_commands_callback, &command->IUnknown_iface);
}
if (FAILED(hr))
- WARN("Could not enqueue sample request, hr %#x\n", hr);
+ WARN("Could not enqueue sample request, hr %#lx\n", hr);
}
else if (stream->token_queue[i])
IUnknown_Release(stream->token_queue[i]);
@@ -461,32 +461,32 @@ static void send_buffer(struct media_stream *stream, const struct wg_parser_even
if (FAILED(hr = MFCreateSample(&sample)))
{
- ERR("Failed to create sample, hr %#x.\n", hr);
+ ERR("Failed to create sample, hr %#lx.\n", hr);
return;
}
if (FAILED(hr = MFCreateMemoryBuffer(event->u.buffer.size, &buffer)))
{
- ERR("Failed to create buffer, hr %#x.\n", hr);
+ ERR("Failed to create buffer, hr %#lx.\n", hr);
IMFSample_Release(sample);
return;
}
if (FAILED(hr = IMFSample_AddBuffer(sample, buffer)))
{
- ERR("Failed to add buffer, hr %#x.\n", hr);
+ ERR("Failed to add buffer, hr %#lx.\n", hr);
goto out;
}
if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(buffer, event->u.buffer.size)))
{
- ERR("Failed to set size, hr %#x.\n", hr);
+ ERR("Failed to set size, hr %#lx.\n", hr);
goto out;
}
if (FAILED(hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL)))
{
- ERR("Failed to lock buffer, hr %#x.\n", hr);
+ ERR("Failed to lock buffer, hr %#lx.\n", hr);
goto out;
}
@@ -500,19 +500,19 @@ static void send_buffer(struct media_stream *stream, const struct wg_parser_even
if (FAILED(hr = IMFMediaBuffer_Unlock(buffer)))
{
- ERR("Failed to unlock buffer, hr %#x.\n", hr);
+ ERR("Failed to unlock buffer, hr %#lx.\n", hr);
goto out;
}
if (FAILED(hr = IMFSample_SetSampleTime(sample, event->u.buffer.pts)))
{
- ERR("Failed to set sample time, hr %#x.\n", hr);
+ ERR("Failed to set sample time, hr %#lx.\n", hr);
goto out;
}
if (FAILED(hr = IMFSample_SetSampleDuration(sample, event->u.buffer.duration)))
{
- ERR("Failed to set sample duration, hr %#x.\n", hr);
+ ERR("Failed to set sample duration, hr %#lx.\n", hr);
goto out;
}
@@ -658,9 +658,9 @@ static DWORD CALLBACK read_thread(void *arg)
if (SUCCEEDED(hr = IMFByteStream_SetCurrentPosition(byte_stream, offset)))
hr = IMFByteStream_Read(byte_stream, data, size, &ret_size);
if (FAILED(hr))
- ERR("Failed to read %u bytes at offset %I64u, hr %#x.\n", size, offset, hr);
+ ERR("Failed to read %u bytes at offset %I64u, hr %#lx.\n", size, offset, hr);
else if (ret_size != size)
- ERR("Unexpected short read: requested %u bytes, got %u.\n", size, ret_size);
+ ERR("Unexpected short read: requested %u bytes, got %lu.\n", size, ret_size);
wg_parser_push_data(source->wg_parser, SUCCEEDED(hr) ? data : NULL, ret_size);
}
@@ -697,7 +697,7 @@ static ULONG WINAPI media_stream_AddRef(IMFMediaStream *iface)
struct media_stream *stream = impl_from_IMFMediaStream(iface);
ULONG ref = InterlockedIncrement(&stream->ref);
- TRACE("%p, refcount %u.\n", iface, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -707,7 +707,7 @@ static ULONG WINAPI media_stream_Release(IMFMediaStream *iface)
struct media_stream *stream = impl_from_IMFMediaStream(iface);
ULONG ref = InterlockedDecrement(&stream->ref);
- TRACE("%p, refcount %u.\n", iface, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if (!ref)
{
@@ -724,7 +724,7 @@ static HRESULT WINAPI media_stream_GetEvent(IMFMediaStream *iface, DWORD flags,
{
struct media_stream *stream = impl_from_IMFMediaStream(iface);
- TRACE("%p, %#x, %p.\n", iface, flags, event);
+ TRACE("%p, %#lx, %p.\n", iface, flags, event);
return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event);
}
@@ -752,7 +752,7 @@ static HRESULT WINAPI media_stream_QueueEvent(IMFMediaStream *iface, MediaEventT
{
struct media_stream *stream = impl_from_IMFMediaStream(iface);
- TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
+ TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value);
}
@@ -843,7 +843,7 @@ static HRESULT new_media_stream(struct media_source *source,
struct media_stream *object = calloc(1, sizeof(*object));
HRESULT hr;
- TRACE("source %p, wg_stream %p, stream_id %u.\n", source, wg_stream, stream_id);
+ TRACE("source %p, wg_stream %p, stream_id %lu.\n", source, wg_stream, stream_id);
object->IMFMediaStream_iface.lpVtbl = &media_stream_vtbl;
object->ref = 1;
@@ -1176,7 +1176,7 @@ static ULONG WINAPI media_source_AddRef(IMFMediaSource *iface)
struct media_source *source = impl_from_IMFMediaSource(iface);
ULONG ref = InterlockedIncrement(&source->ref);
- TRACE("%p, refcount %u.\n", iface, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -1186,7 +1186,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface)
struct media_source *source = impl_from_IMFMediaSource(iface);
ULONG ref = InterlockedDecrement(&source->ref);
- TRACE("%p, refcount %u.\n", iface, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if (!ref)
{
@@ -1202,7 +1202,7 @@ static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags,
{
struct media_source *source = impl_from_IMFMediaSource(iface);
- TRACE("%p, %#x, %p.\n", iface, flags, event);
+ TRACE("%p, %#lx, %p.\n", iface, flags, event);
return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event);
}
@@ -1230,7 +1230,7 @@ static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventT
{
struct media_source *source = impl_from_IMFMediaSource(iface);
- TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
+ TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value);
return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value);
}
@@ -1410,7 +1410,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
if (FAILED(hr = IMFByteStream_GetLength(bytestream, &file_size)))
{
- FIXME("Failed to get byte stream length, hr %#x.\n", hr);
+ FIXME("Failed to get byte stream length, hr %#lx.\n", hr);
return hr;
}
@@ -1467,7 +1467,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
if (FAILED(hr = media_stream_init_desc(object->streams[i])))
{
- ERR("Failed to finish initialization of media stream %p, hr %x.\n", object->streams[i], hr);
+ ERR("Failed to finish initialization of media stream %p, hr %#lx.\n", object->streams[i], hr);
IMFMediaSource_Release(&object->streams[i]->parent_source->IMFMediaSource_iface);
IMFMediaEventQueue_Release(object->streams[i]->event_queue);
free(object->streams[i]);
@@ -1509,7 +1509,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
return S_OK;
fail:
- WARN("Failed to construct MFMediaSource, hr %#x.\n", hr);
+ WARN("Failed to construct MFMediaSource, hr %#lx.\n", hr);
if (descriptors)
{
@@ -1596,7 +1596,7 @@ static ULONG WINAPI winegstreamer_stream_handler_AddRef(IMFByteStreamHandler *if
struct winegstreamer_stream_handler *handler = impl_from_IMFByteStreamHandler(iface);
ULONG refcount = InterlockedIncrement(&handler->refcount);
- TRACE("%p, refcount %u.\n", handler, refcount);
+ TRACE("%p, refcount %lu.\n", handler, refcount);
return refcount;
}
@@ -1607,7 +1607,7 @@ static ULONG WINAPI winegstreamer_stream_handler_Release(IMFByteStreamHandler *i
ULONG refcount = InterlockedDecrement(&handler->refcount);
struct winegstreamer_stream_handler_result *result, *next;
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -1663,7 +1663,7 @@ static ULONG WINAPI create_object_context_AddRef(IUnknown *iface)
struct create_object_context *context = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&context->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -1673,7 +1673,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface)
struct create_object_context *context = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&context->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -1703,7 +1703,7 @@ static HRESULT WINAPI winegstreamer_stream_handler_BeginCreateObject(IMFByteStre
IMFAsyncResult *caller, *item;
HRESULT hr;
- TRACE("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state);
+ TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state);
if (cancel_cookie)
*cancel_cookie = NULL;
@@ -1880,7 +1880,7 @@ static HRESULT WINAPI winegstreamer_stream_handler_callback_GetParameters(IMFAsy
static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_stream_handler *This, WCHAR *url, IMFByteStream *stream, DWORD flags,
IPropertyStore *props, IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type)
{
- TRACE("%p, %s, %p, %u, %p, %p, %p.\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type);
+ TRACE("%p, %s, %p, %#lx, %p, %p, %p.\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type);
if (flags & MF_RESOLUTION_MEDIASOURCE)
{
@@ -1899,7 +1899,7 @@ static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_s
}
else
{
- FIXME("flags = %08x\n", flags);
+ FIXME("Unhandled flags %#lx.\n", flags);
return E_NOTIMPL;
}
}
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 6a58f444204..aa5e60ec116 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -64,7 +64,7 @@ static ULONG WINAPI video_processor_AddRef(IMFTransform *iface)
struct video_processor *transform = impl_video_processor_from_IMFTransform(iface);
ULONG refcount = InterlockedIncrement(&transform->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
@@ -74,7 +74,7 @@ static ULONG WINAPI video_processor_Release(IMFTransform *iface)
struct video_processor *transform = impl_video_processor_from_IMFTransform(iface);
ULONG refcount = InterlockedDecrement(&transform->refcount);
- TRACE("%p, refcount %u.\n", iface, refcount);
+ TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
@@ -146,7 +146,7 @@ static HRESULT WINAPI video_processor_GetOutputStreamAttributes(IMFTransform *if
{
struct video_processor *transform = impl_video_processor_from_IMFTransform(iface);
- TRACE("%p, %u, %p.\n", iface, id, attributes);
+ TRACE("%p, %lu, %p.\n", iface, id, attributes);
*attributes = transform->output_attributes;
IMFAttributes_AddRef(*attributes);
@@ -156,14 +156,14 @@ static HRESULT WINAPI video_processor_GetOutputStreamAttributes(IMFTransform *if
static HRESULT WINAPI video_processor_DeleteInputStream(IMFTransform *iface, DWORD id)
{
- TRACE("%p, %u.\n", iface, id);
+ TRACE("%p, %lu.\n", iface, id);
return E_NOTIMPL;
}
static HRESULT WINAPI video_processor_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids)
{
- TRACE("%p, %u, %p.\n", iface, streams, ids);
+ TRACE("%p, %lu, %p.\n", iface, streams, ids);
return E_NOTIMPL;
}
@@ -171,7 +171,7 @@ static HRESULT WINAPI video_processor_AddInputStreams(IMFTransform *iface, DWORD
static HRESULT WINAPI video_processor_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
IMFMediaType **type)
{
- FIXME("%p, %u, %u, %p.\n", iface, id, index, type);
+ FIXME("%p, %lu, %lu, %p.\n", iface, id, index, type);
return E_NOTIMPL;
}
@@ -179,42 +179,42 @@ static HRESULT WINAPI video_processor_GetInputAvailableType(IMFTransform *iface,
static HRESULT WINAPI video_processor_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
IMFMediaType **type)
{
- FIXME("%p, %u, %u, %p.\n", iface, id, index, type);
+ FIXME("%p, %lu, %lu, %p.\n", iface, id, index, type);
return E_NOTIMPL;
}
static HRESULT WINAPI video_processor_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
{
- FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags);
+ FIXME("%p, %lu, %p, %#lx.\n", iface, id, type, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI video_processor_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
{
- FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags);
+ FIXME("%p, %lu, %p, %#lx.\n", iface, id, type, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI video_processor_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
{
- FIXME("%p, %u, %p.\n", iface, id, type);
+ FIXME("%p, %lu, %p.\n", iface, id, type);
return E_NOTIMPL;
}
static HRESULT WINAPI video_processor_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
{
- FIXME("%p, %u, %p.\n", iface, id, type);
+ FIXME("%p, %lu, %p.\n", iface, id, type);
return E_NOTIMPL;
}
static HRESULT WINAPI video_processor_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)
{
- FIXME("%p, %u, %p.\n", iface, id, flags);
+ FIXME("%p, %lu, %p.\n", iface, id, flags);
return E_NOTIMPL;
}
@@ -235,21 +235,21 @@ static HRESULT WINAPI video_processor_SetOutputBounds(IMFTransform *iface, LONGL
static HRESULT WINAPI video_processor_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event)
{
- TRACE("%p, %u, %p.\n", iface, id, event);
+ TRACE("%p, %lu, %p.\n", iface, id, event);
return E_NOTIMPL;
}
static HRESULT WINAPI video_processor_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
{
- FIXME("%p, %u.\n", iface, message);
+ FIXME("%p, %u, %#Ix.\n", iface, message, param);
return E_NOTIMPL;
}
static HRESULT WINAPI video_processor_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)
{
- FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags);
+ FIXME("%p, %lu, %p, %#lx.\n", iface, id, sample, flags);
return E_NOTIMPL;
}
@@ -257,7 +257,7 @@ static HRESULT WINAPI video_processor_ProcessInput(IMFTransform *iface, DWORD id
static HRESULT WINAPI video_processor_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status)
{
- FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status);
+ FIXME("%p, %#lx, %lu, %p, %p.\n", iface, flags, count, samples, status);
return E_NOTIMPL;
}
@@ -521,7 +521,7 @@ HRESULT mfplat_DllRegisterServer(void)
if (FAILED(hr))
{
- FIXME("Failed to register MFT, hr %#x\n", hr);
+ FIXME("Failed to register MFT, hr %#lx.\n", hr);
return hr;
}
}
diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c
index e8d56d54785..331bc9a888a 100644
--- a/dlls/winegstreamer/quartz_parser.c
+++ b/dlls/winegstreamer/quartz_parser.c
@@ -452,7 +452,7 @@ static bool amt_to_wg_format_audio(const AM_MEDIA_TYPE *mt, struct wg_format *fo
}
if (mt->cbFormat < sizeof(WAVEFORMATEX) || !mt->pbFormat)
{
- ERR("Unexpected format size %u.\n", mt->cbFormat);
+ ERR("Unexpected format size %lu.\n", mt->cbFormat);
return false;
}
@@ -504,7 +504,7 @@ static bool amt_to_wg_format_audio_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_form
}
if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat)
{
- ERR("Unexpected format size %u.\n", mt->cbFormat);
+ ERR("Unexpected format size %lu.\n", mt->cbFormat);
return false;
}
@@ -533,7 +533,7 @@ static bool amt_to_wg_format_audio_mpeg1_layer3(const AM_MEDIA_TYPE *mt, struct
}
if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat)
{
- ERR("Unexpected format size %u.\n", mt->cbFormat);
+ ERR("Unexpected format size %lu.\n", mt->cbFormat);
return false;
}
@@ -578,7 +578,7 @@ static bool amt_to_wg_format_video(const AM_MEDIA_TYPE *mt, struct wg_format *fo
}
if (mt->cbFormat < sizeof(VIDEOINFOHEADER) || !mt->pbFormat)
{
- ERR("Unexpected format size %u.\n", mt->cbFormat);
+ ERR("Unexpected format size %lu.\n", mt->cbFormat);
return false;
}
@@ -674,11 +674,11 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample,
HRESULT hr;
BYTE *ptr = NULL;
- TRACE("offset %u, size %u, sample size %u\n", offset, size, IMediaSample_GetSize(sample));
+ TRACE("offset %u, size %u, sample size %lu.\n", offset, size, IMediaSample_GetSize(sample));
hr = IMediaSample_SetActualDataLength(sample, size);
if(FAILED(hr)){
- WARN("SetActualDataLength failed: %08x\n", hr);
+ ERR("Failed to set sample size, hr %#lx.\n", hr);
return hr;
}
@@ -728,12 +728,10 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample,
IMediaSample_SetSyncPoint(sample, !event->u.buffer.delta);
if (!pin->pin.pin.peer)
- hr = VFW_E_NOT_CONNECTED;
- else
- hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample);
-
- TRACE("sending sample returned: %08x\n", hr);
+ return VFW_E_NOT_CONNECTED;
+ hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample);
+ TRACE("Receive() returned hr %#lx.\n", hr);
return hr;
}
@@ -760,7 +758,7 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event
if (FAILED(hr))
{
if (hr != VFW_E_NOT_CONNECTED)
- ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr);
+ ERR("Failed to get a sample, hr %#lx.\n", hr);
break;
}
@@ -783,7 +781,7 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event
if (FAILED(hr))
{
if (hr != VFW_E_NOT_CONNECTED)
- ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr);
+ ERR("Failed to get a sample, hr %#lx.\n", hr);
}
else
{
@@ -879,7 +877,7 @@ static DWORD CALLBACK read_thread(void *arg)
hr = IAsyncReader_SyncRead(filter->reader, offset, size, data);
if (FAILED(hr))
- ERR("Failed to read %u bytes at offset %I64u, hr %#x.\n", size, offset, hr);
+ ERR("Failed to read %u bytes at offset %I64u, hr %#lx.\n", size, offset, hr);
wg_parser_push_data(filter->wg_parser, SUCCEEDED(hr) ? data : NULL, size);
}
@@ -970,7 +968,7 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface)
continue;
if (FAILED(hr = IMemAllocator_Commit(filter->sources[i]->pin.pAllocator)))
- ERR("Failed to commit allocator, hr %#x.\n", hr);
+ ERR("Failed to commit allocator, hr %#lx.\n", hr);
filter->sources[i]->thread = CreateThread(NULL, 0, stream_thread, filter->sources[i], 0, NULL);
}
@@ -1230,14 +1228,14 @@ static HRESULT WINAPI stream_select_Info(IAMStreamSelect *iface, LONG index,
AM_MEDIA_TYPE **mt, DWORD *flags, LCID *lcid, DWORD *group, WCHAR **name,
IUnknown **object, IUnknown **unknown)
{
- FIXME("iface %p, index %d, mt %p, flags %p, lcid %p, group %p, name %p, object %p, unknown %p, stub!\n",
+ FIXME("iface %p, index %ld, mt %p, flags %p, lcid %p, group %p, name %p, object %p, unknown %p, stub!\n",
iface, index, mt, flags, lcid, group, name, object, unknown);
return E_NOTIMPL;
}
static HRESULT WINAPI stream_select_Enable(IAMStreamSelect *iface, LONG index, DWORD flags)
{
- FIXME("iface %p, index %d, flags %#x, stub!\n", iface, index, flags);
+ FIXME("iface %p, index %ld, flags %#lx, stub!\n", iface, index, flags);
return E_NOTIMPL;
}
@@ -1299,7 +1297,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface,
struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter);
int i;
- TRACE("pin %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n",
+ TRACE("pin %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n",
pin, current ? debugstr_time(*current) : "<null>", current_flags,
stop ? debugstr_time(*stop) : "<null>", stop_flags);
@@ -1419,7 +1417,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil
uint64_t timestamp;
int64_t diff;
- TRACE("pin %p, sender %p, type %s, proportion %u, late %s, timestamp %s.\n",
+ TRACE("pin %p, sender %p, type %s, proportion %ld, late %s, timestamp %s.\n",
pin, sender, q.Type == Famine ? "Famine" : "Flood", q.Proportion,
debugstr_time(q.Late), debugstr_time(q.TimeStamp));
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index aa15a5a77f9..fc919ef2c49 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -66,7 +66,7 @@ static void open_stream(struct async_reader *reader, IWMReaderCallback *callback
if (FAILED(hr = IWMReaderCallback_QueryInterface(callback,
&IID_IWMReaderCallbackAdvanced, (void **)&reader->reader.callback_advanced)))
reader->reader.callback_advanced = NULL;
- TRACE("Querying for IWMReaderCallbackAdvanced returned %#x.\n", hr);
+ TRACE("Querying for IWMReaderCallbackAdvanced returned %#lx.\n", hr);
}
static DWORD WINAPI stream_thread(void *arg)
@@ -139,13 +139,13 @@ static DWORD WINAPI stream_thread(void *arg)
else
hr = IWMReaderCallback_OnSample(callback, i, pts, duration,
flags, sample, reader->context);
- TRACE("Callback returned %#x.\n", hr);
+ TRACE("Callback returned %#lx.\n", hr);
INSSBuffer_Release(sample);
all_eos = false;
}
else if (hr != NS_E_NO_MORE_SAMPLES)
{
- ERR("Failed to get sample, hr %#x.\n", hr);
+ ERR("Failed to get sample, hr %#lx.\n", hr);
return 0;
}
}
@@ -279,7 +279,7 @@ static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output, IW
{
struct async_reader *reader = impl_from_IWMReader(iface);
- TRACE("reader %p, output %u, props %p.\n", reader, output, props);
+ TRACE("reader %p, output %lu, props %p.\n", reader, output, props);
return wm_reader_get_output_props(&reader->reader, output, props);
}
@@ -288,7 +288,7 @@ static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output, IW
{
struct async_reader *reader = impl_from_IWMReader(iface);
- TRACE("reader %p, output %u, props %p.\n", reader, output, props);
+ TRACE("reader %p, output %lu, props %p.\n", reader, output, props);
return wm_reader_set_output_props(&reader->reader, output, props);
}
@@ -297,7 +297,7 @@ static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD outp
{
struct async_reader *reader = impl_from_IWMReader(iface);
- TRACE("reader %p, output %u, count %p.\n", reader, output, count);
+ TRACE("reader %p, output %lu, count %p.\n", reader, output, count);
return wm_reader_get_output_format_count(&reader->reader, output, count);
}
@@ -307,7 +307,7 @@ static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output,
{
struct async_reader *reader = impl_from_IWMReader(iface);
- TRACE("reader %p, output %u, index %u, props %p.\n", reader, output, index, props);
+ TRACE("reader %p, output %lu, index %lu, props %p.\n", reader, output, index, props);
return wm_reader_get_output_format(&reader->reader, output, index, props);
}
@@ -538,15 +538,17 @@ static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *
{
struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface);
- TRACE("reader %p, output %u, allocate %d.\n", reader, output, allocate);
+ TRACE("reader %p, output %lu, allocate %d.\n", reader, output, allocate);
return wm_reader_set_allocate_for_output(&reader->reader, output, allocate);
}
static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate)
{
- struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
- FIXME("(%p)->(%d %p)\n", This, output_num, allocate);
+ struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface);
+
+ FIXME("reader %p, output %lu, allocate %p, stub!\n", reader, output_num, allocate);
+
return E_NOTIMPL;
}
@@ -584,7 +586,7 @@ static HRESULT WINAPI WMReaderAdvanced_SetClientInfo(IWMReaderAdvanced6 *iface,
static HRESULT WINAPI WMReaderAdvanced_GetMaxOutputSampleSize(IWMReaderAdvanced6 *iface, DWORD output, DWORD *max)
{
struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
- FIXME("(%p)->(%d %p)\n", This, output, max);
+ FIXME("(%p)->(%lu %p)\n", This, output, max);
return E_NOTIMPL;
}
@@ -667,7 +669,7 @@ static HRESULT WINAPI WMReaderAdvanced2_GetOutputSetting(IWMReaderAdvanced6 *ifa
const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length)
{
struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
- FIXME("(%p)->(%d %s %p %p %p)\n", This, output_num, debugstr_w(name), type, value, length);
+ FIXME("(%p)->(%lu %s %p %p %p)\n", This, output_num, debugstr_w(name), type, value, length);
return E_NOTIMPL;
}
@@ -675,7 +677,7 @@ static HRESULT WINAPI WMReaderAdvanced2_SetOutputSetting(IWMReaderAdvanced6 *ifa
const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length)
{
struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
- FIXME("(%p)->(%d %s %d %p %d)\n", This, output_num, debugstr_w(name), type, value, length);
+ FIXME("(%p)->(%lu %s %#x %p %u)\n", This, output_num, debugstr_w(name), type, value, length);
return E_NOTIMPL;
}
@@ -742,15 +744,18 @@ static HRESULT WINAPI WMReaderAdvanced3_StartAtPosition(IWMReaderAdvanced6 *ifac
static HRESULT WINAPI WMReaderAdvanced4_GetLanguageCount(IWMReaderAdvanced6 *iface, DWORD output_num, WORD *language_count)
{
struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
- FIXME("(%p)->(%d %p)\n", This, output_num, language_count);
+ FIXME("(%p)->(%lu %p)\n", This, output_num, language_count);
return E_NOTIMPL;
}
static HRESULT WINAPI WMReaderAdvanced4_GetLanguage(IWMReaderAdvanced6 *iface, DWORD output_num,
WORD language, WCHAR *language_string, WORD *language_string_len)
{
- struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
- FIXME("(%p)->(%d %x %p %p)\n", This, output_num, language, language_string, language_string_len);
+ struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface);
+
+ FIXME("reader %p, output %lu, language %#x, language_string %p, language_string_len %p, stub!\n",
+ reader, output_num, language, language_string, language_string_len);
+
return E_NOTIMPL;
}
@@ -806,17 +811,21 @@ static HRESULT WINAPI WMReaderAdvanced4_GetURL(IWMReaderAdvanced6 *iface, WCHAR
static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface, DWORD output_num, IWMPlayerHook *hook)
{
- struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
- FIXME("(%p)->(%d %p)\n", This, output_num, hook);
+ struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface);
+
+ FIXME("reader %p, output %lu, hook %p, stub!\n", reader, output_num, hook);
+
return E_NOTIMPL;
}
static HRESULT WINAPI WMReaderAdvanced6_SetProtectStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert,
DWORD cert_size, DWORD cert_type, DWORD flags, BYTE *initialization_vector, DWORD *initialization_vector_size)
{
- struct async_reader *This = impl_from_IWMReaderAdvanced6(iface);
- FIXME("(%p)->(%p %d %d %x %p %p)\n", This, cert, cert_size, cert_type, flags, initialization_vector,
- initialization_vector_size);
+ struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface);
+
+ FIXME("reader %p, cert %p, cert_size %lu, cert_type %#lx, flags %#lx, vector %p, vector_size %p, stub!\n",
+ reader, cert, cert_size, cert_type, flags, initialization_vector, initialization_vector_size);
+
return E_NOTIMPL;
}
@@ -899,18 +908,18 @@ static ULONG WINAPI reader_accl_Release(IWMReaderAccelerator *iface)
static HRESULT WINAPI reader_accl_GetCodecInterface(IWMReaderAccelerator *iface, DWORD output, REFIID riid, void **codec)
{
- struct async_reader *This = impl_from_IWMReaderAccelerator(iface);
+ struct async_reader *reader = impl_from_IWMReaderAccelerator(iface);
- FIXME("%p, %d, %s, %p\n", This, output, debugstr_guid(riid), codec);
+ FIXME("reader %p, output %lu, iid %s, codec %p, stub!\n", reader, output, debugstr_guid(riid), codec);
return E_NOTIMPL;
}
static HRESULT WINAPI reader_accl_Notify(IWMReaderAccelerator *iface, DWORD output, WM_MEDIA_TYPE *subtype)
{
- struct async_reader *This = impl_from_IWMReaderAccelerator(iface);
+ struct async_reader *reader = impl_from_IWMReaderAccelerator(iface);
- FIXME("%p, %d, %p\n", This, output, subtype);
+ FIXME("reader %p, output %lu, subtype %p, stub!\n", reader, output, subtype);
return E_NOTIMPL;
}
@@ -968,11 +977,13 @@ static HRESULT WINAPI networkconfig_GetUDPPortRanges(IWMReaderNetworkConfig2 *if
return E_NOTIMPL;
}
-static HRESULT WINAPI networkconfig_SetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array,
- DWORD ranges)
+static HRESULT WINAPI networkconfig_SetUDPPortRanges(IWMReaderNetworkConfig2 *iface,
+ WM_PORT_NUMBER_RANGE *ranges, DWORD count)
{
- struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
- FIXME("%p, %p, %u\n", This, array, ranges);
+ struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface);
+
+ FIXME("reader %p, ranges %p, count %lu.\n", reader, ranges, count);
+
return E_NOTIMPL;
}
@@ -1019,8 +1030,10 @@ static HRESULT WINAPI networkconfig_GetProxyPort(IWMReaderNetworkConfig2 *iface,
static HRESULT WINAPI networkconfig_SetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol,
DWORD port)
{
- struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
- FIXME("%p, %s, %u\n", This, debugstr_w(protocol), port);
+ struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface);
+
+ FIXME("reader %p, protocol %s, port %lu, stub!\n", reader, debugstr_w(protocol), port);
+
return E_NOTIMPL;
}
@@ -1144,8 +1157,10 @@ static HRESULT WINAPI networkconfig_GetConnectionBandwidth(IWMReaderNetworkConfi
static HRESULT WINAPI networkconfig_SetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD bandwidth)
{
- struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
- FIXME("%p, %u\n", This, bandwidth);
+ struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface);
+
+ FIXME("reader %p, bandwidth %lu, stub!\n", reader, bandwidth);
+
return E_NOTIMPL;
}
@@ -1159,8 +1174,10 @@ static HRESULT WINAPI networkconfig_GetNumProtocolsSupported(IWMReaderNetworkCon
static HRESULT WINAPI networkconfig_GetSupportedProtocolName(IWMReaderNetworkConfig2 *iface, DWORD protocol_num,
WCHAR *protocol, DWORD *size)
{
- struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
- FIXME("%p, %u, %p %p\n", This, protocol_num, protocol, size);
+ struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface);
+
+ FIXME("reader %p, index %lu, protocol %p, size %p, stub!\n", reader, protocol_num, protocol, size);
+
return E_NOTIMPL;
}
@@ -1174,8 +1191,10 @@ static HRESULT WINAPI networkconfig_AddLoggingUrl(IWMReaderNetworkConfig2 *iface
static HRESULT WINAPI networkconfig_GetLoggingUrl(IWMReaderNetworkConfig2 *iface, DWORD index, WCHAR *url,
DWORD *size)
{
- struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
- FIXME("%p, %u, %p, %p\n", This, index, url, size);
+ struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface);
+
+ FIXME("reader %p, index %lu, url %p, size %p, stub!\n", reader, index, url, size);
+
return E_NOTIMPL;
}
@@ -1246,8 +1265,10 @@ static HRESULT WINAPI networkconfig_GetAutoReconnectLimit(IWMReaderNetworkConfig
static HRESULT WINAPI networkconfig_SetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD limit)
{
- struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface);
- FIXME("%p, %u\n", This, limit);
+ struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface);
+
+ FIXME("reader %p, limit %lu, stub!\n", reader, limit);
+
return E_NOTIMPL;
}
@@ -1378,8 +1399,10 @@ static HRESULT WINAPI readclock_SetTimer(IWMReaderStreamClock *iface, QWORD when
static HRESULT WINAPI readclock_KillTimer(IWMReaderStreamClock *iface, DWORD id)
{
- struct async_reader *This = impl_from_IWMReaderStreamClock(iface);
- FIXME("%p, %d\n", This, id);
+ struct async_reader *reader = impl_from_IWMReaderStreamClock(iface);
+
+ FIXME("reader %p, id %lu, stub!\n", reader, id);
+
return E_NOTIMPL;
}
@@ -1418,8 +1441,10 @@ static ULONG WINAPI negotiation_Release(IWMReaderTypeNegotiation *iface)
static HRESULT WINAPI negotiation_TryOutputProps(IWMReaderTypeNegotiation *iface, DWORD output, IWMOutputMediaProps *props)
{
- struct async_reader *This = impl_from_IWMReaderTypeNegotiation(iface);
- FIXME("%p, %d, %p\n", This, output, props);
+ struct async_reader *reader = impl_from_IWMReaderTypeNegotiation(iface);
+
+ FIXME("reader %p, output %lu, props %p, stub!\n", reader, output, props);
+
return E_NOTIMPL;
}
@@ -1464,25 +1489,31 @@ static HRESULT WINAPI refclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *t
static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME basetime,
REFERENCE_TIME streamtime, HEVENT event, DWORD_PTR *cookie)
{
- struct async_reader *This = impl_from_IReferenceClock(iface);
- FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(basetime),
- wine_dbgstr_longlong(streamtime), event, cookie);
+ struct async_reader *reader = impl_from_IReferenceClock(iface);
+
+ FIXME("reader %p, basetime %s, streamtime %s, event %#Ix, cookie %p, stub!\n",
+ reader, debugstr_time(basetime), debugstr_time(streamtime), event, cookie);
+
return E_NOTIMPL;
}
static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME starttime,
REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie)
{
- struct async_reader *This = impl_from_IReferenceClock(iface);
- FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(starttime),
- wine_dbgstr_longlong(period), semaphore, cookie);
+ struct async_reader *reader = impl_from_IReferenceClock(iface);
+
+ FIXME("reader %p, starttime %s, period %s, semaphore %#Ix, cookie %p, stub!\n",
+ reader, debugstr_time(starttime), debugstr_time(period), semaphore, cookie);
+
return E_NOTIMPL;
}
static HRESULT WINAPI refclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie)
{
- struct async_reader *This = impl_from_IReferenceClock(iface);
- FIXME("%p, %lu\n", This, cookie);
+ struct async_reader *reader = impl_from_IReferenceClock(iface);
+
+ FIXME("reader %p, cookie %Iu, stub!\n", reader, cookie);
+
return E_NOTIMPL;
}
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 1a2b8d7614b..d6dddc177eb 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -24,7 +24,7 @@ static struct wm_stream *get_stream_by_output_number(struct wm_reader *reader, D
{
if (output < reader->stream_count)
return &reader->streams[output];
- WARN("Invalid output number %u.\n", output);
+ WARN("Invalid output number %lu.\n", output);
return NULL;
}
@@ -65,7 +65,7 @@ static ULONG WINAPI output_props_AddRef(IWMOutputMediaProps *iface)
struct output_props *props = impl_from_IWMOutputMediaProps(iface);
ULONG refcount = InterlockedIncrement(&props->refcount);
- TRACE("%p increasing refcount to %u.\n", props, refcount);
+ TRACE("%p increasing refcount to %lu.\n", props, refcount);
return refcount;
}
@@ -75,7 +75,7 @@ static ULONG WINAPI output_props_Release(IWMOutputMediaProps *iface)
struct output_props *props = impl_from_IWMOutputMediaProps(iface);
ULONG refcount = InterlockedDecrement(&props->refcount);
- TRACE("%p decreasing refcount to %u.\n", props, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", props, refcount);
if (!refcount)
free(props);
@@ -209,7 +209,7 @@ static ULONG WINAPI buffer_AddRef(INSSBuffer *iface)
struct buffer *buffer = impl_from_INSSBuffer(iface);
ULONG refcount = InterlockedIncrement(&buffer->refcount);
- TRACE("%p increasing refcount to %u.\n", buffer, refcount);
+ TRACE("%p increasing refcount to %lu.\n", buffer, refcount);
return refcount;
}
@@ -219,7 +219,7 @@ static ULONG WINAPI buffer_Release(INSSBuffer *iface)
struct buffer *buffer = impl_from_INSSBuffer(iface);
ULONG refcount = InterlockedDecrement(&buffer->refcount);
- TRACE("%p decreasing refcount to %u.\n", buffer, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", buffer, refcount);
if (!refcount)
free(buffer);
@@ -237,7 +237,7 @@ static HRESULT WINAPI buffer_SetLength(INSSBuffer *iface, DWORD size)
{
struct buffer *buffer = impl_from_INSSBuffer(iface);
- TRACE("iface %p, size %u.\n", buffer, size);
+ TRACE("iface %p, size %lu.\n", buffer, size);
if (size > buffer->capacity)
return E_INVALIDARG;
@@ -329,7 +329,7 @@ static ULONG WINAPI stream_config_AddRef(IWMStreamConfig *iface)
struct stream_config *config = impl_from_IWMStreamConfig(iface);
ULONG refcount = InterlockedIncrement(&config->refcount);
- TRACE("%p increasing refcount to %u.\n", config, refcount);
+ TRACE("%p increasing refcount to %lu.\n", config, refcount);
return refcount;
}
@@ -339,7 +339,7 @@ static ULONG WINAPI stream_config_Release(IWMStreamConfig *iface)
struct stream_config *config = impl_from_IWMStreamConfig(iface);
ULONG refcount = InterlockedDecrement(&config->refcount);
- TRACE("%p decreasing refcount to %u.\n", config, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", config, refcount);
if (!refcount)
{
@@ -422,7 +422,7 @@ static HRESULT WINAPI stream_config_GetBitrate(IWMStreamConfig *iface, DWORD *bi
static HRESULT WINAPI stream_config_SetBitrate(IWMStreamConfig *iface, DWORD bitrate)
{
- FIXME("iface %p, bitrate %u, stub!\n", iface, bitrate);
+ FIXME("iface %p, bitrate %lu, stub!\n", iface, bitrate);
return E_NOTIMPL;
}
@@ -434,7 +434,7 @@ static HRESULT WINAPI stream_config_GetBufferWindow(IWMStreamConfig *iface, DWOR
static HRESULT WINAPI stream_config_SetBufferWindow(IWMStreamConfig *iface, DWORD window)
{
- FIXME("iface %p, window %u, stub!\n", iface, window);
+ FIXME("iface %p, window %lu, stub!\n", iface, window);
return E_NOTIMPL;
}
@@ -591,7 +591,7 @@ static DWORD CALLBACK read_thread(void *arg)
if (!SetFilePointerEx(file, large_offset, NULL, FILE_BEGIN)
|| !ReadFile(file, data, size, &ret_size, NULL))
{
- ERR("Failed to read %u bytes at offset %I64u, error %u.\n", size, offset, GetLastError());
+ ERR("Failed to read %u bytes at offset %I64u, error %lu.\n", size, offset, GetLastError());
wg_parser_push_data(reader->wg_parser, NULL, 0);
continue;
}
@@ -602,14 +602,14 @@ static DWORD CALLBACK read_thread(void *arg)
hr = IStream_Read(stream, data, size, &ret_size);
if (FAILED(hr))
{
- ERR("Failed to read %u bytes at offset %I64u, hr %#x.\n", size, offset, hr);
+ ERR("Failed to read %u bytes at offset %I64u, hr %#lx.\n", size, offset, hr);
wg_parser_push_data(reader->wg_parser, NULL, 0);
continue;
}
}
if (ret_size != size)
- ERR("Unexpected short read: requested %u bytes, got %u.\n", size, ret_size);
+ ERR("Unexpected short read: requested %u bytes, got %lu.\n", size, ret_size);
wg_parser_push_data(reader->wg_parser, data, ret_size);
}
@@ -674,7 +674,7 @@ static ULONG WINAPI profile_AddRef(IWMProfile3 *iface)
struct wm_reader *reader = impl_from_IWMProfile3(iface);
ULONG refcount = InterlockedIncrement(&reader->refcount);
- TRACE("%p increasing refcount to %u.\n", reader, refcount);
+ TRACE("%p increasing refcount to %lu.\n", reader, refcount);
return refcount;
}
@@ -684,7 +684,7 @@ static ULONG WINAPI profile_Release(IWMProfile3 *iface)
struct wm_reader *reader = impl_from_IWMProfile3(iface);
ULONG refcount = InterlockedDecrement(&reader->refcount);
- TRACE("%p decreasing refcount to %u.\n", reader, refcount);
+ TRACE("%p decreasing refcount to %lu.\n", reader, refcount);
if (!refcount)
reader->ops->destroy(reader);
@@ -742,14 +742,14 @@ static HRESULT WINAPI profile_GetStream(IWMProfile3 *iface, DWORD index, IWMStre
struct wm_reader *reader = impl_from_IWMProfile3(iface);
struct stream_config *object;
- TRACE("reader %p, index %u, config %p.\n", reader, index, config);
+ TRACE("reader %p, index %lu, config %p.\n", reader, index, config);
EnterCriticalSection(&reader->cs);
if (index >= reader->stream_count)
{
LeaveCriticalSection(&reader->cs);
- WARN("Index %u exceeds stream count %u; returning E_INVALIDARG.\n", index, reader->stream_count);
+ WARN("Index %lu exceeds stream count %u; returning E_INVALIDARG.\n", index, reader->stream_count);
return E_INVALIDARG;
}
@@ -816,7 +816,7 @@ static HRESULT WINAPI profile_GetMutualExclusionCount(IWMProfile3 *iface, DWORD
static HRESULT WINAPI profile_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **excl)
{
- FIXME("iface %p, index %u, excl %p, stub!\n", iface, index, excl);
+ FIXME("iface %p, index %lu, excl %p, stub!\n", iface, index, excl);
return E_NOTIMPL;
}
@@ -864,7 +864,7 @@ static HRESULT WINAPI profile_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD
static HRESULT WINAPI profile_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **sharing)
{
- FIXME("iface %p, index %d, sharing %p, stub!\n", iface, index, sharing);
+ FIXME("iface %p, index %lu, sharing %p, stub!\n", iface, index, sharing);
return E_NOTIMPL;
}
@@ -1131,7 +1131,7 @@ static HRESULT WINAPI header_info_GetCodecInfoCount(IWMHeaderInfo3 *iface, DWORD
static HRESULT WINAPI header_info_GetCodecInfo(IWMHeaderInfo3 *iface, DWORD index, WORD *name_len,
WCHAR *name, WORD *desc_len, WCHAR *desc, WMT_CODEC_INFO_TYPE *type, WORD *size, BYTE *info)
{
- FIXME("iface %p, index %u, name_len %p, name %p, desc_len %p, desc %p, type %p, size %p, info %p, stub!\n",
+ FIXME("iface %p, index %lu, name_len %p, name %p, desc_len %p, desc %p, type %p, size %p, info %p, stub!\n",
iface, index, name_len, name, desc_len, desc, type, size, info);
return E_NOTIMPL;
}
@@ -1163,7 +1163,7 @@ static HRESULT WINAPI header_info_GetAttributeByIndexEx(IWMHeaderInfo3 *iface,
static HRESULT WINAPI header_info_ModifyAttribute(IWMHeaderInfo3 *iface, WORD stream_number,
WORD index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD size)
{
- FIXME("iface %p, stream_number %u, index %u, type %#x, lang_index %u, value %p, size %u, stub!\n",
+ FIXME("iface %p, stream_number %u, index %u, type %#x, lang_index %u, value %p, size %lu, stub!\n",
iface, stream_number, index, type, lang_index, value, size);
return E_NOTIMPL;
}
@@ -1172,7 +1172,7 @@ static HRESULT WINAPI header_info_AddAttribute(IWMHeaderInfo3 *iface,
WORD stream_number, const WCHAR *name, WORD *index,
WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD size)
{
- FIXME("iface %p, stream_number %u, name %s, index %p, type %#x, lang_index %u, value %p, size %u, stub!\n",
+ FIXME("iface %p, stream_number %u, name %s, index %p, type %#x, lang_index %u, value %p, size %lu, stub!\n",
iface, stream_number, debugstr_w(name), index, type, lang_index, value, size);
return E_NOTIMPL;
}
@@ -1309,7 +1309,7 @@ static HRESULT WINAPI packet_size_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD
static HRESULT WINAPI packet_size_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size)
{
- FIXME("iface %p, size %u, stub!\n", iface, size);
+ FIXME("iface %p, size %lu, stub!\n", iface, size);
return E_NOTIMPL;
}
@@ -1321,7 +1321,7 @@ static HRESULT WINAPI packet_size_GetMinPacketSize(IWMPacketSize2 *iface, DWORD
static HRESULT WINAPI packet_size_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size)
{
- FIXME("iface %p, size %u, stub!\n", iface, size);
+ FIXME("iface %p, size %lu, stub!\n", iface, size);
return E_NOTIMPL;
}
@@ -1365,14 +1365,14 @@ static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface)
static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count,
const WCHAR **filenames, IWMStatusCallback *callback, void *context)
{
- FIXME("iface %p, count %u, filenames %p, callback %p, context %p, stub!\n",
+ FIXME("iface %p, count %lu, filenames %p, callback %p, context %p, stub!\n",
iface, count, filenames, callback, context);
return E_NOTIMPL;
}
static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *hrs)
{
- FIXME("iface %p, count %u, hrs %p, stub!\n", iface, count, hrs);
+ FIXME("iface %p, count %lu, hrs %p, stub!\n", iface, count, hrs);
return E_NOTIMPL;
}
@@ -1384,7 +1384,7 @@ static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface)
static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT hr)
{
- FIXME("iface %p, hr %#x, stub!\n", iface, hr);
+ FIXME("iface %p, hr %#lx, stub!\n", iface, hr);
return E_NOTIMPL;
}
@@ -1468,7 +1468,7 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size)
if (FAILED(hr = wg_parser_connect(reader->wg_parser, file_size)))
{
- ERR("Failed to connect parser, hr %#x.\n", hr);
+ ERR("Failed to connect parser, hr %#lx.\n", hr);
goto out_shutdown_thread;
}
@@ -1543,7 +1543,7 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream)
if (FAILED(hr = IStream_Stat(stream, &stat, STATFLAG_NONAME)))
{
- ERR("Failed to stat stream, hr %#x.\n", hr);
+ ERR("Failed to stat stream, hr %#lx.\n", hr);
return hr;
}
@@ -1569,13 +1569,13 @@ HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename)
if ((file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
{
- ERR("Failed to open %s, error %u.\n", debugstr_w(filename), GetLastError());
+ ERR("Failed to open %s, error %lu.\n", debugstr_w(filename), GetLastError());
return HRESULT_FROM_WIN32(GetLastError());
}
if (!GetFileSizeEx(file, &size))
{
- ERR("Failed to get the size of %s, error %u.\n", debugstr_w(filename), GetLastError());
+ ERR("Failed to get the size of %s, error %lu.\n", debugstr_w(filename), GetLastError());
CloseHandle(file);
return HRESULT_FROM_WIN32(GetLastError());
}
@@ -1851,7 +1851,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream,
if (FAILED(hr = IWMReaderCallbackAdvanced_AllocateForStream(callback_advanced,
stream->index + 1, event.u.buffer.size, &sample, NULL)))
{
- ERR("Failed to allocate stream sample of %u bytes, hr %#x.\n", event.u.buffer.size, hr);
+ ERR("Failed to allocate stream sample of %u bytes, hr %#lx.\n", event.u.buffer.size, hr);
wg_parser_stream_release_buffer(wg_stream);
return hr;
}
@@ -1861,7 +1861,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream,
if (FAILED(hr = IWMReaderCallbackAdvanced_AllocateForOutput(callback_advanced,
stream->index, event.u.buffer.size, &sample, NULL)))
{
- ERR("Failed to allocate output sample of %u bytes, hr %#x.\n", event.u.buffer.size, hr);
+ ERR("Failed to allocate output sample of %u bytes, hr %#lx.\n", event.u.buffer.size, hr);
wg_parser_stream_release_buffer(wg_stream);
return hr;
}
@@ -1886,11 +1886,11 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream,
}
if (FAILED(hr = INSSBuffer_GetBufferAndLength(sample, &data, &size)))
- ERR("Failed to get data pointer, hr %#x.\n", hr);
+ ERR("Failed to get data pointer, hr %#lx.\n", hr);
if (FAILED(hr = INSSBuffer_GetMaxLength(sample, &capacity)))
- ERR("Failed to get capacity, hr %#x.\n", hr);
+ ERR("Failed to get capacity, hr %#lx.\n", hr);
if (event.u.buffer.size > capacity)
- ERR("Returned capacity %u is less than requested capacity %u.\n",
+ ERR("Returned capacity %lu is less than requested capacity %u.\n",
capacity, event.u.buffer.size);
if (!wg_parser_stream_copy_buffer(wg_stream, data, 0, event.u.buffer.size))
@@ -1901,7 +1901,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream,
}
if (FAILED(hr = INSSBuffer_SetLength(sample, event.u.buffer.size)))
- ERR("Failed to set size %u, hr %#x.\n", event.u.buffer.size, hr);
+ ERR("Failed to set size %u, hr %#lx.\n", event.u.buffer.size, hr);
wg_parser_stream_release_buffer(wg_stream);
diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c
index 96754d107de..e86645a207a 100644
--- a/dlls/winegstreamer/wm_syncreader.c
+++ b/dlls/winegstreamer/wm_syncreader.c
@@ -67,7 +67,7 @@ static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader2 *iface)
static HRESULT WINAPI WMSyncReader_GetMaxOutputSampleSize(IWMSyncReader2 *iface, DWORD output, DWORD *max)
{
struct sync_reader *This = impl_from_IWMSyncReader2(iface);
- FIXME("(%p)->(%d %p): stub!\n", This, output, max);
+ FIXME("(%p)->(%lu %p): stub!\n", This, output, max);
return E_NOTIMPL;
}
@@ -160,7 +160,7 @@ static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface,
{
struct sync_reader *reader = impl_from_IWMSyncReader2(iface);
- TRACE("reader %p, output %u, index %u, props %p.\n", reader, output, index, props);
+ TRACE("reader %p, output %lu, index %lu, props %p.\n", reader, output, index, props);
return wm_reader_get_output_format(&reader->reader, output, index, props);
}
@@ -169,7 +169,7 @@ static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, D
{
struct sync_reader *reader = impl_from_IWMSyncReader2(iface);
- TRACE("reader %p, output %u, count %p.\n", reader, output, count);
+ TRACE("reader %p, output %lu, count %p.\n", reader, output, count);
return wm_reader_get_output_format_count(&reader->reader, output, count);
}
@@ -190,7 +190,7 @@ static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface,
{
struct sync_reader *reader = impl_from_IWMSyncReader2(iface);
- TRACE("reader %p, output %u, props %p.\n", reader, output, props);
+ TRACE("reader %p, output %lu, props %p.\n", reader, output, props);
return wm_reader_get_output_props(&reader->reader, output, props);
}
@@ -199,7 +199,7 @@ static HRESULT WINAPI WMSyncReader_GetOutputSetting(IWMSyncReader2 *iface, DWORD
WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length)
{
struct sync_reader *This = impl_from_IWMSyncReader2(iface);
- FIXME("(%p)->(%u %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length);
+ FIXME("(%p)->(%lu %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length);
return E_NOTIMPL;
}
@@ -215,7 +215,7 @@ static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *ifac
{
struct sync_reader *reader = impl_from_IWMSyncReader2(iface);
- TRACE("reader %p, output %u, stream_number %p.\n", reader, output, stream_number);
+ TRACE("reader %p, output %lu, stream_number %p.\n", reader, output, stream_number);
*stream_number = output + 1;
return S_OK;
@@ -253,7 +253,7 @@ static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD o
{
struct sync_reader *reader = impl_from_IWMSyncReader2(iface);
- TRACE("reader %p, output %u, props %p.\n", reader, output, props);
+ TRACE("reader %p, output %lu, props %p.\n", reader, output, props);
return wm_reader_set_output_props(&reader->reader, output, props);
}
@@ -263,7 +263,7 @@ static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD
{
struct sync_reader *reader = impl_from_IWMSyncReader2(iface);
- TRACE("reader %p, output %u, name %s, type %#x, value %p, size %u.\n",
+ TRACE("reader %p, output %lu, name %s, type %#x, value %p, size %u.\n",
reader, output, debugstr_w(name), type, value, size);
if (!wcscmp(name, L"VideoSampleDurations"))
@@ -336,28 +336,28 @@ static HRESULT WINAPI WMSyncReader2_SetRangeByFrameEx(IWMSyncReader2 *iface, WOR
static HRESULT WINAPI WMSyncReader2_SetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx *allocator)
{
struct sync_reader *This = impl_from_IWMSyncReader2(iface);
- FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator);
+ FIXME("(%p)->(%lu %p): stub!\n", This, output_num, allocator);
return E_NOTIMPL;
}
static HRESULT WINAPI WMSyncReader2_GetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx **allocator)
{
struct sync_reader *This = impl_from_IWMSyncReader2(iface);
- FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator);
+ FIXME("(%p)->(%lu %p): stub!\n", This, output_num, allocator);
return E_NOTIMPL;
}
static HRESULT WINAPI WMSyncReader2_SetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx *allocator)
{
struct sync_reader *This = impl_from_IWMSyncReader2(iface);
- FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator);
+ FIXME("(%p)->(%lu %p): stub!\n", This, stream_num, allocator);
return E_NOTIMPL;
}
static HRESULT WINAPI WMSyncReader2_GetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx **allocator)
{
struct sync_reader *This = impl_from_IWMSyncReader2(iface);
- FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator);
+ FIXME("(%p)->(%lu %p): stub!\n", This, stream_num, allocator);
return E_NOTIMPL;
}
diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c
index a6fdbf27724..945390f44db 100644
--- a/dlls/winegstreamer/wma_decoder.c
+++ b/dlls/winegstreamer/wma_decoder.c
@@ -90,7 +90,7 @@ static ULONG WINAPI unknown_AddRef(IUnknown *iface)
struct wma_decoder *decoder = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&decoder->refcount);
- TRACE("iface %p increasing refcount to %u.\n", decoder, refcount);
+ TRACE("iface %p increasing refcount to %lu.\n", decoder, refcount);
return refcount;
}
@@ -100,7 +100,7 @@ static ULONG WINAPI unknown_Release(IUnknown *iface)
struct wma_decoder *decoder = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&decoder->refcount);
- TRACE("iface %p decreasing refcount to %u.\n", decoder, refcount);
+ TRACE("iface %p decreasing refcount to %lu.\n", decoder, refcount);
if (!refcount)
{
@@ -161,7 +161,7 @@ static HRESULT WINAPI transform_GetStreamCount(IMFTransform *iface, DWORD *input
static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs,
DWORD output_size, DWORD *outputs)
{
- FIXME("iface %p, input_size %u, inputs %p, output_size %u, outputs %p stub!\n", iface,
+ FIXME("iface %p, input_size %lu, inputs %p, output_size %lu, outputs %p stub!\n", iface,
input_size, inputs, output_size, outputs);
return E_NOTIMPL;
}
@@ -172,7 +172,7 @@ static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id
UINT32 block_alignment;
HRESULT hr;
- TRACE("iface %p, id %u, info %p.\n", iface, id, info);
+ TRACE("iface %p, id %lu, info %p.\n", iface, id, info);
if (!decoder->input_type || !decoder->output_type)
return MF_E_TRANSFORM_TYPE_NOT_SET;
@@ -195,7 +195,7 @@ static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD i
UINT32 channel_count, block_alignment;
HRESULT hr;
- TRACE("iface %p, id %u, info %p.\n", iface, id, info);
+ TRACE("iface %p, id %lu, info %p.\n", iface, id, info);
if (!decoder->input_type || !decoder->output_type)
return MF_E_TRANSFORM_TYPE_NOT_SET;
@@ -220,32 +220,32 @@ static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes
static HRESULT WINAPI transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes)
{
- FIXME("iface %p, id %u, attributes %p stub!\n", iface, id, attributes);
+ FIXME("iface %p, id %lu, attributes %p stub!\n", iface, id, attributes);
return E_NOTIMPL;
}
static HRESULT WINAPI transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes)
{
- FIXME("iface %p, id %u, attributes %p stub!\n", iface, id, attributes);
+ FIXME("iface %p, id %lu, attributes %p stub!\n", iface, id, attributes);
return E_NOTIMPL;
}
static HRESULT WINAPI transform_DeleteInputStream(IMFTransform *iface, DWORD id)
{
- FIXME("iface %p, id %u stub!\n", iface, id);
+ FIXME("iface %p, id %lu stub!\n", iface, id);
return E_NOTIMPL;
}
static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids)
{
- FIXME("iface %p, streams %u, ids %p stub!\n", iface, streams, ids);
+ FIXME("iface %p, streams %lu, ids %p stub!\n", iface, streams, ids);
return E_NOTIMPL;
}
static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index,
IMFMediaType **type)
{
- FIXME("iface %p, id %u, index %u, type %p stub!\n", iface, id, index, type);
+ FIXME("iface %p, id %lu, index %lu, type %p stub!\n", iface, id, index, type);
return E_NOTIMPL;
}
@@ -258,7 +258,7 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
const GUID *output_type;
HRESULT hr;
- TRACE("iface %p, id %u, index %u, type %p.\n", iface, id, index, type);
+ TRACE("iface %p, id %lu, index %lu, type %p.\n", iface, id, index, type);
if (!decoder->input_type)
return MF_E_TRANSFORM_TYPE_NOT_SET;
@@ -330,7 +330,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM
HRESULT hr;
ULONG i;
- TRACE("iface %p, id %u, type %p, flags %#x.\n", iface, id, type, flags);
+ TRACE("iface %p, id %lu, type %p, flags %#lx.\n", iface, id, type, flags);
if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) ||
FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
@@ -384,7 +384,7 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF
GUID major, subtype;
HRESULT hr;
- TRACE("iface %p, id %u, type %p, flags %#x.\n", iface, id, type, flags);
+ TRACE("iface %p, id %lu, type %p, flags %#lx.\n", iface, id, type, flags);
if (!decoder->input_type)
return MF_E_TRANSFORM_TYPE_NOT_SET;
@@ -448,19 +448,19 @@ failed:
static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
{
- FIXME("iface %p, id %u, type %p stub!\n", iface, id, type);
+ FIXME("iface %p, id %lu, type %p stub!\n", iface, id, type);
return E_NOTIMPL;
}
static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
{
- FIXME("iface %p, id %u, type %p stub!\n", iface, id, type);
+ FIXME("iface %p, id %lu, type %p stub!\n", iface, id, type);
return E_NOTIMPL;
}
static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)
{
- FIXME("iface %p, id %u, flags %p stub!\n", iface, id, flags);
+ FIXME("iface %p, id %lu, flags %p stub!\n", iface, id, flags);
return E_NOTIMPL;
}
@@ -479,7 +479,7 @@ static HRESULT WINAPI transform_SetOutputBounds(IMFTransform *iface, LONGLONG lo
static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event)
{
- FIXME("iface %p, id %u, event %p stub!\n", iface, id, event);
+ FIXME("iface %p, id %lu, event %p stub!\n", iface, id, event);
return E_NOTIMPL;
}
@@ -491,14 +491,14 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_
static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)
{
- FIXME("iface %p, id %u, sample %p, flags %#x stub!\n", iface, id, sample, flags);
+ FIXME("iface %p, id %lu, sample %p, flags %#lx stub!\n", iface, id, sample, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status)
{
- FIXME("iface %p, flags %#x, count %u, samples %p, status %p stub!\n", iface, flags, count, samples, status);
+ FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status);
return E_NOTIMPL;
}
@@ -564,79 +564,79 @@ static HRESULT WINAPI media_object_GetStreamCount(IMediaObject *iface, DWORD *in
static HRESULT WINAPI media_object_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags)
{
- FIXME("iface %p, index %u, flags %p stub!\n", iface, index, flags);
+ FIXME("iface %p, index %lu, flags %p stub!\n", iface, index, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags)
{
- FIXME("iface %p, index %u, flags %p stub!\n", iface, index, flags);
+ FIXME("iface %p, index %lu, flags %p stub!\n", iface, index, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index,
DMO_MEDIA_TYPE *type)
{
- FIXME("iface %p, index %u, type_index %u, type %p stub!\n", iface, index, type_index, type);
+ FIXME("iface %p, index %lu, type_index %lu, type %p stub!\n", iface, index, type_index, type);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index,
DMO_MEDIA_TYPE *type)
{
- FIXME("iface %p, index %u, type_index %u, type %p stub!\n", iface, index, type_index, type);
+ FIXME("iface %p, index %lu, type_index %lu, type %p stub!\n", iface, index, type_index, type);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_SetInputType(IMediaObject *iface, DWORD index,
const DMO_MEDIA_TYPE *type, DWORD flags)
{
- FIXME("iface %p, index %u, type %p, flags %#x stub!\n", iface, index, type, flags);
+ FIXME("iface %p, index %lu, type %p, flags %#lx stub!\n", iface, index, type, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_SetOutputType(IMediaObject *iface, DWORD index,
const DMO_MEDIA_TYPE *type, DWORD flags)
{
- FIXME("iface %p, index %u, type %p, flags %#x stub!\n", iface, index, type, flags);
+ FIXME("iface %p, index %lu, type %p, flags %#lx stub!\n", iface, index, type, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type)
{
- FIXME("iface %p, index %u, type %p stub!\n", iface, index, type);
+ FIXME("iface %p, index %lu, type %p stub!\n", iface, index, type);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type)
{
- FIXME("iface %p, index %u, type %p stub!\n", iface, index, type);
+ FIXME("iface %p, index %lu, type %p stub!\n", iface, index, type);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_GetInputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size,
DWORD *lookahead, DWORD *alignment)
{
- FIXME("iface %p, index %u, size %p, lookahead %p, alignment %p stub!\n", iface, index, size,
+ FIXME("iface %p, index %lu, size %p, lookahead %p, alignment %p stub!\n", iface, index, size,
lookahead, alignment);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment)
{
- FIXME("iface %p, index %u, size %p, alignment %p stub!\n", iface, index, size, alignment);
+ FIXME("iface %p, index %lu, size %p, alignment %p stub!\n", iface, index, size, alignment);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency)
{
- FIXME("iface %p, index %u, latency %p stub!\n", iface, index, latency);
+ FIXME("iface %p, index %lu, latency %p stub!\n", iface, index, latency);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency)
{
- FIXME("iface %p, index %u, latency %s stub!\n", iface, index, wine_dbgstr_longlong(latency));
+ FIXME("iface %p, index %lu, latency %s stub!\n", iface, index, wine_dbgstr_longlong(latency));
return E_NOTIMPL;
}
@@ -648,7 +648,7 @@ static HRESULT WINAPI media_object_Flush(IMediaObject *iface)
static HRESULT WINAPI media_object_Discontinuity(IMediaObject *iface, DWORD index)
{
- FIXME("iface %p, index %u stub!\n", iface, index);
+ FIXME("iface %p, index %lu stub!\n", iface, index);
return E_NOTIMPL;
}
@@ -666,14 +666,14 @@ static HRESULT WINAPI media_object_FreeStreamingResources(IMediaObject *iface)
static HRESULT WINAPI media_object_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags)
{
- FIXME("iface %p, index %u, flags %p stub!\n", iface, index, flags);
+ FIXME("iface %p, index %lu, flags %p stub!\n", iface, index, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_ProcessInput(IMediaObject *iface, DWORD index,
IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength)
{
- FIXME("iface %p, index %u, buffer %p, flags %#x, timestamp %s, timelength %s stub!\n", iface,
+ FIXME("iface %p, index %lu, buffer %p, flags %#lx, timestamp %s, timelength %s stub!\n", iface,
index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength));
return E_NOTIMPL;
}
@@ -681,13 +681,13 @@ static HRESULT WINAPI media_object_ProcessInput(IMediaObject *iface, DWORD index
static HRESULT WINAPI media_object_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count,
DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status)
{
- FIXME("iface %p, flags %#x, count %u, buffers %p, status %p stub!\n", iface, flags, count, buffers, status);
+ FIXME("iface %p, flags %#lx, count %lu, buffers %p, status %p stub!\n", iface, flags, count, buffers, status);
return E_NOTIMPL;
}
static HRESULT WINAPI media_object_Lock(IMediaObject *iface, LONG lock)
{
- FIXME("iface %p, lock %d stub!\n", iface, lock);
+ FIXME("iface %p, lock %ld stub!\n", iface, lock);
return E_NOTIMPL;
}
--
2.34.1
1
1
[PATCH v5] ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4.
by Bastien Orivel 03 Feb '22
by Bastien Orivel 03 Feb '22
03 Feb '22
According to MSDN [1], the `TCP_NODELAY` parameter should be of type
`BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte
instead of an int, any program written in rust that tries to set that
option on a socket will fail with a "Invalid parameter supplied" error.
Turns out that setsockopt on linux does not want optlen to be less than
4 bytes [3].
Windows' behavior is the following:
- For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT
- For optlen > 0, ignore the optlen value and set the TCP_NODELAY value
to one if the first byte of the given optvalue is not 0.
This will fix any rust program using the hyper library to do HTTP
requests.
[1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o…
[2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80…
[3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302…
Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr>
---
dlls/ws2_32/socket.c | 10 +++++--
dlls/ws2_32/tests/sock.c | 63 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index a75aaee68be..4b3ca3c2507 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2903,8 +2903,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int
switch(optname)
{
case TCP_NODELAY:
- return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen );
-
+ {
+ INT nodelay = *optval;
+ if (optlen <= 0) {
+ SetLastError(WSAEFAULT);
+ return SOCKET_ERROR;
+ }
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) );
+ }
default:
FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname);
SetLastError(WSAENOPROTOOPT);
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index b38357954b7..d208c17e43f 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1259,6 +1259,69 @@ static void test_set_getsockopt(void)
ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT,
"got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError());
+ /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any positive value */
+ size = sizeof(value);
+
+ value = 1;
+ err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1);
+ ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n");
+ value = 0xff;
+ err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size);
+ ok(!err, "getsockopt TCP_NODELAY failed\n");
+ ok(value == 1, "TCP_NODELAY should be 1\n");
+ value = 0;
+ err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value));
+ ok(!err, "Failed to reset TCP_NODELAY to 0\n");
+
+ value = 1;
+ err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4);
+ ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n");
+ value = 0xff;
+ err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size);
+ ok(!err, "getsockopt TCP_NODELAY failed\n");
+ ok(value == 1, "TCP_NODELAY should be 1\n");
+ value = 0;
+ err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value));
+ ok(!err, "Failed to reset TCP_NODELAY to 0\n");
+
+ value = 1;
+ err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42);
+ ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n");
+ value = 0xff;
+ err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size);
+ ok(!err, "getsockopt TCP_NODELAY failed\n");
+ ok(value == 1, "TCP_NODELAY should be 1\n");
+ value = 0;
+ err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value));
+ ok(!err, "Failed to reset TCP_NODELAY to 0\n");
+
+ value = 1;
+ err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0);
+ ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT,
+ "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError());
+ value = 0xff;
+ err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size);
+ ok(!err, "getsockopt TCP_NODELAY failed\n");
+ ok(!value, "TCP_NODELAY should be 0\n");
+
+ value = 1;
+ err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, -1);
+ /* On win 10 pro, this sets the error to WSAENOBUFS instead of WSAEFAULT */
+ ok(err == SOCKET_ERROR && (WSAGetLastError() == WSAEFAULT || WSAGetLastError() == WSAENOBUFS),
+ "got %d with %d (expected SOCKET_ERROR with either WSAEFAULT or WSAENOBUFS)\n", err, WSAGetLastError());
+ value = 0xff;
+ err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size);
+ ok(!err, "getsockopt TCP_NODELAY failed\n");
+ ok(!value, "TCP_NODELAY should be 0\n");
+
+ value = 0x100;
+ err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4);
+ ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n");
+ value = 0xff;
+ err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size);
+ ok(!err, "getsockopt TCP_NODELAY failed\n");
+ ok(!value, "TCP_NODELAY should be 0\n");
+
/* Test for erroneously passing a value instead of a pointer as optval */
size = sizeof(char);
err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size);
--
2.34.1
2
1
Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com>
---
dlls/userenv/tests/userenv.c | 17 ++++++++++++++++-
dlls/userenv/userenv_main.c | 3 +++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c
index a91edeef260..c7a6791e2be 100644
--- a/dlls/userenv/tests/userenv.c
+++ b/dlls/userenv/tests/userenv.c
@@ -78,7 +78,7 @@ static void test_create_env(void)
BOOL r, is_wow64 = FALSE;
HANDLE htok;
WCHAR * env[4];
- char * st, systemroot[100];
+ char * st, systemroot[100], programdata[100];
int i, j;
static const struct profile_item common_vars[] = {
@@ -96,6 +96,7 @@ static void test_create_env(void)
};
static const struct profile_item common_post_nt4_vars[] = {
{ "ALLUSERSPROFILE" },
+ { "ProgramData" },
{ "TEMP" },
{ "TMP" },
{ "CommonProgramFiles" },
@@ -119,6 +120,12 @@ static void test_create_env(void)
r = SetEnvironmentVariableA("SystemRoot", "overwrite");
expect(TRUE, r);
+ r = GetEnvironmentVariableA("ProgramData", programdata, sizeof(programdata));
+ ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError());
+
+ r = SetEnvironmentVariableA("ProgramData", "overwrite");
+ expect(TRUE, r);
+
if (0)
{
/* Crashes on NT4 */
@@ -151,12 +158,20 @@ static void test_create_env(void)
r = SetEnvironmentVariableA("SystemRoot", systemroot);
expect(TRUE, r);
+ r = SetEnvironmentVariableA("ProgramData", programdata);
+ expect(TRUE, r);
+
for(i=0; i<4; i++)
{
r = get_env(env[i], "SystemRoot", &st);
ok(!strcmp(st, "SystemRoot=overwrite"), "%s\n", st);
expect(TRUE, r);
HeapFree(GetProcessHeap(), 0, st);
+
+ r = get_env(env[i], "ProgramData", &st);
+ ok(strcmp(st, "ProgramData=overwrite"), "%s\n", st);
+ expect(TRUE, r);
+ HeapFree(GetProcessHeap(), 0, st);
}
/* Test for common environment variables (NT4 and higher) */
diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c
index 87ace7d5c11..08dede60d35 100644
--- a/dlls/userenv/userenv_main.c
+++ b/dlls/userenv/userenv_main.c
@@ -243,7 +243,10 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment,
}
if (get_reg_value(env, hkey, L"Public", buf, UNICODE_STRING_MAX_CHARS))
+ {
set_env_var(&env, L"ALLUSERSPROFILE", buf);
+ set_env_var(&env, L"ProgramData", buf);
+ }
}
else
{
--
2.34.1
1
0
[PATCH v2] winegcc: --out-implib needs to propagate -m32/-m64 to winebuild
by Kevin Puetz 03 Feb '22
by Kevin Puetz 03 Feb '22
03 Feb '22
This was already passed through for linking, and for spec.o files,
but was overlooked when implementing -Wl,--out-implib
Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com>
--
This version will also send -m32/-m64 to subcommands that don't care
e.g. winebuild --fixup-constructors peeks at the ELF magic number instead,
and winebuld --builtin just modifies an existing PE header in-place.
But that's harmless; winebuild will always parse and accept -m16/32/64,
and it does interact with --target, so it's reasonable to always pass
them together just to have fewer details to think about.
---
tools/winegcc/winegcc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 0aafca1271a..44d86fb130a 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -897,6 +897,8 @@ static struct strarray get_winebuild_args(struct options *opts)
strarray_add( &spec_args, "--target" );
strarray_add( &spec_args, opts->target_alias );
}
+ if (opts->force_pointer_size)
+ strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));
for (i = 0; i < opts->prefix.count; i++)
strarray_add( &spec_args, strmake( "-B%s", opts->prefix.str[i] ));
strarray_addall( &spec_args, opts->winebuild_args );
@@ -1025,8 +1027,6 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file,
}
spec_o_name = get_temp_file(output_name, ".spec.o");
- if (opts->force_pointer_size)
- strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));
if (opts->pic && !is_pe) strarray_add(&spec_args, "-fPIC");
strarray_add(&spec_args, opts->shared ? "--dll" : "--exe");
if (opts->fake_module)
--
2.34.1
1
0
[PATCH v2 1/2] win32u: Don't pass physdev to wine_get_wgl_driver() driver function.
by Paul Gofman 03 Feb '22
by Paul Gofman 03 Feb '22
03 Feb '22
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
---
Supersedes 223960.
v2:
- added patch.
Specific GL driver initialization does not depend on anything in the device or context besides making
a decision to call or skip the next driver. Copying the driver constant function pointers out allows
to call driver's _wine_get_wgl_driver outside of any DC lock in the next patch.
dlls/win32u/dibdrv/dc.c | 11 ++++++-----
dlls/win32u/driver.c | 24 +++++++++++++++++++++---
dlls/wineandroid.drv/init.c | 11 ++---------
dlls/winemac.drv/opengl.c | 4 +++-
dlls/winex11.drv/init.c | 11 ++---------
include/wine/gdi_driver.h | 2 +-
6 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c
index a96b613d0a3..4cc95e6b843 100644
--- a/dlls/win32u/dibdrv/dc.c
+++ b/dlls/win32u/dibdrv/dc.c
@@ -605,8 +605,10 @@ static struct opengl_funcs opengl_funcs =
/**********************************************************************
* dibdrv_wine_get_wgl_driver
*/
-static struct opengl_funcs * CDECL dibdrv_wine_get_wgl_driver( PHYSDEV dev, UINT version )
+static struct opengl_funcs * CDECL dibdrv_wine_get_wgl_driver( UINT version, const struct gdi_dc_funcs ***next_funcs )
{
+ *next_funcs = NULL;
+
if (version != WINE_WGL_DRIVER_VERSION)
{
ERR( "version mismatch, opengl32 wants %u but dibdrv has %u\n", version, WINE_WGL_DRIVER_VERSION );
@@ -1177,11 +1179,10 @@ static INT CDECL windrv_StretchDIBits( PHYSDEV dev, INT x_dst, INT y_dst, INT wi
return ret;
}
-static struct opengl_funcs * CDECL windrv_wine_get_wgl_driver( PHYSDEV dev, UINT version )
+static struct opengl_funcs * CDECL windrv_wine_get_wgl_driver( UINT version, const struct gdi_dc_funcs ***next_funcs )
{
- dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver );
- if (dev->funcs == &dib_driver) dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver );
- return dev->funcs->wine_get_wgl_driver( dev, version );
+ if (*(*next_funcs + 1) == &dib_driver) ++*next_funcs;
+ return NULL;
}
static const struct gdi_dc_funcs window_driver =
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 39996086c6d..f527c6c51cf 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -579,8 +579,10 @@ static NTSTATUS CDECL nulldrv_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSO
return STATUS_PROCEDURE_NOT_FOUND;
}
-static struct opengl_funcs * CDECL nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version )
+static struct opengl_funcs * CDECL nulldrv_wine_get_wgl_driver( UINT version, const struct gdi_dc_funcs ***next_funcs )
{
+ *next_funcs = NULL;
+
return (void *)-1;
}
@@ -1347,13 +1349,29 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE
*/
struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version )
{
+ const struct gdi_dc_funcs *driver_funcs[11], **next_funcs;
struct opengl_funcs *ret = NULL;
DC * dc = get_dc_ptr( hdc );
+ PHYSDEV physdev;
if (dc)
{
- PHYSDEV physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver );
- ret = physdev->funcs->wine_get_wgl_driver( physdev, version );
+ next_funcs = driver_funcs;
+ physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver );
+ while (physdev && next_funcs - driver_funcs < ARRAY_SIZE(driver_funcs) - 1)
+ {
+ *next_funcs++ = physdev->funcs;
+ if (physdev->funcs == &null_driver) break;
+ physdev = GET_NEXT_PHYSDEV( physdev, wine_get_wgl_driver );
+ }
+ *next_funcs = NULL;
+ next_funcs = driver_funcs;
+ while (*next_funcs)
+ {
+ ret = (*next_funcs)->wine_get_wgl_driver( version, &next_funcs );
+ if (ret || !next_funcs) break;
+ ++next_funcs;
+ }
release_dc_ptr( dc );
}
return ret;
diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c
index ed9116eb47e..3c7da3f780f 100644
--- a/dlls/wineandroid.drv/init.c
+++ b/dlls/wineandroid.drv/init.c
@@ -261,16 +261,9 @@ BOOL CDECL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devm
/**********************************************************************
* ANDROID_wine_get_wgl_driver
*/
-static struct opengl_funcs * CDECL ANDROID_wine_get_wgl_driver( PHYSDEV dev, UINT version )
+static struct opengl_funcs * CDECL ANDROID_wine_get_wgl_driver( UINT version, const struct gdi_dc_funcs ***next_funcs )
{
- struct opengl_funcs *ret;
-
- if (!(ret = get_wgl_driver( version )))
- {
- dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver );
- ret = dev->funcs->wine_get_wgl_driver( dev, version );
- }
- return ret;
+ return get_wgl_driver( version );
}
diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index daf194c2aec..b5670906e93 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -4632,10 +4632,12 @@ static struct opengl_funcs opengl_funcs =
/**********************************************************************
* macdrv_wine_get_wgl_driver
*/
-struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(PHYSDEV dev, UINT version)
+struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(UINT version, const struct gdi_dc_funcs ***next_funcs)
{
static INIT_ONCE opengl_init = INIT_ONCE_STATIC_INIT;
+ *next_funcs = NULL;
+
if (version != WINE_WGL_DRIVER_VERSION)
{
ERR("version mismatch, opengl32 wants %u but macdrv has %u\n", version, WINE_WGL_DRIVER_VERSION);
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 5b31c352a23..ebd221c2d38 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -312,16 +312,9 @@ static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOI
/**********************************************************************
* X11DRV_wine_get_wgl_driver
*/
-static struct opengl_funcs * CDECL X11DRV_wine_get_wgl_driver( PHYSDEV dev, UINT version )
+static struct opengl_funcs * CDECL X11DRV_wine_get_wgl_driver( UINT version, const struct gdi_dc_funcs ***next_funcs )
{
- struct opengl_funcs *ret;
-
- if (!(ret = get_glx_driver( version )))
- {
- dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver );
- ret = dev->funcs->wine_get_wgl_driver( dev, version );
- }
- return ret;
+ return get_glx_driver( version );
}
/**********************************************************************
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 567a6c21608..0e3bbade6c4 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -159,7 +159,7 @@ struct gdi_dc_funcs
BOOL (CDECL *pUnrealizePalette)(HPALETTE);
NTSTATUS (CDECL *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *);
NTSTATUS (CDECL *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *);
- struct opengl_funcs * (CDECL *wine_get_wgl_driver)(PHYSDEV,UINT);
+ struct opengl_funcs * (CDECL *wine_get_wgl_driver)(UINT,const struct gdi_dc_funcs ***);
/* priority order for the driver on the stack */
UINT priority;
--
2.34.1
2
4
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
dlls/dmusic/tests/Makefile.in | 1 -
dlls/dmusic/tests/dmusic.c | 380 +++++++++++++++++-----------------
2 files changed, 190 insertions(+), 191 deletions(-)
diff --git a/dlls/dmusic/tests/Makefile.in b/dlls/dmusic/tests/Makefile.in
index 091204f16f6..2f8d6a8654c 100644
--- a/dlls/dmusic/tests/Makefile.in
+++ b/dlls/dmusic/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = dmusic.dll
IMPORTS = oleaut32 ole32 uuid user32 dsound
diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c
index f6b817cca60..d8fc6affd9b 100644
--- a/dlls/dmusic/tests/dmusic.c
+++ b/dlls/dmusic/tests/dmusic.c
@@ -46,7 +46,7 @@ static void test_dmusic(void)
IDirectMusicPort *port = NULL;
hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic);
- ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr);
+ ok(hr == S_OK, "Cannot create DirectMusic object: %#lx\n", hr);
port_params.dwSize = sizeof(port_params);
port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS;
@@ -55,39 +55,39 @@ static void test_dmusic(void)
/* No port can be created before SetDirectSound is called */
hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL);
- ok(hr == DMUS_E_DSOUND_NOT_SET, "IDirectMusic_CreatePort returned: %x\n", hr);
+ ok(hr == DMUS_E_DSOUND_NOT_SET, "IDirectMusic_CreatePort returned: %#lx\n", hr);
hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL);
- ok(hr == S_OK, "IDirectMusic_SetDirectSound returned: %x\n", hr);
+ ok(hr == S_OK, "IDirectMusic_SetDirectSound returned: %#lx\n", hr);
/* Check wrong params */
hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, (IUnknown*)dmusic);
- ok(hr == CLASS_E_NOAGGREGATION, "IDirectMusic_CreatePort returned: %x\n", hr);
+ ok(hr == CLASS_E_NOAGGREGATION, "IDirectMusic_CreatePort returned: %#lx\n", hr);
hr = IDirectMusic_CreatePort(dmusic, NULL, &port_params, &port, NULL);
- ok(hr == E_POINTER, "IDirectMusic_CreatePort returned: %x\n", hr);
+ ok(hr == E_POINTER, "IDirectMusic_CreatePort returned: %#lx\n", hr);
hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, NULL, &port, NULL);
- ok(hr == E_INVALIDARG, "IDirectMusic_CreatePort returned: %x\n", hr);
+ ok(hr == E_INVALIDARG, "IDirectMusic_CreatePort returned: %#lx\n", hr);
hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, NULL, NULL);
- ok(hr == E_POINTER, "IDirectMusic_CreatePort returned: %x\n", hr);
+ ok(hr == E_POINTER, "IDirectMusic_CreatePort returned: %#lx\n", hr);
/* Test creation of default port with GUID_NULL */
hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL);
- ok(hr == S_OK, "IDirectMusic_CreatePort returned: %x\n", hr);
+ ok(hr == S_OK, "IDirectMusic_CreatePort returned: %#lx\n", hr);
port_caps.dwSize = sizeof(port_caps);
while (IDirectMusic_EnumPort(dmusic, index, &port_caps) == S_OK)
{
- ok(port_caps.dwSize == sizeof(port_caps), "DMUS_PORTCAPS dwSize member is wrong (%u)\n", port_caps.dwSize);
- trace("Port %u:\n", index);
- trace(" dwFlags = %x\n", port_caps.dwFlags);
+ ok(port_caps.dwSize == sizeof(port_caps), "DMUS_PORTCAPS dwSize member is wrong (%lu)\n", port_caps.dwSize);
+ trace("Port %lu:\n", index);
+ trace(" dwFlags = %lx\n", port_caps.dwFlags);
trace(" guidPort = %s\n", wine_dbgstr_guid(&port_caps.guidPort));
- trace(" dwClass = %u\n", port_caps.dwClass);
- trace(" dwType = %u\n", port_caps.dwType);
- trace(" dwMemorySize = %u\n", port_caps.dwMemorySize);
- trace(" dwMaxChannelGroups = %u\n", port_caps.dwMaxChannelGroups);
- trace(" dwMaxVoices = %u\n", port_caps.dwMaxVoices);
- trace(" dwMaxAudioChannels = %u\n", port_caps.dwMaxAudioChannels);
- trace(" dwEffectFlags = %x\n", port_caps.dwEffectFlags);
+ trace(" dwClass = %lu\n", port_caps.dwClass);
+ trace(" dwType = %lu\n", port_caps.dwType);
+ trace(" dwMemorySize = %lu\n", port_caps.dwMemorySize);
+ trace(" dwMaxChannelGroups = %lu\n", port_caps.dwMaxChannelGroups);
+ trace(" dwMaxVoices = %lu\n", port_caps.dwMaxVoices);
+ trace(" dwMaxAudioChannels = %lu\n", port_caps.dwMaxAudioChannels);
+ trace(" dwEffectFlags = %lx\n", port_caps.dwEffectFlags);
trace(" wszDescription = %s\n", wine_dbgstr_w(port_caps.wszDescription));
index++;
}
@@ -123,14 +123,14 @@ static void test_setdsound(void)
skip("No driver\n");
return;
}
- ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr);
+ ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr);
hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8,
(void **)&dmusic);
- ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr);
+ ok(hr == S_OK, "DirectMusic create failed: %#lx\n", hr);
hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL);
- ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr);
+ ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr);
hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, ¶ms, &port, NULL);
- ok(hr == S_OK, "CreatePort returned: %x\n", hr);
+ ok(hr == S_OK, "CreatePort returned: %#lx\n", hr);
IDirectMusicPort_Release(port);
IDirectMusic_Release(dmusic);
IDirectSound_Release(dsound);
@@ -138,103 +138,103 @@ static void test_setdsound(void)
/* dsound ref counting */
hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8,
(void **)&dmusic);
- ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr);
+ ok(hr == S_OK, "DirectMusic create failed: %#lx\n", hr);
hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&dsound, NULL);
- ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr);
+ ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr);
hr = IDirectSound_SetCooperativeLevel(dsound, GetForegroundWindow(), DSSCL_PRIORITY);
- ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr);
+ ok(hr == S_OK, "SetCooperativeLevel failed: %#lx\n", hr);
hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL);
- ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr);
+ ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 2, "dsound ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound ref count got %ld expected 2\n", ref);
hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, ¶ms, &port, NULL);
- ok(hr == S_OK, "CreatePort returned: %x\n", hr);
+ ok(hr == S_OK, "CreatePort returned: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 2, "dsound ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound ref count got %ld expected 2\n", ref);
IDirectMusicPort_AddRef(port);
ref = IDirectMusicPort_Release(port);
- ok(ref == 1, "port ref count got %d expected 1\n", ref);
+ ok(ref == 1, "port ref count got %ld expected 1\n", ref);
hr = IDirectMusicPort_Activate(port, TRUE);
- ok(hr == S_OK, "Port Activate returned: %x\n", hr);
+ ok(hr == S_OK, "Port Activate returned: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 4, "dsound ref count got %d expected 4\n", ref);
+ ok(ref == 4, "dsound ref count got %ld expected 4\n", ref);
IDirectMusicPort_AddRef(port);
ref = IDirectMusicPort_Release(port);
- ok(ref == 1, "port ref count got %d expected 1\n", ref);
+ ok(ref == 1, "port ref count got %ld expected 1\n", ref);
/* Releasing dsound from dmusic */
hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL);
- ok(hr == DMUS_E_DSOUND_ALREADY_SET, "SetDirectSound failed: %08x\n", hr);
+ ok(hr == DMUS_E_DSOUND_ALREADY_SET, "SetDirectSound failed: %#lx\n", hr);
hr = IDirectMusicPort_Activate(port, FALSE);
- ok(hr == S_OK, "Port Activate returned: %x\n", hr);
+ ok(hr == S_OK, "Port Activate returned: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 2, "dsound ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound ref count got %ld expected 2\n", ref);
hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL);
- ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr);
+ ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 1, "dsound ref count got %d expected 1\n", ref);
+ ok(ref == 1, "dsound ref count got %ld expected 1\n", ref);
/* Setting the same dsound twice */
hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL);
- ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr);
+ ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 2, "dsound ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound ref count got %ld expected 2\n", ref);
hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL);
- ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr);
+ ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 2, "dsound ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound ref count got %ld expected 2\n", ref);
/* Replacing one dsound with another */
hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&dsound2, NULL);
- ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr);
+ ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr);
hr = IDirectMusic_SetDirectSound(dmusic, dsound2, NULL);
- ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr);
+ ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 1, "dsound ref count got %d expected 1\n", ref);
+ ok(ref == 1, "dsound ref count got %ld expected 1\n", ref);
ref = get_refcount(dsound2);
- ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound2 ref count got %ld expected 2\n", ref);
/* Replacing the dsound in the port */
hr = IDirectMusicPort_SetDirectSound(port, dsound, NULL);
- ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr);
+ ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 2, "dsound ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound ref count got %ld expected 2\n", ref);
ref = get_refcount(dsound2);
- ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound2 ref count got %ld expected 2\n", ref);
/* Setting the dsound again on the port will mess with the parent dmusic */
hr = IDirectMusicPort_SetDirectSound(port, dsound, NULL);
- ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr);
+ ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 3, "dsound ref count got %d expected 3\n", ref);
+ ok(ref == 3, "dsound ref count got %ld expected 3\n", ref);
ref = get_refcount(dsound2);
- ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref);
+ ok(ref == 1, "dsound2 ref count got %ld expected 1\n", ref);
IDirectSound_AddRef(dsound2); /* Crash prevention */
hr = IDirectMusicPort_Activate(port, TRUE);
- ok(hr == S_OK, "Activate returned: %x\n", hr);
+ ok(hr == S_OK, "Activate returned: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 4, "dsound ref count got %d expected 4\n", ref);
+ ok(ref == 4, "dsound ref count got %ld expected 4\n", ref);
ref = get_refcount(dsound2);
- ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound2 ref count got %ld expected 2\n", ref);
hr = IDirectMusicPort_Activate(port, TRUE);
- ok(hr == S_FALSE, "Activate returned: %x\n", hr);
+ ok(hr == S_FALSE, "Activate returned: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 4, "dsound ref count got %d expected 4\n", ref);
+ ok(ref == 4, "dsound ref count got %ld expected 4\n", ref);
ref = get_refcount(dsound2);
- ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref);
+ ok(ref == 2, "dsound2 ref count got %ld expected 2\n", ref);
/* Deactivating the port messes with the dsound refcount in the parent dmusic */
hr = IDirectMusicPort_Activate(port, FALSE);
- ok(hr == S_OK, "Port Activate returned: %x\n", hr);
+ ok(hr == S_OK, "Port Activate returned: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 3, "dsound ref count got %d expected 3\n", ref);
+ ok(ref == 3, "dsound ref count got %ld expected 3\n", ref);
ref = get_refcount(dsound2);
- ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref);
+ ok(ref == 1, "dsound2 ref count got %ld expected 1\n", ref);
hr = IDirectMusicPort_Activate(port, FALSE);
- ok(hr == S_FALSE, "Port Activate returned: %x\n", hr);
+ ok(hr == S_FALSE, "Port Activate returned: %#lx\n", hr);
ref = get_refcount(dsound);
- ok(ref == 3, "dsound ref count got %d expected 3\n", ref);
+ ok(ref == 3, "dsound ref count got %ld expected 3\n", ref);
ref = get_refcount(dsound2);
- ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref);
+ ok(ref == 1, "dsound2 ref count got %ld expected 1\n", ref);
IDirectMusicPort_Release(port);
IDirectMusic_Release(dmusic);
@@ -254,7 +254,7 @@ static void test_dmbuffer(void)
LPBYTE data;
hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic);
- ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr);
+ ok(hr == S_OK, "Cannot create DirectMusic object: %#lx\n", hr);
desc.dwSize = sizeof(DMUS_BUFFERDESC);
desc.dwFlags = 0;
@@ -262,43 +262,43 @@ static void test_dmbuffer(void)
memcpy(&desc.guidBufferFormat, &GUID_NULL, sizeof(GUID));
hr = IDirectMusic_CreateMusicBuffer(dmusic, &desc, &dmbuffer, NULL);
- ok(hr == S_OK, "IDirectMusic_CreateMusicBuffer return %x\n", hr);
+ ok(hr == S_OK, "IDirectMusic_CreateMusicBuffer returned %#lx\n", hr);
hr = IDirectMusicBuffer_GetBufferFormat(dmbuffer, &format);
- ok(hr == S_OK, "IDirectMusicBuffer_GetBufferFormat returned %x\n", hr);
+ ok(hr == S_OK, "IDirectMusicBuffer_GetBufferFormat returned %#lx\n", hr);
ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", wine_dbgstr_guid(&format));
hr = IDirectMusicBuffer_GetMaxBytes(dmbuffer, &size);
- ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr);
- ok(size == 1024, "Buffer size is %u instead of 1024\n", size);
+ ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %#lx\n", hr);
+ ok(size == 1024, "Buffer size is %lu instead of 1024\n", size);
hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time);
- ok(hr == DMUS_E_BUFFER_EMPTY, "IDirectMusicBuffer_GetStartTime returned %x\n", hr);
+ ok(hr == DMUS_E_BUFFER_EMPTY, "IDirectMusicBuffer_GetStartTime returned %#lx\n", hr);
hr = IDirectMusicBuffer_SetStartTime(dmbuffer, 10);
- ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr);
+ ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %#lx\n", hr);
hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time);
- ok(hr == DMUS_E_BUFFER_EMPTY, "IDirectMusicBuffer_GetStartTime returned %x\n", hr);
+ ok(hr == DMUS_E_BUFFER_EMPTY, "IDirectMusicBuffer_GetStartTime returned %#lx\n", hr);
hr = IDirectMusicBuffer_PackStructured(dmbuffer, 20, 0, 0);
- ok(hr == DMUS_E_INVALID_EVENT, "IDirectMusicBuffer_PackStructured returned %x\n", hr);
+ ok(hr == DMUS_E_INVALID_EVENT, "IDirectMusicBuffer_PackStructured returned %#lx\n", hr);
hr = IDirectMusicBuffer_PackStructured(dmbuffer, 20, 0, 0x000090); /* note on : chan 0, note 0 & vel 0 */
- ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %x\n", hr);
+ ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %#lx\n", hr);
hr = IDirectMusicBuffer_PackStructured(dmbuffer, 30, 0, 0x000080); /* note off : chan 0, note 0 & vel 0 */
- ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %x\n", hr);
+ ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %#lx\n", hr);
hr = IDirectMusicBuffer_GetUsedBytes(dmbuffer, &bytes);
- ok(hr == S_OK, "IDirectMusicBuffer_GetUsedBytes returned %x\n", hr);
- ok(bytes == 48, "Buffer size is %u instead of 48\n", bytes);
+ ok(hr == S_OK, "IDirectMusicBuffer_GetUsedBytes returned %#lx\n", hr);
+ ok(bytes == 48, "Buffer size is %lu instead of 48\n", bytes);
hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time);
- ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr);
+ ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %#lx\n", hr);
ok(time == 20, "Buffer start time is wrong\n");
hr = IDirectMusicBuffer_SetStartTime(dmbuffer, 40);
- ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr);
+ ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %#lx\n", hr);
hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time);
- ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr);
+ ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %#lx\n", hr);
ok(time == 40, "Buffer start time is wrong\n");
hr = IDirectMusicBuffer_GetRawBufferPtr(dmbuffer, &data);
- ok(hr == S_OK, "IDirectMusicBuffer_GetRawBufferPtr returned %x\n", hr);
+ ok(hr == S_OK, "IDirectMusicBuffer_GetRawBufferPtr returned %#lx\n", hr);
if (hr == S_OK)
{
DMUS_EVENTHEADER* header;
@@ -307,23 +307,23 @@ static void test_dmbuffer(void)
/* Check message 1 */
header = (DMUS_EVENTHEADER*)data;
data += sizeof(DMUS_EVENTHEADER);
- ok(header->cbEvent == 3, "cbEvent is %u instead of 3\n", header->cbEvent);
- ok(header->dwChannelGroup == 0, "dwChannelGroup is %u instead of 0\n", header->dwChannelGroup);
+ ok(header->cbEvent == 3, "cbEvent is %lu instead of 3\n", header->cbEvent);
+ ok(header->dwChannelGroup == 0, "dwChannelGroup is %lu instead of 0\n", header->dwChannelGroup);
ok(header->rtDelta == 0, "rtDelta is %s instead of 0\n", wine_dbgstr_longlong(header->rtDelta));
- ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %x instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED);
+ ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %lx instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED);
message = *(DWORD*)data & 0xffffff; /* Only 3 bytes are relevant */
data += sizeof(DWORD);
- ok(message == 0x000090, "Message is %0x instead of 0x000090\n", message);
+ ok(message == 0x000090, "Message is %0lx instead of 0x000090\n", message);
/* Check message 2 */
header = (DMUS_EVENTHEADER*)data;
data += sizeof(DMUS_EVENTHEADER);
- ok(header->cbEvent == 3, "cbEvent is %u instead of 3\n", header->cbEvent);
- ok(header->dwChannelGroup == 0, "dwChannelGroup is %u instead of 0\n", header->dwChannelGroup);
+ ok(header->cbEvent == 3, "cbEvent is %lu instead of 3\n", header->cbEvent);
+ ok(header->dwChannelGroup == 0, "dwChannelGroup is %lu instead of 0\n", header->dwChannelGroup);
ok(header->rtDelta == 10, "rtDelta is %s instead of 0\n", wine_dbgstr_longlong(header->rtDelta));
- ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %x instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED);
+ ok(header->dwFlags == DMUS_EVENT_STRUCTURED, "dwFlags is %lx instead of %x\n", header->dwFlags, DMUS_EVENT_STRUCTURED);
message = *(DWORD*)data & 0xffffff; /* Only 3 bytes are relevant */
- ok(message == 0x000080, "Message 2 is %0x instead of 0x000080\n", message);
+ ok(message == 0x000080, "Message 2 is %0lx instead of 0x000080\n", message);
}
if (dmbuffer)
@@ -343,13 +343,13 @@ static void test_COM(void)
hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown,
(void**)&dm8);
ok(hr == CLASS_E_NOAGGREGATION,
- "DirectMusic8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
+ "DirectMusic8 create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr);
ok(!dm8, "dm8 = %p\n", dm8);
/* Invalid RIID */
hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject,
(void**)&dm8);
- ok(hr == E_NOINTERFACE, "DirectMusic8 create failed: %08x, expected E_NOINTERFACE\n", hr);
+ ok(hr == E_NOINTERFACE, "DirectMusic8 create failed: %#lx, expected E_NOINTERFACE\n", hr);
/* Same refcount for DirectMusic and DirectMusic8 */
hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8,
@@ -359,23 +359,23 @@ static void test_COM(void)
win_skip("DirectMusic too old (no IDirectMusic8)\n");
return;
}
- ok(hr == S_OK, "DirectMusic8 create failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "DirectMusic8 create failed: %#lx, expected S_OK\n", hr);
refcount = IDirectMusic8_AddRef(dm8);
- ok(refcount == 2, "refcount == %u, expected 2\n", refcount);
+ ok(refcount == 2, "refcount == %lu, expected 2\n", refcount);
hr = IDirectMusic8_QueryInterface(dm8, &IID_IDirectMusic, (void**)&dm);
- ok(hr == S_OK, "QueryInterface for IID_IDirectMusic failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IDirectMusic failed: %#lx\n", hr);
refcount = IDirectMusic_AddRef(dm);
- ok(refcount == 4, "refcount == %u, expected 4\n", refcount);
+ ok(refcount == 4, "refcount == %lu, expected 4\n", refcount);
IDirectMusic_Release(dm);
hr = IDirectMusic8_QueryInterface(dm8, &IID_IUnknown, (void**)&unk);
- ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr);
refcount = IUnknown_AddRef(unk);
- ok(refcount == 5, "refcount == %u, expected 5\n", refcount);
+ ok(refcount == 5, "refcount == %lu, expected 5\n", refcount);
refcount = IUnknown_Release(unk);
- ok(refcount == 4, "refcount == %u, expected 4\n", refcount);
+ ok(refcount == 4, "refcount == %lu, expected 4\n", refcount);
while (IDirectMusic8_Release(dm8));
}
@@ -392,40 +392,40 @@ static void test_COM_dmcoll(void)
hr = CoCreateInstance(&CLSID_DirectMusicCollection, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmc);
ok(hr == CLASS_E_NOAGGREGATION,
- "DirectMusicCollection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
+ "DirectMusicCollection create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr);
ok(!dmc, "dmc = %p\n", dmc);
/* Invalid RIID */
hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER,
&IID_IClassFactory, (void**)&dmc);
- ok(hr == E_NOINTERFACE, "DirectMusicCollection create failed: %08x, expected E_NOINTERFACE\n", hr);
+ ok(hr == E_NOINTERFACE, "DirectMusicCollection create failed: %#lx, expected E_NOINTERFACE\n", hr);
/* Same refcount for all DirectMusicCollection interfaces */
hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectMusicCollection, (void**)&dmc);
- ok(hr == S_OK, "DirectMusicCollection create failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "DirectMusicCollection create failed: %#lx, expected S_OK\n", hr);
refcount = IDirectMusicCollection_AddRef(dmc);
- ok(refcount == 2, "refcount == %u, expected 2\n", refcount);
+ ok(refcount == 2, "refcount == %lu, expected 2\n", refcount);
hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo);
- ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr);
refcount = IDirectMusicObject_AddRef(dmo);
- ok(refcount == 4, "refcount == %u, expected 4\n", refcount);
+ ok(refcount == 4, "refcount == %lu, expected 4\n", refcount);
refcount = IDirectMusicObject_Release(dmo);
hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps);
- ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr);
refcount = IPersistStream_AddRef(ps);
- ok(refcount == 5, "refcount == %u, expected 5\n", refcount);
+ ok(refcount == 5, "refcount == %lu, expected 5\n", refcount);
refcount = IPersistStream_Release(ps);
hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IUnknown, (void**)&unk);
- ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr);
refcount = IUnknown_AddRef(unk);
- ok(refcount == 6, "refcount == %u, expected 6\n", refcount);
+ ok(refcount == 6, "refcount == %lu, expected 6\n", refcount);
refcount = IUnknown_Release(unk);
- ok(refcount == 5, "refcount == %u, expected 5\n", refcount);
+ ok(refcount == 5, "refcount == %lu, expected 5\n", refcount);
while (IDirectMusicCollection_Release(dmc));
}
@@ -441,45 +441,45 @@ static void test_dmcoll(void)
hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectMusicCollection, (void**)&dmc);
- ok(hr == S_OK, "DirectMusicCollection create failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "DirectMusicCollection create failed: %#lx, expected S_OK\n", hr);
/* IDirectMusicObject */
hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo);
- ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr);
hr = IDirectMusicObject_GetDescriptor(dmo, NULL);
- ok(hr == E_POINTER, "IDirectMusicObject_GetDescriptor: expected E_POINTER, got %08x\n", hr);
+ ok(hr == E_POINTER, "IDirectMusicObject_GetDescriptor: expected E_POINTER, got %#lx\n", hr);
hr = IDirectMusicObject_SetDescriptor(dmo, NULL);
- ok(hr == E_POINTER, "IDirectMusicObject_SetDescriptor: expected E_POINTER, got %08x\n", hr);
+ ok(hr == E_POINTER, "IDirectMusicObject_SetDescriptor: expected E_POINTER, got %#lx\n", hr);
ZeroMemory(&desc, sizeof(desc));
hr = IDirectMusicObject_GetDescriptor(dmo, &desc);
- ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr);
+ ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %#lx\n", hr);
ok(desc.dwValidData == DMUS_OBJ_CLASS,
- "Fresh object has more valid data (%08x) than DMUS_OBJ_CLASS\n", desc.dwValidData);
+ "Fresh object has more valid data (%#lx) than DMUS_OBJ_CLASS\n", desc.dwValidData);
/* DMUS_OBJ_CLASS is immutable */
desc.dwValidData = DMUS_OBJ_CLASS;
hr = IDirectMusicObject_SetDescriptor(dmo, &desc);
- ok(hr == S_FALSE , "IDirectMusicObject_SetDescriptor failed: %08x\n", hr);
- ok(!desc.dwValidData, "dwValidData wasn't cleared: %08x\n", desc.dwValidData);
+ ok(hr == S_FALSE , "IDirectMusicObject_SetDescriptor failed: %#lx\n", hr);
+ ok(!desc.dwValidData, "dwValidData wasn't cleared: %#lx\n", desc.dwValidData);
desc.dwValidData = DMUS_OBJ_CLASS;
desc.guidClass = CLSID_DirectMusicSegment;
hr = IDirectMusicObject_SetDescriptor(dmo, &desc);
- ok(hr == S_FALSE && !desc.dwValidData, "IDirectMusicObject_SetDescriptor failed: %08x\n", hr);
+ ok(hr == S_FALSE && !desc.dwValidData, "IDirectMusicObject_SetDescriptor failed: %#lx\n", hr);
hr = IDirectMusicObject_GetDescriptor(dmo, &desc);
- ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr);
+ ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %#lx\n", hr);
ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection),
"guidClass changed, should be CLSID_DirectMusicCollection\n");
/* Unimplemented IPersistStream methods*/
hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps);
- ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr);
hr = IPersistStream_GetClassID(ps, &class);
- ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr);
+ ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %#lx\n", hr);
hr = IPersistStream_IsDirty(ps);
- ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr);
+ ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr);
hr = IPersistStream_GetSizeMax(ps, &size);
- ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr);
+ ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr);
hr = IPersistStream_Save(ps, NULL, TRUE);
- ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr);
+ ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr);
while (IDirectMusicCollection_Release(dmc));
}
@@ -505,16 +505,16 @@ static IDirectMusicPort *create_synth_port(IDirectMusic **dmusic)
HRESULT hr;
hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (void **)dmusic);
- ok(hr == S_OK, "Cannot create DirectMusic object: %#x\n", hr);
+ ok(hr == S_OK, "Cannot create DirectMusic object: %#lx\n", hr);
params.dwSize = sizeof(params);
params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS;
params.dwChannelGroups = 1;
params.dwAudioChannels = 2;
hr = IDirectMusic_SetDirectSound(*dmusic, NULL, NULL);
- ok(hr == S_OK, "IDirectMusic_SetDirectSound failed: %#x\n", hr);
+ ok(hr == S_OK, "IDirectMusic_SetDirectSound failed: %#lx\n", hr);
hr = IDirectMusic_CreatePort(*dmusic, &GUID_NULL, ¶ms, &port, NULL);
- ok(hr == S_OK, "IDirectMusic_CreatePort failed: %#x\n", hr);
+ ok(hr == S_OK, "IDirectMusic_CreatePort failed: %#lx\n", hr);
return port;
}
@@ -535,35 +535,35 @@ static void test_COM_synthport(void)
/* Same refcount for all DirectMusicPort interfaces */
refcount = IDirectMusicPort_AddRef(port);
- ok(refcount == 2, "refcount == %u, expected 2\n", refcount);
+ ok(refcount == 2, "refcount == %lu, expected 2\n", refcount);
hr = IDirectMusicPort_QueryInterface(port, &IID_IDirectMusicPortDownload, (void**)&dmpd);
- ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPortDownload failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPortDownload failed: %#lx\n", hr);
refcount = IDirectMusicPortDownload_AddRef(dmpd);
- ok(refcount == 4, "refcount == %u, expected 4\n", refcount);
+ ok(refcount == 4, "refcount == %lu, expected 4\n", refcount);
IDirectMusicPortDownload_Release(dmpd);
hr = IDirectMusicPort_QueryInterface(port, &IID_IKsControl, (void**)&iksc);
- ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %#lx\n", hr);
refcount = IKsControl_AddRef(iksc);
- ok(refcount == 5, "refcount == %u, expected 5\n", refcount);
+ ok(refcount == 5, "refcount == %lu, expected 5\n", refcount);
IKsControl_Release(iksc);
hr = IDirectMusicPort_QueryInterface(port, &IID_IUnknown, (void**)&unk);
- ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);
+ ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr);
refcount = IUnknown_AddRef(unk);
- ok(refcount == 6, "refcount == %u, expected 6\n", refcount);
+ ok(refcount == 6, "refcount == %lu, expected 6\n", refcount);
IUnknown_Release(unk);
/* Unsupported interface */
hr = IDirectMusicPort_QueryInterface(port, &IID_IDirectMusicThru, (void**)&dmt);
- todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicThru failed: %08x\n", hr);
+ todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicThru failed: %#lx\n", hr);
hr = IDirectMusicPort_QueryInterface(port, &IID_IReferenceClock, (void**)&clock);
- ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %08x\n", hr);
+ ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %#lx\n", hr);
while (IDirectMusicPort_Release(port));
refcount = IDirectMusic_Release(dmusic);
- ok(!refcount, "Got outstanding refcount %d.\n", refcount);
+ ok(!refcount, "Got outstanding refcount %ld.\n", refcount);
}
struct chunk {
@@ -679,12 +679,12 @@ static void test_parsedescriptor(void)
hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectMusicObject, (void **)&dmo);
- ok(hr == S_OK, "DirectMusicCollection create failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "DirectMusicCollection create failed: %#lx, expected S_OK\n", hr);
/* Nothing loaded */
hr = IDirectMusicObject_GetDescriptor(dmo, &desc);
- ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr);
- ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n",
+ ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr);
+ ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_OBJECT\n",
desc.dwValidData);
ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection),
"Got class guid %s, expected CLSID_DirectMusicCollection\n",
@@ -694,8 +694,8 @@ static void test_parsedescriptor(void)
stream = gen_riff_stream(empty);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n",
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
+ ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n",
desc.dwValidData);
ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection),
"Got class guid %s, expected CLSID_DirectMusicCollection\n",
@@ -705,31 +705,31 @@ static void test_parsedescriptor(void)
/* NULL pointers */
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc);
- ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr);
+ ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr);
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL);
- ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr);
+ ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr);
/* Wrong form */
empty[1] = DMUS_FOURCC_CONTAINER_FORM;
stream = gen_riff_stream(empty);
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == DMUS_E_NOTADLSCOL, "ParseDescriptor failed: %08x, expected DMUS_E_NOTADLSCOL\n", hr);
+ ok(hr == DMUS_E_NOTADLSCOL, "ParseDescriptor failed: %#lx, expected DMUS_E_NOTADLSCOL\n", hr);
IStream_Release(stream);
/* All desc chunks */
stream = gen_riff_stream(alldesc);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_VERSION),
- "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_VERSION\n", desc.dwValidData);
+ "Got valid data %#lx, expected DMUS_OBJ_CLASS | DMUS_OBJ_VERSION\n", desc.dwValidData);
ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection),
"Got class guid %s, expected CLSID_DirectMusicCollection\n",
wine_dbgstr_guid(&desc.guidClass));
ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n",
wine_dbgstr_guid(&desc.guidClass));
ok(desc.vVersion.dwVersionMS == 5 && desc.vVersion.dwVersionLS == 8,
- "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS,
+ "Got version %lu.%lu, expected 5.8\n", desc.vVersion.dwVersionMS,
desc.vVersion.dwVersionLS);
IStream_Release(stream);
@@ -738,8 +738,8 @@ static void test_parsedescriptor(void)
stream = gen_riff_stream(inam);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
- ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n",
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
+ ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n",
desc.dwValidData);
IStream_Release(stream);
@@ -748,9 +748,9 @@ static void test_parsedescriptor(void)
stream = gen_riff_stream(inam);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME),
- "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData);
+ "Got valid data %#lx, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData);
ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n",
wine_dbgstr_w(desc.wszName));
IStream_Release(stream);
@@ -759,9 +759,9 @@ static void test_parsedescriptor(void)
stream = gen_riff_stream(dupes);
memset(&desc, 0, sizeof(desc));
hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc);
- ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
+ ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr);
ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION),
- "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n",
+ "Got valid data %#lx, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n",
desc.dwValidData);
ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n",
wine_dbgstr_w(desc.wszName));
@@ -785,29 +785,29 @@ static void test_master_clock(void)
GUID guid;
hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (void **)&dmusic);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
hr = IDirectMusic_GetMasterClock(dmusic, NULL, NULL);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
memset(&guid, 0xcc, sizeof(guid));
hr = IDirectMusic_GetMasterClock(dmusic, &guid, NULL);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid));
clock = (IReferenceClock *)0xdeadbeef;
hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
ok(clock && clock != (IReferenceClock *)0xdeadbeef, "Got clock %p.\n", clock);
hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock2);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
ok(clock2 == clock, "Clocks didn't match.\n");
IReferenceClock_Release(clock2);
memset(&guid, 0xcc, sizeof(guid));
hr = IDirectMusic_GetMasterClock(dmusic, &guid, &clock2);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid));
ok(clock2 == clock, "Clocks didn't match.\n");
IReferenceClock_Release(clock2);
@@ -815,59 +815,59 @@ static void test_master_clock(void)
QueryPerformanceFrequency(&freq);
QueryPerformanceCounter(&counter);
hr = IReferenceClock_GetTime(clock, &time1);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
time2 = counter.QuadPart * 10000000.0 / freq.QuadPart;
ok(compare_time(time1, time2, 20 * 10000), "Expected about %s, got %s.\n",
wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1));
hr = IReferenceClock_GetTime(clock, &time2);
- ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr);
+ ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#lx.\n", hr);
Sleep(100);
hr = IReferenceClock_GetTime(clock, &time2);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n",
wine_dbgstr_longlong(time1 + 100 * 10000), wine_dbgstr_longlong(time2));
hr = IReferenceClock_AdviseTime(clock, 0, 0, NULL, &cookie);
- ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr);
+ ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr);
hr = IReferenceClock_AdvisePeriodic(clock, 0, 0, NULL, &cookie);
- ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr);
+ ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr);
hr = IReferenceClock_Unadvise(clock, 0);
- ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr);
+ ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr);
IReferenceClock_Release(clock);
hr = IDirectMusic_EnumMasterClock(dmusic, 0, NULL);
- todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+ todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);
memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO));
clock_info.dwSize = sizeof(DMUS_CLOCKINFO7);
hr = IDirectMusic_EnumMasterClock(dmusic, 0, &clock_info);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType);
ok(IsEqualGUID(&clock_info.guidClock, &guid_system_clock), "Got guid %s.\n",
wine_dbgstr_guid(&clock_info.guidClock));
- ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags);
+ ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#lx.\n", clock_info.dwFlags);
memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO));
clock_info.dwSize = sizeof(DMUS_CLOCKINFO7);
hr = IDirectMusic_EnumMasterClock(dmusic, 1, &clock_info);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(hr == S_OK, "Got hr %#lx.\n", hr);
ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType);
ok(IsEqualGUID(&clock_info.guidClock, &guid_dsound_clock), "Got guid %s.\n",
wine_dbgstr_guid(&clock_info.guidClock));
- ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags);
+ ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#lx.\n", clock_info.dwFlags);
memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO));
clock_info.dwSize = sizeof(DMUS_CLOCKINFO7);
hr = IDirectMusic_EnumMasterClock(dmusic, 2, &clock_info);
- ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
ref = IDirectMusic_Release(dmusic);
- ok(!ref, "Got outstanding refcount %d.\n", ref);
+ ok(!ref, "Got outstanding refcount %ld.\n", ref);
}
static void test_synthport(void)
@@ -887,39 +887,39 @@ static void test_synthport(void)
desc.cbBuffer = 1023;
memcpy(&desc.guidBufferFormat, &GUID_NULL, sizeof(GUID));
hr = IDirectMusic_CreateMusicBuffer(dmusic, &desc, &buf, NULL);
- ok(hr == S_OK, "IDirectMusic_CreateMusicBuffer failed: %#x\n", hr);
+ ok(hr == S_OK, "IDirectMusic_CreateMusicBuffer failed: %#lx\n", hr);
/* Unsupported methods */
hr = IDirectMusicPort_Read(port, NULL);
- todo_wine ok(hr == E_POINTER, "Read returned: %#x\n", hr);
+ todo_wine ok(hr == E_POINTER, "Read returned: %#lx\n", hr);
hr = IDirectMusicPort_Read(port, buf);
- ok(hr == E_NOTIMPL, "Read returned: %#x\n", hr);
+ ok(hr == E_NOTIMPL, "Read returned: %#lx\n", hr);
hr = IDirectMusicPort_SetReadNotificationHandle(port, NULL);
- ok(hr == E_NOTIMPL, "SetReadNotificationHandle returned: %#x\n", hr);
+ ok(hr == E_NOTIMPL, "SetReadNotificationHandle returned: %#lx\n", hr);
hr = IDirectMusicPort_Compact(port);
- ok(hr == E_NOTIMPL, "Compact returned: %#x\n", hr);
+ ok(hr == E_NOTIMPL, "Compact returned: %#lx\n", hr);
/* GetCaps */
hr = IDirectMusicPort_GetCaps(port, NULL);
- ok(hr == E_INVALIDARG, "GetCaps failed: %#x\n", hr);
+ ok(hr == E_INVALIDARG, "GetCaps failed: %#lx\n", hr);
memset(&caps, 0, sizeof(caps));
hr = IDirectMusicPort_GetCaps(port, &caps);
- ok(hr == E_INVALIDARG, "GetCaps failed: %#x\n", hr);
+ ok(hr == E_INVALIDARG, "GetCaps failed: %#lx\n", hr);
caps.dwSize = sizeof(caps);
hr = IDirectMusicPort_GetCaps(port, &caps);
- ok(hr == S_OK, "GetCaps failed: %#x\n", hr);
- ok(caps.dwSize == sizeof(caps), "dwSize was modified to %d\n", caps.dwSize);
+ ok(hr == S_OK, "GetCaps failed: %#lx\n", hr);
+ ok(caps.dwSize == sizeof(caps), "dwSize was modified to %ld\n", caps.dwSize);
ok(IsEqualGUID(&caps.guidPort, &CLSID_DirectMusicSynth), "Expected port guid CLSID_DirectMusicSynth, got %s\n",
wine_dbgstr_guid(&caps.guidPort));
- ok(caps.dwClass == DMUS_PC_OUTPUTCLASS, "Got wrong dwClass: %#x\n", caps.dwClass);
- ok(caps.dwType == DMUS_PORT_USER_MODE_SYNTH, "Got wrong dwType: %#x\n", caps.dwType);
+ ok(caps.dwClass == DMUS_PC_OUTPUTCLASS, "Got wrong dwClass: %#lx\n", caps.dwClass);
+ ok(caps.dwType == DMUS_PORT_USER_MODE_SYNTH, "Got wrong dwType: %#lx\n", caps.dwType);
ok(caps.dwFlags == (DMUS_PC_AUDIOPATH|DMUS_PC_DIRECTSOUND|DMUS_PC_DLS|DMUS_PC_DLS2|DMUS_PC_SOFTWARESYNTH|
- DMUS_PC_WAVE), "Unexpected dwFlags returned: %#x\n", caps.dwFlags);
- ok(caps.dwMemorySize == DMUS_PC_SYSTEMMEMORY, "Got dwMemorySize: %#x\n", caps.dwMemorySize);
- ok(caps.dwMaxChannelGroups == 1000, "Got dwMaxChannelGroups: %d\n", caps.dwMaxChannelGroups);
- ok(caps.dwMaxVoices == 1000, "Got dwMaxVoices: %d\n", caps.dwMaxVoices);
- ok(caps.dwMaxAudioChannels == 2, "Got dwMaxAudioChannels: %#x\n", caps.dwMaxAudioChannels);
- ok(caps.dwEffectFlags == DMUS_EFFECT_REVERB, "Unexpected dwEffectFlags returned: %#x\n", caps.dwEffectFlags);
+ DMUS_PC_WAVE), "Unexpected dwFlags returned: %#lx\n", caps.dwFlags);
+ ok(caps.dwMemorySize == DMUS_PC_SYSTEMMEMORY, "Got dwMemorySize: %#lx\n", caps.dwMemorySize);
+ ok(caps.dwMaxChannelGroups == 1000, "Got dwMaxChannelGroups: %ld\n", caps.dwMaxChannelGroups);
+ ok(caps.dwMaxVoices == 1000, "Got dwMaxVoices: %ld\n", caps.dwMaxVoices);
+ ok(caps.dwMaxAudioChannels == 2, "Got dwMaxAudioChannels: %#lx\n", caps.dwMaxAudioChannels);
+ ok(caps.dwEffectFlags == DMUS_EFFECT_REVERB, "Unexpected dwEffectFlags returned: %#lx\n", caps.dwEffectFlags);
trace("Port wszDescription: %s\n", wine_dbgstr_w(caps.wszDescription));
IDirectMusicPort_Release(port);
--
2.34.1
1
0
03 Feb '22
This was already passed through for linking, and for spec.o files,
but was overlooked when implementing -Wl,--out-implib
Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com>
---
tools/winegcc/winegcc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 0aafca1271a..aa8c63f5457 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1408,6 +1408,8 @@ static void build(struct options* opts)
strarray_add( &implib_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " )));
tool = build_tool_name( opts, TOOL_LD );
strarray_add( &implib_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " )));
+ if (opts->force_pointer_size)
+ strarray_add(&implib_args, strmake("-m%u", 8 * opts->force_pointer_size ));
strarray_add(&implib_args, "--implib");
strarray_add(&implib_args, "-o");
--
2.34.1
2
2
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/d2d1/tests/Makefile.in | 1 -
dlls/d2d1/tests/d2d1.c | 1341 +++++++++++++++++------------------
2 files changed, 666 insertions(+), 676 deletions(-)
diff --git a/dlls/d2d1/tests/Makefile.in b/dlls/d2d1/tests/Makefile.in
index cd8701395b2e..5eeb815e07fb 100644
--- a/dlls/d2d1/tests/Makefile.in
+++ b/dlls/d2d1/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = d2d1.dll
IMPORTS = d2d1 d3d10_1 d3d11 dwrite dxguid uuid user32 advapi32 ole32 gdi32
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 003aad605054..2ac48e026c32 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -343,12 +343,12 @@ static void get_d3d10_surface_readback(IDXGISurface *surface, struct resource_re
HRESULT hr;
hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&device);
- ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&src_resource);
- ok(SUCCEEDED(hr), "Failed to query resource interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface_GetDesc(surface, &surface_desc);
- ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
texture_desc.Width = surface_desc.Width;
texture_desc.Height = surface_desc.Height;
texture_desc.MipLevels = 1;
@@ -360,7 +360,7 @@ static void get_d3d10_surface_readback(IDXGISurface *surface, struct resource_re
texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ;
texture_desc.MiscFlags = 0;
hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D10Texture2D **)&rb->u.d3d10_resource);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
rb->width = texture_desc.Width;
rb->height = texture_desc.Height;
@@ -370,7 +370,7 @@ static void get_d3d10_surface_readback(IDXGISurface *surface, struct resource_re
ID3D10Device_Release(device);
hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->u.d3d10_resource, 0, D3D10_MAP_READ, 0, &map_desc);
- ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
rb->pitch = map_desc.RowPitch;
rb->data = map_desc.pData;
@@ -387,12 +387,12 @@ static void get_d3d11_surface_readback(IDXGISurface *surface, struct resource_re
HRESULT hr;
hr = IDXGISurface_GetDevice(surface, &IID_ID3D11Device, (void **)&device);
- ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Resource, (void **)&src_resource);
- ok(SUCCEEDED(hr), "Failed to query resource interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface_GetDesc(surface, &surface_desc);
- ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
texture_desc.Width = surface_desc.Width;
texture_desc.Height = surface_desc.Height;
texture_desc.MipLevels = 1;
@@ -404,7 +404,7 @@ static void get_d3d11_surface_readback(IDXGISurface *surface, struct resource_re
texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
texture_desc.MiscFlags = 0;
hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->u.d3d11_resource);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
rb->width = texture_desc.Width;
rb->height = texture_desc.Height;
@@ -415,7 +415,7 @@ static void get_d3d11_surface_readback(IDXGISurface *surface, struct resource_re
ID3D11Device_Release(device);
hr = ID3D11DeviceContext_Map(context, rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc);
- ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID3D11DeviceContext_Release(context);
rb->pitch = map_desc.RowPitch;
@@ -556,7 +556,7 @@ static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp,
hash_size = sizeof(hash_data);
ret = CryptGetHashParam(hash, HP_HASHVAL, hash_data, &hash_size, 0);
ok(ret, "Failed to get hash value.\n");
- ok(hash_size == sizeof(hash_data), "Got unexpected hash size %u.\n", hash_size);
+ ok(hash_size == sizeof(hash_data), "Got unexpected hash size %lu.\n", hash_size);
ret = CryptDestroyHash(hash);
ok(ret, "Failed to destroy hash.\n");
@@ -594,16 +594,16 @@ static BOOL compare_wic_bitmap(IWICBitmap *bitmap, const char *ref_sha1)
BOOL ret;
hr = IWICBitmap_Lock(bitmap, NULL, WICBitmapLockRead, &lock);
- ok(SUCCEEDED(hr), "Failed to lock bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IWICBitmapLock_GetDataPointer(lock, &buffer_size, &data);
- ok(SUCCEEDED(hr), "Failed to get bitmap data, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IWICBitmapLock_GetStride(lock, &stride);
- ok(SUCCEEDED(hr), "Failed to get bitmap stride, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IWICBitmapLock_GetSize(lock, &width, &height);
- ok(SUCCEEDED(hr), "Failed to get bitmap size, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = compare_sha1(data, stride, 4, width, height, ref_sha1);
@@ -862,7 +862,7 @@ static IDXGIDevice *create_device(BOOL d3d11)
ID3D10Device1_Release(d3d10_device);
}
- ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
return device;
}
@@ -886,9 +886,9 @@ static IDXGISwapChain *create_swapchain(IDXGIDevice *device, HWND window, BOOL w
HRESULT hr;
hr = IDXGIDevice_GetAdapter(device, &adapter);
- ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIAdapter_Release(adapter);
desc.BufferDesc.Width = 640;
@@ -908,7 +908,7 @@ static IDXGISwapChain *create_swapchain(IDXGIDevice *device, HWND window, BOOL w
desc.Flags = 0;
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &desc, &swapchain);
- ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDXGIFactory_Release(factory);
return swapchain;
@@ -921,7 +921,7 @@ static IDXGISwapChain *create_d3d10_swapchain(ID3D10Device1 *device, HWND window
HRESULT hr;
hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device);
- ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
swapchain = create_swapchain(dxgi_device, window, windowed);
IDXGIDevice_Release(dxgi_device);
return swapchain;
@@ -935,9 +935,9 @@ static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface,
HRESULT hr;
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, desc, &render_target);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Factory_Release(factory);
return render_target;
@@ -967,7 +967,7 @@ static void release_test_context_(unsigned int line, struct d2d1_test_context *c
ID2D1RenderTarget_GetFactory(ctx->rt, &factory);
ID2D1RenderTarget_Release(ctx->rt);
ref = ID2D1Factory_Release(factory);
- ok_(__FILE__, line)(!ref, "Factory has %u references left.\n", ref);
+ ok_(__FILE__, line)(!ref, "Factory has %lu references left.\n", ref);
IDXGISurface_Release(ctx->surface);
IDXGISwapChain_Release(ctx->swapchain);
@@ -994,7 +994,7 @@ static BOOL init_test_context_(unsigned int line, struct d2d1_test_context *ctx,
ctx->swapchain = create_swapchain(ctx->device, ctx->window, TRUE);
ok_(__FILE__, line)(!!ctx->swapchain, "Failed to create swapchain.\n");
hr = IDXGISwapChain_GetBuffer(ctx->swapchain, 0, &IID_IDXGISurface, (void **)&ctx->surface);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get buffer, hr %#lx.\n", hr);
ctx->rt = create_render_target(ctx->surface, d3d11);
if (!ctx->rt && d3d11)
@@ -1026,7 +1026,7 @@ static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL h
return;
options = ID2D1Bitmap1_GetOptions(bitmap1);
- ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n",
+ ok_(__FILE__, line)(options == expected_options, "Got unexpected bitmap options %#x, expected %#lx.\n",
options, expected_options);
surface = (void *)0xdeadbeef;
@@ -1038,12 +1038,12 @@ static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL h
D2D1_SIZE_U pixel_size;
DWORD bind_flags = 0;
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get bitmap surface, hr %#lx.\n", hr);
ok_(__FILE__, line)(!!surface, "Expected surface instance.\n");
/* Correlate with resource configuration. */
hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get texture pointer, hr %#lx.\n", hr);
ID3D10Texture2D_GetDesc(texture, &desc);
ok_(__FILE__, line)(desc.Usage == 0, "Unexpected usage %#x.\n", desc.Usage);
@@ -1072,7 +1072,7 @@ static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL h
}
else
{
- ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n");
}
@@ -1289,7 +1289,7 @@ static void geometry_sink_check_(unsigned int line, const struct geometry_sink *
"Got unexpected figure %u, segment %u type %#x, expected %#x.\n",
i, j, segment->type, expected_segment->type);
ok_(__FILE__, line)(segment->flags == expected_segment->flags,
- "Got unexpected figure %u, segment %u flags %#x, expected %#x.\n",
+ "Got unexpected figure %u, segment %u flags %#lx, expected %#lx.\n",
i, j, segment->flags, expected_segment->flags);
switch (segment->type)
{
@@ -1480,7 +1480,7 @@ static void test_clip(BOOL d3d11)
ID2D1RenderTarget_PopAxisAlignedClip(rt);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "035a44d4198d6e422e9de6185b5b2c2bac5e33c9");
ok(match, "Surface does not match.\n");
@@ -1546,7 +1546,7 @@ static void test_clip(BOOL d3d11)
ID2D1RenderTarget_PopAxisAlignedClip(rt);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "cb418ec4a7c8407b5e36db06fc6292a06bb8476c");
ok(match, "Surface does not match.\n");
@@ -1590,9 +1590,9 @@ static void test_state_block(BOOL d3d11)
rt = ctx.rt;
ID2D1RenderTarget_GetFactory(rt, &factory);
hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown **)&dwrite_factory);
- ok(SUCCEEDED(hr), "Failed to create dwrite factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDWriteFactory_CreateRenderingParams(dwrite_factory, &text_rendering_params1);
- ok(SUCCEEDED(hr), "Failed to create dwrite rendering params, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IDWriteFactory_Release(dwrite_factory);
drawing_state.antialiasMode = ID2D1RenderTarget_GetAntialiasMode(rt);
@@ -1613,7 +1613,7 @@ static void test_state_block(BOOL d3d11)
ok(!text_rendering_params2, "Got unexpected text rendering params %p.\n", text_rendering_params2);
hr = ID2D1Factory_CreateDrawingStateBlock(factory, NULL, NULL, &state_block);
- ok(SUCCEEDED(hr), "Failed to create drawing state block, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DrawingStateBlock_GetDescription(state_block, &drawing_state);
ok(drawing_state.antialiasMode == D2D1_ANTIALIAS_MODE_PER_PRIMITIVE,
"Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode);
@@ -1635,7 +1635,7 @@ static void test_state_block(BOOL d3d11)
drawing_state.tag2 = 0xbeef;
drawing_state.transform = transform1;
hr = ID2D1Factory_CreateDrawingStateBlock(factory, &drawing_state, text_rendering_params1, &state_block);
- ok(SUCCEEDED(hr), "Failed to create drawing state block, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DrawingStateBlock_GetDescription(state_block, &drawing_state);
ok(drawing_state.antialiasMode == D2D1_ANTIALIAS_MODE_ALIASED,
@@ -1743,7 +1743,7 @@ static void test_state_block(BOOL d3d11)
ID2D1DrawingStateBlock1 *state_block1;
hr = ID2D1DrawingStateBlock_QueryInterface(state_block, &IID_ID2D1DrawingStateBlock1, (void **)&state_block1);
- ok(SUCCEEDED(hr), "Failed to get ID2D1DrawingStateBlock1 interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DrawingStateBlock1_GetDescription(state_block1, &drawing_state1);
ok(drawing_state1.antialiasMode == D2D1_ANTIALIAS_MODE_ALIASED,
@@ -1783,7 +1783,7 @@ static void test_state_block(BOOL d3d11)
ID2D1DrawingStateBlock1_Release(state_block1);
hr = ID2D1Factory1_CreateDrawingStateBlock(factory1, NULL, NULL, &state_block1);
- ok(SUCCEEDED(hr), "Failed to create drawing state block, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DrawingStateBlock1_GetDescription(state_block1, &drawing_state1);
ok(drawing_state1.antialiasMode == D2D1_ANTIALIAS_MODE_PER_PRIMITIVE,
"Got unexpected antialias mode %#x.\n", drawing_state1.antialiasMode);
@@ -1808,7 +1808,7 @@ static void test_state_block(BOOL d3d11)
ID2D1DrawingStateBlock_Release(state_block);
refcount = IDWriteRenderingParams_Release(text_rendering_params1);
- ok(!refcount, "Rendering params %u references left.\n", refcount);
+ ok(!refcount, "Rendering params %lu references left.\n", refcount);
ID2D1Factory_Release(factory);
release_test_context(&ctx);
}
@@ -1835,7 +1835,7 @@ static void test_color_brush(BOOL d3d11)
set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
opacity = ID2D1SolidColorBrush_GetOpacity(brush);
ok(opacity == 1.0f, "Got unexpected opacity %.8e.\n", opacity);
set_matrix_identity(&matrix);
@@ -1856,7 +1856,7 @@ static void test_color_brush(BOOL d3d11)
scale_matrix(&matrix, 2.0f, 2.0f);
brush_desc.transform = matrix;
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, &brush_desc, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
opacity = ID2D1SolidColorBrush_GetOpacity(brush);
ok(opacity == 0.3f, "Got unexpected opacity %.8e.\n", opacity);
ID2D1SolidColorBrush_GetTransform(brush, &tmp_matrix);
@@ -1890,7 +1890,7 @@ static void test_color_brush(BOOL d3d11)
ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)brush);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "6d1218fca5e21fb7e287b3a439d60dbc251f5ceb");
ok(match, "Surface does not match.\n");
@@ -1964,11 +1964,11 @@ static void test_bitmap_brush(BOOL d3d11)
bitmap_desc.dpiX = 96.0f;
bitmap_desc.dpiY = 96.0f;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
image_size = ID2D1Bitmap_GetSize(bitmap);
hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image);
- ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get ID2D1Image, hr %#x.\n", hr);
+ ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Got unexpected hr %#lx.\n", hr);
if (hr == S_OK)
{
ID2D1DeviceContext *context;
@@ -1976,7 +1976,7 @@ static void test_bitmap_brush(BOOL d3d11)
D2D1_RECT_F src_rect;
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f);
@@ -2029,7 +2029,7 @@ static void test_bitmap_brush(BOOL d3d11)
D2D1_COMPOSITE_MODE_SOURCE_OVER);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "95675fbc4a16404c9568d41b14e8f6be64240998");
ok(match, "Surface does not match.\n");
@@ -2041,7 +2041,7 @@ static void test_bitmap_brush(BOOL d3d11)
D2D1_COMPOSITE_MODE_SOURCE_OVER);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "95675fbc4a16404c9568d41b14e8f6be64240998");
ok(match, "Surface does not match.\n");
@@ -2053,7 +2053,7 @@ static void test_bitmap_brush(BOOL d3d11)
/* Creating a brush with a NULL bitmap crashes on Vista, but works fine on
* Windows 7+. */
hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapBrush_GetBitmap(brush, &tmp_bitmap);
ok(tmp_bitmap == bitmap, "Got unexpected bitmap %p, expected %p.\n", tmp_bitmap, bitmap);
ID2D1Bitmap_Release(tmp_bitmap);
@@ -2075,7 +2075,7 @@ static void test_bitmap_brush(BOOL d3d11)
ID2D1BitmapBrush_Release(brush);
hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
translate_matrix(&matrix, 40.0f, 120.0f);
scale_matrix(&matrix, 20.0f, 60.0f);
@@ -2130,7 +2130,7 @@ static void test_bitmap_brush(BOOL d3d11)
D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "f5d039c280fa33ba05496c9883192a34108efbbe");
ok(match, "Surface does not match.\n");
@@ -2148,7 +2148,7 @@ static void test_bitmap_brush(BOOL d3d11)
D2D1_BITMAP_INTERPOLATION_MODE_LINEAR + 1, &src_rect);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "f5d039c280fa33ba05496c9883192a34108efbbe");
ok(match, "Surface does not match.\n");
@@ -2160,7 +2160,7 @@ static void test_bitmap_brush(BOOL d3d11)
D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, &src_rect);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "59043096393570ad800dbcbfdd644394b79493bd");
ok(match, "Surface does not match.\n");
@@ -2189,7 +2189,7 @@ static void test_bitmap_brush(BOOL d3d11)
}
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "b4b775afecdae2d26642001f4faff73663bb8b31");
ok(match, "Surface does not match.\n");
@@ -2197,7 +2197,7 @@ static void test_bitmap_brush(BOOL d3d11)
bitmap_desc.dpiX = 96.0f / 20.0f;
bitmap_desc.dpiY = 96.0f / 60.0f;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapBrush_SetBitmap(brush, bitmap);
ID2D1RenderTarget_BeginDraw(rt);
@@ -2217,14 +2217,14 @@ static void test_bitmap_brush(BOOL d3d11)
set_rect(&dst_rect, -1.0f, -1.0f, 1.0f, 1.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &dst_rect, &rectangle_geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
translate_matrix(&matrix, 240.0f, 720.0f);
scale_matrix(&matrix, 40.0f, 120.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)rectangle_geometry,
&matrix, &transformed_geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RectangleGeometry_Release(rectangle_geometry);
set_matrix_identity(&matrix);
@@ -2238,7 +2238,7 @@ static void test_bitmap_brush(BOOL d3d11)
ID2D1Factory_Release(factory);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "cf7b90ba7b139fdfbe9347e1907d635cfb4ed197");
ok(match, "Surface does not match.\n");
@@ -2287,7 +2287,7 @@ static void test_bitmap_brush(BOOL d3d11)
ID2D1BitmapBrush_Release(brush);
refcount = ID2D1Bitmap_Release(bitmap);
- ok(!refcount, "Bitmap has %u references left.\n", refcount);
+ ok(!refcount, "Bitmap has %lu references left.\n", refcount);
release_test_context(&ctx);
}
@@ -2357,12 +2357,12 @@ static void test_linear_brush(BOOL d3d11)
hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops),
D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient);
- ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&gradient_properties.startPoint, 320.0f, 0.0f);
set_point(&gradient_properties.endPoint, 0.0f, 960.0f);
hr = ID2D1RenderTarget_CreateLinearGradientBrush(rt, &gradient_properties, NULL, gradient, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
opacity = ID2D1LinearGradientBrush_GetOpacity(brush);
ok(opacity == 1.0f, "Got unexpected opacity %.8e.\n", opacity);
@@ -2389,7 +2389,7 @@ static void test_linear_brush(BOOL d3d11)
ID2D1RenderTarget_FillRectangle(rt, &r, (ID2D1Brush *)brush);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
get_surface_readback(&ctx, &rb);
for (i = 0; i < ARRAY_SIZE(test1); ++i)
@@ -2398,7 +2398,7 @@ static void test_linear_brush(BOOL d3d11)
colour = get_readback_colour(&rb, test1[i].x, test1[i].y);
ok(compare_colour(colour, test1[i].colour, 1),
- "Got unexpected colour 0x%08x at position {%u, %u}.\n",
+ "Got unexpected colour 0x%08lx at position {%u, %u}.\n",
colour, test1[i].x, test1[i].y);
}
release_resource_readback(&rb);
@@ -2439,14 +2439,14 @@ static void test_linear_brush(BOOL d3d11)
set_rect(&r, -1.0f, -1.0f, 1.0f, 1.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &r, &rectangle_geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
translate_matrix(&matrix, 228.5f, 714.0f);
scale_matrix(&matrix, 40.0f, 120.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)rectangle_geometry,
&matrix, &transformed_geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RectangleGeometry_Release(rectangle_geometry);
set_matrix_identity(&matrix);
@@ -2462,7 +2462,7 @@ static void test_linear_brush(BOOL d3d11)
ID2D1Factory_Release(factory);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
get_surface_readback(&ctx, &rb);
for (i = 0; i < ARRAY_SIZE(test2); ++i)
@@ -2471,14 +2471,14 @@ static void test_linear_brush(BOOL d3d11)
colour = get_readback_colour(&rb, test2[i].x, test2[i].y);
ok(compare_colour(colour, test2[i].colour, 1),
- "Got unexpected colour 0x%08x at position {%u, %u}.\n",
+ "Got unexpected colour 0x%08lx at position {%u, %u}.\n",
colour, test2[i].x, test2[i].y);
}
release_resource_readback(&rb);
ID2D1LinearGradientBrush_Release(brush);
refcount = ID2D1GradientStopCollection_Release(gradient);
- ok(!refcount, "Gradient has %u references left.\n", refcount);
+ ok(!refcount, "Gradient has %lu references left.\n", refcount);
release_test_context(&ctx);
}
@@ -2548,14 +2548,14 @@ static void test_radial_brush(BOOL d3d11)
hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops),
D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient);
- ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&gradient_properties.center, 160.0f, 480.0f);
set_point(&gradient_properties.gradientOriginOffset, 40.0f, -120.0f);
gradient_properties.radiusX = 160.0f;
gradient_properties.radiusY = 480.0f;
hr = ID2D1RenderTarget_CreateRadialGradientBrush(rt, &gradient_properties, NULL, gradient, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
f = ID2D1RadialGradientBrush_GetOpacity(brush);
ok(f == 1.0f, "Got unexpected opacity %.8e.\n", f);
@@ -2586,7 +2586,7 @@ static void test_radial_brush(BOOL d3d11)
ID2D1RenderTarget_FillRectangle(rt, &r, (ID2D1Brush *)brush);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
get_surface_readback(&ctx, &rb);
for (i = 0; i < ARRAY_SIZE(test1); ++i)
@@ -2595,7 +2595,7 @@ static void test_radial_brush(BOOL d3d11)
colour = get_readback_colour(&rb, test1[i].x, test1[i].y);
ok(compare_colour(colour, test1[i].colour, 1),
- "Got unexpected colour 0x%08x at position {%u, %u}.\n",
+ "Got unexpected colour 0x%08lx at position {%u, %u}.\n",
colour, test1[i].x, test1[i].y);
}
release_resource_readback(&rb);
@@ -2636,14 +2636,14 @@ static void test_radial_brush(BOOL d3d11)
set_rect(&r, -1.0f, -1.0f, 1.0f, 1.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &r, &rectangle_geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
translate_matrix(&matrix, 228.5f, 714.0f);
scale_matrix(&matrix, 40.0f, 120.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)rectangle_geometry,
&matrix, &transformed_geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RectangleGeometry_Release(rectangle_geometry);
set_matrix_identity(&matrix);
@@ -2661,7 +2661,7 @@ static void test_radial_brush(BOOL d3d11)
ID2D1Factory_Release(factory);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
get_surface_readback(&ctx, &rb);
for (i = 0; i < ARRAY_SIZE(test2); ++i)
@@ -2670,14 +2670,14 @@ static void test_radial_brush(BOOL d3d11)
colour = get_readback_colour(&rb, test2[i].x, test2[i].y);
ok(compare_colour(colour, test2[i].colour, 1),
- "Got unexpected colour 0x%08x at position {%u, %u}.\n",
+ "Got unexpected colour 0x%08lx at position {%u, %u}.\n",
colour, test2[i].x, test2[i].y);
}
release_resource_readback(&rb);
ID2D1RadialGradientBrush_Release(brush);
refcount = ID2D1GradientStopCollection_Release(gradient);
- ok(!refcount, "Gradient has %u references left.\n", refcount);
+ ok(!refcount, "Gradient has %lu references left.\n", refcount);
release_test_context(&ctx);
}
@@ -3161,163 +3161,163 @@ static void test_path_geometry(BOOL d3d11)
ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED);
set_color(&color, 0.890f, 0.851f, 0.600f, 1.0f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Close() when closed. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!count, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!count, "Got unexpected segment count %u.\n", count);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!count, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!count, "Got unexpected segment count %u.\n", count);
ID2D1PathGeometry_Release(geometry);
/* Open() when closed. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!count, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!count, "Got unexpected segment count %u.\n", count);
ID2D1PathGeometry_Release(geometry);
/* Open() when open. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &tmp_sink);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!count, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!count, "Got unexpected segment count %u.\n", count);
ID2D1PathGeometry_Release(geometry);
/* BeginFigure() without EndFigure(). */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
/* EndFigure() without BeginFigure(). */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
/* BeginFigure()/EndFigure() mismatch. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
ID2D1PathGeometry_Release(geometry);
/* AddLine() outside BeginFigure()/EndFigure(). */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_AddLine(sink, point);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_AddLine(sink, point);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
/* Empty figure. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 123.0f, 456.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 1, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 1, "Got unexpected segment count %u.\n", count);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 123.0f, 456.0f, 123.0f, 456.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3326,7 +3326,7 @@ static void test_path_geometry(BOOL d3d11)
translate_matrix(&matrix, 80.0f, 640.0f);
scale_matrix(&matrix, 2.0f, 0.5f);
hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 326.0f, 868.0f, 326.0f, 868.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3335,9 +3335,9 @@ static void test_path_geometry(BOOL d3d11)
/* Degenerate figure. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 123.0f, 456.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
quadratic_to(sink, 123.0f, 456.0f, 123.0f, 456.0f);
@@ -3345,52 +3345,52 @@ static void test_path_geometry(BOOL d3d11)
quadratic_to(sink, 123.0f, 456.0f, 123.0f, 456.0f);
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 1, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 4, "Got unexpected segment count %u.\n", count);
ID2D1PathGeometry_Release(geometry);
/* Close right after Open(). */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Not open yet. */
set_rect(&rect, 1.0f, 2.0f, 3.0f, 4.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect);
- ok(hr == D2DERR_WRONG_STATE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 1.0f, 2.0f, 3.0f, 4.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Open, not closed. */
set_rect(&rect, 1.0f, 2.0f, 3.0f, 4.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect);
- ok(hr == D2DERR_WRONG_STATE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 1.0f, 2.0f, 3.0f, 4.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 0, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 0, "Got unexpected segment count %u.\n", count);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(rect.left > rect.right && rect.top > rect.bottom,
"Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom);
@@ -3399,7 +3399,7 @@ static void test_path_geometry(BOOL d3d11)
scale_matrix(&matrix, 10.0f, 20.0f);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(rect.left > rect.right && rect.top > rect.bottom,
"Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom);
@@ -3407,17 +3407,17 @@ static void test_path_geometry(BOOL d3d11)
/* GetBounds() with bezier segments. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
fill_geometry_sink_bezier(sink, 0);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 5.0f, 20.0f, 75.0f, 752.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3427,7 +3427,7 @@ static void test_path_geometry(BOOL d3d11)
scale_matrix(&matrix, 2.0f, 0.5f);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 90.0f, 650.0f, 230.0f, 1016.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3436,17 +3436,17 @@ static void test_path_geometry(BOOL d3d11)
/* GetBounds() with bezier segments and some hollow components. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
fill_geometry_sink_bezier(sink, 2);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 5.0f, 472.0f, 75.0f, 752.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3456,7 +3456,7 @@ static void test_path_geometry(BOOL d3d11)
scale_matrix(&matrix, 2.0f, 0.5f);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 90.0f, 876.0f, 230.0f, 1016.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3465,17 +3465,17 @@ static void test_path_geometry(BOOL d3d11)
/* GetBounds() with bezier segments and all hollow components. */
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
fill_geometry_sink_bezier(sink, 4);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3485,7 +3485,7 @@ static void test_path_geometry(BOOL d3d11)
scale_matrix(&matrix, 2.0f, 0.5f);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3493,20 +3493,20 @@ static void test_path_geometry(BOOL d3d11)
ID2D1PathGeometry_Release(geometry);
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* The fillmode that's used is the last one set before the sink is closed. */
ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING);
fill_geometry_sink(sink, 0);
ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_ALTERNATE);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 6, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Intersections don't create extra segments. */
ok(count == 44, "Got unexpected segment count %u.\n", count);
ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING);
@@ -3515,13 +3515,13 @@ static void test_path_geometry(BOOL d3d11)
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 6, &expected_figures[0], 0);
geometry_sink_cleanup(&simplify_sink);
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 6, &expected_figures[0], 0);
geometry_sink_cleanup(&simplify_sink);
@@ -3529,12 +3529,12 @@ static void test_path_geometry(BOOL d3d11)
translate_matrix(&matrix, 80.0f, 640.0f);
scale_matrix(&matrix, 1.0f, -1.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry);
- ok(SUCCEEDED(hr), "Failed to create transformed geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_init(&simplify_sink);
hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 6, &expected_figures[6], 0);
geometry_sink_cleanup(&simplify_sink);
@@ -3549,7 +3549,7 @@ static void test_path_geometry(BOOL d3d11)
geometry_sink_init(&simplify_sink);
hr = ID2D1Geometry_Simplify(tmp_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
&tmp_matrix, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 6, &expected_figures[6], 0);
geometry_sink_cleanup(&simplify_sink);
ID2D1Geometry_Release(tmp_geometry);
@@ -3560,7 +3560,7 @@ static void test_path_geometry(BOOL d3d11)
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry, (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "3aace1b22aae111cb577614fed16e4eb1650dba5");
ok(match, "Surface does not match.\n");
@@ -3568,13 +3568,13 @@ static void test_path_geometry(BOOL d3d11)
set_point(&point, 94.0f, 620.0f);
contains = TRUE;
hr = ID2D1TransformedGeometry_FillContainsPoint(transformed_geometry, point, NULL, 0.0f, &contains);
- ok(hr == S_OK, "FillContainsPoint failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!contains, "Got unexpected contains %#x.\n", contains);
set_point(&point, 95.0f, 620.0f);
contains = FALSE;
hr = ID2D1TransformedGeometry_FillContainsPoint(transformed_geometry, point, NULL, 0.0f, &contains);
- ok(hr == S_OK, "FillContainsPoint failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(contains == TRUE, "Got unexpected contains %#x.\n", contains);
/* With transformation matrix. */
@@ -3583,31 +3583,31 @@ static void test_path_geometry(BOOL d3d11)
set_point(&point, 85.0f, 620.0f);
contains = FALSE;
hr = ID2D1TransformedGeometry_FillContainsPoint(transformed_geometry, point, &matrix, 0.0f, &contains);
- ok(hr == S_OK, "FillContainsPoint failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(contains == TRUE, "Got unexpected contains %#x.\n", contains);
ID2D1TransformedGeometry_Release(transformed_geometry);
ID2D1PathGeometry_Release(geometry);
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
fill_geometry_sink(sink, 0);
ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 6, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 44, "Got unexpected segment count %u.\n", count);
ID2D1GeometrySink_Release(sink);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 5.0f, 20.0f, 235.0f, 300.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3618,7 +3618,7 @@ static void test_path_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / 4.0f);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, -3.17192993e+02f, 8.71231079e+01f, 4.04055908e+02f, 6.17453125e+02f, 1);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3626,7 +3626,7 @@ static void test_path_geometry(BOOL d3d11)
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_WINDING, 6, &expected_figures[0], 0);
geometry_sink_cleanup(&simplify_sink);
@@ -3634,50 +3634,50 @@ static void test_path_geometry(BOOL d3d11)
translate_matrix(&matrix, 320.0f, 320.0f);
scale_matrix(&matrix, -1.0f, 1.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry);
- ok(SUCCEEDED(hr), "Failed to create transformed geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry, (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "bfb40a1f007694fa07dbd3b854f3f5d9c3e1d76b");
ok(match, "Surface does not match.\n");
ID2D1TransformedGeometry_Release(transformed_geometry);
ID2D1PathGeometry_Release(geometry);
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
fill_geometry_sink_bezier(sink, 0);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 4, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 20, "Got unexpected segment count %u.\n", count);
ID2D1GeometrySink_Release(sink);
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 4, &expected_figures[12], 1);
geometry_sink_cleanup(&simplify_sink);
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 100.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 4, &expected_figures[20], 1);
geometry_sink_cleanup(&simplify_sink);
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 10.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 4, &expected_figures[24], 1);
geometry_sink_cleanup(&simplify_sink);
@@ -3687,12 +3687,12 @@ static void test_path_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / 4.0f);
scale_matrix(&matrix, 2.0f, 0.5f);
hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry);
- ok(SUCCEEDED(hr), "Failed to create transformed geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_init(&simplify_sink);
hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 4, &expected_figures[16], 4);
geometry_sink_cleanup(&simplify_sink);
@@ -3701,7 +3701,7 @@ static void test_path_geometry(BOOL d3d11)
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry, (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 64,
"7xoCngECngECngECngECngECngECngECnQEEnAEEnAEEnAEEnAEEmwEGmgEGmgEGmgEGmQEImAEI"
"lAEECASLAQgKCIEBDQoMew8KD3YQDBByEgwSbhMOEmwUDhRpFBAUZxUQFWUVEhVjFhIWYRYUFl8X"
@@ -3750,37 +3750,37 @@ static void test_path_geometry(BOOL d3d11)
ID2D1PathGeometry_Release(geometry);
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
fill_geometry_sink_bezier(sink, 0);
ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 4, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 20, "Got unexpected segment count %u.\n", count);
ID2D1GeometrySink_Release(sink);
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_WINDING, 4, &expected_figures[12], 1);
geometry_sink_cleanup(&simplify_sink);
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 100.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_WINDING, 4, &expected_figures[20], 1);
geometry_sink_cleanup(&simplify_sink);
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 10.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_WINDING, 4, &expected_figures[24], 1);
geometry_sink_cleanup(&simplify_sink);
@@ -3790,14 +3790,14 @@ static void test_path_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / -4.0f);
scale_matrix(&matrix, 2.0f, 0.5f);
hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry);
- ok(SUCCEEDED(hr), "Failed to create transformed geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry, (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 64,
"7xoCngECngECngECngECngECngECngECnQEEnAEEnAEEnAEEnAEEmwEGmgEGmgEGmgEGmQEImAEI"
"lAEQiwEagQEjeyh2LHIwbjNsNmk4ZzplPGM+YUBfQl1DXURbRlpGWUhYSFdKVkpVS1VMVExUTFRM"
@@ -3834,9 +3834,9 @@ static void test_path_geometry(BOOL d3d11)
ID2D1PathGeometry_Release(geometry);
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 40.0f, 20.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
@@ -3851,12 +3851,12 @@ static void test_path_geometry(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_GetFigureCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 2, "Got unexpected figure count %u.\n", count);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 6, "Got unexpected segment count %u.\n", count);
ID2D1GeometrySink_Release(sink);
@@ -3864,40 +3864,40 @@ static void test_path_geometry(BOOL d3d11)
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "a875e68e0cb9c055927b1b50b879f90b24e38470");
ok(match, "Surface does not match.\n");
ID2D1PathGeometry_Release(geometry);
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 40.0f, 20.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
line_to(sink, 75.0f, 300.0f);
line_to(sink, 5.0f, 300.0f);
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count);
- ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(count == 2, "Got unexpected segment count %u.\n", count);
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[28], 1);
geometry_sink_cleanup(&simplify_sink);
ID2D1PathGeometry_Release(geometry);
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 20.0f, 80.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
@@ -3924,12 +3924,12 @@ static void test_path_geometry(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 20.0f, 20.0f, 180.0f, 180.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -3937,7 +3937,7 @@ static void test_path_geometry(BOOL d3d11)
geometry_sink_init(&simplify_sink);
hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 4, &expected_figures[29], 1);
geometry_sink_cleanup(&simplify_sink);
@@ -4010,11 +4010,11 @@ static void test_rectangle_geometry(BOOL d3d11)
};
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RectangleGeometry_GetRect(geometry, &rect2);
match = compare_rect(&rect2, 0.0f, 0.0f, 0.0f, 0.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
@@ -4023,7 +4023,7 @@ static void test_rectangle_geometry(BOOL d3d11)
set_rect(&rect, 50.0f, 0.0f, 40.0f, 100.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RectangleGeometry_GetRect(geometry, &rect2);
match = compare_rect(&rect2, 50.0f, 0.0f, 40.0f, 100.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
@@ -4032,7 +4032,7 @@ static void test_rectangle_geometry(BOOL d3d11)
set_rect(&rect, 0.0f, 100.0f, 40.0f, 50.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RectangleGeometry_GetRect(geometry, &rect2);
match = compare_rect(&rect2, 0.0f, 100.0f, 40.0f, 50.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
@@ -4041,7 +4041,7 @@ static void test_rectangle_geometry(BOOL d3d11)
set_rect(&rect, 50.0f, 100.0f, 40.0f, 50.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RectangleGeometry_GetRect(geometry, &rect2);
match = compare_rect(&rect2, 50.0f, 100.0f, 40.0f, 50.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
@@ -4050,63 +4050,63 @@ static void test_rectangle_geometry(BOOL d3d11)
set_rect(&rect, 0.0f, 0.0f, 10.0f, 20.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Edge. */
contains = FALSE;
set_point(&point, 0.0f, 0.0f);
hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains);
- ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!!contains, "Got wrong hit test result %d.\n", contains);
/* Within tolerance limit around corner. */
contains = TRUE;
set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE, 0.0f);
hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains);
- ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!contains, "Got wrong hit test result %d.\n", contains);
contains = FALSE;
set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE + 0.01f, 0.0f);
hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains);
- ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!!contains, "Got wrong hit test result %d.\n", contains);
contains = TRUE;
set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE - 0.01f, 0.0f);
hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains);
- ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!contains, "Got wrong hit test result %d.\n", contains);
contains = TRUE;
set_point(&point, -D2D1_DEFAULT_FLATTENING_TOLERANCE, -D2D1_DEFAULT_FLATTENING_TOLERANCE);
hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains);
- ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!contains, "Got wrong hit test result %d.\n", contains);
/* Inside. */
contains = FALSE;
set_point(&point, 5.0f, 5.0f);
hr = ID2D1RectangleGeometry_FillContainsPoint(geometry, point, NULL, 0.0f, &contains);
- ok(SUCCEEDED(hr), "FillContainsPoint() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!!contains, "Got wrong hit test result %d.\n", contains);
/* Test GetBounds() and Simplify(). */
hr = ID2D1RectangleGeometry_GetBounds(geometry, NULL, &rect);
- ok(SUCCEEDED(hr), "Failed to get bounds.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 0.0f, 0.0f, 10.0f, 20.0f, 0);
ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
geometry_sink_init(&sink);
hr = ID2D1RectangleGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
NULL, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[0], 0);
geometry_sink_cleanup(&sink);
geometry_sink_init(&sink);
hr = ID2D1RectangleGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[0], 0);
geometry_sink_cleanup(&sink);
@@ -4115,14 +4115,14 @@ static void test_rectangle_geometry(BOOL d3d11)
scale_matrix(&matrix, 3.0f, 2.0f);
rotate_matrix(&matrix, M_PI / -5.0f);
hr = ID2D1RectangleGeometry_GetBounds(geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get bounds.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 2.00000000e+01f, 1.82442951e+01f, 7.95376282e+01f, 6.23606796e+01f, 0);
ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
geometry_sink_init(&sink);
hr = ID2D1RectangleGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
&matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[1], 1);
geometry_sink_cleanup(&sink);
@@ -4130,14 +4130,14 @@ static void test_rectangle_geometry(BOOL d3d11)
translate_matrix(&matrix, 25.0f, 15.0f);
scale_matrix(&matrix, 0.0f, 2.0f);
hr = ID2D1RectangleGeometry_GetBounds(geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get bounds.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 25.0f, 15.0f, 25.0f, 55.0f, 0);
ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
geometry_sink_init(&sink);
hr = ID2D1RectangleGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
&matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[2], 0);
geometry_sink_cleanup(&sink);
@@ -4145,14 +4145,14 @@ static void test_rectangle_geometry(BOOL d3d11)
translate_matrix(&matrix, 30.0f, 45.0f);
scale_matrix(&matrix, 0.5f, 0.0f);
hr = ID2D1RectangleGeometry_GetBounds(geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get bounds.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 30.0f, 45.0f, 35.0f, 45.0f, 0);
ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
geometry_sink_init(&sink);
hr = ID2D1RectangleGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
&matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[3], 0);
geometry_sink_cleanup(&sink);
@@ -4161,23 +4161,23 @@ static void test_rectangle_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / 3.0f);
translate_matrix(&matrix, 30.0f, 20.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry);
- ok(SUCCEEDED(hr), "Failed to create transformed geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect);
- ok(SUCCEEDED(hr), "Failed to get bounds.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1);
ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
geometry_sink_init(&sink);
hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
NULL, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[4], 1);
geometry_sink_cleanup(&sink);
geometry_sink_init(&sink);
hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
NULL, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[4], 1);
geometry_sink_cleanup(&sink);
@@ -4185,42 +4185,42 @@ static void test_rectangle_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / -3.0f);
scale_matrix(&matrix, 0.25f, 0.2f);
ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get bounds.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2);
ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
geometry_sink_init(&sink);
hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,
&matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[5], 4);
geometry_sink_cleanup(&sink);
set_matrix_identity(&matrix);
scale_matrix(&matrix, 2.0f, 0.0f);
ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get bounds.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1);
ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
geometry_sink_init(&sink);
hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
&matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[6], 1);
geometry_sink_cleanup(&sink);
set_matrix_identity(&matrix);
scale_matrix(&matrix, 0.0f, 0.5f);
ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get bounds.\n");
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1);
ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
geometry_sink_init(&sink);
hr = ID2D1TransformedGeometry_Simplify(transformed_geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES,
&matrix, 0.0f, &sink.ID2D1SimplifiedGeometrySink_iface);
- ok(SUCCEEDED(hr), "Failed to simplify geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
geometry_sink_check(&sink, D2D1_FILL_MODE_ALTERNATE, 1, &expected_figures[7], 1);
geometry_sink_cleanup(&sink);
@@ -4237,11 +4237,11 @@ static void test_rounded_rectangle_geometry(BOOL d3d11)
HRESULT hr;
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rounded_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1Factory_CreateRoundedRectangleGeometry(factory, &rect, &geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RoundedRectangleGeometry_GetRoundedRect(geometry, &rect2);
ok(!memcmp(&rect, &rect2, sizeof(rect)), "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n",
@@ -4325,10 +4325,10 @@ static void test_bitmap_formats(BOOL d3d11)
bitmap_desc.pixelFormat.alphaMode = j;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap);
if (bitmap_formats[i].mask & (1u << j))
- ok(hr == S_OK, "Got unexpected hr %#x, for format %#x/%#x.\n",
+ ok(hr == S_OK, "Got unexpected hr %#lx, for format %#x/%#x.\n",
hr, bitmap_formats[i].format, j);
else
- ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#x, for format %#x/%#x.\n",
+ ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#lx, for format %#x/%#x.\n",
hr, bitmap_formats[i].format, j);
if (SUCCEEDED(hr))
ID2D1Bitmap_Release(bitmap);
@@ -4374,22 +4374,22 @@ static void test_alpha_mode(BOOL d3d11)
bitmap_desc.dpiX = 96.0f / 40.0f;
bitmap_desc.dpiY = 96.0f / 30.0f;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &bitmap_brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapBrush_SetInterpolationMode(bitmap_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR);
ID2D1BitmapBrush_SetExtendModeX(bitmap_brush, D2D1_EXTEND_MODE_WRAP);
ID2D1BitmapBrush_SetExtendModeY(bitmap_brush, D2D1_EXTEND_MODE_WRAP);
set_color(&color, 0.0f, 1.0f, 0.0f, 0.75f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &color_brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "Failed to create brush, hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "48c41aff3a130a17ee210866b2ab7d36763934d5");
ok(match, "Surface does not match.\n");
@@ -4397,7 +4397,7 @@ static void test_alpha_mode(BOOL d3d11)
set_color(&color, 1.0f, 0.0f, 0.0f, 0.25f);
ID2D1RenderTarget_Clear(rt, &color);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "6487e683730fb5a77c1911388d00b04664c5c4e4");
ok(match, "Surface does not match.\n");
@@ -4405,7 +4405,7 @@ static void test_alpha_mode(BOOL d3d11)
set_color(&color, 0.0f, 0.0f, 1.0f, 0.75f);
ID2D1RenderTarget_Clear(rt, &color);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "7a35ba09e43cbaf591388ff1ef8de56157630c98");
ok(match, "Surface does not match.\n");
@@ -4423,7 +4423,7 @@ static void test_alpha_mode(BOOL d3d11)
ID2D1Bitmap_Release(bitmap);
bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapBrush_SetBitmap(bitmap_brush, bitmap);
set_rect(&rect, 0.0f, 120.0f, 160.0f, 240.0f);
@@ -4446,7 +4446,7 @@ static void test_alpha_mode(BOOL d3d11)
ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "14f8ac64b70966c7c3c6281c59aaecdb17c3b16a");
ok(match, "Surface does not match.\n");
@@ -4465,12 +4465,12 @@ static void test_alpha_mode(BOOL d3d11)
ID2D1Bitmap_Release(bitmap);
bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapBrush_SetBitmap(bitmap_brush, bitmap);
ID2D1BitmapBrush_Release(bitmap_brush);
hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &bitmap_brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapBrush_SetInterpolationMode(bitmap_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR);
ID2D1BitmapBrush_SetExtendModeX(bitmap_brush, D2D1_EXTEND_MODE_WRAP);
ID2D1BitmapBrush_SetExtendModeY(bitmap_brush, D2D1_EXTEND_MODE_WRAP);
@@ -4478,12 +4478,12 @@ static void test_alpha_mode(BOOL d3d11)
ID2D1SolidColorBrush_Release(color_brush);
set_color(&color, 0.0f, 1.0f, 0.0f, 0.75f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &color_brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "b44510bf2d2e61a8d7c0ad862de49a471f1fd13f");
ok(match, "Surface does not match.\n");
@@ -4491,7 +4491,7 @@ static void test_alpha_mode(BOOL d3d11)
set_color(&color, 1.0f, 0.0f, 0.0f, 0.25f);
ID2D1RenderTarget_Clear(rt, &color);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "2184f4a9198fc1de09ac85301b7a03eebadd9b81");
ok(match, "Surface does not match.\n");
@@ -4499,7 +4499,7 @@ static void test_alpha_mode(BOOL d3d11)
set_color(&color, 0.0f, 0.0f, 1.0f, 0.75f);
ID2D1RenderTarget_Clear(rt, &color);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "6527ec83b4039c895b50f9b3e144fe0cf90d1889");
ok(match, "Surface does not match.\n");
@@ -4517,7 +4517,7 @@ static void test_alpha_mode(BOOL d3d11)
ID2D1Bitmap_Release(bitmap);
bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapBrush_SetBitmap(bitmap_brush, bitmap);
set_rect(&rect, 0.0f, 120.0f, 160.0f, 240.0f);
@@ -4540,12 +4540,12 @@ static void test_alpha_mode(BOOL d3d11)
ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "465f5a3190d7bde408b3206b4be939fb22f8a3d6");
ok(match, "Surface does not match.\n");
refcount = ID2D1Bitmap_Release(bitmap);
- ok(refcount == 1, "Bitmap has %u references left.\n", refcount);
+ ok(refcount == 1, "Bitmap has %lu references left.\n", refcount);
ID2D1SolidColorBrush_Release(color_brush);
ID2D1BitmapBrush_Release(bitmap_brush);
ID2D1RenderTarget_Release(rt);
@@ -4579,18 +4579,18 @@ static void test_shared_bitmap(BOOL d3d11)
window2 = create_window();
swapchain2 = create_swapchain(ctx.device, window2, TRUE);
hr = IDXGISwapChain_GetBuffer(swapchain2, 0, &IID_IDXGISurface, (void **)&surface2);
- ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
&IID_IWICImagingFactory, (void **)&wic_factory);
- ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IWICImagingFactory_CreateBitmap(wic_factory, 640, 480,
&GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap1);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IWICImagingFactory_CreateBitmap(wic_factory, 640, 480,
&GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap2);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IWICImagingFactory_Release(wic_factory);
desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
@@ -4607,32 +4607,32 @@ static void test_shared_bitmap(BOOL d3d11)
bitmap_desc.dpiY = 96.0f;
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory1);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory2);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* DXGI surface render targets with the same device and factory. */
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory1, ctx.surface, &desc, &rt1);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateBitmap(rt1, size, NULL, 0, &bitmap_desc, &bitmap1);
check_bitmap_surface(bitmap1, TRUE, 0);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory1, surface2, &desc, &rt2);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, NULL, &bitmap2);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_bitmap_surface(bitmap2, TRUE, 0);
ID2D1Bitmap_Release(bitmap2);
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IUnknown, bitmap1, NULL, &bitmap2);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_Release(rt2);
/* DXGI surface render targets with the same device but different factories. */
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory2, surface2, &desc, &rt2);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, NULL, &bitmap2);
- ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_Release(rt2);
/* DXGI surface render targets with different devices but the same factory. */
@@ -4642,55 +4642,55 @@ static void test_shared_bitmap(BOOL d3d11)
ok(!!device2, "Failed to create device.\n");
swapchain2 = create_swapchain(device2, window2, TRUE);
hr = IDXGISwapChain_GetBuffer(swapchain2, 0, &IID_IDXGISurface, (void **)&surface2);
- ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory1, surface2, &desc, &rt2);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, NULL, &bitmap2);
- ok(hr == D2DERR_UNSUPPORTED_OPERATION, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_UNSUPPORTED_OPERATION, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_Release(rt2);
/* DXGI surface render targets with different devices and different factories. */
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory2, surface2, &desc, &rt2);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, NULL, &bitmap2);
- ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_Release(rt2);
/* DXGI surface render target and WIC bitmap render target, same factory. */
hr = ID2D1Factory_CreateWicBitmapRenderTarget(factory1, wic_bitmap2, &desc, &rt2);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, NULL, &bitmap2);
- ok(hr == D2DERR_UNSUPPORTED_OPERATION, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_UNSUPPORTED_OPERATION, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_Release(rt2);
/* WIC bitmap render targets on different D2D factories. */
ID2D1Bitmap_Release(bitmap1);
ID2D1RenderTarget_Release(rt1);
hr = ID2D1Factory_CreateWicBitmapRenderTarget(factory1, wic_bitmap1, &desc, &rt1);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateBitmap(rt1, size, NULL, 0, &bitmap_desc, &bitmap1);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_QueryInterface(rt1, &IID_ID2D1GdiInteropRenderTarget, (void **)&interop);
- ok(SUCCEEDED(hr), "Failed to get interop target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1GdiInteropRenderTarget_QueryInterface(interop, &IID_ID2D1RenderTarget, (void **)&rt3);
- ok(SUCCEEDED(hr), "Failed to get render target back, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(rt3 == rt1, "Unexpected render target\n");
ID2D1RenderTarget_Release(rt3);
ID2D1GdiInteropRenderTarget_Release(interop);
hr = ID2D1Factory_CreateWicBitmapRenderTarget(factory2, wic_bitmap2, &desc, &rt2);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, NULL, &bitmap2);
- ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_Release(rt2);
/* WIC bitmap render targets on the same D2D factory. */
hr = ID2D1Factory_CreateWicBitmapRenderTarget(factory1, wic_bitmap2, &desc, &rt2);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, NULL, &bitmap2);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_bitmap_surface(bitmap2, FALSE, 0);
ID2D1Bitmap_Release(bitmap2);
ID2D1RenderTarget_Release(rt2);
@@ -4705,7 +4705,7 @@ static void test_shared_bitmap(BOOL d3d11)
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory1, surface2, &desc, &rt2);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED;
@@ -4713,7 +4713,7 @@ static void test_shared_bitmap(BOOL d3d11)
bitmap_desc.dpiY = 0.0f;
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface, surface2, &bitmap_desc, &bitmap2);
- ok(SUCCEEDED(hr) || broken(hr == E_INVALIDARG) /* vista */, "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK || broken(hr == E_INVALIDARG) /* vista */, "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
@@ -4745,7 +4745,7 @@ static void test_shared_bitmap(BOOL d3d11)
size = ID2D1Bitmap_GetPixelSize(bitmap2);
hr = IDXGISurface_GetDesc(surface2, &surface_desc);
- ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(size.width == surface_desc.Width && size.height == surface_desc.Height, "Got wrong bitmap size.\n");
check_bitmap_surface(bitmap2, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW);
@@ -4756,7 +4756,7 @@ static void test_shared_bitmap(BOOL d3d11)
if (IDXGISurface_QueryInterface(surface2, &IID_IDXGISurface1, (void **)&surface3) == S_OK)
{
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface1, surface3, &bitmap_desc, &bitmap2);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Bitmap_Release(bitmap2);
IDXGISurface1_Release(surface3);
@@ -4768,7 +4768,7 @@ static void test_shared_bitmap(BOOL d3d11)
hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface, surface2, &bitmap_desc, &bitmap2);
todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6)
- ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr);
+ ok(hr == bitmap_format_tests[i].hr, "%u: Got unexpected hr %#lx.\n", i, hr);
if (SUCCEEDED(bitmap_format_tests[i].hr))
{
@@ -4836,7 +4836,7 @@ static void test_bitmap_updates(BOOL d3d11)
bitmap_desc.dpiX = 96.0f;
bitmap_desc.dpiY = 96.0f;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, 0.0f, 0.0f, 320.0f, 240.0f);
ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f,
@@ -4846,7 +4846,7 @@ static void test_bitmap_updates(BOOL d3d11)
bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, 0.0f, 240.0f, 320.0f, 480.0f);
ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f,
@@ -4854,31 +4854,31 @@ static void test_bitmap_updates(BOOL d3d11)
set_rect_u(&dst_rect, 1, 1, 3, 3);
hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, bitmap_data, 4 * sizeof(*bitmap_data));
- ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect_u(&dst_rect, 0, 3, 3, 4);
hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, &bitmap_data[6], 4 * sizeof(*bitmap_data));
- ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect_u(&dst_rect, 0, 0, 4, 1);
hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, &bitmap_data[10], 4 * sizeof(*bitmap_data));
- ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect_u(&dst_rect, 0, 1, 1, 3);
hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, &bitmap_data[2], sizeof(*bitmap_data));
- ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect_u(&dst_rect, 4, 4, 3, 1);
hr = ID2D1Bitmap_CopyFromMemory(bitmap, &dst_rect, bitmap_data, sizeof(*bitmap_data));
- ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, 320.0f, 240.0f, 640.0f, 480.0f);
ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f,
D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL);
hr = ID2D1Bitmap_CopyFromMemory(bitmap, NULL, bitmap_data, 4 * sizeof(*bitmap_data));
- ok(SUCCEEDED(hr), "Failed to update bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, 320.0f, 0.0f, 640.0f, 240.0f);
ID2D1RenderTarget_DrawBitmap(rt, bitmap, &rect, 1.0f,
D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "cb8136c91fbbdc76bb83b8c09edc1907b0a5d0a6");
ok(match, "Surface does not match.\n");
@@ -4924,7 +4924,7 @@ static void test_opacity_brush(BOOL d3d11)
set_color(&color, 0.0f, 1.0f, 0.0f, 0.8f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &color_brush);
- ok(SUCCEEDED(hr), "Failed to create color brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_size_u(&size, 4, 4);
bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
@@ -4932,12 +4932,12 @@ static void test_opacity_brush(BOOL d3d11)
bitmap_desc.dpiX = 96.0f;
bitmap_desc.dpiY = 96.0f;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &opacity_brush);
- ok(SUCCEEDED(hr), "Failed to create bitmap brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapBrush_SetInterpolationMode(opacity_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR);
refcount = ID2D1Bitmap_Release(bitmap);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
set_size_u(&size, 1, 1);
bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
@@ -4945,12 +4945,12 @@ static void test_opacity_brush(BOOL d3d11)
bitmap_desc.dpiX = 96.0f;
bitmap_desc.dpiY = 96.0f;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, &bitmap_data[2], sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &bitmap_brush);
- ok(SUCCEEDED(hr), "Failed to create bitmap brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapBrush_SetInterpolationMode(bitmap_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR);
refcount = ID2D1Bitmap_Release(bitmap);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
ID2D1RenderTarget_BeginDraw(rt);
@@ -5000,7 +5000,7 @@ static void test_opacity_brush(BOOL d3d11)
(ID2D1Brush *)bitmap_brush, (ID2D1Brush *)opacity_brush);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(hr == D2DERR_INCOMPATIBLE_BRUSH_TYPES, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_INCOMPATIBLE_BRUSH_TYPES, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "7141c6c7b3decb91196428efb1856bcbf9872935");
ok(match, "Surface does not match.\n");
ID2D1RenderTarget_BeginDraw(rt);
@@ -5042,7 +5042,7 @@ static void test_opacity_brush(BOOL d3d11)
ID2D1RectangleGeometry_Release(geometry);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_surface(&ctx, "c3a5802d1750efa3e9122c1a92f6064df3872732");
ok(match, "Surface does not match.\n");
@@ -5080,7 +5080,7 @@ static void test_create_target(BOOL d3d11)
return;
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(create_dpi_tests); ++i)
{
@@ -5099,21 +5099,21 @@ static void test_create_target(BOOL d3d11)
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, ctx.surface, &desc, &rt);
- ok(hr == create_dpi_tests[i].hr, "Wrong return code, hr %#x, expected %#x, test %u.\n", hr,
- create_dpi_tests[i].hr, i);
+ ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpect hr %#lx, expected %#lx.\n",
+ i, hr, create_dpi_tests[i].hr);
if (FAILED(hr))
continue;
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_IUnknown, (void **)&unk);
- ok(SUCCEEDED(hr), "Failed to get IUnknown, hr %#x.\n", hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(unk == (IUnknown *)rt, "Expected same interface pointer.\n");
IUnknown_Release(unk);
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1GdiInteropRenderTarget, (void **)&interop);
- ok(SUCCEEDED(hr), "Failed to get interop target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = ID2D1GdiInteropRenderTarget_QueryInterface(interop, &IID_ID2D1RenderTarget, (void **)&rt2);
- ok(SUCCEEDED(hr), "Failed to get render target back, %#x.\n", hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ok(rt2 == rt, "Unexpected render target\n");
ID2D1RenderTarget_Release(rt2);
ID2D1GdiInteropRenderTarget_Release(interop);
@@ -5185,10 +5185,10 @@ static void test_draw_text_layout(BOOL d3d11)
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory2);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(factory != factory2, "got same factory\n");
desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
@@ -5200,33 +5200,33 @@ static void test_draw_text_layout(BOOL d3d11)
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, ctx.surface, &desc, &rt);
- ok(SUCCEEDED(hr), "Failed to create a target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory2, ctx.surface, &desc, &rt2);
- ok(SUCCEEDED(hr), "Failed to create a target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown **)&dwrite_factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDWriteFactory_CreateTextFormat(dwrite_factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL,
DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"", &text_format);
- ok(SUCCEEDED(hr), "Failed to create text format, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDWriteFactory_CreateTextLayout(dwrite_factory, L"text", 4, text_format, 100.0f, 100.0f, &text_layout);
- ok(SUCCEEDED(hr), "Failed to create text layout, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt2, &color, NULL, &brush2);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* effect brush is created from different factory */
range.startPosition = 0;
range.length = 4;
hr = IDWriteTextLayout_SetDrawingEffect(text_layout, (IUnknown*)brush2, range);
- ok(SUCCEEDED(hr), "Failed to set drawing effect, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
@@ -5234,17 +5234,17 @@ static void test_draw_text_layout(BOOL d3d11)
ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- todo_wine ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#lx.\n", hr);
/* Effect is d2d resource, but not a brush. */
set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry);
- ok(SUCCEEDED(hr), "Failed to geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
range.startPosition = 0;
range.length = 4;
hr = IDWriteTextLayout_SetDrawingEffect(text_layout, (IUnknown*)geometry, range);
- ok(SUCCEEDED(hr), "Failed to set drawing effect, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RectangleGeometry_Release(geometry);
ID2D1RenderTarget_BeginDraw(rt);
@@ -5253,7 +5253,7 @@ static void test_draw_text_layout(BOOL d3d11)
ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(antialias_mode_tests); ++i)
{
@@ -5263,7 +5263,7 @@ static void test_draw_text_layout(BOOL d3d11)
hr = IDWriteFactory_CreateCustomRenderingParams(dwrite_factory, 2.0f, 1.0f, 0.0f, DWRITE_PIXEL_GEOMETRY_FLAT,
antialias_mode_tests[i].rendering_mode, &rendering_params);
- ok(SUCCEEDED(hr), "Failed to create custom rendering params, hr %#x.\n", hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ID2D1RenderTarget_SetTextRenderingParams(rt, rendering_params);
@@ -5272,7 +5272,7 @@ static void test_draw_text_layout(BOOL d3d11)
ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush *)brush, D2D1_DRAW_TEXT_OPTIONS_NONE);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(hr == antialias_mode_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr);
+ ok(hr == antialias_mode_tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IDWriteRenderingParams_Release(rendering_params);
}
@@ -5343,7 +5343,7 @@ static void test_dc_target(BOOL d3d11)
release_test_context(&ctx);
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(invalid_formats); ++i)
{
@@ -5355,7 +5355,7 @@ static void test_dc_target(BOOL d3d11)
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt);
- ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#lx.\n", hr);
}
desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
@@ -5366,16 +5366,16 @@ static void test_dc_target(BOOL d3d11)
desc.usage = D2D1_RENDER_TARGET_USAGE_NONE;
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt);
- ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1DCRenderTarget_QueryInterface(rt, &IID_ID2D1GdiInteropRenderTarget, (void **)&interop);
- ok(SUCCEEDED(hr), "Failed to get interop target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1GdiInteropRenderTarget_QueryInterface(interop, &IID_ID2D1RenderTarget, (void **)&rt3);
- ok(SUCCEEDED(hr), "Failed to get render target back, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(rt3 == (ID2D1RenderTarget *)rt, "Unexpected render target\n");
ID2D1RenderTarget_Release(rt3);
hr = ID2D1GdiInteropRenderTarget_QueryInterface(interop, &IID_ID2D1DCRenderTarget, (void **)&rt2);
- ok(SUCCEEDED(hr), "Failed to get render target back, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(rt2 == rt, "Unexpected render target\n");
ID2D1DCRenderTarget_Release(rt2);
ID2D1GdiInteropRenderTarget_Release(interop);
@@ -5391,18 +5391,18 @@ static void test_dc_target(BOOL d3d11)
/* object creation methods work without BindDC() */
set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1SolidColorBrush_Release(brush);
ID2D1DCRenderTarget_BeginDraw(rt);
hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL);
- ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1DCRenderTarget_Release(rt);
/* BindDC() */
hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt);
- ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
aa_mode = ID2D1DCRenderTarget_GetAntialiasMode(rt);
ok(aa_mode == D2D1_ANTIALIAS_MODE_PER_PRIMITIVE, "Got wrong default aa mode %d.\n", aa_mode);
@@ -5419,7 +5419,7 @@ static void test_dc_target(BOOL d3d11)
SetRect(&rect, 0, 0, 32, 32);
hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect);
- ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
/* Target properties are retained during BindDC() */
ID2D1DCRenderTarget_SetTags(rt, 1, 2);
@@ -5431,7 +5431,7 @@ static void test_dc_target(BOOL d3d11)
ID2D1DCRenderTarget_SetTransform(rt, &matrix);
hr = ID2D1DCRenderTarget_BindDC(rt, hdc, &rect);
- ok(hr == S_OK, "BindDC() returned %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DCRenderTarget_GetTags(rt, &t1, &t2);
ok(t1 == 1 && t2 == 2, "Got wrong tags.\n");
@@ -5460,10 +5460,10 @@ static void test_dc_target(BOOL d3d11)
ID2D1DCRenderTarget_Clear(rt, &color);
hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
clr = GetPixel(hdc, 0, 0);
- ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr);
+ ok(clr == RGB(255, 0, 0), "Got unexpected colour 0x%08lx.\n", clr);
hdc2 = CreateCompatibleDC(NULL);
ok(hdc2 != NULL, "Failed to create an HDC.\n");
@@ -5471,14 +5471,14 @@ static void test_dc_target(BOOL d3d11)
create_target_dibsection(hdc2, 16, 16);
hr = ID2D1DCRenderTarget_BindDC(rt, hdc2, &rect);
- ok(hr == S_OK, "BindDC() returned %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
clr = GetPixel(hdc2, 0, 0);
- ok(clr == 0, "Unexpected color 0x%08x.\n", clr);
+ ok(clr == 0, "Got unexpected colour 0x%08lx.\n", clr);
set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f);
hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DCRenderTarget_BeginDraw(rt);
@@ -5488,19 +5488,19 @@ static void test_dc_target(BOOL d3d11)
ID2D1DCRenderTarget_FillRectangle(rt, &r, (ID2D1Brush*)brush);
hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1SolidColorBrush_Release(brush);
clr = GetPixel(hdc2, 0, 0);
- ok(clr == RGB(0, 255, 0), "Unexpected color 0x%08x.\n", clr);
+ ok(clr == RGB(0, 255, 0), "Got unexpected colour 0x%08lx.\n", clr);
clr = GetPixel(hdc2, 10, 0);
- ok(clr == 0, "Unexpected color 0x%08x.\n", clr);
+ ok(clr == 0, "Got unexpected colour 0x%08lx.\n", clr);
/* Invalid DC. */
hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect);
- todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ID2D1DCRenderTarget_BeginDraw(rt);
@@ -5508,13 +5508,13 @@ static void test_dc_target(BOOL d3d11)
ID2D1DCRenderTarget_Clear(rt, &color);
hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
clr = GetPixel(hdc2, 0, 0);
- todo_wine ok(clr == RGB(255, 0, 0), "Got unexpected colour 0x%08x.\n", clr);
+ todo_wine ok(clr == RGB(255, 0, 0), "Got unexpected colour 0x%08lx.\n", clr);
hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect);
- ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ID2D1DCRenderTarget_BeginDraw(rt);
@@ -5522,10 +5522,10 @@ static void test_dc_target(BOOL d3d11)
ID2D1DCRenderTarget_Clear(rt, &color);
hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
clr = GetPixel(hdc2, 0, 0);
- todo_wine ok(clr == RGB(0, 0, 255), "Got unexpected colour 0x%08x.\n", clr);
+ todo_wine ok(clr == RGB(0, 0, 255), "Got unexpected colour 0x%08lx.\n", clr);
DeleteDC(hdc);
DeleteDC(hdc2);
@@ -5550,7 +5550,7 @@ static void test_hwnd_target(BOOL d3d11)
release_test_context(&ctx);
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
@@ -5566,25 +5566,25 @@ static void test_hwnd_target(BOOL d3d11)
hwnd_rt_desc.presentOptions = D2D1_PRESENT_OPTIONS_NONE;
hr = ID2D1Factory_CreateHwndRenderTarget(factory, &desc, &hwnd_rt_desc, &rt);
- ok(FAILED(hr), "Target creation should fail, hr %#x.\n", hr);
+ ok(hr != S_OK, "Got unexpected hr %#lx.\n", hr);
hwnd_rt_desc.hwnd = (HWND)0xdeadbeef;
hr = ID2D1Factory_CreateHwndRenderTarget(factory, &desc, &hwnd_rt_desc, &rt);
- ok(FAILED(hr), "Target creation should fail, hr %#x.\n", hr);
+ ok(hr != S_OK, "Got unexpected hr %#lx.\n", hr);
hwnd_rt_desc.hwnd = CreateWindowA("static", "d2d_test", 0, 0, 0, 0, 0, 0, 0, 0, 0);
ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n");
hr = ID2D1Factory_CreateHwndRenderTarget(factory, &desc, &hwnd_rt_desc, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1HwndRenderTarget_QueryInterface(rt, &IID_ID2D1GdiInteropRenderTarget, (void **)&interop);
- ok(SUCCEEDED(hr), "Failed to get interop target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1GdiInteropRenderTarget_QueryInterface(interop, &IID_ID2D1RenderTarget, (void **)&rt3);
- ok(SUCCEEDED(hr), "Failed to get render target back, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(rt3 == (ID2D1RenderTarget *)rt, "Unexpected render target\n");
ID2D1RenderTarget_Release(rt3);
hr = ID2D1GdiInteropRenderTarget_QueryInterface(interop, &IID_ID2D1HwndRenderTarget, (void **)&rt2);
- ok(SUCCEEDED(hr), "Failed to get render target back, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(rt2 == rt, "Unexpected render target\n");
ID2D1HwndRenderTarget_Release(rt2);
ID2D1GdiInteropRenderTarget_Release(interop);
@@ -5592,7 +5592,7 @@ static void test_hwnd_target(BOOL d3d11)
size.width = 128;
size.height = 64;
hr = ID2D1HwndRenderTarget_Resize(rt, &size);
- ok(SUCCEEDED(hr), "Failed to resize render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1HwndRenderTarget_Release(rt);
@@ -5634,7 +5634,7 @@ static void test_compatible_target_size_(unsigned int line, ID2D1RenderTarget *r
{
hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, size_tests[i].size, size_tests[i].pixel_size,
NULL, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &bitmap_rt);
- ok_(__FILE__, line)(SUCCEEDED(hr), "%u: Failed to create render target, hr %#x.\n", i, hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "%u: Failed to create render target, hr %#lx.\n", i, hr);
if (size_tests[i].pixel_size)
{
@@ -5671,7 +5671,7 @@ static void test_compatible_target_size_(unsigned int line, ID2D1RenderTarget *r
pixel_size.height = pixel_size.width = 0;
hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, &pixel_size, NULL,
D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &bitmap_rt);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create render target, hr %#lx.\n", hr);
if (SUCCEEDED(ID2D1BitmapRenderTarget_QueryInterface(bitmap_rt, &IID_ID2D1DeviceContext, (void **)&context)))
{
@@ -5717,7 +5717,7 @@ static void test_bitmap_target(BOOL d3d11)
release_test_context(&ctx);
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
@@ -5734,22 +5734,22 @@ static void test_bitmap_target(BOOL d3d11)
hwnd_rt_desc.presentOptions = D2D1_PRESENT_OPTIONS_NONE;
hr = ID2D1Factory_CreateHwndRenderTarget(factory, &desc, &hwnd_rt_desc, &hwnd_rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
test_compatible_target_size((ID2D1RenderTarget *)hwnd_rt);
hr = ID2D1HwndRenderTarget_CreateCompatibleRenderTarget(hwnd_rt, NULL, NULL, NULL,
D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1BitmapRenderTarget_QueryInterface(rt, &IID_ID2D1GdiInteropRenderTarget, (void **)&interop);
- ok(SUCCEEDED(hr), "Failed to get interop target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1GdiInteropRenderTarget_QueryInterface(interop, &IID_ID2D1RenderTarget, (void **)&rt3);
- ok(SUCCEEDED(hr), "Failed to get render target back, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(rt3 == (ID2D1RenderTarget *)rt, "Unexpected render target\n");
ID2D1RenderTarget_Release(rt3);
hr = ID2D1GdiInteropRenderTarget_QueryInterface(interop, &IID_ID2D1BitmapRenderTarget, (void **)&rt2);
- ok(SUCCEEDED(hr), "Failed to get render target back, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(rt2 == rt, "Unexpected render target\n");
ID2D1BitmapRenderTarget_Release(rt2);
ID2D1GdiInteropRenderTarget_Release(interop);
@@ -5757,7 +5757,7 @@ static void test_bitmap_target(BOOL d3d11)
/* See if parent target is referenced. */
ID2D1HwndRenderTarget_AddRef(hwnd_rt);
refcount = ID2D1HwndRenderTarget_Release(hwnd_rt);
- ok(refcount == 1, "Target should not have been referenced, got %u.\n", refcount);
+ ok(refcount == 1, "Target should not have been referenced, got %lu.\n", refcount);
/* Size was not specified, should match parent. */
pixel_size = ID2D1HwndRenderTarget_GetPixelSize(hwnd_rt);
@@ -5778,7 +5778,7 @@ static void test_bitmap_target(BOOL d3d11)
set_size_u(&pixel_size, 32, 32);
hr = ID2D1HwndRenderTarget_CreateCompatibleRenderTarget(hwnd_rt, NULL, &pixel_size, NULL,
D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
pixel_size2 = ID2D1BitmapRenderTarget_GetPixelSize(rt);
ok(!memcmp(&pixel_size, &pixel_size2, sizeof(pixel_size)), "Got target pixel size mismatch.\n");
@@ -5792,7 +5792,7 @@ static void test_bitmap_target(BOOL d3d11)
set_size_u(&pixel_size, 128, 128);
hr = ID2D1HwndRenderTarget_CreateCompatibleRenderTarget(hwnd_rt, &size, &pixel_size, NULL,
D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Doubled pixel size dimensions with the same DIP size give doubled dpi. */
ID2D1BitmapRenderTarget_GetDpi(rt, dpi2, dpi2 + 1);
@@ -5804,7 +5804,7 @@ static void test_bitmap_target(BOOL d3d11)
set_size_f(&size, 70.1f, 70.4f);
hr = ID2D1HwndRenderTarget_CreateCompatibleRenderTarget(hwnd_rt, &size, NULL, NULL,
D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1BitmapRenderTarget_GetDpi(rt, dpi2, dpi2 + 1);
@@ -5822,9 +5822,9 @@ static void test_bitmap_target(BOOL d3d11)
/* Check if GetBitmap() returns same instance. */
hr = ID2D1BitmapRenderTarget_GetBitmap(rt, &bitmap);
- ok(SUCCEEDED(hr), "GetBitmap() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1BitmapRenderTarget_GetBitmap(rt, &bitmap2);
- ok(SUCCEEDED(hr), "GetBitmap() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(bitmap == bitmap2, "Got different bitmap instances.\n");
/* Draw something, see if bitmap instance is retained. */
@@ -5832,18 +5832,18 @@ static void test_bitmap_target(BOOL d3d11)
set_color(&color, 1.0f, 1.0f, 0.0f, 1.0f);
ID2D1BitmapRenderTarget_Clear(rt, &color);
hr = ID2D1BitmapRenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Bitmap_Release(bitmap2);
hr = ID2D1BitmapRenderTarget_GetBitmap(rt, &bitmap2);
- ok(SUCCEEDED(hr), "GetBitmap() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(bitmap == bitmap2, "Got different bitmap instances.\n");
ID2D1Bitmap_Release(bitmap);
ID2D1Bitmap_Release(bitmap2);
refcount = ID2D1BitmapRenderTarget_Release(rt);
- ok(!refcount, "Target should be released, got %u.\n", refcount);
+ ok(!refcount, "Target should be released, got %lu.\n", refcount);
DestroyWindow(hwnd_rt_desc.hwnd);
@@ -5856,19 +5856,19 @@ static void test_bitmap_target(BOOL d3d11)
desc.usage = D2D1_RENDER_TARGET_USAGE_NONE;
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &dc_rt);
- ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
test_compatible_target_size((ID2D1RenderTarget *)dc_rt);
hr = ID2D1DCRenderTarget_CreateCompatibleRenderTarget(dc_rt, NULL, NULL, NULL,
D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
pixel_size = ID2D1BitmapRenderTarget_GetPixelSize(rt);
ok(pixel_size.width == 0 && pixel_size.height == 0, "Got wrong size\n");
hr = ID2D1BitmapRenderTarget_GetBitmap(rt, &bitmap);
- ok(SUCCEEDED(hr), "GetBitmap() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
pixel_size = ID2D1Bitmap_GetPixelSize(bitmap);
ok(pixel_size.width == 0 && pixel_size.height == 0, "Got wrong size\n");
ID2D1Bitmap_Release(bitmap);
@@ -5886,7 +5886,7 @@ static void test_desktop_dpi(BOOL d3d11)
HRESULT hr;
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
dpi_x = dpi_y = 0.0f;
ID2D1Factory_GetDesktopDpi(factory, &dpi_x, &dpi_y);
@@ -5924,7 +5924,7 @@ static void test_stroke_style(BOOL d3d11)
float dashes[2];
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
desc.startCap = D2D1_CAP_STYLE_SQUARE;
desc.endCap = D2D1_CAP_STYLE_ROUND;
@@ -5935,7 +5935,7 @@ static void test_stroke_style(BOOL d3d11)
desc.dashOffset = -1.0f;
hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style);
- ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
cap_style = ID2D1StrokeStyle_GetStartCap(style);
ok(cap_style == D2D1_CAP_STYLE_SQUARE, "Unexpected cap style %d.\n", cap_style);
@@ -5964,24 +5964,24 @@ static void test_stroke_style(BOOL d3d11)
ID2D1StrokeStyle_Release(style);
hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style);
- ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, dashes, 0, &style);
- ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, dashes, 1, &style);
- ok(hr == S_OK, "Unexpected return value, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1StrokeStyle_Release(style);
/* Builtin style, dashes are specified. */
desc.dashStyle = D2D1_DASH_STYLE_DOT;
hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, dashes, 1, &style);
- ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
/* Invalid style. */
desc.dashStyle = 100;
hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style);
- ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
/* Test returned dash pattern for builtin styles. */
desc.startCap = D2D1_CAP_STYLE_SQUARE;
@@ -5999,7 +5999,7 @@ static void test_stroke_style(BOOL d3d11)
desc.dashStyle = dash_style_tests[i].dash_style;
hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style);
- ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
dash_count = ID2D1StrokeStyle_GetDashesCount(style);
ok(dash_count == dash_style_tests[i].dash_count, "%u: unexpected dash count %u, expected %u.\n",
@@ -6029,7 +6029,7 @@ static void test_stroke_style(BOOL d3d11)
/* NULL dashes array, non-zero length. */
memset(&desc, 0, sizeof(desc));
hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 1, &style);
- ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
count = ID2D1StrokeStyle_GetDashesCount(style);
ok(count == 0, "Unexpected dashes count %u.\n", count);
@@ -6059,7 +6059,7 @@ static void test_gradient(BOOL d3d11)
stops2[1] = stops2[0];
hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops2, 2, D2D1_GAMMA_2_2,
D2D1_EXTEND_MODE_CLAMP, &gradient);
- ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
count = ID2D1GradientStopCollection_GetGradientStopCount(gradient);
ok(count == 2, "Unexpected stop count %u.\n", count);
@@ -6112,7 +6112,7 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED);
set_color(&color, 0.890f, 0.851f, 0.600f, 1.0f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
set_color(&color, 0.396f, 0.180f, 0.537f, 1.0f);
@@ -6149,7 +6149,7 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1RenderTarget_DrawEllipse(rt, &ellipse, (ID2D1Brush *)brush, 10.0f, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 0, "");
ok(match, "Figure does not match.\n");
@@ -6242,7 +6242,7 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1RenderTarget_DrawRoundedRectangle(rt, &rounded_rect, (ID2D1Brush *)brush, 10.0f, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 0, "iGIQjgEUjAEUjgEQiGIA");
todo_wine ok(match, "Figure does not match.\n");
@@ -6336,7 +6336,7 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1RenderTarget_DrawRoundedRectangle(rt, &rounded_rect, (ID2D1Brush *)brush, 10.0f, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 0, "iGIQjgEUjAEUjgEQiGIA");
todo_wine ok(match, "Figure does not match.\n");
@@ -6399,9 +6399,9 @@ static void test_draw_geometry(BOOL d3d11)
todo_wine ok(match, "Figure does not match.\n");
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 40.0f, 160.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
@@ -6471,14 +6471,14 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_ALTERNATE);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, 5.0f, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 0, "");
@@ -6550,11 +6550,11 @@ static void test_draw_geometry(BOOL d3d11)
set_rect(&rect, 20.0f, 80.0f, 60.0f, 240.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &rect_geometry[0]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &rect_geometry[1]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
translate_matrix(&matrix, 160.0f, 640.0f);
@@ -6562,14 +6562,14 @@ static void test_draw_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / -5.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)rect_geometry[1], &matrix, &transformed_geometry[0]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
scale_matrix(&matrix, 0.5f, 1.0f);
translate_matrix(&matrix, -80.0f, 0.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[0], &matrix, &transformed_geometry[1]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
rotate_matrix(&matrix, M_PI / 2.0f);
@@ -6577,7 +6577,7 @@ static void test_draw_geometry(BOOL d3d11)
scale_matrix(&matrix, 2.0f, 0.25f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
@@ -6586,7 +6586,7 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)transformed_geometry[1], (ID2D1Brush *)brush, 5.0f, NULL);
ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)transformed_geometry[2], (ID2D1Brush *)brush, 15.0f, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1TransformedGeometry_Release(transformed_geometry[2]);
ID2D1TransformedGeometry_Release(transformed_geometry[1]);
ID2D1TransformedGeometry_Release(transformed_geometry[0]);
@@ -6653,9 +6653,9 @@ static void test_draw_geometry(BOOL d3d11)
ok(match, "Figure does not match.\n");
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 20.0f, 80.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
@@ -6754,14 +6754,14 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, 10.0f, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 0,
@@ -6876,9 +6876,9 @@ static void test_draw_geometry(BOOL d3d11)
ok(match, "Figure does not match.\n");
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, -0.402914f, 0.915514f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
@@ -6897,7 +6897,7 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
set_matrix_identity(&matrix);
@@ -6905,7 +6905,7 @@ static void test_draw_geometry(BOOL d3d11)
scale_matrix(&matrix, 20.0f, 80.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)geometry, &matrix, &transformed_geometry[0]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
translate_matrix(&matrix, 160.0f, 640.0f);
@@ -6913,7 +6913,7 @@ static void test_draw_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / -5.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)geometry, &matrix, &transformed_geometry[1]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
set_matrix_identity(&matrix);
@@ -6921,7 +6921,7 @@ static void test_draw_geometry(BOOL d3d11)
translate_matrix(&matrix, -80.0f, 0.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
rotate_matrix(&matrix, M_PI / 2.0f);
@@ -6929,7 +6929,7 @@ static void test_draw_geometry(BOOL d3d11)
scale_matrix(&matrix, 2.0f, 0.25f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[2], &matrix, &transformed_geometry[3]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
@@ -6938,7 +6938,7 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)transformed_geometry[2], (ID2D1Brush *)brush, 5.0f, NULL);
ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)transformed_geometry[3], (ID2D1Brush *)brush, 15.0f, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1TransformedGeometry_Release(transformed_geometry[3]);
ID2D1TransformedGeometry_Release(transformed_geometry[2]);
ID2D1TransformedGeometry_Release(transformed_geometry[1]);
@@ -6990,9 +6990,9 @@ static void test_draw_geometry(BOOL d3d11)
ok(match, "Figure does not match.\n");
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 20.0f, 80.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
@@ -7005,14 +7005,14 @@ static void test_draw_geometry(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, 10.0f, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 32,
@@ -7062,7 +7062,7 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED);
set_color(&color, 0.890f, 0.851f, 0.600f, 1.0f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
set_color(&color, 0.396f, 0.180f, 0.537f, 1.0f);
@@ -7087,7 +7087,7 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1RenderTarget_FillEllipse(rt, &ellipse, (ID2D1Brush *)brush);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_figure(&ctx, 0, 160, 160, 160, 0xff652e89, 0, "gMgB");
ok(match, "Figure does not match.\n");
@@ -7145,7 +7145,7 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1RenderTarget_FillRoundedRectangle(rt, &rounded_rect, (ID2D1Brush *)brush);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 0, "gMgB");
ok(match, "Figure does not match.\n");
@@ -7215,7 +7215,7 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1RenderTarget_FillRoundedRectangle(rt, &rounded_rect, (ID2D1Brush *)brush);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 0, "gMgB");
ok(match, "Figure does not match.\n");
@@ -7254,9 +7254,9 @@ static void test_fill_geometry(BOOL d3d11)
ok(match, "Figure does not match.\n");
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 40.0f, 160.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
@@ -7326,14 +7326,14 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_ALTERNATE);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 0, "gMgB");
@@ -7381,11 +7381,11 @@ static void test_fill_geometry(BOOL d3d11)
set_rect(&rect, 20.0f, 80.0f, 60.0f, 240.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &rect_geometry[0]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &rect_geometry[1]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
translate_matrix(&matrix, 160.0f, 640.0f);
@@ -7393,14 +7393,14 @@ static void test_fill_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / -5.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)rect_geometry[1], &matrix, &transformed_geometry[0]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
scale_matrix(&matrix, 0.5f, 1.0f);
translate_matrix(&matrix, -80.0f, 0.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[0], &matrix, &transformed_geometry[1]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
rotate_matrix(&matrix, M_PI / 2.0f);
@@ -7408,7 +7408,7 @@ static void test_fill_geometry(BOOL d3d11)
scale_matrix(&matrix, 2.0f, 0.25f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
@@ -7417,7 +7417,7 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[1], (ID2D1Brush *)brush, NULL);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[2], (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1TransformedGeometry_Release(transformed_geometry[2]);
ID2D1TransformedGeometry_Release(transformed_geometry[1]);
ID2D1TransformedGeometry_Release(transformed_geometry[0]);
@@ -7463,9 +7463,9 @@ static void test_fill_geometry(BOOL d3d11)
ok(match, "Figure does not match.\n");
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 20.0f, 80.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
@@ -7564,14 +7564,14 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 0,
@@ -7645,9 +7645,9 @@ static void test_fill_geometry(BOOL d3d11)
ok(match, "Figure does not match.\n");
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, -0.402914f, 0.915514f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
@@ -7666,7 +7666,7 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
set_matrix_identity(&matrix);
@@ -7674,7 +7674,7 @@ static void test_fill_geometry(BOOL d3d11)
scale_matrix(&matrix, 20.0f, 80.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)geometry, &matrix, &transformed_geometry[0]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
translate_matrix(&matrix, 160.0f, 640.0f);
@@ -7682,7 +7682,7 @@ static void test_fill_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / -5.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)geometry, &matrix, &transformed_geometry[1]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
set_matrix_identity(&matrix);
@@ -7690,7 +7690,7 @@ static void test_fill_geometry(BOOL d3d11)
translate_matrix(&matrix, -80.0f, 0.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
rotate_matrix(&matrix, M_PI / 2.0f);
@@ -7698,7 +7698,7 @@ static void test_fill_geometry(BOOL d3d11)
scale_matrix(&matrix, 2.0f, 0.25f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[2], &matrix, &transformed_geometry[3]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
@@ -7707,7 +7707,7 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[2], (ID2D1Brush *)brush, NULL);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[3], (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1TransformedGeometry_Release(transformed_geometry[3]);
ID2D1TransformedGeometry_Release(transformed_geometry[2]);
ID2D1TransformedGeometry_Release(transformed_geometry[1]);
@@ -7749,9 +7749,9 @@ static void test_fill_geometry(BOOL d3d11)
ok(match, "Figure does not match.\n");
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, -0.402914f, 0.915514f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
@@ -7770,7 +7770,7 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
set_matrix_identity(&matrix);
@@ -7778,7 +7778,7 @@ static void test_fill_geometry(BOOL d3d11)
scale_matrix(&matrix, 20.0f, 80.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)geometry, &matrix, &transformed_geometry[0]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
translate_matrix(&matrix, 160.0f, 640.0f);
@@ -7786,7 +7786,7 @@ static void test_fill_geometry(BOOL d3d11)
rotate_matrix(&matrix, M_PI / -5.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)geometry, &matrix, &transformed_geometry[1]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
set_matrix_identity(&matrix);
@@ -7794,7 +7794,7 @@ static void test_fill_geometry(BOOL d3d11)
translate_matrix(&matrix, -80.0f, 0.0f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_matrix_identity(&matrix);
rotate_matrix(&matrix, M_PI / 2.0f);
@@ -7802,7 +7802,7 @@ static void test_fill_geometry(BOOL d3d11)
scale_matrix(&matrix, 2.0f, 0.25f);
hr = ID2D1Factory_CreateTransformedGeometry(factory,
(ID2D1Geometry *)transformed_geometry[2], &matrix, &transformed_geometry[3]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
@@ -7811,7 +7811,7 @@ static void test_fill_geometry(BOOL d3d11)
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[2], (ID2D1Brush *)brush, NULL);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[3], (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1TransformedGeometry_Release(transformed_geometry[3]);
ID2D1TransformedGeometry_Release(transformed_geometry[2]);
ID2D1TransformedGeometry_Release(transformed_geometry[1]);
@@ -7851,15 +7851,15 @@ static void test_gdi_interop(BOOL d3d11)
return;
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
&IID_IWICImagingFactory, (void **)&wic_factory);
- ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16,
&GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IWICImagingFactory_Release(wic_factory);
/* WIC target, default usage */
@@ -7872,19 +7872,19 @@ static void test_gdi_interop(BOOL d3d11)
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateWicBitmapRenderTarget(factory, wic_bitmap, &desc, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1GdiInteropRenderTarget, (void **)&interop);
- ok(SUCCEEDED(hr), "Failed to get gdi interop interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
dc = (void *)0xdeadbeef;
hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc);
- ok(FAILED(hr), "GetDC() was expected to fail, hr %#x.\n", hr);
+ ok(hr != S_OK, "Got unexpected hr %#lx.\n", hr);
todo_wine ok(!dc, "Got unexpected DC %p.\n", dc);
ID2D1GdiInteropRenderTarget_Release(interop);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_Release(rt);
@@ -7892,25 +7892,25 @@ static void test_gdi_interop(BOOL d3d11)
desc.usage = D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE;
hr = ID2D1Factory_CreateWicBitmapRenderTarget(factory, wic_bitmap, &desc, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1GdiInteropRenderTarget, (void **)&interop);
- ok(SUCCEEDED(hr), "Failed to get gdi interop interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
dc = NULL;
hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc);
- ok(SUCCEEDED(hr), "GetDC() was expected to succeed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(dc != NULL, "Expected NULL dc, got %p.\n", dc);
ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f);
ID2D1RenderTarget_Clear(rt, &color);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_wic_bitmap(wic_bitmap, "54034063dbc1c1bb61cb60ec57e4498678dc2b13");
ok(match, "Bitmap does not match.\n");
@@ -7919,37 +7919,37 @@ static void test_gdi_interop(BOOL d3d11)
ID2D1RenderTarget_BeginDraw(rt);
hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc);
- ok(SUCCEEDED(hr), "GetDC() was expected to succeed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
SetRect(&rect, 0, 0, 16, 16);
FillRect(dc, &rect, GetStockObject(BLACK_BRUSH));
ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_wic_bitmap(wic_bitmap, "60cacbf3d72e1e7834203da608037b1bf83b40e8");
ok(match, "Bitmap does not match.\n");
/* Bitmap is locked at BeginDraw(). */
hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock);
- ok(SUCCEEDED(hr), "Expected bitmap to be unlocked, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IWICBitmapLock_Release(wic_lock);
ID2D1RenderTarget_BeginDraw(rt);
hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock);
- todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
IWICBitmapLock_Release(wic_lock);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Lock before BeginDraw(). */
hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock);
- ok(SUCCEEDED(hr), "Expected bitmap to be unlocked, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_BeginDraw(rt);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#lx.\n", hr);
IWICBitmapLock_Release(wic_lock);
ID2D1GdiInteropRenderTarget_Release(interop);
@@ -7979,7 +7979,7 @@ static void test_layer(BOOL d3d11)
ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED);
hr = ID2D1RenderTarget_CreateLayer(rt, NULL, &layer);
- ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Layer_GetFactory(layer, &layer_factory);
ok(layer_factory == factory, "Got unexpected layer factory %p, expected %p.\n", layer_factory, factory);
ID2D1Factory_Release(layer_factory);
@@ -7990,7 +7990,7 @@ static void test_layer(BOOL d3d11)
set_size_f(&size, 800.0f, 600.0f);
hr = ID2D1RenderTarget_CreateLayer(rt, &size, &layer);
- ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
size = ID2D1Layer_GetSize(layer);
ok(size.width == 800.0f, "Got unexpected width %.8e.\n", size.width);
ok(size.height == 600.0f, "Got unexpected height %.8e.\n", size.height);
@@ -8023,12 +8023,12 @@ static void test_bezier_intersect(BOOL d3d11)
ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED);
set_color(&color, 0.890f, 0.851f, 0.600f, 1.0f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 160.0f, 720.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
@@ -8049,7 +8049,7 @@ static void test_bezier_intersect(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
ID2D1RenderTarget_BeginDraw(rt);
@@ -8057,7 +8057,7 @@ static void test_bezier_intersect(BOOL d3d11)
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
match = compare_figure(&ctx, 160, 120, 320, 240, 0xff652e89, 2048,
@@ -8087,9 +8087,9 @@ static void test_bezier_intersect(BOOL d3d11)
ok(match, "Figure does not match.\n");
hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
- ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(geometry, &sink);
- ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&point, 240.0f, 720.0f);
ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
@@ -8100,14 +8100,14 @@ static void test_bezier_intersect(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
hr = ID2D1GeometrySink_Close(sink);
- ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
ID2D1RenderTarget_BeginDraw(rt);
ID2D1RenderTarget_Clear(rt, &color);
ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL);
hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1PathGeometry_Release(geometry);
match = compare_figure(&ctx, 160, 120, 320, 240, 0xff652e89, 2048,
@@ -8155,7 +8155,7 @@ static void test_create_device(BOOL d3d11)
}
hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device);
- ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Device_GetFactory(device, &factory2);
ok(factory2 == (ID2D1Factory *)factory, "Got unexpected factory %p, expected %p.\n", factory2, factory);
@@ -8165,11 +8165,11 @@ static void test_create_device(BOOL d3d11)
if (pD2D1CreateDevice)
{
hr = pD2D1CreateDevice(ctx.device, NULL, &device);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Device_Release(device);
hr = pD2D1CreateDevice(ctx.device, &properties, &device);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Device_Release(device);
}
else
@@ -8178,7 +8178,7 @@ static void test_create_device(BOOL d3d11)
release_test_context(&ctx);
refcount = ID2D1Factory1_Release(factory);
- ok(!refcount, "Factory has %u references left.\n", refcount);
+ ok(!refcount, "Factory has %lu references left.\n", refcount);
}
#define check_rt_bitmap_surface(r, s, o) check_rt_bitmap_surface_(__LINE__, r, s, o)
@@ -8207,7 +8207,7 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B
bitmap_desc.dpiX = 96.0f;
bitmap_desc.dpiY = 96.0f;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create bitmap, hr %#lx.\n", hr);
check_bitmap_surface_(line, bitmap, has_surface, options);
@@ -8216,19 +8216,19 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B
/* Zero sized bitmaps. */
set_size_u(&size, 0, 0);
hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create bitmap, hr %#lx.\n", hr);
check_bitmap_surface_(line, bitmap, has_surface, options);
ID2D1Bitmap_Release(bitmap);
set_size_u(&size, 2, 0);
hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create bitmap, hr %#lx.\n", hr);
check_bitmap_surface_(line, bitmap, has_surface, options);
ID2D1Bitmap_Release(bitmap);
set_size_u(&size, 0, 2);
hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create bitmap, hr %#lx.\n", hr);
check_bitmap_surface_(line, bitmap, has_surface, options);
ID2D1Bitmap_Release(bitmap);
@@ -8237,15 +8237,15 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B
hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
&IID_IWICImagingFactory, (void **)&wic_factory);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create WIC imaging factory, hr %#lx.\n", hr);
hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16,
&GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create WIC bitmap, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create WIC bitmap, hr %#lx.\n", hr);
IWICImagingFactory_Release(wic_factory);
hr = ID2D1RenderTarget_CreateBitmapFromWicBitmap(rt, (IWICBitmapSource *)wic_bitmap, NULL, &bitmap);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap from WIC source, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create bitmap from WIC source, hr %#lx.\n", hr);
check_bitmap_surface_(line, bitmap, has_surface, options);
@@ -8255,7 +8255,7 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B
/* Compatible target follows its parent. */
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get device context, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get device context, hr %#lx.\n", hr);
dc_rt = NULL;
ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DCRenderTarget, (void **)&dc_rt);
@@ -8289,10 +8289,10 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B
hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL,
D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &compatible_rt);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create compatible render target, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create compatible render target, hr %#lx.\n", hr);
hr = ID2D1BitmapRenderTarget_QueryInterface(compatible_rt, &IID_ID2D1DeviceContext, (void **)&context2);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get device context, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get device context, hr %#lx.\n", hr);
ID2D1DeviceContext_GetDevice(context2, &device2);
ok_(__FILE__, line)(device == device2, "Unexpected device.\n");
@@ -8302,12 +8302,12 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B
hr = ID2D1BitmapRenderTarget_CreateBitmap(compatible_rt, size,
bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to create bitmap, hr %#lx.\n", hr);
check_bitmap_surface_(line, bitmap, has_surface, options);
ID2D1Bitmap_Release(bitmap);
hr = ID2D1BitmapRenderTarget_GetBitmap(compatible_rt, &bitmap);
- ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get compatible target bitmap, hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == S_OK, "Failed to get compatible target bitmap, hr %#lx.\n", hr);
bitmap2 = NULL;
ID2D1DeviceContext_GetTarget(context2, (ID2D1Image **)&bitmap2);
@@ -8324,7 +8324,7 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B
{
hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL,
D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &compatible_rt);
- ok_(__FILE__, line)(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT, "Unexpected hr %#x.\n", hr);
+ ok_(__FILE__, line)(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT, "Unexpected hr %#lx.\n", hr);
}
ID2D1DeviceContext_Release(context);
@@ -8355,13 +8355,13 @@ static IDXGISurface *create_surface(IDXGIDevice *dxgi_device, DXGI_FORMAT format
texture_desc.MiscFlags = 0;
hr = IDXGIDevice_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)&d3d_device);
- ok(SUCCEEDED(hr), "Failed to get device interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10Device_CreateTexture2D(d3d_device, &texture_desc, NULL, &texture);
- ok(SUCCEEDED(hr), "Failed to create a texture, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Failed to get surface interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID3D10Device_Release(d3d_device);
ID3D10Texture2D_Release(texture);
@@ -8428,7 +8428,7 @@ static void test_bitmap_surface(BOOL d3d11)
/* DXGI target */
hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&device_context);
- ok(SUCCEEDED(hr), "Failed to get device context, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
bitmap = NULL;
ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap);
@@ -8442,10 +8442,10 @@ static void test_bitmap_surface(BOOL d3d11)
/* Bitmap created from DXGI surface. */
hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device);
- ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context);
- ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(bitmap_format_tests); ++i)
{
@@ -8455,7 +8455,7 @@ static void test_bitmap_surface(BOOL d3d11)
hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, &bitmap_desc, &bitmap);
todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT)
- ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr);
+ ok(hr == bitmap_format_tests[i].hr, "%u: Got unexpected hr %#lx.\n", i, hr);
if (SUCCEEDED(bitmap_format_tests[i].hr))
{
@@ -8474,8 +8474,8 @@ static void test_bitmap_surface(BOOL d3d11)
surface2 = create_surface(ctx.device, DXGI_FORMAT_A8_UNORM);
hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface2, NULL, &bitmap);
- ok(SUCCEEDED(hr) || broken(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) /* Win7 */,
- "Failed to create a bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK || broken(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) /* Win7 */,
+ "Got unexpected hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
@@ -8489,7 +8489,7 @@ static void test_bitmap_surface(BOOL d3d11)
IDXGISurface_Release(surface2);
hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, NULL, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
pixel_format = ID2D1Bitmap1_GetPixelFormat(bitmap);
ok(pixel_format.alphaMode == D2D1_ALPHA_MODE_PREMULTIPLIED,
@@ -8511,14 +8511,14 @@ static void test_bitmap_surface(BOOL d3d11)
bitmap_desc.pixelFormat = ID2D1DeviceContext_GetPixelFormat(device_context);
size.width = size.height = 4;
hr = ID2D1DeviceContext_CreateBitmap(device_context, size, NULL, 0, &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_bitmap_surface((ID2D1Bitmap *)bitmap, TRUE, D2D1_BITMAP_OPTIONS_NONE);
ID2D1DeviceContext_SetTags(device_context, 1, 2);
ID2D1DeviceContext_BeginDraw(device_context);
ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap);
hr = ID2D1DeviceContext_EndDraw(device_context, &t1, &t2);
- ok(hr == D2DERR_INVALID_TARGET, "Unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_INVALID_TARGET, "Got unexpected hr %#lx.\n", hr);
ok(t1 == 1 && t2 == 2, "Unexpected tags %s:%s.\n", wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2));
ID2D1Bitmap1_Release(bitmap);
@@ -8529,7 +8529,7 @@ static void test_bitmap_surface(BOOL d3d11)
bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET;
hr = ID2D1DeviceContext_CreateBitmap(device_context, size, NULL, 0, &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_bitmap_surface((ID2D1Bitmap *)bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET);
ID2D1DeviceContext_SetTarget(device_context, NULL);
ID2D1DeviceContext_SetTags(device_context, 3, 4);
@@ -8537,7 +8537,7 @@ static void test_bitmap_surface(BOOL d3d11)
ID2D1DeviceContext_BeginDraw(device_context);
ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap);
hr = ID2D1DeviceContext_EndDraw(device_context, &t1, &t2);
- ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(!t1 && !t2, "Unexpected tags %s:%s.\n", wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2));
ID2D1Bitmap1_Release(bitmap);
@@ -8555,10 +8555,10 @@ static void test_bitmap_surface(BOOL d3d11)
rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE;
rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory1_CreateDCRenderTarget(factory, &rt_desc, (ID2D1DCRenderTarget **)&rt);
- ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context);
- ok(SUCCEEDED(hr), "Failed to get device context, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap);
ok(!bitmap, "Unexpected target.\n");
@@ -8575,7 +8575,7 @@ static void test_bitmap_surface(BOOL d3d11)
ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n");
hr = ID2D1Factory1_CreateHwndRenderTarget(factory, &rt_desc, &hwnd_rt_desc, (ID2D1HwndRenderTarget **)&rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE);
ID2D1RenderTarget_Release(rt);
@@ -8586,14 +8586,14 @@ static void test_bitmap_surface(BOOL d3d11)
hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
&IID_IWICImagingFactory, (void **)&wic_factory);
- ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16,
&GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IWICImagingFactory_Release(wic_factory);
hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_rt_bitmap_surface(rt, FALSE, D2D1_BITMAP_OPTIONS_NONE);
ID2D1RenderTarget_Release(rt);
@@ -8637,10 +8637,10 @@ static void test_device_context(BOOL d3d11)
}
hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device);
- ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context);
- ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DeviceContext_GetDevice(device_context, &device2);
ok(device2 == device, "Unexpected device instance.\n");
@@ -8658,19 +8658,19 @@ static void test_device_context(BOOL d3d11)
/* DXGI target */
rt = ctx.rt;
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context);
- ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap);
options = ID2D1Bitmap1_GetOptions(bitmap);
ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW),
"Unexpected bitmap options %#x.\n", options);
hr = ID2D1Bitmap1_GetSurface(bitmap, &surface2);
- ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(surface2 == ctx.surface, "Unexpected surface instance.\n");
IDXGISurface_Release(surface2);
ID2D1DeviceContext_BeginDraw(device_context);
hr = ID2D1Bitmap1_GetSurface(bitmap, &surface2);
- ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(surface2 == ctx.surface, "Unexpected surface instance.\n");
IDXGISurface_Release(surface2);
ID2D1DeviceContext_EndDraw(device_context, NULL, NULL);
@@ -8687,10 +8687,10 @@ static void test_device_context(BOOL d3d11)
hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
&IID_IWICImagingFactory, (void **)&wic_factory);
- ok(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16,
&GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
IWICImagingFactory_Release(wic_factory);
rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
@@ -8701,16 +8701,16 @@ static void test_device_context(BOOL d3d11)
rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE;
rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory1_CreateWicBitmapRenderTarget(factory, wic_bitmap, &rt_desc, &rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context);
- ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap);
options = ID2D1Bitmap1_GetOptions(bitmap);
ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW),
"Unexpected bitmap options %#x.\n", options);
hr = ID2D1Bitmap1_GetSurface(bitmap, &surface);
- todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
ID2D1Bitmap1_Release(bitmap);
ID2D1DeviceContext_SetTarget(device_context, NULL);
@@ -8731,16 +8731,16 @@ static void test_device_context(BOOL d3d11)
ok(!!hwnd_rt_desc.hwnd, "Failed to create target window.\n");
hr = ID2D1Factory1_CreateHwndRenderTarget(factory, &rt_desc, &hwnd_rt_desc, (ID2D1HwndRenderTarget **)&rt);
- ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context);
- ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap);
options = ID2D1Bitmap1_GetOptions(bitmap);
ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW),
"Unexpected bitmap options %#x.\n", options);
hr = ID2D1Bitmap1_GetSurface(bitmap, &surface);
- ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
ID2D1Bitmap1_Release(bitmap);
ID2D1DeviceContext_SetTarget(device_context, NULL);
@@ -8753,10 +8753,10 @@ static void test_device_context(BOOL d3d11)
/* DC target */
hr = ID2D1Factory1_CreateDCRenderTarget(factory, &rt_desc, &dc_rt);
- ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1DCRenderTarget_QueryInterface(dc_rt, &IID_ID2D1DeviceContext, (void **)&device_context);
- ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap);
ok(bitmap == NULL, "Unexpected bitmap instance.\n");
@@ -8767,14 +8767,14 @@ static void test_device_context(BOOL d3d11)
SetRect(&rect, 0, 0, 16, 16);
hr = ID2D1DCRenderTarget_BindDC(dc_rt, hdc, &rect);
- ok(SUCCEEDED(hr), "BindDC() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap);
options = ID2D1Bitmap1_GetOptions(bitmap);
ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE),
"Unexpected bitmap options %#x.\n", options);
hr = ID2D1Bitmap1_GetSurface(bitmap, &surface);
- ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
ID2D1Bitmap1_Release(bitmap);
ID2D1DeviceContext_SetTarget(device_context, NULL);
@@ -8918,10 +8918,10 @@ static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, IDXGIDe
HRESULT hr;
hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device);
- ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context);
- ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Device_Release(device);
return device_context;
@@ -8975,7 +8975,7 @@ static void test_command_list(BOOL d3d11)
ok(device_context != NULL, "Failed to create device context.\n");
hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list);
- todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
if (FAILED(hr))
{
@@ -8988,7 +8988,7 @@ static void test_command_list(BOOL d3d11)
ID2D1DeviceContext_BeginDraw(device_context);
hr = ID2D1DeviceContext_QueryInterface(device_context, &IID_ID2D1RenderTarget, (void **)&rt);
- ok(SUCCEEDED(hr), "Failed to get rt interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Test how resources are referenced by the list. */
@@ -8999,70 +8999,70 @@ static void test_command_list(BOOL d3d11)
bitmap_desc.dpiX = 96.0f;
bitmap_desc.dpiY = 96.0f;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_DrawBitmap(rt, bitmap, NULL, 0.25f, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL);
refcount = ID2D1Bitmap_Release(bitmap);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
/* Solid color brush. */
set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, (ID2D1SolidColorBrush **)&brush);
- ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, 0.0f, 0.0f, 16.0f, 16.0f);
ID2D1RenderTarget_FillRectangle(rt, &rect, brush);
refcount = ID2D1Brush_Release(brush);
- ok(refcount == 0, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 0, "Got unexpected refcount %lu.\n", refcount);
/* Bitmap brush. */
hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, (ID2D1BitmapBrush **)&brush);
- ok(SUCCEEDED(hr), "Failed to create bitmap brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, 0.0f, 0.0f, 16.0f, 16.0f);
ID2D1RenderTarget_FillRectangle(rt, &rect, brush);
refcount = ID2D1Brush_Release(brush);
- ok(refcount == 0, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 0, "Got unexpected refcount %lu.\n", refcount);
refcount = ID2D1Bitmap_Release(bitmap);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
/* Linear gradient brush. */
hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops),
D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient);
- ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&linear_gradient_properties.startPoint, 320.0f, 0.0f);
set_point(&linear_gradient_properties.endPoint, 0.0f, 960.0f);
hr = ID2D1RenderTarget_CreateLinearGradientBrush(rt, &linear_gradient_properties, NULL, gradient,
(ID2D1LinearGradientBrush **)&brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f);
hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL);
refcount = ID2D1Brush_Release(brush);
- ok(refcount == 0, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 0, "Got unexpected refcount %lu.\n", refcount);
refcount = ID2D1Geometry_Release(geometry);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
refcount = ID2D1GradientStopCollection_Release(gradient);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
/* Radial gradient brush. */
hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops),
D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient);
- ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&radial_gradient_properties.center, 160.0f, 480.0f);
set_point(&radial_gradient_properties.gradientOriginOffset, 40.0f, -120.0f);
@@ -9070,39 +9070,39 @@ static void test_command_list(BOOL d3d11)
radial_gradient_properties.radiusY = 480.0f;
hr = ID2D1RenderTarget_CreateRadialGradientBrush(rt, &radial_gradient_properties, NULL, gradient,
(ID2D1RadialGradientBrush **)&brush);
- ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f);
hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL);
refcount = ID2D1Brush_Release(brush);
- ok(refcount == 0, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 0, "Got unexpected refcount %lu.\n", refcount);
refcount = ID2D1Geometry_Release(geometry);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
refcount = ID2D1GradientStopCollection_Release(gradient);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
/* Geometry. */
set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f);
hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, (ID2D1SolidColorBrush **)&brush);
- ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL);
refcount = ID2D1Brush_Release(brush);
- ok(refcount == 0, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 0, "Got unexpected refcount %lu.\n", refcount);
refcount = ID2D1Geometry_Release(geometry);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
/* Stroke style. */
stroke_desc.startCap = D2D1_CAP_STYLE_SQUARE;
@@ -9114,21 +9114,21 @@ static void test_command_list(BOOL d3d11)
stroke_desc.dashOffset = -1.0f;
hr = ID2D1Factory_CreateStrokeStyle((ID2D1Factory *)factory, &stroke_desc, NULL, 0, &stroke_style);
- ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, (ID2D1SolidColorBrush **)&brush);
- ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_point(&p0, 100.0f, 160.0f);
set_point(&p1, 140.0f, 160.0f);
ID2D1RenderTarget_DrawLine(rt, p0, p1, brush, 1.0f, stroke_style);
refcount = ID2D1Brush_Release(brush);
- ok(refcount == 0, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 0, "Got unexpected refcount %lu.\n", refcount);
refcount = ID2D1StrokeStyle_Release(stroke_style);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
/* Close on attached list. */
ID2D1DeviceContext_GetTarget(device_context, &target);
@@ -9136,22 +9136,22 @@ static void test_command_list(BOOL d3d11)
ID2D1Image_Release(target);
hr = ID2D1CommandList_Close(command_list);
- ok(SUCCEEDED(hr), "Failed to close a list, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DeviceContext_GetTarget(device_context, &target);
ok(target == NULL, "Unexpected context target.\n");
hr = ID2D1CommandList_Close(command_list);
- ok(hr == D2DERR_WRONG_STATE, "Unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr);
ID2D1CommandList_Release(command_list);
/* Close empty list. */
hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list);
- ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1CommandList_Close(command_list);
- ok(SUCCEEDED(hr), "Failed to close a list, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1CommandList_Release(command_list);
@@ -9160,7 +9160,7 @@ static void test_command_list(BOOL d3d11)
ok(device_context2 != NULL, "Failed to create device context.\n");
hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list);
- ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1DeviceContext_SetTarget(device_context2, (ID2D1Image *)command_list);
ID2D1DeviceContext_GetTarget(device_context2, &target);
@@ -9213,21 +9213,21 @@ static void test_max_bitmap_size(BOOL d3d11)
};
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(device_types); ++i)
{
if (FAILED(hr = D3D10CreateDevice1(NULL, device_types[i].type, NULL, D3D10_CREATE_DEVICE_BGRA_SUPPORT,
D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device)))
{
- skip("Failed to create %s d3d device, hr %#x.\n", device_types[i].name, hr);
+ skip("Failed to create %s d3d device, hr %#lx.\n", device_types[i].name, hr);
continue;
}
window = create_window();
swapchain = create_d3d10_swapchain(device, window, TRUE);
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface);
- ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (j = 0; j < ARRAY_SIZE(target_types); ++j)
{
@@ -9244,8 +9244,7 @@ static void test_max_bitmap_size(BOOL d3d11)
desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, &desc, &rt);
- ok(SUCCEEDED(hr), "%s/%s: failed to create render target, hr %#x.\n", device_types[i].name,
- target_types[j].name, hr);
+ ok(hr == S_OK, "%s/%s: Got unexpected hr %#lx.\n", device_types[i].name, target_types[j].name, hr);
bitmap_size = ID2D1RenderTarget_GetMaximumBitmapSize(rt);
ok(bitmap_size >= D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION, "%s/%s: unexpected bitmap size %u.\n",
@@ -9259,7 +9258,7 @@ static void test_max_bitmap_size(BOOL d3d11)
size.width = bitmap_size;
size.height = 1;
hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap);
- ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Bitmap_Release(bitmap);
ID2D1RenderTarget_Release(rt);
@@ -9277,8 +9276,8 @@ static void test_max_bitmap_size(BOOL d3d11)
texture_desc.MiscFlags = 0;
hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture);
- ok(SUCCEEDED(hr) || broken(hr == E_INVALIDARG && device_types[i].type == D3D10_DRIVER_TYPE_WARP) /* Vista */,
- "%s/%s: failed to create texture, hr %#x.\n", device_types[i].name, target_types[j].name, hr);
+ ok(hr == S_OK || broken(hr == E_INVALIDARG && device_types[i].type == D3D10_DRIVER_TYPE_WARP) /* Vista */,
+ "%s/%s: Got unexpected hr %#lx.\n", device_types[i].name, target_types[j].name, hr);
if (SUCCEEDED(hr))
ID3D10Texture2D_Release(texture);
}
@@ -9355,7 +9354,7 @@ static void test_dpi(BOOL d3d11)
bitmap_desc.colorContext = NULL;
hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, &bitmap_desc, &bitmap);
/* Native accepts negative DPI values for DXGI surface bitmap. */
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
ID2D1DeviceContext_SetDpi(device_context, dc_dpi_x, dc_dpi_y);
@@ -9370,7 +9369,7 @@ static void test_dpi(BOOL d3d11)
ID2D1DeviceContext_BeginDraw(device_context);
ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap);
hr = ID2D1DeviceContext_EndDraw(device_context, NULL, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* Device context DPI values aren't updated by SetTarget. */
ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y);
@@ -9384,7 +9383,7 @@ static void test_dpi(BOOL d3d11)
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
&IID_IWICImagingFactory, (void **)&wic_factory);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(create_dpi_tests); ++i)
{
IWICBitmapSource *wic_bitmap_src;
@@ -9394,9 +9393,9 @@ static void test_dpi(BOOL d3d11)
hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16,
&GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
hr = IWICBitmap_QueryInterface(wic_bitmap, &IID_IWICBitmapSource, (void **)&wic_bitmap_src);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
IWICBitmap_Release(wic_bitmap);
bitmap_desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN;
@@ -9406,7 +9405,7 @@ static void test_dpi(BOOL d3d11)
bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW;
bitmap_desc.colorContext = NULL;
hr = ID2D1DeviceContext_CreateBitmapFromWicBitmap(device_context, wic_bitmap_src, &bitmap_desc, &bitmap);
- ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n",
+ ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#lx, expected %#lx.\n",
i, hr, create_dpi_tests[i].hr);
IWICBitmapSource_Release(wic_bitmap_src);
@@ -9433,7 +9432,7 @@ static void test_dpi(BOOL d3d11)
ID2D1DeviceContext_BeginDraw(device_context);
ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap);
hr = ID2D1DeviceContext_EndDraw(device_context, NULL, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* Device context DPI values aren't updated by SetTarget. */
ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y);
@@ -9459,7 +9458,7 @@ static void test_dpi(BOOL d3d11)
bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW;
bitmap_desc.colorContext = NULL;
hr = ID2D1DeviceContext_CreateBitmap(device_context, size, NULL, 0, &bitmap_desc, &bitmap);
- ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n",
+ ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#lx, expected %#lx.\n",
i, hr, create_dpi_tests[i].hr);
if (FAILED(hr))
@@ -9485,7 +9484,7 @@ static void test_dpi(BOOL d3d11)
ID2D1DeviceContext_BeginDraw(device_context);
ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)bitmap);
hr = ID2D1DeviceContext_EndDraw(device_context, NULL, NULL);
- ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr);
/* Device context DPI values aren't updated by SetTarget. */
ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y);
@@ -9536,16 +9535,16 @@ static void test_wic_bitmap_format(BOOL d3d11)
hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
&IID_IWICImagingFactory, (void **)&wic_factory);
- ok(hr == S_OK, "Failed to create WIC imaging factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16,
tests[i].wic, WICBitmapCacheOnDemand, &wic_bitmap);
- ok(hr == S_OK, "%s: Failed to create WIC bitmap, hr %#x.\n", debugstr_guid(tests[i].wic), hr);
+ ok(hr == S_OK, "%s: Got unexpected hr %#lx.\n", debugstr_guid(tests[i].wic), hr);
hr = ID2D1RenderTarget_CreateBitmapFromWicBitmap(rt, (IWICBitmapSource *)wic_bitmap, NULL, &bitmap);
- ok(hr == S_OK, "%s: Failed to create bitmap from WIC source, hr %#x.\n", debugstr_guid(tests[i].wic), hr);
+ ok(hr == S_OK, "%s: Got unexpected hr %#lx.\n", debugstr_guid(tests[i].wic), hr);
format = ID2D1Bitmap_GetPixelFormat(bitmap);
ok(format.format == tests[i].d2d.format, "%s: Got unexpected DXGI format %#x.\n",
@@ -9740,22 +9739,22 @@ static void test_geometry_group(BOOL d3d11)
BOOL match;
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometries[0]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, -2.0f, -2.0f, 0.0f, 2.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometries[1]);
- ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_CreateGeometryGroup(factory, D2D1_FILL_MODE_ALTERNATE, geometries, 2, &group);
- ok(SUCCEEDED(hr), "Failed to create geometry group, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f);
hr = ID2D1GeometryGroup_GetBounds(group, NULL, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry group bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, -2.0f, -2.0f, 1.0f, 2.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -9764,7 +9763,7 @@ static void test_geometry_group(BOOL d3d11)
translate_matrix(&matrix, 80.0f, 640.0f);
scale_matrix(&matrix, 2.0f, 0.5f);
hr = ID2D1GeometryGroup_GetBounds(group, &matrix, &rect);
- ok(SUCCEEDED(hr), "Failed to get geometry group bounds, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
match = compare_rect(&rect, 76.0f, 639.0f, 82.0f, 641.0f, 0);
ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n",
rect.left, rect.top, rect.right, rect.bottom);
@@ -9795,10 +9794,10 @@ static void test_mt_factory(BOOL d3d11)
DWORD ret;
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED + 1, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread);
if (hr == E_NOINTERFACE)
@@ -9807,7 +9806,7 @@ static void test_mt_factory(BOOL d3d11)
ID2D1Factory_Release(factory);
return;
}
- ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = ID2D1Multithread_GetMultithreadProtected(multithread);
ok(!ret, "Unexpected return value.\n");
@@ -9822,10 +9821,10 @@ static void test_mt_factory(BOOL d3d11)
ID2D1Factory_Release(factory);
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread);
- ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = ID2D1Multithread_GetMultithreadProtected(multithread);
ok(!!ret, "Unexpected return value.\n");
@@ -9887,7 +9886,7 @@ static void test_effect(BOOL d3d11)
}
hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(effect_tests); ++i)
{
@@ -9896,82 +9895,74 @@ static void test_effect(BOOL d3d11)
winetest_push_context("Test %u", i);
hr = ID2D1DeviceContext_CreateEffect(context, test->clsid, &effect);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Effect_GetOutput(effect, &image_b);
ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a);
ID2D1Image_Release(image_b);
ID2D1Image_Release(image_a);
hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid));
- ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) + 1);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) - 1);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid));
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer));
- todo_wine
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size);
- todo_wine
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size - 1);
- todo_wine
- ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, 0xdeadbeef, (BYTE *)&clsid, sizeof(clsid));
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_UNKNOWN, (BYTE *)&clsid, sizeof(clsid));
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)&clsid, sizeof(clsid));
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, buffer, sizeof(buffer));
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID,
D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid));
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
- if (hr == S_OK)
- ok(IsEqualGUID(&clsid, test->clsid), "Got unexpected clsid %s, expected %s.\n",
- debugstr_guid(&clsid), debugstr_guid(test->clsid));
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ ok(IsEqualGUID(&clsid, test->clsid), "Got unexpected clsid %s, expected %s.\n",
+ debugstr_guid(&clsid), debugstr_guid(test->clsid));
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CACHED,
D2D1_PROPERTY_TYPE_BOOL, (BYTE *)&cached, sizeof(cached));
- todo_wine
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
if (hr == S_OK)
ok(cached == FALSE, "Got unexpected cached %d.\n", cached);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_PRECISION,
D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision));
- todo_wine
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
if (hr == S_OK)
ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %u.\n", precision);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MIN_INPUTS,
D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&min_inputs, sizeof(min_inputs));
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
- if (hr == S_OK)
- ok(min_inputs == test->min_inputs, "Got unexpected min inputs %u, expected %u.\n",
- min_inputs, test->min_inputs);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ ok(min_inputs == test->min_inputs, "Got unexpected min inputs %u, expected %u.\n",
+ min_inputs, test->min_inputs);
hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MAX_INPUTS,
D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&max_inputs, sizeof(max_inputs));
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
- if (hr == S_OK)
- ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n",
- max_inputs, test->max_inputs);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n",
+ max_inputs, test->max_inputs);
input_count = ID2D1Effect_GetInputCount(effect);
- ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n",
+ ok(input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n",
input_count, test->default_input_count);
input_count = (test->max_inputs < 16 ? test->max_inputs : 16);
@@ -9980,9 +9971,9 @@ static void test_effect(BOOL d3d11)
winetest_push_context("Input %u", j);
hr = ID2D1Effect_SetInputCount(effect, j);
if (j < test->min_inputs || j > test->max_inputs)
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
else
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
winetest_pop_context();
}
@@ -10001,7 +9992,7 @@ static void test_effect(BOOL d3d11)
bitmap_desc.dpiX = 96.0f;
bitmap_desc.dpiY = 96.0f;
hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, size, NULL, 4, &bitmap_desc, &bitmap);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE);
for (j = 0; j < input_count + 4; ++j)
@@ -10120,10 +10111,10 @@ static void test_effect_2d_affine(BOOL d3d11)
}
hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(effect_2d_affine_tests); ++i)
{
@@ -10139,13 +10130,13 @@ static void test_effect_2d_affine(BOOL d3d11)
bitmap_desc.colorContext = NULL;
hr = ID2D1DeviceContext_CreateBitmap(context, input_size, test->img_data,
sizeof(*test->img_data) * test->img_width, &bitmap_desc, &bitmap);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE);
todo_wine
hr = ID2D1Effect_SetValue(effect, D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX,
D2D1_PROPERTY_TYPE_MATRIX_3X2, (const BYTE *)test->matrix, sizeof(*test->matrix));
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Effect_GetOutput(effect, &output);
ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds);
@@ -10168,7 +10159,7 @@ static void test_effect_2d_affine(BOOL d3d11)
offset.y = 240.0f;
ID2D1DeviceContext_DrawImage(context, output, &offset, NULL, 0, 0);
hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
x = offset.x + output_bounds.left - 2.0f;
y = offset.y + output_bounds.top - 2.0f;
@@ -10232,10 +10223,10 @@ static void test_effect_crop(BOOL d3d11)
}
hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Crop, &effect);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(crop_effect_tests); ++i)
{
@@ -10251,12 +10242,12 @@ static void test_effect_crop(BOOL d3d11)
bitmap_desc.colorContext = NULL;
hr = ID2D1DeviceContext_CreateBitmap(context, input_size, image,
sizeof(*image) * 16, &bitmap_desc, &bitmap);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE);
hr = ID2D1Effect_SetValue(effect, D2D1_CROP_PROP_RECT, D2D1_PROPERTY_TYPE_VECTOR4,
(const BYTE *)&test->crop_rect, sizeof(test->crop_rect));
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1Effect_GetOutput(effect, &output);
set_rect(&output_bounds, -1.0f, -1.0f, -1.0f, -1.0f);
@@ -10458,11 +10449,11 @@ static void test_stroke_contains_point(BOOL d3d11)
};
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
set_rect(&rect, 0.0f, 0.0f, 10.0f, 20.0f);
hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &rectangle);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(rectangle_tests); ++i)
{
const struct contains_point_test *test = &rectangle_tests[i];
@@ -10472,7 +10463,7 @@ static void test_stroke_contains_point(BOOL d3d11)
contains = !test->contains;
hr = ID2D1RectangleGeometry_StrokeContainsPoint(rectangle, test->point, test->stroke_width,
NULL, test->matrix ? &test->transform : NULL, test->tolerance, &contains);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(contains == test->contains, "Got unexpected result %#x.\n", contains);
winetest_pop_context();
@@ -10480,9 +10471,9 @@ static void test_stroke_contains_point(BOOL d3d11)
ID2D1RectangleGeometry_Release(rectangle);
hr = ID2D1Factory_CreatePathGeometry(factory, &path);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID2D1PathGeometry_Open(path, &sink);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* A limaçon. */
set_point(&point, 160.0f, 720.0f);
@@ -10524,7 +10515,7 @@ static void test_stroke_contains_point(BOOL d3d11)
ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN);
hr = ID2D1GeometrySink_Close(sink);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID2D1GeometrySink_Release(sink);
for (i = 0; i < ARRAY_SIZE(path_tests); ++i)
@@ -10536,7 +10527,7 @@ static void test_stroke_contains_point(BOOL d3d11)
contains = !test->contains;
hr = ID2D1PathGeometry_StrokeContainsPoint(path, test->point, test->stroke_width,
NULL, test->matrix ? &test->transform : NULL, test->tolerance, &contains);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(contains == test->contains, "Got unexpected result %#x.\n", contains);
winetest_pop_context();
--
2.30.2
2
1
[PATCH 3/5] d2d1/tests: Declare "level" as D3D_FEATURE_LEVEL in create_d3d11_device().
by Henri Verbeet 03 Feb '22
by Henri Verbeet 03 Feb '22
03 Feb '22
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/d2d1/tests/d2d1.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 314d8b7ce60d..003aad605054 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -824,7 +824,7 @@ static ID3D10Device1 *create_d3d10_device(void)
static ID3D11Device *create_d3d11_device(void)
{
- DWORD level = D3D_FEATURE_LEVEL_11_0;
+ D3D_FEATURE_LEVEL level = D3D_FEATURE_LEVEL_11_0;
ID3D11Device *device;
if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL,
--
2.30.2
2
1
03 Feb '22
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/d2d1/tests/d2d1.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index b0aa02ad2a90..314d8b7ce60d 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -536,6 +536,7 @@ static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp,
HCRYPTPROV provider;
BYTE hash_data[20];
HCRYPTHASH hash;
+ DWORD hash_size;
unsigned int i;
char sha1[41];
BOOL ret;
@@ -552,10 +553,10 @@ static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp,
}
ok(ret, "Failed to hash data.\n");
- i = sizeof(hash_data);
- ret = CryptGetHashParam(hash, HP_HASHVAL, hash_data, &i, 0);
+ hash_size = sizeof(hash_data);
+ ret = CryptGetHashParam(hash, HP_HASHVAL, hash_data, &hash_size, 0);
ok(ret, "Failed to get hash value.\n");
- ok(i == sizeof(hash_data), "Got unexpected hash size %u.\n", i);
+ ok(hash_size == sizeof(hash_data), "Got unexpected hash size %u.\n", hash_size);
ret = CryptDestroyHash(hash);
ok(ret, "Failed to destroy hash.\n");
--
2.30.2
2
1
03 Feb '22
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/d3d10_1/tests/Makefile.in | 1 -
dlls/d3d10_1/tests/d3d10_1.c | 104 ++++++++++++++++-----------------
2 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/dlls/d3d10_1/tests/Makefile.in b/dlls/d3d10_1/tests/Makefile.in
index 97eaf324ff78..256bb407d414 100644
--- a/dlls/d3d10_1/tests/Makefile.in
+++ b/dlls/d3d10_1/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = d3d10_1.dll
IMPORTS = d3d10_1 user32
diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c
index 51da614d9d76..33abd919a031 100644
--- a/dlls/d3d10_1/tests/d3d10_1.c
+++ b/dlls/d3d10_1/tests/d3d10_1.c
@@ -87,7 +87,7 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, BOOL
hr = IUnknown_QueryInterface(unknown, iid, (void **)&out);
ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr),
- "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ "Got unexpected hr %#lx, expected %#lx.\n", hr, expected_hr);
if (SUCCEEDED(hr))
IUnknown_Release(out);
return hr;
@@ -128,18 +128,18 @@ static void test_create_device(void)
hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, NULL);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
device = (ID3D10Device1 *)0xdeadbeef;
hr = D3D10CreateDevice1(NULL, 0xffffffff, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, &device);
- todo_wine ok(hr == E_INVALIDARG, "D3D10CreateDevice1 returned %#x.\n", hr);
+ todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok(!device, "Got unexpected device pointer %p.\n", device);
device = (ID3D10Device1 *)0xdeadbeef;
hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
0, D3D10_1_SDK_VERSION, &device);
- ok(hr == E_INVALIDARG, "D3D10CreateDevice1 returned %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok(!device, "Got unexpected device pointer %p.\n", device);
window = CreateWindowA("static", "d3d10_1_test", 0, 0, 0, 0, 0, 0, 0, 0, 0);
@@ -162,13 +162,13 @@ static void test_create_device(void)
hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, &swapchain_desc, &swapchain, &device);
- ok(SUCCEEDED(hr), "D3D10CreateDeviceAndSwapChain1 failed %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
check_interface(swapchain, &IID_IDXGISwapChain1, TRUE, FALSE);
memset(&obtained_desc, 0, sizeof(obtained_desc));
hr = IDXGISwapChain_GetDesc(swapchain, &obtained_desc);
- ok(SUCCEEDED(hr), "GetDesc failed %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(obtained_desc.BufferDesc.Width == swapchain_desc.BufferDesc.Width,
"Got unexpected BufferDesc.Width %u.\n", obtained_desc.BufferDesc.Width);
ok(obtained_desc.BufferDesc.Height == swapchain_desc.BufferDesc.Height,
@@ -203,56 +203,56 @@ static void test_create_device(void)
"Got unexpected Flags %#x.\n", obtained_desc.Flags);
refcount = IDXGISwapChain_Release(swapchain);
- ok(!refcount, "Swapchain has %u references left.\n", refcount);
+ ok(!refcount, "Swapchain has %lu references left.\n", refcount);
feature_level = ID3D10Device1_GetFeatureLevel(device);
ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n",
feature_level, supported_feature_level);
refcount = ID3D10Device1_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, NULL, NULL, &device);
- ok(SUCCEEDED(hr), "D3D10CreateDeviceAndSwapChain1 failed %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = ID3D10Device1_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, NULL, NULL, NULL);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, &swapchain_desc, NULL, NULL);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
swapchain = (IDXGISwapChain *)0xdeadbeef;
device = (ID3D10Device1 *)0xdeadbeef;
hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
0, D3D10_1_SDK_VERSION, &swapchain_desc, &swapchain, &device);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain);
ok(!device, "Got unexpected device pointer %p.\n", device);
swapchain = (IDXGISwapChain *)0xdeadbeef;
hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, &swapchain_desc, &swapchain, NULL);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain);
swapchain_desc.OutputWindow = NULL;
hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, &swapchain_desc, NULL, &device);
- ok(SUCCEEDED(hr), "D3D10CreateDeviceAndSwapChain1 failed %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = ID3D10Device1_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
swapchain = (IDXGISwapChain *)0xdeadbeef;
device = (ID3D10Device1 *)0xdeadbeef;
swapchain_desc.OutputWindow = NULL;
hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, &swapchain_desc, &swapchain, &device);
- ok(hr == DXGI_ERROR_INVALID_CALL, "D3D10CreateDeviceAndSwapChain1 returned %#x.\n", hr);
+ ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain);
ok(!device, "Got unexpected device pointer %p.\n", device);
@@ -262,7 +262,7 @@ static void test_create_device(void)
swapchain_desc.BufferDesc.Format = DXGI_FORMAT_BC5_UNORM;
hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0,
supported_feature_level, D3D10_1_SDK_VERSION, &swapchain_desc, &swapchain, &device);
- ok(hr == E_INVALIDARG, "D3D10CreateDeviceAndSwapChain1 returned %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain);
ok(!device, "Got unexpected device pointer %p.\n", device);
@@ -317,7 +317,7 @@ static void test_device_interfaces(void)
IDXGIDevice_Release(dxgi_device);
refcount = ID3D10Device1_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i)
@@ -336,7 +336,7 @@ static void test_device_interfaces(void)
check_interface(device, &IID_ID3D10InfoQueue, TRUE, FALSE);
refcount = ID3D10Device1_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
}
@@ -366,10 +366,10 @@ static void test_create_shader_resource_view(void)
buffer_desc.MiscFlags = 0;
hr = ID3D10Device1_CreateBuffer(device, &buffer_desc, NULL, &buffer);
- ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, NULL, &srview);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
srv_desc.ViewDimension = D3D10_1_SRV_DIMENSION_BUFFER;
@@ -377,19 +377,19 @@ static void test_create_shader_resource_view(void)
U(srv_desc).Buffer.ElementWidth = 64;
hr = ID3D10Device1_CreateShaderResourceView1(device, NULL, &srv_desc, &srview);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
expected_refcount = get_refcount((IUnknown *)device) + 1;
hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview);
- ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
refcount = get_refcount((IUnknown *)device);
- ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
+ ok(refcount >= expected_refcount, "Got unexpected refcount %lu, expected >= %lu.\n", refcount, expected_refcount);
tmp_device = NULL;
expected_refcount = refcount + 1;
ID3D10ShaderResourceView1_GetDevice(srview, &tmp_device);
ok(tmp_device == (ID3D10Device *)device, "Got unexpected device %p, expected %p.\n", tmp_device, device);
refcount = get_refcount((IUnknown *)device);
- ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+ ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp_device);
check_interface(srview, &IID_ID3D10ShaderResourceView, TRUE, FALSE);
@@ -407,10 +407,10 @@ static void test_create_shader_resource_view(void)
buffer_desc.MiscFlags = 0;
hr = ID3D10Device1_CreateBuffer(device, &buffer_desc, NULL, &buffer);
- ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
ID3D10Buffer_Release(buffer);
@@ -427,10 +427,10 @@ static void test_create_shader_resource_view(void)
texture_desc.MiscFlags = 0;
hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture);
- ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)texture, NULL, &srview);
- ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ID3D10ShaderResourceView1_GetDesc1(srview, &srv_desc);
ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format);
@@ -448,7 +448,7 @@ static void test_create_shader_resource_view(void)
ID3D10Texture2D_Release(texture);
refcount = ID3D10Device1_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_create_blend_state(void)
@@ -557,7 +557,7 @@ static void test_create_blend_state(void)
}
hr = ID3D10Device1_CreateBlendState1(device, NULL, &blend_state1);
- ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
memset(&desc, 0, sizeof(desc));
desc.AlphaToCoverageEnable = FALSE;
@@ -573,18 +573,18 @@ static void test_create_blend_state(void)
expected_refcount = get_refcount((IUnknown *)device) + 1;
hr = ID3D10Device1_CreateBlendState1(device, &desc, &blend_state1);
- ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10Device1_CreateBlendState1(device, &desc, &blend_state2);
- ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(blend_state1 == blend_state2, "Got different blend state objects.\n");
refcount = get_refcount((IUnknown *)device);
- ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount);
+ ok(refcount >= expected_refcount, "Got unexpected refcount %lu, expected >= %lu.\n", refcount, expected_refcount);
tmp = NULL;
expected_refcount = refcount + 1;
ID3D10BlendState1_GetDevice(blend_state1, &tmp);
ok(tmp == (ID3D10Device *)device, "Got unexpected device %p, expected %p.\n", tmp, device);
refcount = get_refcount((IUnknown *)device);
- ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
+ ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount);
ID3D10Device_Release(tmp);
ID3D10BlendState1_GetDesc1(blend_state1, &obtained_desc);
@@ -625,16 +625,16 @@ static void test_create_blend_state(void)
check_interface(blend_state1, &IID_ID3D11BlendState, TRUE, TRUE);
refcount = ID3D10BlendState1_Release(blend_state1);
- ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);
+ ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount);
refcount = ID3D10BlendState1_Release(blend_state2);
- ok(!refcount, "Blend state has %u references left.\n", refcount);
+ ok(!refcount, "Blend state has %lu references left.\n", refcount);
for (i = 0; i < ARRAY_SIZE(desc_conversion_tests); ++i)
{
const D3D10_BLEND_DESC1 *current_desc = &desc_conversion_tests[i];
hr = ID3D10Device1_CreateBlendState1(device, current_desc, &blend_state1);
- ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10BlendState1_QueryInterface(blend_state1, &IID_ID3D10BlendState, (void **)&d3d10_blend_state);
ok(SUCCEEDED(hr), "Blend state should implement ID3D10BlendState.\n");
@@ -669,11 +669,11 @@ static void test_create_blend_state(void)
ID3D10BlendState_Release(d3d10_blend_state);
refcount = ID3D10BlendState1_Release(blend_state1);
- ok(!refcount, "Got unexpected refcount %u.\n", refcount);
+ ok(!refcount, "Got unexpected refcount %lu.\n", refcount);
}
refcount = ID3D10Device1_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
static void test_getdc(void)
@@ -708,47 +708,47 @@ static void test_getdc(void)
desc.CPUAccessFlags = 0;
desc.MiscFlags = 0;
hr = ID3D10Device1_CreateTexture2D(device, &desc, NULL, &texture);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1);
- ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface1_GetDC(surface1, FALSE, &dc);
- todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
IDXGISurface1_Release(surface1);
ID3D10Texture2D_Release(texture);
desc.MiscFlags = D3D10_RESOURCE_MISC_GDI_COMPATIBLE;
hr = ID3D10Device1_CreateTexture2D(device, &desc, NULL, &texture);
- ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1);
- ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface1_ReleaseDC(surface1, NULL);
- todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface1_GetDC(surface1, FALSE, &dc);
- ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* One more time. */
dc = (HDC)0xdeadbeef;
hr = IDXGISurface1_GetDC(surface1, FALSE, &dc);
- todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
ok(dc == (HDC)0xdeadbeef, "Got unexpected dc %p.\n", dc);
hr = IDXGISurface1_ReleaseDC(surface1, NULL);
- ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = IDXGISurface1_ReleaseDC(surface1, NULL);
- todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
+ todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr);
IDXGISurface1_Release(surface1);
ID3D10Texture2D_Release(texture);
refcount = ID3D10Device1_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
+ ok(!refcount, "Device has %lu references left.\n", refcount);
}
START_TEST(d3d10_1)
--
2.30.2
1
0
03 Feb '22
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/d3dx11_42/tests/Makefile.in | 1 -
dlls/d3dx11_43/tests/Makefile.in | 1 -
dlls/d3dx11_43/tests/d3dx11.c | 145 ++++++++++++++++---------------
3 files changed, 73 insertions(+), 74 deletions(-)
diff --git a/dlls/d3dx11_42/tests/Makefile.in b/dlls/d3dx11_42/tests/Makefile.in
index a4ea6f1a0277..660f6d947cce 100644
--- a/dlls/d3dx11_42/tests/Makefile.in
+++ b/dlls/d3dx11_42/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = d3dx11_42.dll
IMPORTS = d3dx11_42
PARENTSRC = ../../d3dx11_43/tests
diff --git a/dlls/d3dx11_43/tests/Makefile.in b/dlls/d3dx11_43/tests/Makefile.in
index 11bb7763a01b..6e522df66fb9 100644
--- a/dlls/d3dx11_43/tests/Makefile.in
+++ b/dlls/d3dx11_43/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = d3dx11_43.dll
IMPORTS = d3dx11
diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c
index fe33089a5414..89fc0721c922 100644
--- a/dlls/d3dx11_43/tests/d3dx11.c
+++ b/dlls/d3dx11_43/tests/d3dx11.c
@@ -316,42 +316,42 @@ static void test_D3DX11CreateAsyncMemoryLoader(void)
void *ptr;
hr = D3DX11CreateAsyncMemoryLoader(NULL, 0, NULL);
- ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11CreateAsyncMemoryLoader(NULL, 0, &loader);
- ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11CreateAsyncMemoryLoader(&data, 0, &loader);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
size = 100;
hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(ptr == &data, "Got data pointer %p, original %p.\n", ptr, &data);
ok(!size, "Got unexpected data size.\n");
/* Load() is no-op. */
hr = ID3DX11DataLoader_Load(loader);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3DX11DataLoader_Destroy(loader);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
data = 0;
hr = D3DX11CreateAsyncMemoryLoader(&data, sizeof(data), &loader);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Load() is no-op. */
hr = ID3DX11DataLoader_Load(loader);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(ptr == &data, "Got data pointer %p, original %p.\n", ptr, &data);
ok(size == sizeof(data), "Got unexpected data size.\n");
hr = ID3DX11DataLoader_Destroy(loader);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
}
static void create_testfile(WCHAR *path, const void *data, int data_len)
@@ -364,7 +364,7 @@ static void create_testfile(WCHAR *path, const void *data, int data_len)
lstrcatW(path, L"asyncloader.data");
file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
- ok(file != INVALID_HANDLE_VALUE, "Test file creation failed, at %s, error %d.\n",
+ ok(file != INVALID_HANDLE_VALUE, "Test file creation failed, at %s, error %ld.\n",
wine_dbgstr_w(path), GetLastError());
ret = WriteFile(file, data, data_len, &written, NULL);
@@ -385,59 +385,59 @@ static void test_D3DX11CreateAsyncFileLoader(void)
BOOL ret;
hr = D3DX11CreateAsyncFileLoaderA(NULL, NULL);
- ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11CreateAsyncFileLoaderA(NULL, &loader);
- ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11CreateAsyncFileLoaderA("nonexistentfilename", &loader);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
- ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = ID3DX11DataLoader_Load(loader);
- ok(hr == D3D11_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3D11_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#lx.\n", hr);
hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
- ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = ID3DX11DataLoader_Destroy(loader);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Test file sharing using dummy empty file. */
create_testfile(path, test_data1, sizeof(test_data1));
hr = D3DX11CreateAsyncFileLoaderW(path, &loader);
- ok(SUCCEEDED(hr), "Failed to create file loader, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = DeleteFileW(path);
- ok(ret, "DeleteFile() failed, ret %d, error %d.\n", ret, GetLastError());
+ ok(ret, "Got unexpected ret %#x, error %ld.\n", ret, GetLastError());
/* File was removed before Load(). */
hr = ID3DX11DataLoader_Load(loader);
- ok(hr == D3D11_ERROR_FILE_NOT_FOUND, "Load() returned unexpected result, hr %#x.\n", hr);
+ ok(hr == D3D11_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#lx.\n", hr);
/* Create it again. */
create_testfile(path, test_data1, sizeof(test_data1));
hr = ID3DX11DataLoader_Load(loader);
- ok(SUCCEEDED(hr), "Load() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
/* Already loaded. */
hr = ID3DX11DataLoader_Load(loader);
- ok(SUCCEEDED(hr), "Load() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = DeleteFileW(path);
- ok(ret, "DeleteFile() failed, ret %d, error %d.\n", ret, GetLastError());
+ ok(ret, "Got unexpected ret %#x, error %ld.\n", ret, GetLastError());
/* Already loaded, file removed. */
hr = ID3DX11DataLoader_Load(loader);
- ok(hr == D3D11_ERROR_FILE_NOT_FOUND, "Load() returned unexpected result, hr %#x.\n", hr);
+ ok(hr == D3D11_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#lx.\n", hr);
/* Decompress still works. */
ptr = NULL;
hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
- ok(SUCCEEDED(hr), "Decompress() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(ptr != NULL, "Got unexpected ptr %p.\n", ptr);
ok(size == sizeof(test_data1), "Got unexpected decompressed size.\n");
if (size == sizeof(test_data1))
@@ -447,21 +447,21 @@ static void test_D3DX11CreateAsyncFileLoader(void)
create_testfile(path, test_data2, sizeof(test_data2));
hr = ID3DX11DataLoader_Load(loader);
- ok(SUCCEEDED(hr), "Load() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ptr = NULL;
hr = ID3DX11DataLoader_Decompress(loader, &ptr, &size);
- ok(SUCCEEDED(hr), "Decompress() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(ptr != NULL, "Got unexpected ptr %p.\n", ptr);
ok(size == sizeof(test_data2), "Got unexpected decompressed size.\n");
if (size == sizeof(test_data2))
ok(!memcmp(ptr, test_data2, size), "Got unexpected file data.\n");
hr = ID3DX11DataLoader_Destroy(loader);
- ok(SUCCEEDED(hr), "Destroy() failed, hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ret = DeleteFileW(path);
- ok(ret, "DeleteFile() failed, ret %d, error %d.\n", ret, GetLastError());
+ ok(ret, "Got unexpected ret %#x, error %ld.\n", ret, GetLastError());
}
static void test_D3DX11CreateAsyncResourceLoader(void)
@@ -470,22 +470,22 @@ static void test_D3DX11CreateAsyncResourceLoader(void)
HRESULT hr;
hr = D3DX11CreateAsyncResourceLoaderA(NULL, NULL, NULL);
- ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11CreateAsyncResourceLoaderA(NULL, NULL, &loader);
- ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11CreateAsyncResourceLoaderA(NULL, "noname", &loader);
- ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11CreateAsyncResourceLoaderW(NULL, NULL, NULL);
- ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11CreateAsyncResourceLoaderW(NULL, NULL, &loader);
- ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#lx.\n", hr);
hr = D3DX11CreateAsyncResourceLoaderW(NULL, L"noname", &loader);
- ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr);
+ ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#lx.\n", hr);
}
static HRESULT WINAPI test_d3dinclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type,
@@ -574,8 +574,9 @@ static void test_D3DX11CompileFromFile(void)
create_file(L"include1.h", include1, strlen(include1), NULL);
create_file(L"include\\include2.h", include2, strlen(include2), NULL);
- hr = D3DX11CompileFromFileW(filename, NULL, &include.ID3DInclude_iface, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result);
- todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result);
+ hr = D3DX11CompileFromFileW(filename, NULL, &include.ID3DInclude_iface,
+ "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result);
+ todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result);
todo_wine ok(!!blob, "Got unexpected blob.\n");
ok(!errors, "Got unexpected errors.\n");
if (blob)
@@ -588,7 +589,7 @@ static void test_D3DX11CompileFromFile(void)
* instead of using the immediate parent, as it would be the case for
* standard C preprocessor includes. */
hr = D3DX11CompileFromFileW(filename, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result);
- todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result);
+ todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result);
todo_wine ok(!!blob, "Got unexpected blob.\n");
ok(!errors, "Got unexpected errors.\n");
if (blob)
@@ -600,7 +601,7 @@ static void test_D3DX11CompileFromFile(void)
len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL);
WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL);
hr = D3DX11CompileFromFileA(filename_a, NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result);
- todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result);
+ todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result);
todo_wine ok(!!blob, "Got unexpected blob.\n");
ok(!errors, "Got unexpected errors.\n");
if (blob)
@@ -613,7 +614,7 @@ static void test_D3DX11CompileFromFile(void)
SetCurrentDirectoryW(temp_dir);
hr = D3DX11CompileFromFileW(L"source.ps", NULL, NULL, "main", "ps_2_0", 0, 0, NULL, &blob, &errors, &result);
- todo_wine ok(hr == S_OK && hr == result, "Got hr %#x, result %#x.\n", hr, result);
+ todo_wine ok(hr == S_OK && hr == result, "Got unexpected hr %#lx, result %#lx.\n", hr, result);
todo_wine ok(!!blob, "Got unexpected blob.\n");
ok(!errors, "Got unexpected errors.\n");
if (blob)
@@ -730,7 +731,7 @@ static void check_dds_pixel_format_(unsigned int line, DWORD flags, DWORD fourcc
memset(dds.data, 0, sizeof(dds.data));
hr = D3DX11GetImageInfoFromMemory(&dds, sizeof(dds), NULL, &info, NULL);
- ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#x for pixel format %#x.\n", hr, expected_format);
+ ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx for pixel format %#x.\n", hr, expected_format);
if (SUCCEEDED(hr))
{
ok_(__FILE__, line)(info.Format == expected_format, "Unexpected format %#x, expected %#x\n",
@@ -750,50 +751,50 @@ static void test_D3DX11GetImageInfoFromMemory(void)
}
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) + 5, NULL, &info, NULL); /* too large size */
- ok(hr == S_OK, "Unexpected hr %#x.", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, NULL, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, &info, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) - 1, NULL, &info, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp + 1, sizeof(bmp_1bpp) - 1, NULL, &info, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, &info, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, NULL, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, NULL, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, NULL, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, &info, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(NULL, 0, NULL, NULL, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
/* test BMP support */
hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.", hr);
ok(info.Width == 1, "Unexpected width %u.\n", info.Width);
ok(info.Height == 1, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -805,10 +806,10 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(bmp_2bpp, sizeof(bmp_2bpp), NULL, &info, NULL);
- ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr);
+ ok(hr == E_FAIL, "Got unexpected hr %#lx.", hr);
hr = D3DX11GetImageInfoFromMemory(bmp_4bpp, sizeof(bmp_4bpp), NULL, &info, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 1, "Unexpected width %u.\n", info.Width);
ok(info.Height == 1, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -820,7 +821,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(bmp_8bpp, sizeof(bmp_8bpp), NULL, &info, NULL);
- ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 1, "Unexpected width %u.\n", info.Width);
ok(info.Height == 1, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -832,7 +833,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(bmp_32bpp_xrgb, sizeof(bmp_32bpp_xrgb), NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 2, "Unexpected width %u.\n", info.Width);
ok(info.Height == 2, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -844,7 +845,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(bmp_32bpp_argb, sizeof(bmp_32bpp_argb), NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 2, "Unexpected width %u.\n", info.Width);
ok(info.Height == 2, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -857,7 +858,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
/* Grayscale PNG */
hr = D3DX11GetImageInfoFromMemory(png_grayscale, sizeof(png_grayscale), NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 1, "Unexpected width %u.\n", info.Width);
ok(info.Height == 1, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -870,7 +871,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
/* test DDS support */
hr = D3DX11GetImageInfoFromMemory(dds_24bit, sizeof(dds_24bit), NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 2, "Unexpected width %u.\n", info.Width);
ok(info.Height == 2, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -881,7 +882,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(dds_24bit, sizeof(dds_24bit) - 1, NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 2, "Unexpected width %u.\n", info.Width);
ok(info.Height == 2, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -892,7 +893,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(dds_16bit, sizeof(dds_16bit), NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 2, "Unexpected width %u.\n", info.Width);
ok(info.Height == 2, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -904,7 +905,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
memset(&info, 0, sizeof(info));
hr = D3DX11GetImageInfoFromMemory(dds_16bit, sizeof(dds_16bit) - 1, NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 2, "Unexpected width %u.\n", info.Width);
ok(info.Height == 2, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -916,7 +917,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
memset(&info, 0, sizeof(info));
hr = D3DX11GetImageInfoFromMemory(dds_8bit, sizeof(dds_8bit), NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 16, "Unexpected width %u.\n", info.Width);
ok(info.Height == 4, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -927,7 +928,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(dds_cube_map, sizeof(dds_cube_map), NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 4, "Unexpected width %u.\n", info.Width);
ok(info.Height == 4, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -938,7 +939,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(dds_cube_map, sizeof(dds_cube_map) - 1, NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 4, "Unexpected width %u.\n", info.Width);
ok(info.Height == 4, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth);
@@ -949,7 +950,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(dds_volume_map, sizeof(dds_volume_map), NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 4, "Unexpected width %u.\n", info.Width);
ok(info.Height == 4, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 2, "Unexpected depth %u.\n", info.Depth);
@@ -960,7 +961,7 @@ static void test_D3DX11GetImageInfoFromMemory(void)
ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat);
hr = D3DX11GetImageInfoFromMemory(dds_volume_map, sizeof(dds_volume_map) - 1, NULL, &info, NULL);
- ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+ ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
ok(info.Width == 4, "Unexpected width %u.\n", info.Width);
ok(info.Height == 4, "Unexpected height %u.\n", info.Height);
ok(info.Depth == 2, "Unexpected depth %u.\n", info.Depth);
--
2.30.2
1
0
03 Feb '22
v3: As suggested by Alexandre changed NC_HandleNCCalcSize to not return a value.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37609
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/user32/controls.h | 2 +-
dlls/user32/defwnd.c | 3 ++-
dlls/user32/nonclient.c | 9 ++-------
dlls/user32/tests/win.c | 6 ------
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h
index ce14d13171f..52584748768 100644
--- a/dlls/user32/controls.h
+++ b/dlls/user32/controls.h
@@ -168,7 +168,7 @@ extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN;
/* nonclient area */
extern LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) DECLSPEC_HIDDEN;
extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN;
-extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN;
+extern void NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN;
extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN;
extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN;
extern LRESULT NC_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN;
diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index abb73e73ca8..a8978c2d847 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
@@ -260,7 +260,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
}
case WM_NCCALCSIZE:
- return NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam );
+ NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam );
+ break;
case WM_WINDOWPOSCHANGING:
return WINPOS_HandleWindowPosChanging( hwnd, (WINDOWPOS *)lParam );
diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c
index 639cca707fb..f944ed568a4 100644
--- a/dlls/user32/nonclient.c
+++ b/dlls/user32/nonclient.c
@@ -346,19 +346,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectExForDpi( LPRECT rect, DWORD style
*
* Handle a WM_NCCALCSIZE message. Called from DefWindowProc().
*/
-LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect )
+void NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect )
{
RECT tmpRect = { 0, 0, 0, 0 };
- LRESULT result = 0;
LONG cls_style = GetClassLongW(hwnd, GCL_STYLE);
LONG style = GetWindowLongW( hwnd, GWL_STYLE );
LONG exStyle = GetWindowLongW( hwnd, GWL_EXSTYLE );
if (winRect == NULL)
- return 0;
-
- if (cls_style & CS_VREDRAW) result |= WVR_VREDRAW;
- if (cls_style & CS_HREDRAW) result |= WVR_HREDRAW;
+ return;
if (!(style & WS_MINIMIZE))
{
@@ -413,7 +409,6 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect )
winRect->right = winRect->left;
winRect->bottom = winRect->top;
}
- return result;
}
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 4aeb3816db2..847093710a5 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -1236,7 +1236,6 @@ static void test_nonclient_area(HWND hwnd)
rc = rc_window;
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
-todo_wine_if(ret != 0)
ok(!ret, "got %08lx\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2);
ok(EqualRect(&rc, &rc_client),
@@ -1255,7 +1254,6 @@ todo_wine_if(ret != 0)
rc = rc_window;
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
-todo_wine_if(ret != 0)
ok(!ret, "got %08lx\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2);
ok(EqualRect(&rc, &rc_client),
@@ -12673,25 +12671,21 @@ static void test_WM_NCCALCSIZE(void)
params.lppos = &winpos;
ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)¶ms);
-todo_wine
ok(!ret, "got %08lx\n", ret);
ok(EqualRect(¶ms.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(¶ms.rgrc[0]));
params.rgrc[0] = window_rect;
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)¶ms);
-todo_wine
ok(!ret, "got %08lx\n", ret);
ok(EqualRect(¶ms.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(¶ms.rgrc[0]));
GetWindowRect(hwnd, &window_rect);
ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect);
-todo_wine
ok(!ret, "got %08lx\n", ret);
ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect));
GetWindowRect(hwnd, &window_rect);
ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect);
-todo_wine
ok(!ret, "got %08lx\n", ret);
ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect));
--
2.34.1
2
2
This simplifies getting a connection to the TestAgent server with
elevated privileges.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/bin/LibvirtTool.pl | 60 ++++++++++++++++++++------------------
1 file changed, 32 insertions(+), 28 deletions(-)
diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index b186e19c39..51ed8e73e8 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -257,6 +257,28 @@ sub ChangeStatus($$;$)
return 0;
}
+=pod
+=over 12
+
+=item C<GetPrivilegedTA()>
+
+Returns a connection to a TestAgent server with elevated privileges.
+
+If the server running on the regular port does not have elevated privileges
+this assumes that the one on the alternate port will. It is up to the caller
+to report an error if that's not the case.
+
+=back
+=cut
+
+sub GetPrivilegedTA($)
+{
+ my ($TA) = @_;
+
+ # Use SetTime() to detect if privileged operations are allowed.
+ return $TA->SetTime() ? $TA : $VM->GetAgent(1);
+}
+
sub ShutDown()
{
my $Domain = $VM->GetDomain();
@@ -270,30 +292,15 @@ sub ShutDown()
Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey $CurrentSnapshot\n");
LogMsg "Performing a clean shutdown of $VMKey $CurrentSnapshot\n";
- # Use SetTime() to detect if privileged operations are allowed.
- my $TA = $VM->GetAgent();
- if (!$TA->SetTime())
- {
- # Not a fatal error. Try the next port in case the VM runs a privileged
- # TestAgentd daemon there.
- $TA->Disconnect();
- $TA = $VM->GetAgent(1);
- if (!$TA->SetTime())
- {
- Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n";
- $TA->Disconnect();
- return 0;
- }
- }
-
my $Success = 1;
my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ?
["shutdown.exe", "/p", "/d", "00:00"] :
["/sbin/shutdown", "--poweroff", "now"];
Debug(Elapsed($Start), " Running @$Cmd\n");
- if (!$TA->Run($Cmd, 0))
+ my $PTA = GetPrivilegedTA($VM->GetAgent());
+ if (!$PTA->Run($Cmd, 0))
{
- Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n";
+ Error "Could not run @$Cmd: ". $PTA->GetLastError() ."\n";
$Success = 0;
}
else
@@ -311,7 +318,8 @@ sub ShutDown()
sleep(1);
}
}
- $TA->Disconnect();
+ $PTA->Disconnect();
+
Debug(Elapsed($Start), " Successfully shut down $VMKey\n");
LogMsg "Successfully shut down $VMKey\n";
return $Success;
@@ -496,16 +504,11 @@ sub SetupTestAgentd($$$$)
# This is needed not only for the tests (date is important when checking
# HTTPS certificates), but also for the build (if the time moves forward
# during the build some ccache versions will return a compilation error).
- if (!$TA->SetTime())
+ my $PTA = GetPrivilegedTA($TA);
+ FatalError("Cannot set the VM system time\n") if (!$PTA);
+ if (!$PTA->SetTime())
{
- # Not a fatal error. Try the next port in case the VM runs a privileged
- # TestAgentd daemon there.
- my $PrivilegedTA = $VM->GetAgent(1);
- if (!$PrivilegedTA->SetTime())
- {
- FatalError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() ."\n");
- }
- $PrivilegedTA->Disconnect();
+ FatalError("Setting the VM system time failed: ". $PTA->GetLastError() ."\n");
}
if ($Booting and $VM->Type eq "wine")
@@ -543,6 +546,7 @@ sub SetupTestAgentd($$$$)
FatalError("The VM has been rebooted too many times: start.count=$Count > 1");
}
}
+ $PTA->Disconnect();
$TA->Disconnect();
}
--
2.30.2
1
0
03 Feb '22
The special 'mx-MX' locale sets all locale settings to different values
in order to detect when the Wine tests use the wrong locale API.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
testbot/bin/SetWinLocale | 40 +++++++++++++++++++++++++++++-----------
1 file changed, 29 insertions(+), 11 deletions(-)
diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale
index 0d4c305ceb..df0d6f7031 100755
--- a/testbot/bin/SetWinLocale
+++ b/testbot/bin/SetWinLocale
@@ -416,7 +416,7 @@ while (@ARGV)
}
# Check and untaint parameters
-my $CountryId;
+my ($Keyboard, $CountryId);
if (!defined $Usage)
{
if (!defined $OptHostName)
@@ -437,11 +437,31 @@ if (!defined $Usage)
$OptLocale ||= $OptDefault;
$OptSystem ||= $OptDefault;
$OptMUI ||= $OptDefault;
-
+ $Keyboard = $OptKeyboard || $OptDefault;
if (!$OptCountry and ($OptDefault || "") =~ /-([A-Z]{2})$/)
{
$OptCountry = $1;
}
+
+ # The "mixed" locale is used to make sure the tests each use the right
+ # locale API. To do so set each locale setting to a different value, each
+ # producing different results (e.g. different date format, decimal separator,
+ # etc).
+ my $MXStr = "";
+ sub SetMX($$$)
+ {
+ my ($Value, $Option, $MXValue) = @_;
+ return $Value if (!$Value or $Value !~ /^(?:mx-|MX$)/);
+ $MXStr .= " $Option $MXValue";
+ return $MXValue;
+ }
+ $OptLocale = SetMX($OptLocale, "--locale", "fr-FR");
+ $OptCountry = SetMX($OptCountry, "--country", "TO");
+ $OptSystem = SetMX($OptSystem, "--system", "ja-JP");
+ $OptMUI = SetMX($OptMUI, "--mui", "ko-KR");
+ $Keyboard = SetMX($Keyboard, "--keyboard", "es-ES");
+ Info("using$MXStr\n") if ($MXStr);
+
if ($OptCountry)
{
$CountryId = $Countries{$OptCountry};
@@ -453,8 +473,7 @@ if (!defined $Usage)
}
if (!$OptLocale and !$OptCountry and !$OptSystem and !$OptUTF8 and
- !$OptMUI and !$OptKeyboard and !defined $OptSysCopy and
- !defined $OptDefCopy)
+ !$OptMUI and !$Keyboard and !defined $OptSysCopy and !defined $OptDefCopy)
{
if (!$OptShow)
{
@@ -468,7 +487,7 @@ if (!defined $Usage)
}
}
if ($OptShow and ($OptLocale or $OptCountry or $OptSystem or $OptUTF8 or
- $OptMUI or $OptKeyboard or defined $OptSysCopy or
+ $OptMUI or $Keyboard or defined $OptSysCopy or
defined $OptDefCopy or defined $OptUseIntl or
defined $OptReboot))
{
@@ -822,8 +841,8 @@ sub GetKeyboardIds($)
my $LCIDLocale = GetLCID($OptLocale);
my $LCIDSystem = GetLCID($OptSystem);
-my $KeyboardIds = GetKeyboardIds($OptKeyboard || $OptDefault);
-if (!$KeyboardIds and ($OptKeyboard or $OptDefault))
+my $KeyboardIds = GetKeyboardIds($Keyboard);
+if (!$KeyboardIds and $Keyboard)
{
if ($OptKeyboard)
{
@@ -832,9 +851,8 @@ if (!$KeyboardIds and ($OptKeyboard or $OptDefault))
# intl.cpl automatically pick the appropriate keyboard but, unlike
# for Windows' initial installation, it does not make it the
# default since the system has a keyboard already.
- Warning("no known keyboard for the $OptDefault locale. Letting intl.cpl use its default.\n");
+ Warning("no known keyboard for the $Keyboard locale. Letting intl.cpl use its default.\n");
}
-$OptKeyboard ||= $OptDefault;
#
@@ -1001,7 +1019,7 @@ if ($OptMUI)
}
if ($KeyboardIds)
{
- CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1);
+ CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $Keyboard", 1);
}
if ($OptSysCopy)
@@ -1022,7 +1040,7 @@ if ($OptSysCopy)
}
if ($KeyboardIds)
{
- CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1);
+ CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $Keyboard", 1);
}
}
if (!$OptReboot and ($OptSystem or $OptMUI))
--
2.30.2
1
0
03 Feb '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/user32/tests/win.c | 164 +++++++++++++++++++++++++++++++++++++---
1 file changed, 154 insertions(+), 10 deletions(-)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 5ce7eb02f1c..4aeb3816db2 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -764,6 +764,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR
}
case WM_WINDOWPOSCHANGED:
{
+ LRESULT ret;
RECT rc1, rc2;
WINDOWPOS *winpos = (WINDOWPOS *)lparam;
ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x);
@@ -784,7 +785,8 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR
wine_dbgstr_rect(&rc2));
GetClientRect(hwnd, &rc2);
- DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1);
+ ok(!ret, "got %08lx\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2);
ok(EqualRect(&rc1, &rc2), "rects do not match %s / %s\n", wine_dbgstr_rect(&rc1),
wine_dbgstr_rect(&rc2));
@@ -837,6 +839,13 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR
break;
case WM_MOUSEACTIVATE:
return MA_ACTIVATE;
+
+ case WM_NCCALCSIZE:
+ {
+ LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
+ ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ return ret;
+ }
}
return DefWindowProcA(hwnd, msg, wparam, lparam);
@@ -867,6 +876,13 @@ static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPAR
return 0;
}
break;
+
+ case WM_NCCALCSIZE:
+ {
+ LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
+ ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ return ret;
+ }
}
return DefWindowProcA(hwnd, msg, wparam, lparam);
@@ -892,6 +908,13 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR
ok(!got_getminmaxinfo, "tool: WM_GETMINMAXINFO should NOT have been received before WM_NCCREATE\n");
break;
}
+
+ case WM_NCCALCSIZE:
+ {
+ LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
+ ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ return ret;
+ }
}
return DefWindowProcA(hwnd, msg, wparam, lparam);
@@ -1156,6 +1179,14 @@ static LRESULT CALLBACK test_standard_scrollbar_proc(HWND hwnd, UINT msg, WPARAM
DeleteObject(region);
return 0;
}
+
+ case WM_NCCALCSIZE:
+ {
+ LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp);
+ ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp);
+ return ret;
+ }
+
default:
return DefWindowProcA(hwnd, msg, wp, lp);
}
@@ -1204,7 +1235,9 @@ static void test_nonclient_area(HWND hwnd)
rc = rc_window;
- DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
+todo_wine_if(ret != 0)
+ ok(!ret, "got %08lx\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2);
ok(EqualRect(&rc, &rc_client),
"client rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d client=%s, calc=%s\n",
@@ -1221,7 +1254,9 @@ static void test_nonclient_area(HWND hwnd)
FixedAdjustWindowRectEx(&rc_window, style, menu, exstyle);
rc = rc_window;
- DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
+todo_wine_if(ret != 0)
+ ok(!ret, "got %08lx\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2);
ok(EqualRect(&rc, &rc_client),
"synthetic rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, client=%s, calc=%s\n",
@@ -2114,6 +2149,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L
case WM_WINDOWPOSCHANGED:
{
+ LRESULT ret;
WINDOWPOS *winpos = (WINDOWPOS *)lparam;
RECT rc1, rc2;
@@ -2125,7 +2161,8 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L
wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2));
GetWindowRect(hwnd, &rc1);
GetClientRect(hwnd, &rc2);
- DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1);
+ ok(!ret, "got %08lx\n", ret);
MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2);
ok(EqualRect(&rc1, &rc2), "rects do not match, window=%s client=%s\n",
wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2));
@@ -2151,7 +2188,15 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L
return 1;
}
+
+ case WM_NCCALCSIZE:
+ {
+ LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
+ ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ return ret;
+ }
}
+
return DefWindowProcA(hwnd, msg, wparam, lparam);
}
@@ -2207,6 +2252,13 @@ static LRESULT WINAPI mdi_main_wnd_procA(HWND hwnd, UINT msg, WPARAM wparam, LPA
return 1;
}
+ case WM_NCCALCSIZE:
+ {
+ LRESULT ret = DefFrameProcA(hwnd, mdi_client, WM_NCCALCSIZE, wparam, lparam);
+ ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ return ret;
+ }
+
case WM_CLOSE:
PostQuitMessage(0);
break;
@@ -4418,11 +4470,13 @@ static void test_validatergn(HWND hwnd)
static void nccalchelper(HWND hwnd, INT x, INT y, RECT *prc)
{
+ LRESULT ret;
RECT rc;
MoveWindow( hwnd, 0, 0, x, y, 0);
GetWindowRect( hwnd, prc);
rc = *prc;
- DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)prc);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)prc);
+ ok(!ret, "got %08lx\n", ret);
if (winetest_debug > 1)
trace("window rect is %s, nccalc rect is %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(prc));
}
@@ -6314,11 +6368,14 @@ static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM
}
case WM_NCCALCSIZE:
{
+ LRESULT ret;
RECT rect, *r = (RECT *)lp;
GetWindowRect( hwnd, &rect );
ok( EqualRect( &rect, r ), "passed rect %s doesn't match window rect %s\n",
wine_dbgstr_rect( r ), wine_dbgstr_rect( &rect ));
- return DefWindowProcA(hwnd, msg, wp, lp);
+ ret = DefWindowProcA(hwnd, msg, wp, lp);
+ ok(!ret, "got %08lx\n", ret);
+ return ret;
}
default:
return DefWindowProcA(hwnd, msg, wp, lp);
@@ -7228,7 +7285,8 @@ static void test_ShowWindow(void)
/* test NC area */
GetWindowRect(hwnd, &rc);
SetRect(&rcNonClient, rc.left, rc.top, rc.left, rc.top);
- DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc);
+ ok(!ret, "got %08lx\n", ret);
ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n",
wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc));
@@ -7516,7 +7574,8 @@ static void test_ShowWindow_owned(HWND hwndMain)
/* test NC area */
GetWindowRect(hwnd, &rect);
SetRect(&nc, rect.left, rect.top, rect.left, rect.top);
- DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect);
+ ok(!ret, "got %08lx\n", ret);
ok(EqualRect(&rect, &nc), "expected %s, got %s\n",
wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect));
@@ -7648,7 +7707,8 @@ static void test_ShowWindow_child(HWND hwndMain)
/* test NC area */
GetWindowRect(hwnd, &rect);
SetRect(&nc, rect.left, rect.top, rect.left, rect.top);
- DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect);
+ ok(!ret, "got %08lx\n", ret);
ok(EqualRect(&rect, &nc), "expected %s, got %s\n",
wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect));
@@ -7776,7 +7836,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain)
/* test NC area */
GetWindowRect(hwnd, &rect);
SetRect(&nc, rect.left, rect.top, rect.left, rect.top);
- DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect);
+ ok(!ret, "got %08lx\n", ret);
ok(EqualRect(&rect, &nc), "expected %s, got %s\n",
wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect));
@@ -8810,6 +8871,12 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR
ok(minmax->ptMaxSize.y >= mi.rcMonitor.bottom, "%d >= %d\n", minmax->ptMaxSize.y, mi.rcMonitor.bottom);
break;
}
+ case WM_NCCALCSIZE:
+ {
+ LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp);
+ ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp);
+ return ret;
+ }
}
return DefWindowProcA(hwnd, msg, wp, lp);
}
@@ -9069,6 +9136,13 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM
break;
}
+
+ case WM_NCCALCSIZE:
+ {
+ LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam);
+ ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam);
+ return ret;
+ }
}
return DefWindowProcA(hwnd, msg, wparam, lparam);
@@ -12555,6 +12629,75 @@ static void test_DragDetect(void)
ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n");
}
+static void test_WM_NCCALCSIZE(void)
+{
+ WNDCLASSA cls;
+ HWND hwnd;
+ NCCALCSIZE_PARAMS params;
+ WINDOWPOS winpos;
+ RECT client_rect, window_rect;
+ LRESULT ret;
+
+ cls.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW;
+ cls.lpfnWndProc = DefWindowProcA;
+ cls.cbClsExtra = 0;
+ cls.cbWndExtra = 0;
+ cls.hInstance = GetModuleHandleA(0);
+ cls.hIcon = 0;
+ cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW);
+ cls.hbrBackground = GetStockObject(WHITE_BRUSH);
+ cls.lpszMenuName = NULL;
+ cls.lpszClassName = "dummy_window_class";
+ ret = RegisterClassA(&cls);
+ ok(ret, "RegisterClass error %u\n", GetLastError());
+
+ hwnd = CreateWindowExA(0, "dummy_window_class", NULL,
+ WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP,
+ 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL);
+ ok(hwnd != 0, "CreateWindowEx error %u\n", GetLastError());
+
+ GetWindowRect(hwnd, &window_rect);
+ params.rgrc[0] = window_rect;
+ params.rgrc[1] = window_rect;
+ GetClientRect(hwnd, &client_rect);
+ MapWindowPoints(hwnd, 0, (POINT *)&client_rect, 2);
+ params.rgrc[2] = client_rect;
+
+ winpos.hwnd = hwnd;
+ winpos.hwndInsertAfter = HWND_TOP;
+ winpos.x = window_rect.left;
+ winpos.y = window_rect.top;
+ winpos.cx = window_rect.right - window_rect.left;
+ winpos.cy = window_rect.bottom - window_rect.top;
+ winpos.flags = SWP_NOMOVE;
+ params.lppos = &winpos;
+
+ ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)¶ms);
+todo_wine
+ ok(!ret, "got %08lx\n", ret);
+ ok(EqualRect(¶ms.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(¶ms.rgrc[0]));
+
+ params.rgrc[0] = window_rect;
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)¶ms);
+todo_wine
+ ok(!ret, "got %08lx\n", ret);
+ ok(EqualRect(¶ms.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(¶ms.rgrc[0]));
+
+ GetWindowRect(hwnd, &window_rect);
+ ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect);
+todo_wine
+ ok(!ret, "got %08lx\n", ret);
+ ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect));
+
+ GetWindowRect(hwnd, &window_rect);
+ ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect);
+todo_wine
+ ok(!ret, "got %08lx\n", ret);
+ ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect));
+
+ DestroyWindow(hwnd);
+}
+
START_TEST(win)
{
char **argv;
@@ -12731,6 +12874,7 @@ START_TEST(win)
test_SC_SIZE();
test_cancel_mode();
test_DragDetect();
+ test_WM_NCCALCSIZE();
/* add the tests above this line */
if (hhook) UnhookWindowsHookEx(hhook);
--
2.34.1
2
2
03 Feb '22
Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
dlls/user32/tests/win.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 847093710a5..0c308861a4b 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -7288,7 +7288,7 @@ static void test_ShowWindow(void)
ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n",
wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc));
- ShowWindow(hwnd, SW_RESTORE);
+ ret = ShowWindow(hwnd, SW_RESTORE);
ok(ret, "not expected ret: %lu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
@@ -7302,7 +7302,7 @@ static void test_ShowWindow(void)
ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n",
wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc));
- ShowWindow(hwnd, SW_MAXIMIZE);
+ ret = ShowWindow(hwnd, SW_MAXIMIZE);
ok(ret, "not expected ret: %lu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
@@ -7320,7 +7320,7 @@ static void test_ShowWindow(void)
ok(EqualRect(&rcResized, &rc), "expected %s, got %s\n",
wine_dbgstr_rect(&rcResized), wine_dbgstr_rect(&rc));
- ShowWindow(hwnd, SW_RESTORE);
+ ret = ShowWindow(hwnd, SW_RESTORE);
ok(ret, "not expected ret: %lu\n", ret);
style = GetWindowLongA(hwnd, GWL_STYLE);
ok(!(style & WS_DISABLED), "window should not be disabled\n");
--
2.34.1
1
0
03 Feb '22
A+
---
Eric Pouech (9):
programs/conhost/tests: enable compilation with long types
programs/find/tests: enable compilation with long types
programs/fsutil/tests: enable compilation with long types
programs/regedit/tests: enable compilation with long types
programs/reg/tests: enable compilation with long types
programs/schtasks/tests: enable compilation with long types
programs/services/tests: enable compilation with long types
programs/wscript/tests: enable compilation with long types
programs/xcopy/tests: enable compilation with long types
programs/conhost/tests/Makefile.in | 1 -
programs/conhost/tests/tty.c | 128 ++---
programs/find/tests/Makefile.in | 1 -
programs/find/tests/find.c | 2 +-
programs/fsutil/tests/Makefile.in | 1 -
programs/fsutil/tests/fsutil.c | 6 +-
programs/reg/tests/Makefile.in | 1 -
programs/reg/tests/add.c | 302 +++++-----
programs/reg/tests/copy.c | 192 +++----
programs/reg/tests/delete.c | 114 ++--
programs/reg/tests/export.c | 98 ++--
programs/reg/tests/import.c | 816 ++++++++++++++--------------
programs/reg/tests/query.c | 94 ++--
programs/regedit/tests/Makefile.in | 1 -
programs/regedit/tests/regedit.c | 80 +--
programs/schtasks/tests/Makefile.in | 1 -
programs/schtasks/tests/schtasks.c | 42 +-
programs/services/tests/Makefile.in | 1 -
programs/services/tests/service.c | 150 ++---
programs/wscript/tests/Makefile.in | 1 -
programs/wscript/tests/run.c | 14 +-
programs/xcopy/tests/Makefile.in | 1 -
programs/xcopy/tests/xcopy.c | 14 +-
23 files changed, 1026 insertions(+), 1035 deletions(-)
2
11
03 Feb '22
A wine installation should not be divided across multiple prefixes,
and one shouldn't mix components from multiple installations.
winegcc should therefore select a single viable get_inc_dir
(as was with get_lib_dir) and add (only) its
${includedir}/wine/msvcrt and ${includedir}/wine/windows,
not offer gcc multiple (potentially nonexistent or unrelated)
paths to search for wine headers
Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com>
--
e.g. for a wine built with --prefix /opt/wine-6
it's potentially the case that /usr/include/wine/* may also exist
(perhaps from a distro package), but we don't really want
winegcc adding both -I/opt/wine-6/include/windows -I/usr/include/wine/windows
get_inc_dir is identical in all winegcc/widl/wrc tools, and thus seems
like a good candidate to move into tools.h. However, its interactions
with init_argv0_dir (includedir global variable, INCLUDDIR macro, etc)
made that not really work out.
---
tools/widl/widl.c | 39 ++++++++++++++++++++++------------
tools/winegcc/winegcc.c | 47 ++++++++++++++++++++++++-----------------
tools/wrc/wrc.c | 39 ++++++++++++++++++++++------------
3 files changed, 80 insertions(+), 45 deletions(-)
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
index 7686594b7d3..8150d6158e4 100644
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -256,6 +256,29 @@ static void add_widl_version_define(void)
wpp_add_cmdline_define(version_str);
}
+static const char *get_inc_dir(const char *sysroot)
+{
+ const char *stdincpath[] = { includedir, INCLUDEDIR, "/usr/include", "/usr/local/include" };
+ const char *root = sysroot ? sysroot : "";
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(stdincpath); i++)
+ {
+ const char *root = (sysroot && i) ? sysroot : "";
+ char *path;
+ struct stat statbuf;
+
+ if (!stdincpath[i]) continue;
+ path = strmake( "%s%s/%s",root, stdincpath[i], "wine");
+ if (!stat(path,&statbuf) && S_ISDIR(statbuf.st_mode))
+ {
+ return strmake( "%s%s",root,stdincpath[i]);
+ }
+ }
+
+ return strmake( "%s%s", root, INCLUDEDIR );
+}
+
/* clean things up when aborting on a signal */
static void exit_on_signal( int sig )
{
@@ -733,19 +756,9 @@ int main(int argc,char *argv[])
if (stdinc)
{
- static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" };
-
- if (includedir)
- {
- wpp_add_include_path( strmake( "%s/wine/msvcrt", includedir ));
- wpp_add_include_path( strmake( "%s/wine/windows", includedir ));
- }
- for (i = 0; i < ARRAY_SIZE(incl_dirs); i++)
- {
- if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue;
- wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] ));
- wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] ));
- }
+ const char *inc_dir = get_inc_dir(sysroot);
+ wpp_add_include_path( strmake( "%s/wine/msvcrt", inc_dir));
+ wpp_add_include_path( strmake( "%s/wine/windows", inc_dir));
}
if (pointer_size)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 8644afe7535..6e701a5c08b 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -647,6 +647,29 @@ static char *get_lib_dir( struct options *opts )
return strmake( "%s%s", root, LIBDIR );
}
+static const char *get_inc_dir(const char *sysroot)
+{
+ const char *stdincpath[] = { includedir, INCLUDEDIR, "/usr/include", "/usr/local/include" };
+ const char *root = sysroot ? sysroot : "";
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(stdincpath); i++)
+ {
+ const char *root = (sysroot && i) ? sysroot : "";
+ char *path;
+ struct stat statbuf;
+
+ if (!stdincpath[i]) continue;
+ path = strmake( "%s%s/%s",root, stdincpath[i], "wine");
+ if (!stat(path,&statbuf) && S_ISDIR(statbuf.st_mode))
+ {
+ return strmake( "%s%s",root,stdincpath[i]);
+ }
+ }
+
+ return strmake( "%s%s", root, INCLUDEDIR );
+}
+
static void init_argv0_dir( const char *argv0 )
{
#ifndef _WIN32
@@ -813,32 +836,18 @@ no_compat_defines:
/* standard includes come last in the include search path */
if (!opts->wine_objdir && !opts->nostdinc)
{
- const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" };
- const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : "";
+ const char *inc_sysroot = opts->isysroot ? opts->isysroot : opts->sysroot;
+ const char *inc_dir = get_inc_dir(inc_sysroot);
const char *isystem = gcc_defs ? "-isystem" : "-I";
const char *idirafter = gcc_defs ? "-idirafter" : "-I";
if (opts->use_msvcrt)
{
- if (includedir) strarray_add( &comp_args, strmake( "%s%s/wine/msvcrt", isystem, includedir ));
- for (j = 0; j < ARRAY_SIZE(incl_dirs); j++)
- {
- if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue;
- strarray_add(&comp_args, strmake( "%s%s%s/wine/msvcrt", isystem, root, incl_dirs[j] ));
- }
+ strarray_add(&comp_args, strmake( "%s%s/wine/msvcrt", isystem, inc_dir ));
strarray_add(&comp_args, "-D__MSVCRT__");
}
- if (includedir)
- {
- strarray_add( &comp_args, strmake( "%s%s/wine/windows", isystem, includedir ));
- strarray_add( &comp_args, strmake( "%s%s", idirafter, includedir ));
- }
- for (j = 0; j < ARRAY_SIZE(incl_dirs); j++)
- {
- if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue;
- strarray_add(&comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] ));
- strarray_add(&comp_args, strmake( "%s%s%s", idirafter, root, incl_dirs[j] ));
- }
+ strarray_add(&comp_args, strmake( "%s%s/wine/windows", isystem, inc_dir ));
+ strarray_add(&comp_args, strmake( "%s%s", idirafter, inc_dir));
}
else if (opts->wine_objdir)
strarray_add(&comp_args, strmake("-I%s/include", opts->wine_objdir) );
diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c
index 41207120237..3b38629c71b 100644
--- a/tools/wrc/wrc.c
+++ b/tools/wrc/wrc.c
@@ -225,6 +225,29 @@ static void set_version_defines(void)
free( version );
}
+static const char *get_inc_dir(const char *sysroot)
+{
+ const char *stdincpath[] = { includedir, INCLUDEDIR, "/usr/include", "/usr/local/include" };
+ const char *root = sysroot ? sysroot : "";
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(stdincpath); i++)
+ {
+ const char *root = (sysroot && i) ? sysroot : "";
+ char *path;
+ struct stat statbuf;
+
+ if (!stdincpath[i]) continue;
+ path = strmake( "%s%s/%s",root, stdincpath[i], "wine");
+ if (!stat(path,&statbuf) && S_ISDIR(statbuf.st_mode))
+ {
+ return strmake( "%s%s",root,stdincpath[i]);
+ }
+ }
+
+ return strmake( "%s%s", root, INCLUDEDIR );
+}
+
/* clean things up when aborting on a signal */
static void exit_on_signal( int sig )
{
@@ -453,19 +476,9 @@ int main(int argc,char *argv[])
/* If we do need to search standard includes, add them to the path */
if (stdinc)
{
- static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" };
-
- if (includedir)
- {
- wpp_add_include_path( strmake( "%s/wine/msvcrt", includedir ));
- wpp_add_include_path( strmake( "%s/wine/windows", includedir ));
- }
- for (i = 0; i < ARRAY_SIZE(incl_dirs); i++)
- {
- if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue;
- wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] ));
- wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] ));
- }
+ const char *inc_dir = get_inc_dir(sysroot);
+ wpp_add_include_path( strmake( "%s/wine/msvcrt", inc_dir));
+ wpp_add_include_path( strmake( "%s/wine/windows", inc_dir));
}
/* Kill io buffering when some kind of debuglevel is enabled */
--
2.34.1
1
1
[PATCH 1/4] hnetcfg: Don't use _GetValue() if text element is missing in get_xml_elements().
by Paul Gofman 03 Feb '22
by Paul Gofman 03 Feb '22
03 Feb '22
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
---
dlls/hnetcfg/port.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c
index def77621764..611a652ce5e 100644
--- a/dlls/hnetcfg/port.c
+++ b/dlls/hnetcfg/port.c
@@ -265,7 +265,10 @@ static BOOL get_xml_elements( const char *desc_xml, struct xml_value_desc *value
if (node_type == XmlNodeType_EndElement) value = L"";
else goto done;
}
- if (FAILED(IXmlReader_GetValue( reader, &value, NULL ))) goto done;
+ else
+ {
+ if (FAILED(IXmlReader_GetValue( reader, &value, NULL ))) goto done;
+ }
if (values[i].value)
{
WARN( "Duplicate value %s.\n", debugstr_w(values[i].name) );
--
2.34.1
1
3
03 Feb '22
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
dlls/wbemprox/Makefile.in | 1 -
dlls/wbemprox/builtin.c | 8 ++++----
dlls/wbemprox/class.c | 44 ++++++++++++++++++++++---------------------
dlls/wbemprox/process.c | 10 +++++-----
dlls/wbemprox/qualifier.c | 16 ++++++++--------
dlls/wbemprox/query.c | 4 ++--
dlls/wbemprox/reg.c | 2 +-
dlls/wbemprox/service.c | 2 +-
dlls/wbemprox/services.c | 34 +++++++++++++++++----------------
dlls/wbemprox/table.c | 4 ++--
dlls/wbemprox/wbemlocator.c | 2 +-
11 files changed, 63 insertions(+), 64 deletions(-)
diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in
index 89c209ab183..48a43646491 100644
--- a/dlls/wbemprox/Makefile.in
+++ b/dlls/wbemprox/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wbemprox.dll
IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 050e9462a4c..2de3479a699 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -3167,7 +3167,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co
offset += sizeof(*rec);
num_rows++;
}
- TRACE("created %u rows\n", num_rows);
+ TRACE("created %lu rows\n", num_rows);
table->num_rows = num_rows;
free( info );
@@ -3656,7 +3656,7 @@ static const WCHAR *get_service_type( DWORD type )
else if (type & SERVICE_FILE_SYSTEM_DRIVER) return L"File System Driver";
else if (type & SERVICE_WIN32_OWN_PROCESS) return L"Own Process";
else if (type & SERVICE_WIN32_SHARE_PROCESS) return L"Share Process";
- else ERR("unhandled type 0x%08x\n", type);
+ else ERR("unhandled type 0x%08lx\n", type);
return NULL;
}
static const WCHAR *get_service_state( DWORD state )
@@ -3668,7 +3668,7 @@ static const WCHAR *get_service_state( DWORD state )
case SERVICE_STOP_PENDING: return L"Stop Pending";
case SERVICE_RUNNING: return L"Running";
default:
- ERR("unknown state %u\n", state);
+ ERR("unknown state %lu\n", state);
return L"Unknown";
}
}
@@ -3682,7 +3682,7 @@ static const WCHAR *get_service_startmode( DWORD mode )
case SERVICE_DEMAND_START: return L"Manual";
case SERVICE_DISABLED: return L"Disabled";
default:
- ERR("unknown mode 0x%x\n", mode);
+ ERR("unknown mode 0x%lx\n", mode);
return L"Unknown";
}
}
diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c
index 6f93c58a0df..7ca691164c6 100644
--- a/dlls/wbemprox/class.c
+++ b/dlls/wbemprox/class.c
@@ -119,7 +119,7 @@ static HRESULT WINAPI enum_class_object_Next(
HRESULT hr;
ULONG i, j;
- TRACE("%p, %d, %u, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned);
+ TRACE("%p, %ld, %lu, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned);
if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER;
if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n");
@@ -148,7 +148,7 @@ static HRESULT WINAPI enum_class_object_NextAsync(
ULONG uCount,
IWbemObjectSink *pSink )
{
- FIXME("%p, %u, %p\n", iface, uCount, pSink);
+ FIXME("%p, %lu, %p\n", iface, uCount, pSink);
return E_NOTIMPL;
}
@@ -172,7 +172,7 @@ static HRESULT WINAPI enum_class_object_Skip(
struct view *view = ec->query->view;
static int once = 0;
- TRACE("%p, %d, %u\n", iface, lTimeout, nCount);
+ TRACE("%p, %ld, %lu\n", iface, lTimeout, nCount);
if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n");
@@ -396,7 +396,7 @@ static HRESULT WINAPI class_object_Get(
struct class_object *co = impl_from_IWbemClassObject( iface );
struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter );
- TRACE("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor);
+ TRACE("%p, %s, %08lx, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor);
if (co->record)
{
@@ -437,7 +437,7 @@ static HRESULT record_set_value( struct record *record, UINT index, VARIANT *var
record->fields[index].u.ival = val;
return S_OK;
default:
- FIXME("unhandled type %u\n", type);
+ FIXME("unhandled type %lu\n", type);
break;
}
return WBEM_E_INVALID_PARAMETER;
@@ -453,7 +453,7 @@ static HRESULT WINAPI class_object_Put(
struct class_object *co = impl_from_IWbemClassObject( iface );
struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter );
- TRACE("%p, %s, %08x, %p, %u\n", iface, debugstr_w(wszName), lFlags, pVal, Type);
+ TRACE("%p, %s, %08lx, %p, %lu\n", iface, debugstr_w(wszName), lFlags, pVal, Type);
if (co->record)
{
@@ -487,7 +487,7 @@ static HRESULT WINAPI class_object_GetNames(
struct class_object *co = impl_from_IWbemClassObject( iface );
struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter );
- TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags,
+ TRACE("%p, %s, %08lx, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags,
debugstr_variant(pQualifierVal), pNames);
if (!pNames)
@@ -501,7 +501,7 @@ static HRESULT WINAPI class_object_GetNames(
lFlags != WBEM_FLAG_NONSYSTEM_ONLY &&
lFlags != WBEM_FLAG_SYSTEM_ONLY))
{
- FIXME("flags %08x not supported\n", lFlags);
+ FIXME("flags %08lx not supported\n", lFlags);
return E_NOTIMPL;
}
@@ -517,9 +517,9 @@ static HRESULT WINAPI class_object_BeginEnumeration(
{
struct class_object *co = impl_from_IWbemClassObject( iface );
- TRACE("%p, %08x\n", iface, lEnumFlags);
+ TRACE("%p, %08lx\n", iface, lEnumFlags);
- if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags);
+ if (lEnumFlags) FIXME("flags 0x%08lx not supported\n", lEnumFlags);
co->index_property = 0;
return S_OK;
@@ -541,7 +541,7 @@ static HRESULT WINAPI class_object_Next(
HRESULT hr;
UINT i;
- TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor);
+ TRACE("%p, %08lx, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor);
for (i = obj->index_property; i < table->num_cols; i++)
{
@@ -661,9 +661,9 @@ static HRESULT WINAPI class_object_GetObjectText(
struct view *view = ec->query->view;
BSTR text;
- TRACE("%p, %08x, %p\n", iface, lFlags, pstrObjectText);
+ TRACE("%p, %08lx, %p\n", iface, lFlags, pstrObjectText);
- if (lFlags) FIXME("flags %08x not implemented\n", lFlags);
+ if (lFlags) FIXME("flags %08lx not implemented\n", lFlags);
if (!(text = get_object_text( view, co->index ))) return E_OUTOFMEMORY;
*pstrObjectText = text;
@@ -675,7 +675,7 @@ static HRESULT WINAPI class_object_SpawnDerivedClass(
LONG lFlags,
IWbemClassObject **ppNewClass )
{
- FIXME("%p, %08x, %p\n", iface, lFlags, ppNewClass);
+ FIXME("%p, %08lx, %p\n", iface, lFlags, ppNewClass);
return E_NOTIMPL;
}
@@ -691,7 +691,7 @@ static HRESULT WINAPI class_object_SpawnInstance(
struct record *record;
HRESULT hr;
- TRACE("%p, %08x, %p\n", iface, lFlags, ppNewInstance);
+ TRACE("%p, %08lx, %p\n", iface, lFlags, ppNewInstance);
if (!(record = create_record( table ))) return E_OUTOFMEMORY;
if (FAILED(hr = IEnumWbemClassObject_Clone( co->iter, &iter )))
@@ -709,7 +709,7 @@ static HRESULT WINAPI class_object_CompareTo(
LONG lFlags,
IWbemClassObject *pCompareTo )
{
- FIXME("%p, %08x, %p\n", iface, lFlags, pCompareTo);
+ FIXME("%p, %08lx, %p\n", iface, lFlags, pCompareTo);
return E_NOTIMPL;
}
@@ -755,7 +755,7 @@ static void set_default_value( CIMTYPE type, UINT val, BYTE *ptr )
*(UINT32 *)ptr = val;
break;
default:
- FIXME("unhandled type %u\n", type);
+ FIXME("unhandled type %lu\n", type);
break;
}
}
@@ -892,7 +892,7 @@ static HRESULT WINAPI class_object_GetMethod(
unsigned int i;
HRESULT hr;
- TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature);
+ TRACE("%p, %s, %08lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature);
if (ppInSignature) *ppInSignature = NULL;
if (ppOutSignature) *ppOutSignature = NULL;
@@ -931,7 +931,7 @@ static HRESULT WINAPI class_object_PutMethod(
IWbemClassObject *pInSignature,
IWbemClassObject *pOutSignature )
{
- FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pInSignature, pOutSignature);
+ FIXME("%p, %s, %08lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, pInSignature, pOutSignature);
return E_NOTIMPL;
}
@@ -949,9 +949,9 @@ static HRESULT WINAPI class_object_BeginMethodEnumeration(
{
struct class_object *co = impl_from_IWbemClassObject( iface );
- TRACE("%p, %08x\n", iface, lEnumFlags);
+ TRACE("%p, %08lx\n", iface, lEnumFlags);
- if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags);
+ if (lEnumFlags) FIXME("flags 0x%08lx not supported\n", lEnumFlags);
co->index_method = 0;
return S_OK;
@@ -968,7 +968,7 @@ static HRESULT WINAPI class_object_NextMethod(
BSTR method;
HRESULT hr;
- TRACE("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature);
+ TRACE("%p, %08lx, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature);
if (!(method = get_method_name( co->ns, co->name, co->index_method ))) return WBEM_S_NO_MORE_DATA;
diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c
index 93136e9aefc..6f0901d1711 100644
--- a/dlls/wbemprox/process.c
+++ b/dlls/wbemprox/process.c
@@ -135,19 +135,19 @@ HRESULT process_create( IWbemClassObject *obj, IWbemContext *context, IWbemClass
if (FAILED(hr = IWbemClassObject_Get( in, L"CommandLine", 0, &command_line, &type, NULL ))
|| V_VT( &command_line ) != VT_BSTR)
- WARN( "Invalid CommandLine, hr %#x, type %u.\n", hr, V_VT( &command_line ));
+ WARN( "Invalid CommandLine, hr %#lx, type %u.\n", hr, V_VT( &command_line ));
else
TRACE( "CommandLine %s.\n", debugstr_w( V_BSTR( &command_line )));
if (FAILED(hr = IWbemClassObject_Get( in, L"CurrentDirectory", 0, ¤t_directory, &type, NULL ))
|| V_VT( ¤t_directory ) != VT_BSTR)
- WARN("Invalid CurrentDirectory, hr %#x, type %u.\n", hr, V_VT( ¤t_directory ));
+ WARN("Invalid CurrentDirectory, hr %#lx, type %u.\n", hr, V_VT( ¤t_directory ));
else
TRACE( "CurrentDirectory %s.\n", debugstr_w( V_BSTR( ¤t_directory )));
if (SUCCEEDED(IWbemClassObject_Get( in, L"ProcessStartupInformation", 0, &startup_info, &type, NULL ))
&& V_VT( &startup_info ) == VT_UNKNOWN && V_UNKNOWN( &startup_info ))
- FIXME( "ProcessStartupInformation is not implemented, vt_type %u, type %u, val %p.\n",
+ FIXME( "ProcessStartupInformation is not implemented, vt_type %u, type %lu, val %p.\n",
V_VT( &startup_info ), type, V_UNKNOWN( &startup_info ));
if (out && (hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params )))
@@ -164,7 +164,7 @@ HRESULT process_create( IWbemClassObject *obj, IWbemContext *context, IWbemClass
bret = CreateProcessW( NULL, V_BSTR( &command_line ), NULL, NULL, FALSE, 0L,
V_VT( ¤t_directory ) == VT_BSTR ? V_BSTR( ¤t_directory ) : NULL,
NULL, &si, &pi );
- TRACE( "CreateProcessW ret %#x, GetLastError() %u.\n", bret, GetLastError() );
+ TRACE( "CreateProcessW ret %#x, GetLastError() %lu.\n", bret, GetLastError() );
if (bret)
{
CloseHandle( pi.hThread );
@@ -217,6 +217,6 @@ done:
VariantClear( &command_line );
VariantClear( ¤t_directory );
VariantClear( &startup_info );
- TRACE( "ret %#x.\n", ret );
+ TRACE( "ret %#lx.\n", ret );
return ret;
}
diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c
index aa032388759..a71f6cd1a9e 100644
--- a/dlls/wbemprox/qualifier.c
+++ b/dlls/wbemprox/qualifier.c
@@ -159,7 +159,7 @@ static HRESULT get_qualifier_value( enum wbm_namespace ns, const WCHAR *class, c
hr = IWbemClassObject_Get( obj, L"BoolValue", 0, val, NULL, NULL );
break;
default:
- ERR("unhandled type %u\n", V_UI4( &var ));
+ ERR("unhandled type %lu\n", V_UI4( &var ));
break;
}
@@ -177,10 +177,10 @@ static HRESULT WINAPI qualifier_set_Get(
{
struct qualifier_set *set = impl_from_IWbemQualifierSet( iface );
- TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor);
+ TRACE("%p, %s, %08lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor);
if (lFlags)
{
- FIXME("flags %08x not supported\n", lFlags);
+ FIXME("flags %08lx not supported\n", lFlags);
return E_NOTIMPL;
}
return get_qualifier_value( set->ns, set->class, set->member, wszName, pVal, plFlavor );
@@ -192,7 +192,7 @@ static HRESULT WINAPI qualifier_set_Put(
VARIANT *pVal,
LONG lFlavor )
{
- FIXME("%p, %s, %p, %d\n", iface, debugstr_w(wszName), pVal, lFlavor);
+ FIXME("%p, %s, %p, %ld\n", iface, debugstr_w(wszName), pVal, lFlavor);
return E_NOTIMPL;
}
@@ -214,10 +214,10 @@ static HRESULT WINAPI qualifier_set_GetNames(
IWbemClassObject *obj;
HRESULT hr;
- TRACE("%p, %08x, %p\n", iface, lFlags, pNames);
+ TRACE("%p, %08lx, %p\n", iface, lFlags, pNames);
if (lFlags)
{
- FIXME("flags %08x not supported\n", lFlags);
+ FIXME("flags %08lx not supported\n", lFlags);
return E_NOTIMPL;
}
@@ -237,7 +237,7 @@ static HRESULT WINAPI qualifier_set_BeginEnumeration(
IWbemQualifierSet *iface,
LONG lFlags )
{
- FIXME("%p, %08x\n", iface, lFlags);
+ FIXME("%p, %08lx\n", iface, lFlags);
return E_NOTIMPL;
}
@@ -248,7 +248,7 @@ static HRESULT WINAPI qualifier_set_Next(
VARIANT *pVal,
LONG *plFlavor )
{
- FIXME("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, pVal, plFlavor);
+ FIXME("%p, %08lx, %p, %p, %p\n", iface, lFlags, pstrName, pVal, plFlavor);
return E_NOTIMPL;
}
diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c
index 56631cbca9e..dfda0b34ea2 100644
--- a/dlls/wbemprox/query.c
+++ b/dlls/wbemprox/query.c
@@ -300,7 +300,7 @@ static const WCHAR *format_int( WCHAR *buf, UINT len, CIMTYPE type, LONGLONG val
return buf;
default:
- ERR( "unhandled type %u\n", type );
+ ERR( "unhandled type %lu\n", type );
return NULL;
}
}
@@ -1047,7 +1047,7 @@ VARTYPE to_vartype( CIMTYPE type )
case CIM_REAL32: return VT_R4;
default:
- ERR("unhandled type %u\n", type);
+ ERR("unhandled type %lu\n", type);
break;
}
return 0;
diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c
index eaa1db8bdde..51c11aaddfa 100644
--- a/dlls/wbemprox/reg.c
+++ b/dlls/wbemprox/reg.c
@@ -569,7 +569,7 @@ static void set_dwordvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, D
HKEY hkey;
LONG res;
- TRACE("%p, %s, %s, %#x\n", root, debugstr_w(subkey), debugstr_w(name), value);
+ TRACE("%p, %s, %s, %#lx\n", root, debugstr_w(subkey), debugstr_w(name), value);
if ((res = RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE | reg_get_access_mask( context ), &hkey )))
{
diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c
index b0b7bce0872..08dc104fd3d 100644
--- a/dlls/wbemprox/service.c
+++ b/dlls/wbemprox/service.c
@@ -45,7 +45,7 @@ static UINT map_error( DWORD error )
case ERROR_SERVICE_REQUEST_TIMEOUT: return 7;
case ERROR_SERVICE_ALREADY_RUNNING: return 10;
default:
- WARN("unknown error %u\n", error);
+ WARN("unknown error %lu\n", error);
break;
}
return 8;
diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c
index 5184bf4a4fa..1fd24b878d1 100644
--- a/dlls/wbemprox/services.c
+++ b/dlls/wbemprox/services.c
@@ -122,7 +122,7 @@ static HRESULT WINAPI client_security_SetBlanket(
const OLECHAR *princname = (pServerPrincName == COLE_DEFAULT_PRINCIPAL) ?
L"<COLE_DEFAULT_PRINCIPAL>" : pServerPrincName;
- FIXME("%p, %p, %u, %u, %s, %u, %u, %p, 0x%08x\n", iface, pProxy, AuthnSvc, AuthzSvc,
+ FIXME("%p, %p, %lu, %lu, %s, %lu, %lu, %p, 0x%08lx\n", iface, pProxy, AuthnSvc, AuthzSvc,
debugstr_w(princname), AuthnLevel, ImpLevel, pAuthInfo, Capabilities);
return WBEM_NO_ERROR;
}
@@ -290,7 +290,7 @@ static HRESULT WINAPI wbem_services_OpenNamespace(
{
struct wbem_services *ws = impl_from_IWbemServices( iface );
- TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags,
+ TRACE("%p, %s, 0x%08lx, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags,
pCtx, ppWorkingNamespace, ppResult);
if (ws->ns != WBEMPROX_NAMESPACE_LAST || !strNamespace)
@@ -502,10 +502,10 @@ static HRESULT WINAPI wbem_services_GetObject(
{
struct wbem_services *services = impl_from_IWbemServices( iface );
- TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strObjectPath), lFlags,
+ TRACE("%p, %s, 0x%08lx, %p, %p, %p\n", iface, debugstr_w(strObjectPath), lFlags,
pCtx, ppObject, ppCallResult);
- if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags);
+ if (lFlags) FIXME("unsupported flags 0x%08lx\n", lFlags);
if (!strObjectPath || !strObjectPath[0])
return create_class_object( services->ns, NULL, NULL, 0, NULL, ppObject );
@@ -645,9 +645,9 @@ static HRESULT WINAPI wbem_services_CreateInstanceEnum(
struct path *path;
HRESULT hr;
- TRACE("%p, %s, 0%08x, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum);
+ TRACE("%p, %s, 0%08lx, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum);
- if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags);
+ if (lFlags) FIXME("unsupported flags 0x%08lx\n", lFlags);
hr = parse_path( strClass, &path );
if (hr != S_OK) return hr;
@@ -678,7 +678,7 @@ static HRESULT WINAPI wbem_services_ExecQuery(
{
struct wbem_services *services = impl_from_IWbemServices( iface );
- TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage),
+ TRACE("%p, %s, %s, 0x%08lx, %p, %p\n", iface, debugstr_w(strQueryLanguage),
debugstr_w(strQuery), lFlags, pCtx, ppEnum);
if (!strQueryLanguage || !strQuery || !strQuery[0]) return WBEM_E_INVALID_PARAMETER;
@@ -724,7 +724,7 @@ static HRESULT WINAPI wbem_services_ExecQueryAsync(
struct async_header *async;
struct async_query *query;
- TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery),
+ TRACE("%p, %s, %s, 0x%08lx, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery),
lFlags, pCtx, pResponseHandler);
if (!pResponseHandler) return WBEM_E_INVALID_PARAMETER;
@@ -794,7 +794,7 @@ static HRESULT WINAPI wbem_services_ExecNotificationQueryAsync(
struct async_header *async;
struct async_query *query;
- TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery),
+ TRACE("%p, %s, %s, 0x%08lx, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery),
lFlags, pCtx, pResponseHandler);
if (!pResponseHandler) return WBEM_E_INVALID_PARAMETER;
@@ -857,10 +857,10 @@ static HRESULT WINAPI wbem_services_ExecMethod(
struct table *table;
HRESULT hr;
- TRACE("%p, %s, %s, %08x, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath),
+ TRACE("%p, %s, %s, %08lx, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath),
debugstr_w(strMethodName), lFlags, context, pInParams, ppOutParams, ppCallResult);
- if (lFlags) FIXME("flags %08x not supported\n", lFlags);
+ if (lFlags) FIXME("flags %08lx not supported\n", lFlags);
if ((hr = parse_path( strObjectPath, &path )) != S_OK) return hr;
if (!(str = query_from_path( path )))
@@ -1084,7 +1084,7 @@ static HRESULT WINAPI wbem_context_GetNames(
LONG flags,
SAFEARRAY **names )
{
- FIXME("%p, %#x, %p\n", iface, flags, names);
+ FIXME("%p, %#lx, %p\n", iface, flags, names);
return E_NOTIMPL;
}
@@ -1093,7 +1093,7 @@ static HRESULT WINAPI wbem_context_BeginEnumeration(
IWbemContext *iface,
LONG flags )
{
- FIXME("%p, %#x\n", iface, flags);
+ FIXME("%p, %#lx\n", iface, flags);
return E_NOTIMPL;
}
@@ -1104,7 +1104,7 @@ static HRESULT WINAPI wbem_context_Next(
BSTR *name,
VARIANT *value )
{
- FIXME("%p, %#x, %p, %p\n", iface, flags, name, value);
+ FIXME("%p, %#lx, %p, %p\n", iface, flags, name, value);
return E_NOTIMPL;
}
@@ -1139,7 +1139,7 @@ static HRESULT WINAPI wbem_context_SetValue(
struct wbem_context_value *value;
HRESULT hr;
- TRACE("%p, %s, %#x, %s\n", iface, debugstr_w(name), flags, debugstr_variant(var));
+ TRACE("%p, %s, %#lx, %s\n", iface, debugstr_w(name), flags, debugstr_variant(var));
if (!name || !var)
return WBEM_E_INVALID_PARAMETER;
@@ -1179,7 +1179,7 @@ static HRESULT WINAPI wbem_context_GetValue(
struct wbem_context *context = impl_from_IWbemContext( iface );
struct wbem_context_value *value;
- TRACE("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, var);
+ TRACE("%p, %s, %#lx, %p\n", iface, debugstr_w(name), flags, var);
if (!name || !var)
return WBEM_E_INVALID_PARAMETER;
@@ -1196,7 +1196,7 @@ static HRESULT WINAPI wbem_context_DeleteValue(
LPCWSTR name,
LONG flags )
{
- FIXME("%p, %s, %#x\n", iface, debugstr_w(name), flags);
+ FIXME("%p, %s, %#lx\n", iface, debugstr_w(name), flags);
return E_NOTIMPL;
}
diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c
index d08646a1c50..e0f908d7f0f 100644
--- a/dlls/wbemprox/table.c
+++ b/dlls/wbemprox/table.c
@@ -70,7 +70,7 @@ UINT get_type_size( CIMTYPE type )
case CIM_REAL32:
return sizeof(FLOAT);
default:
- ERR("unhandled type %u\n", type);
+ ERR("unhandled type %lu\n", type);
break;
}
return sizeof(LONGLONG);
@@ -250,7 +250,7 @@ HRESULT set_value( const struct table *table, UINT row, UINT column, LONGLONG va
*(UINT64 *)ptr = val;
break;
default:
- FIXME("unhandled column type %u\n", type);
+ FIXME("unhandled column type %lu\n", type);
return WBEM_E_FAILED;
}
return S_OK;
diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c
index 58cb4a86991..6456407bba9 100644
--- a/dlls/wbemprox/wbemlocator.c
+++ b/dlls/wbemprox/wbemlocator.c
@@ -165,7 +165,7 @@ static HRESULT WINAPI wbem_locator_ConnectServer(
HRESULT hr;
WCHAR *server, *namespace;
- TRACE("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User),
+ TRACE("%p, %s, %s, %s, %s, 0x%08lx, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User),
debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), context, ppNamespace);
hr = parse_resource( NetworkResource, &server, &namespace );
2
1
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/msxml3/Makefile.in | 1 -
dlls/msxml3/attribute.c | 8 +--
dlls/msxml3/bsc.c | 33 ++++++------
dlls/msxml3/cdata.c | 40 +++++++--------
dlls/msxml3/comment.c | 40 +++++++--------
dlls/msxml3/dispex.c | 54 ++++++++------------
dlls/msxml3/docfrag.c | 25 +++++----
dlls/msxml3/doctype.c | 25 +++++----
dlls/msxml3/domdoc.c | 42 +++++++--------
dlls/msxml3/domimpl.c | 23 ++++-----
dlls/msxml3/element.c | 29 +++++------
dlls/msxml3/entityref.c | 7 +--
dlls/msxml3/factory.c | 20 ++++----
dlls/msxml3/httprequest.c | 104 ++++++++++++++++----------------------
dlls/msxml3/main.c | 2 +-
dlls/msxml3/mxnamespace.c | 18 +++----
dlls/msxml3/mxwriter.c | 52 ++++++++-----------
dlls/msxml3/node.c | 30 ++++-------
dlls/msxml3/nodelist.c | 13 ++---
dlls/msxml3/nodemap.c | 17 ++++---
dlls/msxml3/parseerror.c | 7 +--
dlls/msxml3/pi.c | 8 +--
dlls/msxml3/saxreader.c | 34 +++++--------
dlls/msxml3/schema.c | 14 ++---
dlls/msxml3/selection.c | 20 ++++----
dlls/msxml3/stylesheet.c | 10 ++--
dlls/msxml3/text.c | 18 +++----
dlls/msxml3/xmldoc.c | 17 +++----
dlls/msxml3/xmlelem.c | 31 ++++--------
dlls/msxml3/xmlparser.c | 26 +++-------
dlls/msxml3/xmlview.c | 84 +++++++++++++-----------------
31 files changed, 373 insertions(+), 479 deletions(-)
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index 7e3eccc0139..2bf789732da 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = msxml3.dll
IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS)
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
index cbb70daa4a2..89a1f630021 100644
--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
@@ -95,9 +95,9 @@ static HRESULT WINAPI domattr_QueryInterface(
static ULONG WINAPI domattr_AddRef(
IXMLDOMAttribute *iface )
{
- domattr *This = impl_from_IXMLDOMAttribute( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domattr *attr = impl_from_IXMLDOMAttribute( iface );
+ ULONG ref = InterlockedIncrement( &attr->ref );
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -107,7 +107,7 @@ static ULONG WINAPI domattr_Release(
domattr *This = impl_from_IXMLDOMAttribute( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
destroy_xmlnode(&This->node);
diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
index 3455fd675aa..5e3b60d92b5 100644
--- a/dlls/msxml3/bsc.c
+++ b/dlls/msxml3/bsc.c
@@ -76,10 +76,10 @@ static HRESULT WINAPI bsc_QueryInterface(
static ULONG WINAPI bsc_AddRef(
IBindStatusCallback *iface )
{
- bsc_t *This = impl_from_IBindStatusCallback(iface);
- LONG ref = InterlockedIncrement(&This->ref);
+ bsc_t *bsc = impl_from_IBindStatusCallback(iface);
+ LONG ref = InterlockedIncrement(&bsc->ref);
- TRACE("(%p) ref=%d\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -87,15 +87,18 @@ static ULONG WINAPI bsc_AddRef(
static ULONG WINAPI bsc_Release(
IBindStatusCallback *iface )
{
- bsc_t *This = impl_from_IBindStatusCallback(iface);
- LONG ref = InterlockedDecrement(&This->ref);
+ bsc_t *bsc = impl_from_IBindStatusCallback(iface);
+ LONG ref = InterlockedDecrement(&bsc->ref);
- TRACE("(%p) ref=%d\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if(!ref) {
- if (This->binding) IBinding_Release(This->binding);
- if (This->memstream) IStream_Release(This->memstream);
- heap_free(This);
+ if (!ref)
+ {
+ if (bsc->binding)
+ IBinding_Release(bsc->binding);
+ if (bsc->memstream)
+ IStream_Release(bsc->memstream);
+ heap_free(bsc);
}
return ref;
@@ -109,7 +112,7 @@ static HRESULT WINAPI bsc_OnStartBinding(
bsc_t *This = impl_from_IBindStatusCallback(iface);
HRESULT hr;
- TRACE("(%p)->(%x %p)\n", This, dwReserved, pib);
+ TRACE("%p, %lx, %p.\n", iface, dwReserved, pib);
This->binding = pib;
IBinding_AddRef(pib);
@@ -153,7 +156,7 @@ static HRESULT WINAPI bsc_OnStopBinding(
bsc_t *This = impl_from_IBindStatusCallback(iface);
HRESULT hr = S_OK;
- TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));
+ TRACE("%p, %#lx, %s.\n", iface, hresult, debugstr_w(szError));
if(This->binding) {
IBinding_Release(This->binding);
@@ -194,12 +197,12 @@ static HRESULT WINAPI bsc_OnDataAvailable(
FORMATETC* pformatetc,
STGMEDIUM* pstgmed)
{
- bsc_t *This = impl_from_IBindStatusCallback(iface);
+ bsc_t *bsc = impl_from_IBindStatusCallback(iface);
BYTE buf[4096];
DWORD read, written;
HRESULT hr;
- TRACE("(%p)->(%x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
+ TRACE("%p, %lx, %lu, %p, %p.\n", iface, grfBSCF, dwSize, pformatetc, pstgmed);
do
{
@@ -207,7 +210,7 @@ static HRESULT WINAPI bsc_OnDataAvailable(
if(FAILED(hr))
break;
- hr = IStream_Write(This->memstream, buf, read, &written);
+ hr = IStream_Write(bsc->memstream, buf, read, &written);
} while(SUCCEEDED(hr) && written != 0 && read != 0);
return S_OK;
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index fa8856ece5f..9994a508c54 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -89,26 +89,25 @@ static HRESULT WINAPI domcdata_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domcdata_AddRef(
- IXMLDOMCDATASection *iface )
+static ULONG WINAPI domcdata_AddRef(IXMLDOMCDATASection *iface)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domcdata *cdata = impl_from_IXMLDOMCDATASection(iface);
+ ULONG ref = InterlockedIncrement(&cdata->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domcdata_Release(
- IXMLDOMCDATASection *iface )
+static ULONG WINAPI domcdata_Release(IXMLDOMCDATASection *iface)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ domcdata *cdata = impl_from_IXMLDOMCDATASection(iface);
+ ULONG ref = InterlockedDecrement(&cdata->ref);
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
- destroy_xmlnode(&This->node);
- heap_free( This );
+ destroy_xmlnode(&cdata->node);
+ heap_free(cdata);
}
return ref;
@@ -577,11 +576,10 @@ static HRESULT WINAPI domcdata_substringData(
IXMLDOMCDATASection *iface,
LONG offset, LONG count, BSTR *p)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr;
BSTR data;
- TRACE("(%p)->(%d %d %p)\n", This, offset, count, p);
+ TRACE("%p, %ld, %ld, %p.\n", iface, offset, count, p);
if(!p)
return E_INVALIDARG;
@@ -651,12 +649,11 @@ static HRESULT WINAPI domcdata_insertData(
IXMLDOMCDATASection *iface,
LONG offset, BSTR p)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr;
BSTR data;
LONG p_len;
- TRACE("(%p)->(%d %s)\n", This, offset, debugstr_w(p));
+ TRACE("%p, %ld, %s.\n", iface, offset, debugstr_w(p));
/* If have a NULL or empty string, don't do anything. */
if((p_len = SysStringLen(p)) == 0)
@@ -699,12 +696,11 @@ static HRESULT WINAPI domcdata_deleteData(
IXMLDOMCDATASection *iface,
LONG offset, LONG count)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr;
LONG len = -1;
BSTR str;
- TRACE("(%p)->(%d %d)\n", This, offset, count);
+ TRACE("%p, %ld, %ld.\n", iface, offset, count);
hr = IXMLDOMCDATASection_get_length(iface, &len);
if(hr != S_OK) return hr;
@@ -747,10 +743,9 @@ static HRESULT WINAPI domcdata_replaceData(
IXMLDOMCDATASection *iface,
LONG offset, LONG count, BSTR p)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
HRESULT hr;
- TRACE("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(p));
+ TRACE("%p, %ld, %ld, %s.\n", iface, offset, count, debugstr_w(p));
hr = IXMLDOMCDATASection_deleteData(iface, offset, count);
@@ -764,12 +759,11 @@ static HRESULT WINAPI domcdata_splitText(
IXMLDOMCDATASection *iface,
LONG offset, IXMLDOMText **txtNode)
{
- domcdata *This = impl_from_IXMLDOMCDATASection( iface );
IXMLDOMDocument *doc;
LONG length = 0;
HRESULT hr;
- TRACE("(%p)->(%d %p)\n", This, offset, txtNode);
+ TRACE("%p, %ld, %p.\n", iface, offset, txtNode);
if (!txtNode || offset < 0) return E_INVALIDARG;
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index 561cc570b03..3ac7ed604ea 100644
--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
@@ -89,26 +89,25 @@ static HRESULT WINAPI domcomment_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domcomment_AddRef(
- IXMLDOMComment *iface )
+static ULONG WINAPI domcomment_AddRef(IXMLDOMComment *iface)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domcomment *comment = impl_from_IXMLDOMComment(iface);
+ ULONG ref = InterlockedIncrement(&comment->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domcomment_Release(
- IXMLDOMComment *iface )
+static ULONG WINAPI domcomment_Release(IXMLDOMComment *iface)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ domcomment *comment = impl_from_IXMLDOMComment(iface);
+ ULONG ref = InterlockedDecrement(&comment->ref);
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
- destroy_xmlnode(&This->node);
- heap_free( This );
+ destroy_xmlnode(&comment->node);
+ heap_free(comment);
}
return ref;
@@ -575,15 +574,12 @@ static HRESULT WINAPI domcomment_get_length(
return hr;
}
-static HRESULT WINAPI domcomment_substringData(
- IXMLDOMComment *iface,
- LONG offset, LONG count, BSTR *p)
+static HRESULT WINAPI domcomment_substringData(IXMLDOMComment *iface, LONG offset, LONG count, BSTR *p)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
HRESULT hr;
BSTR data;
- TRACE("(%p)->(%d %d %p)\n", This, offset, count, p);
+ TRACE("%p, %ld, %ld, %p.\n", iface, offset, count, p);
if(!p)
return E_INVALIDARG;
@@ -653,12 +649,11 @@ static HRESULT WINAPI domcomment_insertData(
IXMLDOMComment *iface,
LONG offset, BSTR p)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
HRESULT hr;
BSTR data;
LONG p_len;
- TRACE("(%p)->(%d %s)\n", This, offset, debugstr_w(p));
+ TRACE("%p, %ld, %s.\n", iface, offset, debugstr_w(p));
/* If have a NULL or empty string, don't do anything. */
if((p_len = SysStringLen(p)) == 0)
@@ -705,7 +700,7 @@ static HRESULT WINAPI domcomment_deleteData(
LONG len = -1;
BSTR str;
- TRACE("(%p)->(%d %d)\n", iface, offset, count);
+ TRACE("%p, %ld, %ld.\n", iface, offset, count);
hr = IXMLDOMComment_get_length(iface, &len);
if(hr != S_OK) return hr;
@@ -748,10 +743,9 @@ static HRESULT WINAPI domcomment_replaceData(
IXMLDOMComment *iface,
LONG offset, LONG count, BSTR p)
{
- domcomment *This = impl_from_IXMLDOMComment( iface );
HRESULT hr;
- TRACE("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(p));
+ TRACE("%p, %ld, %ld, %s.\n", iface, offset, count, debugstr_w(p));
hr = IXMLDOMComment_deleteData(iface, offset, count);
diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c
index 7f57f080516..cd7c2820133 100644
--- a/dlls/msxml3/dispex.c
+++ b/dlls/msxml3/dispex.c
@@ -142,7 +142,7 @@ static HRESULT get_typelib(unsigned lib, ITypeLib **tl)
if(!typelib[lib]) {
hres = LoadRegTypeLib(lib_ids[lib].iid, lib_ids[lib].major, 0, LOCALE_SYSTEM_DEFAULT, tl);
if(FAILED(hres)) {
- ERR("LoadRegTypeLib failed: %08x\n", hres);
+ ERR("LoadRegTypeLib failed, hr %#lx.\n", hres);
return hres;
}
@@ -173,7 +173,7 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo)
return hres;
hres = ITypeLib_GetTypeInfoOfGuid(typelib, get_riid_from_tid(tid), &ti);
if(FAILED(hres)) {
- ERR("GetTypeInfoOfGuid failed: %08x\n", hres);
+ ERR("GetTypeInfoOfGuid failed, hr %#lx.\n", hres);
return hres;
}
}
@@ -259,7 +259,7 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This)
hres = get_typeinfo(This->data->disp_tid, &dti);
if(FAILED(hres)) {
- ERR("Could not get disp type info: %08x\n", hres);
+ ERR("Could not get disp type info, hr %#lx.\n", hres);
return NULL;
}
@@ -363,26 +363,25 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti
static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
+ DispatchEx *dispex = impl_from_IDispatchEx(iface);
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
- return get_typeinfo(This->data->disp_tid, ppTInfo);
+ return get_typeinfo(dispex->data->disp_tid, ppTInfo);
}
static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
UINT i;
HRESULT hres;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
for(i=0; i < cNames; i++) {
- hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i);
+ hres = IDispatchEx_GetDispID(iface, rgszNames[i], 0, rgDispId+i);
if(FAILED(hres))
return hres;
}
@@ -394,13 +393,10 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,
REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams,
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
-
- TRACE("(%p)->(%x %s %x %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %x, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
- return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags,
- pDispParams, pVarResult, pExcepInfo, NULL);
+ return IDispatchEx_InvokeEx(iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL);
}
static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid)
@@ -409,10 +405,10 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
dispex_data_t *data;
int min, max, n, c;
- TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid);
+ TRACE("%p, %s, %lx, %p.\n", iface, debugstr_w(bstrName), grfdex, pid);
if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit))
- FIXME("Unsupported grfdex %x\n", grfdex);
+ FIXME("Unsupported grfdex %lx.\n", grfdex);
data = get_dispex_data(This);
if(!data)
@@ -486,7 +482,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
int min, max, n;
HRESULT hres;
- TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
+ TRACE("%p, %ld, %lx, %x, %p, %p, %p, %p.\n", iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
if(This->data->vtbl && This->data->vtbl->invoke) {
hres = This->data->vtbl->invoke(This->outer, id, lcid, wFlags, pdp, pvarRes, pei);
@@ -518,19 +514,19 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
}
if(min > max) {
- WARN("invalid id %x\n", id);
+ WARN("invalid id %lx.\n", id);
return DISP_E_UNKNOWNNAME;
}
hres = get_typeinfo(data->funcs[n].tid, &ti);
if(FAILED(hres)) {
- ERR("Could not get type info: %08x\n", hres);
+ ERR("Could not get type info, hr %#lx.\n", hres);
return hres;
}
hres = IUnknown_QueryInterface(This->outer, get_riid_from_tid(data->funcs[n].tid), (void**)&unk);
if(FAILED(hres)) {
- ERR("Could not get iface: %08x\n", hres);
+ ERR("Could not get interface, hr %#lx.\n", hres);
ITypeInfo_Release(ti);
return E_FAIL;
}
@@ -546,43 +542,37 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex);
+ TRACE("%p, %s, %lx.\n", iface, debugstr_w(bstrName), grfdex);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%x)\n", This, id);
+ TRACE("%p, %ld.\n", iface, id);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex);
+ TRACE("%p, %ld, %lx, %p.\n", iface, id, grfdexFetch, pgrfdex);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%x %p)\n", This, id, pbstrName);
+ TRACE("%p, %ld, %p.\n", iface, id, pbstrName);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE(" Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, grfdex, id, pid);
+ TRACE("%p, %lx, %ld, %p.\n", iface, grfdex, id, pid);
return E_NOTIMPL;
}
static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk)
{
- DispatchEx *This = impl_from_IDispatchEx(iface);
- TRACE("Not implemented in native msxml3 (%p)->(%p)\n", This, ppunk);
+ TRACE("%p, %p.\n", iface, ppunk);
return E_NOTIMPL;
}
diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
index 88456001464..595f9775272 100644
--- a/dlls/msxml3/docfrag.c
+++ b/dlls/msxml3/docfrag.c
@@ -88,26 +88,25 @@ static HRESULT WINAPI domfrag_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domfrag_AddRef(
- IXMLDOMDocumentFragment *iface )
+static ULONG WINAPI domfrag_AddRef(IXMLDOMDocumentFragment *iface)
{
- domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domfrag *domfrag = impl_from_IXMLDOMDocumentFragment(iface);
+ ULONG ref = InterlockedIncrement(&domfrag->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domfrag_Release(
- IXMLDOMDocumentFragment *iface )
+static ULONG WINAPI domfrag_Release(IXMLDOMDocumentFragment *iface)
{
- domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ domfrag *domfrag = impl_from_IXMLDOMDocumentFragment(iface);
+ ULONG ref = InterlockedDecrement(&domfrag->ref);
+
+ TRACE("%p, refcount %lu.\n", iface, ref);
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ if (!ref)
{
- destroy_xmlnode(&This->node);
- heap_free( This );
+ destroy_xmlnode(&domfrag->node);
+ heap_free(domfrag);
}
return ref;
diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c
index 9010481bb4e..50871b26a21 100644
--- a/dlls/msxml3/doctype.c
+++ b/dlls/msxml3/doctype.c
@@ -80,26 +80,25 @@ static HRESULT WINAPI domdoctype_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domdoctype_AddRef(
- IXMLDOMDocumentType *iface )
+static ULONG WINAPI domdoctype_AddRef(IXMLDOMDocumentType *iface)
{
- domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
- LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ domdoctype *doctype = impl_from_IXMLDOMDocumentType(iface);
+ LONG ref = InterlockedIncrement(&doctype->ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domdoctype_Release(
- IXMLDOMDocumentType *iface )
+static ULONG WINAPI domdoctype_Release(IXMLDOMDocumentType *iface)
{
- domdoctype *This = impl_from_IXMLDOMDocumentType( iface );
- ULONG ref = InterlockedDecrement(&This->ref);
+ domdoctype *doctype = impl_from_IXMLDOMDocumentType(iface);
+ ULONG ref = InterlockedDecrement(&doctype->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if(!ref) {
- destroy_xmlnode(&This->node);
- heap_free(This);
+ if (!ref)
+ {
+ destroy_xmlnode(&doctype->node);
+ heap_free(doctype);
}
return ref;
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 082d7950f8d..f0420a517ea 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -349,7 +349,7 @@ static domdoc_properties * properties_add_ref(domdoc_properties *properties)
if (!properties) return NULL;
ref = InterlockedIncrement(&properties->refs);
- TRACE("%p, %d.\n", properties, ref);
+ TRACE("%p, %ld.\n", properties, ref);
return properties;
}
@@ -361,7 +361,7 @@ static void properties_release(domdoc_properties *properties)
ref = InterlockedDecrement(&properties->refs);
- TRACE("%p, %d.\n", properties, ref);
+ TRACE("%p, %ld.\n", properties, ref);
if (ref < 0)
WARN("negative refcount, expect troubles\n");
@@ -613,7 +613,7 @@ void xmldoc_init(xmlDocPtr doc, MSXML_VERSION version)
LONG xmldoc_add_refs(xmlDocPtr doc, LONG refs)
{
LONG ref = InterlockedExchangeAdd(&priv_from_xmlDocPtr(doc)->refs, refs) + refs;
- TRACE("(%p)->(%d)\n", doc, ref);
+ TRACE("%p, refcount %ld.\n", doc, ref);
return ref;
}
@@ -626,7 +626,8 @@ LONG xmldoc_release_refs(xmlDocPtr doc, LONG refs)
{
xmldoc_priv *priv = priv_from_xmlDocPtr(doc);
LONG ref = InterlockedExchangeAdd(&priv->refs, -refs) - refs;
- TRACE("(%p)->(%d)\n", doc, ref);
+
+ TRACE("%p, refcount %ld.\n", doc, ref);
if (ref < 0)
WARN("negative refcount, expect troubles\n");
@@ -818,7 +819,7 @@ static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream)
if (FAILED(hr))
{
- ERR("failed to copy stream 0x%08x\n", hr);
+ ERR("failed to copy stream, hr %#lx.\n", hr);
IStream_Release(hstream);
return hr;
}
@@ -878,7 +879,7 @@ static HRESULT WINAPI PersistStreamInit_Save(
SysFreeString(xmlString);
}
- TRACE("ret 0x%08x\n", hr);
+ TRACE("hr %#lx.\n", hr);
return hr;
}
@@ -977,9 +978,9 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID rii
static ULONG WINAPI domdoc_AddRef( IXMLDOMDocument3 *iface )
{
- domdoc *This = impl_from_IXMLDOMDocument3( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref );
+ domdoc *doc = impl_from_IXMLDOMDocument3(iface);
+ ULONG ref = InterlockedIncrement(&doc->ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -988,9 +989,9 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface )
domdoc *This = impl_from_IXMLDOMDocument3( iface );
LONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref );
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if ( ref == 0 )
+ if (!ref)
{
int eid;
@@ -2249,7 +2250,7 @@ static HRESULT WINAPI domdoc_load(
if (FAILED(hr))
{
This->error = hr;
- WARN("failed to access array data, 0x%08x\n", hr);
+ WARN("failed to access array data, hr %#lx.\n", hr);
break;
}
SafeArrayGetUBound(psa, 1, &len);
@@ -2318,7 +2319,7 @@ static HRESULT WINAPI domdoc_load(
return hr;
}
- FIXME("unsupported IUnknown type (0x%08x) (%p)\n", hr, V_UNKNOWN(&source)->lpVtbl);
+ FIXME("unsupported IUnknown type (%#lx) (%p)\n", hr, V_UNKNOWN(&source)->lpVtbl);
break;
}
default:
@@ -2368,7 +2369,7 @@ static HRESULT WINAPI domdoc_load(
hr = S_FALSE;
}
- TRACE("ret (%d)\n", hr);
+ TRACE("hr %#lx.\n", hr);
return hr;
}
@@ -2533,10 +2534,10 @@ static int XMLCALL domdoc_stream_save_writecallback(void *ctx, const char *buffe
HRESULT hr;
hr = IStream_Write((IStream*)ctx, buffer, len, &written);
- TRACE("0x%08x %p %d %u\n", hr, buffer, len, written);
+ TRACE("hr %#lx, %p, %d, %lu.\n", hr, buffer, len, written);
if (hr != S_OK)
{
- WARN("stream write error: 0x%08x\n", hr);
+ WARN("stream write error, hr %#lx.\n", hr);
return -1;
}
else
@@ -3532,7 +3533,7 @@ static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD co
{
ConnectionPoint *This = impl_from_IConnectionPoint(iface);
- TRACE("(%p)->(%d)\n", This, cookie);
+ TRACE("%p, %ld.\n", iface, cookie);
if (cookie == 0 || cookie > This->sinks_size || !This->sinks[cookie-1].unk)
return CONNECT_E_NOCONNECTION;
@@ -3690,13 +3691,14 @@ static HRESULT WINAPI domdoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *ifa
static HRESULT WINAPI domdoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,
DWORD mask, DWORD enabled)
{
- domdoc *This = impl_from_IObjectSafety(iface);
- TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled);
+ domdoc *doc = impl_from_IObjectSafety(iface);
+
+ TRACE("%p, %s, %lx, %lx.\n", iface, debugstr_guid(riid), mask, enabled);
if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0)
return E_FAIL;
- This->safeopt = (This->safeopt & ~mask) | (mask & enabled);
+ doc->safeopt = (doc->safeopt & ~mask) | (mask & enabled);
return S_OK;
}
diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
index 3e5b912efd2..77a30e775ff 100644
--- a/dlls/msxml3/domimpl.c
+++ b/dlls/msxml3/domimpl.c
@@ -76,24 +76,23 @@ static HRESULT WINAPI domimpl_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domimpl_AddRef(
- IXMLDOMImplementation *iface )
+static ULONG WINAPI domimpl_AddRef(IXMLDOMImplementation *iface)
{
- domimpl *This = impl_from_IXMLDOMImplementation( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ domimpl *domimpl = impl_from_IXMLDOMImplementation(iface);
+ ULONG ref = InterlockedIncrement(&domimpl->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domimpl_Release(
- IXMLDOMImplementation *iface )
+static ULONG WINAPI domimpl_Release(IXMLDOMImplementation *iface)
{
- domimpl *This = impl_from_IXMLDOMImplementation( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ domimpl *domimpl = impl_from_IXMLDOMImplementation(iface);
+ ULONG ref = InterlockedDecrement(&domimpl->ref);
+
+ TRACE("%p, refcount %lu.\n", iface, ref);
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
- heap_free( This );
+ if (!ref)
+ heap_free(domimpl);
return ref;
}
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
index e1462c47d88..7f5b91b0f39 100644
--- a/dlls/msxml3/element.c
+++ b/dlls/msxml3/element.c
@@ -100,28 +100,27 @@ static HRESULT WINAPI domelem_QueryInterface(
return S_OK;
}
-static ULONG WINAPI domelem_AddRef(
- IXMLDOMElement *iface )
+static ULONG WINAPI domelem_AddRef(IXMLDOMElement *iface)
{
- domelem *This = impl_from_IXMLDOMElement( iface );
- LONG ref = InterlockedIncrement(&This->ref);
+ domelem *element = impl_from_IXMLDOMElement(iface);
+ LONG ref = InterlockedIncrement(&element->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
-static ULONG WINAPI domelem_Release(
- IXMLDOMElement *iface )
+static ULONG WINAPI domelem_Release(IXMLDOMElement *iface)
{
- domelem *This = impl_from_IXMLDOMElement( iface );
- ULONG ref = InterlockedDecrement(&This->ref);
+ domelem *element = impl_from_IXMLDOMElement(iface);
+ ULONG ref = InterlockedDecrement(&element->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if(!ref) {
- destroy_xmlnode(&This->node);
- heap_free(This);
+ if (!ref)
+ {
+ destroy_xmlnode(&element->node);
+ heap_free(element);
}
return ref;
@@ -1792,7 +1791,7 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode *
IUnknown *unk;
HRESULT hr;
- TRACE("(%p)->(%d %p)\n", node, index, item);
+ TRACE("%p, %ld, %p.\n", node, index, item);
*item = NULL;
@@ -1879,7 +1878,7 @@ static HRESULT domelem_next_node(const xmlNodePtr node, LONG *iter, IXMLDOMNode
xmlAttrPtr curr;
LONG i;
- TRACE("(%p)->(%d: %p)\n", node, *iter, nextNode);
+ TRACE("%p, %ld, %p.\n", node, *iter, nextNode);
*nextNode = NULL;
diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
index a9e8d085c34..5a446b3271d 100644
--- a/dlls/msxml3/entityref.c
+++ b/dlls/msxml3/entityref.c
@@ -93,7 +93,7 @@ static ULONG WINAPI entityref_AddRef(
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -103,8 +103,9 @@ static ULONG WINAPI entityref_Release(
entityref *This = impl_from_IXMLDOMEntityReference( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
destroy_xmlnode(&This->node);
heap_free( This );
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index b8c8281063a..c2d3cd30c60 100644
--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
@@ -195,20 +195,22 @@ static inline DOMFactory *DOMFactory_from_IClassFactory(IClassFactory *iface)
static ULONG WINAPI DOMClassFactory_AddRef(IClassFactory *iface )
{
- DOMFactory *This = DOMFactory_from_IClassFactory(iface);
- ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref = %u\n", This, ref);
+ DOMFactory *factory = DOMFactory_from_IClassFactory(iface);
+ ULONG ref = InterlockedIncrement(&factory->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
static ULONG WINAPI DOMClassFactory_Release(IClassFactory *iface )
{
- DOMFactory *This = DOMFactory_from_IClassFactory(iface);
- ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref = %u\n", This, ref);
- if(!ref) {
- heap_free(This);
- }
+ DOMFactory *factory = DOMFactory_from_IClassFactory(iface);
+ ULONG ref = InterlockedDecrement(&factory->ref);
+
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
+ heap_free(factory);
+
return ref;
}
diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index 86e569f5dd8..cc384a380e5 100644
--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
@@ -274,7 +274,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref = %d\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -284,7 +284,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref = %d\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
if (!ref)
{
@@ -302,7 +302,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- TRACE("(%p)->(%d %p)\n", This, reserved, pbind);
+ TRACE("%p, %ld, %p.\n", iface, reserved, pbind);
if (!pbind) return E_INVALIDARG;
@@ -325,9 +325,7 @@ static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface,
static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved)
{
- BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
-
- TRACE("(%p)->(%d)\n", This, reserved);
+ TRACE("%p, %ld.\n", iface, reserved);
return E_NOTIMPL;
}
@@ -335,9 +333,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *ifac
static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress,
ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
{
- BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
-
- TRACE("(%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
+ TRACE("%p, %lu, %lu, %lu, %s.\n", iface, ulProgress, ulProgressMax, ulStatusCode,
debugstr_w(szStatusText));
return S_OK;
@@ -348,7 +344,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- TRACE("(%p)->(0x%08x %s)\n", This, hr, debugstr_w(error));
+ TRACE("%p, %#lx, %s.\n", iface, hr, debugstr_w(error));
if (This->binding)
{
@@ -403,7 +399,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
BYTE buf[4096];
HRESULT hr;
- TRACE("(%p)->(%08x %d %p %p)\n", This, flags, size, format, stgmed);
+ TRACE("%p, %#lx, %lu, %p, %p.\n", iface, flags, size, format, stgmed);
do
{
@@ -474,7 +470,7 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac
WCHAR *buff, *ptr;
int size = 0;
- TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(url), debugstr_w(headers), reserved, add_headers);
+ TRACE("%p, %s, %s, %ld, %p.\n", iface, debugstr_w(url), debugstr_w(headers), reserved, add_headers);
*add_headers = NULL;
@@ -576,7 +572,7 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c
{
BindStatusCallback *This = impl_from_IHttpNegotiate(iface);
- TRACE("(%p)->(%d %s %s %p)\n", This, code, debugstr_w(resp_headers),
+ TRACE("%p, %ld, %s, %s, %p.\n", iface, code, debugstr_w(resp_headers),
debugstr_w(req_headers), add_reqheaders);
This->request->status = code;
@@ -931,7 +927,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url,
else
hr = CreateUri(url, 0, 0, &uri);
if(FAILED(hr)) {
- WARN("Could not create IUri object: %08x\n", hr);
+ WARN("Could not create IUri object, hr %#lx.\n", hr);
return hr;
}
@@ -970,11 +966,11 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url,
uri = full_uri;
}
else
- WARN("failed to create modified uri, 0x%08x\n", hr);
+ WARN("failed to create modified uri, hr %#lx.\n", hr);
IUriBuilder_Release(builder);
}
else
- WARN("IUriBuilder creation failed, 0x%08x\n", hr);
+ WARN("IUriBuilder creation failed, hr %#lx.\n", hr);
}
This->uri = uri;
@@ -1396,23 +1392,23 @@ static HRESULT WINAPI XMLHTTPRequest_QueryInterface(IXMLHTTPRequest *iface, REFI
static ULONG WINAPI XMLHTTPRequest_AddRef(IXMLHTTPRequest *iface)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%u)\n", This, ref );
+ httprequest *request = impl_from_IXMLHTTPRequest(iface);
+ ULONG ref = InterlockedIncrement(&request->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
static ULONG WINAPI XMLHTTPRequest_Release(IXMLHTTPRequest *iface)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
- ULONG ref = InterlockedDecrement( &This->ref );
+ httprequest *request = impl_from_IXMLHTTPRequest(iface);
+ ULONG ref = InterlockedDecrement(&request->ref);
- TRACE("(%p)->(%u)\n", This, ref );
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if ( ref == 0 )
+ if (!ref)
{
- httprequest_release( This );
- heap_free( This );
+ httprequest_release(request);
+ heap_free(request);
}
return ref;
@@ -1420,9 +1416,7 @@ static ULONG WINAPI XMLHTTPRequest_Release(IXMLHTTPRequest *iface)
static HRESULT WINAPI XMLHTTPRequest_GetTypeInfoCount(IXMLHTTPRequest *iface, UINT *pctinfo)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
-
- TRACE("(%p)->(%p)\n", This, pctinfo);
+ TRACE("%p, %p.\n", iface, pctinfo);
*pctinfo = 1;
@@ -1432,9 +1426,7 @@ static HRESULT WINAPI XMLHTTPRequest_GetTypeInfoCount(IXMLHTTPRequest *iface, UI
static HRESULT WINAPI XMLHTTPRequest_GetTypeInfo(IXMLHTTPRequest *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx,%p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IXMLHTTPRequest_tid, ppTInfo);
}
@@ -1442,11 +1434,10 @@ static HRESULT WINAPI XMLHTTPRequest_GetTypeInfo(IXMLHTTPRequest *iface, UINT iT
static HRESULT WINAPI XMLHTTPRequest_GetIDsOfNames(IXMLHTTPRequest *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -1466,18 +1457,16 @@ static HRESULT WINAPI XMLHTTPRequest_Invoke(IXMLHTTPRequest *iface, DISPID dispI
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- httprequest *This = impl_from_IXMLHTTPRequest( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLHTTPRequest_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IXMLHTTPRequest_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -1743,13 +1732,14 @@ static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety
static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,
DWORD mask, DWORD enabled)
{
- httprequest *This = impl_from_IObjectSafety(iface);
- TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled);
+ httprequest *request = impl_from_IObjectSafety(iface);
+
+ TRACE("%p, %s, %lx, %lx.\n", iface, debugstr_guid(riid), mask, enabled);
if ((mask & ~safety_supported_options))
return E_FAIL;
- This->safeopt = (This->safeopt & ~mask) | (mask & enabled);
+ request->safeopt = (request->safeopt & ~mask) | (mask & enabled);
return S_OK;
}
@@ -1829,23 +1819,23 @@ static HRESULT WINAPI ServerXMLHTTPRequest_QueryInterface(IServerXMLHTTPRequest
static ULONG WINAPI ServerXMLHTTPRequest_AddRef(IServerXMLHTTPRequest *iface)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
- ULONG ref = InterlockedIncrement( &This->req.ref );
- TRACE("(%p)->(%u)\n", This, ref );
+ serverhttp *request = impl_from_IServerXMLHTTPRequest(iface);
+ ULONG ref = InterlockedIncrement(&request->req.ref);
+ TRACE("%p, refcount %lu.\n", iface, ref );
return ref;
}
static ULONG WINAPI ServerXMLHTTPRequest_Release(IServerXMLHTTPRequest *iface)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
- ULONG ref = InterlockedDecrement( &This->req.ref );
+ serverhttp *request = impl_from_IServerXMLHTTPRequest(iface);
+ ULONG ref = InterlockedDecrement(&request->req.ref);
- TRACE("(%p)->(%u)\n", This, ref );
+ TRACE("%p, refcount %lu.\n", iface, ref );
- if ( ref == 0 )
+ if (!ref)
{
- httprequest_release( &This->req );
- heap_free( This );
+ httprequest_release(&request->req);
+ heap_free(request);
}
return ref;
@@ -1864,9 +1854,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfoCount(IServerXMLHTTPReques
static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IServerXMLHTTPRequest_tid, ppTInfo);
}
@@ -1874,11 +1862,10 @@ static HRESULT WINAPI ServerXMLHTTPRequest_GetTypeInfo(IServerXMLHTTPRequest *if
static HRESULT WINAPI ServerXMLHTTPRequest_GetIDsOfNames(IServerXMLHTTPRequest *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -1898,18 +1885,16 @@ static HRESULT WINAPI ServerXMLHTTPRequest_Invoke(IServerXMLHTTPRequest *iface,
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IServerXMLHTTPRequest_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IServerXMLHTTPRequest_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -2019,8 +2004,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_put_onreadystatechange(IServerXMLHTTP
static HRESULT WINAPI ServerXMLHTTPRequest_setTimeouts(IServerXMLHTTPRequest *iface, LONG resolveTimeout, LONG connectTimeout,
LONG sendTimeout, LONG receiveTimeout)
{
- serverhttp *This = impl_from_IServerXMLHTTPRequest( iface );
- FIXME("(%p)->(%d %d %d %d): stub\n", This, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout);
+ FIXME("%p, %ld, %ld, %ld, %ld: stub\n", iface, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout);
return S_OK;
}
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index 2a97f2637f1..552c6943e24 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -142,7 +142,7 @@ static int wineXmlReadCallback(void * context, char * buffer, int len)
return -1;
}
- TRACE("Read %d\n", dwBytesRead);
+ TRACE("Read %ld bytes.\n", dwBytesRead);
return dwBytesRead;
}
diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c
index fa9194743b6..518897af8e9 100644
--- a/dlls/msxml3/mxnamespace.c
+++ b/dlls/msxml3/mxnamespace.c
@@ -293,7 +293,7 @@ static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *if
HRESULT hr;
BSTR prfx;
- TRACE("(%p)->(%d %p %p)\n", This, index, prefix, prefix_len);
+ TRACE("%p, %ld, %p, %p.\n", This, index, prefix, prefix_len);
if (!prefix_len) return E_POINTER;
@@ -315,15 +315,15 @@ static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *if
static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface,
const WCHAR *uri, LONG index, WCHAR *prefix, int *prefix_len)
{
- namespacemanager *This = impl_from_IMXNamespaceManager( iface );
+ namespacemanager *manager = impl_from_IMXNamespaceManager(iface);
HRESULT hr;
BSTR prfx;
- TRACE("(%p)->(%s %d %p %p)\n", This, debugstr_w(uri), index, prefix, prefix_len);
+ TRACE("%p, %s, %ld, %p, %p.\n", iface, debugstr_w(uri), index, prefix, prefix_len);
if (!uri || !*uri || !prefix_len) return E_INVALIDARG;
- hr = get_declared_prefix_uri(&This->ctxts, uri, &prfx);
+ hr = get_declared_prefix_uri(&manager->ctxts, uri, &prfx);
if (hr == S_OK)
{
/* TODO: figure out what index argument is for */
@@ -429,9 +429,9 @@ static HRESULT WINAPI vbnamespacemanager_QueryInterface(IVBMXNamespaceManager *i
static ULONG WINAPI vbnamespacemanager_AddRef(IVBMXNamespaceManager *iface)
{
- namespacemanager *This = impl_from_IVBMXNamespaceManager( iface );
- ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%u)\n", This, ref );
+ namespacemanager *manager = impl_from_IVBMXNamespaceManager(iface);
+ ULONG ref = InterlockedIncrement(&manager->ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -440,9 +440,9 @@ static ULONG WINAPI vbnamespacemanager_Release(IVBMXNamespaceManager *iface)
namespacemanager *This = impl_from_IVBMXNamespaceManager( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%u)\n", This, ref );
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if ( ref == 0 )
+ if (!ref)
{
struct nscontext *ctxt, *ctxt2;
diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c
index 084324797c7..4a2844bcf08 100644
--- a/dlls/msxml3/mxwriter.c
+++ b/dlls/msxml3/mxwriter.c
@@ -828,10 +828,10 @@ static HRESULT WINAPI mxwriter_QueryInterface(IMXWriter *iface, REFIID riid, voi
static ULONG WINAPI mxwriter_AddRef(IMXWriter *iface)
{
- mxwriter *This = impl_from_IMXWriter( iface );
- LONG ref = InterlockedIncrement(&This->ref);
+ mxwriter *writer = impl_from_IMXWriter(iface);
+ LONG ref = InterlockedIncrement(&writer->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -841,9 +841,9 @@ static ULONG WINAPI mxwriter_Release(IMXWriter *iface)
mxwriter *This = impl_from_IMXWriter( iface );
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if(!ref)
+ if (!ref)
{
/* Windows flushes the buffer when the interface is destroyed. */
flush_output_buffer(This);
@@ -2468,9 +2468,7 @@ static ULONG WINAPI SAXErrorHandler_Release(ISAXErrorHandler *iface)
static HRESULT WINAPI SAXErrorHandler_error(ISAXErrorHandler *iface,
ISAXLocator *locator, const WCHAR *message, HRESULT hr)
{
- mxwriter *This = impl_from_ISAXErrorHandler( iface );
-
- FIXME("(%p)->(%p %s 0x%08x)\n", This, locator, debugstr_w(message), hr);
+ FIXME("%p, %p, %s, %#lx.\n", iface, locator, debugstr_w(message), hr);
return E_NOTIMPL;
}
@@ -2478,9 +2476,7 @@ static HRESULT WINAPI SAXErrorHandler_error(ISAXErrorHandler *iface,
static HRESULT WINAPI SAXErrorHandler_fatalError(ISAXErrorHandler *iface,
ISAXLocator *locator, const WCHAR *message, HRESULT hr)
{
- mxwriter *This = impl_from_ISAXErrorHandler( iface );
-
- FIXME("(%p)->(%p %s 0x%08x)\n", This, locator, debugstr_w(message), hr);
+ FIXME("%p, %p, %s, %#lx.\n", iface, locator, debugstr_w(message), hr);
return E_NOTIMPL;
}
@@ -2488,9 +2484,7 @@ static HRESULT WINAPI SAXErrorHandler_fatalError(ISAXErrorHandler *iface,
static HRESULT WINAPI SAXErrorHandler_ignorableWarning(ISAXErrorHandler *iface,
ISAXLocator *locator, const WCHAR *message, HRESULT hr)
{
- mxwriter *This = impl_from_ISAXErrorHandler( iface );
-
- FIXME("(%p)->(%p %s 0x%08x)\n", This, locator, debugstr_w(message), hr);
+ FIXME("%p, %p, %s, %#lx.\n", iface, locator, debugstr_w(message), hr);
return E_NOTIMPL;
}
@@ -2552,22 +2546,19 @@ static HRESULT WINAPI VBSAXErrorHandler_Invoke(IVBSAXErrorHandler *iface, DISPID
static HRESULT WINAPI VBSAXErrorHandler_error(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code)
{
- mxwriter *This = impl_from_IVBSAXErrorHandler( iface );
- FIXME("(%p)->(%p %p %x): stub\n", This, locator, message, code);
+ FIXME("%p, %p, %p, %lx: stub\n", iface, locator, message, code);
return E_NOTIMPL;
}
static HRESULT WINAPI VBSAXErrorHandler_fatalError(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code)
{
- mxwriter *This = impl_from_IVBSAXErrorHandler( iface );
- FIXME("(%p)->(%p %p %x): stub\n", This, locator, message, code);
+ FIXME("%p, %p, %p, %lx: stub\n", iface, locator, message, code);
return E_NOTIMPL;
}
static HRESULT WINAPI VBSAXErrorHandler_ignorableWarning(IVBSAXErrorHandler *iface, IVBSAXLocator *locator, BSTR *message, LONG code)
{
- mxwriter *This = impl_from_IVBSAXErrorHandler( iface );
- FIXME("(%p)->(%p %p %x): stub\n", This, locator, message, code);
+ FIXME("%p, %p, %p, %lx: stub\n", iface, locator, message, code);
return E_NOTIMPL;
}
@@ -2698,18 +2689,18 @@ static ULONG WINAPI MXAttributes_AddRef(IMXAttributes *iface)
{
mxattributes *This = impl_from_IMXAttributes( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref );
+ TRACE("%p, refcount %lu.\n", iface, ref );
return ref;
}
static ULONG WINAPI MXAttributes_Release(IMXAttributes *iface)
{
mxattributes *This = impl_from_IMXAttributes( iface );
- LONG ref = InterlockedDecrement( &This->ref );
+ ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
- if (ref == 0)
+ if (!ref)
{
int i;
@@ -3261,8 +3252,8 @@ static HRESULT WINAPI VBSAXAttributes_GetTypeInfo(
IVBSAXAttributes *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{
- mxattributes *This = impl_from_IVBSAXAttributes( iface );
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
+
return get_typeinfo(IVBSAXAttributes_tid, ppTInfo);
}
@@ -3274,11 +3265,10 @@ static HRESULT WINAPI VBSAXAttributes_GetIDsOfNames(
LCID lcid,
DISPID* rgDispId)
{
- mxattributes *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -3305,18 +3295,16 @@ static HRESULT WINAPI VBSAXAttributes_Invoke(
EXCEPINFO* pExcepInfo,
UINT* puArgErr)
{
- mxattributes *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXAttributes_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 272e438e773..339504477ac 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -107,7 +107,7 @@ static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface)
{
SupportErrorInfo *This = impl_from_ISupportErrorInfo(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref );
+ TRACE("%p, refcount %ld.\n", iface, ref );
return ref;
}
@@ -116,9 +116,9 @@ static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface)
SupportErrorInfo *This = impl_from_ISupportErrorInfo(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if (ref == 0)
+ if (!ref)
heap_free(This);
return ref;
@@ -1350,7 +1350,7 @@ static HRESULT xslt_doc_get_uri(const xmlChar *uri, void *_ctxt, xsltLoadType ty
SysFreeString(uriW);
if (FAILED(hr))
{
- WARN("Failed to create href uri, %#x.\n", hr);
+ WARN("Failed to create href uri, %#lx.\n", hr);
return hr;
}
@@ -1364,14 +1364,14 @@ static HRESULT xslt_doc_get_uri(const xmlChar *uri, void *_ctxt, xsltLoadType ty
SysFreeString(baseuriW);
if (FAILED(hr))
{
- WARN("Failed to create base uri, %#x.\n", hr);
+ WARN("Failed to create base uri, %#lx.\n", hr);
return hr;
}
hr = CoInternetCombineIUri(base_uri, href_uri, 0, doc_uri, 0);
IUri_Release(base_uri);
if (FAILED(hr))
- WARN("Failed to combine uris, %#x.\n", hr);
+ WARN("Failed to combine uris, hr %#lx.\n", hr);
}
else
{
@@ -1717,14 +1717,9 @@ static HRESULT WINAPI unknode_GetTypeInfo(
LCID lcid,
ITypeInfo** ppTInfo )
{
- unknode *This = unknode_from_IXMLDOMNode( iface );
- HRESULT hr;
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
-
- hr = get_typeinfo(IXMLDOMNode_tid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
- return hr;
+ return get_typeinfo(IXMLDOMNode_tid, ppTInfo);
}
static HRESULT WINAPI unknode_GetIDsOfNames(
@@ -1735,12 +1730,10 @@ static HRESULT WINAPI unknode_GetIDsOfNames(
LCID lcid,
DISPID* rgDispId )
{
- unknode *This = unknode_from_IXMLDOMNode( iface );
-
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -1767,17 +1760,16 @@ static HRESULT WINAPI unknode_Invoke(
EXCEPINFO* pExcepInfo,
UINT* puArgErr )
{
- unknode *This = unknode_from_IXMLDOMNode( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLDOMNode_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMNode_iface, dispIdMember, wFlags, pDispParams,
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams,
pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
index 8ffd2dbd316..fd3d30a2e02 100644
--- a/dlls/msxml3/nodelist.c
+++ b/dlls/msxml3/nodelist.c
@@ -118,7 +118,7 @@ static ULONG WINAPI xmlnodelist_AddRef(
{
xmlnodelist *This = impl_from_IXMLDOMNodeList( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -128,8 +128,9 @@ static ULONG WINAPI xmlnodelist_Release(
xmlnodelist *This = impl_from_IXMLDOMNodeList( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
xmldoc_release( This->parent->doc );
if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant);
@@ -196,7 +197,7 @@ static HRESULT WINAPI xmlnodelist_get_item(
xmlNodePtr curr;
LONG nodeIndex = 0;
- TRACE("(%p)->(%d %p)\n", This, index, listItem);
+ TRACE("%p, %ld, %p.\n", iface, index, listItem);
if(!listItem)
return E_INVALIDARG;
@@ -312,7 +313,7 @@ static HRESULT xmlnodelist_get_dispid(IUnknown *iface, BSTR name, DWORD flags, D
return DISP_E_UNKNOWNNAME;
*dispid = DISPID_DOM_COLLECTION_BASE + idx;
- TRACE("ret %x\n", *dispid);
+ TRACE("ret %lx\n", *dispid);
return S_OK;
}
@@ -321,7 +322,7 @@ static HRESULT xmlnodelist_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fl
{
xmlnodelist *This = impl_from_IXMLDOMNodeList( (IXMLDOMNodeList*)iface );
- TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei);
+ TRACE("%p, %ld, %lx, %x, %p, %p, %p.\n", iface, id, lcid, flags, params, res, ei);
if (id >= DISPID_DOM_COLLECTION_BASE && id <= DISPID_DOM_COLLECTION_MAX)
{
diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
index afe7065dfd9..c90d46136a8 100644
--- a/dlls/msxml3/nodemap.c
+++ b/dlls/msxml3/nodemap.c
@@ -121,7 +121,7 @@ static ULONG WINAPI xmlnodemap_AddRef(
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -131,8 +131,9 @@ static ULONG WINAPI xmlnodemap_Release(
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
xmlnode_release( This->node );
xmldoc_release( This->node->doc );
@@ -225,7 +226,7 @@ static HRESULT WINAPI xmlnodemap_get_item(
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
- TRACE("(%p)->(%d %p)\n", This, index, item);
+ TRACE("%p, %ld, %p.\n", iface, index, item);
return This->funcs->get_item(This->node, index, item);
}
@@ -273,7 +274,7 @@ static HRESULT WINAPI xmlnodemap_nextNode(
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
- TRACE("(%p)->(%p: %d)\n", This, nextItem, This->iterator);
+ TRACE("%p, %p, %ld.\n", iface, nextItem, This->iterator);
return This->funcs->next_node(This->node, &This->iterator, nextItem);
}
@@ -283,7 +284,7 @@ static HRESULT WINAPI xmlnodemap_reset(
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface );
- TRACE("(%p)->(%d)\n", This, This->iterator);
+ TRACE("%p, %ld.\n", iface, This->iterator);
This->iterator = 0;
@@ -371,7 +372,7 @@ static HRESULT xmlnodemap_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DI
return DISP_E_UNKNOWNNAME;
*dispid = DISPID_DOM_COLLECTION_BASE + idx;
- TRACE("ret %x\n", *dispid);
+ TRACE("ret %lx\n", *dispid);
return S_OK;
}
@@ -380,7 +381,7 @@ static HRESULT xmlnodemap_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fla
{
xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( (IXMLDOMNamedNodeMap*)iface );
- TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei);
+ TRACE("%p, %ld, %lx, %x, %p, %p, %p.\n", iface, id, lcid, flags, params, res, ei);
V_VT(res) = VT_DISPATCH;
V_DISPATCH(res) = NULL;
diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
index 9fb3ceca9c3..4f32eb0596b 100644
--- a/dlls/msxml3/parseerror.c
+++ b/dlls/msxml3/parseerror.c
@@ -83,7 +83,7 @@ static ULONG WINAPI parseError_AddRef(
{
parse_error_t *This = impl_from_IXMLDOMParseError2( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -93,8 +93,9 @@ static ULONG WINAPI parseError_Release(
parse_error_t *This = impl_from_IXMLDOMParseError2( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
- if ( ref == 0 )
+ TRACE("%p, refcount %lu.\n", iface, ref);
+
+ if (!ref)
{
SysFreeString(This->url);
SysFreeString(This->reason);
diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
index 4c5c6b12c68..719222bd9ad 100644
--- a/dlls/msxml3/pi.c
+++ b/dlls/msxml3/pi.c
@@ -96,7 +96,7 @@ static ULONG WINAPI dom_pi_AddRef(
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -106,7 +106,7 @@ static ULONG WINAPI dom_pi_Release(
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
destroy_xmlnode(&This->node);
@@ -900,7 +900,7 @@ static HRESULT dom_pi_remove_named_item(xmlNodePtr node, BSTR name, IXMLDOMNode
static HRESULT dom_pi_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode **item)
{
- FIXME("(%p)->(%d %p): stub\n", node, index, item);
+ FIXME("%p, %ld, %p: stub\n", node, index, item);
return E_NOTIMPL;
}
@@ -914,7 +914,7 @@ static HRESULT dom_pi_get_length(const xmlNodePtr node, LONG *length)
static HRESULT dom_pi_next_node(const xmlNodePtr node, LONG *iter, IXMLDOMNode **nextNode)
{
- FIXME("(%p)->(%d %p): stub\n", node, *iter, nextNode);
+ FIXME("%p, %ld, %p: stub\n", node, *iter, nextNode);
return E_NOTIMPL;
}
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index 8c202bddccd..8d58ed1d94b 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -749,9 +749,7 @@ static HRESULT WINAPI ivbsaxattributes_GetTypeInfo(
IVBSAXAttributes *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{
- saxlocator *This = impl_from_IVBSAXAttributes( iface );
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IVBSAXAttributes_tid, ppTInfo);
}
@@ -764,11 +762,10 @@ static HRESULT WINAPI ivbsaxattributes_GetIDsOfNames(
LCID lcid,
DISPID* rgDispId)
{
- saxlocator *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -795,18 +792,16 @@ static HRESULT WINAPI ivbsaxattributes_Invoke(
EXCEPINFO* pExcepInfo,
UINT* puArgErr)
{
- saxlocator *This = impl_from_IVBSAXAttributes( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXAttributes_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXAttributes_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -2150,9 +2145,7 @@ static HRESULT WINAPI ivbsaxlocator_GetTypeInfo(
IVBSAXLocator *iface,
UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
{
- saxlocator *This = impl_from_IVBSAXLocator( iface );
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IVBSAXLocator_tid, ppTInfo);
}
@@ -2165,11 +2158,10 @@ static HRESULT WINAPI ivbsaxlocator_GetIDsOfNames(
LCID lcid,
DISPID* rgDispId)
{
- saxlocator *This = impl_from_IVBSAXLocator( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -2196,18 +2188,16 @@ static HRESULT WINAPI ivbsaxlocator_Invoke(
EXCEPINFO* pExcepInfo,
UINT* puArgErr)
{
- saxlocator *This = impl_from_IVBSAXLocator( iface );
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IVBSAXLocator_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IVBSAXLocator_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -2318,7 +2308,7 @@ static ULONG WINAPI isaxlocator_AddRef(ISAXLocator* iface)
{
saxlocator *This = impl_from_ISAXLocator( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -2326,11 +2316,11 @@ static ULONG WINAPI isaxlocator_Release(
ISAXLocator* iface)
{
saxlocator *This = impl_from_ISAXLocator( iface );
- LONG ref = InterlockedDecrement( &This->ref );
+ ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref );
+ TRACE("%p, refcount %ld.\n", iface, ref );
- if (ref == 0)
+ if (!ref)
{
element_entry *element, *element2;
int index;
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index b74399542ba..3760019ce2e 100644
--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
@@ -755,14 +755,14 @@ void schemasCleanup(void)
static LONG cache_entry_add_ref(cache_entry* entry)
{
LONG ref = InterlockedIncrement(&entry->ref);
- TRACE("(%p)->(%d)\n", entry, ref);
+ TRACE("%p, refcount %ld.\n", entry, ref);
return ref;
}
static LONG cache_entry_release(cache_entry* entry)
{
LONG ref = InterlockedDecrement(&entry->ref);
- TRACE("(%p)->(%d)\n", entry, ref);
+ TRACE("%p, refcount %ld.\n", entry, ref);
if (ref == 0)
{
@@ -936,7 +936,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI, MSXM
hr = IXMLDOMDocument3_load(domdoc, url, &b);
if (hr != S_OK)
{
- ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr);
+ ERR("load() returned %#lx.\n", hr);
if (b != VARIANT_TRUE)
{
FIXME("Failed to load doc at %s\n", debugstr_w(V_BSTR(&url)));
@@ -1126,7 +1126,7 @@ static ULONG WINAPI schema_cache_AddRef(IXMLDOMSchemaCollection2* iface)
{
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -1134,9 +1134,9 @@ static ULONG WINAPI schema_cache_Release(IXMLDOMSchemaCollection2* iface)
{
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
- if (ref == 0)
+ if (!ref)
{
int i;
@@ -1367,7 +1367,7 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if
{
schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface);
- TRACE("(%p)->(%i %p)\n", This, index, uri);
+ TRACE("%p, %ld, %p.\n", iface, index, uri);
if (!uri)
return E_POINTER;
diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c
index 82be1c6604b..e7c63c7a2b2 100644
--- a/dlls/msxml3/selection.c
+++ b/dlls/msxml3/selection.c
@@ -155,7 +155,7 @@ static ULONG WINAPI domselection_AddRef(
{
domselection *This = impl_from_IXMLDOMSelection( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -165,7 +165,7 @@ static ULONG WINAPI domselection_Release(
domselection *This = impl_from_IXMLDOMSelection( iface );
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
xmlXPathFreeObject(This->result);
@@ -232,7 +232,7 @@ static HRESULT WINAPI domselection_get_item(
{
domselection *This = impl_from_IXMLDOMSelection( iface );
- TRACE("(%p)->(%d %p)\n", This, index, listItem);
+ TRACE("%p, %ld, %p.\n", iface, index, listItem);
if(!listItem)
return E_INVALIDARG;
@@ -468,7 +468,7 @@ static ULONG WINAPI enumvariant_AddRef(IEnumVARIANT *iface )
{
enumvariant *This = impl_from_IEnumVARIANT( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -477,7 +477,7 @@ static ULONG WINAPI enumvariant_Release(IEnumVARIANT *iface )
enumvariant *This = impl_from_IEnumVARIANT( iface );
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
if (This->own) IUnknown_Release(This->outer);
@@ -496,7 +496,7 @@ static HRESULT WINAPI enumvariant_Next(
enumvariant *This = impl_from_IEnumVARIANT( iface );
ULONG ret_count = 0;
- TRACE("(%p)->(%u %p %p)\n", This, celt, var, fetched);
+ TRACE("%p, %lu, %p, %p.\n", iface, celt, var, fetched);
if (fetched) *fetched = 0;
@@ -529,8 +529,8 @@ static HRESULT WINAPI enumvariant_Skip(
IEnumVARIANT *iface,
ULONG celt)
{
- enumvariant *This = impl_from_IEnumVARIANT( iface );
- FIXME("(%p)->(%u): stub\n", This, celt);
+ FIXME("%p, %lu: stub\n", iface, celt);
+
return E_NOTIMPL;
}
@@ -595,7 +595,7 @@ static HRESULT domselection_get_dispid(IUnknown *iface, BSTR name, DWORD flags,
return DISP_E_UNKNOWNNAME;
*dispid = DISPID_DOM_COLLECTION_BASE + idx;
- TRACE("ret %x\n", *dispid);
+ TRACE("ret %lx\n", *dispid);
return S_OK;
}
@@ -604,7 +604,7 @@ static HRESULT domselection_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD f
{
domselection *This = impl_from_IXMLDOMSelection( (IXMLDOMSelection*)iface );
- TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei);
+ TRACE("%p, %ld, %lx, %x, %p, %p, %p.\n", iface, id, lcid, flags, params, res, ei);
V_VT(res) = VT_DISPATCH;
V_DISPATCH(res) = NULL;
diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c
index eab2c96d667..6dfa2a77f9c 100644
--- a/dlls/msxml3/stylesheet.c
+++ b/dlls/msxml3/stylesheet.c
@@ -139,7 +139,7 @@ static ULONG WINAPI xsltemplate_AddRef( IXSLTemplate *iface )
{
xsltemplate *This = impl_from_IXSLTemplate( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -148,7 +148,7 @@ static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface )
xsltemplate *This = impl_from_IXSLTemplate( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
if (This->node) IXMLDOMNode_Release( This->node );
@@ -317,7 +317,7 @@ static ULONG WINAPI xslprocessor_AddRef( IXSLProcessor *iface )
{
xslprocessor *This = impl_from_IXSLProcessor( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -326,7 +326,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface )
xslprocessor *This = impl_from_IXSLProcessor( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
struct xslprocessor_par *par, *par2;
@@ -509,7 +509,7 @@ static HRESULT WINAPI xslprocessor_put_output(
if (FAILED(hr))
{
output_type = PROCESSOR_OUTPUT_NOT_SET;
- WARN("failed to get output interface, 0x%08x\n", hr);
+ WARN("failed to get output interface, hr %#lx.\n", hr);
}
break;
default:
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index eb0f130ed03..7631c8595aa 100644
--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
@@ -91,7 +91,7 @@ static ULONG WINAPI domtext_AddRef(
{
domtext *This = impl_from_IXMLDOMText( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -101,7 +101,7 @@ static ULONG WINAPI domtext_Release(
domtext *This = impl_from_IXMLDOMText( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
destroy_xmlnode(&This->node);
@@ -668,11 +668,10 @@ static HRESULT WINAPI domtext_substringData(
IXMLDOMText *iface,
LONG offset, LONG count, BSTR *p)
{
- domtext *This = impl_from_IXMLDOMText( iface );
HRESULT hr;
BSTR data;
- TRACE("(%p)->(%d %d %p)\n", This, offset, count, p);
+ TRACE("%p, %ld, %ld, %p.\n", iface, offset, count, p);
if(!p)
return E_INVALIDARG;
@@ -742,12 +741,11 @@ static HRESULT WINAPI domtext_insertData(
IXMLDOMText *iface,
LONG offset, BSTR p)
{
- domtext *This = impl_from_IXMLDOMText( iface );
HRESULT hr;
BSTR data;
LONG p_len;
- TRACE("(%p)->(%d %s)\n", This, offset, debugstr_w(p));
+ TRACE("%p, %ld, %s.\n", iface, offset, debugstr_w(p));
/* If have a NULL or empty string, don't do anything. */
if((p_len = SysStringLen(p)) == 0)
@@ -794,7 +792,7 @@ static HRESULT WINAPI domtext_deleteData(
LONG len = -1;
BSTR str;
- TRACE("(%p)->(%d %d)\n", iface, offset, count);
+ TRACE("%p, %ld, %ld.\n", iface, offset, count);
hr = IXMLDOMText_get_length(iface, &len);
if(hr != S_OK) return hr;
@@ -837,10 +835,9 @@ static HRESULT WINAPI domtext_replaceData(
IXMLDOMText *iface,
LONG offset, LONG count, BSTR p)
{
- domtext *This = impl_from_IXMLDOMText( iface );
HRESULT hr;
- TRACE("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(p));
+ TRACE("%p, %ld, %ld, %s.\n", iface, offset, count, debugstr_w(p));
hr = IXMLDOMText_deleteData(iface, offset, count);
@@ -854,10 +851,9 @@ static HRESULT WINAPI domtext_splitText(
IXMLDOMText *iface,
LONG offset, IXMLDOMText **txtNode)
{
- domtext *This = impl_from_IXMLDOMText( iface );
LONG length = 0;
- TRACE("(%p)->(%d %p)\n", This, offset, txtNode);
+ TRACE("%p, %ld, %p.\n", iface, offset, txtNode);
if (!txtNode || offset < 0) return E_INVALIDARG;
diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
index 8e07b0516f7..f588f17496c 100644
--- a/dlls/msxml3/xmldoc.c
+++ b/dlls/msxml3/xmldoc.c
@@ -102,7 +102,7 @@ static ULONG WINAPI xmldoc_AddRef(IXMLDocument *iface)
{
xmldoc *This = impl_from_IXMLDocument(iface);
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
return ref;
}
@@ -111,7 +111,7 @@ static ULONG WINAPI xmldoc_Release(IXMLDocument *iface)
xmldoc *This = impl_from_IXMLDocument(iface);
LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %ld.\n", iface, ref);
if (ref == 0)
{
@@ -137,9 +137,7 @@ static HRESULT WINAPI xmldoc_GetTypeInfoCount(IXMLDocument *iface, UINT* pctinfo
static HRESULT WINAPI xmldoc_GetTypeInfo(IXMLDocument *iface, UINT iTInfo,
LCID lcid, ITypeInfo** ppTInfo)
{
- xmldoc *This = impl_from_IXMLDocument(iface);
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
return get_typeinfo(IXMLDocument_tid, ppTInfo);
}
@@ -148,11 +146,10 @@ static HRESULT WINAPI xmldoc_GetIDsOfNames(IXMLDocument *iface, REFIID riid,
LPOLESTR* rgszNames, UINT cNames,
LCID lcid, DISPID* rgDispId)
{
- xmldoc *This = impl_from_IXMLDocument(iface);
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -173,18 +170,16 @@ static HRESULT WINAPI xmldoc_Invoke(IXMLDocument *iface, DISPID dispIdMember,
DISPPARAMS* pDispParams, VARIANT* pVarResult,
EXCEPINFO* pExcepInfo, UINT* puArgErr)
{
- xmldoc *This = impl_from_IXMLDocument(iface);
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLDocument_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDocument_iface, dispIdMember, wFlags,
- pDispParams, pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index ec9094dae7d..f50bfa6e4ff 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -117,25 +117,19 @@ static HRESULT WINAPI xmlelem_GetTypeInfoCount(IXMLElement *iface, UINT* pctinfo
static HRESULT WINAPI xmlelem_GetTypeInfo(IXMLElement *iface, UINT iTInfo,
LCID lcid, ITypeInfo** ppTInfo)
{
- xmlelem *This = impl_from_IXMLElement(iface);
- HRESULT hr;
-
- TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+ TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo);
- hr = get_typeinfo(IXMLElement_tid, ppTInfo);
-
- return hr;
+ return get_typeinfo(IXMLElement_tid, ppTInfo);
}
static HRESULT WINAPI xmlelem_GetIDsOfNames(IXMLElement *iface, REFIID riid,
LPOLESTR* rgszNames, UINT cNames,
LCID lcid, DISPID* rgDispId)
{
- xmlelem *This = impl_from_IXMLElement(iface);
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId)
@@ -156,18 +150,16 @@ static HRESULT WINAPI xmlelem_Invoke(IXMLElement *iface, DISPID dispIdMember,
DISPPARAMS* pDispParams, VARIANT* pVarResult,
EXCEPINFO* pExcepInfo, UINT* puArgErr)
{
- xmlelem *This = impl_from_IXMLElement(iface);
ITypeInfo *typeinfo;
HRESULT hr;
- TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IXMLElement_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &This->IXMLElement_iface, dispIdMember, wFlags, pDispParams,
- pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -380,7 +372,7 @@ static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, LONG *p)
return E_INVALIDARG;
*p = type_libxml_to_msxml(This->node->type);
- TRACE("returning %d\n", *p);
+ TRACE("returning %ld\n", *p);
return S_OK;
}
@@ -428,7 +420,7 @@ static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildEl
xmlelem *childElem = impl_from_IXMLElement(pChildElem);
xmlNodePtr child;
- TRACE("(%p)->(%p %d %d)\n", This, pChildElem, lIndex, lreserved);
+ TRACE("%p, %p, %ld, %ld.\n", iface, pChildElem, lIndex, lreserved);
if (lIndex == 0)
child = xmlAddChild(This->node, childElem->node);
@@ -631,8 +623,8 @@ static HRESULT WINAPI xmlelem_collection_Invoke(IXMLElementCollection *iface, DI
static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, LONG v)
{
- xmlelem_collection *This = impl_from_IXMLElementCollection(iface);
- TRACE("(%p)->(%d)\n", This, v);
+ TRACE("%p, %ld.\n", iface, v);
+
return E_FAIL;
}
@@ -749,7 +741,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next(
xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
HRESULT hr;
- TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, fetched);
+ TRACE("%p, %lu, %p, %p.\n", iface, celt, rgVar, fetched);
if (!rgVar)
return E_INVALIDARG;
@@ -780,8 +772,7 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next(
static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(
IEnumVARIANT *iface, ULONG celt)
{
- xmlelem_collection *This = impl_from_IEnumVARIANT(iface);
- FIXME("(%p)->(%d): stub\n", This, celt);
+ FIXME("%p, %lu: stub\n", iface, celt);
return E_NOTIMPL;
}
diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c
index 0fcb9e34340..59263d043da 100644
--- a/dlls/msxml3/xmlparser.c
+++ b/dlls/msxml3/xmlparser.c
@@ -74,7 +74,7 @@ static ULONG WINAPI xmlparser_AddRef(IXMLParser* iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -83,7 +83,7 @@ static ULONG WINAPI xmlparser_Release(IXMLParser* iface)
xmlparser *This = impl_from_IXMLParser( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if ( ref == 0 )
{
if(This->input)
@@ -228,9 +228,7 @@ static HRESULT WINAPI xmlparser_SetURL(IXMLParser *iface,const WCHAR *pszBaseUrl
static HRESULT WINAPI xmlparser_Load(IXMLParser *iface, BOOL bFullyAvailable,
IMoniker *pMon, LPBC pBC, DWORD dwMode)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %d %p %p %d)\n", This, bFullyAvailable, pMon, pBC, dwMode);
+ FIXME("%p, %d, %p, %p, %ld.\n", iface, bFullyAvailable, pMon, pBC, dwMode);
return E_NOTIMPL;
}
@@ -256,9 +254,7 @@ static HRESULT WINAPI xmlparser_SetInput(IXMLParser *iface, IUnknown *pStm)
static HRESULT WINAPI xmlparser_PushData(IXMLParser *iface, const char *pData,
ULONG nChars, BOOL fLastBuffer)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %s %d %d)\n", This, debugstr_a(pData), nChars, fLastBuffer);
+ FIXME("%p, %s, %lu, %d.\n", iface, debugstr_a(pData), nChars, fLastBuffer);
return E_NOTIMPL;
}
@@ -286,9 +282,7 @@ static HRESULT WINAPI xmlparser_LoadEntity(IXMLParser *iface, const WCHAR *baseU
static HRESULT WINAPI xmlparser_ParseEntity(IXMLParser *iface, const WCHAR *text,
ULONG len, BOOL fpe)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %s %d %d)\n", This, debugstr_w(text), len, fpe);
+ FIXME("%p, %s, %lu, %d.\n", iface, debugstr_w(text), len, fpe);
return E_NOTIMPL;
}
@@ -296,9 +290,7 @@ static HRESULT WINAPI xmlparser_ParseEntity(IXMLParser *iface, const WCHAR *text
static HRESULT WINAPI xmlparser_ExpandEntity(IXMLParser *iface, const WCHAR *text,
ULONG len)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %s %d)\n", This, debugstr_w(text), len);
+ FIXME("%p, %s, %ld.\n", iface, debugstr_w(text), len);
return E_NOTIMPL;
}
@@ -323,9 +315,7 @@ static HRESULT WINAPI xmlparser_GetRoot( IXMLParser *iface, PVOID *ppRoot)
static HRESULT WINAPI xmlparser_Run(IXMLParser *iface, LONG chars)
{
- xmlparser *This = impl_from_IXMLParser( iface );
-
- FIXME("(%p %d)\n", This, chars);
+ FIXME("%p, %ld.\n", iface, chars);
return E_NOTIMPL;
}
@@ -361,7 +351,7 @@ static HRESULT WINAPI xmlparser_SetFlags(IXMLParser *iface, ULONG flags)
{
xmlparser *This = impl_from_IXMLParser( iface );
- TRACE("(%p %d)\n", This, flags);
+ TRACE("%p, %lx.\n", iface, flags);
This->flags = flags;
diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c
index ff561503673..91f3ecf4805 100644
--- a/dlls/msxml3/xmlview.c
+++ b/dlls/msxml3/xmlview.c
@@ -100,9 +100,9 @@ static HRESULT WINAPI XMLView_Binding_QueryInterface(
static ULONG WINAPI XMLView_Binding_AddRef(IBinding *iface)
{
Binding *This = impl_from_IBinding(iface);
- LONG ref = InterlockedIncrement(&This->ref);
+ ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -112,7 +112,7 @@ static ULONG WINAPI XMLView_Binding_Release(IBinding *iface)
Binding *This = impl_from_IBinding(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) {
IBinding_Release(This->binding);
@@ -147,7 +147,7 @@ static HRESULT WINAPI XMLView_Binding_SetPriority(
IBinding *iface, LONG nPriority)
{
Binding *This = impl_from_IBinding(iface);
- TRACE("(%p)->(%d)\n", This, nPriority);
+ TRACE("%p, %ld.\n", iface, nPriority);
return IBinding_SetPriority(This->binding, nPriority);
}
@@ -229,9 +229,9 @@ static ULONG WINAPI XMLView_BindStatusCallback_AddRef(
IBindStatusCallback *iface)
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- LONG ref = InterlockedIncrement(&This->ref);
+ ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -242,7 +242,7 @@ static ULONG WINAPI XMLView_BindStatusCallback_Release(
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) {
if(This->stream)
@@ -261,7 +261,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnStartBinding(
IBinding *binding;
HRESULT hres;
- TRACE("(%p)->(%x %p)\n", This, dwReserved, pib);
+ TRACE("%p, %lx, %p.\n", iface, dwReserved, pib);
hres = XMLView_Binding_Create(pib, &binding);
if(FAILED(hres)) {
@@ -290,8 +290,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_GetPriority(
static HRESULT WINAPI XMLView_BindStatusCallback_OnLowResource(
IBindStatusCallback *iface, DWORD reserved)
{
- BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- FIXME("(%p)->(%x)\n", This, reserved);
+ FIXME("%p, %lx.\n", iface, reserved);
return E_NOTIMPL;
}
@@ -300,7 +299,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnProgress(
ULONG ulStatusCode, LPCWSTR szStatusText)
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- TRACE("(%p)->(%d %d %x %s)\n", This, ulProgress, ulProgressMax,
+ TRACE("%p, %lu, %lu, %lu, %s.\n", iface, ulProgress, ulProgressMax,
ulStatusCode, debugstr_w(szStatusText));
switch(ulStatusCode) {
@@ -310,7 +309,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnProgress(
case BINDSTATUS_MIMETYPEAVAILABLE:
return S_OK;
default:
- FIXME("ulStatusCode: %d\n", ulStatusCode);
+ FIXME("ulStatusCode: %lu\n", ulStatusCode);
return E_NOTIMPL;
}
}
@@ -319,7 +318,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnStopBinding(
IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError)
{
BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
- TRACE("(%p)->(%x %s)\n", This, hresult, debugstr_w(szError));
+ TRACE("%p, %#lx, %s.\n", iface, hresult, debugstr_w(szError));
return IBindStatusCallback_OnStopBinding(This->bsc, hresult, szError);
}
@@ -513,7 +512,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnDataAvailable(
DWORD size;
HRESULT hres;
- TRACE("(%p)->(%x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
+ TRACE("%p, %lx, %ld, %p, %p.\n", iface, grfBSCF, dwSize, pformatetc, pstgmed);
if(!This->stream)
return E_FAIL;
@@ -604,7 +603,7 @@ static ULONG WINAPI XMLView_Moniker_AddRef(IMoniker *iface)
Moniker *This = impl_from_IMoniker(iface);
LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -614,7 +613,7 @@ static ULONG WINAPI XMLView_Moniker_Release(IMoniker *iface)
Moniker *This = impl_from_IMoniker(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) {
IMoniker_Release(This->mon);
@@ -691,8 +690,7 @@ static HRESULT WINAPI XMLView_Moniker_BindToStorage(IMoniker *iface, IBindCtx *p
static HRESULT WINAPI XMLView_Moniker_Reduce(IMoniker *iface, IBindCtx *pbc,
DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced)
{
- Moniker *This = impl_from_IMoniker(iface);
- FIXME("(%p)->(%p %d %p %p)\n", This, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
+ FIXME("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
return E_NOTIMPL;
}
@@ -870,9 +868,9 @@ static HRESULT WINAPI XMLView_PersistMoniker_QueryInterface(
static ULONG WINAPI XMLView_PersistMoniker_AddRef(IPersistMoniker *iface)
{
XMLView *This = impl_from_IPersistMoniker(iface);
- LONG ref = InterlockedIncrement(&This->ref);
+ ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
return ref;
}
@@ -882,7 +880,7 @@ static ULONG WINAPI XMLView_PersistMoniker_Release(IPersistMoniker *iface)
XMLView *This = impl_from_IPersistMoniker(iface);
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(%d)\n", This, ref);
+ TRACE("%p, refcount %lu.\n", iface, ref);
if(!ref) {
if(This->mon)
@@ -926,7 +924,7 @@ static HRESULT WINAPI XMLView_PersistMoniker_Load(IPersistMoniker *iface,
IUnknown *unk;
HRESULT hres;
- TRACE("(%p)->(%x %p %p %x)\n", This, fFullyAvailable, pimkName, pibc, grfMode);
+ TRACE("%p, %x, %p, %p, %lx.\n", iface, fFullyAvailable, pimkName, pibc, grfMode);
hres = IBindCtx_GetObjectParam(pibc, (LPOLESTR)XSLParametersW, &unk);
if(SUCCEEDED(hres)) {
@@ -1125,8 +1123,7 @@ static HRESULT WINAPI XMLView_PersistHistory_SaveHistory(
static HRESULT WINAPI XMLView_PersistHistory_SetPositionCookie(
IPersistHistory *iface, DWORD dwPositioncookie)
{
- XMLView *This = impl_from_IPersistHistory(iface);
- FIXME("(%p)->(%d)\n", This, dwPositioncookie);
+ FIXME("%p, %ld.\n", iface, dwPositioncookie);
return E_NOTIMPL;
}
@@ -1176,8 +1173,7 @@ static ULONG WINAPI XMLView_OleCommandTarget_Release(IOleCommandTarget *iface)
static HRESULT WINAPI XMLView_OleCommandTarget_QueryStatus(IOleCommandTarget *iface,
const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText)
{
- XMLView *This = impl_from_IOleCommandTarget(iface);
- FIXME("(%p)->(%p %x %p %p)\n", This, pguidCmdGroup, cCmds, prgCmds, pCmdText);
+ FIXME("%p, %p, %lu, %p, %p.\n", iface, pguidCmdGroup, cCmds, prgCmds, pCmdText);
return E_NOTIMPL;
}
@@ -1185,8 +1181,7 @@ static HRESULT WINAPI XMLView_OleCommandTarget_Exec(IOleCommandTarget *iface,
const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt,
VARIANT *pvaIn, VARIANT *pvaOut)
{
- XMLView *This = impl_from_IOleCommandTarget(iface);
- FIXME("(%p)->(%p %d %x %p %p)\n", This, pguidCmdGroup,
+ FIXME("%p, %p, %ld, %lx, %p, %p.\n", iface, pguidCmdGroup,
nCmdID, nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
@@ -1249,40 +1244,35 @@ static HRESULT WINAPI XMLView_OleObject_SetHostNames(IOleObject *iface,
static HRESULT WINAPI XMLView_OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x)\n", This, dwSaveOption);
+ FIXME("%p, %lx.\n", iface, dwSaveOption);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_SetMoniker(IOleObject *iface,
DWORD dwWhichMoniker, IMoniker *pmk)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwWhichMoniker, pmk);
+ FIXME("%p, %lx, %p.\n", iface, dwWhichMoniker, pmk);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_GetMoniker(IOleObject *iface,
DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %x %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
+ FIXME("%p, %lx, %lx, %p.\n", iface, dwAssign, dwWhichMoniker, ppmk);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_InitFromData(IOleObject *iface,
IDataObject *pDataObject, BOOL fCreation, DWORD dwReserved)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%p %x %x)\n", This, pDataObject, fCreation, dwReserved);
+ FIXME("%p, %p, %x, %lx.\n", iface, pDataObject, fCreation, dwReserved);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_GetClipboardData(IOleObject *iface,
DWORD dwReserved, IDataObject **ppDataObject)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwReserved, ppDataObject);
+ FIXME("%p, %lx, %p.\n", iface, dwReserved, ppDataObject);
return E_NOTIMPL;
}
@@ -1290,8 +1280,7 @@ static HRESULT WINAPI XMLView_OleObject_DoVerb(IOleObject *iface,
LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite,
LONG lindex, HWND hwndParent, LPCRECT lprcPosRect)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%d %p %p %d %p %p)\n", This, iVerb, lpmsg,
+ FIXME("%p, %ld, %p, %p, %ld, %p, %p.\n", iface, iVerb, lpmsg,
pActiveSite, lindex, hwndParent, lprcPosRect);
return E_NOTIMPL;
}
@@ -1328,24 +1317,21 @@ static HRESULT WINAPI XMLView_OleObject_GetUserClassID(IOleObject *iface, CLSID
static HRESULT WINAPI XMLView_OleObject_GetUserType(IOleObject *iface,
DWORD dwFormOfType, LPOLESTR *pszUserType)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwFormOfType, pszUserType);
+ FIXME("%p, %lx, %p.\n", iface, dwFormOfType, pszUserType);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_SetExtent(IOleObject *iface,
DWORD dwDrawAspect, SIZEL *psizel)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwDrawAspect, psizel);
+ FIXME("%p, %lx, %p.\n", iface, dwDrawAspect, psizel);
return E_NOTIMPL;
}
static HRESULT WINAPI XMLView_OleObject_GetExtent(IOleObject *iface,
DWORD dwDrawAspect, SIZEL *psizel)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%x %p)\n", This, dwDrawAspect, psizel);
+ FIXME("%p, %lx, %p.\n", iface, dwDrawAspect, psizel);
return E_NOTIMPL;
}
@@ -1360,8 +1346,7 @@ static HRESULT WINAPI XMLView_OleObject_Advise(IOleObject *iface,
static HRESULT WINAPI XMLView_OleObject_Unadvise(
IOleObject *iface, DWORD dwConnection)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%d)\n", This, dwConnection);
+ FIXME("%p, %ld.\n", iface, dwConnection);
return E_NOTIMPL;
}
@@ -1376,8 +1361,7 @@ static HRESULT WINAPI XMLView_OleObject_EnumAdvise(
static HRESULT WINAPI XMLView_OleObject_GetMiscStatus(
IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)
{
- XMLView *This = impl_from_IOleObject(iface);
- FIXME("(%p)->(%d %p)\n", This, dwAspect, pdwStatus);
+ FIXME("%p, %ld, %p.\n", iface, dwAspect, pdwStatus);
return E_NOTIMPL;
}
--
2.34.1
1
0
Otherwise .c files with #pragma makedep implib will not be built
--
I think that compilation should not need to occur during `make install`;
it should just be copying files (and maybe stripping) files into DESTDIR,
without any need to modify the build folder.
assuming (of course) that `make all` was up-to-date beforehand.
---
tools/makedep.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/makedep.c b/tools/makedep.c
index 0bb77ce56df..a4fc08e184a 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3262,6 +3262,7 @@ static void output_import_lib( struct makefile *make )
output_filename( spec_file );
output_filenames_obj_dir( make, make->implib_files );
output( "\n" );
+ strarray_add( &make->all_targets, strmake( "lib%s.a", make->importlib ));
add_install_rule( make, make->importlib,
strmake( "lib%s.a", make->importlib ),
strmake( "d%s/lib%s.a", so_dir, make->importlib ));
@@ -3285,6 +3286,7 @@ static void output_import_lib( struct makefile *make )
output_filename( spec_file );
output_filenames_obj_dir( make, make->crossimplib_files );
output( "\n" );
+ strarray_add( &make->all_targets, strmake( "lib%s.cross.a", make->importlib ));
add_install_rule( make, make->importlib,
strmake( "lib%s.cross.a", make->importlib ),
strmake( "d%s/lib%s.a", pe_dir, make->importlib ));
@@ -3362,6 +3364,7 @@ static void output_static_lib( struct makefile *make )
output_filenames_obj_dir( make, make->object_files );
output_filenames_obj_dir( make, make->unixobj_files );
output( "\n" );
+ strarray_add( &make->all_targets, make->staticlib );
add_install_rule( make, make->staticlib, make->staticlib,
strmake( "d%s/%s", so_dir, make->staticlib ));
}
@@ -3378,8 +3381,11 @@ static void output_static_lib( struct makefile *make )
output_filenames_obj_dir( make, make->crossobj_files );
output( "\n" );
if (!make->extlib)
+ {
+ strarray_add( &make->all_targets, name );
add_install_rule( make, make->staticlib, name,
strmake( "d%s/%s", pe_dir, make->staticlib ));
+ }
}
}
--
2.34.1
2
4
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
dlls/dplayx/Makefile.in | 1 -
dlls/dplayx/dplay.c | 198 +++++++++++++++++-----------------
dlls/dplayx/dplaysp.c | 34 +++---
dlls/dplayx/dplayx_global.c | 24 ++---
dlls/dplayx/dplayx_main.c | 2 +-
dlls/dplayx/dplayx_messages.c | 18 ++--
dlls/dplayx/dplobby.c | 68 ++++++------
dlls/dplayx/lobbysp.c | 4 +-
8 files changed, 174 insertions(+), 175 deletions(-)
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 1a8f6c0bd8f..8d41fdbad9e 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dplayx.dll
IMPORTLIB = dplayx
IMPORTS = dxguid uuid winmm ole32 user32 advapi32
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 7a796735ce8..ae929a558b2 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -271,7 +271,7 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
DWORD dwMessageBodySize, const void *lpcMessageHeader, WORD wCommandId, WORD wVersion,
void **lplpReply, DWORD *lpdwMsgSize )
{
- TRACE( "(%p)->(%p,0x%08x,%p,%u,%u)\n",
+ TRACE( "(%p)->(%p,0x%08lx,%p,%u,%u)\n",
This, lpcMessageBody, dwMessageBodySize, lpcMessageHeader, wCommandId,
wVersion );
@@ -302,7 +302,7 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
*lplpReply = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, *lpdwMsgSize );
- FIXME( "Ignoring dwFlags 0x%08x in request msg\n",
+ FIXME( "Ignoring dwFlags 0x%08lx in request msg\n",
lpcMsg->dwFlags );
/* Setup the reply */
@@ -315,7 +315,7 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
lpReply->dpidNewPlayerId = DP_NextObjectId();
- TRACE( "Allocating new playerid 0x%08x from remote request\n",
+ TRACE( "Allocating new playerid 0x%08lx from remote request\n",
lpReply->dpidNewPlayerId );
break;
}
@@ -326,7 +326,7 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody,
break;
case DPMSGCMD_JUSTENVELOPE:
- TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08x\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] );
+ TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08lx\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] );
NS_SetLocalAddr( This->dp2->lpNameServerData, lpcMessageHeader, 20 );
DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize );
@@ -362,7 +362,7 @@ static ULONG WINAPI IDirectPlayImpl_AddRef( IDirectPlay *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE( "(%p) ref=%d\n", This, ref );
+ TRACE( "(%p) ref=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -375,7 +375,7 @@ static ULONG WINAPI IDirectPlayImpl_Release( IDirectPlay *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE( "(%p) ref=%d\n", This, ref );
+ TRACE( "(%p) ref=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplay_destroy( This );
@@ -387,7 +387,7 @@ static HRESULT WINAPI IDirectPlayImpl_AddPlayerToGroup( IDirectPlay *iface, DPID
DPID player )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,0x%08x): stub\n", This, group, player );
+ FIXME( "(%p)->(0x%08lx,0x%08lx): stub\n", This, group, player );
return E_NOTIMPL;
}
@@ -419,21 +419,21 @@ static HRESULT WINAPI IDirectPlayImpl_DeletePlayerFromGroup( IDirectPlay *iface,
DPID player )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,0x%08x): stub\n", This, group, player );
+ FIXME( "(%p)->(0x%08lx,0x%08lx): stub\n", This, group, player );
return E_NOTIMPL;
}
static HRESULT WINAPI IDirectPlayImpl_DestroyPlayer( IDirectPlay *iface, DPID player )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x): stub\n", This, player );
+ FIXME( "(%p)->(0x%08lx): stub\n", This, player );
return E_NOTIMPL;
}
static HRESULT WINAPI IDirectPlayImpl_DestroyGroup( IDirectPlay *iface, DPID group )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x): stub\n", This, group );
+ FIXME( "(%p)->(0x%08lx): stub\n", This, group );
return E_NOTIMPL;
}
@@ -448,7 +448,7 @@ static HRESULT WINAPI IDirectPlayImpl_EnumGroupPlayers( IDirectPlay *iface, DPID
LPDPENUMPLAYERSCALLBACK enumplayercb, void *context, DWORD flags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,%p,%p,0x%08x): stub\n", This, group, enumplayercb, context, flags );
+ FIXME( "(%p)->(0x%08lx,%p,%p,0x%08lx): stub\n", This, group, enumplayercb, context, flags );
return E_NOTIMPL;
}
@@ -456,7 +456,7 @@ static HRESULT WINAPI IDirectPlayImpl_EnumGroups( IDirectPlay *iface, DWORD sess
LPDPENUMPLAYERSCALLBACK enumplayercb, void *context, DWORD flags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,%p,%p,0x%08x): stub\n", This, session, enumplayercb, context, flags );
+ FIXME( "(%p)->(0x%08lx,%p,%p,0x%08lx): stub\n", This, session, enumplayercb, context, flags );
return E_NOTIMPL;
}
@@ -464,7 +464,7 @@ static HRESULT WINAPI IDirectPlayImpl_EnumPlayers( IDirectPlay *iface, DWORD ses
LPDPENUMPLAYERSCALLBACK enumplayercb, void *context, DWORD flags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,%p,%p,0x%08x): stub\n", This, session, enumplayercb, context, flags );
+ FIXME( "(%p)->(0x%08lx,%p,%p,0x%08lx): stub\n", This, session, enumplayercb, context, flags );
return E_NOTIMPL;
}
@@ -472,7 +472,7 @@ static HRESULT WINAPI IDirectPlayImpl_EnumSessions( IDirectPlay *iface, DPSESSIO
DWORD timeout, LPDPENUMSESSIONSCALLBACK enumsessioncb, void *context, DWORD flags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(%p,%u,%p,%p,0x%08x): stub\n", This, sdesc, timeout, enumsessioncb, context,
+ FIXME( "(%p)->(%p,%lu,%p,%p,0x%08lx): stub\n", This, sdesc, timeout, enumsessioncb, context,
flags );
return E_NOTIMPL;
}
@@ -488,14 +488,14 @@ static HRESULT WINAPI IDirectPlayImpl_GetMessageCount( IDirectPlay *iface, DPID
DWORD *count )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,%p): stub\n", This, player, count );
+ FIXME( "(%p)->(0x%08lx,%p): stub\n", This, player, count );
return E_NOTIMPL;
}
static HRESULT WINAPI IDirectPlayImpl_GetPlayerCaps( IDirectPlay *iface, DPID player, DPCAPS *caps )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,%p): stub\n", This, player, caps );
+ FIXME( "(%p)->(0x%08lx,%p): stub\n", This, player, caps );
return E_NOTIMPL;
}
@@ -503,7 +503,7 @@ static HRESULT WINAPI IDirectPlayImpl_GetPlayerName( IDirectPlay *iface, DPID pl
DWORD *size_name, LPSTR fullname, DWORD *size_fullname )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,%p,%p,%p,%p): stub\n", This, player, name, size_name, fullname,
+ FIXME( "(%p)->(0x%08lx,%p,%p,%p,%p): stub\n", This, player, name, size_name, fullname,
size_fullname );
return E_NOTIMPL;
}
@@ -526,7 +526,7 @@ static HRESULT WINAPI IDirectPlayImpl_Receive( IDirectPlay *iface, DPID *from, D
DWORD flags, void *data, DWORD *size )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(%p,%p,0x%08x,%p,%p): stub\n", This, from, to, flags, data, size );
+ FIXME( "(%p)->(%p,%p,0x%08lx,%p,%p): stub\n", This, from, to, flags, data, size );
return E_NOTIMPL;
}
@@ -541,7 +541,7 @@ static HRESULT WINAPI IDirectPlayImpl_Send( IDirectPlay *iface, DPID from, DPID
void *data, DWORD size )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,%u): stub\n", This, from, to, flags, data, size );
+ FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,%lu): stub\n", This, from, to, flags, data, size );
return E_NOTIMPL;
}
@@ -549,7 +549,7 @@ static HRESULT WINAPI IDirectPlayImpl_SetPlayerName( IDirectPlay *iface, DPID pl
LPSTR fullname )
{
IDirectPlayImpl *This = impl_from_IDirectPlay( iface );
- FIXME( "(%p)->(0x%08x,%s,%s): stub\n", This, player, debugstr_a( name ),
+ FIXME( "(%p)->(0x%08lx,%s,%s): stub\n", This, player, debugstr_a( name ),
debugstr_a ( fullname ) );
return E_NOTIMPL;
}
@@ -680,7 +680,7 @@ static ULONG WINAPI IDirectPlay2AImpl_AddRef( IDirectPlay2A *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay2A( iface );
ULONG ref = InterlockedIncrement( &This->ref2A );
- TRACE( "(%p) ref2A=%d\n", This, ref );
+ TRACE( "(%p) ref2A=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -693,7 +693,7 @@ static ULONG WINAPI IDirectPlay2Impl_AddRef( IDirectPlay2 *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay2( iface );
ULONG ref = InterlockedIncrement( &This->ref2 );
- TRACE( "(%p) ref2=%d\n", This, ref );
+ TRACE( "(%p) ref2=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -706,7 +706,7 @@ static ULONG WINAPI IDirectPlay3AImpl_AddRef( IDirectPlay3A *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay3A( iface );
ULONG ref = InterlockedIncrement( &This->ref3A );
- TRACE( "(%p) ref3A=%d\n", This, ref );
+ TRACE( "(%p) ref3A=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -719,7 +719,7 @@ static ULONG WINAPI IDirectPlay3Impl_AddRef( IDirectPlay3 *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay3( iface );
ULONG ref = InterlockedIncrement( &This->ref3 );
- TRACE( "(%p) ref3=%d\n", This, ref );
+ TRACE( "(%p) ref3=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -732,7 +732,7 @@ static ULONG WINAPI IDirectPlay4AImpl_AddRef(IDirectPlay4A *iface)
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
ULONG ref = InterlockedIncrement( &This->ref4A );
- TRACE( "(%p) ref4A=%d\n", This, ref );
+ TRACE( "(%p) ref4A=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -745,7 +745,7 @@ static ULONG WINAPI IDirectPlay4Impl_AddRef(IDirectPlay4 *iface)
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
ULONG ref = InterlockedIncrement( &This->ref4 );
- TRACE( "(%p) ref4=%d\n", This, ref );
+ TRACE( "(%p) ref4=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -758,7 +758,7 @@ static ULONG WINAPI IDirectPlay2AImpl_Release( IDirectPlay2A *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay2A( iface );
ULONG ref = InterlockedDecrement( &This->ref2A );
- TRACE( "(%p) ref2A=%d\n", This, ref );
+ TRACE( "(%p) ref2A=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplay_destroy( This );
@@ -771,7 +771,7 @@ static ULONG WINAPI IDirectPlay2Impl_Release( IDirectPlay2 *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay2( iface );
ULONG ref = InterlockedDecrement( &This->ref2 );
- TRACE( "(%p) ref2=%d\n", This, ref );
+ TRACE( "(%p) ref2=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplay_destroy( This );
@@ -784,7 +784,7 @@ static ULONG WINAPI IDirectPlay3AImpl_Release( IDirectPlay3A *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay3A( iface );
ULONG ref = InterlockedDecrement( &This->ref3A );
- TRACE( "(%p) ref3A=%d\n", This, ref );
+ TRACE( "(%p) ref3A=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplay_destroy( This );
@@ -797,7 +797,7 @@ static ULONG WINAPI IDirectPlay3Impl_Release( IDirectPlay3 *iface )
IDirectPlayImpl *This = impl_from_IDirectPlay3( iface );
ULONG ref = InterlockedDecrement( &This->ref3 );
- TRACE( "(%p) ref3=%d\n", This, ref );
+ TRACE( "(%p) ref3=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplay_destroy( This );
@@ -810,7 +810,7 @@ static ULONG WINAPI IDirectPlay4AImpl_Release(IDirectPlay4A *iface)
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
ULONG ref = InterlockedDecrement( &This->ref4A );
- TRACE( "(%p) ref4A=%d\n", This, ref );
+ TRACE( "(%p) ref4A=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplay_destroy( This );
@@ -823,7 +823,7 @@ static ULONG WINAPI IDirectPlay4Impl_Release(IDirectPlay4 *iface)
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
ULONG ref = InterlockedDecrement( &This->ref4 );
- TRACE( "(%p) ref4=%d\n", This, ref );
+ TRACE( "(%p) ref4=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplay_destroy( This );
@@ -874,7 +874,7 @@ static HRESULT WINAPI IDirectPlay4Impl_AddPlayerToGroup( IDirectPlay4 *iface, DP
lpPlayerList plist;
lpPlayerList newplist;
- TRACE( "(%p)->(0x%08x,0x%08x)\n", This, group, player );
+ TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, group, player );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
return DPERR_UNINITIALIZED;
@@ -1023,7 +1023,7 @@ static lpGroupData DP_CreateGroup( IDirectPlayImpl *This, const DPID *lpid, cons
/* FIXME: Should we validate the dwFlags? */
lpGData->dwFlags = dwFlags;
- TRACE( "Created group id 0x%08x\n", *lpid );
+ TRACE( "Created group id 0x%08lx\n", *lpid );
return lpGData;
}
@@ -1033,13 +1033,13 @@ static void DP_DeleteGroup( IDirectPlayImpl *This, DPID dpid )
{
lpGroupList lpGList;
- TRACE( "(%p)->(0x%08x)\n", This, dpid );
+ TRACE( "(%p)->(0x%08lx)\n", This, dpid );
DPQ_REMOVE_ENTRY( This->dp2->lpSysGroup->groups, groups, lpGData->dpid, ==, dpid, lpGList );
if( lpGList == NULL )
{
- ERR( "DPID 0x%08x not found\n", dpid );
+ ERR( "DPID 0x%08lx not found\n", dpid );
return;
}
@@ -1062,7 +1062,7 @@ static lpGroupData DP_FindAnyGroup( IDirectPlayImpl *This, DPID dpid )
{
lpGroupList lpGroups;
- TRACE( "(%p)->(0x%08x)\n", This, dpid );
+ TRACE( "(%p)->(0x%08lx)\n", This, dpid );
if( dpid == DPID_SYSTEM_GROUP )
{
@@ -1086,7 +1086,7 @@ static HRESULT DP_IF_CreateGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID *l
{
lpGroupData lpGData;
- TRACE( "(%p)->(%p,%p,%p,%p,0x%08x,0x%08x,%u)\n",
+ TRACE( "(%p)->(%p,%p,%p,%p,0x%08lx,0x%08lx,%u)\n",
This, lpMsgHdr, lpidGroup, lpGroupName, lpData, dwDataSize,
dwFlags, bAnsi );
@@ -1333,7 +1333,7 @@ static lpPlayerData DP_CreatePlayer( IDirectPlayImpl *This, DPID *lpid, DPNAME *
/* Initialize the SP data section */
lpPData->lpSPPlayerData = DPSP_CreateSPPlayerData();
- TRACE( "Created player id 0x%08x\n", *lpid );
+ TRACE( "Created player id 0x%08lx\n", *lpid );
if( ~dwFlags & DPLAYI_PLAYER_SYSPLAYER )
This->dp2->lpSessionDesc->dwCurrentPlayers++;
@@ -1354,13 +1354,13 @@ static void DP_DeletePlayer( IDirectPlayImpl *This, DPID dpid )
{
lpPlayerList lpPList;
- TRACE( "(%p)->(0x%08x)\n", This, dpid );
+ TRACE( "(%p)->(0x%08lx)\n", This, dpid );
DPQ_REMOVE_ENTRY( This->dp2->lpSysGroup->players, players, lpPData->dpid, ==, dpid, lpPList );
if( lpPList == NULL )
{
- ERR( "DPID 0x%08x not found\n", dpid );
+ ERR( "DPID 0x%08lx not found\n", dpid );
return;
}
@@ -1385,7 +1385,7 @@ static lpPlayerList DP_FindPlayer( IDirectPlayImpl *This, DPID dpid )
{
lpPlayerList lpPlayers;
- TRACE( "(%p)->(0x%08x)\n", This, dpid );
+ TRACE( "(%p)->(0x%08lx)\n", This, dpid );
if(This->dp2->lpSysGroup == NULL)
return NULL;
@@ -1504,7 +1504,7 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID *
lpPlayerList lpPList;
DWORD dwCreateFlags = 0;
- TRACE( "(%p)->(%p,%p,%p,%p,0x%08x,0x%08x,%u)\n",
+ TRACE( "(%p)->(%p,%p,%p,%p,0x%08lx,0x%08lx,%u)\n",
This, lpidPlayer, lpPlayerName, hEvent, lpData,
dwDataSize, dwFlags, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -1558,7 +1558,7 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID *
)
{
/* Assume non fatal failure */
- ERR( "unknown dwFlags = 0x%08x\n", dwFlags );
+ ERR( "unknown dwFlags = 0x%08lx\n", dwFlags );
}
/* If the name is not specified, we must provide one */
@@ -1619,7 +1619,7 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID *
data.lpSPMessageHeader = lpMsgHdr;
data.lpISP = This->dp2->spData.lpISP;
- TRACE( "Calling SP CreatePlayer 0x%08x: dwFlags: 0x%08x lpMsgHdr: %p\n",
+ TRACE( "Calling SP CreatePlayer 0x%08lx: dwFlags: 0x%08lx lpMsgHdr: %p\n",
*lpidPlayer, data.dwFlags, data.lpSPMessageHeader );
hr = (*This->dp2->spData.lpCB->CreatePlayer)( &data );
@@ -1829,7 +1829,7 @@ static HRESULT WINAPI IDirectPlay4Impl_DeletePlayerFromGroup( IDirectPlay4 *ifac
lpGroupData gdata;
lpPlayerList plist;
- TRACE( "(%p)->(0x%08x,0x%08x)\n", This, group, player );
+ TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, group, player );
/* Find the group */
if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
@@ -1886,18 +1886,18 @@ cbRemoveGroupOrPlayer(
{
lpDPRGOPContext lpCtxt = (lpDPRGOPContext)lpContext;
- TRACE( "Removing element:0x%08x (type:0x%08x) from element:0x%08x\n",
+ TRACE( "Removing element:0x%08lx (type:0x%08lx) from element:0x%08lx\n",
dpId, dwPlayerType, lpCtxt->idGroup );
if( dwPlayerType == DPPLAYERTYPE_GROUP )
{
if ( FAILED( IDirectPlayX_DeleteGroupFromGroup( &lpCtxt->This->IDirectPlay4_iface,
lpCtxt->idGroup, dpId ) ) )
- ERR( "Unable to delete group 0x%08x from group 0x%08x\n", dpId, lpCtxt->idGroup );
+ ERR( "Unable to delete group 0x%08lx from group 0x%08lx\n", dpId, lpCtxt->idGroup );
}
else if ( FAILED( IDirectPlayX_DeletePlayerFromGroup( &lpCtxt->This->IDirectPlay4_iface,
lpCtxt->idGroup, dpId ) ) )
- ERR( "Unable to delete player 0x%08x from grp 0x%08x\n", dpId, lpCtxt->idGroup );
+ ERR( "Unable to delete player 0x%08lx from grp 0x%08lx\n", dpId, lpCtxt->idGroup );
return TRUE; /* Continue enumeration */
}
@@ -1907,7 +1907,7 @@ static HRESULT DP_IF_DestroyGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID i
lpGroupData lpGData;
DPRGOPContext context;
- FIXME( "(%p)->(%p,0x%08x,%u): semi stub\n",
+ FIXME( "(%p)->(%p,0x%08lx,%u): semi stub\n",
This, lpMsgHdr, idGroup, bAnsi );
/* Find the group */
@@ -2002,7 +2002,7 @@ static HRESULT DP_IF_DestroyPlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID
{
DPFAGContext cbContext;
- FIXME( "(%p)->(%p,0x%08x,%u): semi stub\n",
+ FIXME( "(%p)->(%p,0x%08lx,%u): semi stub\n",
This, lpMsgHdr, idPlayer, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -2071,7 +2071,7 @@ cbDeletePlayerFromAllGroups(
}
else
{
- ERR( "Group callback has dwPlayerType = 0x%08x\n", dwPlayerType );
+ ERR( "Group callback has dwPlayerType = 0x%08lx\n", dwPlayerType );
}
return TRUE;
@@ -2160,7 +2160,7 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumGroupPlayers( IDirectPlay4 *iface, DP
lpGroupData gdata;
lpPlayerList plist;
- FIXME( "(%p)->(0x%08x,%p,%p,%p,0x%08x): semi stub\n", This, group, instance, enumplayercb,
+ FIXME( "(%p)->(0x%08lx,%p,%p,%p,0x%08lx): semi stub\n", This, group, instance, enumplayercb,
context, flags );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -2327,7 +2327,7 @@ static DWORD CALLBACK DP_EnumSessionsSendAsyncRequestThread( LPVOID lpContext )
HANDLE hSuicideRequest = data->hSuicideRequest;
DWORD dwTimeout = data->dwTimeout;
- TRACE( "Thread started with timeout = 0x%08x\n", dwTimeout );
+ TRACE( "Thread started with timeout = 0x%08lx\n", dwTimeout );
for( ;; )
{
@@ -2436,7 +2436,7 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumSessions( IDirectPlay4 *iface, DPSESS
DWORD size;
HRESULT hr = DP_OK;
- TRACE( "(%p)->(%p,0x%08x,%p,%p,0x%08x)\n", This, sdesc, timeout, enumsessioncb,
+ TRACE( "(%p)->(%p,0x%08lx,%p,%p,0x%08lx)\n", This, sdesc, timeout, enumsessioncb,
context, flags );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -2629,7 +2629,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupData( IDirectPlay4 *iface, DPID g
DWORD bufsize;
void *src;
- TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n", This, group, data, size, flags );
+ TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n", This, group, data, size, flags );
if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
return DPERR_INVALIDGROUP;
@@ -2665,7 +2665,7 @@ static HRESULT DP_IF_GetGroupName( IDirectPlayImpl *This, DPID idGroup, void *lp
LPDPNAME lpName = lpData;
DWORD dwRequiredDataSize;
- FIXME("(%p)->(0x%08x,%p,%p,%u) ANSI ignored\n",
+ FIXME("(%p)->(0x%08lx,%p,%p,%u) ANSI ignored\n",
This, idGroup, lpData, lpdwDataSize, bAnsi );
if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@@ -2833,7 +2833,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerAddress( IDirectPlay4A *iface,
void *data, DWORD *size )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
- FIXME("(%p)->(0x%08x,%p,%p): stub\n", This, player, data, size );
+ FIXME("(%p)->(0x%08lx,%p,%p): stub\n", This, player, data, size );
return DP_OK;
}
@@ -2841,7 +2841,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerAddress( IDirectPlay4 *iface, DP
void *data, DWORD *size )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,%p,%p): stub\n", This, player, data, size );
+ FIXME( "(%p)->(0x%08lx,%p,%p): stub\n", This, player, data, size );
return DP_OK;
}
@@ -2886,7 +2886,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerCaps( IDirectPlay4 *iface, DPID
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
DPSP_GETCAPSDATA data;
- TRACE( "(%p)->(0x%08x,%p,0x%08x)\n", This, player, caps, flags);
+ TRACE( "(%p)->(0x%08lx,%p,0x%08lx)\n", This, player, caps, flags);
if ( !caps )
return DPERR_INVALIDPARAMS;
@@ -2949,7 +2949,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerData( IDirectPlay4 *iface, DPID
DWORD bufsize;
void *src;
- TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n", This, player, data, size, flags );
+ TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n", This, player, data, size, flags );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
return DPERR_UNINITIALIZED;
@@ -2987,7 +2987,7 @@ static HRESULT DP_IF_GetPlayerName( IDirectPlayImpl *This, DPID idPlayer, void *
LPDPNAME lpName = lpData;
DWORD dwRequiredDataSize;
- FIXME( "(%p)->(0x%08x,%p,%p,%u): ANSI\n",
+ FIXME( "(%p)->(0x%08lx,%p,%p,%u): ANSI\n",
This, idPlayer, lpData, lpdwDataSize, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3208,7 +3208,7 @@ static HRESULT DP_SecureOpen( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpsd,
{
HRESULT hr = DP_OK;
- FIXME( "(%p)->(%p,0x%08x,%p,%p): partial stub\n",
+ FIXME( "(%p)->(%p,0x%08lx,%p,%p): partial stub\n",
This, lpsd, dwFlags, lpSecurity, lpCredentials );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3218,7 +3218,7 @@ static HRESULT DP_SecureOpen( IDirectPlayImpl *This, const DPSESSIONDESC2 *lpsd,
if( lpsd->dwSize != sizeof(DPSESSIONDESC2) )
{
- TRACE( ": rejecting invalid dpsd size (%d).\n", lpsd->dwSize );
+ TRACE( ": rejecting invalid dpsd size (%ld).\n", lpsd->dwSize );
return DPERR_INVALIDPARAMS;
}
@@ -3358,7 +3358,7 @@ static HRESULT DP_IF_Receive( IDirectPlayImpl *This, DPID *lpidFrom, DPID *lpidT
{
LPDPMSG lpMsg = NULL;
- FIXME( "(%p)->(%p,%p,0x%08x,%p,%p,%u): stub\n",
+ FIXME( "(%p)->(%p,%p,0x%08lx,%p,%p,%u): stub\n",
This, lpidFrom, lpidTo, dwFlags, lpData, lpdwDataSize, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3392,11 +3392,11 @@ static HRESULT DP_IF_Receive( IDirectPlayImpl *This, DPID *lpidFrom, DPID *lpidT
( dwFlags & DPRECEIVE_FROMPLAYER )
)
{
- FIXME( "Find matching message 0x%08x\n", dwFlags );
+ FIXME( "Find matching message 0x%08lx\n", dwFlags );
}
else
{
- ERR( "Hmmm..dwFlags 0x%08x\n", dwFlags );
+ ERR( "Hmmm..dwFlags 0x%08lx\n", dwFlags );
}
if( lpMsg == NULL )
@@ -3533,7 +3533,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupData( IDirectPlay4 *iface, DPID g
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
lpGroupData gdata;
- TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, group, data, size, flags );
+ TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n", This, group, data, size, flags );
/* Parameter check */
if ( !data && size )
@@ -3567,7 +3567,7 @@ static HRESULT DP_IF_SetGroupName( IDirectPlayImpl *This, DPID idGroup, DPNAME *
{
lpGroupData lpGData;
- TRACE( "(%p)->(0x%08x,%p,0x%08x,%u)\n", This, idGroup,
+ TRACE( "(%p)->(0x%08lx,%p,0x%08lx,%u)\n", This, idGroup,
lpGroupName, dwFlags, bAnsi );
if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL )
@@ -3666,7 +3666,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SetPlayerData( IDirectPlay4 *iface, DPID
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
lpPlayerList plist;
- TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, player, data, size, flags );
+ TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n", This, player, data, size, flags );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
return DPERR_UNINITIALIZED;
@@ -3700,7 +3700,7 @@ static HRESULT DP_IF_SetPlayerName( IDirectPlayImpl *This, DPID idPlayer, DPNAME
{
lpPlayerList lpPList;
- TRACE( "(%p)->(0x%08x,%p,0x%08x,%u)\n",
+ TRACE( "(%p)->(0x%08lx,%p,0x%08lx,%u)\n",
This, idPlayer, lpPlayerName, dwFlags, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3769,7 +3769,7 @@ static HRESULT DP_SetSessionDesc( IDirectPlayImpl *This, const DPSESSIONDESC2 *l
DWORD dwRequiredSize;
LPDPSESSIONDESC2 lpTempSessDesc;
- TRACE( "(%p)->(%p,0x%08x,%u,%u)\n",
+ TRACE( "(%p)->(%p,0x%08lx,%u,%u)\n",
This, lpSessDesc, dwFlags, bInitial, bAnsi );
if( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -3988,7 +3988,7 @@ static HRESULT WINAPI IDirectPlay4Impl_AddGroupToGroup( IDirectPlay4 *iface, DPI
lpGroupData gdata;
lpGroupList glist;
- TRACE( "(%p)->(0x%08x,0x%08x)\n", This, parent, group );
+ TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, parent, group );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
return DPERR_UNINITIALIZED;
@@ -4025,7 +4025,7 @@ static HRESULT DP_IF_CreateGroupInGroup( IDirectPlayImpl *This, void *lpMsgHdr,
lpGroupList lpGList;
lpGroupData lpGData;
- TRACE( "(%p)->(0x%08x,%p,%p,%p,0x%08x,0x%08x,%u)\n",
+ TRACE( "(%p)->(0x%08lx,%p,%p,%p,0x%08lx,0x%08lx,%u)\n",
This, idParentGroup, lpidGroup, lpGroupName, lpData,
dwDataSize, dwFlags, bAnsi );
@@ -4171,7 +4171,7 @@ static HRESULT WINAPI IDirectPlay4Impl_DeleteGroupFromGroup( IDirectPlay4 *iface
lpGroupList glist;
lpGroupData parentdata;
- TRACE("(%p)->(0x%08x,0x%08x)\n", This, parent, group );
+ TRACE("(%p)->(0x%08lx,0x%08lx)\n", This, parent, group );
/* Is the parent group valid? */
if ( ( parentdata = DP_FindAnyGroup(This, parent ) ) == NULL )
@@ -4253,7 +4253,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface,
DWORD dwFlags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
- TRACE("(%p)->(%p,%p,%p,0x%08x)\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags );
+ TRACE("(%p)->(%p,%p,%p,0x%08lx)\n", This, lpguidApplication, lpEnumCallback, lpContext, dwFlags );
/* A default dwFlags (0) is backwards compatible -- DPCONNECTION_DIRECTPLAY */
if( dwFlags == 0 )
@@ -4522,7 +4522,7 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumGroupsInGroup( IDirectPlay4 *iface, D
lpGroupList glist;
lpGroupData gdata;
- FIXME( "(%p)->(0x%08x,%p,%p,%p,0x%08x): semi stub\n", This, group, instance, enumplayercb,
+ FIXME( "(%p)->(0x%08lx,%p,%p,%p,0x%08lx): semi stub\n", This, group, instance, enumplayercb,
context, flags );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -4569,7 +4569,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_GetGroupConnectionSettings( IDirectPlay4
DWORD flags, DPID group, void *data, DWORD *size )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
- FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, flags, group, data, size );
+ FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, flags, group, data, size );
return DP_OK;
}
@@ -4577,7 +4577,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupConnectionSettings( IDirectPlay4
DPID group, void *data, DWORD *size )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, flags, group, data, size );
+ FIXME( "(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, flags, group, data, size );
return DP_OK;
}
@@ -4592,12 +4592,12 @@ static BOOL CALLBACK DP_GetSpLpGuidFromCompoundAddress(
( IsEqualGUID( guidDataType, &DPAID_LobbyProvider ) )
)
{
- TRACE( "Found SP/LP (%s) %s (data size = 0x%08x)\n",
+ TRACE( "Found SP/LP (%s) %s (data size = 0x%08lx)\n",
debugstr_guid( guidDataType ), debugstr_guid( lpData ), dwDataSize );
if( dwDataSize != sizeof( GUID ) )
{
- ERR( "Invalid sp/lp guid size 0x%08x\n", dwDataSize );
+ ERR( "Invalid sp/lp guid size 0x%08lx\n", dwDataSize );
}
memcpy( lpContext, lpData, dwDataSize );
@@ -4731,7 +4731,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
NULL, NULL, (LPBYTE)returnBuffer,
&sizeOfReturnBuffer ) ) != ERROR_SUCCESS )
{
- ERR(": missing PATH registry data members: 0x%08x\n", dwTemp );
+ ERR(": missing PATH registry data members: 0x%08lx\n", dwTemp );
continue;
}
@@ -4853,7 +4853,7 @@ static HRESULT WINAPI IDirectPlay4Impl_InitializeConnection( IDirectPlay4 *iface
BOOL is_dp_sp; /* TRUE if Direct Play SP, FALSE if Direct Play Lobby SP */
HRESULT hr;
- TRACE( "(%p)->(%p,0x%08x)\n", This, connection, flags );
+ TRACE( "(%p)->(%p,0x%08lx)\n", This, connection, flags );
if ( !connection )
return DPERR_INVALIDPARAMS;
@@ -4956,7 +4956,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_SendChatMessage( IDirectPlay4A *iface, D
DPID to, DWORD flags, DPCHAT *chatmsg )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
- FIXME("(%p)->(0x%08x,0x%08x,0x%08x,%p): stub\n", This, from, to, flags, chatmsg );
+ FIXME("(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub\n", This, from, to, flags, chatmsg );
return DP_OK;
}
@@ -4964,7 +4964,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SendChatMessage( IDirectPlay4 *iface, DPI
DWORD flags, DPCHAT *chatmsg )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p): stub\n", This, from, to, flags, chatmsg );
+ FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub\n", This, from, to, flags, chatmsg );
return DP_OK;
}
@@ -4988,7 +4988,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_SetGroupConnectionSettings( IDirectPlay4
DWORD flags, DPID group, DPLCONNECTION *connection )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
- FIXME("(%p)->(0x%08x,0x%08x,%p): stub\n", This, flags, group, connection );
+ FIXME("(%p)->(0x%08lx,0x%08lx,%p): stub\n", This, flags, group, connection );
return DP_OK;
}
@@ -4996,7 +4996,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupConnectionSettings( IDirectPlay4
DPID group, DPLCONNECTION *connection )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,0x%08x,%p): stub\n", This, flags, group, connection );
+ FIXME( "(%p)->(0x%08lx,0x%08lx,%p): stub\n", This, flags, group, connection );
return DP_OK;
}
@@ -5024,7 +5024,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_StartSession( IDirectPlay4A *iface, DWOR
static HRESULT WINAPI IDirectPlay4Impl_StartSession( IDirectPlay4 *iface, DWORD flags, DPID group )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,0x%08x): stub\n", This, flags, group );
+ FIXME( "(%p)->(0x%08lx,0x%08lx): stub\n", This, flags, group );
return DP_OK;
}
@@ -5053,7 +5053,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupFlags( IDirectPlay4 *iface, DPID
DWORD *flags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,%p): stub\n", This, group, flags );
+ FIXME( "(%p)->(0x%08lx,%p): stub\n", This, group, flags );
return DP_OK;
}
@@ -5084,7 +5084,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupParent( IDirectPlay4 *iface, DPID
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
lpGroupData gdata;
- TRACE( "(%p)->(0x%08x,%p)\n", This, group, parent );
+ TRACE( "(%p)->(0x%08lx,%p)\n", This, group, parent );
if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
return DPERR_INVALIDGROUP;
@@ -5112,7 +5112,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerAccount( IDirectPlay4A *iface,
DWORD flags, void *data, DWORD *size )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
- FIXME("(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, player, flags, data, size );
+ FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, player, flags, data, size );
return DP_OK;
}
@@ -5120,7 +5120,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerAccount( IDirectPlay4 *iface, DP
DWORD flags, void *data, DWORD *size )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,0x%08x,%p,%p): stub\n", This, player, flags, data, size );
+ FIXME( "(%p)->(0x%08lx,0x%08lx,%p,%p): stub\n", This, player, flags, data, size );
return DP_OK;
}
@@ -5149,7 +5149,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerFlags( IDirectPlay4 *iface, DPID
DWORD *flags )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,%p): stub\n", This, player, flags );
+ FIXME( "(%p)->(0x%08lx,%p): stub\n", This, player, flags );
return DP_OK;
}
@@ -5164,7 +5164,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupOwner( IDirectPlay4 *iface, DPID
DPID *owner )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,%p): stub\n", This, group, owner );
+ FIXME( "(%p)->(0x%08lx,%p): stub\n", This, group, owner );
return DP_OK;
}
@@ -5179,7 +5179,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupOwner( IDirectPlay4 *iface, DPID
DPID owner )
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,0x%08x): stub\n", This, group, owner );
+ FIXME( "(%p)->(0x%08lx,0x%08lx): stub\n", This, group, owner );
return DP_OK;
}
@@ -5198,7 +5198,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SendEx( IDirectPlay4 *iface, DPID from, D
{
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
- FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,0x%08x,0x%08x,0x%08x,%p,%p): semi-stub\n",
+ FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,0x%08lx,0x%08lx,0x%08lx,%p,%p): semi-stub\n",
This, from, to, flags, data, size, priority, timeout, context, msgid );
if ( This->dp2->connectionInitialized == NO_PROVIDER )
@@ -5216,7 +5216,7 @@ static HRESULT WINAPI IDirectPlay4Impl_SendEx( IDirectPlay4 *iface, DPID from, D
*/
if ( from != DPID_UNKNOWN && !DP_FindPlayer( This, from ) )
{
- WARN( "INFO: Invalid from player 0x%08x\n", from );
+ WARN( "INFO: Invalid from player 0x%08lx\n", from );
return DPERR_INVALIDPLAYER;
}
@@ -5290,7 +5290,7 @@ static HRESULT WINAPI IDirectPlay4Impl_GetMessageQueue( IDirectPlay4 *iface, DPI
IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
HRESULT hr = DP_OK;
- FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,%p): semi-stub\n", This, from, to, flags, msgs, bytes );
+ FIXME( "(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,%p): semi-stub\n", This, from, to, flags, msgs, bytes );
/* FIXME: Do we need to do from and to sanity checking here? */
/* FIXME: What about sends which are not immediate? */
@@ -5322,7 +5322,7 @@ static HRESULT dplay_cancelmsg ( IDirectPlayImpl* This, DWORD msgid, DWORD flags
{
HRESULT hr = DP_OK;
- FIXME( "(%p)->(0x%08x,0x%08x): semi stub\n", This, msgid, flags );
+ FIXME( "(%p)->(0x%08lx,0x%08lx): semi stub\n", This, msgid, flags );
if ( This->dp2->spData.lpCB->Cancel )
{
diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c
index 53be88e0648..b3bdc04d153 100644
--- a/dlls/dplayx/dplaysp.c
+++ b/dlls/dplayx/dplaysp.c
@@ -82,7 +82,7 @@ static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface )
IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE( "(%p) ref=%d\n", This, ref );
+ TRACE( "(%p) ref=%ld\n", This, ref );
return ref;
}
@@ -92,7 +92,7 @@ static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface )
IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE( "(%p) ref=%d\n", This, ref );
+ TRACE( "(%p) ref=%ld\n", This, ref );
if( !ref )
{
@@ -111,7 +111,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry( IDirectPlaySP *iface, LPCWS
/* Should be able to call the comctl32 undocumented MRU routines.
I suspect that the interface works appropriately */
- FIXME( "(%p)->(%p,%p%p,0x%08x,0x%08x): stub\n",
+ FIXME( "(%p)->(%p,%p%p,0x%08lx,0x%08lx): stub\n",
This, lpSection, lpKey, lpData, dwDataSize, dwMaxEntries );
return DP_OK;
@@ -123,7 +123,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress( IDirectPlaySP *iface, REF
{
IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
- FIXME( "(%p)->(%s,%s,%p,0x%08x,%p,%p): stub\n",
+ FIXME( "(%p)->(%s,%s,%p,0x%08lx,%p,%p): stub\n",
This, debugstr_guid(guidSP), debugstr_guid(guidDataType),
lpData, dwDataSize, lpAddress, lpdwAddressSize );
@@ -136,7 +136,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress( IDirectPlaySP *iface,
{
IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
- TRACE( "(%p)->(%p,%p,0x%08x,%p)\n",
+ TRACE( "(%p)->(%p,%p,0x%08lx,%p)\n",
This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@@ -162,7 +162,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags( IDirectPlaySP *iface, DP
{
IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
- FIXME( "(%p)->(0x%08x,%p): stub\n",
+ FIXME( "(%p)->(0x%08lx,%p): stub\n",
This, idPlayer, lpdwPlayerFlags );
return DP_OK;
@@ -175,7 +175,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData( IDirectPlaySP *iface, D
HRESULT hr;
LPDP_SPPLAYERDATA lpPlayerData;
- TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n",
+ TRACE( "(%p)->(0x%08lx,%p,%p,0x%08lx)\n",
This, idPlayer, lplpData, lpdwDataSize, dwFlags );
hr = DP_GetSPPlayerData( This->dplay, idPlayer, (void**)&lpPlayerData );
@@ -216,18 +216,18 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi
WORD wVersion;
DPSP_REPLYDATA data;
- FIXME( "(%p)->(%p,0x%08x,%p): mostly stub\n",
+ FIXME( "(%p)->(%p,0x%08lx,%p): mostly stub\n",
This, lpMessageBody, dwMessageBodySize, lpMessageHeader );
wCommandId = lpMsg->wCommandId;
wVersion = lpMsg->wVersion;
- TRACE( "Incoming message has envelope of 0x%08x, %u, %u\n",
+ TRACE( "Incoming message has envelope of 0x%08lx, %u, %u\n",
lpMsg->dwMagic, wCommandId, wVersion );
if( lpMsg->dwMagic != DPMSGMAGIC_DPLAYMSG )
{
- ERR( "Unknown magic 0x%08x!\n", lpMsg->dwMagic );
+ ERR( "Unknown magic 0x%08lx!\n", lpMsg->dwMagic );
return DPERR_GENERIC;
}
@@ -522,7 +522,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, D
LPDP_SPPLAYERDATA lpPlayerEntry;
LPVOID lpPlayerData;
- TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, idPlayer, lpData, dwDataSize, dwFlags );
+ TRACE( "(%p)->(0x%08lx,%p,0x%08lx,0x%08lx)\n", This, idPlayer, lpData, dwDataSize, dwFlags );
hr = DP_GetSPPlayerData( This->dplay, idPlayer, (void**)&lpPlayerEntry );
if( FAILED(hr) )
@@ -556,7 +556,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress( IDirectPlaySP *if
{
IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
- FIXME( "(%p)->(%p,0x%08x,%p,%p): stub\n",
+ FIXME( "(%p)->(%p,0x%08lx,%p,%p): stub\n",
This, lpElements, dwElementCount, lpAddress, lpdwAddressSize );
return DP_OK;
@@ -568,7 +568,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void **
IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
HRESULT hr = DP_OK;
- TRACE( "(%p)->(%p,%p,0x%08x)\n", This, lplpData, lpdwDataSize, dwFlags );
+ TRACE( "(%p)->(%p,%p,0x%08lx)\n", This, lplpData, lpdwDataSize, dwFlags );
#if 0
/* This is what the documentation says... */
@@ -583,7 +583,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void **
*/
if( dwFlags != DPSET_REMOTE )
{
- TRACE( "Undocumented dwFlags 0x%08x used\n", dwFlags );
+ TRACE( "Undocumented dwFlags 0x%08lx used\n", dwFlags );
}
#endif
@@ -616,7 +616,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *l
IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
LPVOID lpSpData;
- TRACE( "(%p)->(%p,0x%08x,0x%08x)\n", This, lpData, dwDataSize, dwFlags );
+ TRACE( "(%p)->(%p,0x%08lx,0x%08lx)\n", This, lpData, dwDataSize, dwFlags );
#if 0
/* This is what the documentation says... */
@@ -631,7 +631,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *l
*/
if( dwFlags != DPSET_REMOTE )
{
- TRACE( "Undocumented dwFlags 0x%08x used\n", dwFlags );
+ TRACE( "Undocumented dwFlags 0x%08lx used\n", dwFlags );
}
#endif
@@ -660,7 +660,7 @@ static void WINAPI IDirectPlaySPImpl_SendComplete( IDirectPlaySP *iface, void *u
{
IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface );
- FIXME( "(%p)->(%p,0x%08x): stub\n",
+ FIXME( "(%p)->(%p,0x%08lx): stub\n",
This, unknownA, unknownB );
}
diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index 957f7cf46f5..ec62d273cb4 100644
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -113,7 +113,7 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size )
if( size > (dwBlockSize - sizeof(BOOL)) )
{
- FIXME( "Size exceeded. Request of 0x%08x\n", size );
+ FIXME( "Size exceeded. Request of 0x%08lx\n", size );
size = dwBlockSize - sizeof(BOOL);
}
@@ -193,7 +193,7 @@ static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplDat
if( dwAppID == 0 )
{
dwAppID = GetCurrentProcessId();
- TRACE( "Translated dwAppID == 0 into 0x%08x\n", dwAppID );
+ TRACE( "Translated dwAppID == 0 into 0x%08lx\n", dwAppID );
}
for( i=0; i < numSupportedLobbies; i++ )
@@ -201,7 +201,7 @@ static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplDat
if( lobbyData[ i ].dwAppID == dwAppID )
{
/* This process is lobbied */
- TRACE( "Found 0x%08x @ %u\n", dwAppID, i );
+ TRACE( "Found 0x%08lx @ %u\n", dwAppID, i );
*lplpDplData = &lobbyData[ i ];
return TRUE;
}
@@ -229,7 +229,7 @@ BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID )
if( lobbyData[ i ].dwAppID == 0 )
{
/* This process is now lobbied */
- TRACE( "Setting lobbyData[%u] for (0x%08x,0x%08x)\n",
+ TRACE( "Setting lobbyData[%u] for (0x%08lx,0x%08lx)\n",
i, dwAppID, GetCurrentProcessId() );
lobbyData[ i ].dwAppID = dwAppID;
@@ -386,7 +386,7 @@ BOOL DPLAYX_ConstructData(void)
}
else
{
- ERR( ": semaphore error %d\n", GetLastError() );
+ ERR( ": semaphore error %ld\n", GetLastError() );
return FALSE;
}
@@ -409,7 +409,7 @@ BOOL DPLAYX_ConstructData(void)
}
else
{
- ERR( ": unable to create shared memory (%d)\n", GetLastError() );
+ ERR( ": unable to create shared memory (%ld)\n", GetLastError() );
DPLAYX_ReleaseSemaphore();
return FALSE;
}
@@ -429,7 +429,7 @@ BOOL DPLAYX_ConstructData(void)
if( lpSharedStaticData == NULL )
{
- ERR( ": unable to map static data into process memory space (%d)\n",
+ ERR( ": unable to map static data into process memory space (%ld)\n",
GetLastError() );
DPLAYX_ReleaseSemaphore();
return FALSE;
@@ -795,7 +795,7 @@ HRESULT DPLAYX_GetConnectionSettingsA
{
DPLAYX_ReleaseSemaphore();
- TRACE( "Application 0x%08x is not lobbied\n", dwAppID );
+ TRACE( "Application 0x%08lx is not lobbied\n", dwAppID );
return DPERR_NOTLOBBIED;
}
@@ -911,7 +911,7 @@ HRESULT DPLAYX_SetConnectionSettingsA
/* Store information */
if( lpConn->dwSize != sizeof(DPLCONNECTION) )
{
- ERR(": old/new DPLCONNECTION type? Size=%08x\n", lpConn->dwSize );
+ ERR(": old/new DPLCONNECTION type? Size=%08lx\n", lpConn->dwSize );
return DPERR_INVALIDPARAMS;
}
@@ -931,7 +931,7 @@ HRESULT DPLAYX_SetConnectionSettingsA
{
DPLAYX_ReleaseSemaphore();
- ERR("DPSESSIONDESC passed in? Size=%u\n",
+ ERR("DPSESSIONDESC passed in? Size=%lu\n",
lpConn->lpSessionDesc?lpConn->lpSessionDesc->dwSize:0 );
return DPERR_INVALIDPARAMS;
@@ -974,7 +974,7 @@ HRESULT DPLAYX_SetConnectionSettingsW
/* Store information */
if( lpConn->dwSize != sizeof(DPLCONNECTION) )
{
- ERR(": old/new DPLCONNECTION type? Size=%u\n", lpConn->dwSize );
+ ERR(": old/new DPLCONNECTION type? Size=%lu\n", lpConn->dwSize );
return DPERR_INVALIDPARAMS;
}
@@ -1208,7 +1208,7 @@ LPCSTR DPLAYX_HresultToString(HRESULT hr)
default:
/* For errors not in the list, return HRESULT as a string
This part is not thread safe */
- WARN( "Unknown error 0x%08x\n", hr );
+ WARN( "Unknown error 0x%08lx\n", hr );
wsprintfA( szTempStr, "0x%08x", hr );
return szTempStr;
}
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index 768294c5e21..c8c2778501a 100644
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -75,7 +75,7 @@ DWORD gdwDPlaySPRefCount = 0;
BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
{
- TRACE( "(%p,%d,%p)\n", hinstDLL, fdwReason, lpvReserved );
+ TRACE( "(%p,%ld,%p)\n", hinstDLL, fdwReason, lpvReserved );
switch ( fdwReason )
{
diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c
index 6f6636c4b95..e30c5e644df 100644
--- a/dlls/dplayx/dplayx_messages.c
+++ b/dlls/dplayx/dplayx_messages.c
@@ -118,7 +118,7 @@ static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext )
dwWaitResult = WaitForSingleObject( lpThreadInfo->hStart, 10000 /* 10 sec */ );
if( dwWaitResult == WAIT_TIMEOUT )
{
- FIXME( "Should signal app/wait creation failure (0x%08x)\n", dwWaitResult );
+ FIXME( "Should signal app/wait creation failure (0x%08lx)\n", dwWaitResult );
goto end_of_thread;
}
@@ -130,7 +130,7 @@ static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext )
dwWaitResult = WaitForSingleObject( lpThreadInfo->hSettingRead, INFINITE );
if( dwWaitResult == WAIT_TIMEOUT )
{
- ERR( "App Read connection setting timeout fail (0x%08x)\n", dwWaitResult );
+ ERR( "App Read connection setting timeout fail (0x%08lx)\n", dwWaitResult );
}
/* Close this handle as it's not needed anymore */
@@ -215,7 +215,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlayImpl *This, DWORD dwFlags, DPID *
data.bSystemMessage = TRUE; /* Allow reply to be sent */
data.lpISP = This->dp2->spData.lpISP;
- TRACE( "Asking for player id w/ dwFlags 0x%08x\n",
+ TRACE( "Asking for player id w/ dwFlags 0x%08lx\n",
lpMsgBody->dwFlags );
DP_MSG_ExpectReply( This, &data, DPMSG_DEFAULT_WAIT_TIME, DPMSGCMD_NEWPLAYERIDREPLY,
@@ -231,7 +231,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlayImpl *This, DWORD dwFlags, DPID *
*lpdpidAllocatedId = lpcReply->dpidNewPlayerId;
- TRACE( "Received reply for id = 0x%08x\n", lpcReply->dpidNewPlayerId );
+ TRACE( "Received reply for id = 0x%08lx\n", lpcReply->dpidNewPlayerId );
/* FIXME: I think that the rest of the message has something to do
* with remote data for the player that perhaps I need to setup.
@@ -313,14 +313,14 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer )
lpMsgBody->unknown4[3] = NS_GetNsMagic( This->dp2->lpNameServerData ) -
0x02000000;
- TRACE( "Setting first magic to 0x%08x\n", lpMsgBody->unknown4[3] );
+ TRACE( "Setting first magic to 0x%08lx\n", lpMsgBody->unknown4[3] );
lpMsgBody->unknown4[4] = 0x0;
lpMsgBody->unknown4[5] = 0x0;
lpMsgBody->unknown4[6] = 0x0;
lpMsgBody->unknown4[7] = NS_GetNsMagic( This->dp2->lpNameServerData );
- TRACE( "Setting second magic to 0x%08x\n", lpMsgBody->unknown4[7] );
+ TRACE( "Setting second magic to 0x%08lx\n", lpMsgBody->unknown4[7] );
lpMsgBody->unknown4[8] = 0x0;
lpMsgBody->unknown4[9] = 0x0;
@@ -342,7 +342,7 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer )
data.bSystemMessage = TRUE; /* Allow reply to be sent */
data.lpISP = This->dp2->spData.lpISP;
- TRACE( "Sending forward player request with 0x%08x\n", dpidServer );
+ TRACE( "Sending forward player request with 0x%08lx\n", dpidServer );
lpMsg = DP_MSG_ExpectReply( This, &data,
DPMSG_WAIT_60_SECS,
@@ -377,7 +377,7 @@ static void *DP_MSG_ExpectReply( IDirectPlayImpl *This, DPSP_SENDDATA *lpData, D
hMsgReceipt = DP_MSG_BuildAndLinkReplyStruct( This, &replyStructList,
wReplyCommandId );
- TRACE( "Sending msg and expecting cmd %u in reply within %u ticks\n",
+ TRACE( "Sending msg and expecting cmd %u in reply within %lu ticks\n",
wReplyCommandId, dwWaitTime );
hr = (*This->dp2->spData.lpCB->Send)( lpData );
@@ -393,7 +393,7 @@ static void *DP_MSG_ExpectReply( IDirectPlayImpl *This, DPSP_SENDDATA *lpData, D
dwWaitReturn = WaitForSingleObject( hMsgReceipt, dwWaitTime );
if( dwWaitReturn != WAIT_OBJECT_0 )
{
- ERR( "Wait failed 0x%08x\n", dwWaitReturn );
+ ERR( "Wait failed 0x%08lx\n", dwWaitReturn );
return NULL;
}
diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c
index 30d76aa16d1..52b5618b98f 100644
--- a/dlls/dplayx/dplobby.c
+++ b/dlls/dplayx/dplobby.c
@@ -211,7 +211,7 @@ static ULONG WINAPI IDirectPlayLobbyAImpl_AddRef( IDirectPlayLobbyA *iface )
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobbyA( iface );
ULONG ref = InterlockedIncrement( &This->refA );
- TRACE( "(%p) refA=%d\n", This, ref );
+ TRACE( "(%p) refA=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -224,7 +224,7 @@ static ULONG WINAPI IDirectPlayLobbyImpl_AddRef( IDirectPlayLobby *iface )
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE( "(%p) ref=%d\n", This, ref );
+ TRACE( "(%p) ref=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -237,7 +237,7 @@ static ULONG WINAPI IDirectPlayLobby2AImpl_AddRef(IDirectPlayLobby2A *iface)
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby2A( iface );
ULONG ref = InterlockedIncrement( &This->ref2A );
- TRACE( "(%p) ref2A=%d\n", This, ref );
+ TRACE( "(%p) ref2A=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -250,7 +250,7 @@ static ULONG WINAPI IDirectPlayLobby2Impl_AddRef(IDirectPlayLobby2 *iface)
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby2( iface );
ULONG ref = InterlockedIncrement( &This->ref2 );
- TRACE( "(%p) ref2=%d\n", This, ref );
+ TRACE( "(%p) ref2=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -263,7 +263,7 @@ static ULONG WINAPI IDirectPlayLobby3AImpl_AddRef(IDirectPlayLobby3A *iface)
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
ULONG ref = InterlockedIncrement( &This->ref3A );
- TRACE( "(%p) ref3A=%d\n", This, ref );
+ TRACE( "(%p) ref3A=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -276,7 +276,7 @@ static ULONG WINAPI IDirectPlayLobby3Impl_AddRef(IDirectPlayLobby3 *iface)
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
ULONG ref = InterlockedIncrement( &This->ref3 );
- TRACE( "(%p) ref3=%d\n", This, ref );
+ TRACE( "(%p) ref3=%ld\n", This, ref );
if ( ref == 1 )
InterlockedIncrement( &This->numIfaces );
@@ -289,7 +289,7 @@ static ULONG WINAPI IDirectPlayLobbyAImpl_Release( IDirectPlayLobbyA *iface )
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobbyA( iface );
ULONG ref = InterlockedDecrement( &This->refA );
- TRACE( "(%p) refA=%d\n", This, ref );
+ TRACE( "(%p) refA=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplobby_destroy( This );
@@ -302,7 +302,7 @@ static ULONG WINAPI IDirectPlayLobbyImpl_Release( IDirectPlayLobby *iface )
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE( "(%p) ref=%d\n", This, ref );
+ TRACE( "(%p) ref=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplobby_destroy( This );
@@ -315,7 +315,7 @@ static ULONG WINAPI IDirectPlayLobby2AImpl_Release(IDirectPlayLobby2A *iface)
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby2A( iface );
ULONG ref = InterlockedDecrement( &This->ref2A );
- TRACE( "(%p) ref2A=%d\n", This, ref );
+ TRACE( "(%p) ref2A=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplobby_destroy( This );
@@ -328,7 +328,7 @@ static ULONG WINAPI IDirectPlayLobby2Impl_Release(IDirectPlayLobby2 *iface)
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby2( iface );
ULONG ref = InterlockedDecrement( &This->ref2 );
- TRACE( "(%p) ref2=%d\n", This, ref );
+ TRACE( "(%p) ref2=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplobby_destroy( This );
@@ -341,7 +341,7 @@ static ULONG WINAPI IDirectPlayLobby3AImpl_Release(IDirectPlayLobby3A *iface)
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
ULONG ref = InterlockedDecrement( &This->ref3A );
- TRACE( "(%p) ref3A=%d\n", This, ref );
+ TRACE( "(%p) ref3A=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplobby_destroy( This );
@@ -354,7 +354,7 @@ static ULONG WINAPI IDirectPlayLobby3Impl_Release(IDirectPlayLobby3 *iface)
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
ULONG ref = InterlockedDecrement( &This->ref3 );
- TRACE( "(%p) ref3=%d\n", This, ref );
+ TRACE( "(%p) ref3=%ld\n", This, ref );
if ( !ref && !InterlockedDecrement( &This->numIfaces ) )
dplobby_destroy( This );
@@ -379,7 +379,7 @@ static HRESULT DPL_ConnectEx( IDirectPlayLobbyImpl *This, DWORD dwFlags, REFIID
DWORD dwConnSize = 0;
LPDPLCONNECTION lpConn;
- FIXME("(%p)->(0x%08x,%p,%p): semi stub\n", This, dwFlags, lplpDP, pUnk );
+ FIXME("(%p)->(0x%08lx,%p,%p): semi stub\n", This, dwFlags, lplpDP, pUnk );
if( pUnk )
{
@@ -560,7 +560,7 @@ static HRESULT DPL_CreateAddress(
const DWORD dwNumAddElements = 2; /* Service Provide & address data type */
DPCOMPOUNDADDRESSELEMENT addressElements[ 2 /* dwNumAddElements */ ];
- TRACE( "(%p)->(%p,%p,0x%08x,%p,%p,%d)\n", guidSP, guidDataType, lpData, dwDataSize,
+ TRACE( "(%p)->(%p,%p,0x%08lx,%p,%p,%d)\n", guidSP, guidDataType, lpData, dwDataSize,
lpAddress, lpdwAddressSize, bAnsiInterface );
addressElements[ 0 ].guidDataType = DPAID_ServiceProvider;
@@ -623,7 +623,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddress( IDirectPlayLobby3A *if
{
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
- TRACE("(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress,
+ TRACE("(%p)->(%p,%p,0x%08lx,%p)\n", This, lpEnumAddressCallback, lpAddress,
dwAddressSize, lpContext );
return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@@ -635,7 +635,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_EnumAddress( IDirectPlayLobby3 *ifac
{
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
- TRACE("(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress,
+ TRACE("(%p)->(%p,%p,0x%08lx,%p)\n", This, lpEnumAddressCallback, lpAddress,
dwAddressSize, lpContext );
return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext );
@@ -720,7 +720,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3
char subKeyName[51];
FILETIME filetime;
- TRACE(" (%p)->(%p,%p,%p,0x%08x)\n", This, lpEnumAddressTypeCallback, guidSP, lpContext, dwFlags );
+ TRACE(" (%p)->(%p,%p,%p,0x%08lx)\n", This, lpEnumAddressTypeCallback, guidSP, lpContext, dwFlags );
if( dwFlags != 0 )
{
@@ -848,7 +848,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_EnumLocalApplications( IDirectPlayLo
{
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
- FIXME("(%p)->(%p,%p,0x%08x):stub\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
+ FIXME("(%p)->(%p,%p,0x%08lx):stub\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
return DPERR_OUTOFMEMORY;
}
@@ -897,7 +897,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL
char subKeyName[51];
FILETIME filetime;
- TRACE("(%p)->(%p,%p,0x%08x)\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
+ TRACE("(%p)->(%p,%p,0x%08lx)\n", This, lpEnumLocalAppCallback, lpContext, dwFlags );
if( dwFlags != 0 )
{
@@ -1022,7 +1022,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_GetConnectionSettings( IDirectPlayL
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
HRESULT hr;
- TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
+ TRACE("(%p)->(0x%08lx,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
EnterCriticalSection( &This->lock );
@@ -1042,7 +1042,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_GetConnectionSettings( IDirectPlayLo
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
HRESULT hr;
- TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
+ TRACE("(%p)->(0x%08lx,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
EnterCriticalSection( &This->lock );
@@ -1099,7 +1099,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_ReceiveLobbyMessage( IDirectPlayLob
DWORD *lpdwDataSize )
{
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
- FIXME(":stub %p %08x %08x %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
+ FIXME(":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
lpdwDataSize );
return DPERR_OUTOFMEMORY;
}
@@ -1109,7 +1109,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_ReceiveLobbyMessage( IDirectPlayLobb
DWORD *lpdwDataSize )
{
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
- FIXME(":stub %p %08x %08x %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
+ FIXME(":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
lpdwDataSize );
return DPERR_OUTOFMEMORY;
}
@@ -1304,7 +1304,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A
DWORD dwSuspendCount;
HANDLE hStart, hDeath, hSettingRead;
- TRACE( "(%p)->(0x%08x,%p,%p,%p)\n",
+ TRACE( "(%p)->(0x%08lx,%p,%p,%p)\n",
This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
if( dwFlags != 0 )
@@ -1379,7 +1379,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A
/* Reserve this global application id! */
if( !DPLAYX_CreateLobbyApplication( newProcessInfo.dwProcessId ) )
{
- ERR( "Unable to create global application data for 0x%08x\n",
+ ERR( "Unable to create global application data for 0x%08lx\n",
newProcessInfo.dwProcessId );
}
@@ -1410,7 +1410,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A
/* Unsuspend the process - should return the prev suspension count */
if( ( dwSuspendCount = ResumeThread( newProcessInfo.hThread ) ) != 1 )
{
- ERR( "ResumeThread failed with 0x%08x\n", dwSuspendCount );
+ ERR( "ResumeThread failed with 0x%08lx\n", dwSuspendCount );
}
return DP_OK;
@@ -1420,7 +1420,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_RunApplication( IDirectPlayLobby3 *i
DWORD *lpdwAppID, DPLCONNECTION *lpConn, HANDLE hReceiveEvent )
{
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
- FIXME( "(%p)->(0x%08x,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
+ FIXME( "(%p)->(0x%08lx,%p,%p,%p):stub\n", This, dwFlags, lpdwAppID, lpConn, hReceiveEvent );
return DPERR_OUTOFMEMORY;
}
@@ -1488,7 +1488,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_SetConnectionSettings( IDirectPlayLo
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface );
HRESULT hr;
- TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn );
+ TRACE("(%p)->(0x%08lx,0x%08lx,%p)\n", This, dwFlags, dwAppID, lpConn );
EnterCriticalSection( &This->lock );
@@ -1551,7 +1551,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_SetConnectionSettings( IDirectPlayL
IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface );
HRESULT hr;
- TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn );
+ TRACE("(%p)->(0x%08lx,0x%08lx,%p)\n", This, dwFlags, dwAppID, lpConn );
EnterCriticalSection( &This->lock );
@@ -1667,7 +1667,7 @@ HRESULT DPL_CreateCompoundAddress
DWORD dwElements;
LPCDPCOMPOUNDADDRESSELEMENT lpOrigElements = lpElements;
- TRACE("(%p,0x%08x,%p,%p)\n", lpElements, dwElementCount, lpAddress, lpdwAddressSize );
+ TRACE("(%p,0x%08lx,%p,%p)\n", lpElements, dwElementCount, lpAddress, lpdwAddressSize );
/* Parameter check */
if( ( lpElements == NULL ) ||
@@ -1875,7 +1875,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_WaitForConnectionSettings( IDirectPl
HRESULT hr = DP_OK;
BOOL bStartWait = !(dwFlags & DPLWAIT_CANCEL);
- TRACE( "(%p)->(0x%08x)\n", iface, dwFlags );
+ TRACE( "(%p)->(0x%08lx)\n", iface, dwFlags );
if( DPLAYX_WaitForConnectionSettings( bStartWait ) )
{
@@ -1892,7 +1892,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings( IDirectP
HRESULT hr = DP_OK;
BOOL bStartWait = !(dwFlags & DPLWAIT_CANCEL);
- TRACE( "(%p)->(0x%08x)\n", iface, dwFlags );
+ TRACE( "(%p)->(0x%08lx)\n", iface, dwFlags );
if( DPLAYX_WaitForConnectionSettings( bStartWait ) )
{
@@ -2069,7 +2069,7 @@ HRESULT dplobby_create( REFIID riid, void **ppv )
HRESULT WINAPI DirectPlayLobbyCreateA( GUID *lpGUIDDSP, IDirectPlayLobbyA **lplpDPL,
IUnknown *lpUnk, void *lpData, DWORD dwDataSize )
{
- TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n",
+ TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\n",
lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize);
/* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must
@@ -2098,7 +2098,7 @@ HRESULT WINAPI DirectPlayLobbyCreateA( GUID *lpGUIDDSP, IDirectPlayLobbyA **lplp
HRESULT WINAPI DirectPlayLobbyCreateW( GUID *lpGUIDDSP, IDirectPlayLobby **lplpDPL,
IUnknown *lpUnk, void *lpData, DWORD dwDataSize )
{
- TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n",
+ TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\n",
lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize);
/* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must
diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c
index 3528f94e345..ad4ca891587 100644
--- a/dlls/dplayx/lobbysp.c
+++ b/dlls/dplayx/lobbysp.c
@@ -60,7 +60,7 @@ static ULONG WINAPI IDPLobbySPImpl_AddRef( IDPLobbySP *iface )
IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface );
ULONG ref = InterlockedIncrement( &This->ref );
- TRACE( "(%p) ref=%d\n", This, ref );
+ TRACE( "(%p) ref=%ld\n", This, ref );
return ref;
}
@@ -70,7 +70,7 @@ static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface )
IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface );
ULONG ref = InterlockedDecrement( &This->ref );
- TRACE( "(%p) ref=%d\n", This, ref );
+ TRACE( "(%p) ref=%ld\n", This, ref );
if( !ref )
HeapFree( GetProcessHeap(), 0, This );
--
2.34.1
1
0
[PATCH v2] winhttp: Use lock when attempting to send frame synchronously().
by Paul Gofman 03 Feb '22
by Paul Gofman 03 Feb '22
03 Feb '22
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
---
Supersedes 225419.
While web socket sends are not actually supposed to be queued before the previous one completed, send for pongs
or socket shutdown may be called in parallel. Only the first call will go for synchronous send attempt but the
next queued call have a chance of hitting socket_send() before the first sync one returns.
The sync outside of send_frame() (which is needed if the send wasn't completed synchronously) is provided by
the queueing logic around pending_sends counter.
v2:
- lock before incrementing and checking pending_sends, unlock after pending_sends is finalized
(but before sending app callback).
This way we are guaranteed that:
- sync send is never attempted if async is queued;
- attempt to execute next send will come to pending_sends increment only if the concurring send is
complete or queued (so in the latter case that next send will be queued as well).
dlls/winhttp/request.c | 15 +++++++++++----
dlls/winhttp/winhttp_private.h | 1 +
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 728b1895ba7..a3a6389a938 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -3111,6 +3111,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR
socket->hdr.callback = request->hdr.callback;
socket->hdr.notify_mask = request->hdr.notify_mask;
socket->hdr.context = context;
+ InitializeSRWLock( &socket->send_lock );
addref_object( &request->hdr );
socket->request = request;
@@ -3391,6 +3392,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_
return ERROR_OUTOFMEMORY;
}
+ AcquireSRWLockExclusive( &socket->send_lock );
async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3;
if (!async_send)
{
@@ -3419,10 +3421,11 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_
free( s );
}
}
- else
+ else InterlockedDecrement( &socket->hdr.pending_sends );
+ ReleaseSRWLockExclusive( &socket->send_lock );
+ if (!async_send)
{
TRACE("sent sync.\n");
- InterlockedDecrement( &socket->hdr.pending_sends );
free( s );
socket_send_complete( socket, ret, type, len );
ret = ERROR_SUCCESS;
@@ -3535,6 +3538,7 @@ static DWORD socket_send_pong( struct socket *socket )
if (!(s = malloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY;
+ AcquireSRWLockExclusive( &socket->send_lock );
async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1;
if (!async_send)
{
@@ -3563,6 +3567,7 @@ static DWORD socket_send_pong( struct socket *socket )
InterlockedDecrement( &socket->hdr.pending_sends );
free( s );
}
+ ReleaseSRWLockExclusive( &socket->send_lock );
return ret;
}
return send_frame( socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE, NULL );
@@ -3817,6 +3822,7 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v
if (!(s = malloc( sizeof(*s) ))) return FALSE;
+ AcquireSRWLockExclusive( &socket->send_lock );
async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3;
if (!async_send)
{
@@ -3845,9 +3851,10 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v
free( s );
}
}
- else
+ else InterlockedDecrement( &socket->hdr.pending_sends );
+ ReleaseSRWLockExclusive( &socket->send_lock );
+ if (!async_send)
{
- InterlockedDecrement( &socket->hdr.pending_sends );
free( s );
if (send_callback)
{
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 3e4e1eb298d..732f0afaa88 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -259,6 +259,7 @@ struct socket
unsigned int send_remaining_size;
unsigned int bytes_in_send_frame_buffer;
unsigned int client_buffer_offset;
+ SRWLOCK send_lock;
};
struct send_request
--
2.34.1
2
1
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/mfplat/buffer.c | 7 ++++---
dlls/mfplat/main.c | 8 +++++---
dlls/mfplat/mediatype.c | 26 +++++++++++++++-----------
3 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c
index 9081dc39eab..f161bb29d80 100644
--- a/dlls/mfplat/buffer.c
+++ b/dlls/mfplat/buffer.c
@@ -49,7 +49,7 @@ struct buffer
struct
{
BYTE *linear_buffer;
- unsigned int plane_size;
+ DWORD plane_size;
BYTE *scanline0;
unsigned int width;
@@ -1306,9 +1306,10 @@ static p_copy_image_func get_2d_buffer_copy_func(DWORD fourcc)
static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer)
{
- unsigned int stride, max_length, plane_size;
- struct buffer *object;
+ unsigned int stride, max_length;
unsigned int row_alignment;
+ struct buffer *object;
+ DWORD plane_size;
GUID subtype;
BOOL is_yuv;
HRESULT hr;
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index e2f892ed91d..e79f59d41dd 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -702,9 +702,10 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32
HRESULT hr = S_OK;
HKEY hclsid = 0;
WCHAR buffer[64];
- DWORD size, ret;
WCHAR str[250];
UINT8 *blob;
+ UINT32 size;
+ DWORD ret;
guid_to_string(buffer, clsid);
swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer);
@@ -6094,8 +6095,9 @@ static const IRtwqAsyncCallbackVtbl source_resolver_callback_url_vtbl =
static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void **handler)
{
- unsigned int j = 0, name_length, type;
+ DWORD name_length, type;
HRESULT hr = E_FAIL;
+ unsigned int j = 0;
WCHAR clsidW[39];
CLSID clsid;
@@ -9207,7 +9209,7 @@ static ULONGLONG lldiv128(ULARGE_INTEGER c1, ULARGE_INTEGER c0, LONGLONG denom)
{
ULARGE_INTEGER q1, q0, rhat;
ULARGE_INTEGER v, cmp1, cmp2;
- unsigned int s = 0;
+ DWORD s = 0;
v.QuadPart = llabs(denom);
diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c
index 4f24ccbd237..41dbda572d5 100644
--- a/dlls/mfplat/mediatype.c
+++ b/dlls/mfplat/mediatype.c
@@ -2926,8 +2926,10 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE
if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value)))
format->nChannels = value;
- IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &format->nSamplesPerSec);
- IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &format->nAvgBytesPerSec);
+ if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value)))
+ format->nSamplesPerSec = value;
+ if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &value)))
+ format->nAvgBytesPerSec = value;
if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value)))
format->nBlockAlign = value;
if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value)))
@@ -2939,7 +2941,8 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE
if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value)))
format_ext->Samples.wSamplesPerBlock = value;
- IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &format_ext->dwChannelMask);
+ if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &value)))
+ format_ext->dwChannelMask = value;
memcpy(&format_ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(format_ext->SubFormat));
}
@@ -3085,8 +3088,8 @@ HRESULT WINAPI MFCreateAudioMediaType(const WAVEFORMATEX *format, IMFAudioMediaT
return S_OK;
}
-static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UINT32 *numerator,
- UINT32 *denominator)
+static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, DWORD *numerator,
+ DWORD *denominator)
{
UINT64 value;
@@ -3102,7 +3105,7 @@ static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UIN
*/
HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size)
{
- UINT32 flags, palette_size = 0, avgrate;
+ UINT32 flags, palette_size = 0, value;
MFVIDEOFORMAT *format;
INT32 stride;
GUID guid;
@@ -3162,11 +3165,12 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF
if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&stride)) && stride < 0)
format->videoInfo.VideoFlags |= MFVideoFlag_BottomUpLinearRep;
- if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &avgrate)))
- format->compressedInfo.AvgBitrate = avgrate;
- if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &avgrate)))
- format->compressedInfo.AvgBitErrorRate = avgrate;
- IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &format->compressedInfo.MaxKeyFrameSpacing);
+ if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BITRATE, &value)))
+ format->compressedInfo.AvgBitrate = value;
+ if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AVG_BIT_ERROR_RATE, &value)))
+ format->compressedInfo.AvgBitErrorRate = value;
+ if (SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_MAX_KEYFRAME_SPACING, &value)))
+ format->compressedInfo.MaxKeyFrameSpacing = value;
/* Palette. */
if (palette_size)
--
2.34.1
1
0
03 Feb '22
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/shell32/shellord.c | 5 +++++
dlls/shell32/undocshell.h | 10 ----------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 2c73ce18940..a138f381a92 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -50,6 +50,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell);
WINE_DECLARE_DEBUG_CHANNEL(pidl);
+/* SHWaitForFileToOpen flags */
+#define SHWFF_ADD 0x01
+#define SHWFF_REMOVE 0x02
+#define SHWFF_WAIT 0x04
+
/* FIXME: !!! move CREATEMRULIST and flags to header file !!! */
/* !!! it is in both here and comctl32undoc.c !!! */
typedef struct tagCREATEMRULIST
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index 5ed8d25f234..459c51c8454 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -208,16 +208,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs);
* Misc Stuff
*/
-/* SHWaitForFileToOpen flags */
-#define SHWFF_ADD 0x01
-#define SHWFF_REMOVE 0x02
-#define SHWFF_WAIT 0x04
-
-BOOL WINAPI SHWaitForFileToOpen(
- LPCITEMIDLIST pidl,
- DWORD dwFlags,
- DWORD dwTimeout);
-
WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect,
WORD cKids, const HWND *lpKids);
--
2.34.1
2
6
[PATCH 1/4] quartz/tests: Test more interfaces exposed by the filter graph.
by Zebediah Figura 03 Feb '22
by Zebediah Figura 03 Feb '22
03 Feb '22
From: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
dlls/quartz/tests/filtergraph.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index bd086445a3b..98f7b30717d 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -98,23 +98,30 @@ static void test_interfaces(void)
IFilterGraph2 *graph = create_graph();
check_interface(graph, &IID_IBasicAudio, TRUE);
+ check_interface(graph, &IID_IBasicVideo, TRUE);
check_interface(graph, &IID_IBasicVideo2, TRUE);
+ check_interface(graph, &IID_IFilterGraph, TRUE);
check_interface(graph, &IID_IFilterGraph2, TRUE);
check_interface(graph, &IID_IFilterMapper, TRUE);
+ check_interface(graph, &IID_IFilterMapper2, TRUE);
check_interface(graph, &IID_IFilterMapper3, TRUE);
+ check_interface(graph, &IID_IGraphBuilder, TRUE);
check_interface(graph, &IID_IGraphConfig, TRUE);
check_interface(graph, &IID_IGraphVersion, TRUE);
check_interface(graph, &IID_IMediaControl, TRUE);
check_interface(graph, &IID_IMediaEvent, TRUE);
- check_interface(graph, &IID_IMediaFilter, TRUE);
+ check_interface(graph, &IID_IMediaEventEx, TRUE);
check_interface(graph, &IID_IMediaEventSink, TRUE);
+ check_interface(graph, &IID_IMediaFilter, TRUE);
check_interface(graph, &IID_IMediaPosition, TRUE);
check_interface(graph, &IID_IMediaSeeking, TRUE);
check_interface(graph, &IID_IObjectWithSite, TRUE);
check_interface(graph, &IID_IVideoFrameStep, TRUE);
check_interface(graph, &IID_IVideoWindow, TRUE);
+ check_interface(graph, &IID_IUnknown, TRUE);
check_interface(graph, &IID_IBaseFilter, FALSE);
+ check_interface(graph, &IID_IDispatch, FALSE);
IFilterGraph2_Release(graph);
}
--
2.34.1
2
4
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
---
dlls/sane.ds/ui.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c
index 8be7ed42b70..e66526a088e 100644
--- a/dlls/sane.ds/ui.c
+++ b/dlls/sane.ds/ui.c
@@ -318,6 +318,7 @@ static int create_item(HDC hdc, const struct option_descriptor *opt,
if (trail_edit)
*count+=1;
+ free(trail_edit);
return leading_len + local_len + padding + padding2 + trail_len;
}
--
2.35.1
2
3
From: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
dlls/mf/copier.c | 4 ++--
dlls/mf/evr.c | 4 ++--
dlls/mf/main.c | 3 ++-
dlls/mf/sar.c | 7 ++++---
dlls/mf/session.c | 31 +++++++++++++++++--------------
dlls/mf/topology.c | 11 ++++++-----
6 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c
index b05ae3383ab..fe5664ee4c7 100644
--- a/dlls/mf/copier.c
+++ b/dlls/mf/copier.c
@@ -247,7 +247,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputAvailableType(IMFTransfor
return hr;
}
-static HRESULT sample_copier_get_buffer_size(IMFMediaType *type, DWORD *size)
+static HRESULT sample_copier_get_buffer_size(IMFMediaType *type, UINT32 *size)
{
GUID major, subtype;
UINT64 frame_size;
@@ -281,7 +281,7 @@ static HRESULT sample_copier_get_buffer_size(IMFMediaType *type, DWORD *size)
static HRESULT sample_copier_set_media_type(struct sample_copier *transform, BOOL input, DWORD id, IMFMediaType *type,
DWORD flags)
{
- DWORD buffer_size;
+ UINT32 buffer_size;
HRESULT hr = S_OK;
if (id)
diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index 9552990006d..5e8b559af04 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -1633,8 +1633,8 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer)
if (SUCCEEDED(hr))
{
- unsigned int input_count, output_count;
- unsigned int *ids, *oids;
+ DWORD input_count, output_count;
+ DWORD *ids, *oids;
size_t i;
/* Create stream sinks for inputs that mixer already has by default. */
diff --git a/dlls/mf/main.c b/dlls/mf/main.c
index acbb8377e52..50451170275 100644
--- a/dlls/mf/main.c
+++ b/dlls/mf/main.c
@@ -1072,10 +1072,11 @@ static int __cdecl qsort_string_compare(const void *a, const void *b)
static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int maxlen, PROPVARIANT *dst)
{
static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
- unsigned int capacity = 0, count, size;
+ unsigned int capacity = 0, count;
HRESULT hr = S_OK;
int i, index;
WCHAR *buffW;
+ DWORD size;
if (!(buffW = calloc(maxlen, sizeof(*buffW))))
return E_OUTOFMEMORY;
diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c
index f6f2b32dd2d..3c9bac90c9f 100644
--- a/dlls/mf/sar.c
+++ b/dlls/mf/sar.c
@@ -1493,7 +1493,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_IsMediaTypeSupported(IM
IMFMediaType *in_type, IMFMediaType **out_type)
{
struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface);
- unsigned int flags;
+ DWORD flags;
HRESULT hr;
TRACE("%p, %p, %p.\n", iface, in_type, out_type);
@@ -1618,8 +1618,8 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMF
struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface);
const unsigned int test_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES;
BOOL compare_result;
- unsigned int flags;
HRESULT hr = S_OK;
+ DWORD flags;
TRACE("%p, %p.\n", iface, media_type);
@@ -1777,11 +1777,12 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb
static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result)
{
- unsigned int src_frames, dst_frames, max_frames, pad_frames, src_len;
+ unsigned int src_frames, dst_frames, max_frames, pad_frames;
struct queued_object *obj, *obj2;
BOOL keep_sample = FALSE;
IMFMediaBuffer *buffer;
BYTE *dst, *src;
+ DWORD src_len;
HRESULT hr;
LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry)
diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 66009b1fff2..756ef381373 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -185,7 +185,7 @@ struct topo_node
struct
{
IMFMediaSource *source;
- unsigned int stream_id;
+ DWORD stream_id;
} source;
struct
{
@@ -197,11 +197,11 @@ struct topo_node
struct
{
struct transform_stream *inputs;
- unsigned int *input_map;
+ DWORD *input_map;
unsigned int input_count;
struct transform_stream *outputs;
- unsigned int *output_map;
+ DWORD *output_map;
unsigned int output_count;
} transform;
} u;
@@ -867,8 +867,9 @@ static void session_start(struct media_session *session, const GUID *time_format
static void session_set_started(struct media_session *session)
{
struct media_source *source;
- unsigned int caps, flags;
IMFMediaEvent *event;
+ unsigned int caps;
+ DWORD flags;
session->state = SESSION_STATE_STARTED;
@@ -1181,17 +1182,18 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology
return S_OK;
}
-static unsigned int transform_node_get_stream_id(struct topo_node *node, BOOL output, unsigned int index)
+static DWORD transform_node_get_stream_id(struct topo_node *node, BOOL output, unsigned int index)
{
- unsigned int *map = output ? node->u.transform.output_map : node->u.transform.input_map;
+ DWORD *map = output ? node->u.transform.output_map : node->u.transform.input_map;
return map ? map[index] : index;
}
static HRESULT session_set_transform_stream_info(struct topo_node *node)
{
- unsigned int *input_map = NULL, *output_map = NULL;
- unsigned int i, input_count, output_count, block_alignment;
+ DWORD *input_map = NULL, *output_map = NULL;
+ DWORD i, input_count, output_count;
struct transform_stream *streams;
+ unsigned int block_alignment;
IMFMediaType *media_type;
GUID major = { 0 };
HRESULT hr;
@@ -2132,7 +2134,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface,
struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface);
struct topo_node *topo_node;
IMFTopologyNode *upstream_node;
- unsigned int upstream_output;
+ DWORD upstream_output;
EnterCriticalSection(&session->cs);
@@ -2462,8 +2464,8 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
struct media_sink *sink;
enum object_state state;
struct topo_node *node;
- unsigned int i, count;
BOOL changed = FALSE;
+ DWORD i, count;
HRESULT hr;
if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID)
@@ -2668,10 +2670,11 @@ static struct sample *transform_create_sample(IMFSample *sample)
static HRESULT transform_get_external_output_sample(const struct media_session *session, struct topo_node *transform,
unsigned int output_index, const MFT_OUTPUT_STREAM_INFO *stream_info, IMFSample **sample)
{
- unsigned int buffer_size, downstream_input;
IMFTopologyNode *downstream_node;
IMFMediaBuffer *buffer = NULL;
struct topo_node *topo_node;
+ unsigned int buffer_size;
+ DWORD downstream_input;
TOPOID node_id;
HRESULT hr;
@@ -2713,9 +2716,9 @@ static HRESULT transform_node_pull_samples(const struct media_session *session,
MFT_OUTPUT_STREAM_INFO stream_info;
MFT_OUTPUT_DATA_BUFFER *buffers;
struct sample *queued_sample;
+ HRESULT hr = E_UNEXPECTED;
DWORD status = 0;
unsigned int i;
- HRESULT hr = E_UNEXPECTED;
if (!(buffers = calloc(node->u.transform.output_count, sizeof(*buffers))))
return E_OUTOFMEMORY;
@@ -2888,7 +2891,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop
static HRESULT session_request_sample_from_node(struct media_session *session, IMFTopologyNode *node, DWORD output)
{
IMFTopologyNode *downstream_node, *upstream_node;
- unsigned int downstream_input, upstream_output;
+ DWORD downstream_input, upstream_output;
struct topo_node *topo_node;
MF_TOPOLOGY_TYPE node_type;
struct sample *sample;
@@ -3537,8 +3540,8 @@ static HRESULT session_is_presentation_rate_supported(struct media_session *sess
struct media_source *source;
struct media_sink *sink;
float value = 0.0f, tmp;
- unsigned int flags;
HRESULT hr = S_OK;
+ DWORD flags;
if (!nearest_rate) nearest_rate = &tmp;
diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c
index f97c0cc75d3..8eb1b763e64 100644
--- a/dlls/mf/topology.c
+++ b/dlls/mf/topology.c
@@ -2381,8 +2381,9 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context
static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, unsigned int *layer_size)
{
IMFTopologyNode *downstream_node, *node, *orig_node;
- unsigned int input_index, size = 0;
MF_TOPOLOGY_TYPE node_type;
+ unsigned int size = 0;
+ DWORD input_index;
HRESULT hr = S_OK;
TOPOID id;
@@ -2444,7 +2445,7 @@ static BOOL topology_loader_is_node_d3d_aware(IMFTopologyNode *node)
return !!d3d_aware;
}
-static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, unsigned int upstream_output,
+static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, DWORD upstream_output,
IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform **copier)
{
IMFMediaType *input_type = NULL, *output_type = NULL;
@@ -2483,7 +2484,7 @@ static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, uns
}
static HRESULT topology_loader_connect_copier(struct topoloader_context *context, IMFTopologyNode *upstream_node,
- unsigned int upstream_output, IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform *copier)
+ DWORD upstream_output, IMFTopologyNode *downstream_node, DWORD downstream_input, IMFTransform *copier)
{
IMFTopologyNode *copier_node;
HRESULT hr;
@@ -2506,9 +2507,9 @@ static HRESULT topology_loader_connect_d3d_aware_input(struct topoloader_context
IMFTopologyNode *node)
{
IMFTopologyNode *upstream_node;
- unsigned int upstream_output;
- IMFStreamSink *stream_sink;
IMFTransform *copier = NULL;
+ IMFStreamSink *stream_sink;
+ DWORD upstream_output;
HRESULT hr;
if (FAILED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink)))
--
2.34.1
1
0