- wine-devel - winehq.org

[PATCH v6 0/4] Fix sock_recv reordering issue (#52401): unknown_status + wineserver call approach
by Jinoh Kang 17 Feb '22

17 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 - v4 -> v5: address review comments - v5 -> v6: address review comments (mostly cosmetic), drop RFC status [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 (4): server: Allow calling async_handoff() with status code STATUS_ALERTED. 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 | 36 +++++++++-------- dlls/ntdll/unix/sync.c | 26 ++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ws2_32/tests/sock.c | 8 ++-- server/async.c | 72 ++++++++++++++++++++++++++++++++++ server/protocol.def | 14 ++++++- server/sock.c | 47 +++++++++++----------- 7 files changed, 159 insertions(+), 45 deletions(-) -- 2.34.1

4 11

[PATCH] xinput1_3: Fix the spelling of a WARN() message.
by Francois Gouget 17 Feb '22

17 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/xinput1_3/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 8c21f090af2..909ef9e7dfd 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -520,7 +520,7 @@ static BOOL try_add_device(const WCHAR *device_path) caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); else if (device_is_overridden(device)) - WARN("ignoring HID device, overriden for dinput\n"); + WARN("ignoring HID device, overridden for dinput\n"); else if (!controller_init(&controllers[i], preparsed, &caps, device, device_path)) WARN("ignoring HID device, failed to initialize\n"); else -- 2.30.2

3 2

[tools 1/2] testbot/LibvirtTool: Split off Halt() from ShutDown().
by Francois Gouget 17 Feb '22

17 Feb '22

Halt() does not wait for the VM to be powered off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f714e48545..44b4e4950f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -280,6 +280,21 @@ sub GetPrivilegedTA($) return $TA->SetTime() ? $TA : $VM->GetAgent(1); } +sub Halt() +{ + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running: @$Cmd\n"); + my $PTA = GetPrivilegedTA($VM->GetAgent()); + if (!$PTA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; + return 0; + } + return 1; +} + =pod =over 12 @@ -305,16 +320,7 @@ sub ShutDownIfOffSnapshot() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; - my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : - ["/sbin/shutdown", "--poweroff", "now"]; - Debug(Elapsed($Start), " Running @$Cmd\n"); - my $PTA = GetPrivilegedTA($VM->GetAgent()); - if (!$PTA->Run($Cmd, 0)) - { - Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; - return 0; - } + return 0 if (!Halt()); Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); my $Deadline = time() + $WaitForShutdown; -- 2.30.2

1 1

[PATCH] ncrypt: Add a trailing linefeed to ERR() messages.
by Francois Gouget 17 Feb '22

17 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/ncrypt/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6b1a87ea785..a9735ff0469 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -319,7 +319,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n { if (!(object->properties = malloc(sizeof(*property)))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); return NTE_NO_MEMORY; } object->num_properties++; @@ -329,7 +329,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n struct object_property *tmp; if (!(tmp = realloc(object->properties, sizeof(*property) * object->num_properties + 1))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); return NTE_NO_MEMORY; } object->properties = tmp; @@ -339,7 +339,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n memset(property, 0, sizeof(*property)); if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); return NTE_NO_MEMORY; } @@ -347,7 +347,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n property->value_size = value_size; if (!(property->value = malloc(value_size))) { - ERR("Error allocating memory."); + ERR("Error allocating memory.\n"); free(property->key); property->key = NULL; return NTE_NO_MEMORY; -- 2.30.2

1 0

[PATCH v3 1/5] winepulse.drv: Expose audio devices to the application.
by Gabriel Ivăncescu 17 Feb '22

17 Feb '22

This exposes the actual devices (and virtual sinks/sources) as reported by PulseAudio to an application, allowing it to select the devices itself and, for example, record from (or render to) two devices at the same time. The "PulseAudio" device (which is movable) is still the default, as before, with the same GUID to preserve compatibility with existing setups. Based on a patch by Mark Harmstone <mark(a)harmstone.com>, with changes by Sebastian Lackner <sebastian(a)fds-team.de>. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winepulse.drv/mmdevdrv.c | 212 ++++++++++++++++++++++++++++------ dlls/winepulse.drv/pulse.c | 138 ++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 13 +++ 3 files changed, 319 insertions(+), 44 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index e3d5ea9..ac5f0a5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -69,6 +69,8 @@ static GUID pulse_render_guid = static GUID pulse_capture_guid = { 0x25da76d0, 0x033c, 0x4235, { 0x90, 0x02, 0x19, 0xf4, 0x88, 0x94, 0xac, 0x6f } }; +static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winepulse.drv\\devices"; + static CRITICAL_SECTION session_cs; static CRITICAL_SECTION_DEBUG session_cs_debug = { 0, 0, &session_cs, @@ -145,9 +147,9 @@ struct ACImpl { AudioSession *session; AudioSessionWrapper *session_wrapper; -}; -static const WCHAR defaultW[] = L"PulseAudio"; + char pulse_name[0]; +}; static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; @@ -267,39 +269,115 @@ static void set_stream_volumes(ACImpl *This) pulse_call(set_volumes, &params); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, - UINT *num, UINT *def_index) +static void get_device_guid(HKEY drv_key, EDataFlow flow, const WCHAR *pulse_name, GUID *guid) { - WCHAR *id; + WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; + DWORD type, size = sizeof(*guid); + LSTATUS status; + HKEY dev_key; - TRACE("%d %p %p %p\n", flow, ids, num, def_index); + if (!pulse_name[0]) { + *guid = (flow == eRender) ? pulse_render_guid : pulse_capture_guid; + return; + } - *num = 1; - *def_index = 0; + if (!drv_key) { + CoCreateGuid(guid); + return; + } - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(**ids)); - *keys = NULL; - if (!*ids) - return E_OUTOFMEMORY; + key_name[0] = (flow == eRender) ? '0' : '1'; + key_name[1] = ','; + wcscpy(key_name + 2, pulse_name); - (*ids)[0] = id = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(**keys)); - if (!*keys || !id) { - HeapFree(GetProcessHeap(), 0, id); - HeapFree(GetProcessHeap(), 0, *keys); - HeapFree(GetProcessHeap(), 0, *ids); - *ids = NULL; - *keys = NULL; - return E_OUTOFMEMORY; + status = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_READ | KEY_WRITE | KEY_WOW64_64KEY, + NULL, &dev_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open registry key for device %s: %u\n", debugstr_w(pulse_name), status); + CoCreateGuid(guid); + return; } - memcpy(id, defaultW, sizeof(defaultW)); - if (flow == eRender) - (*keys)[0] = pulse_render_guid; - else - (*keys)[0] = pulse_capture_guid; + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)guid, &size); + if (status != ERROR_SUCCESS || type != REG_BINARY || size != sizeof(*guid)) { + CoCreateGuid(guid); + status = RegSetValueExW(dev_key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(*guid)); + if (status != ERROR_SUCCESS) + ERR("Failed to store device GUID for %s to registry: %u\n", debugstr_w(pulse_name), status); + } + RegCloseKey(dev_key); +} - return S_OK; +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **keys, + UINT *num, UINT *def_index) +{ + struct get_endpoint_ids_params params; + GUID *guids = NULL; + WCHAR **ids = NULL; + unsigned int i = 0; + LSTATUS status; + DWORD name_len; + HKEY drv_key; + WCHAR *p; + + TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); + + params.flow = flow; + params.size = MAX_PULSE_NAME_LEN * 4; + params.device_strings = NULL; + do { + HeapFree(GetProcessHeap(), 0, params.device_strings); + params.device_strings = HeapAlloc(GetProcessHeap(), 0, params.size); + pulse_call(get_endpoint_ids, &params); + } while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if (FAILED(params.result)) + goto end; + + ids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if (!ids || !guids) { + params.result = E_OUTOFMEMORY; + goto end; + } + + status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, + KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open devices registry key: %u\n", status); + drv_key = NULL; + } + + /* straight sequence of (pulse_name+friendly name) pairs of NUL terminated strings */ + p = params.device_strings; + for (i = 0; i < params.num; i++) { + get_device_guid(drv_key, flow, p, &guids[i]); + p += wcslen(p) + 1; /* skip pulse_name */ + + name_len = wcslen(p) + 1; + if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, name_len * sizeof(WCHAR)))) { + params.result = E_OUTOFMEMORY; + break; + } + memcpy(ids[i], p, name_len * sizeof(WCHAR)); + p += name_len; + } + if (drv_key) + RegCloseKey(drv_key); + +end: + HeapFree(GetProcessHeap(), 0, params.device_strings); + if (FAILED(params.result)) { + HeapFree(GetProcessHeap(), 0, guids); + while (i--) HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); + } else { + *ids_out = ids; + *keys = guids; + *num = params.num; + *def_index = 0; + } + return params.result; } int WINAPI AUDDRV_GetPriority(void) @@ -314,23 +392,87 @@ int WINAPI AUDDRV_GetPriority(void) return SUCCEEDED(params.result) ? Priority_Preferred : Priority_Unavailable; } +static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_NAME_LEN], EDataFlow *flow) +{ + WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; + DWORD key_name_size; + DWORD index = 0; + HKEY key; + + /* Return empty string for default PulseAudio device */ + pulse_name[0] = 0; + if (IsEqualGUID(guid, &pulse_render_guid)) { + *flow = eRender; + return TRUE; + } else if (IsEqualGUID(guid, &pulse_capture_guid)) { + *flow = eCapture; + return TRUE; + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_READ | KEY_WOW64_64KEY, &key) != ERROR_SUCCESS) { + WARN("No devices found in registry\n"); + return FALSE; + } + + for (;;) { + DWORD size, type; + LSTATUS status; + GUID reg_guid; + HKEY dev_key; + + key_name_size = ARRAY_SIZE(key_name); + if (RegEnumKeyExW(key, index++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if (RegOpenKeyExW(key, key_name, 0, KEY_READ | KEY_WOW64_64KEY, &dev_key) != ERROR_SUCCESS) { + ERR("Couldn't open key: %s\n", wine_dbgstr_w(key_name)); + continue; + } + + size = sizeof(reg_guid); + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE *)&reg_guid, &size); + RegCloseKey(dev_key); + + if (status == ERROR_SUCCESS && type == REG_BINARY && size == sizeof(reg_guid) && IsEqualGUID(&reg_guid, guid)) { + RegCloseKey(key); + + TRACE("Found matching device key: %s\n", wine_dbgstr_w(key_name)); + + if (key_name[0] == '0') + *flow = eRender; + else if (key_name[0] == '1') + *flow = eCapture; + else { + WARN("Unknown device type: %c\n", key_name[0]); + return FALSE; + } + + return WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, pulse_name, MAX_PULSE_NAME_LEN, NULL, NULL); + } + } + + RegCloseKey(key); + WARN("No matching device in registry for GUID %s\n", debugstr_guid(guid)); + return FALSE; +} + HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; + char pulse_name[MAX_PULSE_NAME_LEN]; EDataFlow dataflow; + unsigned len; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - if (IsEqualGUID(guid, &pulse_render_guid)) - dataflow = eRender; - else if (IsEqualGUID(guid, &pulse_capture_guid)) - dataflow = eCapture; - else - return E_UNEXPECTED; + + if (!get_pulse_name_by_guid(guid, pulse_name, &dataflow)) + return AUDCLNT_E_DEVICE_INVALIDATED; *out = NULL; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + len = strlen(pulse_name) + 1; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(ACImpl, pulse_name[len])); if (!This) return E_OUTOFMEMORY; @@ -342,6 +484,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; This->dataflow = dataflow; This->parent = dev; + memcpy(This->pulse_name, pulse_name, len); hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); if (FAILED(hr)) { @@ -609,6 +752,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } params.name = name = get_application_name(); + params.pulse_name = This->pulse_name; params.dataflow = This->dataflow; params.mode = mode; params.flags = flags; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 3e65936..724b444 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -81,6 +81,12 @@ typedef struct _ACPacket UINT32 discont; } ACPacket; +typedef struct _PhysDevice { + struct list entry; + WCHAR *name; + char pulse_name[0]; +} PhysDevice; + static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; @@ -89,6 +95,8 @@ static WAVEFORMATEXTENSIBLE pulse_fmt[2]; static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; static UINT g_phys_speakers_mask = 0; +static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); +static struct list g_phys_sources = LIST_INIT(g_phys_sources); static const REFERENCE_TIME MinimumPeriod = 30000; static const REFERENCE_TIME DefaultPeriod = 100000; @@ -128,6 +136,20 @@ static void dump_attr(const pa_buffer_attr *attr) TRACE("prebuf: %u\n", attr->prebuf); } +static void free_phys_device_lists(void) +{ + static struct list *const lists[] = { &g_phys_speakers, &g_phys_sources, NULL }; + struct list *const *list = lists; + PhysDevice *dev, *dev_next; + + do { + LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, *list, PhysDevice, entry) { + free(dev->name); + free(dev); + } + } while (*(++list)); +} + /* copied from kernelbase */ static int muldiv(int a, int b, int c) { @@ -190,6 +212,7 @@ static NTSTATUS pulse_process_attach(void *args) static NTSTATUS pulse_process_detach(void *args) { + free_phys_device_lists(); if (pulse_ctx) { pa_context_disconnect(pulse_ctx); @@ -215,6 +238,42 @@ static NTSTATUS pulse_main_loop(void *args) return STATUS_SUCCESS; } +static NTSTATUS pulse_get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; + WCHAR pulse_name[MAX_PULSE_NAME_LEN]; + WCHAR *p = params->device_strings; + DWORD len, name_len, needed = 0; + PhysDevice *dev; + + /* params->num is the number of devices returned. Each returned device is a pair of + pulse_name followed by its friendly name, both NUL terminated, one after another. + The next device immediately follows as another two NUL terminated strings, etc. */ + params->num = 0; + LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { + if (!(len = ntdll_umbstowcs(dev->pulse_name, strlen(dev->pulse_name) + 1, pulse_name, ARRAY_SIZE(pulse_name)))) + continue; + name_len = lstrlenW(dev->name) + 1; + + needed += (len + name_len) * sizeof(WCHAR); + if (needed <= params->size) { + memcpy(p, pulse_name, len * sizeof(WCHAR)); + p += len; + memcpy(p, dev->name, name_len * sizeof(WCHAR)); + p += name_len; + } + params->num++; + } + + if (needed > params->size) { + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + return STATUS_SUCCESS; +} + static void pulse_contextcallback(pa_context *c, void *userdata) { switch (pa_context_get_state(c)) { @@ -357,12 +416,49 @@ static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } -/* For default PulseAudio render device, OR together all of the - * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ +static void pulse_add_device(struct list *list, const char *pulse_name, const char *name) +{ + DWORD len = strlen(pulse_name), name_len = strlen(name); + PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); + WCHAR *wname; + + if (!dev) + return; + + if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + free(dev); + return; + } + + if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || + !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { + free(wname); + free(dev); + return; + } + dev->name[name_len] = 0; + memcpy(dev->pulse_name, pulse_name, len + 1); + + list_add_tail(list, &dev->entry); +} + static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { - if (i) - g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + if (!i || !i->name || !i->name[0]) + return; + + /* For default PulseAudio render device, OR together all of the + * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ + g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + + pulse_add_device(&g_phys_speakers, i->name, i->description); +} + +static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata) +{ + if (!i || !i->name || !i->name[0]) + return; + pulse_add_device(&g_phys_sources, i->name, i->description); } /* For most hardware on Windows, users must choose a configuration with an even @@ -579,7 +675,14 @@ static NTSTATUS pulse_test_connect(void *args) pulse_probe_settings(1, &pulse_fmt[0]); pulse_probe_settings(0, &pulse_fmt[1]); + free_phys_device_lists(); + list_init(&g_phys_speakers); + list_init(&g_phys_sources); g_phys_speakers_mask = 0; + + pulse_add_device(&g_phys_speakers, "", "PulseAudio"); + pulse_add_device(&g_phys_sources, "", "PulseAudio"); + o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); if (o) { while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && @@ -588,6 +691,14 @@ static NTSTATUS pulse_test_connect(void *args) pa_operation_unref(o); } + o = pa_context_get_source_info_list(pulse_ctx, &pulse_phys_sources_cb, NULL); + if (o) { + while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && + pa_operation_get_state(o) == PA_OPERATION_RUNNING) + {} + pa_operation_unref(o); + } + pa_context_unref(pulse_ctx); pulse_ctx = NULL; pa_mainloop_free(pulse_ml); @@ -771,8 +882,9 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV return S_OK; } -static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_bytes) +static HRESULT pulse_stream_connect(struct pulse_stream *stream, const char *pulse_name, UINT32 period_bytes) { + pa_stream_flags_t flags = PA_STREAM_START_CORKED | PA_STREAM_START_UNMUTED | PA_STREAM_ADJUST_LATENCY; int ret; char buffer[64]; static LONG number; @@ -797,12 +909,17 @@ static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_b attr.maxlength = stream->bufsize_frames * pa_frame_size(&stream->ss); attr.prebuf = pa_frame_size(&stream->ss); dump_attr(&attr); + + /* If specific device was requested, use it exactly */ + if (pulse_name[0]) + flags |= PA_STREAM_DONT_MOVE; + else + pulse_name = NULL; /* use default */ + if (stream->dataflow == eRender) - ret = pa_stream_connect_playback(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY, NULL, NULL); + ret = pa_stream_connect_playback(stream->stream, pulse_name, &attr, flags, NULL, NULL); else - ret = pa_stream_connect_record(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY); + ret = pa_stream_connect_record(stream->stream, pulse_name, &attr, flags); if (ret < 0) { WARN("Returns %i\n", ret); return AUDCLNT_E_ENDPOINT_CREATE_FAILED; @@ -864,7 +981,7 @@ static NTSTATUS pulse_create_stream(void *args) stream->share = params->mode; stream->flags = params->flags; - hr = pulse_stream_connect(stream, stream->period_bytes); + hr = pulse_stream_connect(stream, params->pulse_name, stream->period_bytes); if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); @@ -1967,6 +2084,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_process_attach, pulse_process_detach, pulse_main_loop, + pulse_get_endpoint_ids, pulse_create_stream, pulse_release_stream, pulse_start, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index d28a73c..0afd0ef 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -19,6 +19,8 @@ #include "wine/list.h" #include "wine/unixlib.h" +#define MAX_PULSE_NAME_LEN 256 + struct pulse_stream; struct pulse_config @@ -37,9 +39,19 @@ struct main_loop_params HANDLE event; }; +struct get_endpoint_ids_params +{ + EDataFlow flow; + DWORD size; + WCHAR *device_strings; + HRESULT result; + unsigned int num; +}; + struct create_stream_params { const char *name; + const char *pulse_name; EDataFlow dataflow; AUDCLNT_SHAREMODE mode; DWORD flags; @@ -191,6 +203,7 @@ enum unix_funcs process_attach, process_detach, main_loop, + get_endpoint_ids, create_stream, release_stream, start, -- 2.34.1

2 6

[PATCH 1/5] ddraw: Filter out redundant discard maps.
by Zebediah Figura 17 Feb '22

17 Feb '22

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 4 ++++ dlls/ddraw/vertexbuffer.c | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7929e9e1795..0c2a491d45b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -22,6 +22,7 @@ #include <assert.h> #include <limits.h> #include <math.h> +#include <stdbool.h> #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -598,6 +599,7 @@ struct d3d_vertex_buffer DWORD fvf; DWORD size; BOOL dynamic; + bool discarded; }; HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6e8f109173b..860dffc5045 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4293,6 +4293,8 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE return D3D_OK; } + vb_impl->discarded = false; + stride = get_flexible_vertex_size(vb_impl->fvf); if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) @@ -4412,6 +4414,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return D3D_OK; } + vb_impl->discarded = false; + if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) { TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawIndexedPrimitive().\n"); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index dd35b445cc5..fa0e4f4c41a 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -159,10 +159,14 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, if (buffer->version != 7) flags &= ~(DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS); + if (buffer->discarded) + flags &= ~DDLOCK_DISCARDCONTENTS; + if (!(flags & DDLOCK_WAIT)) flags |= DDLOCK_DONOTWAIT; if (flags & DDLOCK_DISCARDCONTENTS) { + buffer->discarded = true; if (!buffer->dynamic) { struct wined3d_buffer *new_buffer; -- 2.34.1

5 11

[PATCH 5/5] win32u: Move primary palette handling from user32.
by Jacek Caban 17 Feb '22

17 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 72 ++---------------------------------- dlls/win32u/ntuser_private.h | 1 + dlls/win32u/palette.c | 26 ++++++++++++- 3 files changed, 29 insertions(+), 70 deletions(-)

2 1

[PATCH 4/5] win32u: Move NtUserGetForegroundWindow implementation from user32.
by Jacek Caban 17 Feb '22

17 Feb '22

2 1

[PATCH 3/5] win32u: Set user callbacks from user32 DllMain.
by Jacek Caban 17 Feb '22

17 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 11 ++++++ dlls/win32u/driver.c | 12 +----- dlls/win32u/ntuser_private.h | 9 +++++ dlls/win32u/palette.c | 11 +----- dlls/win32u/region.c | 7 +--- dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u_private.h | 9 ----- dlls/win32u/wrappers.c | 73 +----------------------------------- include/ntuser.h | 1 + 9 files changed, 28 insertions(+), 107 deletions(-)

2 1

[PATCH 2/5] gdi32: Link directly to user32.
by Jacek Caban 17 Feb '22

17 Feb '22

On Windows, loading gdi32.dll causes user32.dll to be loaded. It's important for win32u, which is not fully functional until user32 sets KernelCallbackTable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/objects.c | 25 ++++--------------------- 2 files changed, 5 insertions(+), 22 deletions(-)

2 1

[PATCH 1/5] user32: Delay load setupapi.
by Jacek Caban 17 Feb '22

17 Feb '22

This reverts 50aeb5e777d9a8836f5530755afab10e042c623f. Previously problematic code is now moved to win32u and doesn't use setupapi. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 8/8] winealsa: Use the stream ptr to indicate the init state.
by Huw Davies 17 Feb '22

17 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 10f2951a0e6..48694710719 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -109,8 +109,6 @@ struct ACImpl { UINT32 channel_count; struct alsa_stream *stream; - BOOL initted; - HANDLE timer; CRITICAL_SECTION lock; @@ -578,7 +576,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - if(This->initted){ + if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); @@ -969,7 +967,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); - if(This->initted){ + if(This->stream){ LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; @@ -1201,7 +1199,6 @@ exit: This->vols = NULL; }else{ This->stream = stream; - This->initted = TRUE; } LeaveCriticalSection(&This->lock); @@ -1223,7 +1220,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1248,7 +1245,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1282,7 +1279,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1873,7 +1870,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1942,7 +1939,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1971,7 +1968,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -2023,7 +2020,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -2059,7 +2056,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } -- 2.25.1

2 1

[PATCH 7/8] winealsa: Move the stream creation to AudioClient_Initialize().
by Huw Davies 17 Feb '22

17 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 56 ++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8a80acd871a..10f2951a0e6 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -507,19 +507,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->dataflow = dataflow; memcpy(This->alsa_name, alsa_name, len + 1); - This->stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); - if(!This->stream){ - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } - - hr = alsa_open_device(alsa_name, dataflow, &This->stream->pcm_handle, &This->stream->hw_params); - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, This->stream); - HeapFree(GetProcessHeap(), 0, This); - return hr; - } - InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ACImpl.lock"); @@ -591,21 +578,23 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - snd_pcm_drop(stream->pcm_handle); - snd_pcm_close(stream->pcm_handle); if(This->initted){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); - HeapFree(GetProcessHeap(), 0, stream->remapping_buf); - HeapFree(GetProcessHeap(), 0, stream->silence_buf); - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - HeapFree(GetProcessHeap(), 0, stream->hw_params); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); + if (stream){ + snd_pcm_drop(stream->pcm_handle); + snd_pcm_close(stream->pcm_handle); + HeapFree(GetProcessHeap(), 0, stream->local_buffer); + HeapFree(GetProcessHeap(), 0, stream->remapping_buf); + HeapFree(GetProcessHeap(), 0, stream->silence_buf); + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + HeapFree(GetProcessHeap(), 0, stream->hw_params); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); + } HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -919,7 +908,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct alsa_stream *stream; snd_pcm_sw_params_t *sw_params = NULL; snd_pcm_format_t format; unsigned int rate, alsa_period_us; @@ -988,6 +977,20 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, dump_fmt(fmt); + stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); + if(!stream){ + LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); + return E_OUTOFMEMORY; + } + + hr = alsa_open_device(This->alsa_name, This->dataflow, &stream->pcm_handle, &stream->hw_params); + if(FAILED(hr)){ + LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); + return hr; + } + stream->need_remapping = map_channels(This, fmt, &stream->alsa_channels, stream->alsa_channel_map) == S_OK; if((err = snd_pcm_hw_params_any(stream->pcm_handle, stream->hw_params)) < 0){ @@ -1180,8 +1183,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - This->initted = TRUE; - TRACE("ALSA period: %lu frames\n", stream->alsa_period_frames); TRACE("ALSA buffer: %lu frames\n", stream->alsa_bufsize_frames); TRACE("MMDevice period: %u frames\n", stream->mmdev_period_frames); @@ -1190,12 +1191,17 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, exit: HeapFree(GetProcessHeap(), 0, sw_params); if(FAILED(hr)){ + snd_pcm_close(stream->pcm_handle); HeapFree(GetProcessHeap(), 0, stream->local_buffer); stream->local_buffer = NULL; CoTaskMemFree(stream->fmt); stream->fmt = NULL; + HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; + }else{ + This->stream = stream; + This->initted = TRUE; } LeaveCriticalSection(&This->lock); -- 2.25.1

2 1

[PATCH 6/8] winealsa: Move is_format_supported to the unixlib.
by Huw Davies 17 Feb '22

17 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 291 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 150 ++---------------- dlls/winealsa.drv/unixlib.h | 11 ++ 3 files changed, 317 insertions(+), 135 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 320d676effb..0680383f59b 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -453,6 +453,27 @@ static NTSTATUS get_endpoint_ids(void *args) return STATUS_SUCCESS; } +static WAVEFORMATEXTENSIBLE *clone_format(const WAVEFORMATEX *fmt) +{ + WAVEFORMATEXTENSIBLE *ret; + size_t size; + + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + size = sizeof(WAVEFORMATEXTENSIBLE); + else + size = sizeof(WAVEFORMATEX); + + ret = malloc(size); + if(!ret) + return NULL; + + memcpy(ret, fmt, size); + + ret->Format.cbSize = size - sizeof(WAVEFORMATEX); + + return ret; +} + static HRESULT alsa_open_device(const char *alsa_name, EDataFlow flow, snd_pcm_t **pcm_handle, snd_pcm_hw_params_t **hw_params) { @@ -486,6 +507,78 @@ static HRESULT alsa_open_device(const char *alsa_name, EDataFlow flow, snd_pcm_t return S_OK; } +static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt) +{ + snd_pcm_format_t format = SND_PCM_FORMAT_UNKNOWN; + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + + if(fmt->wFormatTag == WAVE_FORMAT_PCM || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + if(fmt->wBitsPerSample == 8) + format = SND_PCM_FORMAT_U8; + else if(fmt->wBitsPerSample == 16) + format = SND_PCM_FORMAT_S16_LE; + else if(fmt->wBitsPerSample == 24) + format = SND_PCM_FORMAT_S24_3LE; + else if(fmt->wBitsPerSample == 32) + format = SND_PCM_FORMAT_S32_LE; + else + WARN("Unsupported bit depth: %u\n", fmt->wBitsPerSample); + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmt->wBitsPerSample != fmtex->Samples.wValidBitsPerSample){ + if(fmtex->Samples.wValidBitsPerSample == 20 && fmt->wBitsPerSample == 24) + format = SND_PCM_FORMAT_S20_3LE; + else + WARN("Unsupported ValidBits: %u\n", fmtex->Samples.wValidBitsPerSample); + } + }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ + if(fmt->wBitsPerSample == 32) + format = SND_PCM_FORMAT_FLOAT_LE; + else if(fmt->wBitsPerSample == 64) + format = SND_PCM_FORMAT_FLOAT64_LE; + else + WARN("Unsupported float size: %u\n", fmt->wBitsPerSample); + }else + WARN("Unknown wave format: %04x\n", fmt->wFormatTag); + return format; +} + +static int alsa_channel_index(DWORD flag) +{ + switch(flag){ + case SPEAKER_FRONT_LEFT: + return 0; + case SPEAKER_FRONT_RIGHT: + return 1; + case SPEAKER_BACK_LEFT: + return 2; + case SPEAKER_BACK_RIGHT: + return 3; + case SPEAKER_FRONT_CENTER: + return 4; + case SPEAKER_LOW_FREQUENCY: + return 5; + case SPEAKER_SIDE_LEFT: + return 6; + case SPEAKER_SIDE_RIGHT: + return 7; + } + return -1; +} + +static BOOL need_remapping(const WAVEFORMATEX *fmt, int *map) +{ + unsigned int i; + for(i = 0; i < fmt->nChannels; ++i){ + if(map[i] != i) + return TRUE; + } + return FALSE; +} + static DWORD get_channel_mask(unsigned int channels) { switch(channels){ @@ -512,6 +605,203 @@ static DWORD get_channel_mask(unsigned int channels) return 0; } +static HRESULT map_channels(EDataFlow flow, const WAVEFORMATEX *fmt, int *alsa_channels, int *map) +{ + BOOL need_remap; + + if(flow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){ + WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; + DWORD mask, flag = SPEAKER_FRONT_LEFT; + UINT i = 0; + + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0) + mask = fmtex->dwChannelMask; + else + mask = get_channel_mask(fmt->nChannels); + + *alsa_channels = 0; + + while(i < fmt->nChannels && !(flag & SPEAKER_RESERVED)){ + if(mask & flag){ + map[i] = alsa_channel_index(flag); + TRACE("Mapping mmdevapi channel %u (0x%x) to ALSA channel %d\n", + i, flag, map[i]); + if(map[i] >= *alsa_channels) + *alsa_channels = map[i] + 1; + ++i; + } + flag <<= 1; + } + + while(i < fmt->nChannels){ + map[i] = *alsa_channels; + TRACE("Mapping mmdevapi channel %u to ALSA channel %d\n", + i, map[i]); + ++*alsa_channels; + ++i; + } + + for(i = 0; i < fmt->nChannels; ++i){ + if(map[i] == -1){ + map[i] = *alsa_channels; + ++*alsa_channels; + TRACE("Remapping mmdevapi channel %u to ALSA channel %d\n", + i, map[i]); + } + } + + need_remap = need_remapping(fmt, map); + }else{ + *alsa_channels = fmt->nChannels; + + need_remap = FALSE; + } + + TRACE("need_remapping: %u, alsa_channels: %d\n", need_remap, *alsa_channels); + + return need_remap ? S_OK : S_FALSE; +} + +static NTSTATUS is_format_supported(void *args) +{ + struct is_format_supported_params *params = args; + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)params->fmt_in; + snd_pcm_t *pcm_handle; + snd_pcm_hw_params_t *hw_params; + snd_pcm_format_mask_t *formats = NULL; + snd_pcm_format_t format; + WAVEFORMATEXTENSIBLE *closest = NULL; + unsigned int max = 0, min = 0; + int err; + int alsa_channels, alsa_channel_map[32]; + + params->result = S_OK; + + if(!params->fmt_in || (params->share == AUDCLNT_SHAREMODE_SHARED && !params->fmt_out)) + params->result = E_POINTER; + else if(params->share != AUDCLNT_SHAREMODE_SHARED && params->share != AUDCLNT_SHAREMODE_EXCLUSIVE) + params->result = E_INVALIDARG; + else if(params->fmt_in->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(params->fmt_in->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) + params->result = E_INVALIDARG; + else if(params->fmt_in->nAvgBytesPerSec == 0 || params->fmt_in->nBlockAlign == 0 || + (fmtex->Samples.wValidBitsPerSample > params->fmt_in->wBitsPerSample)) + params->result = E_INVALIDARG; + } + if(FAILED(params->result)) + return STATUS_SUCCESS; + + if(params->fmt_in->nChannels == 0){ + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + return STATUS_SUCCESS; + } + + params->result = alsa_open_device(params->alsa_name, params->flow, &pcm_handle, &hw_params); + if(FAILED(params->result)) + return STATUS_SUCCESS; + + if((err = snd_pcm_hw_params_any(pcm_handle, hw_params)) < 0){ + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + goto exit; + } + + formats = calloc(1, snd_pcm_format_mask_sizeof()); + if(!formats){ + params->result = E_OUTOFMEMORY; + goto exit; + } + + snd_pcm_hw_params_get_format_mask(hw_params, formats); + format = alsa_format(params->fmt_in); + if (format == SND_PCM_FORMAT_UNKNOWN || + !snd_pcm_format_mask_test(formats, format)){ + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + goto exit; + } + + closest = clone_format(params->fmt_in); + if(!closest){ + params->result = E_OUTOFMEMORY; + goto exit; + } + + if((err = snd_pcm_hw_params_get_rate_min(hw_params, &min, NULL)) < 0){ + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + WARN("Unable to get min rate: %d (%s)\n", err, snd_strerror(err)); + goto exit; + } + + if((err = snd_pcm_hw_params_get_rate_max(hw_params, &max, NULL)) < 0){ + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); + goto exit; + } + + if(params->fmt_in->nSamplesPerSec < min || params->fmt_in->nSamplesPerSec > max){ + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + goto exit; + } + + if((err = snd_pcm_hw_params_get_channels_min(hw_params, &min)) < 0){ + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + WARN("Unable to get min channels: %d (%s)\n", err, snd_strerror(err)); + goto exit; + } + + if((err = snd_pcm_hw_params_get_channels_max(hw_params, &max)) < 0){ + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); + goto exit; + } + if(params->fmt_in->nChannels > max){ + params->result = S_FALSE; + closest->Format.nChannels = max; + }else if(params->fmt_in->nChannels < min){ + params->result = S_FALSE; + closest->Format.nChannels = min; + } + + map_channels(params->flow, params->fmt_in, &alsa_channels, alsa_channel_map); + + if(alsa_channels > max){ + params->result = S_FALSE; + closest->Format.nChannels = max; + } + + if(closest->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + closest->dwChannelMask = get_channel_mask(closest->Format.nChannels); + + if(params->fmt_in->nBlockAlign != params->fmt_in->nChannels * params->fmt_in->wBitsPerSample / 8 || + params->fmt_in->nAvgBytesPerSec != params->fmt_in->nBlockAlign * params->fmt_in->nSamplesPerSec || + (params->fmt_in->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->Samples.wValidBitsPerSample < params->fmt_in->wBitsPerSample)) + params->result = S_FALSE; + + if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE && params->fmt_in->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED) + params->result = S_FALSE; + } + +exit: + if(params->result == S_FALSE && !params->fmt_out) + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + + if(params->result == S_FALSE && params->fmt_out) { + closest->Format.nBlockAlign = closest->Format.nChannels * closest->Format.wBitsPerSample / 8; + closest->Format.nAvgBytesPerSec = closest->Format.nBlockAlign * closest->Format.nSamplesPerSec; + if(closest->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + closest->Samples.wValidBitsPerSample = closest->Format.wBitsPerSample; + memcpy(params->fmt_out, closest, closest->Format.cbSize); + } + free(closest); + free(formats); + free(hw_params); + snd_pcm_close(pcm_handle); + + return STATUS_SUCCESS; +} + static NTSTATUS get_mix_format(void *args) { struct get_mix_format_params *params = args; @@ -632,5 +922,6 @@ exit: unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, + is_format_supported, get_mix_format, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 24c6755d697..8a80acd871a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1296,150 +1296,30 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, WAVEFORMATEX **out) { ACImpl *This = impl_from_IAudioClient3(iface); - snd_pcm_format_mask_t *formats = NULL; - snd_pcm_format_t format; - HRESULT hr = S_OK; - WAVEFORMATEX *closest = NULL; - unsigned int max = 0, min = 0; - int err; - int alsa_channels, alsa_channel_map[32]; + struct is_format_supported_params params; TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); + if(fmt) dump_fmt(fmt); - if(!fmt || (mode == AUDCLNT_SHAREMODE_SHARED && !out)) - return E_POINTER; - - if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return E_INVALIDARG; - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmt->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - - dump_fmt(fmt); + params.alsa_name = This->alsa_name; + params.flow = This->dataflow; + params.share = mode; + params.fmt_in = fmt; + params.fmt_out = NULL; if(out){ *out = NULL; - if(mode != AUDCLNT_SHAREMODE_SHARED) - out = NULL; + if(mode == AUDCLNT_SHAREMODE_SHARED) + params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out)); } + ALSA_CALL(is_format_supported, &params); - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - (fmt->nAvgBytesPerSec == 0 || - fmt->nBlockAlign == 0 || - ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample > fmt->wBitsPerSample)) - return E_INVALIDARG; - - if(fmt->nChannels == 0) - return AUDCLNT_E_UNSUPPORTED_FORMAT; - - EnterCriticalSection(&This->lock); - - if((err = snd_pcm_hw_params_any(This->stream->pcm_handle, This->stream->hw_params)) < 0){ - hr = AUDCLNT_E_DEVICE_INVALIDATED; - goto exit; - } - - formats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - snd_pcm_format_mask_sizeof()); - if(!formats){ - hr = E_OUTOFMEMORY; - goto exit; - } - - snd_pcm_hw_params_get_format_mask(This->stream->hw_params, formats); - format = alsa_format(fmt); - if (format == SND_PCM_FORMAT_UNKNOWN || - !snd_pcm_format_mask_test(formats, format)){ - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - - closest = clone_format(fmt); - if(!closest){ - hr = E_OUTOFMEMORY; - goto exit; - } - - if((err = snd_pcm_hw_params_get_rate_min(This->stream->hw_params, &min, NULL)) < 0){ - hr = AUDCLNT_E_DEVICE_INVALIDATED; - WARN("Unable to get min rate: %d (%s)\n", err, snd_strerror(err)); - goto exit; - } - - if((err = snd_pcm_hw_params_get_rate_max(This->stream->hw_params, &max, NULL)) < 0){ - hr = AUDCLNT_E_DEVICE_INVALIDATED; - WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); - goto exit; - } - - if(fmt->nSamplesPerSec < min || fmt->nSamplesPerSec > max){ - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - - if((err = snd_pcm_hw_params_get_channels_min(This->stream->hw_params, &min)) < 0){ - hr = AUDCLNT_E_DEVICE_INVALIDATED; - WARN("Unable to get min channels: %d (%s)\n", err, snd_strerror(err)); - goto exit; - } - - if((err = snd_pcm_hw_params_get_channels_max(This->stream->hw_params, &max)) < 0){ - hr = AUDCLNT_E_DEVICE_INVALIDATED; - WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); - goto exit; - } - if(fmt->nChannels > max){ - hr = S_FALSE; - closest->nChannels = max; - }else if(fmt->nChannels < min){ - hr = S_FALSE; - closest->nChannels = min; - } - - map_channels(This, fmt, &alsa_channels, alsa_channel_map); - - if(alsa_channels > max){ - hr = S_FALSE; - closest->nChannels = max; - } - - if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = get_channel_mask(closest->nChannels); - - if(fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 || - fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample < fmt->wBitsPerSample)) - hr = S_FALSE; - - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && - fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || - ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) - hr = S_FALSE; - } - -exit: - LeaveCriticalSection(&This->lock); - HeapFree(GetProcessHeap(), 0, formats); - - if(hr == S_FALSE && !out) - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - - if(hr == S_FALSE && out) { - closest->nBlockAlign = - closest->nChannels * closest->wBitsPerSample / 8; - closest->nAvgBytesPerSec = - closest->nBlockAlign * closest->nSamplesPerSec; - if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - ((WAVEFORMATEXTENSIBLE*)closest)->Samples.wValidBitsPerSample = closest->wBitsPerSample; - *out = closest; - } else - CoTaskMemFree(closest); + if(params.result == S_FALSE) + *out = &params.fmt_out->Format; + else + CoTaskMemFree(params.fmt_out); - TRACE("returning: %08x\n", hr); - return hr; + return params.result; } static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index ef5b470e1ed..cd8d303b5d3 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -67,6 +67,16 @@ struct get_endpoint_ids_params unsigned int default_idx; }; +struct is_format_supported_params +{ + const char *alsa_name; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + const WAVEFORMATEX *fmt_in; + WAVEFORMATEXTENSIBLE *fmt_out; + HRESULT result; +}; + struct get_mix_format_params { const char *alsa_name; @@ -78,6 +88,7 @@ struct get_mix_format_params enum alsa_funcs { alsa_get_endpoint_ids, + alsa_is_format_supported, alsa_get_mix_format, }; -- 2.25.1

2 1

[PATCH 5/8] winealsa: Move get_mix_format to the unixlib.
by Huw Davies 17 Feb '22

17 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 178 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 126 +++---------------------- dlls/winealsa.drv/unixlib.h | 9 ++ 3 files changed, 199 insertions(+), 114 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index ae05c7a8b9b..320d676effb 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -39,6 +39,7 @@ #include "wine/list.h" #include "wine/unixlib.h" +#include "initguid.h" #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(alsa); @@ -452,7 +453,184 @@ static NTSTATUS get_endpoint_ids(void *args) return STATUS_SUCCESS; } +static HRESULT alsa_open_device(const char *alsa_name, EDataFlow flow, snd_pcm_t **pcm_handle, + snd_pcm_hw_params_t **hw_params) +{ + snd_pcm_stream_t pcm_stream; + int err; + + if(flow == eRender) + pcm_stream = SND_PCM_STREAM_PLAYBACK; + else if(flow == eCapture) + pcm_stream = SND_PCM_STREAM_CAPTURE; + else + return E_UNEXPECTED; + + err = snd_pcm_open(pcm_handle, alsa_name, pcm_stream, SND_PCM_NONBLOCK); + if(err < 0){ + WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); + switch(err){ + case -EBUSY: + return AUDCLNT_E_DEVICE_IN_USE; + default: + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; + } + } + + *hw_params = malloc(snd_pcm_hw_params_sizeof()); + if(!*hw_params){ + snd_pcm_close(*pcm_handle); + return E_OUTOFMEMORY; + } + + return S_OK; +} + +static DWORD get_channel_mask(unsigned int channels) +{ + switch(channels){ + case 0: + return 0; + case 1: + return KSAUDIO_SPEAKER_MONO; + case 2: + return KSAUDIO_SPEAKER_STEREO; + case 3: + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; + case 4: + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ + case 5: + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; + case 6: + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ + case 7: + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; + case 8: + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ + } + FIXME("Unknown speaker configuration: %u\n", channels); + return 0; +} + +static NTSTATUS get_mix_format(void *args) +{ + struct get_mix_format_params *params = args; + WAVEFORMATEXTENSIBLE *fmt = params->fmt; + snd_pcm_t *pcm_handle; + snd_pcm_hw_params_t *hw_params; + snd_pcm_format_mask_t *formats; + unsigned int max_rate, max_channels; + int err; + + params->result = alsa_open_device(params->alsa_name, params->flow, &pcm_handle, &hw_params); + if(FAILED(params->result)) + return STATUS_SUCCESS; + + formats = calloc(1, snd_pcm_format_mask_sizeof()); + if(!formats){ + free(hw_params); + snd_pcm_close(pcm_handle); + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + if((err = snd_pcm_hw_params_any(pcm_handle, hw_params)) < 0){ + WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + goto exit; + } + + snd_pcm_hw_params_get_format_mask(hw_params, formats); + + fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_FLOAT_LE)){ + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + }else if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_S16_LE)){ + fmt->Format.wBitsPerSample = 16; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_U8)){ + fmt->Format.wBitsPerSample = 8; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_S32_LE)){ + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_S24_3LE)){ + fmt->Format.wBitsPerSample = 24; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + }else{ + ERR("Didn't recognize any available ALSA formats\n"); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + goto exit; + } + + if((err = snd_pcm_hw_params_get_channels_max(hw_params, &max_channels)) < 0){ + WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + goto exit; + } + + if(max_channels > 6) + fmt->Format.nChannels = 2; + else + fmt->Format.nChannels = max_channels; + + if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)){ + /* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). */ + + if(fmt->Format.nChannels < max_channels) + fmt->Format.nChannels += 1; + else + /* We could "fake" more channels and downmix the emulated channels, + * but at that point you really ought to tweak your ALSA setup or + * just use PulseAudio. */ + WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); + } + + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); + + if((err = snd_pcm_hw_params_get_rate_max(hw_params, &max_rate, NULL)) < 0){ + WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + goto exit; + } + + if(max_rate >= 48000) + fmt->Format.nSamplesPerSec = 48000; + else if(max_rate >= 44100) + fmt->Format.nSamplesPerSec = 44100; + else if(max_rate >= 22050) + fmt->Format.nSamplesPerSec = 22050; + else if(max_rate >= 11025) + fmt->Format.nSamplesPerSec = 11025; + else if(max_rate >= 8000) + fmt->Format.nSamplesPerSec = 8000; + else{ + ERR("Unknown max rate: %u\n", max_rate); + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + goto exit; + } + + fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * fmt->Format.nChannels) / 8; + fmt->Format.nAvgBytesPerSec = fmt->Format.nSamplesPerSec * fmt->Format.nBlockAlign; + + fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; + fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + +exit: + free(formats); + free(hw_params); + snd_pcm_close(pcm_handle); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, + get_mix_format, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ecd74d373aa..24c6755d697 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1446,11 +1446,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, WAVEFORMATEX **pwfx) { ACImpl *This = impl_from_IAudioClient3(iface); - WAVEFORMATEXTENSIBLE *fmt; - snd_pcm_format_mask_t *formats; - unsigned int max_rate, max_channels; - int err; - HRESULT hr = S_OK; + struct get_mix_format_params params; TRACE("(%p)->(%p)\n", This, pwfx); @@ -1458,119 +1454,21 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); - if(!fmt) + params.alsa_name = This->alsa_name; + params.flow = This->dataflow; + params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!params.fmt) return E_OUTOFMEMORY; - formats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_format_mask_sizeof()); - if(!formats){ - CoTaskMemFree(fmt); - return E_OUTOFMEMORY; - } - - EnterCriticalSection(&This->lock); - - if((err = snd_pcm_hw_params_any(This->stream->pcm_handle, This->stream->hw_params)) < 0){ - WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_DEVICE_INVALIDATED; - goto exit; - } - - snd_pcm_hw_params_get_format_mask(This->stream->hw_params, formats); - - fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_FLOAT_LE)){ - fmt->Format.wBitsPerSample = 32; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; - }else if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_S16_LE)){ - fmt->Format.wBitsPerSample = 16; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_U8)){ - fmt->Format.wBitsPerSample = 8; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_S32_LE)){ - fmt->Format.wBitsPerSample = 32; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_S24_3LE)){ - fmt->Format.wBitsPerSample = 24; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else{ - ERR("Didn't recognize any available ALSA formats\n"); - hr = AUDCLNT_E_DEVICE_INVALIDATED; - goto exit; - } - - if((err = snd_pcm_hw_params_get_channels_max(This->stream->hw_params, - &max_channels)) < 0){ - WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_DEVICE_INVALIDATED; - goto exit; - } - - if(max_channels > 6) - fmt->Format.nChannels = 2; - else - fmt->Format.nChannels = max_channels; - - if(fmt->Format.nChannels > 1 && (fmt->Format.nChannels & 0x1)){ - /* For most hardware on Windows, users must choose a configuration with an even - * number of channels (stereo, quad, 5.1, 7.1). Users can then disable - * channels, but those channels are still reported to applications from - * GetMixFormat! Some applications behave badly if given an odd number of - * channels (e.g. 2.1). */ - - if(fmt->Format.nChannels < max_channels) - fmt->Format.nChannels += 1; - else - /* We could "fake" more channels and downmix the emulated channels, - * but at that point you really ought to tweak your ALSA setup or - * just use PulseAudio. */ - WARN("Some Windows applications behave badly with an odd number of channels (%u)!\n", fmt->Format.nChannels); - } - - fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); + ALSA_CALL(get_mix_format, &params); - if((err = snd_pcm_hw_params_get_rate_max(This->stream->hw_params, &max_rate, - NULL)) < 0){ - WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_DEVICE_INVALIDATED; - goto exit; - } - - if(max_rate >= 48000) - fmt->Format.nSamplesPerSec = 48000; - else if(max_rate >= 44100) - fmt->Format.nSamplesPerSec = 44100; - else if(max_rate >= 22050) - fmt->Format.nSamplesPerSec = 22050; - else if(max_rate >= 11025) - fmt->Format.nSamplesPerSec = 11025; - else if(max_rate >= 8000) - fmt->Format.nSamplesPerSec = 8000; - else{ - ERR("Unknown max rate: %u\n", max_rate); - hr = AUDCLNT_E_DEVICE_INVALIDATED; - goto exit; - } - - fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * - fmt->Format.nChannels) / 8; - fmt->Format.nAvgBytesPerSec = fmt->Format.nSamplesPerSec * - fmt->Format.nBlockAlign; - - fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; - fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - - dump_fmt((WAVEFORMATEX*)fmt); - *pwfx = (WAVEFORMATEX*)fmt; - -exit: - LeaveCriticalSection(&This->lock); - if(FAILED(hr)) - CoTaskMemFree(fmt); - HeapFree(GetProcessHeap(), 0, formats); + if(SUCCEEDED(params.result)){ + *pwfx = &params.fmt->Format; + dump_fmt(*pwfx); + } else + CoTaskMemFree(params.fmt); - return hr; + return params.result; } static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 8a20710b7e5..ef5b470e1ed 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -67,9 +67,18 @@ struct get_endpoint_ids_params unsigned int default_idx; }; +struct get_mix_format_params +{ + const char *alsa_name; + EDataFlow flow; + WAVEFORMATEXTENSIBLE *fmt; + HRESULT result; +}; + enum alsa_funcs { alsa_get_endpoint_ids, + alsa_get_mix_format, }; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH 4/8] winealsa: Move the pcm device opening to a helper.
by Huw Davies 17 Feb '22

17 Feb '22

This will allow GetMixFormat and IsFormatSupported to share this code without needing a stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 50 ++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index f1bc2fd0247..ecd74d373aa 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -442,10 +442,37 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData return FALSE; } +static HRESULT alsa_open_device(const char *alsa_name, EDataFlow flow, snd_pcm_t **pcm_handle, + snd_pcm_hw_params_t **hw_params) +{ + int err; + + if(flow != eRender && flow != eCapture) + return E_UNEXPECTED; + + err = snd_pcm_open(pcm_handle, alsa_name, alsa_get_direction(flow), SND_PCM_NONBLOCK); + if(err < 0){ + WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); + switch(err){ + case -EBUSY: + return AUDCLNT_E_DEVICE_IN_USE; + default: + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; + } + } + + *hw_params = HeapAlloc(GetProcessHeap(), 0, snd_pcm_hw_params_sizeof()); + if(!*hw_params){ + snd_pcm_close(*pcm_handle); + return E_OUTOFMEMORY; + } + + return S_OK; +} + HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; - int err; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -486,26 +513,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return E_OUTOFMEMORY; } - err = snd_pcm_open(&This->stream->pcm_handle, alsa_name, alsa_get_direction(dataflow), SND_PCM_NONBLOCK); - if(err < 0){ - HeapFree(GetProcessHeap(), 0, This->stream); - HeapFree(GetProcessHeap(), 0, This); - WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); - switch(err){ - case -EBUSY: - return AUDCLNT_E_DEVICE_IN_USE; - default: - return AUDCLNT_E_ENDPOINT_CREATE_FAILED; - } - } - - This->stream->hw_params = HeapAlloc(GetProcessHeap(), 0, - snd_pcm_hw_params_sizeof()); - if(!This->stream->hw_params){ - snd_pcm_close(This->stream->pcm_handle); + hr = alsa_open_device(alsa_name, dataflow, &This->stream->pcm_handle, &This->stream->hw_params); + if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; + return hr; } InitializeCriticalSection(&This->lock); -- 2.25.1

2 1

[PATCH 3/8] winealsa: Introduce a stream structure.
by Huw Davies 17 Feb '22

17 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 691 ++++++++++++++++++----------------- dlls/winealsa.drv/unixlib.h | 35 ++ 2 files changed, 385 insertions(+), 341 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0549752dc3f..f1bc2fd0247 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -101,42 +101,17 @@ struct ACImpl { LONG ref; - snd_pcm_t *pcm_handle; - snd_pcm_uframes_t alsa_bufsize_frames, alsa_period_frames, safe_rewind_frames; - snd_pcm_hw_params_t *hw_params; /* does not hold state between calls */ - snd_pcm_format_t alsa_format; - - LARGE_INTEGER last_period_time; - IMMDevice *parent; IUnknown *pUnkFTMarshal; EDataFlow dataflow; - WAVEFORMATEX *fmt; - DWORD flags; - AUDCLNT_SHAREMODE share; - HANDLE event; float *vols; UINT32 channel_count; + struct alsa_stream *stream; - BOOL need_remapping; - int alsa_channels; - int alsa_channel_map[32]; - - BOOL initted, started; - REFERENCE_TIME mmdev_period_rt; - UINT64 written_frames, last_pos_frames; - UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; - snd_pcm_uframes_t remapping_buf_frames; - UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ - UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ - UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ - UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ - UINT32 data_in_alsa_frames; + BOOL initted; HANDLE timer; - BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; - LONG32 getbuf_last; /* <0 when using tmp_buffer */ CRITICAL_SECTION lock; @@ -505,8 +480,15 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->dataflow = dataflow; memcpy(This->alsa_name, alsa_name, len + 1); - err = snd_pcm_open(&This->pcm_handle, alsa_name, alsa_get_direction(dataflow), SND_PCM_NONBLOCK); + This->stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); + if(!This->stream){ + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + + err = snd_pcm_open(&This->stream->pcm_handle, alsa_name, alsa_get_direction(dataflow), SND_PCM_NONBLOCK); if(err < 0){ + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); switch(err){ @@ -517,10 +499,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } } - This->hw_params = HeapAlloc(GetProcessHeap(), 0, + This->stream->hw_params = HeapAlloc(GetProcessHeap(), 0, snd_pcm_hw_params_sizeof()); - if(!This->hw_params){ - snd_pcm_close(This->pcm_handle); + if(!This->stream->hw_params){ + snd_pcm_close(This->stream->pcm_handle); + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } @@ -574,6 +557,7 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct alsa_stream *stream = This->stream; ULONG ref; ref = InterlockedDecrement(&This->ref); @@ -595,20 +579,21 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - snd_pcm_drop(This->pcm_handle); - snd_pcm_close(This->pcm_handle); + snd_pcm_drop(stream->pcm_handle); + snd_pcm_close(stream->pcm_handle); if(This->initted){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->local_buffer); - HeapFree(GetProcessHeap(), 0, This->remapping_buf); - HeapFree(GetProcessHeap(), 0, This->silence_buf); - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - HeapFree(GetProcessHeap(), 0, This->hw_params); - CoTaskMemFree(This->fmt); + HeapFree(GetProcessHeap(), 0, stream->local_buffer); + HeapFree(GetProcessHeap(), 0, stream->remapping_buf); + HeapFree(GetProcessHeap(), 0, stream->silence_buf); + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + HeapFree(GetProcessHeap(), 0, stream->hw_params); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -904,16 +889,16 @@ static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt, int *alsa_cha return need_remap ? S_OK : S_FALSE; } -static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) +static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 frames) { - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; - if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * This->fmt->nBlockAlign); + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); else - memset(buffer, 0, frames * This->fmt->nBlockAlign); + memset(buffer, 0, frames * stream->fmt->nBlockAlign); } static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, @@ -922,6 +907,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); + struct alsa_stream *stream = This->stream; snd_pcm_sw_params_t *sw_params = NULL; snd_pcm_format_t format; unsigned int rate, alsa_period_us; @@ -990,15 +976,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, dump_fmt(fmt); - This->need_remapping = map_channels(This, fmt, &This->alsa_channels, This->alsa_channel_map) == S_OK; + stream->need_remapping = map_channels(This, fmt, &stream->alsa_channels, stream->alsa_channel_map) == S_OK; - if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ + if((err = snd_pcm_hw_params_any(stream->pcm_handle, stream->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } - if((err = snd_pcm_hw_params_set_access(This->pcm_handle, This->hw_params, + if((err = snd_pcm_hw_params_set_access(stream->pcm_handle, stream->hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0){ WARN("Unable to set access: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; @@ -1011,7 +997,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, goto exit; } - if((err = snd_pcm_hw_params_set_format(This->pcm_handle, This->hw_params, + if((err = snd_pcm_hw_params_set_format(stream->pcm_handle, stream->hw_params, format)) < 0){ WARN("Unable to set ALSA format to %u: %d (%s)\n", format, err, snd_strerror(err)); @@ -1019,10 +1005,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, goto exit; } - This->alsa_format = format; + stream->alsa_format = format; rate = fmt->nSamplesPerSec; - if((err = snd_pcm_hw_params_set_rate_near(This->pcm_handle, This->hw_params, + if((err = snd_pcm_hw_params_set_rate_near(stream->pcm_handle, stream->hw_params, &rate, NULL)) < 0){ WARN("Unable to set rate to %u: %d (%s)\n", rate, err, snd_strerror(err)); @@ -1030,52 +1016,52 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, goto exit; } - if((err = snd_pcm_hw_params_set_channels(This->pcm_handle, This->hw_params, - This->alsa_channels)) < 0){ + if((err = snd_pcm_hw_params_set_channels(stream->pcm_handle, stream->hw_params, + stream->alsa_channels)) < 0){ WARN("Unable to set channels to %u: %d (%s)\n", fmt->nChannels, err, snd_strerror(err)); hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; } - This->mmdev_period_rt = period; - alsa_period_us = This->mmdev_period_rt / 10; - if((err = snd_pcm_hw_params_set_period_time_near(This->pcm_handle, - This->hw_params, &alsa_period_us, NULL)) < 0) + stream->mmdev_period_rt = period; + alsa_period_us = stream->mmdev_period_rt / 10; + if((err = snd_pcm_hw_params_set_period_time_near(stream->pcm_handle, + stream->hw_params, &alsa_period_us, NULL)) < 0) WARN("Unable to set period time near %u: %d (%s)\n", alsa_period_us, err, snd_strerror(err)); /* ALSA updates the output variable alsa_period_us */ - This->mmdev_period_frames = MulDiv(fmt->nSamplesPerSec, - This->mmdev_period_rt, 10000000); + stream->mmdev_period_frames = MulDiv(fmt->nSamplesPerSec, + stream->mmdev_period_rt, 10000000); /* Buffer 4 ALSA periods if large enough, else 4 mmdevapi periods */ - This->alsa_bufsize_frames = This->mmdev_period_frames * 4; + stream->alsa_bufsize_frames = stream->mmdev_period_frames * 4; if(err < 0 || alsa_period_us < period / 10) - err = snd_pcm_hw_params_set_buffer_size_near(This->pcm_handle, - This->hw_params, &This->alsa_bufsize_frames); + err = snd_pcm_hw_params_set_buffer_size_near(stream->pcm_handle, + stream->hw_params, &stream->alsa_bufsize_frames); else{ unsigned int periods = 4; - err = snd_pcm_hw_params_set_periods_near(This->pcm_handle, This->hw_params, &periods, NULL); + err = snd_pcm_hw_params_set_periods_near(stream->pcm_handle, stream->hw_params, &periods, NULL); } if(err < 0) WARN("Unable to set buffer size: %d (%s)\n", err, snd_strerror(err)); - if((err = snd_pcm_hw_params(This->pcm_handle, This->hw_params)) < 0){ + if((err = snd_pcm_hw_params(stream->pcm_handle, stream->hw_params)) < 0){ WARN("Unable to set hw params: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } - if((err = snd_pcm_hw_params_get_period_size(This->hw_params, - &This->alsa_period_frames, NULL)) < 0){ + if((err = snd_pcm_hw_params_get_period_size(stream->hw_params, + &stream->alsa_period_frames, NULL)) < 0){ WARN("Unable to get period size: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } - if((err = snd_pcm_hw_params_get_buffer_size(This->hw_params, - &This->alsa_bufsize_frames)) < 0){ + if((err = snd_pcm_hw_params_get_buffer_size(stream->hw_params, + &stream->alsa_bufsize_frames)) < 0){ WARN("Unable to get buffer size: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; @@ -1087,34 +1073,34 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, goto exit; } - if((err = snd_pcm_sw_params_current(This->pcm_handle, sw_params)) < 0){ + if((err = snd_pcm_sw_params_current(stream->pcm_handle, sw_params)) < 0){ WARN("Unable to get sw_params: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } - if((err = snd_pcm_sw_params_set_start_threshold(This->pcm_handle, + if((err = snd_pcm_sw_params_set_start_threshold(stream->pcm_handle, sw_params, 1)) < 0){ WARN("Unable set start threshold to 1: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } - if((err = snd_pcm_sw_params_set_stop_threshold(This->pcm_handle, - sw_params, This->alsa_bufsize_frames)) < 0){ + if((err = snd_pcm_sw_params_set_stop_threshold(stream->pcm_handle, + sw_params, stream->alsa_bufsize_frames)) < 0){ WARN("Unable set stop threshold to %lu: %d (%s)\n", - This->alsa_bufsize_frames, err, snd_strerror(err)); + stream->alsa_bufsize_frames, err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } - if((err = snd_pcm_sw_params(This->pcm_handle, sw_params)) < 0){ + if((err = snd_pcm_sw_params(stream->pcm_handle, sw_params)) < 0){ WARN("Unable to set sw params: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } - if((err = snd_pcm_prepare(This->pcm_handle)) < 0){ + if((err = snd_pcm_prepare(stream->pcm_handle)) < 0){ WARN("Unable to prepare device: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; @@ -1125,42 +1111,42 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, * or surprising rounding as seen with 22050x8x1 with Pulse: * ALSA period 220 vs. 221 frames in mmdevapi and * buffer 883 vs. 2205 frames in mmdevapi! */ - This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - This->bufsize_frames -= This->bufsize_frames % This->mmdev_period_frames; - This->hidden_frames = This->alsa_period_frames + This->mmdev_period_frames + + stream->bufsize_frames -= stream->bufsize_frames % stream->mmdev_period_frames; + stream->hidden_frames = stream->alsa_period_frames + stream->mmdev_period_frames + MulDiv(fmt->nSamplesPerSec, EXTRA_SAFE_RT, 10000000); /* leave no less than about 1.33ms or 256 bytes of data after a rewind */ - This->safe_rewind_frames = max(256 / fmt->nBlockAlign, MulDiv(133, fmt->nSamplesPerSec, 100000)); + stream->safe_rewind_frames = max(256 / fmt->nBlockAlign, MulDiv(133, fmt->nSamplesPerSec, 100000)); /* Check if the ALSA buffer is so small that it will run out before * the next MMDevAPI period tick occurs. Allow a little wiggle room * with 120% of the period time. */ - if(This->alsa_bufsize_frames < 1.2 * This->mmdev_period_frames) + if(stream->alsa_bufsize_frames < 1.2 * stream->mmdev_period_frames) FIXME("ALSA buffer time is too small. Expect underruns. (%lu < %u * 1.2)\n", - This->alsa_bufsize_frames, This->mmdev_period_frames); + stream->alsa_bufsize_frames, stream->mmdev_period_frames); - This->fmt = clone_format(fmt); - if(!This->fmt){ + stream->fmt = clone_format(fmt); + if(!stream->fmt){ hr = E_OUTOFMEMORY; goto exit; } - This->local_buffer = HeapAlloc(GetProcessHeap(), 0, - This->bufsize_frames * fmt->nBlockAlign); - if(!This->local_buffer){ + stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, + stream->bufsize_frames * fmt->nBlockAlign); + if(!stream->local_buffer){ hr = E_OUTOFMEMORY; goto exit; } - silence_buffer(This, This->local_buffer, This->bufsize_frames); + silence_buffer(stream, stream->local_buffer, stream->bufsize_frames); - This->silence_buf = HeapAlloc(GetProcessHeap(), 0, - This->alsa_period_frames * This->fmt->nBlockAlign); - if(!This->silence_buf){ + stream->silence_buf = HeapAlloc(GetProcessHeap(), 0, + stream->alsa_period_frames * stream->fmt->nBlockAlign); + if(!stream->silence_buf){ hr = E_OUTOFMEMORY; goto exit; } - silence_buffer(This, This->silence_buf, This->alsa_period_frames); + silence_buffer(stream, stream->silence_buf, stream->alsa_period_frames); This->channel_count = fmt->nChannels; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); @@ -1172,8 +1158,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; - This->share = mode; - This->flags = flags; + stream->share = mode; + stream->flags = flags; hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); @@ -1184,18 +1170,18 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->initted = TRUE; - TRACE("ALSA period: %lu frames\n", This->alsa_period_frames); - TRACE("ALSA buffer: %lu frames\n", This->alsa_bufsize_frames); - TRACE("MMDevice period: %u frames\n", This->mmdev_period_frames); - TRACE("MMDevice buffer: %u frames\n", This->bufsize_frames); + TRACE("ALSA period: %lu frames\n", stream->alsa_period_frames); + TRACE("ALSA buffer: %lu frames\n", stream->alsa_bufsize_frames); + TRACE("MMDevice period: %u frames\n", stream->mmdev_period_frames); + TRACE("MMDevice buffer: %u frames\n", stream->bufsize_frames); exit: HeapFree(GetProcessHeap(), 0, sw_params); if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, This->local_buffer); - This->local_buffer = NULL; - CoTaskMemFree(This->fmt); - This->fmt = NULL; + HeapFree(GetProcessHeap(), 0, stream->local_buffer); + stream->local_buffer = NULL; + CoTaskMemFree(stream->fmt); + stream->fmt = NULL; HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; } @@ -1210,6 +1196,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, out); @@ -1223,7 +1210,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, return AUDCLNT_E_NOT_INITIALIZED; } - *out = This->bufsize_frames; + *out = stream->bufsize_frames; LeaveCriticalSection(&This->lock); @@ -1234,6 +1221,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency) { ACImpl *This = impl_from_IAudioClient3(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, latency); @@ -1253,10 +1241,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation; * + alsa_period such that ALSA always has at least one period to play. */ if(This->dataflow == eRender) - *latency = MulDiv(This->hidden_frames, 10000000, This->fmt->nSamplesPerSec); + *latency = MulDiv(stream->hidden_frames, 10000000, stream->fmt->nSamplesPerSec); else - *latency = MulDiv(This->alsa_period_frames, 10000000, This->fmt->nSamplesPerSec) - + This->mmdev_period_rt; + *latency = MulDiv(stream->alsa_period_frames, 10000000, stream->fmt->nSamplesPerSec) + + stream->mmdev_period_rt; LeaveCriticalSection(&This->lock); @@ -1267,6 +1255,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out) { ACImpl *This = impl_from_IAudioClient3(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, out); @@ -1281,7 +1270,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, } /* padding is solely updated at callback time in shared mode */ - *out = This->held_frames; + *out = stream->held_frames; LeaveCriticalSection(&This->lock); @@ -1334,7 +1323,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ + if((err = snd_pcm_hw_params_any(This->stream->pcm_handle, This->stream->hw_params)) < 0){ hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } @@ -1346,7 +1335,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, goto exit; } - snd_pcm_hw_params_get_format_mask(This->hw_params, formats); + snd_pcm_hw_params_get_format_mask(This->stream->hw_params, formats); format = alsa_format(fmt); if (format == SND_PCM_FORMAT_UNKNOWN || !snd_pcm_format_mask_test(formats, format)){ @@ -1360,13 +1349,13 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, goto exit; } - if((err = snd_pcm_hw_params_get_rate_min(This->hw_params, &min, NULL)) < 0){ + if((err = snd_pcm_hw_params_get_rate_min(This->stream->hw_params, &min, NULL)) < 0){ hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get min rate: %d (%s)\n", err, snd_strerror(err)); goto exit; } - if((err = snd_pcm_hw_params_get_rate_max(This->hw_params, &max, NULL)) < 0){ + if((err = snd_pcm_hw_params_get_rate_max(This->stream->hw_params, &max, NULL)) < 0){ hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); goto exit; @@ -1377,13 +1366,13 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, goto exit; } - if((err = snd_pcm_hw_params_get_channels_min(This->hw_params, &min)) < 0){ + if((err = snd_pcm_hw_params_get_channels_min(This->stream->hw_params, &min)) < 0){ hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get min channels: %d (%s)\n", err, snd_strerror(err)); goto exit; } - if((err = snd_pcm_hw_params_get_channels_max(This->hw_params, &max)) < 0){ + if((err = snd_pcm_hw_params_get_channels_max(This->stream->hw_params, &max)) < 0){ hr = AUDCLNT_E_DEVICE_INVALIDATED; WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); goto exit; @@ -1469,13 +1458,13 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ + if((err = snd_pcm_hw_params_any(This->stream->pcm_handle, This->stream->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_DEVICE_INVALIDATED; goto exit; } - snd_pcm_hw_params_get_format_mask(This->hw_params, formats); + snd_pcm_hw_params_get_format_mask(This->stream->hw_params, formats); fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; if(snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_FLOAT_LE)){ @@ -1499,7 +1488,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, goto exit; } - if((err = snd_pcm_hw_params_get_channels_max(This->hw_params, + if((err = snd_pcm_hw_params_get_channels_max(This->stream->hw_params, &max_channels)) < 0){ WARN("Unable to get max channels: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_DEVICE_INVALIDATED; @@ -1529,7 +1518,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); - if((err = snd_pcm_hw_params_get_rate_max(This->hw_params, &max_rate, + if((err = snd_pcm_hw_params_get_rate_max(This->stream->hw_params, &max_rate, NULL)) < 0){ WARN("Unable to get max rate: %d (%s)\n", err, snd_strerror(err)); hr = AUDCLNT_E_DEVICE_INVALIDATED; @@ -1590,97 +1579,98 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return S_OK; } -static BYTE *remap_channels(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) +static BYTE *remap_channels(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) { snd_pcm_uframes_t i; UINT c; - UINT bytes_per_sample = This->fmt->wBitsPerSample / 8; + UINT bytes_per_sample = stream->fmt->wBitsPerSample / 8; - if(!This->need_remapping) + if(!stream->need_remapping) return buf; - if(!This->remapping_buf){ - This->remapping_buf = HeapAlloc(GetProcessHeap(), 0, - bytes_per_sample * This->alsa_channels * frames); - This->remapping_buf_frames = frames; - }else if(This->remapping_buf_frames < frames){ - This->remapping_buf = HeapReAlloc(GetProcessHeap(), 0, This->remapping_buf, - bytes_per_sample * This->alsa_channels * frames); - This->remapping_buf_frames = frames; + if(!stream->remapping_buf){ + stream->remapping_buf = HeapAlloc(GetProcessHeap(), 0, + bytes_per_sample * stream->alsa_channels * frames); + stream->remapping_buf_frames = frames; + }else if(stream->remapping_buf_frames < frames){ + stream->remapping_buf = HeapReAlloc(GetProcessHeap(), 0, stream->remapping_buf, + bytes_per_sample * stream->alsa_channels * frames); + stream->remapping_buf_frames = frames; } - snd_pcm_format_set_silence(This->alsa_format, This->remapping_buf, - frames * This->alsa_channels); + snd_pcm_format_set_silence(stream->alsa_format, stream->remapping_buf, + frames * stream->alsa_channels); - switch(This->fmt->wBitsPerSample){ + switch(stream->fmt->wBitsPerSample){ case 8: { UINT8 *tgt_buf, *src_buf; - tgt_buf = This->remapping_buf; + tgt_buf = stream->remapping_buf; src_buf = buf; for(i = 0; i < frames; ++i){ - for(c = 0; c < This->fmt->nChannels; ++c) - tgt_buf[This->alsa_channel_map[c]] = src_buf[c]; - tgt_buf += This->alsa_channels; - src_buf += This->fmt->nChannels; + for(c = 0; c < stream->fmt->nChannels; ++c) + tgt_buf[stream->alsa_channel_map[c]] = src_buf[c]; + tgt_buf += stream->alsa_channels; + src_buf += stream->fmt->nChannels; } break; } case 16: { UINT16 *tgt_buf, *src_buf; - tgt_buf = (UINT16*)This->remapping_buf; + tgt_buf = (UINT16*)stream->remapping_buf; src_buf = (UINT16*)buf; for(i = 0; i < frames; ++i){ - for(c = 0; c < This->fmt->nChannels; ++c) - tgt_buf[This->alsa_channel_map[c]] = src_buf[c]; - tgt_buf += This->alsa_channels; - src_buf += This->fmt->nChannels; + for(c = 0; c < stream->fmt->nChannels; ++c) + tgt_buf[stream->alsa_channel_map[c]] = src_buf[c]; + tgt_buf += stream->alsa_channels; + src_buf += stream->fmt->nChannels; } } break; case 32: { UINT32 *tgt_buf, *src_buf; - tgt_buf = (UINT32*)This->remapping_buf; + tgt_buf = (UINT32*)stream->remapping_buf; src_buf = (UINT32*)buf; for(i = 0; i < frames; ++i){ - for(c = 0; c < This->fmt->nChannels; ++c) - tgt_buf[This->alsa_channel_map[c]] = src_buf[c]; - tgt_buf += This->alsa_channels; - src_buf += This->fmt->nChannels; + for(c = 0; c < stream->fmt->nChannels; ++c) + tgt_buf[stream->alsa_channel_map[c]] = src_buf[c]; + tgt_buf += stream->alsa_channels; + src_buf += stream->fmt->nChannels; } } break; default: { BYTE *tgt_buf, *src_buf; - tgt_buf = This->remapping_buf; + tgt_buf = stream->remapping_buf; src_buf = buf; for(i = 0; i < frames; ++i){ - for(c = 0; c < This->fmt->nChannels; ++c) - memcpy(&tgt_buf[This->alsa_channel_map[c] * bytes_per_sample], + for(c = 0; c < stream->fmt->nChannels; ++c) + memcpy(&tgt_buf[stream->alsa_channel_map[c] * bytes_per_sample], &src_buf[c * bytes_per_sample], bytes_per_sample); - tgt_buf += This->alsa_channels * bytes_per_sample; - src_buf += This->fmt->nChannels * bytes_per_sample; + tgt_buf += stream->alsa_channels * bytes_per_sample; + src_buf += stream->fmt->nChannels * bytes_per_sample; } } break; } - return This->remapping_buf; + return stream->remapping_buf; } static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) { - float vol[ARRAY_SIZE(This->alsa_channel_map)]; + struct alsa_stream *stream = This->stream; + float vol[ARRAY_SIZE(stream->alsa_channel_map)]; BOOL adjust = FALSE; UINT32 i, channels; BYTE *end; - if (This->vol_adjusted_frames >= frames) + if (stream->vol_adjusted_frames >= frames) return; - channels = This->fmt->nChannels; + channels = stream->fmt->nChannels; if (mute) { - int err = snd_pcm_format_set_silence(This->alsa_format, buf, frames * channels); + int err = snd_pcm_format_set_silence(stream->alsa_format, buf, frames * channels); if (err < 0) WARN("Setting buffer to silence failed: %d (%s)\n", err, snd_strerror(err)); return; @@ -1698,10 +1688,10 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ if (!adjust) return; /* Skip the frames we've already adjusted before */ - end = buf + frames * This->fmt->nBlockAlign; - buf += This->vol_adjusted_frames * This->fmt->nBlockAlign; + end = buf + frames * stream->fmt->nBlockAlign; + buf += stream->vol_adjusted_frames * stream->fmt->nBlockAlign; - switch (This->alsa_format) + switch (stream->alsa_format) { #ifndef WORDS_BIGENDIAN #define PROCESS_BUFFER(type) do \ @@ -1735,7 +1725,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ BYTE *p; /* After we adjust the volume, we need to mask out low bits */ - if (This->alsa_format == SND_PCM_FORMAT_S20_3LE) + if (stream->alsa_format == SND_PCM_FORMAT_S20_3LE) mask = ~0x0fff; i = 0; @@ -1781,7 +1771,7 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ break; } default: - TRACE("Unhandled format %i, not adjusting volume.\n", This->alsa_format); + TRACE("Unhandled format %i, not adjusting volume.\n", stream->alsa_format); break; } } @@ -1789,17 +1779,18 @@ static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_ static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) { + struct alsa_stream *stream = This->stream; snd_pcm_sframes_t written; adjust_buffer_volume(This, buf, frames, mute); /* Mark the frames we've already adjusted */ - if (This->vol_adjusted_frames < frames) - This->vol_adjusted_frames = frames; + if (stream->vol_adjusted_frames < frames) + stream->vol_adjusted_frames = frames; - buf = remap_channels(This, buf, frames); + buf = remap_channels(stream, buf, frames); - written = snd_pcm_writei(This->pcm_handle, buf, frames); + written = snd_pcm_writei(stream->pcm_handle, buf, frames); if(written < 0){ int ret; @@ -1810,17 +1801,17 @@ static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, WARN("writei failed, recovering: %ld (%s)\n", written, snd_strerror(written)); - ret = snd_pcm_recover(This->pcm_handle, written, 0); + ret = snd_pcm_recover(stream->pcm_handle, written, 0); if(ret < 0){ WARN("Could not recover: %d (%s)\n", ret, snd_strerror(ret)); return ret; } - written = snd_pcm_writei(This->pcm_handle, buf, frames); + written = snd_pcm_writei(stream->pcm_handle, buf, frames); } if (written > 0) - This->vol_adjusted_frames -= written; + stream->vol_adjusted_frames -= written; return written; } @@ -1828,6 +1819,7 @@ static snd_pcm_sframes_t alsa_write_buffer_wrap(ACImpl *This, BYTE *buf, snd_pcm_uframes_t buflen, snd_pcm_uframes_t offs, snd_pcm_uframes_t to_write) { + struct alsa_stream *stream = This->stream; snd_pcm_sframes_t ret = 0; while(to_write){ @@ -1839,7 +1831,7 @@ static snd_pcm_sframes_t alsa_write_buffer_wrap(ACImpl *This, BYTE *buf, else chunk = to_write; - tmp = alsa_write_best_effort(This, buf + offs * This->fmt->nBlockAlign, chunk, This->session->mute); + tmp = alsa_write_best_effort(This, buf + offs * stream->fmt->nBlockAlign, chunk, This->session->mute); if(tmp < 0) return ret; if(!tmp) @@ -1863,13 +1855,14 @@ static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) static UINT data_not_in_alsa(ACImpl *This) { + struct alsa_stream *stream = This->stream; UINT32 diff; - diff = buf_ptr_diff(This->lcl_offs_frames, This->wri_offs_frames, This->bufsize_frames); + diff = buf_ptr_diff(stream->lcl_offs_frames, stream->wri_offs_frames, stream->bufsize_frames); if(diff) return diff; - return This->held_frames - This->data_in_alsa_frames; + return stream->held_frames - stream->data_in_alsa_frames; } /* Here's the buffer setup: * @@ -1891,25 +1884,26 @@ static UINT data_not_in_alsa(ACImpl *This) */ static void alsa_write_data(ACImpl *This) { + struct alsa_stream *stream = This->stream; snd_pcm_sframes_t written; snd_pcm_uframes_t avail, max_copy_frames, data_frames_played; int err; /* this call seems to be required to get an accurate snd_pcm_state() */ - avail = snd_pcm_avail_update(This->pcm_handle); + avail = snd_pcm_avail_update(stream->pcm_handle); - if(snd_pcm_state(This->pcm_handle) == SND_PCM_STATE_XRUN){ + if(snd_pcm_state(stream->pcm_handle) == SND_PCM_STATE_XRUN){ TRACE("XRun state, recovering\n"); - avail = This->alsa_bufsize_frames; + avail = stream->alsa_bufsize_frames; - if((err = snd_pcm_recover(This->pcm_handle, -EPIPE, 1)) < 0) + if((err = snd_pcm_recover(stream->pcm_handle, -EPIPE, 1)) < 0) WARN("snd_pcm_recover failed: %d (%s)\n", err, snd_strerror(err)); - if((err = snd_pcm_reset(This->pcm_handle)) < 0) + if((err = snd_pcm_reset(stream->pcm_handle)) < 0) WARN("snd_pcm_reset failed: %d (%s)\n", err, snd_strerror(err)); - if((err = snd_pcm_prepare(This->pcm_handle)) < 0) + if((err = snd_pcm_prepare(stream->pcm_handle)) < 0) WARN("snd_pcm_prepare failed: %d (%s)\n", err, snd_strerror(err)); } @@ -1917,61 +1911,63 @@ static void alsa_write_data(ACImpl *This) /* Add a lead-in when starting with too few frames to ensure * continuous rendering. Additional benefit: Force ALSA to start. */ - if(This->data_in_alsa_frames == 0 && This->held_frames < This->alsa_period_frames) + if(stream->data_in_alsa_frames == 0 && stream->held_frames < stream->alsa_period_frames) { - alsa_write_best_effort(This, This->silence_buf, This->alsa_period_frames - This->held_frames, FALSE); - This->vol_adjusted_frames = 0; + alsa_write_best_effort(This, stream->silence_buf, + stream->alsa_period_frames - stream->held_frames, FALSE); + stream->vol_adjusted_frames = 0; } - if(This->started) + if(stream->started) max_copy_frames = data_not_in_alsa(This); else max_copy_frames = 0; - data_frames_played = min(This->data_in_alsa_frames, avail); - This->data_in_alsa_frames -= data_frames_played; + data_frames_played = min(stream->data_in_alsa_frames, avail); + stream->data_in_alsa_frames -= data_frames_played; - if(This->held_frames > data_frames_played){ - if(This->started) - This->held_frames -= data_frames_played; + if(stream->held_frames > data_frames_played){ + if(stream->started) + stream->held_frames -= data_frames_played; }else - This->held_frames = 0; + stream->held_frames = 0; while(avail && max_copy_frames){ snd_pcm_uframes_t to_write; to_write = min(avail, max_copy_frames); - written = alsa_write_buffer_wrap(This, This->local_buffer, - This->bufsize_frames, This->lcl_offs_frames, to_write); + written = alsa_write_buffer_wrap(This, stream->local_buffer, + stream->bufsize_frames, stream->lcl_offs_frames, to_write); if(written <= 0) break; avail -= written; - This->lcl_offs_frames += written; - This->lcl_offs_frames %= This->bufsize_frames; - This->data_in_alsa_frames += written; + stream->lcl_offs_frames += written; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->data_in_alsa_frames += written; max_copy_frames -= written; } - if(This->event) - SetEvent(This->event); + if(stream->event) + SetEvent(stream->event); } static void alsa_read_data(ACImpl *This) { + struct alsa_stream *stream = This->stream; snd_pcm_sframes_t nread; - UINT32 pos = This->wri_offs_frames, limit = This->held_frames; + UINT32 pos = stream->wri_offs_frames, limit = stream->held_frames; - if(!This->started) + if(!stream->started) goto exit; /* FIXME: Detect overrun and signal DATA_DISCONTINUITY * How to count overrun frames and report them as position increase? */ - limit = This->bufsize_frames - max(limit, pos); + limit = stream->bufsize_frames - max(limit, pos); - nread = snd_pcm_readi(This->pcm_handle, - This->local_buffer + pos * This->fmt->nBlockAlign, limit); + nread = snd_pcm_readi(stream->pcm_handle, + stream->local_buffer + pos * stream->fmt->nBlockAlign, limit); TRACE("read %ld from %u limit %u\n", nread, pos, limit); if(nread < 0){ int ret; @@ -1981,14 +1977,14 @@ static void alsa_read_data(ACImpl *This) WARN("read failed, recovering: %ld (%s)\n", nread, snd_strerror(nread)); - ret = snd_pcm_recover(This->pcm_handle, nread, 0); + ret = snd_pcm_recover(stream->pcm_handle, nread, 0); if(ret < 0){ WARN("Recover failed: %d (%s)\n", ret, snd_strerror(ret)); return; } - nread = snd_pcm_readi(This->pcm_handle, - This->local_buffer + pos * This->fmt->nBlockAlign, limit); + nread = snd_pcm_readi(stream->pcm_handle, + stream->local_buffer + pos * stream->fmt->nBlockAlign, limit); if(nread < 0){ WARN("read failed: %ld (%s)\n", nread, snd_strerror(nread)); return; @@ -1997,29 +1993,30 @@ static void alsa_read_data(ACImpl *This) if(This->session->mute){ int err; - if((err = snd_pcm_format_set_silence(This->alsa_format, - This->local_buffer + pos * This->fmt->nBlockAlign, + if((err = snd_pcm_format_set_silence(stream->alsa_format, + stream->local_buffer + pos * stream->fmt->nBlockAlign, nread)) < 0) WARN("Setting buffer to silence failed: %d (%s)\n", err, snd_strerror(err)); } - This->wri_offs_frames += nread; - This->wri_offs_frames %= This->bufsize_frames; - This->held_frames += nread; + stream->wri_offs_frames += nread; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += nread; exit: - if(This->event) - SetEvent(This->event); + if(stream->event) + SetEvent(stream->event); } static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) { ACImpl *This = user; + struct alsa_stream *stream = This->stream; EnterCriticalSection(&This->lock); - QueryPerformanceCounter(&This->last_period_time); + QueryPerformanceCounter(&stream->last_period_time); if(This->dataflow == eRender) alsa_write_data(This); @@ -2029,17 +2026,18 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) LeaveCriticalSection(&This->lock); } -static snd_pcm_uframes_t interp_elapsed_frames(ACImpl *This) +static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) { LARGE_INTEGER time_freq, current_time, time_diff; QueryPerformanceFrequency(&time_freq); QueryPerformanceCounter(&current_time); - time_diff.QuadPart = current_time.QuadPart - This->last_period_time.QuadPart; - return MulDiv(time_diff.QuadPart, This->fmt->nSamplesPerSec, time_freq.QuadPart); + time_diff.QuadPart = current_time.QuadPart - stream->last_period_time.QuadPart; + return MulDiv(time_diff.QuadPart, stream->fmt->nSamplesPerSec, time_freq.QuadPart); } static int alsa_rewind_best_effort(ACImpl *This) { + struct alsa_stream *stream = This->stream; snd_pcm_uframes_t len, leave; /* we can't use snd_pcm_rewindable, some PCM devices crash. so follow @@ -2047,25 +2045,25 @@ static int alsa_rewind_best_effort(ACImpl *This) * buffer, minus 1.33ms for safety. */ /* amount of data to leave in ALSA buffer */ - leave = interp_elapsed_frames(This) + This->safe_rewind_frames; + leave = interp_elapsed_frames(stream) + stream->safe_rewind_frames; - if(This->held_frames < leave) - This->held_frames = 0; + if(stream->held_frames < leave) + stream->held_frames = 0; else - This->held_frames -= leave; + stream->held_frames -= leave; - if(This->data_in_alsa_frames < leave) + if(stream->data_in_alsa_frames < leave) len = 0; else - len = This->data_in_alsa_frames - leave; + len = stream->data_in_alsa_frames - leave; - TRACE("rewinding %lu frames, now held %u\n", len, This->held_frames); + TRACE("rewinding %lu frames, now held %u\n", len, stream->held_frames); if(len) /* snd_pcm_rewind return value is often broken, assume it succeeded */ - snd_pcm_rewind(This->pcm_handle, len); + snd_pcm_rewind(stream->pcm_handle, len); - This->data_in_alsa_frames = 0; + stream->data_in_alsa_frames = 0; return len; } @@ -2073,6 +2071,7 @@ static int alsa_rewind_best_effort(ACImpl *This) static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)\n", This); @@ -2083,55 +2082,55 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event){ + if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } - if(This->started){ + if(stream->started){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_STOPPED; } if(This->dataflow == eCapture){ /* dump any data that might be leftover in the ALSA capture buffer */ - snd_pcm_readi(This->pcm_handle, This->local_buffer, - This->bufsize_frames); + snd_pcm_readi(stream->pcm_handle, stream->local_buffer, + stream->bufsize_frames); }else{ snd_pcm_sframes_t avail, written; snd_pcm_uframes_t offs; - avail = snd_pcm_avail_update(This->pcm_handle); - avail = min(avail, This->held_frames); + avail = snd_pcm_avail_update(stream->pcm_handle); + avail = min(avail, stream->held_frames); - if(This->wri_offs_frames < This->held_frames) - offs = This->bufsize_frames - This->held_frames + This->wri_offs_frames; + if(stream->wri_offs_frames < stream->held_frames) + offs = stream->bufsize_frames - stream->held_frames + stream->wri_offs_frames; else - offs = This->wri_offs_frames - This->held_frames; + offs = stream->wri_offs_frames - stream->held_frames; /* fill it with data */ - written = alsa_write_buffer_wrap(This, This->local_buffer, - This->bufsize_frames, offs, avail); + written = alsa_write_buffer_wrap(This, stream->local_buffer, + stream->bufsize_frames, offs, avail); if(written > 0){ - This->lcl_offs_frames = (offs + written) % This->bufsize_frames; - This->data_in_alsa_frames = written; + stream->lcl_offs_frames = (offs + written) % stream->bufsize_frames; + stream->data_in_alsa_frames = written; }else{ - This->lcl_offs_frames = offs; - This->data_in_alsa_frames = 0; + stream->lcl_offs_frames = offs; + stream->data_in_alsa_frames = 0; } } if(!This->timer){ if(!CreateTimerQueueTimer(&This->timer, g_timer_q, alsa_push_buffer_data, - This, 0, This->mmdev_period_rt / 10000, WT_EXECUTEINTIMERTHREAD)){ + This, 0, stream->mmdev_period_rt / 10000, WT_EXECUTEINTIMERTHREAD)){ LeaveCriticalSection(&This->lock); WARN("Unable to create timer: %u\n", GetLastError()); return E_OUTOFMEMORY; } } - This->started = TRUE; + stream->started = TRUE; LeaveCriticalSection(&This->lock); @@ -2141,6 +2140,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)\n", This); @@ -2151,7 +2151,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - if(!This->started){ + if(!stream->started){ LeaveCriticalSection(&This->lock); return S_FALSE; } @@ -2159,7 +2159,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) if(This->dataflow == eRender) alsa_rewind_best_effort(This); - This->started = FALSE; + stream->started = FALSE; LeaveCriticalSection(&This->lock); @@ -2169,6 +2169,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)\n", This); @@ -2179,34 +2180,34 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - if(This->started){ + if(stream->started){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_STOPPED; } - if(This->getbuf_last){ + if(stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } - if(snd_pcm_drop(This->pcm_handle) < 0) + if(snd_pcm_drop(stream->pcm_handle) < 0) WARN("snd_pcm_drop failed\n"); - if(snd_pcm_reset(This->pcm_handle) < 0) + if(snd_pcm_reset(stream->pcm_handle) < 0) WARN("snd_pcm_reset failed\n"); - if(snd_pcm_prepare(This->pcm_handle) < 0) + if(snd_pcm_prepare(stream->pcm_handle) < 0) WARN("snd_pcm_prepare failed\n"); if(This->dataflow == eRender){ - This->written_frames = 0; - This->last_pos_frames = 0; + stream->written_frames = 0; + stream->last_pos_frames = 0; }else{ - This->written_frames += This->held_frames; + stream->written_frames += stream->held_frames; } - This->held_frames = 0; - This->lcl_offs_frames = 0; - This->wri_offs_frames = 0; + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->wri_offs_frames = 0; LeaveCriticalSection(&This->lock); @@ -2217,6 +2218,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, event); @@ -2230,18 +2232,18 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, return AUDCLNT_E_NOT_INITIALIZED; } - if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ + if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } - if (This->event){ + if (stream->event){ LeaveCriticalSection(&This->lock); FIXME("called twice\n"); return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } - This->event = event; + stream->event = event; LeaveCriticalSection(&This->lock); @@ -2489,6 +2491,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); + struct alsa_stream *stream = This->stream; UINT32 write_pos; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -2499,7 +2502,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, EnterCriticalSection(&This->lock); - if(This->getbuf_last){ + if(stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } @@ -2510,50 +2513,50 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, } /* held_frames == GetCurrentPadding_nolock(); */ - if(This->held_frames + frames > This->bufsize_frames){ + if(stream->held_frames + frames > stream->bufsize_frames){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; } - write_pos = This->wri_offs_frames; - if(write_pos + frames > This->bufsize_frames){ - if(This->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - frames * This->fmt->nBlockAlign); - if(!This->tmp_buffer){ + write_pos = stream->wri_offs_frames; + if(write_pos + frames > stream->bufsize_frames){ + if(stream->tmp_buffer_frames < frames){ + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, + frames * stream->fmt->nBlockAlign); + if(!stream->tmp_buffer){ LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - This->tmp_buffer_frames = frames; + stream->tmp_buffer_frames = frames; } - *data = This->tmp_buffer; - This->getbuf_last = -frames; + *data = stream->tmp_buffer; + stream->getbuf_last = -frames; }else{ - *data = This->local_buffer + write_pos * This->fmt->nBlockAlign; - This->getbuf_last = frames; + *data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; + stream->getbuf_last = frames; } - silence_buffer(This, *data, frames); + silence_buffer(stream, *data, frames); LeaveCriticalSection(&This->lock); return S_OK; } -static void alsa_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_frames) +static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) { - snd_pcm_uframes_t write_offs_frames = This->wri_offs_frames; - UINT32 write_offs_bytes = write_offs_frames * This->fmt->nBlockAlign; - snd_pcm_uframes_t chunk_frames = This->bufsize_frames - write_offs_frames; - UINT32 chunk_bytes = chunk_frames * This->fmt->nBlockAlign; - UINT32 written_bytes = written_frames * This->fmt->nBlockAlign; + snd_pcm_uframes_t write_offs_frames = stream->wri_offs_frames; + UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; + snd_pcm_uframes_t chunk_frames = stream->bufsize_frames - write_offs_frames; + UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; if(written_bytes <= chunk_bytes){ - memcpy(This->local_buffer + write_offs_bytes, buffer, written_bytes); + memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); }else{ - memcpy(This->local_buffer + write_offs_bytes, buffer, chunk_bytes); - memcpy(This->local_buffer, buffer + chunk_bytes, + memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); + memcpy(stream->local_buffer, buffer + chunk_bytes, written_bytes - chunk_bytes); } } @@ -2562,6 +2565,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); + struct alsa_stream *stream = This->stream; BYTE *buffer; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); @@ -2569,37 +2573,37 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( EnterCriticalSection(&This->lock); if(!written_frames){ - This->getbuf_last = 0; + stream->getbuf_last = 0; LeaveCriticalSection(&This->lock); return S_OK; } - if(!This->getbuf_last){ + if(!stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(written_frames > (This->getbuf_last >= 0 ? This->getbuf_last : -This->getbuf_last)){ + if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_INVALID_SIZE; } - if(This->getbuf_last >= 0) - buffer = This->local_buffer + This->wri_offs_frames * This->fmt->nBlockAlign; + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; else - buffer = This->tmp_buffer; + buffer = stream->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This, buffer, written_frames); + silence_buffer(stream, buffer, written_frames); - if(This->getbuf_last < 0) - alsa_wrap_buffer(This, buffer, written_frames); + if(stream->getbuf_last < 0) + alsa_wrap_buffer(stream, buffer, written_frames); - This->wri_offs_frames += written_frames; - This->wri_offs_frames %= This->bufsize_frames; - This->held_frames += written_frames; - This->written_frames += written_frames; - This->getbuf_last = 0; + stream->wri_offs_frames += written_frames; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += written_frames; + stream->written_frames += written_frames; + stream->getbuf_last = 0; LeaveCriticalSection(&This->lock); @@ -2656,6 +2660,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -2670,49 +2675,49 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, EnterCriticalSection(&This->lock); - if(This->getbuf_last){ + if(stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } /* hr = GetNextPacketSize(iface, frames); */ - if(This->held_frames < This->mmdev_period_frames){ + if(stream->held_frames < stream->mmdev_period_frames){ *frames = 0; LeaveCriticalSection(&This->lock); return AUDCLNT_S_BUFFER_EMPTY; } - *frames = This->mmdev_period_frames; + *frames = stream->mmdev_period_frames; - if(This->lcl_offs_frames + *frames > This->bufsize_frames){ + if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; - if(This->tmp_buffer_frames < *frames){ - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - *frames * This->fmt->nBlockAlign); - if(!This->tmp_buffer){ + if(stream->tmp_buffer_frames < *frames){ + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, + *frames * stream->fmt->nBlockAlign); + if(!stream->tmp_buffer){ LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - This->tmp_buffer_frames = *frames; + stream->tmp_buffer_frames = *frames; } - *data = This->tmp_buffer; - chunk_bytes = (This->bufsize_frames - This->lcl_offs_frames) * - This->fmt->nBlockAlign; - offs_bytes = This->lcl_offs_frames * This->fmt->nBlockAlign; - frames_bytes = *frames * This->fmt->nBlockAlign; - memcpy(This->tmp_buffer, This->local_buffer + offs_bytes, chunk_bytes); - memcpy(This->tmp_buffer + chunk_bytes, This->local_buffer, + *data = stream->tmp_buffer; + chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * + stream->fmt->nBlockAlign; + offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; + frames_bytes = *frames * stream->fmt->nBlockAlign; + memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); + memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, frames_bytes - chunk_bytes); }else - *data = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + *data = stream->local_buffer + + stream->lcl_offs_frames * stream->fmt->nBlockAlign; - This->getbuf_last = *frames; + stream->getbuf_last = *frames; *flags = 0; if(devpos) - *devpos = This->written_frames; + *devpos = stream->written_frames; if(qpcpos){ /* fixme: qpc of recording time */ LARGE_INTEGER stamp, freq; QueryPerformanceCounter(&stamp); @@ -2729,32 +2734,33 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)->(%u)\n", This, done); EnterCriticalSection(&This->lock); if(!done){ - This->getbuf_last = 0; + stream->getbuf_last = 0; LeaveCriticalSection(&This->lock); return S_OK; } - if(!This->getbuf_last){ + if(!stream->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(This->getbuf_last != done){ + if(stream->getbuf_last != done){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_INVALID_SIZE; } - This->written_frames += done; - This->held_frames -= done; - This->lcl_offs_frames += done; - This->lcl_offs_frames %= This->bufsize_frames; - This->getbuf_last = 0; + stream->written_frames += done; + stream->held_frames -= done; + stream->lcl_offs_frames += done; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->getbuf_last = 0; LeaveCriticalSection(&This->lock); @@ -2765,6 +2771,7 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( IAudioCaptureClient *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, frames); @@ -2773,7 +2780,7 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( EnterCriticalSection(&This->lock); - *frames = This->held_frames < This->mmdev_period_frames ? 0 : This->mmdev_period_frames; + *frames = stream->held_frames < stream->mmdev_period_frames ? 0 : stream->mmdev_period_frames; LeaveCriticalSection(&This->lock); @@ -2829,13 +2836,14 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); + struct alsa_stream *stream = This->stream; TRACE("(%p)->(%p)\n", This, freq); - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; else - *freq = This->fmt->nSamplesPerSec; + *freq = stream->fmt->nSamplesPerSec; return S_OK; } @@ -2844,6 +2852,7 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); + struct alsa_stream *stream = This->stream; UINT64 position; snd_pcm_state_t alsa_state; @@ -2855,38 +2864,38 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, EnterCriticalSection(&This->lock); /* avail_update required to get accurate snd_pcm_state() */ - snd_pcm_avail_update(This->pcm_handle); - alsa_state = snd_pcm_state(This->pcm_handle); + snd_pcm_avail_update(stream->pcm_handle); + alsa_state = snd_pcm_state(stream->pcm_handle); if(This->dataflow == eRender){ - position = This->written_frames - This->held_frames; + position = stream->written_frames - stream->held_frames; - if(This->started && alsa_state == SND_PCM_STATE_RUNNING && This->held_frames) + if(stream->started && alsa_state == SND_PCM_STATE_RUNNING && stream->held_frames) /* we should be using snd_pcm_delay here, but it is broken * especially during ALSA device underrun. instead, let's just * interpolate between periods with the system timer. */ - position += interp_elapsed_frames(This); + position += interp_elapsed_frames(stream); - position = min(position, This->written_frames - This->held_frames + This->mmdev_period_frames); + position = min(position, stream->written_frames - stream->held_frames + stream->mmdev_period_frames); - position = min(position, This->written_frames); + position = min(position, stream->written_frames); }else - position = This->written_frames + This->held_frames; + position = stream->written_frames + stream->held_frames; /* ensure monotic growth */ - if(position < This->last_pos_frames) - position = This->last_pos_frames; + if(position < stream->last_pos_frames) + position = stream->last_pos_frames; else - This->last_pos_frames = position; + stream->last_pos_frames = position; TRACE("frames written: %u, held: %u, state: 0x%x, position: %u\n", - (UINT32)(This->written_frames%1000000000), This->held_frames, + (UINT32)(stream->written_frames%1000000000), stream->held_frames, alsa_state, (UINT32)(position%1000000000)); LeaveCriticalSection(&This->lock); - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *pos = position * This->fmt->nBlockAlign; + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *pos = position * stream->fmt->nBlockAlign; else *pos = position; @@ -3056,7 +3065,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ EnterCriticalSection(&client->lock); - if(client->started){ + if(client->stream->started){ *state = AudioSessionStateActive; LeaveCriticalSection(&client->lock); LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index f3014d0b448..8a20710b7e5 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -16,6 +16,41 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "audioclient.h" + +struct alsa_stream +{ + snd_pcm_t *pcm_handle; + snd_pcm_uframes_t alsa_bufsize_frames, alsa_period_frames, safe_rewind_frames; + snd_pcm_hw_params_t *hw_params; /* does not hold state between calls */ + snd_pcm_format_t alsa_format; + + LARGE_INTEGER last_period_time; + + WAVEFORMATEX *fmt; + DWORD flags; + AUDCLNT_SHAREMODE share; + HANDLE event; + + BOOL need_remapping; + int alsa_channels; + int alsa_channel_map[32]; + + BOOL started; + REFERENCE_TIME mmdev_period_rt; + UINT64 written_frames, last_pos_frames; + UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; + snd_pcm_uframes_t remapping_buf_frames; + UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ + UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ + UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ + UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ + UINT32 data_in_alsa_frames; + + BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; + LONG32 getbuf_last; /* <0 when using tmp_buffer */ +}; + struct endpoint { WCHAR *name; -- 2.25.1

2 1

[PATCH 2/8] winealsa: Use the global lock to lock the session.
by Huw Davies 17 Feb '22

17 Feb '22

Mainly just for simplicity. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index abec9dc969a..0549752dc3f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -77,8 +77,6 @@ typedef struct _AudioSession { float *channel_vols; BOOL mute; - CRITICAL_SECTION lock; - struct list entry; } AudioSession; @@ -748,9 +746,6 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); - InitializeCriticalSection(&ret->lock); - ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); - session_init_vols(ret, num_channels); ret->master_vol = 1.f; @@ -3283,11 +3278,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->master_vol = level; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3573,11 +3568,11 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->channel_vols[index] = level; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3623,12 +3618,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } -- 2.25.1

2 1

[PATCH 1/8] winealsa: Explicitly store the name and channel count in the audio client.
by Huw Davies 17 Feb '22

17 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 516bba1e5fc..abec9dc969a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -119,6 +119,7 @@ struct ACImpl { AUDCLNT_SHAREMODE share; HANDLE event; float *vols; + UINT32 channel_count; BOOL need_remapping; int alsa_channels; @@ -145,6 +146,9 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; struct list entry; + + /* Keep at end */ + char alsa_name[1]; }; typedef struct _SessionMgr { @@ -472,6 +476,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient char alsa_name[256]; EDataFlow dataflow; HRESULT hr; + int len; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -481,7 +486,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(dataflow != eRender && dataflow != eCapture) return E_UNEXPECTED; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); + len = strlen(alsa_name); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(ACImpl, alsa_name[len + 1])); if(!This) return E_OUTOFMEMORY; @@ -499,6 +505,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; + memcpy(This->alsa_name, alsa_name, len + 1); + err = snd_pcm_open(&This->pcm_handle, alsa_name, alsa_get_direction(dataflow), SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); @@ -1159,19 +1167,20 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } silence_buffer(This, This->silence_buf, This->alsa_period_frames); - This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); + This->channel_count = fmt->nChannels; + This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ hr = E_OUTOFMEMORY; goto exit; } - for(i = 0; i < fmt->nChannels; ++i) + for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; This->share = mode; This->flags = flags; - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, + hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); if(FAILED(hr)) goto exit; @@ -3385,7 +3394,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->fmt->nChannels; + *out = This->channel_count; return S_OK; } @@ -3400,7 +3409,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; TRACE("ALSA does not support volume control\n"); @@ -3424,7 +3433,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; *level = This->vols[index]; @@ -3443,7 +3452,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; TRACE("ALSA does not support volume control\n"); @@ -3469,7 +3478,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock); -- 2.25.1

2 1

[PATCH vkd3d v4 3/3] vkd3d-shader/hlsl: Cover all numeric types in constant folding operations.
by Matteo Bruni 17 Feb '22

17 Feb '22

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> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_constant_ops.c | 331 ++++++++++++++++++-------- 2 files changed, 232 insertions(+), 100 deletions(-) diff --git a/Makefile.am b/Makefile.am index 94fa522a..8617a09d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,6 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/max.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 9e19cef4..51cee179 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -20,11 +20,216 @@ #include "hlsl.h" +static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) +{ + unsigned int k; + uint32_t u; + int32_t i; + double d; + float f; + bool b; + + if (dst->node.data_type->dimx != src->node.data_type->dimx + || dst->node.data_type->dimy != src->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + + for (k = 0; k < 4; ++k) + { + switch (src->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + u = src->value[k].f; + i = src->value[k].f; + f = src->value[k].f; + d = src->value[k].f; + b = src->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + u = src->value[k].d; + i = src->value[k].d; + f = src->value[k].d; + d = src->value[k].d; + b = src->value[k].d; + break; + + case HLSL_TYPE_INT: + u = src->value[k].i; + i = src->value[k].i; + f = src->value[k].i; + d = src->value[k].i; + b = src->value[k].i; + break; + + case HLSL_TYPE_UINT: + u = src->value[k].u; + i = src->value[k].u; + f = src->value[k].u; + d = src->value[k].u; + b = src->value[k].u; + break; + + case HLSL_TYPE_BOOL: + u = src->value[k].b; + i = src->value[k].b; + f = src->value[k].b; + d = src->value[k].b; + b = src->value[k].b; + break; + + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + + switch (dst->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = f; + break; + + case HLSL_TYPE_DOUBLE: + dst->value[k].d = d; + break; + + case HLSL_TYPE_INT: + dst->value[k].i = i; + break; + + case HLSL_TYPE_UINT: + dst->value[k].u = u; + break; + + case HLSL_TYPE_BOOL: + dst->value[k].b = b; + break; + + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + +static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = -src->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->value[k].d = -src->value[k].d; + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = -src->value[k].u; + break; + + default: + FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + +static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src1, + struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = src1->value[k].f + src2->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->value[k].d = src1->value[k].d + src2->value[k].d; + break; + + /* Handling HLSL_TYPE_INT through the unsigned field to avoid + * undefined behavior with signed integers in C. */ + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u + src2->value[k].u; + break; + + default: + FIXME("Fold addition for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + +static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (int k = 0; k < 4; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].f = src1->value[k].f * src2->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->value[k].d = src1->value[k].d * src2->value[k].d; + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + dst->value[k].u = src1->value[k].u * src2->value[k].u; + break; + + default: + FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; struct hlsl_ir_expr *expr; - unsigned int i, dimx; + unsigned int i; + bool success; if (instr->type != HLSL_IR_EXPR) return false; @@ -38,115 +243,43 @@ bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void arg1 = hlsl_ir_constant(expr->operands[0].node); if (expr->operands[1].node) arg2 = hlsl_ir_constant(expr->operands[1].node); - dimx = instr->data_type->dimx; if (!(res = hlsl_alloc(ctx, sizeof(*res)))) return false; init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); - switch (instr->data_type->base_type) + switch (expr->op) { - case HLSL_TYPE_FLOAT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].i; - break; - - case HLSL_TYPE_UINT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - default: - FIXME("Fold float op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } + case HLSL_OP1_CAST: + success = fold_cast(ctx, res, arg1); break; - } - case HLSL_TYPE_UINT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].i = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - case HLSL_OP1_NEG: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = -arg1->value[i].u; - break; - - case HLSL_OP2_ADD: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u + arg2->value[i].u; - break; - - case HLSL_OP2_MUL: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u * arg2->value[i].u; - break; - - default: - FIXME("Fold uint op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } + case HLSL_OP1_NEG: + success = fold_neg(ctx, res, arg1); + break; + + case HLSL_OP2_ADD: + success = fold_add(ctx, res, arg1, arg2); + break; + + case HLSL_OP2_MUL: + success = fold_mul(ctx, res, arg1, arg2); break; - } default: - FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); - vkd3d_free(res); - return false; + FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); + success = false; + break; } - list_add_before(&expr->node.entry, &res->node.entry); - hlsl_replace_node(&expr->node, &res->node); - return true; + if (success) + { + list_add_before(&expr->node.entry, &res->node.entry); + hlsl_replace_node(&expr->node, &res->node); + } + else + { + vkd3d_free(res); + } + return success; } -- 2.34.1

3 2

[PATCH vkd3d v3 1/3] vkd3d-shader/hlsl: Move replace_node() to hlsl.c.
by Zebediah Figura 17 Feb '22

17 Feb '22

From: Francisco Casas <fcasas(a)codeweavers.com> Also rename it to hlsl_replace_node(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 14 ++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl_codegen.c | 25 ++++++------------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8a0f4b017..a9a427707 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1400,6 +1400,20 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl vkd3d_string_buffer_cleanup(&buffer); } +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) +{ + struct hlsl_src *src, *next; + + LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) + { + hlsl_src_remove(src); + hlsl_src_from_node(src, new); + } + list_remove(&old->entry); + hlsl_free_instr(old); +} + + void hlsl_free_type(struct hlsl_type *type) { struct hlsl_struct_field *field, *next_field; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3a69165e5..67fe1a8d5 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -713,6 +713,8 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); + void hlsl_free_instr(struct hlsl_ir_node *node); void hlsl_free_instr_list(struct list *list); void hlsl_free_type(struct hlsl_type *type); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index eac3513c9..77ddd979a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -224,19 +224,6 @@ static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx return progress; } -static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) -{ - struct hlsl_src *src, *next; - - LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) - { - hlsl_src_remove(src); - hlsl_src_from_node(src, new); - } - list_remove(&old->entry); - hlsl_free_instr(old); -} - /* Lower casts from vec1 to vecN to swizzles. */ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -267,7 +254,7 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -437,7 +424,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, list_add_before(&node->entry, &swizzle_node->node.entry); new_node = &swizzle_node->node; } - replace_node(node, new_node); + hlsl_replace_node(node, new_node); return true; } @@ -566,7 +553,7 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { - replace_node(&expr->node, expr->operands[0].node); + hlsl_replace_node(&expr->node, expr->operands[0].node); return true; } } @@ -708,7 +695,7 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -842,7 +829,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi } list_add_before(&expr->node.entry, &res->node.entry); - replace_node(&expr->node, &res->node); + hlsl_replace_node(&expr->node, &res->node); return true; } @@ -862,7 +849,7 @@ static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *i if (((swizzle->swizzle >> (2 * i)) & 3) != i) return false; - replace_node(instr, swizzle->val.node); + hlsl_replace_node(instr, swizzle->val.node); return true; } -- 2.34.1

4 9

[v2 PATCH vkd3d] vkd3d-shader/hlsl: Fix floating point literals matching.
by Nikolay Sivov 17 Feb '22

17 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: as far as I can tell from testing, it's not allowed to have float literal suffixes without decimal point or exponent. libs/vkd3d-shader/hlsl.l | 2 +- tests/hlsl-initializer-numeric.shader_test | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index e9281ec..1cc19ad 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -192,7 +192,7 @@ row_major {return KW_ROW_MAJOR; } yylval->floatval = atof(yytext); return C_FLOAT; } -[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { +[0-9]+[eE][+-]?[0-9]+[h|H|f|F]? { yylval->floatval = atof(yytext); return C_FLOAT; } diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test index 2fce390..4057688 100644 --- a/tests/hlsl-initializer-numeric.shader_test +++ b/tests/hlsl-initializer-numeric.shader_test @@ -33,3 +33,16 @@ float4 main() : sv_target [test] draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float4 aa = { 1e1, 1e-1, 1., 2.f }; + float4 bb = { .1, .1e1, .2f, 1.e-1f }; + return aa + bb; +} + +[test] +draw quad +probe all rgba (10.1, 1.1, 1.2, 2.1) 4 -- 2.34.1

5 4

[PATCH] scrrun: Add a stub for pipe-based text stream.
by Nikolay Sivov 17 Feb '22

17 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 138 +++++++++++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 23 ++++-- 2 files changed, 145 insertions(+), 16 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d16ecb722dc..4794437a71d 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -706,20 +706,21 @@ static HRESULT WINAPI textstream_SkipLine(ITextStream *iface) static HRESULT WINAPI textstream_Close(ITextStream *iface) { - struct textstream *This = impl_from_ITextStream(iface); + struct textstream *stream = impl_from_ITextStream(iface); HRESULT hr = S_OK; - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - if(!CloseHandle(This->file)) + if (!CloseHandle(stream->file)) hr = S_FALSE; - This->file = NULL; + stream->file = NULL; return hr; } -static const ITextStreamVtbl textstreamvtbl = { +static const ITextStreamVtbl textstreamvtbl = +{ textstream_QueryInterface, textstream_AddRef, textstream_Release, @@ -742,6 +743,114 @@ static const ITextStreamVtbl textstreamvtbl = { textstream_Close }; +static HRESULT WINAPI pipestream_get_Line(ITextStream *iface, LONG *line) +{ + FIXME("%p, %p.\n", iface, line); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_get_Column(ITextStream *iface, LONG *column) +{ + FIXME("%p, %p.\n", iface, column); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_get_AtEndOfStream(ITextStream *iface, VARIANT_BOOL *eos) +{ + FIXME("%p, %p.\n", iface, eos); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_get_AtEndOfLine(ITextStream *iface, VARIANT_BOOL *eol) +{ + FIXME("%p, %p.\n", iface, eol); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_Read(ITextStream *iface, LONG len, BSTR *text) +{ + FIXME("%p, %ld, %p.\n", iface, len, text); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_ReadLine(ITextStream *iface, BSTR *text) +{ + FIXME("%p, %p.\n", iface, text); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_ReadAll(ITextStream *iface, BSTR *text) +{ + FIXME("%p, %p.\n", iface, text); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_Write(ITextStream *iface, BSTR text) +{ + FIXME("%p, %s.\n", iface, debugstr_w(text)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_WriteLine(ITextStream *iface, BSTR text) +{ + FIXME("%p, %s.\n", iface, debugstr_w(text)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_WriteBlankLines(ITextStream *iface, LONG lines) +{ + FIXME("%p, %ld.\n", iface, lines); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_Skip(ITextStream *iface, LONG count) +{ + FIXME("%p, %ld.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI pipestream_SkipLine(ITextStream *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const ITextStreamVtbl pipestreamvtbl = +{ + textstream_QueryInterface, + textstream_AddRef, + textstream_Release, + textstream_GetTypeInfoCount, + textstream_GetTypeInfo, + textstream_GetIDsOfNames, + textstream_Invoke, + pipestream_get_Line, + pipestream_get_Column, + pipestream_get_AtEndOfStream, + pipestream_get_AtEndOfLine, + pipestream_Read, + pipestream_ReadLine, + pipestream_ReadAll, + pipestream_Write, + pipestream_WriteLine, + pipestream_WriteBlankLines, + pipestream_Skip, + pipestream_SkipLine, + textstream_Close +}; + static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, Tristate format, ITextStream **ret) { static const unsigned short utf16bom = 0xfeff; @@ -839,11 +948,24 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod return S_OK; } -HRESULT WINAPI DoOpenPipeStream(HANDLE pipe, IOMode mode, ITextStream **stream) +HRESULT WINAPI DoOpenPipeStream(HANDLE pipe, IOMode mode, ITextStream **ret) { - FIXME("%p, %d, %p.\n", pipe, mode, stream); + struct textstream *stream; - return E_NOTIMPL; + TRACE("%p, %d, %p.\n", pipe, mode, ret); + + if (!(stream = calloc(1, sizeof(*stream)))) + return E_OUTOFMEMORY; + + stream->ITextStream_iface.lpVtbl = &pipestreamvtbl; + stream->ref = 1; + stream->mode = mode; + stream->file = pipe; + + init_classinfo(&CLSID_TextStream, (IUnknown *)&stream->ITextStream_iface, &stream->classinfo); + *ret = &stream->ITextStream_iface; + + return S_OK; } static HRESULT WINAPI drive_QueryInterface(IDrive *iface, REFIID riid, void **obj) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 098060a90bb..894b6251f34 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2613,7 +2613,6 @@ static void test_DoOpenPipeStream(void) ok(ret, "Failed to create pipes.\n"); hr = pDoOpenPipeStream(piperead, ForReading, &stream_read); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { @@ -2624,9 +2623,13 @@ static void test_DoOpenPipeStream(void) ok(written == sizeof(testdata), "Write to anonymous pipe wrote %ld bytes.\n", written); hr = ITextStream_Read(stream_read, 4, &str); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!wcscmp(str, L"test"), "Unexpected data read %s.\n", wine_dbgstr_w(str)); - SysFreeString(str); + if (SUCCEEDED(hr)) + { + ok(!wcscmp(str, L"test"), "Unexpected data read %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + } ITextStream_Release(stream_read); } @@ -2635,7 +2638,6 @@ static void test_DoOpenPipeStream(void) ok(ret, "Unexpected return value.\n"); /* Stream takes ownership. */ ret = CloseHandle(piperead); - todo_wine ok(!ret, "Unexpected return value.\n"); /* Streams on both ends. */ @@ -2644,32 +2646,37 @@ static void test_DoOpenPipeStream(void) stream_read = NULL; hr = pDoOpenPipeStream(piperead, ForReading, &stream_read); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream_write = NULL; hr = pDoOpenPipeStream(pipewrite, ForWriting, &stream_write); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { str = SysAllocString(L"data"); hr = ITextStream_Write(stream_write, str); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Write(stream_read, str); + todo_wine ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); SysFreeString(str); hr = ITextStream_Read(stream_write, 1, &str); + todo_wine ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#lx.\n", hr); hr = ITextStream_Read(stream_read, 4, &str); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!wcscmp(str, L"data"), "Unexpected data.\n"); - SysFreeString(str); + if (SUCCEEDED(hr)) + { + ok(!wcscmp(str, L"data"), "Unexpected data.\n"); + SysFreeString(str); + } } if (stream_read) -- 2.34.1

1 0

[PATCH 0/3] Better support of 32bit debuggees in 64bit winedbg
by Eric Pouech 17 Feb '22

17 Feb '22

This serie fixes a couple of bugs in 64bit instance of winedbg handling a 64 bit target. The third one is mostly cosmetic (don't print 16 digits for 32 bit addresses). A+ --- Eric Pouech (3): programs/winedbg: correctly read register values dlls/dbghelp: correctly promote to 64bit register relative offsets programs/winedbg: rework printing of pointer values dlls/dbghelp/symbol.c | 2 +- programs/winedbg/be_i386.c | 8 +++--- programs/winedbg/be_x86_64.c | 9 ++++--- programs/winedbg/break.c | 14 +++++----- programs/winedbg/debugger.h | 6 ++--- programs/winedbg/gdbproxy.c | 9 ++++--- programs/winedbg/info.c | 17 ++++++------ programs/winedbg/memory.c | 49 +++++++---------------------------- programs/winedbg/stack.c | 11 ++++---- programs/winedbg/symbol.c | 10 +++---- programs/winedbg/tgt_active.c | 41 +++++++++++++++-------------- programs/winedbg/winedbg.c | 3 ++- 12 files changed, 78 insertions(+), 101 deletions(-)

1 3

[PATCH 1/5] dlls/ntdll/tests: fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION
by Eric Pouech 17 Feb '22

17 Feb '22

this prevents mingw-gcc version 11 to generate warnings (-Warray-bounds) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e9d42127c3e..d6b323dd9d7 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1461,7 +1461,7 @@ static void test_query_firmware(void) NTSTATUS status; SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti; - sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + sfti = HeapAlloc(GetProcessHeap(), 0, sizeof(*sfti)); ok(!!sfti, "Failed to allocate memory\n"); sfti->ProviderSignature = 0;

1 4

[PATCH v2 4/4] ncrypt: Add NCryptVerifySignature stub.
by Hans Leidekker 17 Feb '22

17 Feb '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> With this change now some applications which uses ncrypt for signature validation work. For example, the visual studio installer (using dotnet from winetricks). Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 8 ++++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 2c2a0dc6f56..2a804109dec 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -367,3 +367,11 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name return set_object_property(object, name, input, insize); } + +SECURITY_STATUS NCryptVerifySignature(NCRYPT_KEY_HANDLE handle, void *padding, BYTE *hash, DWORD hash_size, + BYTE *signature, DWORD signature_size, DWORD flags) +{ + FIXME("(%#Ix, %p, %p, %lu, %p, %lu, %#lx): stub\n", handle, padding, hash, hash_size, signature, + signature_size, flags); + return ERROR_SUCCESS; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 0e92609790c..bb914616373 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -101,7 +101,7 @@ @ stub NCryptUnprotectKey @ stub NCryptUnprotectSecret @ stub NCryptVerifyClaim -@ stub NCryptVerifySignature +@ stdcall NCryptVerifySignature(ptr ptr ptr long ptr long long) @ stub SslChangeNotify @ stub SslComputeClientAuthHash @ stub SslComputeEapKeyBlock -- 2.30.2

1 0

[PATCH v2 3/4] ncrypt: NCryptGetProperty should always fill result size.
by Hans Leidekker 17 Feb '22

17 Feb '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 7 ++----- dlls/ncrypt/tests/ncrypt.c | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 82ce7a0b4dc..2c2a0dc6f56 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -165,11 +165,8 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name if (flags) FIXME("flags %#lx not supported\n", flags); if (!(property = get_object_property(object, name))) return NTE_INVALID_PARAMETER; - if (!output) - { - *result = property->value_size; - return ERROR_SUCCESS; - } + *result = property->value_size; + if (!output) return ERROR_SUCCESS; if (outsize < property->value_size) return NTE_BUFFER_TOO_SMALL; memcpy(output, property->value, property->value_size); diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 070b0c3f13e..891e5b60254 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -186,9 +186,7 @@ static void test_get_property(void) value[0] = 0; ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)value, sizeof(value), &size, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { ok(size == 8, "got %lu\n", size); - } ok(!lstrcmpW(value, L"RSA"), "The string doesn't match with 'RSA'\n"); size = 0; -- 2.30.2

1 0

[PATCH v2 2/4] ncrypt: Set a couple of key properties.
by Hans Leidekker 17 Feb '22

17 Feb '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Initialize test variables and change title to better reflect the patch. Squash patch 5 into this one. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 100 ++++++++++++++++++---------------- dlls/ncrypt/ncrypt_internal.h | 1 + dlls/ncrypt/tests/ncrypt.c | 22 ++++++-- include/ncrypt.h | 34 ++++++++++++ 4 files changed, 104 insertions(+), 53 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index ca70b2d92c3..82ce7a0b4dc 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -184,6 +184,53 @@ static struct object *allocate_object(enum object_type type) return ret; } +static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +{ + struct object_property *property; + + FIXME("check duplicates\n"); + if (!object->num_properties) + { + if (!(object->properties = malloc(sizeof(*property)))) + { + ERR("Error allocating memory."); + return NTE_NO_MEMORY; + } + property = &object->properties[object->num_properties++]; + } + else + { + struct object_property *tmp; + if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) + { + ERR("Error allocating memory."); + return NTE_NO_MEMORY; + } + object->properties = tmp; + property = &object->properties[object->num_properties++]; + } + + memset(property, 0, sizeof(*property)); + if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) + { + ERR("Error allocating memory."); + return NTE_NO_MEMORY; + } + + lstrcpyW(property->key, name); + property->value_size = value_size; + if (!(property->value = malloc(value_size))) + { + ERR("Error allocating memory."); + free(property->key); + property->key = NULL; + return NTE_NO_MEMORY; + } + + memcpy(property->value, value, value_size); + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *handle, BYTE *data, DWORD datasize, DWORD flags) @@ -244,6 +291,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H key = &object->key; key->alg = RSA; + key->rsa.bit_length = rsaheader->BitLength; key->rsa.public_exp_size = rsaheader->cbPublicExp; key->rsa.modulus_size = rsaheader->cbModulus; if (!(key->rsa.public_exp = malloc(rsaheader->cbPublicExp))) @@ -261,10 +309,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H } public_exp = &data[sizeof(*rsaheader)]; /* The public exp is after the header. */ - modulus = &public_exp[rsaheader->cbPublicExp]; /* The modulus is after the public exp. */ + modulus = &public_exp[rsaheader->cbPublicExp]; /* The modulus is after the public exponent. */ memcpy(key->rsa.public_exp, public_exp, rsaheader->cbPublicExp); memcpy(key->rsa.modulus, modulus, rsaheader->cbModulus); + set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)L"RSA", sizeof(L"RSA")); + set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&key->rsa.bit_length, sizeof(key->rsa.bit_length)); + set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); *handle = (NCRYPT_KEY_HANDLE)object; break; } @@ -310,53 +361,6 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c return ERROR_SUCCESS; } -static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) -{ - struct object_property *property; - - FIXME("check duplicates\n"); - if (!object->num_properties) - { - if (!(object->properties = malloc(sizeof(*property)))) - { - ERR("Error allocating memory."); - return NTE_NO_MEMORY; - } - property = &object->properties[object->num_properties++]; - } - else - { - struct object_property *tmp; - if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) - { - ERR("Error allocating memory."); - return NTE_NO_MEMORY; - } - object->properties = tmp; - property = &object->properties[object->num_properties++]; - } - - memset(property, 0, sizeof(*property)); - if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) - { - ERR("Error allocating memory."); - return NTE_NO_MEMORY; - } - - lstrcpyW(property->key, name); - property->value_size = value_size; - if (!(property->value = malloc(value_size))) - { - ERR("Error allocating memory."); - free(property->key); - property->key = NULL; - return NTE_NO_MEMORY; - } - - memcpy(property->value, value, value_size); - return ERROR_SUCCESS; -} - SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name, BYTE *input, DWORD insize, DWORD flags) { struct object *object = (struct object *)handle; diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index fe5f27ea1eb..3966dd73ed6 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -26,6 +26,7 @@ enum key_algorithm struct rsa_key { + DWORD bit_length; DWORD public_exp_size; BYTE *public_exp; DWORD modulus_size; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 23205d989f0..070b0c3f13e 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -169,7 +169,7 @@ static void test_get_property(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; WCHAR value[4]; - DWORD size; + DWORD keylength, size; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); @@ -177,17 +177,29 @@ static void test_get_property(void) ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { - ret = NCryptGetProperty(key, L"Algorithm Group", NULL, 0, &size, 0); + size = 0; + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, NULL, 0, &size, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(size == 8, "got %lu\n", size); size = 0; - ret = NCryptGetProperty(key, L"Algorithm Group", (BYTE *)value, sizeof(value), &size, 0); + value[0] = 0; + ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)value, sizeof(value), &size, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + todo_wine { ok(size == 8, "got %lu\n", size); - ok(!lstrcmpW(value, L"RSA"), "The string doesn't match with 'RSA'\n"); } + ok(!lstrcmpW(value, L"RSA"), "The string doesn't match with 'RSA'\n"); + + size = 0; + ret = NCryptGetProperty(key, NCRYPT_LENGTH_PROPERTY, NULL, 0, &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == sizeof(DWORD), "got %lu\n", size); + + keylength = 0; + ret = NCryptGetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, size, &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(keylength == 1024, "got %lu\n", keylength); NCryptFreeObject(prov); } diff --git a/include/ncrypt.h b/include/ncrypt.h index 5a8ba7e88fc..f7372b30621 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -71,6 +71,40 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_SILENT_FLAG 0x00000040 +#define NCRYPT_NAME_PROPERTY L"Name" +#define NCRYPT_UNIQUE_NAME_PROPERTY L"Unique Name" +#define NCRYPT_ALGORITHM_PROPERTY L"Algorithm Name" +#define NCRYPT_LENGTH_PROPERTY L"Length" +#define NCRYPT_LENGTHS_PROPERTY L"Lengths" +#define NCRYPT_BLOCK_LENGTH_PROPERTY L"Block Length" +#define NCRYPT_UI_POLICY_PROPERTY L"UI Policy" +#define NCRYPT_EXPORT_POLICY_PROPERTY L"Export Policy" +#define NCRYPT_WINDOW_HANDLE_PROPERTY L"HWND Handle" +#define NCRYPT_USE_CONTEXT_PROPERTY L"Use Context" +#define NCRYPT_IMPL_TYPE_PROPERTY L"Impl Type" +#define NCRYPT_KEY_USAGE_PROPERTY L"Key Usage" +#define NCRYPT_KEY_TYPE_PROPERTY L"Key Type" +#define NCRYPT_VERSION_PROPERTY L"Version" +#define NCRYPT_SECURITY_DESCR_SUPPORT_PROPERTY L"Security Descr Support" +#define NCRYPT_SECURITY_DESCR_PROPERTY L"Security Descr" +#define NCRYPT_USE_COUNT_ENABLED_PROPERTY L"Enabled Use Count" +#define NCRYPT_USE_COUNT_PROPERTY L"Use Count" +#define NCRYPT_LAST_MODIFIED_PROPERTY L"Modified" +#define NCRYPT_MAX_NAME_LENGTH_PROPERTY L"Max Name Length" +#define NCRYPT_ALGORITHM_GROUP_PROPERTY L"Algorithm Group" +#define NCRYPT_PROVIDER_HANDLE_PROPERTY L"Provider Handle" +#define NCRYPT_PIN_PROPERTY L"SmartCardPin" +#define NCRYPT_READER_PROPERTY L"SmartCardReader" +#define NCRYPT_SMARTCARD_GUID_PROPERTY L"SmartCardGuid" +#define NCRYPT_CERTIFICATE_PROPERTY L"SmartCardKeyCertificate" +#define NCRYPT_PIN_PROMPT_PROPERTY L"SmartCardPinPrompt" +#define NCRYPT_USER_CERTSTORE_PROPERTY L"SmartCardUserCertStore" +#define NCRYPT_ROOT_CERTSTORE_PROPERTY L"SmartcardRootCertStore" +#define NCRYPT_SECURE_PIN_PROPERTY L"SmartCardSecurePin" +#define NCRYPT_ASSOCIATED_ECDH_KEY L"SmartCardAssociatedECDHKey" +#define NCRYPT_SCARD_PIN_ID L"SmartCardPinId" +#define NCRYPT_SCARD_PIN_INFO L"SmartCardPinInfo" + SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); -- 2.30.2

1 0

[PATCH v2 1/4] ncrypt: Fix resizing property array.
by Hans Leidekker 17 Feb '22

17 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6b1a87ea785..ca70b2d92c3 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -312,7 +312,7 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) { - struct object_property *property = &object->properties[object->num_properties]; + struct object_property *property; FIXME("check duplicates\n"); if (!object->num_properties) @@ -322,18 +322,18 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n ERR("Error allocating memory."); return NTE_NO_MEMORY; } - object->num_properties++; + property = &object->properties[object->num_properties++]; } else { struct object_property *tmp; - if (!(tmp = realloc(object->properties, sizeof(*property) * object->num_properties + 1))) + if (!(tmp = realloc(object->properties, sizeof(*property) * (object->num_properties + 1)))) { ERR("Error allocating memory."); return NTE_NO_MEMORY; } object->properties = tmp; - object->num_properties++; + property = &object->properties[object->num_properties++]; } memset(property, 0, sizeof(*property)); -- 2.30.2

1 0

[PATCH] mfplat: Fix playback rate handling in system time source.
by Nikolay Sivov 17 Feb '22

17 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 49 ++++++++++++++++---------------------- dlls/mfplat/tests/mfplat.c | 25 +++++++++++++++++++ 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1992776595d..7991152f7a7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -124,17 +124,20 @@ struct system_time_source MFCLOCK_STATE state; IMFClock *clock; LONGLONG start_offset; + LONGLONG system_time; + LONGLONG clock_time; float rate; int i_rate; CRITICAL_SECTION cs; }; -static void system_time_source_apply_rate(const struct system_time_source *source, LONGLONG *value) +static void system_time_source_update_clock_time(struct system_time_source *source, LONGLONG system_time) { - if (source->i_rate) - *value *= source->i_rate; - else - *value *= source->rate; + LONGLONG diff = system_time - source->system_time; + if (source->i_rate) diff *= source->i_rate; + else if (source->rate != 1.0f) diff *= source->rate; + source->clock_time += diff; + source->system_time = system_time; } static struct system_time_source *impl_from_IMFPresentationTimeSource(IMFPresentationTimeSource *iface) @@ -8076,12 +8079,8 @@ static HRESULT WINAPI system_time_source_GetCorrelatedTime(IMFPresentationTimeSo if (SUCCEEDED(hr = IMFClock_GetCorrelatedTime(source->clock, 0, clock_time, system_time))) { if (source->state == MFCLOCK_STATE_RUNNING) - { - system_time_source_apply_rate(source, clock_time); - *clock_time += source->start_offset; - } - else - *clock_time = source->start_offset; + system_time_source_update_clock_time(source, *system_time); + *clock_time = source->start_offset + source->clock_time; } LeaveCriticalSection(&source->cs); @@ -8220,25 +8219,19 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if state = source->state; if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_START))) { - system_time_source_apply_rate(source, &system_time); if (start_offset == PRESENTATION_CURRENT_POSITION) { - switch (state) + if (state != MFCLOCK_STATE_RUNNING) { - case MFCLOCK_STATE_RUNNING: - break; - case MFCLOCK_STATE_PAUSED: - source->start_offset -= system_time; - break; - default: - source->start_offset = -system_time; - break; - ; + source->start_offset -= system_time; + source->system_time = 0; } } else { - source->start_offset = -system_time + start_offset; + source->start_offset = start_offset; + source->system_time = system_time; + source->clock_time = 0; } } LeaveCriticalSection(&source->cs); @@ -8255,7 +8248,9 @@ static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *ifa EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_STOP))) - source->start_offset = 0; + { + source->start_offset = source->system_time = source->clock_time = 0; + } LeaveCriticalSection(&source->cs); return hr; @@ -8271,8 +8266,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *if EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE))) { - system_time_source_apply_rate(source, &system_time); - source->start_offset += system_time; + system_time_source_update_clock_time(source, system_time); } LeaveCriticalSection(&source->cs); @@ -8289,8 +8283,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink * EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_RESTART))) { - system_time_source_apply_rate(source, &system_time); - source->start_offset -= system_time; + source->system_time = system_time; } LeaveCriticalSection(&source->cs); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c013b7b5c23..91c9d971a3b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3641,6 +3641,31 @@ static void test_system_time_source(void) hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + hr = IMFClockStateSink_OnClockSetRate(statesink, 5, 2.0f); + ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockPause(statesink, 6); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 12 && !!systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockRestart(statesink, 7); + ok(hr == S_OK, "Failed to restart source, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockPause(statesink, 8); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 14 && !!systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); ok(hr == S_OK, "Failed to get time %#x.\n", hr); ok(time == 2 * systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), -- 2.34.1

2 1

[PATCH vkd3d 6/6] vkd3d-shader/hlsl: Reroute initialization towards a generic variable initializer.
by Francisco Casas 17 Feb '22

17 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 103 ++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 61 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9cb14f52..547eb00b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1476,14 +1476,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var struct hlsl_struct_field *field; unsigned int i = 0; - if (initializer_size(initializer) != hlsl_type_component_count(type)) - { - hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", - hlsl_type_component_count(type), initializer_size(initializer)); - return; - } - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { struct hlsl_ir_node *node = initializer->args[i]; @@ -1510,6 +1502,28 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var } } +static void initialize_generic_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, + struct parse_initializer *initializer, unsigned int reg_offset, struct hlsl_type *type, + unsigned int *initializer_offset) +{ + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + initialize_numeric_var(ctx, var, initializer, reg_offset, type, initializer_offset); + } + else if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, var, initializer); + } + else if (type->type == HLSL_CLASS_ARRAY) + { + hlsl_fixme(ctx, &var->loc, "Initializers for arrays not supported yet."); + } + else if (type->type == HLSL_CLASS_OBJECT) + { + hlsl_fixme(ctx, &var->loc, "Initializers for objects not supported yet."); + } +} + static void free_parse_variable_def(struct parse_variable_def *v) { free_parse_initializer(&v->initializer); @@ -1633,69 +1647,36 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.args_count != 1 - && type->dimx * type->dimy != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, var, &v->initializer); - list_move_tail(statements_list, v->initializer.instrs); - - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - if (v->arrays.count) - vkd3d_free(v->arrays.sizes); - vkd3d_free(v); - continue; - } - if (v->arrays.count) - { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v); - continue; - } - if (v->initializer.args_count > 1) { + unsigned int size = initializer_size(&v->initializer); unsigned int initializer_offset = 0; - flatten_parse_initializer(ctx, &v->initializer); - if (v->initializer.args_count != size) + if (hlsl_type_component_count(type) != size) { - hlsl_fixme(ctx, &v->loc, "Could not flatten initializer."); + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); free_parse_initializer(&v->initializer); + if (v->arrays.count) + vkd3d_free(v->arrays.sizes); vkd3d_free(v); continue; } - initialize_numeric_var(ctx, var, &v->initializer, 0, type, &initializer_offset); + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + flatten_parse_initializer(ctx, &v->initializer); + if (v->initializer.args_count != size) + { + hlsl_fixme(ctx, &v->loc, "Could not flatten initializer."); + free_parse_initializer(&v->initializer); + if (v->arrays.count) + vkd3d_free(v->arrays.sizes); + vkd3d_free(v); + continue; + } + } + initialize_generic_var(ctx, var, &v->initializer, 0, type, &initializer_offset); } else { -- 2.25.1

2 1

[PATCH vkd3d 5/6] vkd3d-shader/hlsl: Remove instruction list parameter in struct_var_initializer().
by Francisco Casas 17 Feb '22

17 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a24192a3..9cb14f52 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1469,7 +1469,7 @@ static void initialize_numeric_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var } } -static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, +static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_initializer *initializer) { struct hlsl_type *type = var->data_type; @@ -1481,13 +1481,9 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), initializer_size(initializer)); - free_parse_initializer(initializer); return; } - list_move_tail(list, initializer->instrs); - vkd3d_free(initializer->instrs); - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { struct hlsl_ir_node *node = initializer->args[i]; @@ -1501,19 +1497,17 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru { if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) break; - list_add_tail(list, &c->node.entry); + list_add_tail(initializer->instrs, &c->node.entry); if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) break; - list_add_tail(list, &store->node.entry); + list_add_tail(initializer->instrs, &store->node.entry); } else { hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer."); } } - - vkd3d_free(initializer->args); } static void free_parse_variable_def(struct parse_variable_def *v) @@ -1663,7 +1657,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type->type == HLSL_CLASS_STRUCT) { - struct_var_initializer(ctx, statements_list, var, &v->initializer); + struct_var_initializer(ctx, var, &v->initializer); + list_move_tail(statements_list, v->initializer.instrs); + + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

2 1

[PATCH vkd3d 4/6] vkd3d-shader/hlsl: Flatten initializers.
by Francisco Casas 17 Feb '22

17 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 106 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bcc9e4d7..a24192a3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1321,6 +1321,109 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } +static void append_node_components(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *node, struct hlsl_ir_node **comps, unsigned int *comps_count, + const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = node->data_type; + + switch (type->type) + { + case HLSL_CLASS_SCALAR: + { + comps[*comps_count] = node; + *comps_count += 1; + break; + } + case HLSL_CLASS_VECTOR: + { + struct hlsl_type *cast_type = hlsl_get_scalar_type(ctx, type->base_type); + struct hlsl_ir_swizzle *swizzle; + struct hlsl_ir_node *cast; + unsigned int i; + + for (i = 0; i < type->dimx; i++) + { + if (!(swizzle = hlsl_new_swizzle(ctx, hlsl_swizzle_from_writemask(1 << i), 1, node, loc))) + return; + list_add_tail(instrs, &swizzle->node.entry); + + if (!(cast = add_implicit_conversion(ctx, instrs, &swizzle->node, cast_type, loc))) + return; + + comps[*comps_count] = cast; + *comps_count += 1; + } + break; + } + case HLSL_CLASS_MATRIX: + { + hlsl_fixme(ctx, loc, "Flattening of matrices."); + break; + } + case HLSL_CLASS_STRUCT: + { + struct hlsl_struct_field *field; + struct hlsl_ir_load *load; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!(load = add_record_load(ctx, instrs, node, field, *loc))) + return; + + append_node_components(ctx, instrs, &load->node, comps, comps_count, loc); + } + break; + } + case HLSL_CLASS_ARRAY: + { + struct hlsl_ir_constant *c; + struct hlsl_ir_load *load; + unsigned int i; + + for (i = 0; i < type->e.array.elements_count; i++) + { + if (!(c = hlsl_new_uint_constant(ctx, i, *loc))) + return; + list_add_tail(instrs, &c->node.entry); + + if (!(load = add_array_load(ctx, instrs, node, &c->node, *loc))) + return; + + append_node_components(ctx, instrs, &load->node, comps, comps_count, loc); + } + break; + } + case HLSL_CLASS_OBJECT: + { + hlsl_fixme(ctx, loc, "Flattening of objects."); + break; + } + } +} + +static void flatten_parse_initializer(struct hlsl_ctx *ctx, struct parse_initializer *initializer) +{ + unsigned int size = initializer_size(initializer); + unsigned int new_args_count = 0; + struct hlsl_ir_node **new_args; + unsigned int i = 0; + + new_args = hlsl_alloc(ctx, size * sizeof(struct hlsl_ir_node *)); + if (!new_args) + return; + + for (i = 0; i < initializer->args_count; i++) + { + append_node_components(ctx, initializer->instrs, initializer->args[i], new_args, + &new_args_count, &initializer->args[i]->loc); + } + + vkd3d_free(initializer->args); + initializer->args = new_args; + initializer->args_count = new_args_count; +} + static void initialize_numeric_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_initializer *initializer, unsigned int reg_offset, struct hlsl_type *type, unsigned int *initializer_offset) @@ -1586,9 +1689,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t { unsigned int initializer_offset = 0; + flatten_parse_initializer(ctx, &v->initializer); if (v->initializer.args_count != size) { - hlsl_fixme(ctx, &v->loc, "Flatten initializer."); + hlsl_fixme(ctx, &v->loc, "Could not flatten initializer."); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; -- 2.25.1

2 1

[PATCH 01/28] programs/cmd: enable compilation with long types
by Eric Pouech 17 Feb '22

17 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/Makefile.in | 1 - programs/cmd/builtins.c | 20 ++++++++++---------- programs/cmd/directory.c | 4 ++-- programs/cmd/wcmdmain.c | 14 +++++++------- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in index 8c8489af727..b3b33aa1413 100644 --- a/programs/cmd/Makefile.in +++ b/programs/cmd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cmd.exe IMPORTS = shell32 user32 advapi32 diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2fc7e07f7aa..963a9eaf361 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -344,7 +344,7 @@ void WCMD_choice (const WCHAR * args) { } if (opt_timeout) - WINE_FIXME("timeout not supported: %c,%d\n", opt_default, opt_timeout); + WINE_FIXME("timeout not supported: %c,%ld\n", opt_default, opt_timeout); if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), 0); @@ -396,7 +396,7 @@ void WCMD_choice (const WCHAR * args) { SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); errorlevel = (ptr - opt_c) + 1; - WINE_TRACE("answer: %d\n", errorlevel); + WINE_TRACE("answer: %ld\n", errorlevel); heap_free(my_command); return; } @@ -427,12 +427,12 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(filename), GetLastError()); return FALSE; } else { SetFilePointer (h, 0, NULL, FILE_END); if (!WriteFile(h, &eof, 1, &bytes_written, NULL)) { - WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + WINE_ERR("Failed to append EOF to %s (%ld)\n", wine_dbgstr_w(filename), GetLastError()); CloseHandle(h); return FALSE; } @@ -491,7 +491,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app in = CreateFileW(srcname, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (in == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(srcname), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(srcname), GetLastError()); return FALSE; } @@ -499,7 +499,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app out = CreateFileW(dstname, GENERIC_WRITE, 0, NULL, append?OPEN_EXISTING:CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (out == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(dstname), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(dstname), GetLastError()); CloseHandle(in); return FALSE; } @@ -526,12 +526,12 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app if (bytesread) { ok = WriteFile(out, buffer, bytesread, &byteswritten, NULL); if (!ok || byteswritten != bytesread) { - WINE_ERR("Unexpected failure writing to %s, rc=%d\n", + WINE_ERR("Unexpected failure writing to %s, rc=%ld\n", wine_dbgstr_w(dstname), GetLastError()); } } } else { - WINE_ERR("Unexpected failure reading from %s, rc=%d\n", + WINE_ERR("Unexpected failure reading from %s, rc=%ld\n", wine_dbgstr_w(srcname), GetLastError()); } } while (ok && bytesread > 0); @@ -2442,7 +2442,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (useNumbers) { WCHAR thisNum[20]; - WINE_TRACE("FOR /L provided range from %d to %d step %d\n", + WINE_TRACE("FOR /L provided range from %ld to %ld step %ld\n", numbers[0], numbers[2], numbers[1]); for (i=numbers[0]; (numbers[1]<0)? i>=numbers[2] : i<=numbers[2]; @@ -4775,7 +4775,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { /* Open a key to HKEY_CLASSES_ROOT for enumerating */ if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"", 0, accessOptions, &key) != ERROR_SUCCESS) { - WINE_FIXME("Unexpected failure opening HKCR key: %d\n", GetLastError()); + WINE_FIXME("Unexpected failure opening HKCR key: %ld\n", GetLastError()); return; } diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 807f7b386b1..8417687939a 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -536,7 +536,7 @@ static void WCMD_dir_trailer(WCHAR drive) { driveName[0] = drive; status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes); - WINE_TRACE("Writing trailer for '%s' gave %d(%d)\n", wine_dbgstr_w(driveName), + WINE_TRACE("Writing trailer for '%s' gave %ld(%ld)\n", wine_dbgstr_w(driveName), status, GetLastError()); if (errorlevel==0 && !bare) { @@ -727,7 +727,7 @@ void WCMD_directory (WCHAR *args) p++; } p = p - 1; /* So when step on, move to '/' */ - WINE_TRACE("Result: showattrs %x, bits %x\n", showattrs, attrsbits); + WINE_TRACE("Result: showattrs %lx, bits %lx\n", showattrs, attrsbits); break; default: SetLastError(ERROR_INVALID_PARAMETER); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 65601348b05..af54b209d83 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -132,7 +132,7 @@ void WINAPIV WCMD_output (const WCHAR *format, ...) { format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { WCMD_output_asis_len(string, len, GetStdHandle(STD_OUTPUT_HANDLE)); @@ -157,7 +157,7 @@ void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) { format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { WCMD_output_asis_len(string, len, GetStdHandle(STD_ERROR_HANDLE)); @@ -181,7 +181,7 @@ WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...) format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); string = (WCHAR*)LocalAlloc(LMEM_FIXED, 2); *string = 0; } @@ -303,7 +303,7 @@ void WCMD_print_error (void) { status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPWSTR) &lpMsgBuf, 0, NULL); if (!status) { - WINE_FIXME ("Cannot display message for error %d, status %d\n", + WINE_FIXME ("Cannot display message for error %ld, status %ld\n", error_code, GetLastError()); return; } @@ -1462,7 +1462,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, GetCurrentProcess(), &h, 0, TRUE, DUPLICATE_SAME_ACCESS) == 0) { - WINE_FIXME("Duplicating handle failed with gle %d\n", GetLastError()); + WINE_FIXME("Duplicating handle failed with gle %ld\n", GetLastError()); } WINE_TRACE("Redirect %d (%p) to %d (%p)\n", handle, GetStdHandle(idx_stdhandles[idx]), idx, h); @@ -1664,7 +1664,7 @@ WCHAR *WCMD_LoadMessage(UINT id) { static WCHAR msg[2048]; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); lstrcpyW(msg, L"Failed!"); } return msg; @@ -2442,7 +2442,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) /* Pre initialize some messages */ lstrcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY)); - sprintf(osver, "%d.%d.%d", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); + sprintf(osver, "%ld.%ld.%ld", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); cmd = WCMD_format_string(WCMD_LoadMessage(WCMD_VERSION), osver); lstrcpyW(version_string, cmd); LocalFree(cmd);

2 29

[PATCH] mf/tests: Add some tests for rate support in SAR.
by Nikolay Sivov 17 Feb '22

17 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 110 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b3f50665e79..63df50cf3b8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3842,6 +3842,108 @@ static void test_quality_manager(void) ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } +static void check_sar_rate_support(IMFMediaSink *sink) +{ + IMFRateSupport *rate_support; + IMFMediaTypeHandler *handler; + IMFStreamSink *stream_sink; + IMFMediaType *media_type; + HRESULT hr; + float rate; + + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFRateSupport, (void **)&rate_support); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) return; + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + if (hr == MF_E_SHUTDOWN) + { + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFRateSupport_Release(rate_support); + return; + } + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &handler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFStreamSink_Release(stream_sink); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + if (SUCCEEDED(hr)) + { + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + } + else + { + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + } + + IMFMediaTypeHandler_Release(handler); + IMFRateSupport_Release(rate_support); +} + static void test_sar(void) { IMFPresentationClock *present_clock, *present_clock2; @@ -4073,9 +4175,13 @@ if (SUCCEEDED(hr)) IMFMediaType_Release(mediatype); + check_sar_rate_support(sink); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype2); ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + check_sar_rate_support(sink); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(mediatype == mediatype2, "Unexpected instance.\n"); @@ -4184,6 +4290,8 @@ if (SUCCEEDED(hr)) hr = IMFMediaSink_GetPresentationClock(sink, &present_clock2); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + check_sar_rate_support(sink); + IMFMediaSink_Release(sink); /* Activation */ @@ -4253,6 +4361,8 @@ if (SUCCEEDED(hr)) hr = MFCreateAudioRenderer(attributes, &sink); ok(hr == MF_E_NO_AUDIO_PLAYBACK_DEVICE, "Failed to create a sink, hr %#x.\n", hr); + IMFAttributes_Release(attributes); + CoUninitialize(); } -- 2.34.1

1 0

[PATCH vkd3d 3/6] vkd3d-shader/hlsl: Support complex numeric initializers.
by Francisco Casas 17 Feb '22

17 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.y | 93 +++++++++++++++++++++++++++++++--------- 2 files changed, 73 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index 491537f6..85611daf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -310,7 +310,6 @@ XFAIL_TESTS = \ tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-nested.shader_test \ - tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4ec36b76..bcc9e4d7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1321,6 +1321,51 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } +static void initialize_numeric_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, + struct parse_initializer *initializer, unsigned int reg_offset, struct hlsl_type *type, + unsigned int *initializer_offset) +{ + unsigned int i; + + if (type->type == HLSL_CLASS_MATRIX) + hlsl_fixme(ctx, &var->loc, "Matrix initializer."); + + for (i = 0; i < type->dimx; i++) + { + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *node; + + node = initializer->args[*initializer_offset]; + *initializer_offset += 1; + + if (!(node = add_implicit_conversion(ctx, initializer->instrs, node, + hlsl_get_scalar_type(ctx, type->base_type), &node->loc))) + return; + + if (hlsl_type_is_single_reg(var->data_type)) + { + if (!(c = hlsl_new_uint_constant(ctx, reg_offset, node->loc))) + return; + list_add_tail(initializer->instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, (1u << i), node->loc))) + return; + } + else + { + if (!(c = hlsl_new_uint_constant(ctx, reg_offset + i, node->loc))) + return; + list_add_tail(initializer->instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) + return; + } + + list_add_tail(initializer->instrs, &store->node.entry); + } +} + static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, struct parse_initializer *initializer) { @@ -1492,20 +1537,16 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.args_count != 1 + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) @@ -1540,23 +1581,35 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } + if (v->initializer.args_count > 1) { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; + unsigned int initializer_offset = 0; + + if (v->initializer.args_count != size) + { + hlsl_fixme(ctx, &v->loc, "Flatten initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + initialize_numeric_var(ctx, var, &v->initializer, 0, type, &initializer_offset); } + else + { + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } -- 2.25.1

2 4

[tools v2] testbot/SetWinLocale: Simplify sending the Powershell script.
by Francois Gouget 17 Feb '22

17 Feb '22

Converting the line endings to CR+LF is not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Rediffed. I think v1 failed to apply because GetWinProperties() took the place of GetWinSettings(). --- testbot/bin/SetWinLocale | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 73c774e6e4..670de46043 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -662,20 +662,9 @@ sub RegGetValue($;$) # Show the host's locale settings # -if (open(my $fh, "<", "$0.ps1")) +if (!$TA->SendFile("$0.ps1", "$name0.ps1", 0)) { - my $Script = join("", <$fh>); - close($fh); - - $Script =~ s~\n~\r\n~g; - if (!$TA->SendFileFromString($Script, "$name0.ps1", 0)) - { - FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); - } -} -else -{ - FatalError("could not open '$0.ps1' for reading: $!\n"); + FatalError("could not send the Powershell script:", $TA->GetLastError(), "\n"); } sub GetWinProperties($) -- 2.30.2

1 0

[PATCH 1/5] mf/tests: Add some H264 decoder creation tests.
by Rémi Bernon 17 Feb '22

17 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c4d318a9e43..add48be964a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6135,6 +6135,65 @@ failed: CoUninitialize(); } +static void test_h264_decoder(void) +{ + static const media_type_desc transform_inputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264_ES), + }, + }; + static const media_type_desc transform_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), + }, + }; + + MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; + IMFTransform *transform; + GUID class_id; + HRESULT hr; + ULONG ret; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + if (!create_transform(MFT_CATEGORY_VIDEO_DECODER, &input_type, &output_type, L"Microsoft H264 Video Decoder MFT", + transform_inputs, ARRAY_SIZE(transform_inputs), transform_outputs, ARRAY_SIZE(transform_outputs), + &transform, &class_id)) + goto failed; + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %u\n", ret); + +failed: + CoUninitialize(); +} + START_TEST(mf) { init_functions(); @@ -6170,4 +6229,5 @@ START_TEST(mf) test_MFRequireProtectedEnvironment(); test_wma_encoder(); test_wma_decoder(); + test_h264_decoder(); } -- 2.34.1

2 9

[LEGAL] Contributing to comctrl32 with prior access to the Windows Research Kernel
by Angelo Haller 17 Feb '22

17 Feb '22

Can someone who has had access to the Windows Research Kernel (WRK) still submit patches to tests and comctrl32? The FAQ [0] states that some can still legally submit changes to certain components in certain cases. Is this one of them? As I understand comctrl32 is not part of the WRK. I have seen some scheduler code of the WRK through an assignment in university >~10 years ago. Nothing else. Can I still send in my fixes/patches regarding comctrl32/listview? Thanks, Angelo [0] https://wiki.winehq.org/Developer_FAQ

2 1

[PATCH 1/4] kernelbase: Allow the two initial slashes to be backslashes in UrlGetPart().
by Zebediah Figura 17 Feb '22

17 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 8 +++++++- dlls/shlwapi/tests/url.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index e29ee585123..befdf237c5e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4191,6 +4191,11 @@ static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators return url + wcslen( url ); } +static BOOL is_slash( char c ) +{ + return c == '/' || c == '\\'; +} + static void parse_url( const WCHAR *url, struct parsed_url *pl ) { const WCHAR *work; @@ -4200,7 +4205,8 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); if (!*work || (*work != ':')) return; work++; - if ((*work != '/') || (*(work+1) != '/')) return; + if (!is_slash( work[0] ) || !is_slash( work[1] )) + return; pl->username = work + 2; work = parse_url_element( pl->username, L":@/\\?#" ); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 18af0906e08..ae0d0738195 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -661,12 +661,12 @@ static void test_UrlGetPart(void) {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"ftp://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://host?a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host?a:b@c:d", URL_PART_QUERY, 0, S_OK, "a:b@c:d"}, -- 2.34.1

1 3

[PATCH 1/6] ncrypt: Fix null pointer.
by Santino Mazza 17 Feb '22

17 Feb '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6b1a87ea785..22e2e9089ef 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -322,6 +322,7 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n ERR("Error allocating memory."); return NTE_NO_MEMORY; } + property = &object->properties[object->num_properties]; object->num_properties++; } else -- 2.32.0

1 5

[PATCH 1/3] vcomp: Add tests for _vcomp_for_dynamic_init_i8()
by David Koller 17 Feb '22

17 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52012 Signed-off-by: David Koller <dk(a)cs.stanford.edu> --- dlls/vcomp/tests/vcomp.c | 247 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index a229e0198f7..19d56820450 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -87,7 +87,10 @@ static void (CDECL *p_vcomp_enter_critsect)(CRITICAL_SECTION **critsect); static void (CDECL *p_vcomp_flush)(void); static void (CDECL *p_vcomp_for_dynamic_init)(unsigned int flags, unsigned int first, unsigned int last, int step, unsigned int chunksize); +static void (CDECL *p_vcomp_for_dynamic_init_i8)(unsigned int flags, ULONG64 first, ULONG64 last, + LONG64 step, ULONG64 chunksize); static int (CDECL *p_vcomp_for_dynamic_next)(unsigned int *begin, unsigned int *end); +static int (CDECL *p_vcomp_for_dynamic_next_i8)(ULONG64 *begin, ULONG64 *end); static void (CDECL *p_vcomp_for_static_end)(void); static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, int chunksize, unsigned int *loops, int *begin, int *end, int *next, int *lastchunk); @@ -329,7 +332,9 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_enter_critsect); VCOMP_GET_PROC(_vcomp_flush); VCOMP_GET_PROC(_vcomp_for_dynamic_init); + VCOMP_GET_PROC(_vcomp_for_dynamic_init_i8); VCOMP_GET_PROC(_vcomp_for_dynamic_next); + VCOMP_GET_PROC(_vcomp_for_dynamic_next_i8); VCOMP_GET_PROC(_vcomp_for_static_end); VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_init_i8); @@ -1546,6 +1551,60 @@ static void CDECL for_dynamic_static_cb(void) ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); } +static void CDECL for_dynamic_static_i8_cb(void) +{ + ULONG64 my_begin, my_end, begin, end; + int ret; + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 0, 1000, 7, TRUE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 1000, 0, 7, FALSE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC, 1000, 0, 7, 1); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 0, 1000, 7, TRUE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); + + begin = end = 0xdeadbeef; + my_for_static_simple_init_i8(TRUE, 1000, 0, 7, FALSE, &my_begin, &my_end); + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_STATIC, 1000, 0, 7, 5); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == TRUE, "expected ret == TRUE, got %d\n", ret); + ok(begin == my_begin, "expected begin == %s, got %s\n", wine_dbgstr_longlong(my_begin), + wine_dbgstr_longlong(begin)); + ok(end == my_end, "expected end == %s, got %s\n", wine_dbgstr_longlong(my_end), + wine_dbgstr_longlong(end)); + ret = p_vcomp_for_dynamic_next_i8(&begin, &end); + ok(ret == FALSE, "expected ret == FALSE, got %d\n", ret); +} + static void CDECL for_dynamic_chunked_cb(LONG *a, LONG *b, LONG *c, LONG *d) { unsigned int begin, end; @@ -1583,6 +1642,47 @@ static void CDECL for_dynamic_chunked_cb(LONG *a, LONG *b, LONG *c, LONG *d) } } +static void CDECL for_dynamic_chunked_i8_cb(LONG64 *a, LONG64 *b, LONG64 *c, LONG64 *d) +{ + ULONG64 begin, end; + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 994) ok(end == 1000, "expected end == 1000, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin == end, "expected begin == end, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(a, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED, 1000, 0, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 6) ok(end == 0, "expected end == 0, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin == end, "expected begin == end, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(b, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 980) ok(end == 1000, "expected end == 1000, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin + 28 == end, "expected begin + 28 == end, got %s and %s\n", + wine_dbgstr_longlong(begin + 28), wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(c, begin); + } + + p_vcomp_for_dynamic_init_i8(VCOMP_DYNAMIC_FLAGS_CHUNKED, 1000, 0, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + if (begin == 20) ok(end == 0, "expected end == 0, got %s\n", wine_dbgstr_longlong(end)); + else ok(begin - 28 == end, "expected begin - 28 == end, got %s and %s\n", + wine_dbgstr_longlong(begin - 28), wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(d, begin); + } +} + static void CDECL for_dynamic_guided_cb(unsigned int flags, LONG *a, LONG *b, LONG *c, LONG *d) { int num_threads = pomp_get_num_threads(); @@ -1621,6 +1721,48 @@ static void CDECL for_dynamic_guided_cb(unsigned int flags, LONG *a, LONG *b, LO } } +static void CDECL for_dynamic_guided_i8_cb(unsigned int flags, LONG64 *a, LONG64 *b, LONG64 *c, LONG64 *d) +{ + int num_threads = pomp_get_num_threads(); + ULONG64 begin, end; + + p_vcomp_for_dynamic_init_i8(flags | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 0 && end == 1000), + "expected begin == 0 and end == 1000, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(a, begin); + } + + p_vcomp_for_dynamic_init_i8(flags, 1000, 0, 7, 1); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 1000 && end == 0), + "expected begin == 1000 and end == 0, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(b, begin); + } + + p_vcomp_for_dynamic_init_i8(flags | VCOMP_DYNAMIC_FLAGS_INCREMENT, 0, 1000, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 0 && end == 1000), + "expected begin == 0 and end == 1000, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(c, begin); + } + + p_vcomp_for_dynamic_init_i8(flags, 1000, 0, 7, 5); + while (p_vcomp_for_dynamic_next_i8(&begin, &end)) + { + ok(num_threads != 1 || (begin == 1000 && end == 0), + "expected begin == 1000 and end == 0, got %s and %s\n", wine_dbgstr_longlong(begin), + wine_dbgstr_longlong(end)); + InterlockedExchangeAdd64(d, begin); + } +} + static void test_vcomp_for_dynamic_init(void) { static const int guided_a[] = {0, 6041, 9072, 11179}; @@ -1725,6 +1867,110 @@ static void test_vcomp_for_dynamic_init(void) pomp_set_num_threads(max_threads); } +static void test_vcomp_for_dynamic_init_i8(void) +{ + static const int guided_a[] = {0, 6041, 9072, 11179}; + static const int guided_b[] = {1000, 1959, 2928, 3821}; + static const int guided_c[] = {0, 4067, 6139, 7273}; + static const int guided_d[] = {1000, 1933, 2861, 3727}; + LONG64 a, b, c, d; + int max_threads = pomp_get_max_threads(); + int i; + + /* test static scheduling */ + for_dynamic_static_i8_cb(); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 0, for_dynamic_static_i8_cb); + p_vcomp_fork(FALSE, 0, for_dynamic_static_i8_cb); + } + + /* test chunked scheduling */ + a = b = c = d = 0; + for_dynamic_chunked_i8_cb(&a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 4, for_dynamic_chunked_i8_cb, &a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 4, for_dynamic_chunked_i8_cb, &a, &b, &c, &d); + ok(a == 71071, "expected a == 71071, got %s\n", wine_dbgstr_longlong(a)); + ok(b == 71929, "expected b == 71929, got %s\n", wine_dbgstr_longlong(b)); + ok(c == 14210, "expected c == 14210, got %s\n", wine_dbgstr_longlong(c)); + ok(d == 14790, "expected d == 14790, got %s\n", wine_dbgstr_longlong(d)); + } + + /* test guided scheduling */ + a = b = c = d = 0; + for_dynamic_guided_i8_cb(VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 5, for_dynamic_guided_i8_cb, VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[i - 1], "expected a == %d, got %s\n", guided_a[i - 1], wine_dbgstr_longlong(a)); + ok(b == guided_b[i - 1], "expected b == %d, got %s\n", guided_b[i - 1], wine_dbgstr_longlong(b)); + ok(c == guided_c[i - 1], "expected c == %d, got %s\n", guided_c[i - 1], wine_dbgstr_longlong(c)); + ok(d == guided_d[i - 1], "expected d == %d, got %s\n", guided_d[i - 1], wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 5, for_dynamic_guided_i8_cb, VCOMP_DYNAMIC_FLAGS_GUIDED, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + } + + /* test with empty flags */ + a = b = c = d = 0; + for_dynamic_guided_i8_cb(0, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = d = 0; + p_vcomp_fork(TRUE, 5, for_dynamic_guided_i8_cb, 0, &a, &b, &c, &d); + ok(a == guided_a[i - 1], "expected a == %d, got %s\n", guided_a[i - 1], wine_dbgstr_longlong(a)); + ok(b == guided_b[i - 1], "expected b == %d, got %s\n", guided_b[i - 1], wine_dbgstr_longlong(b)); + ok(c == guided_c[i - 1], "expected c == %d, got %s\n", guided_c[i - 1], wine_dbgstr_longlong(c)); + ok(d == guided_d[i - 1], "expected d == %d, got %s\n", guided_d[i - 1], wine_dbgstr_longlong(d)); + + a = b = c = d = 0; + p_vcomp_fork(FALSE, 5, for_dynamic_guided_i8_cb, 0, &a, &b, &c, &d); + ok(a == guided_a[0], "expected a == %d, got %s\n", guided_a[0], wine_dbgstr_longlong(a)); + ok(b == guided_b[0], "expected b == %d, got %s\n", guided_b[0], wine_dbgstr_longlong(b)); + ok(c == guided_c[0], "expected c == %d, got %s\n", guided_c[0], wine_dbgstr_longlong(c)); + ok(d == guided_d[0], "expected d == %d, got %s\n", guided_d[0], wine_dbgstr_longlong(d)); + } + + pomp_set_num_threads(max_threads); +} + static void CDECL master_cb(HANDLE semaphore) { int num_threads = pomp_get_num_threads(); @@ -2644,6 +2890,7 @@ START_TEST(vcomp) test_vcomp_for_static_simple_init(); test_vcomp_for_static_init(); test_vcomp_for_dynamic_init(); + test_vcomp_for_dynamic_init_i8(); test_vcomp_master_begin(); test_vcomp_single_begin(); test_vcomp_enter_critsect(); -- 2.25.1

2 4

[PATCH 1/2] user32: Test Get/SetWindowPlacement with invalid length.
by Esme Povirk 16 Feb '22

16 Feb '22

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/user32/tests/win.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cb6b61e59c0..b1ef97c01d6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12086,6 +12086,17 @@ static void test_window_placement(void) GetWindowRect(hwnd, &rect); ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + wp.length = 0; + SetLastError(0xdeadbeef); + ret = SetWindowPlacement(hwnd, &wp); +todo_wine { + ok(!ret, "SetWindowPlacement should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); +} + DestroyWindow(hwnd); } @@ -12245,7 +12256,7 @@ static void test_arrange_iconic_windows(void) static void other_process_proc(HWND hwnd) { HANDLE window_ready_event, test_done_event; - WINDOWPLACEMENT wp; + WINDOWPLACEMENT wp = {0}; DWORD ret; window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window"); -- 2.30.2

3 4

[PATCH v3 1/5] winegstreamer: Remove unnecessary DECLSPEC_HIDDEN qualifier.
by Rémi Bernon 16 Feb '22

16 Feb '22

On PE internal functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Remove DECLSPEC_HIDDEN and add a patch first to make it consistent. Reorder patches and improve error handling, prefer NTSTATUS values for error codes. dlls/winegstreamer/gst_private.h | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 222bce3b2c7..3584f465218 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -39,7 +39,7 @@ #include "unixlib.h" -bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) DECLSPEC_HIDDEN; +bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size); static inline const char *debugstr_time(REFERENCE_TIME time) { @@ -64,60 +64,60 @@ static inline const char *debugstr_time(REFERENCE_TIME time) #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) DECLSPEC_HIDDEN; -void wg_parser_destroy(struct wg_parser *parser) DECLSPEC_HIDDEN; +struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering); +void wg_parser_destroy(struct wg_parser *parser); -HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) DECLSPEC_HIDDEN; -void wg_parser_disconnect(struct wg_parser *parser) DECLSPEC_HIDDEN; +HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size); +void wg_parser_disconnect(struct wg_parser *parser); -void wg_parser_begin_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; -void wg_parser_end_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; +void wg_parser_begin_flush(struct wg_parser *parser); +void wg_parser_end_flush(struct wg_parser *parser); -bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size) DECLSPEC_HIDDEN; -void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size) DECLSPEC_HIDDEN; +bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size); +void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size); -uint32_t wg_parser_get_stream_count(struct wg_parser *parser) DECLSPEC_HIDDEN; -struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index) DECLSPEC_HIDDEN; +uint32_t wg_parser_get_stream_count(struct wg_parser *parser); +struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index); -void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_disable(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format); +void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format); +void wg_parser_stream_disable(struct wg_parser_stream *stream); -bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event) DECLSPEC_HIDDEN; +bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event); bool wg_parser_stream_copy_buffer(struct wg_parser_stream *stream, - void *data, uint32_t offset, uint32_t size) DECLSPEC_HIDDEN; -void wg_parser_stream_release_buffer(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; + void *data, uint32_t offset, uint32_t size); +void wg_parser_stream_release_buffer(struct wg_parser_stream *stream); void wg_parser_stream_notify_qos(struct wg_parser_stream *stream, - bool underflow, double proportion, int64_t diff, uint64_t timestamp) DECLSPEC_HIDDEN; + bool underflow, double proportion, int64_t diff, uint64_t timestamp); /* Returns the duration in 100-nanosecond units. */ -uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream); /* start_pos and stop_pos are in 100-nanosecond units. */ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, - uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) DECLSPEC_HIDDEN; + uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); unsigned int wg_format_get_max_size(const struct wg_format *format); -HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out); +HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT wave_parser_create(IUnknown *outer, IUnknown **out); +HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out); bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm); bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format); -BOOL init_gstreamer(void) DECLSPEC_HIDDEN; +BOOL init_gstreamer(void); -extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; -extern HRESULT mfplat_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj); +extern HRESULT mfplat_DllRegisterServer(void); -IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) DECLSPEC_HIDDEN; -void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) DECLSPEC_HIDDEN; +IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format); +void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format); -HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; +HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj); -HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; +HRESULT audio_converter_create(REFIID riid, void **ret); struct wm_stream { -- 2.34.1

2 9

[tools 1/2] testbot/SetWinLocale: Add an 'info LOCALE' action to the Powershell script.
by Francois Gouget 16 Feb '22

16 Feb '22

It returns Windows' 'canonical' locale identifier as well as the default keyboard layout. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale.ps1 | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index ed8fa29ee1..26bd03fdfd 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -103,6 +103,52 @@ function ShowSettings() exit 0 } +function GetLocaleInfo($Locale) +{ + $LInfo= New-WinUserLanguageList $Locale + $LInfo = $LInfo[0] + + # Window synthesizes an Autonym for unknown/uninstalled locales (e.g. fr-DE), + # but cannot recommend a keyboard layout. + # Note also that installing a locale (e.g. fr-FR) typically also installs + # (at least the core functionality of) related locales (e.g. fr-BE), even + # though those are not shown as installed in the GUI. + if ($LInfo.InputMethodTips[0] -eq $null) + { + return $null + } + + # 'Canonicalize' the LanguageTag by picking the matching entry from the + # installed languages list. + $List = Get-WinUserLanguageList + foreach ($L in $List) + { + if ($LInfo.Autonym -eq $L.Autonym) + { + return $L + } + } + return $LInfo +} + + +function ShowLocaleInfo($Argv) +{ + $Locale = $Argv[1] +GetLocaleInfo($Locale) + $LInfo = GetLocaleInfo($Locale) + if ($LInfo -eq $null) + { + echo "$Name0:error: unknown locale $Locale. Is it installed?" + exit 1 + } + + Write-Output "LanguageTag=$($LInfo.LanguageTag)" + Write-Output "Autonym=$($LInfo.Autonym)" + Write-Output "LocalizedName=$($LInfo.LocalizedName)" + Write-Output "InputMethodTips=$($LInfo.InputMethodTips)" + exit 0 +} # # Modify the Windows locales settings through intl.cpl @@ -309,6 +355,7 @@ function SetLocales($Argv) function ShowUsage() { Write-Output "Usage: $Name0 settings" + Write-Output "or $Name0 info LOCALE" Write-Output "or $Name0 intlconfig LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY" Write-Output "or $Name0 locales LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY USEINTLCPL" Write-Output "or $Name0 -?" @@ -317,6 +364,8 @@ function ShowUsage() Write-Output "" Write-Output "Where:" Write-Output " settings Show the current Windows locale settings." + Write-Output " info Show information about the specified locale. In particular it" + Write-Output " shows Windows' 'canonical' locale identifier." Write-Output " intlconfig Generates an XML configuration file for intl.cpl." Write-Output " locales Modifies the locales either through the Powershell APIs or" Write-Output " intl.cpl." @@ -341,6 +390,7 @@ function ShowUsage() $Action = $args[0] if ($Action -eq "settings") { ShowSettings } +if ($Action -eq "info") { ShowLocaleInfo $args } if ($Action -eq "intlconfig") { ShowIntlConfig $args } if ($Action -eq "locales") { SetLocales $args } $Rc = 0 -- 2.30.2

1 1

[tools 1/2] testbot/LibvirtTool: Reorganize the snapshot creation.
by Francois Gouget 16 Feb '22

16 Feb '22

WaitForBoot() is responsible for establishing the first connection after the VM boots, which can take longer than usual. PrepareVM() replaces SetupTestAgentd() and performs all the tasks needed to make the VM ready for the tests. CreateSnapshot() now also configures the VM before creating the Libvirt snapshot. And CheckBootCount() verifies that the VM did not crash at some point during the process. It is now systematically called before creating snapshots or declaring the VM fit for duty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 228 ++++++++++++++++++++++--------------- 1 file changed, 135 insertions(+), 93 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index cfdb251694..aecca4b534 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -454,6 +454,21 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub WaitForBoot($) +{ + my ($TA) = @_; + + Debug(Elapsed($Start), " Waiting for the VM to boot\n"); + LogMsg "Waiting for $VMKey to boot\n"; + my $MinTimeout = $TA->SetConnectTimeout(undef, undef, $WaitForBoot); + if (!$TA->GetVersion()) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); + } + $TA->SetConnectTimeout(undef, undef, $MinTimeout); +} + sub WaitForSession($) { my ($TA) = @_; @@ -478,14 +493,33 @@ sub WaitForSession($) } } -sub SetupTestAgentd($$$) +sub CheckBootCount($) +{ + my ($TA) = @_; + + # Check that TestAgentd is not displaying the "Has Windows rebooted?" warning. + my $Count = $TA->GetProperties("start.count"); + if (defined $Count and $Count > 1) + { + FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1\n"); + } +} + +sub ResetBootCount($) +{ + my ($TA) = @_; + + # Check the boot count before resetting it + CheckBootCount($TA); + $TA->SetProperty("start.count", 0); +} + +sub PrepareVM($) { - my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; + my ($TA) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; - my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); my $Version = $TA->GetVersion(); if (!$Version) { @@ -493,9 +527,58 @@ sub SetupTestAgentd($$$) FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); } - # Upgrade TestAgentd - if ($UpgradeTestAgentd and ($VM->Type eq "win32" or $VM->Type eq "win64")) + # Always update the guest's system time + # 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). + my $PTA = GetPrivilegedTA($TA); + FatalError("$VMKey has no privileged TestAgent server\n") if (!$PTA); + if (!$PTA->SetTime()) + { + FatalError("Setting the $VMKey system time failed: ". $PTA->GetLastError() ."\n"); + } +} + +sub GetSnapshotConfig($) +{ + my ($Config) = @_; + + # Don't stack snapshots. For instance assume the snapshot name is + # 'test-live-fr-FR-tsign' and that 'test-live-fr-FR' already exists + # (typically because it is used by another VM): + # - It's probably better if snapshots are independent from each other. + # - Applying the 'tsign' flag on top of the existing snapshot requires a + # Windows reboot. But format locale changes may not stick across reboots. + # - Stopping the snapshot name parsing when finding an existing snapshot name + # would lose the 'live' flag resulting in an error (or the wrong type of + # snapshot. Avoiding this issue would result in more complexity. + # - Finally snapshot stacking does not seem that useful. + # - A consequence is that the base snapshot should be called 'test' and not + # 'test-live'. + while (1) + { + if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) + { + $Config->{locale} ||= $1; # take only the last match + } + elsif ($Config->{base} =~ s/-(live)$//) + { + $Config->{$1} = 1; + } + else + { + last; + } + } +} + +sub CreateSnapshot($$$$) +{ + my ($Domain, $TA, $Config, $Booting) = @_; + + if ($VM->Type =~ /^win(?:32|64)$/) { + my $Version = $TA->GetVersion(); Debug(Elapsed($Start), " Upgrading the $VMKey TestAgent server from $Version\n"); LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; if ($Version !~ / ([0-9]+)\.([0-9]+)$/) @@ -532,76 +615,41 @@ sub SetupTestAgentd($$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } - # Always update the guest's system time - # 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). - my $PTA = GetPrivilegedTA($TA); - FatalError("Cannot set the $VMKey VM system time\n") if (!$PTA); - if (!$PTA->SetTime()) + if ($Config->{locale}) { - FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); - } - - WaitForSession($TA) if ($Booting); + Debug(Elapsed($Start), " Setting up the $Config->{locale} locale on $VMKey\n"); + # SetWinLocale --default performs a reboot and WaitForBoot() + ResetBootCount($TA); + $TA->Disconnect(); + $Booting = 1; - if ($ResetStartCount) - { - # If SetProperty() is not supported neither is --show-restarts. - # So it all works out. - $TA->SetProperty("start.count", 0); - } - elsif ($Booting) - { - # Check that TestAgentd is not displaying the "Has Windows rebooted?" - # warning. - my $Count = $TA->GetProperties("start.count"); - if (defined $Count and $Count > 1) + my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $Config->{locale}); + push @Cmd, "--debug" if ($Debug); + Debug("Running: ", join(" ", @Cmd), "\n"); + if (system(@Cmd)) { - FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1"); + FatalError("Could not set the $VMKey locale to $Config->{locale}\n"); } } - $PTA->Disconnect(); - $TA->Disconnect(); -} - -sub GetSnapshotConfig($) -{ - my ($Config) = @_; - while (1) + if ($Booting) { - if ($Config->{base} =~ s/-([a-z]{2}-[A-Z]{2})$//) - { - $Config->{locale} = $1; - } - elsif ($Config->{base} =~ s/-(live)$//) - { - $Config->{$1} = 1; - } - else + WaitForSession($TA); + if ($SleepAfterBoot) { - last; + Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $Config->{snapshot} snapshot\n"); + LogMsg "Letting $VMKey settle down for the $Config->{snapshot} snapshot\n"; + sleep($SleepAfterBoot); } } -} - -sub CreateSnapshot($$) -{ - my ($Domain, $SnapshotName) = @_; - - if ($SleepAfterBoot != 0) - { - Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $SnapshotName snapshot\n"); - LogMsg "Letting $VMKey settle down for the $SnapshotName snapshot\n"; - sleep($SleepAfterBoot); - } + CheckBootCount($TA); - Debug(Elapsed($Start), " Creating the $SnapshotName snapshot\n"); - my $ErrMessage = $Domain->CreateSnapshot($SnapshotName); + $TA->Disconnect(); # disconnect before taking the snapshot + Debug(Elapsed($Start), " Creating the $Config->{snapshot} snapshot\n"); + my $ErrMessage = $Domain->CreateSnapshot($Config->{snapshot}); if (defined $ErrMessage) { - FatalError("Could not recreate the $SnapshotName snapshot on $VMKey: $ErrMessage\n"); + FatalError("Could not create the $Config->{snapshot} snapshot on $VMKey: $ErrMessage\n"); } } @@ -613,13 +661,17 @@ sub Revert() return 1; } $CurrentStatus = "reverting"; - my $Config = { base => $VM->IdleSnapshot }; + my $Config = { + base => $VM->IdleSnapshot, + snapshot => $VM->IdleSnapshot, + }; my $Domain = $VM->GetDomain(); if (!$Domain->HasSnapshot($Config->{base})) { $Config->{create} = 1; GetSnapshotConfig($Config); + Debug(join(" ", Elapsed($Start), "Config:", map { "$_=$Config->{$_}" } sort keys %$Config), "\n"); if ($Config->{locale} and $VM->Type !~ /^win(?:32|64)$/) { FatalError("Creating locale snapshots ($Config->{locale}) is not supported for ". $VM->Type ." VMs ($VMKey)\n"); @@ -655,8 +707,8 @@ sub Revert() if (defined $ErrMessage) { # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware - # configuration to another. So try again after powering off the VM, though - # this can be much slower. + # configuration to another. So try again after forcefully powering off + # the VM, though this can be much slower. Debug(Elapsed($Start), " Powering off the VM\n"); $ErrMessage = $Domain->PowerOff(); if (defined $ErrMessage) @@ -672,33 +724,22 @@ sub Revert() FatalError("Could not revert $VMKey to $Config->{base}: $ErrMessage\n"); } - # Mark the VM as sleeping which allows the scheduler to abort the revert in - # favor of higher priority tasks. But don't allow interruptions in the - # middle of snapshot creation! if (!$Config->{create}) { + # Mark the VM as sleeping which allows the scheduler to abort the revert in + # favor of higher priority tasks. But don't allow interruptions in the + # middle of snapshot creation! return 1 if (ChangeStatus("reverting", "sleeping")); } - # Set up the TestAgent server. Note that setting the locale will require a - # reboot so reset start.count in that case. - SetupTestAgentd($Booting, $Config->{create}, $Config->{locale}); - - # Set up the VM locale - if ($Config->{locale}) - { - Debug(Elapsed($Start), " Setting up the $Config->{locale} locale on $VMKey\n"); - my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $Config->{locale}); - push @Cmd, "--debug" if ($Debug); - if (system(@Cmd)) - { - FatalError("Could not set the $VMKey locale to $Config->{locale}\n"); - } - } + my $TA = $VM->GetAgent(); + WaitForBoot($TA) if ($Booting); + PrepareVM($TA); if ($Config->{create}) { - CreateSnapshot($Domain, $VM->IdleSnapshot); + CreateSnapshot($Domain, $TA, $Config, $Booting); + $Booting = 0; if ($VM->Type eq "build" or $VM->Type eq "wine") { @@ -721,15 +762,16 @@ sub Revert() # The activity monitor does not like it when VMs skip the sleeping step return 1 if (ChangeStatus("reverting", "sleeping")); } - else - { - my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? - $SleepAfterBoot : $SleepAfterRevert; - Debug(Elapsed($Start), " Sleeping ${Sleep}s\n"); - LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; - sleep($Sleep); - } + WaitForSession($TA) if ($Booting); + + my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? + $SleepAfterBoot : $SleepAfterRevert; + Debug(Elapsed($Start), " Sleeping ${Sleep}s\n"); + LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; + sleep($Sleep); + + CheckBootCount($TA); return ChangeStatus($CurrentStatus, "idle", "done"); } -- 2.30.2

1 1

[tools] testbot/SetWinLocale: Simplify sending the Powershell script.
by Francois Gouget 16 Feb '22

16 Feb '22

Converting the line endings to CR+LF is not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Also it's a Powershell script, not a batch file. testbot/bin/SetWinLocale | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 29b57b30f8..94e2f49404 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -663,20 +663,9 @@ sub RegGetValue($;$) # Show the host's locale settings # -if (open(my $fh, "<", "$0.ps1")) +if (!$TA->SendFile("$0.ps1", "$name0.ps1", 0)) { - my $Script = join("", <$fh>); - close($fh); - - $Script =~ s~\n~\r\n~g; - if (!$TA->SendFileFromString($Script, "$name0.ps1", 0)) - { - FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); - } -} -else -{ - FatalError("could not open '$0.ps1' for reading: $!\n"); + FatalError("could not send the Powershell script:", $TA->GetLastError(), "\n"); } sub GetWinSettings() -- 2.30.2

1 0

[PATCH 01/24] dlls/msacm32: enable compilation with long types
by Eric Pouech 16 Feb '22

16 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msacm32/Makefile.in | 1 - dlls/msacm32/driver.c | 26 +++++++++++++------------- dlls/msacm32/filter.c | 12 ++++++------ dlls/msacm32/format.c | 26 +++++++++++++------------- dlls/msacm32/internal.c | 14 +++++++------- dlls/msacm32/msacm32_main.c | 4 ++-- dlls/msacm32/pcmconverter.c | 24 ++++++++++++------------ dlls/msacm32/stream.c | 24 ++++++++++++------------ 8 files changed, 65 insertions(+), 66 deletions(-) diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index a6da7428749..be2136d78f7 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm32.dll IMPORTLIB = msacm32 IMPORTS = winmm user32 advapi32 diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 036461800b1..c01872d636a 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -49,7 +49,7 @@ MMRESULT WINAPI acmDriverAddA(PHACMDRIVERID phadid, HINSTANCE hinstModule, WCHAR * driverW = NULL; LPARAM lParamW = lParam; - TRACE("(%p, %p, %08lx, %08x, %08x)\n", + TRACE("(%p, %p, %08Ix, %08lx, %08lx)\n", phadid, hinstModule, lParam, dwPriority, fdwAdd); if (!phadid) { @@ -98,7 +98,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, { PWINE_ACMLOCALDRIVER pLocalDrv = NULL; - TRACE("(%p, %p, %08lx, %08x, %08x)\n", + TRACE("(%p, %p, %08Ix, %08lx, %08lx)\n", phadid, hinstModule, lParam, dwPriority, fdwAdd); if (!phadid) { @@ -165,7 +165,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, } break; default: - ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd); + ERR("invalid flag value 0x%08lx for fdwAdd\n", fdwAdd); return MMSYSERR_INVALFLAG; } @@ -182,7 +182,7 @@ MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose) PWINE_ACMDRIVERID padid; PWINE_ACMDRIVER* tpad; - TRACE("(%p, %08x)\n", had, fdwClose); + TRACE("(%p, %08lx)\n", had, fdwClose); if (fdwClose) { WARN("invalid flag\n"); @@ -225,7 +225,7 @@ MMRESULT WINAPI acmDriverDetailsA(HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, D MMRESULT mmr; ACMDRIVERDETAILSW addw; - TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails); if (!padd) { WARN("invalid parameter\n"); @@ -276,7 +276,7 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D HACMDRIVER acmDrvr; MMRESULT mmr; - TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails); if (!padd) { WARN("invalid parameter\n"); @@ -318,7 +318,7 @@ MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance, PWINE_ACMDRIVERID padid; DWORD fdwSupport; - TRACE("(%p, %08lx, %08x)\n", fnCallback, dwInstance, fdwEnum); + TRACE("(%p, %08Ix, %08lx)\n", fnCallback, dwInstance, fdwEnum); if (!fnCallback) { WARN("invalid parameter\n"); @@ -353,7 +353,7 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID { PWINE_ACMOBJ pao; - TRACE("(%p, %p, %08x)\n", hao, phadid, fdwDriverID); + TRACE("(%p, %p, %08lx)\n", hao, phadid, fdwDriverID); if (fdwDriverID) { WARN("invalid flag\n"); @@ -391,7 +391,7 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID */ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - TRACE("(%p, %04x, %08lx, %08lx\n", had, uMsg, lParam1, lParam2); + TRACE("(%p, %04x, %08Ix, %08Ix\n", had, uMsg, lParam1, lParam2); if ((uMsg >= ACMDM_USER && uMsg < ACMDM_RESERVED_LOW) || uMsg == ACMDM_DRIVER_ABOUT || @@ -492,7 +492,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe PWINE_ACMDRIVER pad = NULL; MMRESULT ret; - TRACE("(%p, %p, %08u)\n", phad, hadid, fdwOpen); + TRACE("(%p, %p, %08lu)\n", phad, hadid, fdwOpen); if (!phad) { WARN("invalid parameter\n"); @@ -605,7 +605,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority) { - TRACE("(%p, %08x, %08x)\n", hadid, dwPriority, fdwPriority); + TRACE("(%p, %08lx, %08lx)\n", hadid, dwPriority, fdwPriority); /* Check for unknown flags */ if (fdwPriority & @@ -679,7 +679,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd return MMSYSERR_NOTSUPPORTED; } if (dwPriority != 1 && dwPriority != (DWORD)-1) { - FIXME("unexpected priority %d, using sign only\n", dwPriority); + FIXME("unexpected priority %ld, using sign only\n", dwPriority); if ((signed)dwPriority < 0) dwPriority = (DWORD)-1; if (dwPriority > 0) dwPriority = 1; } @@ -746,7 +746,7 @@ MMRESULT WINAPI acmDriverRemove(HACMDRIVERID hadid, DWORD fdwRemove) PWINE_ACMDRIVERID padid; PWINE_ACMNOTIFYWND panwnd; - TRACE("(%p, %08x)\n", hadid, fdwRemove); + TRACE("(%p, %08lx)\n", hadid, fdwRemove); padid = MSACM_GetDriverID(hadid); panwnd = MSACM_GetNotifyWnd(hadid); diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c index 8d5abced9d9..bacb9c0abcf 100644 --- a/dlls/msacm32/filter.c +++ b/dlls/msacm32/filter.c @@ -91,7 +91,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd, MMRESULT mmr; ACMFILTERTAGDETAILSA aftd; - TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails); memset(&aftd, 0, sizeof(aftd)); aftd.cbStruct = sizeof(aftd); @@ -127,7 +127,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd, mmr = MSACM_Message(had, ACMDM_FILTER_DETAILS, (LPARAM)pafd, fdwDetails); break; default: - WARN("Unknown fdwDetails %08x\n", fdwDetails); + WARN("Unknown fdwDetails %08lx\n", fdwDetails); mmr = MMSYSERR_INVALFLAG; break; } @@ -228,7 +228,7 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd, PWINE_ACMDRIVERID padid; BOOL ret; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, pafd, fnCallback, dwInstance, fdwEnum); if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; @@ -294,7 +294,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd PWINE_ACMDRIVERID padid; MMRESULT mmr; - TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails); if (fdwDetails & ~(ACM_FILTERTAGDETAILSF_FILTERTAG|ACM_FILTERTAGDETAILSF_INDEX| ACM_FILTERTAGDETAILSF_LARGESTSIZE)) @@ -355,7 +355,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd break; default: - WARN("Unsupported fdwDetails=%08x\n", fdwDetails); + WARN("Unsupported fdwDetails=%08lx\n", fdwDetails); mmr = MMSYSERR_ERROR; } @@ -427,7 +427,7 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, PWINE_ACMDRIVERID padid; unsigned int i; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, paftd, fnCallback, dwInstance, fdwEnum); if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM; diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 536fa42e767..6aab538fffb 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -217,7 +217,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, { ACMFORMATCHOOSEW *afc = (ACMFORMATCHOOSEW *)GetPropW(hWnd, L"acmprop"); - TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam); + TRACE("hwnd=%p msg=%i 0x%08Ix 0x%08Ix\n", hWnd, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: @@ -230,7 +230,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) - FIXME("Unsupported style %08x\n", afc->fdwStyle); + FIXME("Unsupported style %08lx\n", afc->fdwStyle); if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)) ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE); return TRUE; @@ -249,7 +249,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, MSACM_FillFormat(hWnd, afc); break; default: - TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08lx\n", + TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08Ix\n", HIWORD(wParam), lParam); break; } @@ -261,7 +261,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, break; default: - TRACE("Dropped dlgCmd: ctl=%d ntf=0x%04x 0x%08lx\n", + TRACE("Dropped dlgCmd: ctl=%d ntf=0x%04x 0x%08Ix\n", LOWORD(wParam), HIWORD(wParam), lParam); break; } @@ -281,7 +281,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, break; #endif default: - TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08lx 0x%08lx\n", + TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08Ix 0x%08Ix\n", hWnd, msg, wParam, lParam ); break; } @@ -430,7 +430,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD MMRESULT mmr; ACMFORMATTAGDETAILSW aftd = {0}; - TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails); if (!pafd) return MMSYSERR_INVALPARAM; @@ -486,7 +486,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails); break; default: - WARN("Unknown fdwDetails %08x\n", fdwDetails); + WARN("Unknown fdwDetails %08lx\n", fdwDetails); mmr = MMSYSERR_INVALFLAG; break; } @@ -673,7 +673,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD cbwfxMax; MMRESULT mmr; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, pafd, fnCallback, dwInstance, fdwEnum); if (!pafd) @@ -705,7 +705,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, return MMSYSERR_INVALPARAM; if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) - FIXME("Unsupported fdwEnum values %08x\n", fdwEnum); + FIXME("Unsupported fdwEnum values %08lx\n", fdwEnum); mmr = acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &cbwfxMax); if (mmr != MMSYSERR_NOERROR) @@ -745,7 +745,7 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc, ACMDRVFORMATSUGGEST adfg; MMRESULT mmr; - TRACE("(%p, %p, %p, %d, %d)\n", + TRACE("(%p, %p, %p, %ld, %ld)\n", had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest); if (!pwfxSrc || !pwfxDst) @@ -850,7 +850,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd PWINE_ACMDRIVERID padid; MMRESULT mmr = ACMERR_NOTPOSSIBLE; - TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails); if (fdwDetails & ~(ACM_FORMATTAGDETAILSF_FORMATTAG|ACM_FORMATTAGDETAILSF_INDEX| ACM_FORMATTAGDETAILSF_LARGESTSIZE)) @@ -917,7 +917,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd break; default: - WARN("Unsupported fdwDetails=%08x\n", fdwDetails); + WARN("Unsupported fdwDetails=%08lx\n", fdwDetails); mmr = MMSYSERR_ERROR; } @@ -999,7 +999,7 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, unsigned int i; BOOL bPcmDone = FALSE; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, paftd, fnCallback, dwInstance, fdwEnum); if (!paftd) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index e83f1f5c215..7c2d3b5bf9e 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -74,12 +74,12 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) if (0 == wcsnicmp(pszRegEntry, msacmW, ARRAY_SIZE(msacmW))) { lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { - WARN("unable to open registry key - 0x%08x\n", lRet); + WARN("unable to open registry key - 0x%08lx\n", lRet); } else { bufLen = sizeof(buf); lRet = RegQueryValueExW(hKey, pszRegEntry, NULL, NULL, (LPBYTE)buf, &bufLen); if (lRet != ERROR_SUCCESS) { - WARN("unable to query requested subkey %s - 0x%08x\n", debugstr_w(pszRegEntry), lRet); + WARN("unable to query requested subkey %s - 0x%08lx\n", debugstr_w(pszRegEntry), lRet); } else { MSACM_RegisterDriver(pszRegEntry, buf, 0); } @@ -403,7 +403,7 @@ PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNot { PWINE_ACMNOTIFYWND panwnd; - TRACE("(%p,0x%08x)\n", hNotifyWnd, dwNotifyMsg); + TRACE("(%p,0x%08lx)\n", hNotifyWnd, dwNotifyMsg); panwnd = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMNOTIFYWND)); panwnd->obj.dwType = WINE_ACMOBJ_NOTIFYWND; @@ -654,13 +654,13 @@ void MSACM_WriteCurrentPriorities(void) /* Delete ACM priority key and create it anew */ lError = RegDeleteKeyW(HKEY_CURRENT_USER, basePriorityKey); if (lError != ERROR_SUCCESS && lError != ERROR_FILE_NOT_FOUND) { - ERR("unable to remove current key %s (0x%08x) - priority changes won't persist past application end.\n", + ERR("unable to remove current key %s (0x%08lx) - priority changes won't persist past application end.\n", debugstr_w(basePriorityKey), lError); return; } lError = RegCreateKeyW(HKEY_CURRENT_USER, basePriorityKey, &hPriorityKey); if (lError != ERROR_SUCCESS) { - ERR("unable to create key %s (0x%08x) - priority changes won't persist past application end.\n", + ERR("unable to create key %s (0x%08lx) - priority changes won't persist past application end.\n", debugstr_w(basePriorityKey), lError); return; } @@ -680,7 +680,7 @@ void MSACM_WriteCurrentPriorities(void) lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - ERR("unable to write value for %s under key %s (0x%08x)\n", + ERR("unable to write value for %s under key %s (0x%08lx)\n", debugstr_w(padid->pszDriverAlias), debugstr_w(basePriorityKey), lError); } } @@ -694,7 +694,7 @@ void MSACM_WriteCurrentPriorities(void) lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - ERR("unable to write value for Internal PCM Converter under key %s (0x%08x)\n", + ERR("unable to write value for Internal PCM Converter under key %s (0x%08lx)\n", debugstr_w(basePriorityKey), lError); } RegCloseKey(hPriorityKey); diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index efe58af309a..ad33c88d85a 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -44,7 +44,7 @@ HINSTANCE MSACM_hInstance32 = 0; */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, lpvReserved); + TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -87,7 +87,7 @@ DWORD WINAPI acmGetVersion(void) case VER_PLATFORM_WIN32s: return 0x02010000; /* 2.1 */ default: - FIXME("%x not supported\n", version.dwPlatformId); + FIXME("%lx not supported\n", version.dwPlatformId); /* fall through */ case VER_PLATFORM_WIN32_WINDOWS: return 0x04030000; /* 4.3.0 */ diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index d528a6d35fb..0b9724ba5e1 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -65,7 +65,7 @@ static DWORD PCM_drvOpen(LPCSTR str, PACMDRVOPENDESCW adod) */ static DWORD PCM_drvClose(DWORD dwDevID) { - TRACE("(%d)\n", dwDevID); + TRACE("(%ld)\n", dwDevID); return 1; } @@ -1001,7 +1001,7 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - TRACE("(%p, %08x)\n", aftd, dwQuery); + TRACE("(%p, %08lx)\n", aftd, dwQuery); switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -1024,7 +1024,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -1044,7 +1044,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) */ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) { - TRACE("(%p, %08x)\n", afd, dwQuery); + TRACE("(%p, %08lx)\n", afd, dwQuery); switch (dwQuery) { case ACM_FORMATDETAILSF_FORMAT: @@ -1068,7 +1068,7 @@ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -1260,7 +1260,7 @@ static LRESULT PCM_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss adsi->pwfxSrc->nAvgBytesPerSec) & dstMask; break; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -1278,12 +1278,12 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER TRACE("(%p, %p)\n", adsi, adsh); - TRACE("nsrc=%d,adsh->cbSrcLength=%d\n", nsrc, adsh->cbSrcLength); - TRACE("ndst=%d,adsh->cbDstLength=%d\n", ndst, adsh->cbDstLength); - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("nsrc=%ld,adsh->cbSrcLength=%ld\n", nsrc, adsh->cbSrcLength); + TRACE("ndst=%ld,adsh->cbDstLength=%ld\n", ndst, adsh->cbDstLength); + TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", adsi->pwfxSrc->wFormatTag, adsi->pwfxSrc->nChannels, adsi->pwfxSrc->nSamplesPerSec, adsi->pwfxSrc->nAvgBytesPerSec, adsi->pwfxSrc->nBlockAlign, adsi->pwfxSrc->wBitsPerSample, adsi->pwfxSrc->cbSize); - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", adsi->pwfxDst->wFormatTag, adsi->pwfxDst->nChannels, adsi->pwfxDst->nSamplesPerSec, adsi->pwfxDst->nAvgBytesPerSec, adsi->pwfxDst->nBlockAlign, adsi->pwfxDst->wBitsPerSample, adsi->pwfxDst->cbSize); @@ -1291,7 +1291,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER ~(ACM_STREAMCONVERTF_BLOCKALIGN| ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag @@ -1325,7 +1325,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %u %08lx %08lx);\n", + TRACE("(%08Ix %p %u %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg) { diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index e06503abfe4..1fcd2e39066 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -67,7 +67,7 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose) PWINE_ACMSTREAM was; MMRESULT ret; - TRACE("(%p, %d)\n", has, fdwClose); + TRACE("(%p, %ld)\n", has, fdwClose); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -93,7 +93,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT ret = MMSYSERR_NOERROR; PACMDRVSTREAMHEADER padsh; - TRACE("(%p, %p, %d)\n", has, pash, fdwConvert); + TRACE("(%p, %p, %ld)\n", has, pash, fdwConvert); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -138,7 +138,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - FIXME("(%p, %u, %ld, %ld): stub\n", has, uMsg, lParam1, lParam2); + FIXME("(%p, %u, %Id, %Id): stub\n", has, uMsg, lParam1, lParam2); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -158,7 +158,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, int wfxDstSize; WAVEFORMATEX wfxSrc, wfxDst; - TRACE("(%p, %p, %p, %p, %p, %ld, %ld, %d)\n", + TRACE("(%p, %p, %p, %p, %p, %Id, %Id, %ld)\n", phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen); /* NOTE: pwfxSrc and/or pwfxDst can point to a structure smaller than @@ -177,11 +177,11 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, pwfxDst = &wfxDst; } - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", pwfxSrc->wFormatTag, pwfxSrc->nChannels, pwfxSrc->nSamplesPerSec, pwfxSrc->nAvgBytesPerSec, pwfxSrc->nBlockAlign, pwfxSrc->wBitsPerSample, pwfxSrc->cbSize); - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", pwfxDst->wFormatTag, pwfxDst->nChannels, pwfxDst->nSamplesPerSec, pwfxDst->nAvgBytesPerSec, pwfxDst->nBlockAlign, pwfxDst->wBitsPerSample, pwfxDst->cbSize); @@ -303,7 +303,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT ret = MMSYSERR_NOERROR; PACMDRVSTREAMHEADER padsh; - TRACE("(%p, %p, %d)\n", has, pash, fdwPrepare); + TRACE("(%p, %p, %ld)\n", has, pash, fdwPrepare); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -320,7 +320,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, if ((was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM || was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) && pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { - WARN("source smaller than block align (%d < %d)\n", + WARN("source smaller than block align (%ld < %d)\n", pash->cbSrcLength, was->drvInst.pwfxSrc->nBlockAlign); return pash->cbSrcLength ? ACMERR_NOTPOSSIBLE : MMSYSERR_INVALPARAM; } @@ -373,7 +373,7 @@ MMRESULT WINAPI acmStreamReset(HACMSTREAM has, DWORD fdwReset) PWINE_ACMSTREAM was; MMRESULT ret = MMSYSERR_NOERROR; - TRACE("(%p, %d)\n", has, fdwReset); + TRACE("(%p, %ld)\n", has, fdwReset); if (fdwReset) { WARN("invalid flag\n"); @@ -398,7 +398,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput, ACMDRVSTREAMSIZE adss; MMRESULT ret; - TRACE("(%p, %d, %p, %d)\n", has, cbInput, pdwOutputBytes, fdwSize); + TRACE("(%p, %ld, %p, %ld)\n", has, cbInput, pdwOutputBytes, fdwSize); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -439,7 +439,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput, break; } } - TRACE("=> (%d) [%u]\n", ret, *pdwOutputBytes); + TRACE("=> (%d) [%lu]\n", ret, *pdwOutputBytes); return ret; } @@ -453,7 +453,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT ret = MMSYSERR_NOERROR; PACMDRVSTREAMHEADER padsh; - TRACE("(%p, %p, %d)\n", has, pash, fdwUnprepare); + TRACE("(%p, %p, %ld)\n", has, pash, fdwUnprepare); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n");

4 29

User handles changes
by Jacek Caban 16 Feb '22

16 Feb '22

Hi all, I've been recently looking at user handle handling in win32u and how it should be split from user32 (and PE world in general). In general, having something similar to how we handle gdi handles now would be nice. We're able to expose DC_ATTR struct (and possibly others in the future), allowing simple functions like an attribute getter, to avoid any syscalls, while keeping internal 'kernel' part private to win32u. Unlike gdi handles, user handles need to be really interprocess, which makes things more tricky. Having it working only for current process would not buy us much, because we'd need to expose the fallback part from win32u anyway. I also considered avoiding the problem and simply expose additional Wine-specific functions from win32u. That could work, but such differences in handles capabilities from Windows quickly add up and the number of cases where it would affect design decisions convinced me to just try to make shared memory work. We were talking about extending shared memory usage for wineserver communication anyway. I created a branch with my prototype of implementation: https://github.com/jacekcw/wine/tree/user-handles I think that this is enough to get a sense of how I think it could work. Those patches still need some work and testing, but it's close enough. It implements user handle table using shared memory that is writeable from server, but read-only for clients. Using shared memory for the handles table alone is enough to reimplement things like IsWindow() and GetWindowThreadProcessId(). Handle table entry contains three objects: - server object, not much changes here - client 'kernel' object. Using windows as an example, this is WND struct. We will want to make it private to win32u (instead of user32), but other than that its mechanism can stay mostly unchanged, except we will need to more careful to match server state closely - shared struct representing current state of the object. This replaces some fields of above types, but will also be accessible from PE code. user-handles branch reimplements GetWindowLong* on top of shared memory (mostly, it's not complete there, but remaining cases will be similar once complete). This also seems to match how it works on Windows: win32u exposes NtUserSetWindowLong, but no Get* equivalent. The getter can be lock-free because the only race it needs to worry about is if the handle was closed and memory reused (in which case we'd read a garbage). To avoid that, we simply need to recheck the handle after reading the memory. Also note that guarantees of user_section lock still hold. Although this memory is modified on server side, it's always initiated by a server call call from proper thread when SetWindowLong* holds the lock. There are some similarities to Huw's and Rémi's shared memory patches that are used in Proton, but this patchset touches different areas. user-handles branch also doesn't need locking mechanisms because thread safety is guaranteed by other means. We may need something like serial number-based synchronization when we will need a way to read multiple fields who's integrity cannot be guaranteed differently, but that doesn't seem necessary for cases that I needed so far. Anyway, I believe that those patches can be adopted to use mechanisms from my series, but the overlap is small at this point. Any feedback is appreciated. Thanks, Jacek

2 2

[PATCH v5 3/6] ncrypt/tests: Test NCryptFreeObject function.
by Hans Leidekker 16 Feb '22

16 Feb '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 68b893282c2..01d33e93755 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -136,7 +136,35 @@ static void test_key_import_rsa(void) NCryptFreeObject(prov); } +static void test_ncrypt_free_object(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + char *buf; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + todo_wine { + ret = NCryptFreeObject(key); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + key = 0; + ret = NCryptFreeObject(key); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + buf = calloc(1, 50); + ret = NCryptFreeObject((NCRYPT_KEY_HANDLE)buf); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + free(buf); + } +} + START_TEST(ncrypt) { test_key_import_rsa(); + test_ncrypt_free_object(); } -- 2.30.2

2 3

[PATCH v5 6/6] ncrypt: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 16 Feb '22

16 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/Makefile.in | 1 - dlls/ncrypt/main.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index 120187ef61c..ad3ed409961 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES IMPORTLIB = ncrypt MODULE = ncrypt.dll diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index a2253c44cb9..6b1a87ea785 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(0x%lx, %p, %s, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(algid), + FIXME("(%#Ix, %p, %s, %s, %#lx, %#lx): stub\n", provider, key, wine_dbgstr_w(algid), wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } @@ -41,21 +41,21 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + FIXME("(%#Ix, %p, %lu, %p, %p, %lu, %p, %#lx): stub\n", key, input, insize, padding, output, outsize, result, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptDeleteKey(NCRYPT_KEY_HANDLE key, DWORD flags) { - FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + FIXME("(%#Ix, %#lx): stub\n", key, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + FIXME("(%#Ix, %p, %lu, %p, %p, %lu, %p, %#lx): stub\n", key, input, insize, padding, output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -63,20 +63,20 @@ SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD i SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD alg_ops, DWORD *alg_count, NCryptAlgorithmName **alg_list, DWORD flags) { - FIXME("(0x%lx, 0x%08x, %p, %p, 0x%08x): stub\n", provider, alg_ops, alg_count, alg_list, flags); + FIXME("(%#Ix, %#lx, %p, %p, %#lx): stub\n", provider, alg_ops, alg_count, alg_list, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR *scope, NCryptKeyName **key_name, PVOID *enum_state, DWORD flags) { - FIXME("(0x%lx, %p, %p, %p, 0x%08x): stub\n", provider, scope, key_name, enum_state, flags); + FIXME("(%#Ix, %p, %p, %p, %#lx): stub\n", provider, scope, key_name, enum_state, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) { - FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + FIXME("(%#Ix, %#lx): stub\n", key, flags); return NTE_NOT_SUPPORTED; } @@ -161,8 +161,8 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name struct object *object = (struct object *)handle; const struct object_property *property; - TRACE("(%#Ix, %s, %p, %u, %p, 0x%08x)\n", handle, wine_dbgstr_w(name), output, outsize, result, flags); - if (flags) FIXME("flags 0x%08x not supported\n", flags); + TRACE("(%#Ix, %s, %p, %lu, %p, %#lx)\n", handle, wine_dbgstr_w(name), output, outsize, result, flags); + if (flags) FIXME("flags %#lx not supported\n", flags); if (!(property = get_object_property(object, name))) return NTE_INVALID_PARAMETER; if (!output) @@ -190,7 +190,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H { BCRYPT_KEY_BLOB *header = (BCRYPT_KEY_BLOB *)data; - TRACE("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, wine_dbgstr_w(type), + TRACE("(%#Ix, %#Ix, %s, %p, %p, %p, %lu, %#lx): stub\n", provider, decrypt_key, wine_dbgstr_w(type), params, handle, data, datasize, flags); if (decrypt_key) @@ -209,7 +209,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H } else if (flags) { - ERR("Invalid flags 0x%x\n", flags); + ERR("Invalid flags %#lx\n", flags); return NTE_BAD_FLAGS; } @@ -269,7 +269,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H break; } default: - FIXME("unhandled key magic %x\n", header->Magic); + FIXME("Unhandled key magic %#lx.\n", header->Magic); return NTE_INVALID_PARAMETER; } @@ -278,20 +278,20 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), flags); + FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); return NTE_NOT_SUPPORTED; } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) { - FIXME("(0x%lx): stub\n", hKey); + FIXME("(%#Ix): stub\n", hKey); return FALSE; } SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(0x%lx, %p, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); + FIXME("(%#Ix, %p, %s, %#lx, %#lx): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } @@ -299,7 +299,7 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c { struct object *object; - FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); + FIXME("(%p, %s, %#lx): stub\n", provider, wine_dbgstr_w(name), flags); if (!(object = allocate_object(STORAGE_PROVIDER))) { @@ -361,8 +361,8 @@ SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name { struct object *object = (struct object *)handle; - TRACE("(%#Ix, %s, %p, %u, 0x%08x)\n", handle, wine_dbgstr_w(name), input, insize, flags); - if (flags) FIXME("flags 0x%08x not supported\n", flags); + TRACE("(%#Ix, %s, %p, %lu, %#lx)\n", handle, wine_dbgstr_w(name), input, insize, flags); + if (flags) FIXME("flags %#lx not supported\n", flags); return set_object_property(object, name, input, insize); } -- 2.30.2

1 0

[PATCH v5 5/6] ncrypt: Implement NCryptGetProperty and NCryptSetProperty.
by Hans Leidekker 16 Feb '22

16 Feb '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 96 +++++++++++++++++++++++++++++++++++--- dlls/ncrypt/tests/ncrypt.c | 32 +++++++++++++ include/ncrypt.h | 2 + 3 files changed, 123 insertions(+), 7 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index fcf5bdbe3e7..a2253c44cb9 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -109,6 +109,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) { struct object *object = (struct object *)handle; SECURITY_STATUS ret = ERROR_SUCCESS; + unsigned int i; TRACE("(%#Ix)\n", handle); @@ -133,15 +134,46 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) return NTE_INVALID_HANDLE; } + for (i = 0; i < object->num_properties; i++) + { + free(object->properties[i].key); + free(object->properties[i].value); + } + free(object->properties); free(object); return ret; } -SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output, +static const struct object_property *get_object_property(struct object *object, const WCHAR *name) +{ + unsigned int i; + for (i = 0; i < object->num_properties; i++) + { + const struct object_property *property = &object->properties[i]; + if (!lstrcmpW(property->key, name)) return property; + } + return NULL; +} + +SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, result, flags); - return NTE_NOT_SUPPORTED; + struct object *object = (struct object *)handle; + const struct object_property *property; + + TRACE("(%#Ix, %s, %p, %u, %p, 0x%08x)\n", handle, wine_dbgstr_w(name), output, outsize, result, flags); + if (flags) FIXME("flags 0x%08x not supported\n", flags); + + if (!(property = get_object_property(object, name))) return NTE_INVALID_PARAMETER; + if (!output) + { + *result = property->value_size; + return ERROR_SUCCESS; + } + if (outsize < property->value_size) return NTE_BUFFER_TOO_SMALL; + + memcpy(output, property->value, property->value_size); + return ERROR_SUCCESS; } static struct object *allocate_object(enum object_type type) @@ -278,9 +310,59 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c return ERROR_SUCCESS; } -SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, - PBYTE input, DWORD insize, DWORD flags) +static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) { - FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, flags); - return NTE_NOT_SUPPORTED; + struct object_property *property = &object->properties[object->num_properties]; + + FIXME("check duplicates\n"); + if (!object->num_properties) + { + if (!(object->properties = malloc(sizeof(*property)))) + { + ERR("Error allocating memory."); + return NTE_NO_MEMORY; + } + object->num_properties++; + } + else + { + struct object_property *tmp; + if (!(tmp = realloc(object->properties, sizeof(*property) * object->num_properties + 1))) + { + ERR("Error allocating memory."); + return NTE_NO_MEMORY; + } + object->properties = tmp; + object->num_properties++; + } + + memset(property, 0, sizeof(*property)); + if (!(property->key = malloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) + { + ERR("Error allocating memory."); + return NTE_NO_MEMORY; + } + + lstrcpyW(property->key, name); + property->value_size = value_size; + if (!(property->value = malloc(value_size))) + { + ERR("Error allocating memory."); + free(property->key); + property->key = NULL; + return NTE_NO_MEMORY; + } + + memcpy(property->value, value, value_size); + return ERROR_SUCCESS; +} + +SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE handle, const WCHAR *name, BYTE *input, DWORD insize, DWORD flags) +{ + struct object *object = (struct object *)handle; + + TRACE("(%#Ix, %s, %p, %u, 0x%08x)\n", handle, wine_dbgstr_w(name), input, insize, flags); + if (flags) FIXME("flags 0x%08x not supported\n", flags); + + return set_object_property(object, name, input, insize); } diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 430cb0ae52c..23205d989f0 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -159,10 +159,42 @@ static void test_ncrypt_free_object(void) ret = NCryptFreeObject((NCRYPT_KEY_HANDLE)buf); ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); free(buf); + + NCryptFreeObject(prov); +} + +static void test_get_property(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + WCHAR value[4]; + DWORD size; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + todo_wine { + ret = NCryptGetProperty(key, L"Algorithm Group", NULL, 0, &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 8, "got %lu\n", size); + + size = 0; + ret = NCryptGetProperty(key, L"Algorithm Group", (BYTE *)value, sizeof(value), &size, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(size == 8, "got %lu\n", size); + ok(!lstrcmpW(value, L"RSA"), "The string doesn't match with 'RSA'\n"); + } + + NCryptFreeObject(prov); } START_TEST(ncrypt) { test_key_import_rsa(); test_ncrypt_free_object(); + test_get_property(); } diff --git a/include/ncrypt.h b/include/ncrypt.h index 84f1fedd0b9..5a8ba7e88fc 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -76,10 +76,12 @@ SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, B SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE, DWORD); SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); +SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); +SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); #ifdef __cplusplus } -- 2.30.2

1 0

[PATCH v5 4/6] ncrypt: Implement NCryptFreeObject.
by Hans Leidekker 16 Feb '22

16 Feb '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 51 +++++++++++++++++++++++++++++++++++--- dlls/ncrypt/tests/ncrypt.c | 2 -- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 0d5a40b7b26..fcf5bdbe3e7 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -86,10 +86,55 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) return NTE_NOT_SUPPORTED; } -SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) +static SECURITY_STATUS free_key_object(struct key *key) { - FIXME("(0x%lx): stub\n", object); - return NTE_NOT_SUPPORTED; + switch (key->alg) + { + case RSA: + { + free(key->rsa.modulus); + free(key->rsa.public_exp); + free(key->rsa.prime1); + free(key->rsa.prime2); + break; + } + default: + WARN("invalid key %p\n", key); + return NTE_INVALID_HANDLE; + } + return ERROR_SUCCESS; +} + +SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) +{ + struct object *object = (struct object *)handle; + SECURITY_STATUS ret = ERROR_SUCCESS; + + TRACE("(%#Ix)\n", handle); + + if (!object) + { + WARN("invalid handle %#Ix\n", handle); + return NTE_INVALID_HANDLE; + } + + switch (object->type) + { + case KEY: + { + if ((ret = free_key_object(&object->key))) return ret; + break; + } + case STORAGE_PROVIDER: + break; + + default: + WARN("invalid handle %#Ix\n", handle); + return NTE_INVALID_HANDLE; + } + + free(object); + return ret; } SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output, diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 01d33e93755..430cb0ae52c 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -148,7 +148,6 @@ static void test_ncrypt_free_object(void) ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { ret = NCryptFreeObject(key); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); @@ -160,7 +159,6 @@ static void test_ncrypt_free_object(void) ret = NCryptFreeObject((NCRYPT_KEY_HANDLE)buf); ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); free(buf); - } } START_TEST(ncrypt) -- 2.30.2

1 0

[PATCH v5 2/6] ncrypt: Implement NCryptImportKey function.
by Hans Leidekker 16 Feb '22

16 Feb '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 116 ++++++++++++++++++++++++++++------ dlls/ncrypt/ncrypt_internal.h | 31 +++++++++ dlls/ncrypt/tests/ncrypt.c | 2 - 3 files changed, 128 insertions(+), 21 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 44cfe781e7c..0d5a40b7b26 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -24,17 +24,17 @@ #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "bcrypt.h" #include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, - const WCHAR *algid, const WCHAR *name, DWORD keyspec, - DWORD flags) + const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) { FIXME("(0x%lx, %p, %s, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(algid), - wine_dbgstr_w(name), keyspec, flags); + wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } @@ -42,7 +42,7 @@ SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD i BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, - output, outsize, result, flags); + output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -56,13 +56,12 @@ SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD i BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, - output, outsize, result, flags); + output, outsize, result, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD alg_ops, - DWORD *alg_count, NCryptAlgorithmName **alg_list, - DWORD flags) + DWORD *alg_count, NCryptAlgorithmName **alg_list, DWORD flags) { FIXME("(0x%lx, 0x%08x, %p, %p, 0x%08x): stub\n", provider, alg_ops, alg_count, alg_list, flags); return NTE_NOT_SUPPORTED; @@ -96,8 +95,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, - result, flags); + FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -110,17 +108,98 @@ static struct object *allocate_object(enum object_type type) } SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, - const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, - PBYTE data, DWORD datasize, DWORD flags) + const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *handle, + BYTE *data, DWORD datasize, DWORD flags) { - FIXME("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, - wine_dbgstr_w(type), params, - key, data, datasize, flags); - return NTE_NOT_SUPPORTED; + BCRYPT_KEY_BLOB *header = (BCRYPT_KEY_BLOB *)data; + + TRACE("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, wine_dbgstr_w(type), + params, handle, data, datasize, flags); + + if (decrypt_key) + { + FIXME("Key blob decryption not implemented\n"); + return NTE_NOT_SUPPORTED; + } + if (params) + { + FIXME("Parameter information not implemented\n"); + return NTE_NOT_SUPPORTED; + } + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + ERR("Invalid flags 0x%x\n", flags); + return NTE_BAD_FLAGS; + } + + switch (header->Magic) + { + case BCRYPT_RSAPUBLIC_MAGIC: + { + DWORD expected_size; + struct object *object; + struct key *key; + BYTE *public_exp, *modulus; + BCRYPT_RSAKEY_BLOB *rsaheader = (BCRYPT_RSAKEY_BLOB *)data; + + if (datasize < sizeof(*rsaheader)) + { + ERR("Invalid buffer size.\n"); + return NTE_BAD_DATA; + } + + expected_size = sizeof(*rsaheader) + rsaheader->cbPublicExp + rsaheader->cbModulus; + if (datasize != expected_size) + { + ERR("Invalid buffer size.\n"); + return NTE_BAD_DATA; + } + + if (!(object = allocate_object(KEY))) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + + key = &object->key; + key->alg = RSA; + key->rsa.public_exp_size = rsaheader->cbPublicExp; + key->rsa.modulus_size = rsaheader->cbModulus; + if (!(key->rsa.public_exp = malloc(rsaheader->cbPublicExp))) + { + ERR("Error allocating memory.\n"); + free(object); + return NTE_NO_MEMORY; + } + if (!(key->rsa.modulus = malloc(rsaheader->cbModulus))) + { + ERR("Error allocating memory.\n"); + free(key->rsa.public_exp); + free(object); + return NTE_NO_MEMORY; + } + + public_exp = &data[sizeof(*rsaheader)]; /* The public exp is after the header. */ + modulus = &public_exp[rsaheader->cbPublicExp]; /* The modulus is after the public exp. */ + memcpy(key->rsa.public_exp, public_exp, rsaheader->cbPublicExp); + memcpy(key->rsa.modulus, modulus, rsaheader->cbModulus); + + *handle = (NCRYPT_KEY_HANDLE)object; + break; + } + default: + FIXME("unhandled key magic %x\n", header->Magic); + return NTE_INVALID_PARAMETER; + } + + return ERROR_SUCCESS; } -SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, - DWORD flags) +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), flags); return NTE_NOT_SUPPORTED; @@ -157,7 +236,6 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE input, DWORD insize, DWORD flags) { - FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, - flags); + FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, flags); return NTE_NOT_SUPPORTED; } diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index 7a2d96f8417..fe5f27ea1eb 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -16,12 +16,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +enum key_algorithm +{ + DH, + DSA, + ECC, + RSA, +}; + +struct rsa_key +{ + DWORD public_exp_size; + BYTE *public_exp; + DWORD modulus_size; + BYTE *modulus; + DWORD prime1_size; + BYTE *prime1; + DWORD prime2_size; + BYTE *prime2; +}; + +struct key +{ + enum key_algorithm alg; + union + { + struct rsa_key rsa; + }; +}; + struct storage_provider { }; enum object_type { + KEY, STORAGE_PROVIDER, }; @@ -39,6 +69,7 @@ struct object struct object_property *properties; union { + struct key key; struct storage_provider storage_provider; }; }; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 06551ab3a94..68b893282c2 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -97,7 +97,6 @@ static void test_key_import_rsa(void) ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - todo_wine { key = 0; ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); @@ -135,7 +134,6 @@ static void test_key_import_rsa(void) ok(ret == NTE_BAD_DATA, "got %#lx\n", ret); NCryptFreeObject(prov); - } } START_TEST(ncrypt) -- 2.30.2

1 0

[PATCH v5 1/6] ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Hans Leidekker 16 Feb '22

16 Feb '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> Some applications crash when the storage provider is null. v5: Use a more generic object allocater. Clean up structure and variable naming a little. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 21 ++++++++++++++++- dlls/ncrypt/ncrypt_internal.h | 44 +++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 -- 3 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 dlls/ncrypt/ncrypt_internal.h diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..44cfe781e7c 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -19,10 +19,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -99,6 +101,14 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *prop return NTE_NOT_SUPPORTED; } +static struct object *allocate_object(enum object_type type) +{ + struct object *ret; + if (!(ret = calloc(1, sizeof(*ret)))) return NULL; + ret->type = type; + return ret; +} + SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, PBYTE data, DWORD datasize, DWORD flags) @@ -131,8 +141,17 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { + struct object *object; + FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + + if (!(object = allocate_object(STORAGE_PROVIDER))) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + *provider = (NCRYPT_PROV_HANDLE)object; + return ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..7a2d96f8417 --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +struct storage_provider +{ +}; + +enum object_type +{ + STORAGE_PROVIDER, +}; + +struct object_property +{ + WCHAR *key; + DWORD value_size; + void *value; +}; + +struct object +{ + enum object_type type; + DWORD num_properties; + struct object_property *properties; + union + { + struct storage_provider storage_provider; + }; +}; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index fe0e782b1af..06551ab3a94 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -92,12 +92,10 @@ static void test_key_import_rsa(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; - todo_wine { prov = 0; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - } todo_wine { key = 0; -- 2.30.2

1 0

[PATCH 1/5] wined3d: Pass a wined3d_device_gl pointer to wined3d_context_gl_create_bo().
by Zebediah Figura 16 Feb '22

16 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 3 +- dlls/wined3d/context_gl.c | 116 +-------------------------------- dlls/wined3d/device.c | 116 ++++++++++++++++++++++++++++++++- dlls/wined3d/texture.c | 5 +- dlls/wined3d/view.c | 5 +- dlls/wined3d/wined3d_private.h | 6 +- 6 files changed, 127 insertions(+), 124 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cab93ccc4e3..7c3537e466e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -201,6 +201,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { + struct wined3d_device_gl *device_gl = wined3d_device_gl(buffer_gl->b.resource.device); const struct wined3d_gl_info *gl_info = context_gl->gl_info; GLenum usage = GL_STATIC_DRAW; GLbitfield gl_storage_flags; @@ -223,7 +224,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf coherent = false; } gl_storage_flags = wined3d_resource_gl_storage_flags(&buffer_gl->b.resource); - if (!wined3d_context_gl_create_bo(context_gl, size, binding, usage, coherent, gl_storage_flags, bo)) + if (!wined3d_device_gl_create_bo(device_gl, context_gl, size, binding, usage, coherent, gl_storage_flags, bo)) { ERR("Failed to create OpenGL buffer object.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 77e0379ee61..8901bafcce3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2766,30 +2766,6 @@ GLuint wined3d_context_gl_allocate_vram_chunk_buffer(struct wined3d_context_gl * return id; } -static struct wined3d_allocator_block *wined3d_context_gl_allocate_memory(struct wined3d_context_gl *context_gl, - unsigned int memory_type, GLsizeiptr size, GLuint *id) -{ - struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); - struct wined3d_allocator *allocator = &device_gl->allocator; - struct wined3d_allocator_block *block; - - if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) - { - *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); - return NULL; - } - - if (!(block = wined3d_allocator_allocate(allocator, &context_gl->c, memory_type, size))) - { - *id = 0; - return NULL; - } - - *id = wined3d_allocator_chunk_gl(block->chunk)->gl_buffer; - - return block; -} - static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *chunk_gl, struct wined3d_context_gl *context_gl) { @@ -2852,7 +2828,7 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ if ((flags & WINED3D_MAP_DISCARD) && bo->command_fence_id > device_gl->completed_fence_id) { - if (wined3d_context_gl_create_bo(context_gl, bo->size, + if (wined3d_device_gl_create_bo(device_gl, context_gl, bo->size, bo->binding, bo->usage, bo->b.coherent, bo->flags, &tmp)) { list_move_head(&tmp.b.users, &bo->b.users); @@ -3157,96 +3133,6 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct bo->id = 0; } -static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info, GLenum binding) -{ - switch (binding) - { - case GL_ARRAY_BUFFER: - case GL_ATOMIC_COUNTER_BUFFER: - case GL_DRAW_INDIRECT_BUFFER: - case GL_PIXEL_UNPACK_BUFFER: - case GL_UNIFORM_BUFFER: - return true; - - case GL_TEXTURE_BUFFER: - return gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]; - - default: - return false; - } -} - -bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, - GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) -{ - unsigned int memory_type_idx = wined3d_device_gl_find_memory_type(flags); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_allocator_block *memory = NULL; - GLsizeiptr buffer_offset = 0; - GLuint id = 0; - - TRACE("context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", - context_gl, size, binding, usage, coherent, flags, bo); - - if (gl_info->supported[ARB_BUFFER_STORAGE]) - { - if (use_buffer_chunk_suballocation(gl_info, binding)) - { - if ((memory = wined3d_context_gl_allocate_memory(context_gl, memory_type_idx, size, &id))) - buffer_offset = memory->offset; - } - else - { - WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); - id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); - } - - if (!id) - { - WARN("Failed to allocate buffer.\n"); - return false; - } - } - else - { - GL_EXTCALL(glGenBuffers(1, &id)); - if (!id) - { - checkGLcall("buffer object creation"); - return false; - } - wined3d_context_gl_bind_bo(context_gl, binding, id); - - if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) - { - GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); - } - - GL_EXTCALL(glBufferData(binding, size, NULL, usage)); - - wined3d_context_gl_bind_bo(context_gl, binding, 0); - checkGLcall("buffer object creation"); - } - - TRACE("Created buffer object %u.\n", id); - bo->id = id; - bo->memory = memory; - bo->size = size; - bo->binding = binding; - bo->usage = usage; - bo->flags = flags; - bo->b.coherent = coherent; - list_init(&bo->b.users); - bo->command_fence_id = 0; - bo->b.buffer_offset = buffer_offset; - bo->b.memory_offset = bo->b.buffer_offset; - bo->b.map_ptr = NULL; - bo->b.client_map_count = 0; - - return true; -} - static void wined3d_context_gl_set_render_offscreen(struct wined3d_context_gl *context_gl, BOOL offscreen) { if (context_gl->c.render_offscreen == offscreen) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4dac9220f0f..84d2e3a0ce8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -29,6 +29,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(winediag); struct wined3d_matrix_3x3 @@ -1033,7 +1034,7 @@ gl_memory_types[] = {GL_CLIENT_STORAGE_BIT | GL_MAP_READ_BIT | GL_MAP_WRITE_BIT}, }; -unsigned int wined3d_device_gl_find_memory_type(GLbitfield flags) +static unsigned int wined3d_device_gl_find_memory_type(GLbitfield flags) { unsigned int i; @@ -1052,6 +1053,119 @@ GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx) return gl_memory_types[memory_type_idx].flags; } +static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct wined3d_device_gl *device_gl, + struct wined3d_context_gl *context_gl, unsigned int memory_type, GLsizeiptr size, GLuint *id) +{ + struct wined3d_allocator *allocator = &device_gl->allocator; + struct wined3d_allocator_block *block; + + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) + { + *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); + return NULL; + } + + if (!(block = wined3d_allocator_allocate(allocator, &context_gl->c, memory_type, size))) + { + *id = 0; + return NULL; + } + + *id = wined3d_allocator_chunk_gl(block->chunk)->gl_buffer; + + return block; +} + +static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info, GLenum binding) +{ + switch (binding) + { + case GL_ARRAY_BUFFER: + case GL_ATOMIC_COUNTER_BUFFER: + case GL_DRAW_INDIRECT_BUFFER: + case GL_PIXEL_UNPACK_BUFFER: + case GL_UNIFORM_BUFFER: + return true; + + case GL_TEXTURE_BUFFER: + return gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]; + + default: + return false; + } +} + +bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct wined3d_context_gl *context_gl, + GLsizeiptr size, GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) +{ + unsigned int memory_type_idx = wined3d_device_gl_find_memory_type(flags); + const struct wined3d_gl_info *gl_info = &device_gl->d.adapter->gl_info; + struct wined3d_allocator_block *memory = NULL; + GLsizeiptr buffer_offset = 0; + GLuint id = 0; + + TRACE("device_gl %p, context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", + device_gl, context_gl, size, binding, usage, coherent, flags, bo); + + if (gl_info->supported[ARB_BUFFER_STORAGE]) + { + if (use_buffer_chunk_suballocation(gl_info, binding)) + { + if ((memory = wined3d_device_gl_allocate_memory(device_gl, context_gl, memory_type_idx, size, &id))) + buffer_offset = memory->offset; + } + else + { + WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); + id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); + } + + if (!id) + { + WARN("Failed to allocate buffer.\n"); + return false; + } + } + else + { + GL_EXTCALL(glGenBuffers(1, &id)); + if (!id) + { + checkGLcall("buffer object creation"); + return false; + } + wined3d_context_gl_bind_bo(context_gl, binding, id); + + if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + { + GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + } + + GL_EXTCALL(glBufferData(binding, size, NULL, usage)); + + wined3d_context_gl_bind_bo(context_gl, binding, 0); + checkGLcall("buffer object creation"); + } + + TRACE("Created buffer object %u.\n", id); + bo->id = id; + bo->memory = memory; + bo->size = size; + bo->binding = binding; + bo->usage = usage; + bo->flags = flags; + bo->b.coherent = coherent; + list_init(&bo->b.users); + bo->command_fence_id = 0; + bo->b.buffer_offset = buffer_offset; + bo->b.memory_offset = bo->b.buffer_offset; + bo->b.map_ptr = NULL; + bo->b.client_map_count = 0; + + return true; +} + void wined3d_device_gl_delete_opengl_contexts_cs(void *object) { struct wined3d_device_gl *device_gl = object; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 18925338285..b1fd1e7bde2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2019,8 +2019,9 @@ static void wined3d_texture_gl_prepare_buffer_object(struct wined3d_texture_gl * if (bo->id) return; - if (!wined3d_context_gl_create_bo(context_gl, sub_resource->size, GL_PIXEL_UNPACK_BUFFER, - GL_STREAM_DRAW, true, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo)) + if (!wined3d_device_gl_create_bo(wined3d_device_gl(texture_gl->t.resource.device), + context_gl, sub_resource->size, GL_PIXEL_UNPACK_BUFFER, GL_STREAM_DRAW, true, + GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo)) return; TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", bo->id, texture_gl, sub_resource_idx); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4483a21a6d0..a345626cf5e 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1671,10 +1671,11 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { + struct wined3d_device_gl *device_gl = wined3d_device_gl(resource->device); struct wined3d_buffer *buffer = buffer_from_resource(resource); struct wined3d_context_gl *context_gl; - context_gl = wined3d_context_gl(context_acquire(resource->device, NULL, 0)); + context_gl = wined3d_context_gl(context_acquire(&device_gl->d, NULL, 0)); create_buffer_view(&view_gl->gl_view, &context_gl->c, desc, buffer, view_gl->v.format); view_gl->bo_user.valid = true; list_add_head(&buffer->buffer_object->users, &view_gl->bo_user.entry); @@ -1683,7 +1684,7 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) struct wined3d_bo_gl *bo = &view_gl->counter_bo; view_gl->v.counter_bo = &bo->b; - wined3d_context_gl_create_bo(context_gl, sizeof(uint32_t), GL_ATOMIC_COUNTER_BUFFER, + wined3d_device_gl_create_bo(device_gl, context_gl, sizeof(uint32_t), GL_ATOMIC_COUNTER_BUFFER, GL_STATIC_DRAW, true, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo); wined3d_unordered_access_view_set_counter(&view_gl->v, 0); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cfd1d98d6ad..48b760edc1b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2382,8 +2382,6 @@ void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *contex void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN; -bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, - GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, @@ -4214,9 +4212,11 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, + struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, + GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; -unsigned int wined3d_device_gl_find_memory_type(GLbitfield flags) DECLSPEC_HIDDEN; GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx) DECLSPEC_HIDDEN; static inline float wined3d_alpha_ref(const struct wined3d_state *state) -- 2.34.1

3 9

[PATCH v3 1/4] iphlpapi: Fix ULONG comparisons, most notably for IPv4 addresses.
by Francois Gouget 16 Feb '22

16 Feb '22

The difference between two ULONGs may not fit in an int, causing sorting errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Introduce DWORD_cmp() to simplify the comparisons. v3: Spelling fix. Resent as one patchset so the tests should succeed on the last part. Note: ipaddrrow_cmp() and ipforward_row_cmp() should do byte-swapping too. This will go in the next patch. The IPv6 address comparisons use memcmp() so the resulting value should fit in an int. My computer has UDP servers listening on 192.* and 0.* but the 192.* entries preceeded the 0.* ones in the UDP table returned by GetUdpTable(). Because of this SnmpExtensionQuery(SNMP_PDU_GETNEXT) found that the last matching UDP entry was lower than the table's first entry and thus returned the first entry instead of the next one. This resulted in an infinite loop in inetmib1:main depending on the exact set of running UDP servers and IPv4 addresses. https://test.winehq.org/data/patterns.html#inetmib1:main --- dlls/iphlpapi/iphlpapi_main.c | 45 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 53b5006d771..6fe0cbc58f4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1593,9 +1593,15 @@ DWORD WINAPI GetIfEntry( MIB_IFROW *row ) return err; } +static int DWORD_cmp( DWORD a, DWORD b ) +{ + return a b ? 1 : 0; /* a subtraction would overflow */ +} + static int ifrow_cmp( const void *a, const void *b ) { - return ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; + const MIB_IFROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwIndex, rowB->dwIndex); } /****************************************************************** @@ -1921,7 +1927,8 @@ done: static int ipaddrrow_cmp( const void *a, const void *b ) { - return ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } /****************************************************************** @@ -2026,14 +2033,11 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s static int ipforward_row_cmp( const void *a, const void *b ) { - const MIB_IPFORWARDROW *rowA = a; - const MIB_IPFORWARDROW *rowB = b; - int ret; - - if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; - if ((ret = rowA->dwForwardProto - rowB->dwForwardProto) != 0) return ret; - if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; - return rowA->dwForwardNextHop - rowB->dwForwardNextHop; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest) || + DWORD_cmp(rowA->dwForwardProto, rowB->dwForwardProto) || + DWORD_cmp(rowA->dwForwardPolicy, rowB->dwForwardPolicy) || + DWORD_cmp(rowA->dwForwardNextHop, rowB->dwForwardNextHop); } /****************************************************************** @@ -2277,10 +2281,8 @@ err: static int ipnetrow_cmp( const void *a, const void *b ) { - const MIB_IPNETROW *row_a = a; - const MIB_IPNETROW *row_b = b; - - return RtlUlongByteSwap( row_a->dwAddr ) - RtlUlongByteSwap( row_b->dwAddr ); + const MIB_IPNETROW *rowA = a, *rowB = b; + return DWORD_cmp(RtlUlongByteSwap( rowA->dwAddr ), RtlUlongByteSwap( rowB->dwAddr )); } /****************************************************************** @@ -3043,13 +3045,12 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int tcp_row_cmp( const void *a, const void *b ) { - const MIB_TCPROW *rowA = a; - const MIB_TCPROW *rowB = b; + const MIB_TCPROW *rowA = a, *rowB = b; int ret; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwLocalAddr ), RtlUshortByteSwap( rowB->dwLocalAddr ))) != 0) return ret; if ((ret = RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort )) != 0) return ret; - if ((ret = RtlUlongByteSwap( rowA->dwRemoteAddr ) - RtlUlongByteSwap( rowB->dwRemoteAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwRemoteAddr ), RtlUshortByteSwap( rowB->dwRemoteAddr ))) != 0) return ret; return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort ); } @@ -3432,12 +3433,10 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int udp_row_cmp( const void *a, const void *b ) { - const MIB_UDPROW *rowA = a; - const MIB_UDPROW *rowB = b; - int ret; + const MIB_UDPROW *rowA = a, *rowB = b; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; - return RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); + return DWORD_cmp(RtlUlongByteSwap( rowA->dwLocalAddr), RtlUlongByteSwap( rowB->dwLocalAddr )) || + RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); } static int udp6_row_cmp( const void *a, const void *b ) -- 2.30.2

3 8

[PATCH 6/6] win32u: Move UnhookWindowsHook implementation from user32.
by Jacek Caban 16 Feb '22

16 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 16 +--------------- dlls/win32u/hook.c | 28 +++++++++++++++++++++++++++- dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 5 files changed, 34 insertions(+), 16 deletions(-)

2 1

[PATCH 5/6] win32u: Move NtUserUnhookWindowsHookEx implementation from user32.
by Jacek Caban 16 Feb '22

16 Feb '22

2 1

[PATCH 4/6] win32u: Move NtUserSetWindowsHookEx implementation from user32.
by Jacek Caban 16 Feb '22

16 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 69 ++++++--------------------------- dlls/win32u/hook.c | 85 +++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 16 ++++++++ include/ntuser.h | 2 + 7 files changed, 118 insertions(+), 58 deletions(-)

2 1

[PATCH 3/6] win32u: Move NtUserNotifyWinEvent implementation from user32.
by Jacek Caban 16 Feb '22

16 Feb '22

2 1

[PATCH 2/6] win32u: Move NtUserSetWinEventHook implementation from user32.
by Jacek Caban 16 Feb '22

16 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 54 ++++++---------------------------------- dlls/win32u/hook.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 19 ++++++++++++++ include/ntuser.h | 3 +++ 7 files changed, 87 insertions(+), 48 deletions(-)

2 1

[PATCH 1/6] win32u: Move NtUserUnhookWinEvent implementation from user32.
by Jacek Caban 16 Feb '22

16 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 28 ----------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/hook.c | 49 +++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 ++++++ include/ntuser.h | 1 + 9 files changed, 63 insertions(+), 31 deletions(-) create mode 100644 dlls/win32u/hook.c

2 1

[PATCH] riched20/tests: Add a test to see what richedit class flavours should be available.
by Dmitry Timoshkov 16 Feb '22

16 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/riched20/tests/editor.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 85f7c00383a..20bf0358712 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8994,6 +8994,38 @@ static void test_EM_SELECTIONTYPE(void) DestroyWindow(hwnd); } +static void test_window_classes(void) +{ + static const struct + { + const char *class; + BOOL success; + } test[] = + { + { "RichEdit", FALSE }, + { "RichEdit20A", TRUE }, + { "RichEdit20W", TRUE }, + { "RichEdit50A", FALSE }, + { "RichEdit50W", FALSE } + }; + int i; + HWND hwnd; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, test[i].class, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); + todo_wine_if(!strcmp(test[i].class, "RichEdit50A") || !strcmp(test[i].class, "RichEdit50W")) + ok(!hwnd == !test[i].success, "CreateWindow(%s) should %s\n", + test[i].class, test[i].success ? "succeed" : "fail"); + if (!hwnd) + todo_wine + ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, "got %u\n", GetLastError()); + else + DestroyWindow(hwnd); + } +} + START_TEST( editor ) { BOOL ret; @@ -9003,6 +9035,7 @@ START_TEST( editor ) ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); + test_window_classes(); test_WM_CHAR(); test_EM_FINDTEXT(FALSE); test_EM_FINDTEXT(TRUE); -- 2.35.1

2 2

[PATCH] mfplay: Shutdown sources when media items are released.
by Nikolay Sivov 16 Feb '22

16 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index d36bde8fec7..7d9a4da8649 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -61,6 +61,11 @@ static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect * struct media_player; +enum media_item_flags +{ + MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN = 0x1, +}; + struct media_item { IMFPMediaItem IMFPMediaItem_iface; @@ -73,6 +78,7 @@ struct media_item IUnknown *object; LONGLONG start_position; LONGLONG stop_position; + unsigned int flags; }; struct media_player @@ -359,7 +365,11 @@ static ULONG WINAPI media_item_Release(IMFPMediaItem *iface) if (item->player) IMFPMediaPlayer_Release(&item->player->IMFPMediaPlayer_iface); if (item->source) + { + if (item->flags & MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN) + IMFMediaSource_Shutdown(item->source); IMFMediaSource_Release(item->source); + } if (item->pd) IMFPresentationDescriptor_Release(item->pd); if (item->object) @@ -1189,6 +1199,7 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, IMFPMediaItem_Release(&item->IMFPMediaItem_iface); return E_OUTOFMEMORY; } + item->flags |= MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN; if (sync) { @@ -1244,11 +1255,11 @@ static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface static HRESULT media_player_create_item_from_object(struct media_player *player, IUnknown *object, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **ret) { + IMFMediaSource *source = NULL; + IMFByteStream *stream = NULL; struct media_item *item; MF_OBJECT_TYPE obj_type; HRESULT hr; - IMFByteStream *stream = NULL; - IMFMediaSource *source = NULL; *ret = NULL; @@ -1268,6 +1279,9 @@ static HRESULT media_player_create_item_from_object(struct media_player *player, return E_UNEXPECTED; } + if (source) + item->flags |= MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN; + if (sync) { if (stream) -- 2.34.1

1 0

[PATCH 1/3] mf/evr: Implement IsRateSupported().
by Nikolay Sivov 16 Feb '22

16 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 33 +++++++++++++++-- dlls/mf/tests/mf.c | 92 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index eae8338df7a..1d7c792fb1a 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2715,6 +2715,17 @@ static ULONG WINAPI video_renderer_rate_support_Release(IMFRateSupport *iface) return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); } +static BOOL video_renderer_is_main_stream_configured(const struct video_renderer *renderer) +{ + IMFMediaType *media_type; + HRESULT hr; + + if (SUCCEEDED(hr = IMFTransform_GetInputCurrentType(renderer->mixer, 0, &media_type))) + IMFMediaType_Release(media_type); + + return SUCCEEDED(hr); +} + static HRESULT WINAPI video_renderer_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { @@ -2741,11 +2752,27 @@ static HRESULT WINAPI video_renderer_rate_support_GetFastestRate(IMFRateSupport } static HRESULT WINAPI video_renderer_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, - float *nearest_supported_rate) + float *nearest_rate) { - FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_rate); + + EnterCriticalSection(&renderer->cs); + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + if (!thin && !video_renderer_is_main_stream_configured(renderer)) + hr = MF_E_INVALIDREQUEST; + + if (nearest_rate) + *nearest_rate = rate; + } + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMFRateSupportVtbl video_renderer_rate_support_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6bde7568202..58c7cbbadd4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4258,6 +4258,10 @@ if (SUCCEEDED(hr)) static void test_evr(void) { + static const float supported_rates[] = + { + 0.0f, 1.0f, -20.0f, 20.0f, 1000.0f, -1000.0f, + }; IMFVideoSampleAllocatorCallback *allocator_callback; IMFStreamSink *stream_sink, *stream_sink2; IMFVideoDisplayControl *display_control; @@ -4275,8 +4279,9 @@ static void test_evr(void) IMFRateSupport *rs; LONG sample_count; IMFSample *sample; - IUnknown *unk; + unsigned int i; UINT64 window3; + IUnknown *unk; float rate; HRESULT hr; GUID guid; @@ -4607,6 +4612,88 @@ todo_wine { hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, TRUE, &rate); ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(supported_rates); ++i) + { + rate = supported_rates[i] + 1.0f; + hr = IMFRateSupport_IsRateSupported(rs, TRUE, supported_rates[i], &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == supported_rates[i], "Unexpected rate %f.\n", rate); + + rate = supported_rates[i] + 1.0f; + hr = IMFRateSupport_IsRateSupported(rs, FALSE, supported_rates[i], &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(rate == supported_rates[i], "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rs, TRUE, supported_rates[i], NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_IsRateSupported(rs, FALSE, supported_rates[i], NULL); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + } + + /* Configuring stream type make rate support work. */ + hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)64 << 32 | 64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 0.0f; + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, TRUE, &rate); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == FLT_MAX, "Unexpected rate %f.\n", rate); +} + rate = 0.0f; + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, TRUE, &rate); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -FLT_MAX, "Unexpected rate %f.\n", rate); +} + for (i = 0; i < ARRAY_SIZE(supported_rates); ++i) + { + rate = supported_rates[i] + 1.0f; + hr = IMFRateSupport_IsRateSupported(rs, TRUE, supported_rates[i], &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == supported_rates[i], "Unexpected rate %f.\n", rate); + + rate = supported_rates[i] + 1.0f; + hr = IMFRateSupport_IsRateSupported(rs, FALSE, supported_rates[i], &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == supported_rates[i], "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rs, TRUE, supported_rates[i], NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_IsRateSupported(rs, FALSE, supported_rates[i], NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } + + IMFMediaTypeHandler_Release(type_handler); + IMFMediaType_Release(media_type); + IMFStreamSink_Release(stream_sink); + hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -4622,6 +4709,9 @@ todo_wine { hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, FALSE, &rate); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFRateSupport_IsRateSupported(rs, TRUE, 1.0f, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFPresentationClock_Release(clock); IMFActivate_Release(activate); -- 2.34.1

1 2

[PATCH vkd3d 2/6] vkd3d-shader/hlsl: Move type_is_single_reg() to hlsl.h.
by Francisco Casas 16 Feb '22

16 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 7 +------ libs/vkd3d-shader/hlsl.h | 5 +++++ libs/vkd3d-shader/hlsl_codegen.c | 9 ++------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8a0f4b01..8c56761d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -527,17 +527,12 @@ struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *nam return var; } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc) { struct hlsl_ir_store *store; - if (!writemask && type_is_single_reg(rhs->data_type)) + if (!writemask && hlsl_type_is_single_reg(rhs->data_type)) writemask = (1 << rhs->data_type->dimx) - 1; if (!(store = hlsl_alloc(ctx, sizeof(*store)))) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3a69165e..1f3ca4a2 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -697,6 +697,11 @@ static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) } } +static inline bool hlsl_type_is_single_reg(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; +} + const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index eac3513c..c502773d 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1685,11 +1685,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1733,14 +1728,14 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) + if (hlsl_type_is_single_reg(var->data_type)) { assert(!offset); ret.writemask = var->reg.writemask; } else { - assert(type_is_single_reg(type)); + assert(hlsl_type_is_single_reg(type)); ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); } return ret; -- 2.25.1

2 1

[PATCH 01/21] dlls/mapi32: enable compilation with long types
by Eric Pouech 16 Feb '22

16 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mapi32/Makefile.in | 1 - dlls/mapi32/mapi32_main.c | 16 ++++++++------- dlls/mapi32/prop.c | 48 +++++++++++++++++++++++---------------------- dlls/mapi32/sendmail.c | 6 +++--- dlls/mapi32/util.c | 18 ++++++++--------- 5 files changed, 44 insertions(+), 45 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index c6bc57f0ad8..3811fd1904b 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mapi32.dll IMPORTLIB = mapi32 IMPORTS = uuid shlwapi shell32 user32 advapi32 diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index ac830626795..3b9d202bf13 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -41,7 +41,7 @@ DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad); + TRACE("(%p,%ld,%p)\n", hinstDLL, fdwReason, fImpLoad); switch (fdwReason) { @@ -52,7 +52,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) break; case DLL_PROCESS_DETACH: if (fImpLoad) break; - TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount); + TRACE("DLL_PROCESS_DETACH: %ld objects remaining\n", MAPI_ObjectCount); unload_mapi_providers(); break; } @@ -68,7 +68,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { HRESULT ret = mapiFunctions.DllGetClassObject(rclsid, iid, ppv); - TRACE("ret: %x\n", ret); + TRACE("ret: %lx\n", ret); return ret; } @@ -97,7 +97,7 @@ HRESULT WINAPI DllCanUnloadNow(void) if (mapiFunctions.DllCanUnloadNow) { ret = mapiFunctions.DllCanUnloadNow(); - TRACE("(): provider returns %d\n", ret); + TRACE("(): provider returns %ld\n", ret); } return MAPI_ObjectCount == 0 ? ret : S_FALSE; @@ -129,7 +129,7 @@ HRESULT WINAPI MAPIInitialize(LPVOID init) ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { - TRACE("(0x%08Ix %s %p 0x%08x 0x%08x %p)\n", uiparam, + TRACE("(0x%08Ix %s %p 0x%08lx 0x%08lx %p)\n", uiparam, debugstr_a(profile), password, flags, reserved, session); if (mapiFunctions.MAPILogon) @@ -149,7 +149,7 @@ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved ) { - TRACE("(0x%08Ix 0x%08Ix 0x%08x 0x%08x)\n", session, + TRACE("(0x%08Ix 0x%08Ix 0x%08lx 0x%08lx)\n", session, uiparam, flags, reserved); if (mapiFunctions.MAPILogoff) @@ -167,7 +167,7 @@ ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, LPWSTR password, ULONG flags, LPMAPISESSION *session) { - TRACE("(0x%08Ix %s %p 0x%08x %p)\n", uiparam, + TRACE("(0x%08Ix %s %p 0x%08lx %p)\n", uiparam, debugstr_w(profile), password, flags, session); if (mapiFunctions.MAPILogonEx) @@ -206,7 +206,7 @@ HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin) if (mapiFunctions.MAPIAdminProfiles) return mapiFunctions.MAPIAdminProfiles(ulFlags, lppProfAdmin); - FIXME("(%u, %p): stub\n", ulFlags, lppProfAdmin); + FIXME("(%lu, %p): stub\n", ulFlags, lppProfAdmin); *lppProfAdmin = NULL; return E_FAIL; } diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index b217035e2c0..95176829f7e 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -299,7 +299,7 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp) */ BOOL WINAPI FPropContainsProp(LPSPropValue lpHaystack, LPSPropValue lpNeedle, ULONG ulFuzzy) { - TRACE("(%p,%p,0x%08x)\n", lpHaystack, lpNeedle, ulFuzzy); + TRACE("(%p,%p,0x%08lx)\n", lpHaystack, lpNeedle, ulFuzzy); if (FBadProp(lpHaystack) || FBadProp(lpNeedle) || PROP_TYPE(lpHaystack->ulPropTag) != PROP_TYPE(lpNeedle->ulPropTag)) @@ -400,7 +400,7 @@ BOOL WINAPI FPropCompareProp(LPSPropValue lpPropLeft, ULONG ulOp, LPSPropValue l { LONG iCmp; - TRACE("(%p,%d,%p)\n", lpPropLeft, ulOp, lpPropRight); + TRACE("(%p,%ld,%p)\n", lpPropLeft, ulOp, lpPropRight); if (ulOp > RELOP_RE || FBadProp(lpPropLeft) || FBadProp(lpPropRight)) return FALSE; @@ -442,7 +442,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight) { LONG iRet; - TRACE("(%p->0x%08x,%p->0x%08x)\n", lpPropLeft, lpPropLeft->ulPropTag, + TRACE("(%p->0x%08lx,%p->0x%08lx)\n", lpPropLeft, lpPropLeft->ulPropTag, lpPropRight, lpPropRight->ulPropTag); /* If the properties are not the same, sort by property type */ @@ -514,7 +514,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight) return memcmp(lpPropLeft->Value.lpguid, lpPropRight->Value.lpguid, sizeof(GUID)); } - FIXME("Unhandled property type %d\n", PROP_TYPE(lpPropLeft->ulPropTag)); + FIXME("Unhandled property type %ld\n", PROP_TYPE(lpPropLeft->ulPropTag)); return 0; } @@ -538,7 +538,7 @@ HRESULT WINAPI HrGetOneProp(LPMAPIPROP lpIProp, ULONG ulPropTag, LPSPropValue *l ULONG ulCount; HRESULT hRet; - TRACE("(%p,%d,%p)\n", lpIProp, ulPropTag, lppProp); + TRACE("(%p,%ld,%p)\n", lpIProp, ulPropTag, lppProp); pta.cValues = 1u; pta.aulPropTag[0] = ulPropTag; @@ -593,7 +593,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp) { BOOL bRet = FALSE; - TRACE("(%p,%d)\n", lpIProp, ulPropTag); + TRACE("(%p,%ld)\n", lpIProp, ulPropTag); if (lpIProp) { @@ -638,7 +638,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp) */ LPSPropValue WINAPI PpropFindProp(LPSPropValue lpProps, ULONG cValues, ULONG ulPropTag) { - TRACE("(%p,%d,%d)\n", lpProps, cValues, ulPropTag); + TRACE("(%p,%ld,%ld)\n", lpProps, cValues, ulPropTag); if (lpProps && cValues) { @@ -1075,7 +1075,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, */ LPSPropValue WINAPI LpValFindProp(ULONG ulPropTag, ULONG cValues, LPSPropValue lpProps) { - TRACE("(%d,%d,%p)\n", ulPropTag, cValues, lpProps); + TRACE("(%ld,%ld,%p)\n", ulPropTag, cValues, lpProps); if (lpProps && cValues) { @@ -1139,7 +1139,7 @@ BOOL WINAPI FBadRglpszA(LPSTR *lppszStrs, ULONG ulCount) { ULONG i; - TRACE("(%p,%d)\n", lppszStrs, ulCount); + TRACE("(%p,%ld)\n", lppszStrs, ulCount); if (!ulCount) return FALSE; @@ -1164,7 +1164,7 @@ BOOL WINAPI FBadRglpszW(LPWSTR *lppszStrs, ULONG ulCount) { ULONG i; - TRACE("(%p,%d)\n", lppszStrs, ulCount); + TRACE("(%p,%ld)\n", lppszStrs, ulCount); if (!ulCount) return FALSE; @@ -1220,7 +1220,7 @@ BOOL WINAPI FBadRowSet(LPSRowSet lpRowSet) */ ULONG WINAPI FBadPropTag(ULONG ulPropTag) { - TRACE("(0x%08x)\n", ulPropTag); + TRACE("(0x%08lx)\n", ulPropTag); switch (ulPropTag & (~MV_FLAG & PROP_TYPE_MASK)) { @@ -1532,7 +1532,7 @@ static ULONG WINAPI IPropData_fnAddRef(LPPROPDATA iface) { IPropDataImpl *This = impl_from_IPropData(iface); - TRACE("(%p)->(count before=%u)\n", This, This->lRef); + TRACE("(%p)->(count before=%lu)\n", This, This->lRef); return InterlockedIncrement(&This->lRef); } @@ -1548,7 +1548,7 @@ static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface) IPropDataImpl *This = impl_from_IPropData(iface); LONG lRef; - TRACE("(%p)->(count before=%u)\n", This, This->lRef); + TRACE("(%p)->(count before=%lu)\n", This, This->lRef); lRef = InterlockedDecrement(&This->lRef); if (!lRef) @@ -1596,7 +1596,7 @@ static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface) static HRESULT WINAPI IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, ULONG ulFlags, LPMAPIERROR *lppError) { - TRACE("(%p,0x%08X,0x%08X,%p)\n", iface, hRes, ulFlags, lppError); + TRACE("(%p,0x%08lX,0x%08lX,%p)\n", iface, hRes, ulFlags, lppError); if (!lppError || SUCCEEDED(hRes) || (ulFlags & ~MAPI_UNICODE)) return MAPI_E_INVALID_PARAMETER; @@ -1620,7 +1620,7 @@ static HRESULT WINAPI IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, U */ static HRESULT WINAPI IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags) { - TRACE("(%p,0x%08X)\n", iface, ulFlags); + TRACE("(%p,0x%08lX)\n", iface, ulFlags); /* Since this object is not transacted we do not need to implement this */ /* FIXME: Should we set the access levels to clean? */ @@ -1658,7 +1658,7 @@ static HRESULT WINAPI IPropData_fnGetProps(LPPROPDATA iface, LPSPropTagArray lpT ULONG i; HRESULT hRet = S_OK; - TRACE("(%p,%p,0x%08x,%p,%p) stub\n", iface, lpTags, ulFlags, + TRACE("(%p,%p,0x%08lx,%p,%p) stub\n", iface, lpTags, ulFlags, lpCount, lppProps); if (!iface || ulFlags & ~MAPI_UNICODE || !lpTags || *lpCount || !lppProps) @@ -1724,7 +1724,7 @@ static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags, ULONG i; HRESULT hRet; - TRACE("(%p,0x%08x,%p) stub\n", iface, ulFlags, lppTags); + TRACE("(%p,0x%08lx,%p) stub\n", iface, ulFlags, lppTags); if (!iface || ulFlags & ~MAPI_UNICODE || !lppTags) return MAPI_E_INVALID_PARAMETER; @@ -1766,7 +1766,7 @@ static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags, static HRESULT WINAPI IPropData_fnOpenProperty(LPPROPDATA iface, ULONG ulPropTag, LPCIID iid, ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk) { - FIXME("(%p,%u,%s,%u,0x%08x,%p) stub\n", iface, ulPropTag, + FIXME("(%p,%lu,%s,%lu,0x%08lx,%p) stub\n", iface, ulPropTag, debugstr_guid(iid), ulOpts, ulFlags, lpUnk); return MAPI_E_NO_SUPPORT; } @@ -1795,7 +1795,7 @@ static HRESULT WINAPI IPropData_fnSetProps(LPPROPDATA iface, ULONG ulValues, LPS HRESULT hRet = S_OK; ULONG i; - TRACE("(%p,%u,%p,%p)\n", iface, ulValues, lpProps, lppProbs); + TRACE("(%p,%lu,%p,%p)\n", iface, ulValues, lpProps, lppProbs); if (!iface || !lpProps) return MAPI_E_INVALID_PARAMETER; @@ -1963,7 +1963,7 @@ static HRESULT WINAPI IPropData_fnCopyTo(LPPROPDATA iface, ULONG niids, LPCIID l LPVOID lpDstObj, ULONG ulFlags, LPSPropProblemArray *lppProbs) { - FIXME("(%p,%u,%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, niids, + FIXME("(%p,%lu,%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, niids, lpiidExcl, lpPropsExcl, ulParam, lpIProgress, debugstr_guid(lpIfaceIid), lpDstObj, ulFlags, lppProbs); return MAPI_E_NO_SUPPORT; @@ -1982,7 +1982,7 @@ static HRESULT WINAPI IPropData_fnCopyProps(LPPROPDATA iface, LPSPropTagArray lp LPCIID lpIface, LPVOID lpDstObj, ULONG ulFlags, LPSPropProblemArray *lppProbs) { - FIXME("(%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, lpInclProps, + FIXME("(%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, lpInclProps, ulParam, lpIProgress, debugstr_guid(lpIface), lpDstObj, ulFlags, lppProbs); return MAPI_E_NO_SUPPORT; @@ -2015,7 +2015,7 @@ static HRESULT WINAPI IPropData_fnGetNamesFromIDs(LPPROPDATA iface, LPSPropTagAr LPGUID iid, ULONG ulFlags, ULONG *lpCount, LPMAPINAMEID **lpppNames) { - FIXME("(%p,%p,%s,0x%08X,%p,%p) stub\n", iface, lppPropTags, + FIXME("(%p,%p,%s,0x%08lX,%p,%p) stub\n", iface, lppPropTags, debugstr_guid(iid), ulFlags, lpCount, lpppNames); return MAPI_E_NO_SUPPORT; } @@ -2045,7 +2045,7 @@ static HRESULT WINAPI IPropData_fnGetIDsFromNames(LPPROPDATA iface, ULONG ulName LPMAPINAMEID *lppNames, ULONG ulFlags, LPSPropTagArray *lppPropTags) { - FIXME("(%p,%d,%p,0x%08X,%p) stub\n", + FIXME("(%p,%ld,%p,0x%08lX,%p) stub\n", iface, ulNames, lppNames, ulFlags, lppPropTags); return MAPI_E_NO_SUPPORT; } @@ -2069,7 +2069,7 @@ IPropData_fnHrSetObjAccess(LPPROPDATA iface, ULONG ulAccess) { IPropDataImpl *This = impl_from_IPropData(iface); - TRACE("(%p,%x)\n", iface, ulAccess); + TRACE("(%p,%lx)\n", iface, ulAccess); if (!iface || ulAccess < IPROP_READONLY || ulAccess > IPROP_READWRITE) return MAPI_E_INVALID_PARAMETER; diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index e1b7a682088..04266efed8c 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -107,7 +107,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM /* Attempt to log on via Extended MAPI */ ret = MAPILogonEx(0, NULL, NULL, MAPI_EXTENDED | MAPI_USE_DEFAULT | MAPI_NEW_SESSION, &session); - TRACE("MAPILogonEx: %x\n", ret); + TRACE("MAPILogonEx: %lx\n", ret); if (ret != S_OK) { @@ -361,7 +361,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM size += read; } - TRACE("%d bytes written of attachment\n", size); + TRACE("%ld bytes written of attachment\n", size); IStream_Commit(stream, STGC_DEFAULT); IStream_Release(stream); @@ -436,7 +436,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM break; default: - TRACE("ShowForm failure: %x\n", ret); + TRACE("ShowForm failure: %lx\n", ret); break; } } diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 8f0036e6873..3cd18bb5d88 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -69,7 +69,7 @@ SCODE WINAPI ScInitMapiUtil(ULONG ulReserved) if (mapiFunctions.ScInitMapiUtil) return mapiFunctions.ScInitMapiUtil(ulReserved); - FIXME("(0x%08x)stub!\n", ulReserved); + FIXME("(0x%08lx)stub!\n", ulReserved); if (ulReserved) return MAPI_E_INVALID_PARAMETER; return S_OK; @@ -126,7 +126,7 @@ SCODE WINAPI MAPIAllocateBuffer(ULONG cbSize, LPVOID *lppBuffer) { LPMAPIALLOCBUFFER lpBuff; - TRACE("(%d,%p)\n", cbSize, lppBuffer); + TRACE("(%ld,%p)\n", cbSize, lppBuffer); if (mapiFunctions.MAPIAllocateBuffer) return mapiFunctions.MAPIAllocateBuffer(cbSize, lppBuffer); @@ -169,7 +169,7 @@ SCODE WINAPI MAPIAllocateMore(ULONG cbSize, LPVOID lpOrig, LPVOID *lppBuffer) { LPMAPIALLOCBUFFER lpBuff = lpOrig; - TRACE("(%d,%p,%p)\n", cbSize, lpOrig, lppBuffer); + TRACE("(%ld,%p,%p)\n", cbSize, lpOrig, lppBuffer); if (mapiFunctions.MAPIAllocateMore) return mapiFunctions.MAPIAllocateMore(cbSize, lpOrig, lppBuffer); @@ -242,7 +242,7 @@ HRESULT WINAPI WrapProgress(PVOID unk1, PVOID unk2, PVOID unk3, PVOID unk4, PVOI */ HRESULT WINAPI HrDispatchNotifications(ULONG flags) { - FIXME("(%08x)\n", flags); + FIXME("(%08lx)\n", flags); return S_OK; } @@ -465,7 +465,7 @@ INT WINAPI MNLS_CompareStringW(DWORD dwCp, LPCWSTR lpszLeft, LPCWSTR lpszRight) { INT ret; - TRACE("0x%08x,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight)); + TRACE("0x%08lx,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight)); ret = MNLS_lstrcmpW(lpszLeft, lpszRight); return ret < 0 ? CSTR_LESS_THAN : ret ? CSTR_GREATER_THAN : CSTR_EQUAL; } @@ -717,7 +717,7 @@ HRESULT WINAPI OpenStreamOnFile(LPALLOCATEBUFFER lpAlloc, LPFREEBUFFER lpFree, DWORD dwMode = STGM_READWRITE, dwAttributes = 0; HRESULT hRet; - TRACE("(%p,%p,0x%08x,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, + TRACE("(%p,%p,0x%08lx,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, debugstr_a((LPSTR)lpszPath), debugstr_a((LPSTR)lpszPrefix), lppStream); if (mapiFunctions.OpenStreamOnFile) @@ -883,7 +883,7 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path BOOL ret = FALSE; HMODULE hmsi; - TRACE("%s %s %p %u %d\n", component, qualifier, dll_path, dll_path_length, install); + TRACE("%s %s %p %lu %d\n", component, qualifier, dll_path, dll_path_length, install); if (mapiFunctions.FGetComponentPath) return mapiFunctions.FGetComponentPath(component, qualifier, dll_path, dll_path_length, install); @@ -937,7 +937,7 @@ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, if (mapiFunctions.HrQueryAllRows) return mapiFunctions.HrQueryAllRows(lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); - FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); + FIXME("(%p, %p, %p, %p, %ld, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); *lppRows = NULL; return MAPI_E_CALL_FAILED; } @@ -950,7 +950,7 @@ HRESULT WINAPI WrapCompressedRTFStream(LPSTREAM compressed, ULONG flags, LPSTREA if (mapiFunctions.WrapCompressedRTFStream) return mapiFunctions.WrapCompressedRTFStream(compressed, flags, uncompressed); - FIXME("(%p, 0x%08x, %p): stub\n", compressed, flags, uncompressed); + FIXME("(%p, 0x%08lx, %p): stub\n", compressed, flags, uncompressed); return MAPI_E_NO_SUPPORT; }

3 23

[PATCH 1/5] xinput1_3: Only write haptics waveform reports when needed.
by Rémi Bernon 16 Feb '22

16 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 96 ++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 0e5bd7283c4..c8ce6622dcb 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -286,11 +286,14 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO PHIDP_PREPARSED_DATA preparsed = controller->hid.preparsed; char *report_buf = controller->hid.output_report_buf; BYTE report_id = controller->hid.haptics_report; + BOOL update_rumble, update_buzz; NTSTATUS status; if (!(controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED)) return ERROR_SUCCESS; + update_rumble = (controller->vibration.wLeftMotorSpeed != state->wLeftMotorSpeed); controller->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + update_buzz = (controller->vibration.wRightMotorSpeed != state->wRightMotorSpeed); controller->vibration.wRightMotorSpeed = state->wRightMotorSpeed; if (!controller->enabled) return ERROR_SUCCESS; @@ -311,55 +314,64 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO return 0; } - /* send haptics rumble report (left motor) */ - status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_INTENSITY, - state->wLeftMotorSpeed, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, - controller->hid.haptics_rumble_ordinal, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, - 0, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); - if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + if (update_rumble) { - WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); - return GetLastError(); + /* send haptics rumble report (left motor) */ + status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_INTENSITY, + state->wLeftMotorSpeed, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, + controller->hid.haptics_rumble_ordinal, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, + 0, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); + if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + { + WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); + return GetLastError(); + } } - /* send haptics buzz report (right motor) */ - status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_INTENSITY, - state->wRightMotorSpeed, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, - controller->hid.haptics_buzz_ordinal, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, - 0, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); - if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + if (update_buzz) { - WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); - return GetLastError(); + /* send haptics buzz report (right motor) */ + status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_INTENSITY, + state->wRightMotorSpeed, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, + controller->hid.haptics_buzz_ordinal, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, + 0, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); + if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + { + WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); + return GetLastError(); + } } - /* trigger haptics waveforms */ - status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, - controller->hid.haptics_none_ordinal, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, - 1, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); - if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + if (update_rumble || update_buzz) { - WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); - return GetLastError(); + /* trigger haptics waveforms */ + status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, + controller->hid.haptics_none_ordinal, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, + 1, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); + if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + { + WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); + return GetLastError(); + } } return ERROR_SUCCESS; -- 2.34.1

1 4

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Parse logical AND.
by Giovanni Mascellani 16 Feb '22

16 Feb '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 459ad03b..f5a05c53 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1136,6 +1136,41 @@ static struct list *add_binary_comparison_expr_merge(struct hlsl_ctx *ctx, struc return list1; } +static struct hlsl_ir_expr *add_binary_logical_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, + struct vkd3d_shader_location *loc) +{ + struct hlsl_type *common_type; + enum hlsl_type_class type; + unsigned int dimx, dimy; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + + if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) + return NULL; + + common_type = hlsl_get_numeric_type(ctx, type, HLSL_TYPE_BOOL, dimx, dimy); + + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, common_type, loc))) + return NULL; + + if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, common_type, loc))) + return NULL; + + return add_expr(ctx, instrs, op, args, common_type, loc); +} + +static struct list *add_binary_logical_expr_merge(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + + list_move_tail(list1, list2); + vkd3d_free(list2); + add_binary_logical_expr(ctx, list1, op, arg1, arg2, loc); + + return list1; +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -3664,7 +3699,7 @@ logicand_expr: bitor_expr | logicand_expr OP_AND bitor_expr { - hlsl_fixme(ctx, &@$, "Logical AND."); + $$ = add_binary_logical_expr_merge(ctx, $1, $3, HLSL_OP2_LOGIC_AND, &@2); } logicor_expr: -- 2.34.1

1 5

[PATCH] kernelbase: Add CreateBoundaryDescriptorA stub.
by Mohamad Al-Jaf 16 Feb '22

16 Feb '22

Needed for IE11. --- I didn't sign this because I'm looking for feedback. The function CreateBoundaryDescriptorA has a spec entry in kernel32 but not kernelbase. However, doing grep -rnw . -e 'CreateBoundaryDescriptorA' reveals that both kernel32 and kernelbase match. Why is this? Still, I don't see a security file in kernel32. I suppose I could add it to kernel_main.c. Would this be okay? --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/security.c | 9 +++++++++ include/namespaceapi.h | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7db82db375d..575f034eed0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -266,7 +266,7 @@ @ stdcall CopyLZFile(long long) LZCopy @ stdcall CreateActCtxA(ptr) @ stdcall -import CreateActCtxW(ptr) -# @ stub CreateBoundaryDescriptorA +@ stdcall -import CreateBoundaryDescriptorA(str long) @ stdcall -import CreateBoundaryDescriptorW(wstr long) @ stdcall -import CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall -import CreateDirectoryA(str ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e06ecde17d1..60c3b74d331 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -174,6 +174,7 @@ # @ stub CouldMultiUserAppsBehaviorBePossibleForPackage @ stdcall CreateActCtxW(ptr) # @ stub CreateAppContainerToken +@ stdcall CreateBoundaryDescriptorA(str long) @ stdcall CreateBoundaryDescriptorW(wstr long) @ stdcall CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall CreateDirectoryA(str ptr) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 3c1a3d7f077..88fdab4699e 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -922,6 +922,15 @@ BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity( PSECURITY_DESCRIPTOR pare return set_ntstatus( RtlConvertToAutoInheritSecurityObject( parent, current, descr, type, is_dir, mapping )); } +/****************************************************************************** + * CreateBoundaryDescriptorA (kernelbase.@) + */ +HANDLE WINAPI CreateBoundaryDescriptorA( LPCSTR name, ULONG flags ) +{ + FIXME("%s %lu - stub\n", debugstr_a(name), flags); + return NULL; +} + /****************************************************************************** * CreateBoundaryDescriptorW (kernelbase.@) */ diff --git a/include/namespaceapi.h b/include/namespaceapi.h index 9446806f82e..f219a2a7488 100644 --- a/include/namespaceapi.h +++ b/include/namespaceapi.h @@ -27,7 +27,9 @@ extern "C" { WINBASEAPI BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorA(LPCSTR,ULONG); WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +#define CreateBoundaryDescriptor WINELIB_NAME_AW(CreateBoundaryDescriptor) WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); -- 2.35.1

2 2

[PATCH 0/4] Enabling long types in ntdll
by Eric Pouech 16 Feb '22

16 Feb '22

It's time to celebrate!! With yesterday's commits, half (50%) of the 745 modules have been migrated with long type compilation. So celebration it is... with migrating ntdll... pushing to wine-devel in a dedicated serie to ease versionning (if needed) A few comments though: - changes to Unixlib part are not automated (whereas the PE part is). so given the number of changes, errors may have been integrated. So double, triple look is welcomed. - Alexandre suggested to add #define WINE_NO_LONG_TYPES to unix/*.c files to reduce changes and not useful casts in debug traces - that would have made 19 files needing that - I tried to reduce that for files where a) there was easy room for adaptating types to avoid warnings and/or b) the number of cast to be added per file was small (say 10) - that leaves 6 unix/*.c files with #define WINE_NO_LONG_TYPES, they others being migrated (plus the two arm* signal files that can simply be migrated as purely compiled as 32 or 64 bit, but I will let folks with an ARM compiler take care of it) However, the mixed type definitions among the dlls/ntdll/*.c could be problematic for maintaining the code. A+ --- Eric Pouech (4): dlls/ntdll/unix: reduce use of long type in unixlib's iocontrol routines dlls/ntdll/unix: don't use long types when possible dlls/ntdll/unix: use correct integral type dlls/ntdll: enable compilation with long types dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/actctx.c | 34 ++++++------- dlls/ntdll/atom.c | 2 +- dlls/ntdll/debugbuffer.c | 40 ++++++++-------- dlls/ntdll/error.c | 2 +- dlls/ntdll/exception.c | 24 +++++----- dlls/ntdll/handletable.c | 4 +- dlls/ntdll/heap.c | 88 +++++++++++++++++----------------- dlls/ntdll/loader.c | 54 ++++++++++----------- dlls/ntdll/locale.c | 22 ++++----- dlls/ntdll/misc.c | 20 ++++---- dlls/ntdll/path.c | 4 +- dlls/ntdll/reg.c | 10 ++-- dlls/ntdll/relay.c | 28 +++++------ dlls/ntdll/resource.c | 4 +- dlls/ntdll/rtl.c | 26 +++++----- dlls/ntdll/rtlbitmap.c | 32 ++++++------- dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/sec.c | 36 +++++++------- dlls/ntdll/signal_i386.c | 28 +++++------ dlls/ntdll/signal_x86_64.c | 28 +++++------ dlls/ntdll/sync.c | 8 ++-- dlls/ntdll/thread.c | 12 ++--- dlls/ntdll/threadpool.c | 26 +++++----- dlls/ntdll/unix/cdrom.c | 21 ++++---- dlls/ntdll/unix/debug.c | 12 ++--- dlls/ntdll/unix/env.c | 12 ++--- dlls/ntdll/unix/file.c | 2 + dlls/ntdll/unix/loader.c | 10 ++-- dlls/ntdll/unix/process.c | 14 +++--- dlls/ntdll/unix/registry.c | 2 + dlls/ntdll/unix/security.c | 2 + dlls/ntdll/unix/serial.c | 32 ++++++------- dlls/ntdll/unix/server.c | 6 +-- dlls/ntdll/unix/signal_arm.c | 2 + dlls/ntdll/unix/signal_arm64.c | 2 + dlls/ntdll/unix/signal_i386.c | 22 ++++----- dlls/ntdll/unix/socket.c | 18 +++---- dlls/ntdll/unix/sync.c | 2 + dlls/ntdll/unix/system.c | 2 + dlls/ntdll/unix/tape.c | 34 ++++++------- dlls/ntdll/unix/thread.c | 17 +++---- dlls/ntdll/unix/unix_private.h | 14 +++--- dlls/ntdll/unix/virtual.c | 2 + dlls/ntdll/version.c | 6 +-- 45 files changed, 394 insertions(+), 376 deletions(-)

1 4

[PATCH v2 1/2] iphlpapi: Fix ULONG comparisons, most notably for IPv4 addresses.
by Francois Gouget 16 Feb '22

16 Feb '22

The difference between two ULONGs may not fit in an int, causing sorting errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Introduce DWORD_cmp() to simplify the comparisons. Note: ipaddrrow_cmp() and ipforward_row_cmp() should do byte-swapping too. This will go in the next patch. Another approach would be to modify all the comparison functions to return a 64-bit value which would ensure no overflow happens (they are all internal functions so that should work). The IPv6 address comparisons use memcmp() so the resulting value should fit in an int. My computer has UDP servers listening on 192.* and 0.* but the 192.* entries preceeded the 0.* ones in the UDP table returned by GetUdpTable(). Because of this SnmpExtensionQuery(SNMP_PDU_GETNEXT) found that the last matching UDP entry was lower than the table's first entry and thus returned the first entry instead of the next one. This resulted in an infinite loop in inetmib1:main depending on the exact set of running UDP servers and IPv4 addresses. https://test.winehq.org/data/patterns.html#inetmib1:main --- dlls/iphlpapi/iphlpapi_main.c | 45 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 53b5006d771..2a8086292b9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1593,9 +1593,15 @@ DWORD WINAPI GetIfEntry( MIB_IFROW *row ) return err; } +static int DWORD_cmp( DWORD a, DWORD b ) +{ + return a b ? 1 : 0; /* a substraction would overflow */ +} + static int ifrow_cmp( const void *a, const void *b ) { - return ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; + const MIB_IFROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwIndex, rowB->dwIndex); } /****************************************************************** @@ -1921,7 +1927,8 @@ done: static int ipaddrrow_cmp( const void *a, const void *b ) { - return ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } /****************************************************************** @@ -2026,14 +2033,11 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s static int ipforward_row_cmp( const void *a, const void *b ) { - const MIB_IPFORWARDROW *rowA = a; - const MIB_IPFORWARDROW *rowB = b; - int ret; - - if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; - if ((ret = rowA->dwForwardProto - rowB->dwForwardProto) != 0) return ret; - if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; - return rowA->dwForwardNextHop - rowB->dwForwardNextHop; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest) || + DWORD_cmp(rowA->dwForwardProto, rowB->dwForwardProto) || + DWORD_cmp(rowA->dwForwardPolicy, rowB->dwForwardPolicy) || + DWORD_cmp(rowA->dwForwardNextHop, rowB->dwForwardNextHop); } /****************************************************************** @@ -2277,10 +2281,8 @@ err: static int ipnetrow_cmp( const void *a, const void *b ) { - const MIB_IPNETROW *row_a = a; - const MIB_IPNETROW *row_b = b; - - return RtlUlongByteSwap( row_a->dwAddr ) - RtlUlongByteSwap( row_b->dwAddr ); + const MIB_IPNETROW *rowA = a, *rowB = b; + return DWORD_cmp(RtlUlongByteSwap( rowA->dwAddr ), RtlUlongByteSwap( rowB->dwAddr )); } /****************************************************************** @@ -3043,13 +3045,12 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int tcp_row_cmp( const void *a, const void *b ) { - const MIB_TCPROW *rowA = a; - const MIB_TCPROW *rowB = b; + const MIB_TCPROW *rowA = a, *rowB = b; int ret; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwLocalAddr ), RtlUshortByteSwap( rowB->dwLocalAddr ))) != 0) return ret; if ((ret = RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort )) != 0) return ret; - if ((ret = RtlUlongByteSwap( rowA->dwRemoteAddr ) - RtlUlongByteSwap( rowB->dwRemoteAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwRemoteAddr ), RtlUshortByteSwap( rowB->dwRemoteAddr ))) != 0) return ret; return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort ); } @@ -3432,12 +3433,10 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int udp_row_cmp( const void *a, const void *b ) { - const MIB_UDPROW *rowA = a; - const MIB_UDPROW *rowB = b; - int ret; + const MIB_UDPROW *rowA = a, *rowB = b; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; - return RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); + return DWORD_cmp(RtlUlongByteSwap( rowA->dwLocalAddr), RtlUlongByteSwap( rowB->dwLocalAddr )) || + RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); } static int udp6_row_cmp( const void *a, const void *b ) -- 2.30.2

2 2

[PATCH 01/21] dlls/ncrypt: enable compilation with long types
by Eric Pouech 16 Feb '22

16 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ncrypt/Makefile.in | 1 - dlls/ncrypt/main.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index 120187ef61c..ad3ed409961 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES IMPORTLIB = ncrypt MODULE = ncrypt.dll diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..28f46ac0af9 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -31,7 +31,7 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(0x%lx, %p, %s, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(algid), + FIXME("(0x%Ix, %p, %s, %s, 0x%08lx, 0x%08lx): stub\n", provider, key, wine_dbgstr_w(algid), wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } @@ -39,21 +39,21 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + FIXME("(0x%Ix, %p, %lu, %p, %p, %lu, %p, 0x%08lx): stub\n", key, input, insize, padding, output, outsize, result, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptDeleteKey(NCRYPT_KEY_HANDLE key, DWORD flags) { - FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + FIXME("(0x%Ix, 0x%08lx): stub\n", key, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + FIXME("(0x%Ix, %p, %lu, %p, %p, %lu, %p, 0x%08lx): stub\n", key, input, insize, padding, output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -62,20 +62,20 @@ SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD a DWORD *alg_count, NCryptAlgorithmName **alg_list, DWORD flags) { - FIXME("(0x%lx, 0x%08x, %p, %p, 0x%08x): stub\n", provider, alg_ops, alg_count, alg_list, flags); + FIXME("(0x%Ix, 0x%08lx, %p, %p, 0x%08lx): stub\n", provider, alg_ops, alg_count, alg_list, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR *scope, NCryptKeyName **key_name, PVOID *enum_state, DWORD flags) { - FIXME("(0x%lx, %p, %p, %p, 0x%08x): stub\n", provider, scope, key_name, enum_state, flags); + FIXME("(0x%Ix, %p, %p, %p, 0x%08lx): stub\n", provider, scope, key_name, enum_state, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) { - FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + FIXME("(0x%Ix, 0x%08lx): stub\n", key, flags); return NTE_NOT_SUPPORTED; } @@ -87,14 +87,14 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) { - FIXME("(0x%lx): stub\n", object); + FIXME("(0x%Ix): stub\n", object); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, + FIXME("(0x%Ix, %s, %p, %lu, %p, 0x%08lx): stub\n", object, wine_dbgstr_w(property), output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -103,7 +103,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, PBYTE data, DWORD datasize, DWORD flags) { - FIXME("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, + FIXME("(0x%Ix, 0x%Ix, %s, %p, %p, %p, %lu, 0x%08lx): stub\n", provider, decrypt_key, wine_dbgstr_w(type), params, key, data, datasize, flags); return NTE_NOT_SUPPORTED; @@ -112,33 +112,33 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), flags); + FIXME("(0x%Ix, %s, 0x%08lx): stub\n", provider, wine_dbgstr_w(algid), flags); return NTE_NOT_SUPPORTED; } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) { - FIXME("(0x%lx): stub\n", hKey); + FIXME("(0x%Ix): stub\n", hKey); return FALSE; } SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(0x%lx, %p, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); + FIXME("(0x%Ix, %p, %s, 0x%08lx, 0x%08lx): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { - FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); + FIXME("(%p, %s, %lu): stub\n", provider, wine_dbgstr_w(name), flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE input, DWORD insize, DWORD flags) { - FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, + FIXME("(%Ix, %s, %p, %lu, 0x%08lx): stub\n", object, wine_dbgstr_w(property), input, insize, flags); return NTE_NOT_SUPPORTED; }

1 20

[PATCH] msxml3/tests: Fix some double-frees of BSTRs.
by Daniel Lehman 16 Feb '22

16 Feb '22

2 1

[PATCH v2 1/4] winegstreamer: Introduce new wg_transform struct.
by Rémi Bernon 16 Feb '22

16 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Move the format helpers to a dedicated source, use a separate major format in the wg_format struct for WMA format. dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 3 ++ dlls/winegstreamer/main.c | 14 +++++++ dlls/winegstreamer/unix_private.h | 31 ++++++++++++++ dlls/winegstreamer/unixlib.h | 8 ++++ dlls/winegstreamer/wg_parser.c | 20 +++++++-- dlls/winegstreamer/wg_transform.c | 69 +++++++++++++++++++++++++++++++ dlls/winegstreamer/wma_decoder.c | 20 +++++++++ 8 files changed, 162 insertions(+), 4 deletions(-) create mode 100644 dlls/winegstreamer/unix_private.h create mode 100644 dlls/winegstreamer/wg_transform.c diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index c53e914e246..52295418f0f 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ mfplat.c \ quartz_parser.c \ wg_parser.c \ + wg_transform.c \ wm_asyncreader.c \ wm_reader.c \ wm_syncreader.c \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 222bce3b2c7..df82b229143 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -96,6 +96,9 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) DECLSPEC void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) DECLSPEC_HIDDEN; +struct wg_transform *wg_transform_create(void) DECLSPEC_HIDDEN; +void wg_transform_destroy(struct wg_transform *transform) DECLSPEC_HIDDEN; + unsigned int wg_format_get_max_size(const struct wg_format *format); HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 260dd208e2f..f23fa3abcdf 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -254,6 +254,20 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, __wine_unix_call(unix_handle, unix_wg_parser_stream_seek, &params); } +struct wg_transform *wg_transform_create(void) +{ + struct wg_transform_create_params params = {0}; + + if (__wine_unix_call(unix_handle, unix_wg_transform_create, &params)) + return NULL; + return params.transform; +} + +void wg_transform_destroy(struct wg_transform *transform) +{ + __wine_unix_call(unix_handle, unix_wg_transform_destroy, transform); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h new file mode 100644 index 00000000000..375d33e7728 --- /dev/null +++ b/dlls/winegstreamer/unix_private.h @@ -0,0 +1,31 @@ +/* + * winegstreamer Unix library interface + * + * Copyright 2020-2021 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINEGSTREAMER_UNIX_PRIVATE_H +#define __WINE_WINEGSTREAMER_UNIX_PRIVATE_H + +#include "unixlib.h" + +extern bool init_gstreamer(void) DECLSPEC_HIDDEN; + +extern NTSTATUS wg_transform_create(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_transform_destroy(void *args) DECLSPEC_HIDDEN; + +#endif /* __WINE_WINEGSTREAMER_UNIX_PRIVATE_H */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 82bb534b938..c8b98da3a64 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -217,6 +217,11 @@ struct wg_parser_stream_seek_params DWORD start_flags, stop_flags; }; +struct wg_transform_create_params +{ + struct wg_transform *transform; +}; + enum unix_funcs { unix_wg_parser_create, @@ -245,6 +250,9 @@ enum unix_funcs unix_wg_parser_stream_get_duration, unix_wg_parser_stream_seek, + + unix_wg_transform_create, + unix_wg_transform_destroy, }; #endif /* __WINE_WINEGSTREAMER_UNIXLIB_H */ diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 013566b25e9..ac8c5a2b95c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -37,7 +37,7 @@ #include "winternl.h" #include "dshow.h" -#include "unixlib.h" +#include "unix_private.h" typedef enum { @@ -51,7 +51,7 @@ typedef enum * debug logging instead of Wine debug logging. In order to be safe we forbid * any use of Wine debug logging in this entire file. */ -GST_DEBUG_CATEGORY_STATIC(wine); +GST_DEBUG_CATEGORY(wine); #define GST_CAT_DEFAULT wine typedef BOOL (*init_gst_cb)(struct wg_parser *parser); @@ -1963,6 +1963,16 @@ static void init_gstreamer_once(void) gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } +bool init_gstreamer(void) +{ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + + if (pthread_once(&init_once, init_gstreamer_once)) + return false; + + return true; +} + static NTSTATUS wg_parser_create(void *args) { static const init_gst_cb init_funcs[] = @@ -1973,11 +1983,10 @@ static NTSTATUS wg_parser_create(void *args) [WG_PARSER_WAVPARSE] = wave_parser_init_gst, }; - static pthread_once_t once = PTHREAD_ONCE_INIT; struct wg_parser_create_params *params = args; struct wg_parser *parser; - if (pthread_once(&once, init_gstreamer_once)) + if (!init_gstreamer()) return E_FAIL; if (!(parser = calloc(1, sizeof(*parser)))) @@ -2044,4 +2053,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_parser_stream_get_duration), X(wg_parser_stream_seek), + + X(wg_transform_create), + X(wg_transform_destroy), }; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c new file mode 100644 index 00000000000..822740da0d7 --- /dev/null +++ b/dlls/winegstreamer/wg_transform.c @@ -0,0 +1,69 @@ +/* + * GStreamer transform backend + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#include <gst/gst.h> +#include <gst/video/video.h> +#include <gst/audio/audio.h> + +#include "winternl.h" +#include "dshow.h" + +#include "unix_private.h" + +GST_DEBUG_CATEGORY_EXTERN(wine); +#define GST_CAT_DEFAULT wine + +struct wg_transform +{ +}; + +NTSTATUS wg_transform_destroy(void *args) +{ + struct wg_transform *transform = args; + + free(transform); + return S_OK; +} + +NTSTATUS wg_transform_create(void *args) +{ + struct wg_transform_create_params *params = args; + struct wg_transform *transform; + + if (!init_gstreamer()) + return E_FAIL; + + if (!(transform = calloc(1, sizeof(*transform)))) + return E_OUTOFMEMORY; + + GST_INFO("Created winegstreamer transform %p.", transform); + params->transform = transform; + return S_OK; +} diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 78316059052..3b051230a9e 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -53,6 +53,8 @@ struct wma_decoder LONG refcount; IMFMediaType *input_type; IMFMediaType *output_type; + + struct wg_transform *wg_transform; }; static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface) @@ -60,6 +62,19 @@ static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct wma_decoder, IUnknown_inner); } +static HRESULT try_create_wg_transform(struct wma_decoder *decoder) +{ + if (decoder->wg_transform) + wg_transform_destroy(decoder->wg_transform); + + decoder->wg_transform = wg_transform_create(); + if (decoder->wg_transform) + return S_OK; + + WARN("Failed to create wg_transform.\n"); + return E_FAIL; +} + static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID iid, void **out) { struct wma_decoder *decoder = impl_from_IUnknown(iface); @@ -104,6 +119,8 @@ static ULONG WINAPI unknown_Release(IUnknown *iface) if (!refcount) { + if (decoder->wg_transform) + wg_transform_destroy(decoder->wg_transform); if (decoder->input_type) IMFMediaType_Release(decoder->input_type); if (decoder->output_type) @@ -438,6 +455,9 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)decoder->output_type))) goto failed; + if (FAILED(hr = try_create_wg_transform(decoder))) + goto failed; + return S_OK; failed: -- 2.34.1

2 6

[PATCH v3 1/8] advapi32: Add AccessCheckByTypeAndAuditAlarmA stub.
by Mohamad Al-Jaf 16 Feb '22

16 Feb '22

Needed for IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: Fix incorrect format specifiers. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ include/winbase.h | 1 + include/winnt.h | 7 +++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index cefc8dc2899..ce9a003e127 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -8,7 +8,7 @@ @ stdcall AccessCheckAndAuditAlarmA(str ptr str str ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr) -# @ stub AccessCheckByTypeAndAuditAlarmA +@ stdcall AccessCheckByTypeAndAuditAlarmA(str ptr str str ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub AccessCheckByTypeAndAuditAlarmW # @ stub AccessCheckByTypeResultList # @ stub AccessCheckByTypeResultListAndAuditAlarmA diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e0f7b63aedb..bc292d6fd02 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1429,6 +1429,22 @@ BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR Subsystem, LPVOID HandleId, LPSTR O return TRUE; } +/****************************************************************************** + * AccessCheckByTypeAndAuditAlarmA [ADVAPI32.@] + */ +BOOL WINAPI AccessCheckByTypeAndAuditAlarmA( LPCSTR subsystem, LPVOID id, LPCSTR type_name, + LPCSTR name, PSECURITY_DESCRIPTOR descr, PSID sid, + DWORD access, AUDIT_EVENT_TYPE audit, DWORD flags, + POBJECT_TYPE_LIST types, DWORD length, + PGENERIC_MAPPING mapping, BOOL creation, LPDWORD granted, + LPBOOL status, LPBOOL on_close ) +{ + FIXME( "stub (%s,%p,%s,%s,%p,%p,%08lx,%u,%08lx,%p,%08lx,%p,%x,%p,%p,%p)\n", debugstr_a(subsystem), + id, debugstr_a(type_name), debugstr_a(name), descr, sid, access, audit, + flags, types, length, mapping, creation, granted, status, on_close ); + return TRUE; +} + BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR SubsystemName, LPVOID HandleId, BOOL GenerateOnClose) { FIXME("stub (%s,%p,%x)\n", debugstr_a(SubsystemName), HandleId, GenerateOnClose); diff --git a/include/winbase.h b/include/winbase.h index a8744eb417a..0fc978b69c8 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1780,6 +1780,7 @@ WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPST WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); #define AccessCheckAndAuditAlarm WINELIB_NAME_AW(AccessCheckAndAuditAlarm) WINADVAPI BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); +WINADVAPI BOOL WINAPI AccessCheckByTypeAndAuditAlarmA(LPCSTR,LPVOID,LPCSTR,LPCSTR,PSECURITY_DESCRIPTOR,PSID,DWORD,AUDIT_EVENT_TYPE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); WINBASEAPI VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK); WINBASEAPI VOID WINAPI AcquireSRWLockShared(PSRWLOCK); WINADVAPI BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); diff --git a/include/winnt.h b/include/winnt.h index bd64b092369..b82c96bfb27 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, -- 2.35.1

1 7

[PATCH 0/6] Reduce gcc 11's -Warray-bound warnings
by Eric Pouech 16 Feb '22

16 Feb '22

GCC11 warns when accessing the fields of a structure, when the allocation of that structure is smaller than the size of the structure even though the accessed fields are within the boundaries of the memory are that has been allocated this serie addresses a couple of those Note to Zebediah: in the quartz one, I wondered if we could reduce the allocated size to a VIDEOINFOHEADER when the dwBitMasks is not used, but I didn't change it A+ --- Eric Pouech (6): dlls/oledb32/tests: silence some gcc11 warnings (-Warray-bounds) dlls/windows.globalization: use 0-length array to keep gcc happy gdiplus/tests: get rid of some GCC11 warnings (-Warray-bounds) dlls/quartz: use VIDEOINFOHEADER instead of partially allocated VIDEOINFO structure dlls/gdiplus: get rid of gcc11 warnings (-Warray-bounds) dlls/user32: silence gcc11 warning (-Warray-bounds) dlls/gdiplus/image.c | 5 ++++- dlls/gdiplus/tests/graphics.c | 19 +++++++++---------- dlls/oledb32/tests/convert.c | 10 +++++----- dlls/quartz/avidec.c | 9 +++++---- dlls/user32/win.c | 2 +- dlls/windows.globalization/main.c | 2 +- 6 files changed, 25 insertions(+), 22 deletions(-)

3 9

[PATCH 1/5] kernelbase: Parse query strings even without a slash after the host in UrlGetPart().
by Zebediah Figura 16 Feb '22

16 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 12 +++++------- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d14316f05ee..35cce74ab24 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4243,15 +4243,13 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) work = parse_url_element( pl->port, L"/\\?#" ); pl->port_len = work - pl->port; } - if (*work == '/') + + if ((pl->query = wcschr( work, '?' ))) { - /* see if query string */ - if ((pl->query = wcschr( work, '?' ))) - { - ++pl->query; - pl->query_len = lstrlenW(pl->query); - } + ++pl->query; + pl->query_len = lstrlenW(pl->query); } + SuccessExit: TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n", pl->scheme, pl->scheme_len, pl->username, pl->username_len, pl->password, pl->password_len, pl->hostname, diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 1b26204a94f..3bfd8961c8f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -669,7 +669,7 @@ static void test_UrlGetPart(void) {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, {"http://host?a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, - {"http://host?a:b@c:d", URL_PART_QUERY, 0, S_OK, "a:b@c:d", .todo_hr = TRUE}, + {"http://host?a:b@c:d", URL_PART_QUERY, 0, S_OK, "a:b@c:d"}, {"http://host#a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host#a:b@c:d", URL_PART_QUERY, 0, S_FALSE, ""}, -- 2.34.1

1 4

[PATCH v2 1/8] advapi32: Add AccessCheckByTypeAndAuditAlarmA stub.
by Mohamad Al-Jaf 16 Feb '22

16 Feb '22

Needed for IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: Fix whitespace error. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ include/winbase.h | 1 + include/winnt.h | 7 +++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index cefc8dc2899..ce9a003e127 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -8,7 +8,7 @@ @ stdcall AccessCheckAndAuditAlarmA(str ptr str str ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr) -# @ stub AccessCheckByTypeAndAuditAlarmA +@ stdcall AccessCheckByTypeAndAuditAlarmA(str ptr str str ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub AccessCheckByTypeAndAuditAlarmW # @ stub AccessCheckByTypeResultList # @ stub AccessCheckByTypeResultListAndAuditAlarmA diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e0f7b63aedb..a6247cd7f89 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1429,6 +1429,22 @@ BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR Subsystem, LPVOID HandleId, LPSTR O return TRUE; } +/****************************************************************************** + * AccessCheckByTypeAndAuditAlarmA [ADVAPI32.@] + */ +BOOL WINAPI AccessCheckByTypeAndAuditAlarmA( LPCSTR subsystem, LPVOID id, LPCSTR type_name, + LPCSTR name, PSECURITY_DESCRIPTOR descr, PSID sid, + DWORD access, AUDIT_EVENT_TYPE audit, DWORD flags, + POBJECT_TYPE_LIST types, DWORD length, + PGENERIC_MAPPING mapping, BOOL creation, LPDWORD granted, + LPBOOL status, LPBOOL on_close ) +{ + FIXME( "stub (%s,%p,%s,%s,%p,%p,%08x,%p,%08x,%p,%08x,%p,%x,%p,%p,%p)\n", debugstr_a(subsystem), + id, debugstr_a(type_name), debugstr_a(name), descr, sid, access, audit, + flags, types, length, mapping, creation, granted, status, on_close ); + return TRUE; +} + BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR SubsystemName, LPVOID HandleId, BOOL GenerateOnClose) { FIXME("stub (%s,%p,%x)\n", debugstr_a(SubsystemName), HandleId, GenerateOnClose); diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..379bd06830f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1780,6 +1780,7 @@ WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPST WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); #define AccessCheckAndAuditAlarm WINELIB_NAME_AW(AccessCheckAndAuditAlarm) WINADVAPI BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); +WINADVAPI BOOL WINAPI AccessCheckByTypeAndAuditAlarmA(LPCSTR,LPVOID,LPCSTR,LPCSTR,PSECURITY_DESCRIPTOR,PSID,DWORD,AUDIT_EVENT_TYPE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); WINBASEAPI VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK); WINBASEAPI VOID WINAPI AcquireSRWLockShared(PSRWLOCK); WINADVAPI BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); diff --git a/include/winnt.h b/include/winnt.h index bd64b092369..b82c96bfb27 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, -- 2.35.1

1 8

[PATCH v4 1/5] ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Santino Mazza 16 Feb '22

16 Feb '22

Some applications crash when the storage provider its null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 17 ++++++++++- dlls/ncrypt/ncrypt_internal.h | 56 +++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 -- 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 dlls/ncrypt/ncrypt_internal.h diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..3a916e5b722 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -19,10 +19,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -129,10 +131,23 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN return NTE_NOT_SUPPORTED; } +int allocate_storage_provider_object(struct ncrypt_object **providerobject) +{ + *providerobject = malloc(sizeof(struct ncrypt_object)); + if (providerobject == NULL) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + memset(*providerobject, 0, sizeof(struct ncrypt_object)); + (*providerobject)->type = STORAGE_PROVIDER; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + return allocate_storage_provider_object((struct ncrypt_object**)provider); } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..1201cdd857a --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef NCRYPT_INTERNAL_H +#define NCRYPT_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +struct ncrypt_storage_provider_object +{ + // FIXME Stub +}; + +enum ncrypt_object_type +{ + STORAGE_PROVIDER, +}; + +struct ncrypt_object_property +{ + WCHAR *key; + DWORD value_size; + VOID *value; +}; + +struct ncrypt_object +{ + enum ncrypt_object_type type; + DWORD number_of_properties; + struct ncrypt_object_property *properties; + union + { + struct ncrypt_storage_provider_object storage_provider; + } object; +}; + +#endif // NCRYPT_INTERNAL_H diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 045dd60c793..df2179ca10a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -92,12 +92,10 @@ static void test_key_import_rsa(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; - todo_wine { prov = 0; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - } todo_wine { key = 0; -- 2.32.0

1 0

[PATCH v4 1/5] ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Santino Mazza 16 Feb '22

16 Feb '22

Some applications crash when the storage provider its null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 17 ++++++++++- dlls/ncrypt/ncrypt_internal.h | 56 +++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 -- 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 dlls/ncrypt/ncrypt_internal.h diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..3a916e5b722 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -19,10 +19,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -129,10 +131,23 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN return NTE_NOT_SUPPORTED; } +int allocate_storage_provider_object(struct ncrypt_object **providerobject) +{ + *providerobject = malloc(sizeof(struct ncrypt_object)); + if (providerobject == NULL) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + memset(*providerobject, 0, sizeof(struct ncrypt_object)); + (*providerobject)->type = STORAGE_PROVIDER; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + return allocate_storage_provider_object((struct ncrypt_object**)provider); } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..1201cdd857a --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef NCRYPT_INTERNAL_H +#define NCRYPT_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +struct ncrypt_storage_provider_object +{ + // FIXME Stub +}; + +enum ncrypt_object_type +{ + STORAGE_PROVIDER, +}; + +struct ncrypt_object_property +{ + WCHAR *key; + DWORD value_size; + VOID *value; +}; + +struct ncrypt_object +{ + enum ncrypt_object_type type; + DWORD number_of_properties; + struct ncrypt_object_property *properties; + union + { + struct ncrypt_storage_provider_object storage_provider; + } object; +}; + +#endif // NCRYPT_INTERNAL_H diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 045dd60c793..df2179ca10a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -92,12 +92,10 @@ static void test_key_import_rsa(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; - todo_wine { prov = 0; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - } todo_wine { key = 0; -- 2.32.0

1 4

Re: [PATCH 4/6] dlls/quartz: use VIDEOINFOHEADER instead of partially allocated VIDEOINFO structure
by Zebediah Figura 15 Feb '22

15 Feb '22

On 2/14/22 13:32, Eric Pouech wrote: >> I think this is a gcc bug. It now warns about *any* access to a >> structure which was allocated with anything but sizeof(). E.g. the >> following will generate warnings with -O2 -Warray-bounds=1: >> >> -- >> >> #include <stddef.h> >> #include <stdlib.h> >> >> struct apple >> { >> unsigned int u; >> char v[10]; >> }; >> >> struct apple *func(void) >> { >> struct apple *a = malloc(offsetof(struct apple, v[10])); >> >> a->u = 1; >> a->v[9] = 3; >> return a; >> } >> >> -- >> >> Same with malloc(14). Only malloc(sizeof(struct apple)) works, even >> though the three expressions are obviously identical. >> >> If we must work around this in Wine, I'd rather either disable >> -Warray-bounds or else just use sizeof() and over-allocate. > > compiling here your snipnet gives 16 bytes for apple not 14 > > > using malloc(16) instead of malloc(offsetof(struct apple, v[10])) > doesn't generate warning > > > my understanding if that gcc generates a warning when accessing a > structure which allocation is strictly smaller than the structure size > > even if all required bits are inside the allocated part Right, I managed to forget how struct alignment works. [1] claims the following: "It's not valid to access an object of one type using an lvalue of another. In simple cases GCC diagnoses violations of this requirement by -Wstrict-aliasing. -Warray-bounds doesn't detect aliasing violations but it does detect a subset of the problem that's apparent when the size of the lvalue's type is greater than the size of the object. The object must be big enough for the whole lvalue, even if the accessed member is within the bounds of the smaller object." I can't easily find this in the C specification, but it's also not the easiest thing to search for, and it wouldn't surprise me if it's true. Still, I'm not convinced we really want to change our usage accordingly. I'm guessing this is one of those things that may be undefined behaviour but always works in practice, and from the looks of things we have more false positives from -Warray-bounds than true positives. But if we really do want -Warray-bounds, I'd rather just allocate the whole VIDEOINFO structure here. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103292 P.S. can you please remember to keep wine-devel in CC?

2 1

[PATCH] server: Use a free list for unallocated object handles.
by Zebediah Figura 15 Feb '22

15 Feb '22

The Legend of Heroes: Trails of Cold Steel III suffers from an application bug, where it tries to wait on a handle after closing it. Because of the usage patterns of the game and the way Wine allocates handles, the handle is usually reused by a separate object, which is effectively never signaled, resulting in a hang. This patch changes our handle allocation strategy to resemble Windows, and in the process makes the race much less likely, although still theoretically possible. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52461 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- A more detailed explanation of the bug can be found in the linked bug report. server/handle.c | 125 +++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 60 deletions(-) diff --git a/server/handle.c b/server/handle.c index bc692b8ebeb..75b1f7969df 100644 --- a/server/handle.c +++ b/server/handle.c @@ -41,8 +41,13 @@ struct handle_entry { - struct object *ptr; /* object */ - unsigned int access; /* access rights */ + union + { + struct object *ptr; /* object */ + struct handle_entry *next; /* next free entry */ + } u; + unsigned int access; /* access rights */ + int used; /* is the entry currently in use? */ }; struct handle_table @@ -51,8 +56,8 @@ struct handle_table struct process *process; /* process owning this table */ int count; /* number of allocated entries */ int last; /* last used entry */ - int free; /* first entry that may be free */ struct handle_entry *entries; /* handle entries */ + struct handle_entry *freelist; /* head of free list */ }; static struct handle_table *global_table; @@ -157,11 +162,11 @@ static void handle_table_dump( struct object *obj, int verbose ) entry = table->entries; for (i = 0; i <= table->last; i++, entry++) { - if (!entry->ptr) continue; + if (!entry->used) continue; fprintf( stderr, " %04x: %p %08x ", - index_to_handle(i), entry->ptr, entry->access ); - dump_object_name( entry->ptr ); - entry->ptr->ops->dump( entry->ptr, 0 ); + index_to_handle(i), entry->u.ptr, entry->access ); + dump_object_name( entry->u.ptr ); + entry->u.ptr->ops->dump( entry->u.ptr, 0 ); } } @@ -176,12 +181,14 @@ static void handle_table_destroy( struct object *obj ) for (i = 0, entry = table->entries; i <= table->last; i++, entry++) { - struct object *obj = entry->ptr; - entry->ptr = NULL; - if (obj) + if (entry->used) { + struct object *obj = entry->u.ptr; if (table->process) obj->ops->close_handle( obj, table->process, index_to_handle(i) ); + entry->used = 0; + entry->u.next = table->freelist; + table->freelist = entry; release_object_from_handle( obj ); } } @@ -208,7 +215,7 @@ struct handle_table *alloc_handle_table( struct process *process, int count ) table->process = process; table->count = count; table->last = -1; - table->free = 0; + table->freelist = NULL; if ((table->entries = mem_alloc( count * sizeof(*table->entries) ))) return table; release_object( table ); return NULL; @@ -234,21 +241,23 @@ static int grow_handle_table( struct handle_table *table ) /* allocate the first free entry in the handle table */ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned int access ) { - struct handle_entry *entry = table->entries + table->free; - int i; + struct handle_entry *entry; - for (i = table->free; i <= table->last; i++, entry++) if (!entry->ptr) goto found; - if (i >= table->count) + if (table->freelist) { - if (!grow_handle_table( table )) return 0; - entry = table->entries + i; /* the entries may have moved */ + entry = table->freelist; + table->freelist = entry->u.next; } - table->last = i; - found: - table->free = i + 1; - entry->ptr = grab_object_for_handle( obj ); + else + { + if (table->last + 1 >= table->count && !grow_handle_table( table )) return 0; + entry = &table->entries[++table->last]; + } + + entry->used = 1; + entry->u.ptr = grab_object_for_handle( obj ); entry->access = access; - return index_to_handle(i); + return index_to_handle( entry - table->entries ); } /* allocate a handle for an object, incrementing its refcount */ @@ -327,31 +336,10 @@ static struct handle_entry *get_handle( struct process *process, obj_handle_t ha if (index < 0) return NULL; if (index > table->last) return NULL; entry = table->entries + index; - if (!entry->ptr) return NULL; + if (!entry->used) return NULL; return entry; } -/* attempt to shrink a table */ -static void shrink_handle_table( struct handle_table *table ) -{ - struct handle_entry *entry = table->entries + table->last; - struct handle_entry *new_entries; - int count = table->count; - - while (table->last >= 0) - { - if (entry->ptr) break; - table->last--; - entry--; - } - if (table->last >= count / 4) return; /* no need to shrink */ - if (count < MIN_HANDLE_ENTRIES * 2) return; /* too small to shrink */ - count /= 2; - if (!(new_entries = realloc( table->entries, count * sizeof(*new_entries) ))) return; - table->count = count; - table->entries = new_entries; -} - static void inherit_handle( struct process *parent, const obj_handle_t handle, struct handle_table *table ) { struct handle_entry *dst, *src; @@ -362,8 +350,9 @@ static void inherit_handle( struct process *parent, const obj_handle_t handle, s src = get_handle( parent, handle ); if (!src || !(src->access & RESERVED_INHERIT)) return; index = handle_to_index( handle ); - if (dst[index].ptr) return; - grab_object_for_handle( src->ptr ); + if (dst[index].used) return; + + grab_object_for_handle( src->u.ptr ); dst[index] = *src; table->last = max( table->last, index ); } @@ -397,6 +386,18 @@ struct handle_table *copy_handle_table( struct process *process, struct process { inherit_handle( parent, std_handles[i], table ); } + + /* iterate in reverse so that low values are allocated first */ + for (i = table->last; i >= 0; --i) + { + struct handle_entry *entry = &table->entries[i]; + + if (!entry->used) + { + entry->u.next = table->freelist; + table->freelist = entry; + } + } } else { @@ -406,14 +407,16 @@ struct handle_table *copy_handle_table( struct process *process, struct process memcpy( ptr, parent_table->entries, (table->last + 1) * sizeof(struct handle_entry) ); for (i = 0; i <= table->last; i++, ptr++) { - if (!ptr->ptr) continue; - if (ptr->access & RESERVED_INHERIT) grab_object_for_handle( ptr->ptr ); - else ptr->ptr = NULL; /* don't inherit this entry */ + if (ptr->used && (ptr->access & RESERVED_INHERIT)) grab_object_for_handle( ptr->u.ptr ); + else + { + ptr->used = 0; + ptr->u.next = table->freelist; + table->freelist = ptr; + } } } } - /* attempt to shrink the table */ - shrink_handle_table( table ); return table; } @@ -426,12 +429,14 @@ unsigned int close_handle( struct process *process, obj_handle_t handle ) if (!(entry = get_handle( process, handle ))) return STATUS_INVALID_HANDLE; if (entry->access & RESERVED_CLOSE_PROTECT) return STATUS_HANDLE_NOT_CLOSABLE; - obj = entry->ptr; + obj = entry->u.ptr; if (!obj->ops->close_handle( obj, process, handle )) return STATUS_HANDLE_NOT_CLOSABLE; - entry->ptr = NULL; + table = handle_is_global(handle) ? global_table : process->handles; - if (entry < table->entries + table->free) table->free = entry - table->entries; - if (entry == table->entries + table->last) shrink_handle_table( table ); + entry->used = 0; + entry->u.next = table->freelist; + table->freelist = entry; + release_object_from_handle( obj ); return STATUS_SUCCESS; } @@ -471,7 +476,7 @@ struct object *get_handle_obj( struct process *process, obj_handle_t handle, set_error( STATUS_INVALID_HANDLE ); return NULL; } - obj = entry->ptr; + obj = entry->u.ptr; if (ops && (obj->ops != ops)) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); /* not the right type */ @@ -513,8 +518,8 @@ obj_handle_t find_inherited_handle( struct process *process, const struct object for (i = 0, ptr = table->entries; i <= table->last; i++, ptr++) { - if (!ptr->ptr) continue; - if (ptr->ptr->ops != ops) continue; + if (!ptr->used) continue; + if (ptr->u.ptr->ops != ops) continue; if (ptr->access & RESERVED_INHERIT) return index_to_handle(i); } return 0; @@ -825,7 +830,7 @@ static int enum_handles( struct process *process, void *user ) for (i = 0, entry = table->entries; i <= table->last; i++, entry++) { - if (!entry->ptr) continue; + if (!entry->used) continue; if (!info->handle) { info->count++; @@ -836,7 +841,7 @@ static int enum_handles( struct process *process, void *user ) handle->owner = process->id; handle->handle = index_to_handle(i); handle->access = entry->access & ~RESERVED_ALL; - handle->type = entry->ptr->ops->type->index; + handle->type = entry->u.ptr->ops->type->index; handle->attributes = 0; if (entry->access & RESERVED_INHERIT) handle->attributes |= OBJ_INHERIT; if (entry->access & RESERVED_CLOSE_PROTECT) handle->attributes |= OBJ_PROTECT_CLOSE; -- 2.34.1

2 4

[PATCH v2 1/2] winevulkan: Manually fixup struct alignment for VkPipelineCreationFeedback.
by Georg Lehmann 15 Feb '22

15 Feb '22

We can't reasonably auto generate this because it's output in an otherwise input pNext chain. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 8 +++ dlls/winevulkan/vulkan.c | 110 ++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..2f3d647ef9b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -205,6 +205,8 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkCreateComputePipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkCreateGraphicsPipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -250,6 +252,9 @@ FUNCTION_OVERRIDES = { "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + # VK_KHR_ray_tracing_pipeline + "vkCreateRayTracingPipelinesKHR" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + # VK_EXT_calibrated_timestamps "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -261,6 +266,9 @@ FUNCTION_OVERRIDES = { # VK_EXT_debug_report "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + + # VK_NV_ray_tracing + "vkCreateRayTracingPipelinesNV" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } STRUCT_CHAIN_CONVERSIONS = { diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 19cc999433b..f5d1a1f4fc2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1758,6 +1758,116 @@ NTSTATUS wine_vkDestroyDebugReportCallbackEXT(void *args) return STATUS_SUCCESS; } +static void fixup_pipeline_feedback(VkPipelineCreationFeedback *feedback, uint32_t count) +{ +#if defined(USE_STRUCT_CONVERSION) + struct host_pipeline_feedback + { + VkPipelineCreationFeedbackFlags flags; + uint64_t duration; + } *host_feedback; + int64_t i; + + host_feedback = (void *) feedback; + + for (i = count - 1; i >= 0; i--) + { + memmove(&feedback[i].duration, &host_feedback[i].duration, sizeof(uint64_t)); + feedback[i].flags = host_feedback[i].flags; + } +#else + (void)feedback; + (void)count; +#endif +} + +static void fixup_pipeline_feedback_info(const void *pipeline_info) +{ + VkPipelineCreationFeedbackCreateInfo *feedback; + + feedback = wine_vk_find_struct(pipeline_info, PIPELINE_CREATION_FEEDBACK_CREATE_INFO); + + if (!feedback) + return; + + fixup_pipeline_feedback(feedback->pPipelineCreationFeedback, 1); + fixup_pipeline_feedback(feedback->pPipelineStageCreationFeedbacks, + feedback->pipelineStageCreationFeedbackCount); +} + +NTSTATUS wine_vkCreateComputePipelines(void *args) +{ + struct vkCreateComputePipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateComputePipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateGraphicsPipelines(void *args) +{ + struct vkCreateGraphicsPipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateGraphicsPipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesKHR(void *args) +{ + struct vkCreateRayTracingPipelinesKHR_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, + wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) +{ + struct vkCreateRayTracingPipelinesNV_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) { return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); -- 2.35.1

2 6

[PATCH 1/2] gdiplus/tests: New path that can cause stack overflow in GdipFlattenPath.
by Robert Feuerbach 15 Feb '22

15 Feb '22

A bezier curve found in an application has caused endless recursive calls to flatten_bezier due to float point precision limitations in the flatness test. This curve has been added to the graphicpath.c test to check for the resulting stack overflow error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52492 Signed-off-by: Robert Feuerbach <rjfeuerbach(a)gmail.com> --- dlls/gdiplus/tests/graphicspath.c | 55 ++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 07e6dd166ad..36508776ed3 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1253,6 +1253,58 @@ static void test_flatten(void) GdipDeletePath(path); } +static void test_flatten2(void) +{ + GpStatus status; + GpPath *path; + INT count; + + status = GdipCreatePath(0, &path); + expect(Ok, status); + status = GdipStartPathFigure(path); + expect(Ok, status); + /* path seen in the wild that caused a stack overflow */ + /* low-precision points that can cause a crash */ + status = GdipAddPathBezier(path, + 154.950806, 33.391144, + 221.586075, 15.536285, + 291.747314, 15.536285, + 358.382568, 33.391144); + expect(Ok, status); + status = GdipAddPathBezier(path, + 256.666809, 412.999512, + 256.666718, 412.999481, + 256.666656, 412.999481, + 256.666565, 412.999512); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + trace("Flattening good and problematic bezier curves\n"); + status = GdipFlattenPath(path, NULL, 1.0); + + /* now redo with hexadecimal floats to replicate the points exactly */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathBezier(path, + 0x1.35e6d00000000p+7, 0x1.0b21100000000p+5, + 0x1.bb2c120000000p+7, 0x1.f129400000000p+3, + 0x1.23bf500000000p+8, 0x1.f129400000000p+3, + 0x1.6661f00000000p+8, 0x1.0b21100000000p+5); + expect(Ok, status); + status = GdipAddPathBezier(path, + 0x1.00aab40000000p+8, 0x1.9cffe00000000p+8, + 0x1.00aaae0000000p+8, 0x1.9cffde0000000p+8, + 0x1.00aaaa0000000p+8, 0x1.9cffde0000000p+8, + 0x1.00aaa40000000p+8, 0x1.9cffe00000000p+8); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + trace("Flattening precise copied problematic curves\n"); + status = GdipFlattenPath(path, NULL, 1.0); + + GdipDeletePath(path); +} + static path_test_t widenline_path[] = { {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -1900,6 +1952,7 @@ START_TEST(graphicspath) test_widen_cap(); test_isvisible(); test_empty_rect(); - + test_flatten2(); + GdiplusShutdown(gdiplusToken); } -- 2.32.0 (Apple Git-132)

5 15

Arbitrary DOS device name
by Daniel Kucera 15 Feb '22

15 Feb '22

Hello all, I have a Windows software which tries to access dos device name but it is failing: 0009:Call KERNEL32.CreateFileA(0060f588 "\\\\.\\d6CDE-0",40000000,00000002,00000000,00000003,00000000,00000000) ret=00b1117f 0009:Call ntdll.RtlInitAnsiString(0060f49c,0060f588 "\\\\.\\d6CDE-0") ret=7b036296 0009:Ret ntdll.RtlInitAnsiString() retval=0060f49c ret=7b036296 0009:Call ntdll.RtlAnsiStringToUnicodeString(3fff8bf8,0060f49c,00000000) ret=7b0362fb 0009:Ret ntdll.RtlAnsiStringToUnicodeString() retval=00000000 ret=7b0362fb 0009:Call ntdll._wcsicmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d0c0 L"CONIN$") ret=7b0355c9 0009:Ret ntdll._wcsicmp() retval=fffffff9 ret=7b0355c9 0009:Call ntdll._wcsicmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d0ce L"CONOUT$") ret=7b035636 0009:Ret ntdll._wcsicmp() retval=fffffff9 ret=7b035636 0009:Call ntdll.wcsncmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d644 L"\\\\.\\",00000004) ret=7b035670 0009:Ret ntdll.wcsncmp() retval=00000000 ret=7b035670 0009:Call ntdll.iswalpha(00000064) ret=7b0356cd 0009:Ret ntdll.iswalpha() retval=00000102 ret=7b0356cd 0009:Call ntdll._wcsnicmp(3fff8c08 L"d6CDE-0",7b09d638 L"PIPE\\",00000005) ret=7b0356f5 0009:Ret ntdll._wcsnicmp() retval=fffffff4 ret=7b0356f5 0009:Call ntdll._wcsnicmp(3fff8c08 L"d6CDE-0",7b09d624 L"MAILSLOT\\",00000009) ret=7b03570e 0009:Ret ntdll._wcsnicmp() retval=fffffff7 ret=7b03570e 0009:Call ntdll.RtlIsDosDeviceName_U(3fff8c08 L"d6CDE-0") ret=7b035724 0009:Ret ntdll.RtlIsDosDeviceName_U() retval=00000000 ret=7b035724 0009:Call ntdll.RtlDosPathNameToNtPathName_U(3fff8c00 L"\\\\.\\d6CDE-0",0060f458,00000000,00000000) ret=7b035769 0009:Ret ntdll.RtlDosPathNameToNtPathName_U() retval=00000001 ret=7b035769 0009:Call ntdll.NtCreateFile(0060f454,40100080,0060f474,0060f460,00000000,00000000,00000002,00000001,00000060,00000000,00000000) ret=7b03581e 0009:Ret ntdll.NtCreateFile() retval=c0000034 ret=7b03581e 0009:Call ntdll.RtlNtStatusToDosError(c0000034) ret=7b035a11 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000002 ret=7b035a11 0009:Call ntdll.RtlFreeUnicodeString(0060f458) ret=7b03592b 0009:Ret ntdll.RtlFreeUnicodeString() retval=0060f458 ret=7b03592b 0009:Ret KERNEL32.CreateFileA() retval=ffffffff ret=00b1117f The problem is, that wine doesn't recognize "\\\\.\\d6CDE-0" as valid DOS device name: https://github.com/wine-mirror/wine/blob/e909986e6ea5ecd49b2b847f321ad89b2a… Even when I created the device in HKEY_LOCAL_MACHINE\Software\Wine\Ports it doesn't allow to open it. When I patched the corresponding DLL to use COM81 and created the device in Ports, it works okay (can open the device). I want to write a patch for ntdll/path.c to recognize my string as DOS device but I want it to be generic enough to be acceptable. What approach do you suggest? Can I add a generic match, something like: "\\\\.\\[^\\]+$" ? To add some context here, the software is for controlling USB osclloscope from Hantek: http://hantek.com/uploadpic/hantek/files/20210731/Hantek-6000_Ver2.2.7_D202… It installs a driver which creates mentioned "DOS device" and communicates through it using ioctl. I am reversing the driver and I'll create a Linux char device to handle those ioctl calls and talk to the USB device using libusb. Thanks. -- S pozdravom / Best regards Daniel Kucera.

6 30

[PATCH 1/2] kernel32/tests: Add additional Get/SetThreadDescription() tests.
by Brendan Shanks 15 Feb '22

15 Feb '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/thread.c | 77 ++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 6ccf7af85f8..9c58095fe01 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -100,6 +100,8 @@ static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *); static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **); +static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG,PVECTORED_EXCEPTION_HANDLER); +static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static HANDLE create_target_process(const char *arg) { @@ -2351,6 +2353,23 @@ static void test_thread_info(void) CloseHandle(thread); } +typedef struct tagTHREADNAME_INFO +{ + DWORD dwType; /* Must be 0x1000. */ + LPCSTR szName; /* Pointer to name (in user addr space). */ + DWORD dwThreadID; /* Thread ID (-1 = caller thread). */ + DWORD dwFlags; /* Reserved for future use, must be zero. */ +} THREADNAME_INFO; + +static LONG CALLBACK msvc_threadname_vec_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + if (ExceptionInfo->ExceptionRecord != NULL && + ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_WINE_NAME_THREAD) + return EXCEPTION_CONTINUE_EXECUTION; + + return EXCEPTION_CONTINUE_SEARCH; +} + static void test_thread_description(void) { THREAD_NAME_INFORMATION *thread_desc; @@ -2360,6 +2379,9 @@ static void test_thread_description(void) char buff[128]; WCHAR *ptr; HRESULT hr; + HANDLE thread; + PVOID vectored_handler; + THREADNAME_INFO info; if (!pGetThreadDescription) { @@ -2476,6 +2498,59 @@ static void test_thread_description(void) ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); LocalFree(ptr); + + /* Get with only THREAD_QUERY_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + ptr = NULL; + hr = pGetThreadDescription(thread, &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + len = 0; + status = pNtQueryInformationThread(thread, ThreadNameInformation, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); + + CloseHandle(thread); + + /* Set with only THREAD_SET_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_SET_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + hr = pSetThreadDescription(thread, desc); + todo_wine + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + todo_wine + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + CloseHandle(thread); + + /* The old exception-based thread name method should not affect GetThreadDescription. */ + hr = pSetThreadDescription(GetCurrentThread(), desc); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + vectored_handler = pRtlAddVectoredExceptionHandler(FALSE, &msvc_threadname_vec_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + info.dwType = 0x1000; + info.szName = "123"; + info.dwThreadID = -1; + info.dwFlags = 0; + RaiseException(EXCEPTION_WINE_NAME_THREAD, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)&info); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); } static void init_funcs(void) @@ -2524,6 +2599,8 @@ static void init_funcs(void) X(NtQueryInformationThread); X(RtlGetThreadErrorMode); X(NtSetInformationThread); + X(RtlAddVectoredExceptionHandler); + X(RtlRemoveVectoredExceptionHandler); } #undef X } -- 2.34.1

1 1

[PATCH 6/6] winealsa: Move get_endpoints_id to the unixlib.
by Huw Davies 15 Feb '22

15 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 2 + dlls/winealsa.drv/alsa.c | 458 ++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 458 +++++----------------------------- dlls/winealsa.drv/unixlib.h | 42 ++++ 4 files changed, 560 insertions(+), 400 deletions(-) create mode 100644 dlls/winealsa.drv/alsa.c create mode 100644 dlls/winealsa.drv/unixlib.h diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 7ce382e64c2..2158e087251 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winealsa.drv +UNIXLIB = winealsa.so IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(ALSA_LIBS) @@ -7,5 +8,6 @@ EXTRALIBS = $(ALSA_LIBS) EXTRADLLFLAGS = -mcygwin C_SRCS = \ + alsa.c \ midi.c \ mmdevdrv.c diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c new file mode 100644 index 00000000000..ae05c7a8b9b --- /dev/null +++ b/dlls/winealsa.drv/alsa.c @@ -0,0 +1,458 @@ +/* + * Copyright 2010 Maarten Lankhorst for CodeWeavers + * Copyright 2011 Andrew Eikum for CodeWeavers + * Copyright 2022 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#include <alsa/asoundlib.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "mmdeviceapi.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(alsa); + +static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', + 'w','i','n','e','a','l','s','a','.','d','r','v'}; + +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} + +static HKEY open_hkcu(void) +{ + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + ascii_to_unicode( bufferW, buffer, len + 1 ); + + return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); +} + +static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) +{ + HKEY hkcu = open_hkcu(), key; + + key = reg_open_key( hkcu, name, name_len ); + NtClose( hkcu ); + + return key; +} + +ULONG reg_query_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? wcslen( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + +static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) +{ + return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; +} + +static WCHAR *strdupAtoW(const char *str) +{ + unsigned int len; + WCHAR *ret; + + if(!str) return NULL; + + len = strlen(str) + 1; + ret = malloc(len * sizeof(WCHAR)); + if(ret) ntdll_umbstowcs(str, len, ret, len); + return ret; +} + +static BOOL alsa_try_open(const char *devnode, EDataFlow flow) +{ + snd_pcm_t *handle; + int err; + + TRACE("devnode: %s, flow: %d\n", devnode, flow); + + if((err = snd_pcm_open(&handle, devnode, alsa_get_direction(flow), SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); + return FALSE; + } + + snd_pcm_close(handle); + return TRUE; +} + +static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCHAR *chunk2) +{ + WCHAR *ret; + const WCHAR *prefix; + size_t len_wchars = 0, chunk1_len = 0, chunk2_len = 0, copied = 0, prefix_len; + + static const WCHAR dashW[] = {' ','-',' ',0}; + static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + + if(flow == eRender){ + prefix = outW; + prefix_len = ARRAY_SIZE(outW) - 1; + len_wchars += prefix_len; + }else{ + prefix = inW; + prefix_len = ARRAY_SIZE(inW) - 1; + len_wchars += prefix_len; + } + if(chunk1){ + chunk1_len = wcslen(chunk1); + len_wchars += chunk1_len; + } + if(chunk1 && chunk2) + len_wchars += dashW_len; + if(chunk2){ + chunk2_len = wcslen(chunk2); + len_wchars += chunk2_len; + } + len_wchars += 1; /* NULL byte */ + + ret = malloc(len_wchars * sizeof(WCHAR)); + + memcpy(ret, prefix, prefix_len * sizeof(WCHAR)); + copied += prefix_len; + if(chunk1){ + memcpy(ret + copied, chunk1, chunk1_len * sizeof(WCHAR)); + copied += chunk1_len; + } + if(chunk1 && chunk2){ + memcpy(ret + copied, dashW, dashW_len * sizeof(WCHAR)); + copied += dashW_len; + } + if(chunk2){ + memcpy(ret + copied, chunk2, chunk2_len * sizeof(WCHAR)); + copied += chunk2_len; + } + ret[copied] = 0; + + TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); + + return ret; +} + +struct endpoints_info +{ + unsigned int num, size; + struct endpoint *endpoints; +}; + +static void endpoints_add(struct endpoints_info *endpoints, WCHAR *name, char *device) +{ + if(endpoints->num >= endpoints->size){ + if (!endpoints->size) endpoints->size = 16; + else endpoints->size *= 2; + endpoints->endpoints = realloc(endpoints->endpoints, endpoints->size * sizeof(*endpoints->endpoints)); + } + + endpoints->endpoints[endpoints->num].name = name; + endpoints->endpoints[endpoints->num++].device = device; +} + +static HRESULT alsa_get_card_devices(EDataFlow flow, struct endpoints_info *endpoints_info, + snd_ctl_t *ctl, int card, const WCHAR *cardname) +{ + int err, device; + snd_pcm_info_t *info; + + info = calloc(1, snd_pcm_info_sizeof()); + if(!info) + return E_OUTOFMEMORY; + + snd_pcm_info_set_subdevice(info, 0); + snd_pcm_info_set_stream(info, alsa_get_direction(flow)); + + device = -1; + for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; + err = snd_ctl_pcm_next_device(ctl, &device)){ + char devnode[32]; + WCHAR *devname; + + snd_pcm_info_set_device(info, device); + + if((err = snd_ctl_pcm_info(ctl, info)) < 0){ + if(err == -ENOENT) + /* This device doesn't have the right stream direction */ + continue; + + WARN("Failed to get info for card %d, device %d: %d (%s)\n", + card, device, err, snd_strerror(err)); + continue; + } + + sprintf(devnode, "plughw:%d,%d", card, device); + if(!alsa_try_open(devnode, flow)) + continue; + + devname = strdupAtoW(snd_pcm_info_get_name(info)); + if(!devname){ + WARN("Unable to get device name for card %d, device %d\n", card, device); + continue; + } + + endpoints_add(endpoints_info, construct_device_id(flow, cardname, devname), strdup(devnode)); + free(devname); + } + + free(info); + + if(err != 0) + WARN("Got a failure during device enumeration on card %d: %d (%s)\n", + card, err, snd_strerror(err)); + + return S_OK; +} + +static void get_reg_devices(EDataFlow flow, struct endpoints_info *endpoints_info) +{ + static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; + static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *key_info = (void *)buffer; + HKEY key; + DWORD size; + const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; + + /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ + if((key = reg_open_hkcu_key(drv_keyW, sizeof(drv_keyW)))){ + if((size = reg_query_value(key, value_name, key_info, sizeof(buffer)))){ + WCHAR *p = (WCHAR *)key_info->Data; + + if(key_info->Type != REG_MULTI_SZ){ + ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); + NtClose(key); + return; + } + + while(*p){ + int len = wcslen(p); + char *devname = malloc(len * 3 + 1); + + ntdll_wcstoumbs(p, len + 1, devname, len * 3 + 1, FALSE); + + if(alsa_try_open(devname, flow)) + endpoints_add(endpoints_info, construct_device_id(flow, p, NULL), strdup(devname)); + + free(devname); + p += len + 1; + } + } + + NtClose(key); + } +} + +struct card_type { + struct list entry; + int first_card_number; + char string[1]; +}; + +static struct list card_types = LIST_INIT(card_types); + +static BOOL need_card_number(int card, const char *string) +{ + struct card_type *cptr; + + LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) + { + if(!strcmp(string, cptr->string)) + return card != cptr->first_card_number; + } + + /* this is the first instance of string */ + cptr = malloc(sizeof(struct card_type) + strlen(string)); + if(!cptr) + /* Default to displaying card number if we can't track cards */ + return TRUE; + + cptr->first_card_number = card; + strcpy(cptr->string, string); + list_add_head(&card_types, &cptr->entry); + return FALSE; +} + +static WCHAR *alsa_get_card_name(int card) +{ + char *cardname; + WCHAR *ret; + int err; + + if((err = snd_card_get_name(card, &cardname)) < 0){ + /* FIXME: Should be localized */ + WARN("Unable to get card name for ALSA device %d: %d (%s)\n", card, err, snd_strerror(err)); + cardname = strdup("Unknown soundcard"); + } + + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical card names, second and subsequent instances get + * card number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } + + ret = strdupAtoW(cardname); + free(cardname); + + return ret; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; + struct get_endpoint_ids_params *params = args; + struct endpoints_info endpoints_info; + unsigned int i, needed, name_len, device_len; + struct endpoint *endpoint; + int err, card; + char *ptr; + + card = -1; + + endpoints_info.num = endpoints_info.size = 0; + endpoints_info.endpoints = NULL; + + if(alsa_try_open("default", params->flow)) + endpoints_add(&endpoints_info, construct_device_id(params->flow, defaultW, NULL), strdup("default")); + + get_reg_devices(params->flow, &endpoints_info); + + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ + char cardpath[64]; + WCHAR *cardname; + snd_ctl_t *ctl; + + sprintf(cardpath, "hw:%u", card); + + if((err = snd_ctl_open(&ctl, cardpath, 0)) < 0){ + WARN("Unable to open ctl for ALSA device %s: %d (%s)\n", cardpath, + err, snd_strerror(err)); + continue; + } + + cardname = alsa_get_card_name(card); + alsa_get_card_devices(params->flow, &endpoints_info, ctl, card, cardname); + free(cardname); + + snd_ctl_close(ctl); + } + + if(err != 0) + WARN("Got a failure during card enumeration: %d (%s)\n", err, snd_strerror(err)); + + needed = endpoints_info.num * sizeof(*params->endpoints); + endpoint = params->endpoints; + ptr = (char *)(endpoint + endpoints_info.num); + + for(i = 0; i < endpoints_info.num; i++){ + name_len = wcslen(endpoints_info.endpoints[i].name) + 1; + device_len = strlen(endpoints_info.endpoints[i].device) + 1; + needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); + + if(needed <= params->size){ + endpoint->name = (WCHAR *)ptr; + memcpy(endpoint->name, endpoints_info.endpoints[i].name, name_len * sizeof(WCHAR)); + ptr += name_len * sizeof(WCHAR); + endpoint->device = ptr; + memcpy(endpoint->device, endpoints_info.endpoints[i].device, device_len); + ptr += (device_len + 1) & ~1; + endpoint++; + } + free(endpoints_info.endpoints[i].name); + free(endpoints_info.endpoints[i].device); + } + free(endpoints_info.endpoints); + + params->num = endpoints_info.num; + params->default_idx = 0; + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + + return STATUS_SUCCESS; +} + +unixlib_entry_t __wine_unix_call_funcs[] = +{ + get_endpoint_ids, +}; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 9a8f80a7beb..516bba1e5fc 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1,6 +1,7 @@ /* * Copyright 2010 Maarten Lankhorst for CodeWeavers * Copyright 2011 Andrew Eikum for CodeWeavers + * Copyright 2022 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" +#include "wine/unixlib.h" #include "propsys.h" #include "initguid.h" @@ -49,8 +51,12 @@ #include <alsa/asoundlib.h> +#include "unixlib.h" + WINE_DEFAULT_DEBUG_CHANNEL(alsa); +unixlib_handle_t alsa_handle = 0; + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -161,12 +167,6 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); -static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; -static const char defname[] = "default"; - -static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','a','l','s','a','.','d','r','v'}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v','\\','d','e','v','i','c','e','s',0}; @@ -240,6 +240,9 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &alsa_handle, sizeof(alsa_handle), NULL)) + return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; @@ -266,19 +269,6 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static WCHAR *strdupAtoW(const char *str) -{ - unsigned int len; - WCHAR *ret; - - if(!str) return NULL; - - len = MultiByteToWideChar(CP_UNIXCP, 0, str, -1, NULL, 0); - ret = malloc(len * sizeof(WCHAR)); - if(ret) MultiByteToWideChar(CP_UNIXCP, 0, str, -1, ret, len); - return ret; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -351,399 +341,67 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) -{ - while (len--) *dst++ = (unsigned char)*src++; -} - -static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) -{ - UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; - OBJECT_ATTRIBUTES attr; - HANDLE ret; - - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; - return ret; -} - -static HKEY open_hkcu(void) -{ - char buffer[256]; - WCHAR bufferW[256]; - DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; - DWORD i, len = sizeof(sid_data); - SID *sid; - - if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) - return 0; - - sid = ((TOKEN_USER *)sid_data)->User.Sid; - len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, - MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), - MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); - for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); - ascii_to_unicode( bufferW, buffer, len + 1 ); - - return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); -} - -static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) -{ - HKEY hkcu = open_hkcu(), key; - - key = reg_open_key( hkcu, name, name_len ); - NtClose( hkcu ); - - return key; -} - -ULONG reg_query_value( HKEY hkey, const WCHAR *name, - KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) -{ - unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; - UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; - - if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, - info, size, &size )) - return 0; - - return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); -} - static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) { return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; } -static BOOL alsa_try_open(const char *devnode, EDataFlow flow) -{ - snd_pcm_t *handle; - int err; - - TRACE("devnode: %s, flow: %d\n", devnode, flow); - - if((err = snd_pcm_open(&handle, devnode, alsa_get_direction(flow), SND_PCM_NONBLOCK)) < 0){ - WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); - return FALSE; - } - - snd_pcm_close(handle); - return TRUE; -} - -static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCHAR *chunk2) -{ - WCHAR *ret; - const WCHAR *prefix; - size_t len_wchars = 0, chunk1_len = 0, chunk2_len = 0, copied = 0, prefix_len; - - static const WCHAR dashW[] = {' ','-',' ',0}; - static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; - static const WCHAR outW[] = {'O','u','t',':',' ',0}; - static const WCHAR inW[] = {'I','n',':',' ',0}; - - if(flow == eRender){ - prefix = outW; - prefix_len = ARRAY_SIZE(outW) - 1; - len_wchars += prefix_len; - }else{ - prefix = inW; - prefix_len = ARRAY_SIZE(inW) - 1; - len_wchars += prefix_len; - } - if(chunk1){ - chunk1_len = strlenW(chunk1); - len_wchars += chunk1_len; - } - if(chunk1 && chunk2) - len_wchars += dashW_len; - if(chunk2){ - chunk2_len = strlenW(chunk2); - len_wchars += chunk2_len; - } - len_wchars += 1; /* NULL byte */ - - ret = HeapAlloc(GetProcessHeap(), 0, len_wchars * sizeof(WCHAR)); - - memcpy(ret, prefix, prefix_len * sizeof(WCHAR)); - copied += prefix_len; - if(chunk1){ - memcpy(ret + copied, chunk1, chunk1_len * sizeof(WCHAR)); - copied += chunk1_len; - } - if(chunk1 && chunk2){ - memcpy(ret + copied, dashW, dashW_len * sizeof(WCHAR)); - copied += dashW_len; - } - if(chunk2){ - memcpy(ret + copied, chunk2, chunk2_len * sizeof(WCHAR)); - copied += chunk2_len; - } - ret[copied] = 0; - - TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); - - return ret; -} - -static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, - snd_ctl_t *ctl, int card, const WCHAR *cardname) -{ - int err, device; - snd_pcm_info_t *info; - - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_info_sizeof()); - if(!info) - return E_OUTOFMEMORY; - - snd_pcm_info_set_subdevice(info, 0); - snd_pcm_info_set_stream(info, alsa_get_direction(flow)); - - device = -1; - for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; - err = snd_ctl_pcm_next_device(ctl, &device)){ - char devnode[32]; - WCHAR *devname; - - snd_pcm_info_set_device(info, device); - - if((err = snd_ctl_pcm_info(ctl, info)) < 0){ - if(err == -ENOENT) - /* This device doesn't have the right stream direction */ - continue; - - WARN("Failed to get info for card %d, device %d: %d (%s)\n", - card, device, err, snd_strerror(err)); - continue; - } - - sprintf(devnode, "plughw:%d,%d", card, device); - if(!alsa_try_open(devnode, flow)) - continue; - - if(*num){ - *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); - *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); - }else{ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - } - - devname = strdupAtoW(snd_pcm_info_get_name(info)); - if(!devname){ - WARN("Unable to get device name for card %d, device %d\n", card, device); - continue; - } - - (*ids)[*num] = construct_device_id(flow, cardname, devname); - get_device_guid(flow, devnode, &(*guids)[*num]); - free(devname); - - ++(*num); - } - - HeapFree(GetProcessHeap(), 0, info); - - if(err != 0) - WARN("Got a failure during device enumeration on card %d: %d (%s)\n", - card, err, snd_strerror(err)); - - return S_OK; -} - -static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) -{ - static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; - static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; - char buffer[4096]; - KEY_VALUE_PARTIAL_INFORMATION *key_info = (void *)buffer; - HKEY key; - DWORD size; - const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; - - /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ - if((key = reg_open_hkcu_key(drv_keyW, sizeof(drv_keyW)))){ - if((size = reg_query_value(key, value_name, key_info, sizeof(buffer)))){ - WCHAR *p = (WCHAR *)key_info->Data; - - if(key_info->Type != REG_MULTI_SZ){ - ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); - NtClose(key); - return; - } - - while(*p){ - int len = lstrlenW(p); - char *devname = malloc(len * 3 + 1); - - WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, len * 3 + 1, NULL, NULL); - - if(alsa_try_open(devname, flow)){ - if(*num){ - *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); - *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); - }else{ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - } - (*ids)[*num] = construct_device_id(flow, p, NULL); - get_device_guid(flow, devname, &(*guids)[*num]); - ++*num; - } - free(devname); - p += len + 1; - } - } - - NtClose(key); - } -} - -struct card_type { - struct list entry; - int first_card_number; - char string[1]; -}; - -static struct list card_types = LIST_INIT(card_types); - -static BOOL need_card_number(int card, const char *string) -{ - struct card_type *cptr; - - LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) - { - if(!strcmp(string, cptr->string)) - return card != cptr->first_card_number; - } - - /* this is the first instance of string */ - cptr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct card_type) + strlen(string)); - if(!cptr) - /* Default to displaying card number if we can't track cards */ - return TRUE; - - cptr->first_card_number = card; - strcpy(cptr->string, string); - list_add_head(&card_types, &cptr->entry); - return FALSE; -} - -static WCHAR *alsa_get_card_name(int card) -{ - char *cardname; - WCHAR *ret; - int err; - - if((err = snd_card_get_name(card, &cardname)) < 0){ - /* FIXME: Should be localized */ - WARN("Unable to get card name for ALSA device %d: %d (%s)\n", card, err, snd_strerror(err)); - cardname = strdup("Unknown soundcard"); - } - - if(need_card_number(card, cardname)){ - char *cardnameN; - /* - * For identical card names, second and subsequent instances get - * card number prefix to distinguish them (like Windows). - */ - if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ - free(cardname); - cardname = cardnameN; - } - } - - ret = strdupAtoW(cardname); - free(cardname); - - return ret; -} - -static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, - UINT *num) -{ - int err, card; - - card = -1; - *num = 0; - - if(alsa_try_open(defname, flow)){ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - (*ids)[0] = construct_device_id(flow, defaultW, NULL); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - get_device_guid(flow, defname, &(*guids)[0]); - ++*num; - } - - get_reg_devices(flow, ids, guids, num); - - for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ - char cardpath[64]; - WCHAR *cardname; - snd_ctl_t *ctl; - - sprintf(cardpath, "hw:%u", card); - - if((err = snd_ctl_open(&ctl, cardpath, 0)) < 0){ - WARN("Unable to open ctl for ALSA device %s: %d (%s)\n", cardpath, - err, snd_strerror(err)); - continue; - } - - cardname = alsa_get_card_name(card); - alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardname); - free(cardname); - - snd_ctl_close(ctl); - } - - if(err != 0) - WARN("Got a failure during card enumeration: %d (%s)\n", - err, snd_strerror(err)); - - return S_OK; -} - -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { - HRESULT hr; + struct get_endpoint_ids_params params; + unsigned int i; + GUID *guids = NULL; + WCHAR **ids = NULL; TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - *ids = NULL; - *guids = NULL; - - hr = alsa_enum_devices(flow, ids, guids, num); - if(FAILED(hr)){ - UINT i; - for(i = 0; i < *num; ++i) - HeapFree(GetProcessHeap(), 0, (*ids)[i]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - return E_OUTOFMEMORY; - } - - TRACE("Enumerated %u devices\n", *num); - - if(*num == 0){ - HeapFree(GetProcessHeap(), 0, *ids); - *ids = NULL; - HeapFree(GetProcessHeap(), 0, *guids); - *guids = NULL; + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + ALSA_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; + } + + for(i = 0; i < params.num; i++){ + unsigned int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + ids[i] = HeapAlloc(GetProcessHeap(), 0, size); + if(!ids[i]){ + params.result = E_OUTOFMEMORY; + goto end; + } + memcpy(ids[i], params.endpoints[i].name, size); + get_device_guid(flow, params.endpoints[i].device, guids + i); + } + *def_index = params.default_idx; + +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); + if(FAILED(params.result)){ + HeapFree(GetProcessHeap(), 0, guids); + if(ids){ + for(i = 0; i < params.num; i++) + HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); + } + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - *def_index = 0; - - return S_OK; + return params.result; } static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EDataFlow *flow) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h new file mode 100644 index 00000000000..f3014d0b448 --- /dev/null +++ b/dlls/winealsa.drv/unixlib.h @@ -0,0 +1,42 @@ +/* + * Copyright 2022 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +struct endpoint +{ + WCHAR *name; + char *device; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + +enum alsa_funcs +{ + alsa_get_endpoint_ids, +}; + +extern unixlib_handle_t alsa_handle; + +#define ALSA_CALL(func, params) __wine_unix_call(alsa_handle, alsa_ ## func, params) -- 2.25.1

2 1

[PATCH 5/6] winealsa: Rewrite get_reg_devices() using the Nt registry api.
by Huw Davies 15 Feb '22

15 Feb '22

This code will move to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 96 ++++++++++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a6ca3827e5f..9a8f80a7beb 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -166,7 +166,7 @@ static const char defname[] = "default"; static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','a','l','s','a','.','d','r','v',0}; + 'w','i','n','e','a','l','s','a','.','d','r','v'}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v','\\','d','e','v','i','c','e','s',0}; @@ -351,6 +351,73 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} + +static HKEY open_hkcu(void) +{ + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + ascii_to_unicode( bufferW, buffer, len + 1 ); + + return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); +} + +static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) +{ + HKEY hkcu = open_hkcu(), key; + + key = reg_open_key( hkcu, name, name_len ); + NtClose( hkcu ); + + return key; +} + +ULONG reg_query_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) { return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; @@ -496,27 +563,28 @@ static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *nu { static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *key_info = (void *)buffer; HKEY key; - WCHAR reg_devices[256]; - DWORD size = sizeof(reg_devices), type; + DWORD size; const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ - if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ - if(RegQueryValueExW(key, value_name, 0, &type, - (BYTE*)reg_devices, &size) == ERROR_SUCCESS){ - WCHAR *p = reg_devices; + if((key = reg_open_hkcu_key(drv_keyW, sizeof(drv_keyW)))){ + if((size = reg_query_value(key, value_name, key_info, sizeof(buffer)))){ + WCHAR *p = (WCHAR *)key_info->Data; - if(type != REG_MULTI_SZ){ + if(key_info->Type != REG_MULTI_SZ){ ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); - RegCloseKey(key); + NtClose(key); return; } while(*p){ - char devname[64]; + int len = lstrlenW(p); + char *devname = malloc(len * 3 + 1); - WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, len * 3 + 1, NULL, NULL); if(alsa_try_open(devname, flow)){ if(*num){ @@ -530,12 +598,12 @@ static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *nu get_device_guid(flow, devname, &(*guids)[*num]); ++*num; } - - p += lstrlenW(p) + 1; + free(devname); + p += len + 1; } } - RegCloseKey(key); + NtClose(key); } } -- 2.25.1

2 1

[PATCH 4/6] winealsa: Pass a unicode chunk2 to construct_device_id().
by Huw Davies 15 Feb '22

15 Feb '22

This makes construct_device_id() rather more sane. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 534667040a2..a6ca3827e5f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -372,11 +372,11 @@ static BOOL alsa_try_open(const char *devnode, EDataFlow flow) return TRUE; } -static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const char *chunk2) +static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCHAR *chunk2) { WCHAR *ret; const WCHAR *prefix; - DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len; + size_t len_wchars = 0, chunk1_len = 0, chunk2_len = 0, copied = 0, prefix_len; static const WCHAR dashW[] = {' ','-',' ',0}; static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; @@ -398,8 +398,10 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha } if(chunk1 && chunk2) len_wchars += dashW_len; - if(chunk2) - len_wchars += MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, NULL, 0) - 1; + if(chunk2){ + chunk2_len = strlenW(chunk2); + len_wchars += chunk2_len; + } len_wchars += 1; /* NULL byte */ ret = HeapAlloc(GetProcessHeap(), 0, len_wchars * sizeof(WCHAR)); @@ -415,9 +417,10 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha copied += dashW_len; } if(chunk2){ - MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, ret + copied, len_wchars - copied); - }else - ret[copied] = 0; + memcpy(ret + copied, chunk2, chunk2_len * sizeof(WCHAR)); + copied += chunk2_len; + } + ret[copied] = 0; TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); @@ -425,7 +428,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha } static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, - snd_ctl_t *ctl, int card, const WCHAR *cardnameW) + snd_ctl_t *ctl, int card, const WCHAR *cardname) { int err, device; snd_pcm_info_t *info; @@ -440,8 +443,8 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, device = -1; for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; err = snd_ctl_pcm_next_device(ctl, &device)){ - const char *devname; char devnode[32]; + WCHAR *devname; snd_pcm_info_set_device(info, device); @@ -467,15 +470,15 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); } - devname = snd_pcm_info_get_name(info); + devname = strdupAtoW(snd_pcm_info_get_name(info)); if(!devname){ - WARN("Unable to get device name for card %d, device %d\n", card, - device); + WARN("Unable to get device name for card %d, device %d\n", card, device); continue; } - (*ids)[*num] = construct_device_id(flow, cardnameW, devname); + (*ids)[*num] = construct_device_id(flow, cardname, devname); get_device_guid(flow, devnode, &(*guids)[*num]); + free(devname); ++(*num); } -- 2.25.1

2 1

[PATCH 3/6] winealsa: Introduce a helper to retrieve the card name.
by Huw Davies 15 Feb '22

15 Feb '22

This is primarily to simplify the code. It does however add name collision detection if there are two unknown cards. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 86 ++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6accd1bab4f..534667040a2 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -266,6 +266,19 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } +static WCHAR *strdupAtoW(const char *str) +{ + unsigned int len; + WCHAR *ret; + + if(!str) return NULL; + + len = MultiByteToWideChar(CP_UNIXCP, 0, str, -1, NULL, 0); + ret = malloc(len * sizeof(WCHAR)); + if(ret) MultiByteToWideChar(CP_UNIXCP, 0, str, -1, ret, len); + return ret; +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -553,6 +566,36 @@ static BOOL need_card_number(int card, const char *string) return FALSE; } +static WCHAR *alsa_get_card_name(int card) +{ + char *cardname; + WCHAR *ret; + int err; + + if((err = snd_card_get_name(card, &cardname)) < 0){ + /* FIXME: Should be localized */ + WARN("Unable to get card name for ALSA device %d: %d (%s)\n", card, err, snd_strerror(err)); + cardname = strdup("Unknown soundcard"); + } + + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical card names, second and subsequent instances get + * card number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } + + ret = strdupAtoW(cardname); + free(cardname); + + return ret; +} + static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { @@ -571,13 +614,10 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, get_reg_devices(flow, ids, guids, num); - for(err = snd_card_next(&card); card != -1 && err >= 0; - err = snd_card_next(&card)){ + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64]; - char *cardname; - WCHAR *cardnameW; + WCHAR *cardname; snd_ctl_t *ctl; - DWORD len; sprintf(cardpath, "hw:%u", card); @@ -587,39 +627,9 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, continue; } - if(snd_card_get_name(card, &cardname) < 0) { - /* FIXME: Should be localized */ - static const WCHAR nameW[] = {'U','n','k','n','o','w','n',' ','s','o','u','n','d','c','a','r','d',0}; - WARN("Unable to get card name for ALSA device %s: %d (%s)\n", - cardpath, err, snd_strerror(err)); - alsa_get_card_devices(flow, ids, guids, num, ctl, card, nameW); - }else{ - if(need_card_number(card, cardname)){ - char *cardnameN; - /* - * For identical card names, second and subsequent instances get - * card number prefix to distinguish them (like Windows). - */ - if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ - free(cardname); - cardname = cardnameN; - } - } - len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); - cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - - if(!cardnameW){ - free(cardname); - snd_ctl_close(ctl); - return E_OUTOFMEMORY; - } - MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - - alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardnameW); - - HeapFree(GetProcessHeap(), 0, cardnameW); - free(cardname); - } + cardname = alsa_get_card_name(card); + alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardname); + free(cardname); snd_ctl_close(ctl); } -- 2.25.1

2 1

[PATCH 2/6] winealsa: Pass EDataFlow to alsa_try_open().
by Huw Davies 15 Feb '22

15 Feb '22

Part of the motivation for this patch is to eliminate variables named "stream", in order to avoid confusion with audio streams. It also avoids cases where both "flow" and "stream" are passed to the same function, conveying the same information. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 55 ++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 9d051796765..6accd1bab4f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -338,16 +338,20 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) +static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) +{ + return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; +} + +static BOOL alsa_try_open(const char *devnode, EDataFlow flow) { snd_pcm_t *handle; int err; - TRACE("devnode: %s, stream: %d\n", devnode, stream); + TRACE("devnode: %s, flow: %d\n", devnode, flow); - if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ - WARN("The device \"%s\" failed to open: %d (%s).\n", - devnode, err, snd_strerror(err)); + if((err = snd_pcm_open(&handle, devnode, alsa_get_direction(flow), SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); return FALSE; } @@ -407,9 +411,8 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha return ret; } -static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, - WCHAR ***ids, GUID **guids, UINT *num, snd_ctl_t *ctl, int card, - const WCHAR *cardnameW) +static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, + snd_ctl_t *ctl, int card, const WCHAR *cardnameW) { int err, device; snd_pcm_info_t *info; @@ -419,7 +422,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, return E_OUTOFMEMORY; snd_pcm_info_set_subdevice(info, 0); - snd_pcm_info_set_stream(info, stream); + snd_pcm_info_set_stream(info, alsa_get_direction(flow)); device = -1; for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; @@ -440,7 +443,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, } sprintf(devnode, "plughw:%d,%d", card, device); - if(!alsa_try_open(devnode, stream)) + if(!alsa_try_open(devnode, flow)) continue; if(*num){ @@ -473,15 +476,14 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, return S_OK; } -static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***ids, - GUID **guids, UINT *num) +static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; HKEY key; WCHAR reg_devices[256]; DWORD size = sizeof(reg_devices), type; - const WCHAR *value_name = (stream == SND_PCM_STREAM_PLAYBACK) ? ALSAOutputDevices : ALSAInputDevices; + const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ @@ -500,7 +502,7 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***id WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); - if(alsa_try_open(devname, stream)){ + if(alsa_try_open(devname, flow)){ if(*num){ *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); @@ -554,14 +556,12 @@ static BOOL need_card_number(int card, const char *string) static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { - snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : - SND_PCM_STREAM_CAPTURE); int err, card; card = -1; *num = 0; - if(alsa_try_open(defname, stream)){ + if(alsa_try_open(defname, flow)){ *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); (*ids)[0] = construct_device_id(flow, defaultW, NULL); *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); @@ -569,7 +569,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, ++*num; } - get_reg_devices(flow, stream, ids, guids, num); + get_reg_devices(flow, ids, guids, num); for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ @@ -592,7 +592,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, static const WCHAR nameW[] = {'U','n','k','n','o','w','n',' ','s','o','u','n','d','c','a','r','d',0}; WARN("Unable to get card name for ALSA device %s: %d (%s)\n", cardpath, err, snd_strerror(err)); - alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, nameW); + alsa_get_card_devices(flow, ids, guids, num, ctl, card, nameW); }else{ if(need_card_number(card, cardname)){ char *cardnameN; @@ -615,7 +615,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, } MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, cardnameW); + alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardnameW); HeapFree(GetProcessHeap(), 0, cardnameW); free(cardname); @@ -730,7 +730,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient { ACImpl *This; int err; - snd_pcm_stream_t stream; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -740,6 +739,9 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(!get_alsa_name_by_guid(guid, alsa_name, sizeof(alsa_name), &dataflow)) return AUDCLNT_E_DEVICE_INVALIDATED; + if(dataflow != eRender && dataflow != eCapture) + return E_UNEXPECTED; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; @@ -751,15 +753,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->IAudioClock2_iface.lpVtbl = &AudioClock2_Vtbl; This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; - if(dataflow == eRender) - stream = SND_PCM_STREAM_PLAYBACK; - else if(dataflow == eCapture) - stream = SND_PCM_STREAM_CAPTURE; - else{ - HeapFree(GetProcessHeap(), 0, This); - return E_UNEXPECTED; - } - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); @@ -767,7 +760,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; - err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); + err = snd_pcm_open(&This->pcm_handle, alsa_name, alsa_get_direction(dataflow), SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); -- 2.25.1

2 1

[PATCH 1/6] winealsa: Remove alsa-pulse handle underrun workaround.
by Huw Davies 15 Feb '22

15 Feb '22

Pulse-based systems should be using winepulse.drv. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 102 +---------------------------------- 1 file changed, 1 insertion(+), 101 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5aa1b4aab63..9d051796765 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -50,7 +50,6 @@ #include <alsa/asoundlib.h> WINE_DEFAULT_DEBUG_CHANNEL(alsa); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -666,89 +665,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -/* Using the pulse PCM device from alsa-plugins 1.0.24 triggers a bug - * which causes audio to cease playing after a few minutes of playback. - * Setting handle_underrun=1 on pulse-backed ALSA devices seems to work - * around this issue. */ -static snd_config_t *make_handle_underrun_config(const char *name) -{ - snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[260]; - const char *type_str; - int err; - - snd_config_update(); - - if((err = snd_config_copy(&lconf, snd_config)) < 0){ - WARN("snd_config_copy failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - sprintf(dev_node_name, "pcm.%s", name); - err = snd_config_search(lconf, dev_node_name, &dev_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - /* ALSA is extremely fragile. If it runs into a config setting it doesn't - * recognize, it tends to fail or assert. So we only want to inject - * handle_underrun=1 on devices that we know will recognize it. */ - err = snd_config_search(dev_node, "type", &type_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_get_string(type_node, &type_str)) < 0){ - snd_config_delete(lconf); - return NULL; - } - - if(strcmp(type_str, "pulse") != 0){ - snd_config_delete(lconf); - return NULL; - } - - err = snd_config_search(dev_node, "handle_underrun", &hu_node); - if(err >= 0){ - /* user already has an explicit handle_underrun setting, so don't - * use a local config */ - snd_config_delete(lconf); - return NULL; - } - if(err != -ENOENT){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_imake_integer(&hu_node, "handle_underrun", 1)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_imake_integer failed: %d (%s)\n", err, - snd_strerror(err)); - return NULL; - } - - if((err = snd_config_add(dev_node, hu_node)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_add failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - return lconf; -} - static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EDataFlow *flow) { HKEY devices_key; @@ -815,8 +731,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ACImpl *This; int err; snd_pcm_stream_t stream; - snd_config_t *lconf; - static BOOL handle_underrun = TRUE; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -853,21 +767,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; - if(handle_underrun && ((lconf = make_handle_underrun_config(alsa_name)))){ - err = snd_pcm_open_lconf(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK, lconf); - TRACE("Opening PCM device \"%s\" with handle_underrun: %d\n", alsa_name, err); - snd_config_delete(lconf); - /* Pulse <= 2010 returns EINVAL, it does not know handle_underrun. */ - if(err == -EINVAL){ - ERR_(winediag)("PulseAudio \"%s\" %d without handle_underrun. Audio may hang." - " Please upgrade to alsa_plugins >= 1.0.24\n", alsa_name, err); - handle_underrun = FALSE; - } - }else - err = -EINVAL; - if(err == -EINVAL){ - err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); - } + err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); -- 2.25.1

2 1

[PATCH v3 1/5] ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Santino Mazza 15 Feb '22

15 Feb '22

Some applications crash when the storage provider its null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 16 +++++++++- dlls/ncrypt/ncrypt_internal.h | 56 +++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 +- 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 dlls/ncrypt/ncrypt_internal.h diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..7f844bf9e85 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -129,10 +130,23 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN return NTE_NOT_SUPPORTED; } +int allocate_storage_provider_object(struct ncrypt_object **providerobject) +{ + *providerobject = malloc(sizeof(struct ncrypt_object)); + if (providerobject == NULL) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + memset(*providerobject, 0, sizeof(struct ncrypt_object)); + (*providerobject)->type = STORAGE_PROVIDER; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + return allocate_storage_provider_object(provider); } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..1201cdd857a --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef NCRYPT_INTERNAL_H +#define NCRYPT_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +struct ncrypt_storage_provider_object +{ + // FIXME Stub +}; + +enum ncrypt_object_type +{ + STORAGE_PROVIDER, +}; + +struct ncrypt_object_property +{ + WCHAR *key; + DWORD value_size; + VOID *value; +}; + +struct ncrypt_object +{ + enum ncrypt_object_type type; + DWORD number_of_properties; + struct ncrypt_object_property *properties; + union + { + struct ncrypt_storage_provider_object storage_provider; + } object; +}; + +#endif // NCRYPT_INTERNAL_H diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index b948665ebaa..76e5396b288 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -86,11 +86,11 @@ UCHAR invalid_rsa_key_blob[] = { static void test_key_import_rsa(void) { - todo_wine { NCRYPT_PROV_HANDLE prov; SECURITY_STATUS ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got 0x%x\n", ret); + todo_wine { NCRYPT_KEY_HANDLE key = NULL; ret = NCryptImportKey(prov, NULL, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); ok(ret == ERROR_SUCCESS, "got 0x%x\n", ret); -- 2.32.0

3 12

[PATCH v2 1/5] winepulse.drv: Expose audio devices to the application.
by Gabriel Ivăncescu 15 Feb '22

15 Feb '22

This exposes the actual devices (and virtual sinks/sources) as reported by PulseAudio to an application, allowing it to select the devices itself and, for example, record from (or render to) two devices at the same time. The "PulseAudio" device (which is movable) is still the default, as before, with the same GUID to preserve compatibility with existing setups. Based on a patch by Mark Harmstone <mark(a)harmstone.com>, with changes by Sebastian Lackner <sebastian(a)fds-team.de>. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This patchset has lived in wine-staging for a long time, but has been recently rebased to deal with unixlib separation. dlls/winepulse.drv/mmdevdrv.c | 210 ++++++++++++++++++++++++++++------ dlls/winepulse.drv/pulse.c | 135 ++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 11 ++ 3 files changed, 310 insertions(+), 46 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35a66e1..844c14c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -69,6 +69,8 @@ static GUID pulse_render_guid = static GUID pulse_capture_guid = { 0x25da76d0, 0x033c, 0x4235, { 0x90, 0x02, 0x19, 0xf4, 0x88, 0x94, 0xac, 0x6f } }; +static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winepulse.drv\\devices"; + static CRITICAL_SECTION session_cs; static CRITICAL_SECTION_DEBUG session_cs_debug = { 0, 0, &session_cs, @@ -134,6 +136,7 @@ struct ACImpl { IUnknown *marshal; IMMDevice *parent; struct list entry; + char device[256]; float *vol; LONG ref; @@ -147,8 +150,6 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; }; -static const WCHAR defaultW[] = L"PulseAudio"; - static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; @@ -267,39 +268,114 @@ static void set_stream_volumes(ACImpl *This) pulse_call(set_volumes, &params); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, - UINT *num, UINT *def_index) +static void get_device_guid(HKEY drv_key, EDataFlow flow, const WCHAR *device, GUID *guid) { - WCHAR *id; + DWORD type, size = sizeof(*guid); + WCHAR key_name[258]; + LSTATUS status; + HKEY dev_key; - TRACE("%d %p %p %p\n", flow, ids, num, def_index); + if (!device[0]) { + *guid = (flow == eRender) ? pulse_render_guid : pulse_capture_guid; + return; + } - *num = 1; - *def_index = 0; + if (!drv_key) { + CoCreateGuid(guid); + return; + } - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(**ids)); - *keys = NULL; - if (!*ids) - return E_OUTOFMEMORY; + key_name[0] = (flow == eRender) ? '0' : '1'; + key_name[1] = ','; + wcscpy(key_name + 2, device); - (*ids)[0] = id = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(**keys)); - if (!*keys || !id) { - HeapFree(GetProcessHeap(), 0, id); - HeapFree(GetProcessHeap(), 0, *keys); - HeapFree(GetProcessHeap(), 0, *ids); - *ids = NULL; - *keys = NULL; - return E_OUTOFMEMORY; + status = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_READ | KEY_WRITE | KEY_WOW64_64KEY, + NULL, &dev_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open registry key for device %s: %u\n", debugstr_w(device), status); + CoCreateGuid(guid); + return; } - memcpy(id, defaultW, sizeof(defaultW)); - if (flow == eRender) - (*keys)[0] = pulse_render_guid; - else - (*keys)[0] = pulse_capture_guid; + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)guid, &size); + if (status != ERROR_SUCCESS || type != REG_BINARY || size != sizeof(*guid)) { + CoCreateGuid(guid); + status = RegSetValueExW(dev_key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(*guid)); + if (status != ERROR_SUCCESS) + ERR("Failed to store device GUID for %s to registry: %u\n", debugstr_w(device), status); + } + RegCloseKey(dev_key); +} - return S_OK; +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **keys, + UINT *num, UINT *def_index) +{ + struct get_endpoint_ids_params params; + GUID *guids = NULL; + WCHAR **ids = NULL; + unsigned int i = 0; + LSTATUS status; + DWORD name_len; + HKEY drv_key; + WCHAR *p; + + TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); + + params.flow = flow; + params.size = 1024; + params.devices = NULL; + do { + HeapFree(GetProcessHeap(), 0, params.devices); + params.devices = HeapAlloc(GetProcessHeap(), 0, params.size); + pulse_call(get_endpoint_ids, &params); + } while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if (FAILED(params.result)) + goto end; + + ids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if (!ids || !guids) { + params.result = E_OUTOFMEMORY; + goto end; + } + + status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, + KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open devices registry key: %u\n", status); + drv_key = NULL; + } + + p = params.devices; + for (i = 0; i < params.num; i++) { + get_device_guid(drv_key, flow, p, &guids[i]); + p += wcslen(p) + 1; + + name_len = wcslen(p) + 1; + if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, name_len * sizeof(WCHAR)))) { + params.result = E_OUTOFMEMORY; + break; + } + memcpy(ids[i], p, name_len * sizeof(WCHAR)); + p += name_len; + } + if (drv_key) + RegCloseKey(drv_key); + +end: + HeapFree(GetProcessHeap(), 0, params.devices); + if (FAILED(params.result)) { + HeapFree(GetProcessHeap(), 0, guids); + while (i--) HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); + } else { + *ids_out = ids; + *keys = guids; + *num = params.num; + *def_index = 0; + } + return params.result; } int WINAPI AUDDRV_GetPriority(void) @@ -314,26 +390,87 @@ int WINAPI AUDDRV_GetPriority(void) return SUCCEEDED(params.result) ? Priority_Preferred : Priority_Unavailable; } +static BOOL get_pulse_name_by_guid(const GUID *guid, char name[256], EDataFlow *flow) +{ + DWORD key_name_size; + WCHAR key_name[258]; + DWORD index = 0; + HKEY key; + + /* Return empty string for default PulseAudio device */ + name[0] = 0; + if (IsEqualGUID(guid, &pulse_render_guid)) { + *flow = eRender; + return TRUE; + } else if (IsEqualGUID(guid, &pulse_capture_guid)) { + *flow = eCapture; + return TRUE; + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_READ | KEY_WOW64_64KEY, &key) != ERROR_SUCCESS) { + WARN("No devices found in registry\n"); + return FALSE; + } + + for (;;) { + DWORD size, type; + LSTATUS status; + GUID reg_guid; + HKEY dev_key; + + key_name_size = ARRAY_SIZE(key_name); + if (RegEnumKeyExW(key, index++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if (RegOpenKeyExW(key, key_name, 0, KEY_READ | KEY_WOW64_64KEY, &dev_key) != ERROR_SUCCESS) { + ERR("Couldn't open key: %s\n", wine_dbgstr_w(key_name)); + continue; + } + + size = sizeof(reg_guid); + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE *)&reg_guid, &size); + RegCloseKey(dev_key); + + if (status == ERROR_SUCCESS && type == REG_BINARY && size == sizeof(reg_guid) && IsEqualGUID(&reg_guid, guid)) { + RegCloseKey(key); + + TRACE("Found matching device key: %s\n", wine_dbgstr_w(key_name)); + + if (key_name[0] == '0') + *flow = eRender; + else if (key_name[0] == '1') + *flow = eCapture; + else { + WARN("Unknown device type: %c\n", key_name[0]); + return FALSE; + } + + return WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, name, 256, NULL, NULL); + } + } + + RegCloseKey(key); + WARN("No matching device in registry for GUID %s\n", debugstr_guid(guid)); + return FALSE; +} + HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { - ACImpl *This; + ACImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); EDataFlow dataflow; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - if (IsEqualGUID(guid, &pulse_render_guid)) - dataflow = eRender; - else if (IsEqualGUID(guid, &pulse_capture_guid)) - dataflow = eCapture; - else - return E_UNEXPECTED; *out = NULL; - - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; + if (!get_pulse_name_by_guid(guid, This->device, &dataflow)) { + HeapFree(GetProcessHeap(), 0, This); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; @@ -609,6 +746,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } params.name = name = get_application_name(); + params.device = This->device; params.dataflow = This->dataflow; params.mode = mode; params.flags = flags; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 3e65936..d5f8edf 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -81,6 +81,12 @@ typedef struct _ACPacket UINT32 discont; } ACPacket; +typedef struct _PhysDevice { + struct list entry; + WCHAR *name; + char device[0]; +} PhysDevice; + static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; @@ -89,6 +95,8 @@ static WAVEFORMATEXTENSIBLE pulse_fmt[2]; static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; static UINT g_phys_speakers_mask = 0; +static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); +static struct list g_phys_sources = LIST_INIT(g_phys_sources); static const REFERENCE_TIME MinimumPeriod = 30000; static const REFERENCE_TIME DefaultPeriod = 100000; @@ -128,6 +136,20 @@ static void dump_attr(const pa_buffer_attr *attr) TRACE("prebuf: %u\n", attr->prebuf); } +static void free_phys_device_lists(void) +{ + static struct list *const lists[] = { &g_phys_speakers, &g_phys_sources, NULL }; + struct list *const *list = lists; + PhysDevice *dev, *dev_next; + + do { + LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, *list, PhysDevice, entry) { + free(dev->name); + free(dev); + } + } while (*(++list)); +} + /* copied from kernelbase */ static int muldiv(int a, int b, int c) { @@ -190,6 +212,7 @@ static NTSTATUS pulse_process_attach(void *args) static NTSTATUS pulse_process_detach(void *args) { + free_phys_device_lists(); if (pulse_ctx) { pa_context_disconnect(pulse_ctx); @@ -215,6 +238,39 @@ static NTSTATUS pulse_main_loop(void *args) return STATUS_SUCCESS; } +static NTSTATUS pulse_get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; + DWORD len, name_len, needed = 0; + WCHAR *p = params->devices; + WCHAR device[256]; + PhysDevice *dev; + + params->num = 0; + LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { + if (!(len = ntdll_umbstowcs(dev->device, strlen(dev->device) + 1, device, ARRAY_SIZE(device)))) + continue; + name_len = lstrlenW(dev->name) + 1; + + needed += (len + name_len) * sizeof(WCHAR); + if (needed <= params->size) { + memcpy(p, device, len * sizeof(WCHAR)); + p += len; + memcpy(p, dev->name, name_len * sizeof(WCHAR)); + p += name_len; + } + params->num++; + } + + if (needed > params->size) { + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + return STATUS_SUCCESS; +} + static void pulse_contextcallback(pa_context *c, void *userdata) { switch (pa_context_get_state(c)) { @@ -357,12 +413,49 @@ static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } -/* For default PulseAudio render device, OR together all of the - * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ +static void pulse_add_device(struct list *list, const char *device, const char *name) +{ + DWORD len = strlen(device), name_len = strlen(name); + PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, device[len + 1])); + WCHAR *wname; + + if (!dev) + return; + + if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + free(dev); + return; + } + + if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || + !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { + free(wname); + free(dev); + return; + } + dev->name[name_len] = 0; + memcpy(dev->device, device, len + 1); + + list_add_tail(list, &dev->entry); +} + static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { - if (i) - g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + if (!i || !i->name || !i->name[0]) + return; + + /* For default PulseAudio render device, OR together all of the + * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ + g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + + pulse_add_device(&g_phys_speakers, i->name, i->description); +} + +static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata) +{ + if (!i || !i->name || !i->name[0]) + return; + pulse_add_device(&g_phys_sources, i->name, i->description); } /* For most hardware on Windows, users must choose a configuration with an even @@ -579,7 +672,14 @@ static NTSTATUS pulse_test_connect(void *args) pulse_probe_settings(1, &pulse_fmt[0]); pulse_probe_settings(0, &pulse_fmt[1]); + free_phys_device_lists(); + list_init(&g_phys_speakers); + list_init(&g_phys_sources); g_phys_speakers_mask = 0; + + pulse_add_device(&g_phys_speakers, "", "PulseAudio"); + pulse_add_device(&g_phys_sources, "", "PulseAudio"); + o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); if (o) { while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && @@ -588,6 +688,14 @@ static NTSTATUS pulse_test_connect(void *args) pa_operation_unref(o); } + o = pa_context_get_source_info_list(pulse_ctx, &pulse_phys_sources_cb, NULL); + if (o) { + while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && + pa_operation_get_state(o) == PA_OPERATION_RUNNING) + {} + pa_operation_unref(o); + } + pa_context_unref(pulse_ctx); pulse_ctx = NULL; pa_mainloop_free(pulse_ml); @@ -771,8 +879,9 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV return S_OK; } -static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_bytes) +static HRESULT pulse_stream_connect(struct pulse_stream *stream, const char *device, UINT32 period_bytes) { + pa_stream_flags_t flags = PA_STREAM_START_CORKED | PA_STREAM_START_UNMUTED | PA_STREAM_ADJUST_LATENCY; int ret; char buffer[64]; static LONG number; @@ -797,12 +906,17 @@ static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_b attr.maxlength = stream->bufsize_frames * pa_frame_size(&stream->ss); attr.prebuf = pa_frame_size(&stream->ss); dump_attr(&attr); + + /* If device name is given, use exactly the specified device */ + if (device[0]) + flags |= PA_STREAM_DONT_MOVE; + else + device = NULL; /* use default */ + if (stream->dataflow == eRender) - ret = pa_stream_connect_playback(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY, NULL, NULL); + ret = pa_stream_connect_playback(stream->stream, device, &attr, flags, NULL, NULL); else - ret = pa_stream_connect_record(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY); + ret = pa_stream_connect_record(stream->stream, device, &attr, flags); if (ret < 0) { WARN("Returns %i\n", ret); return AUDCLNT_E_ENDPOINT_CREATE_FAILED; @@ -864,7 +978,7 @@ static NTSTATUS pulse_create_stream(void *args) stream->share = params->mode; stream->flags = params->flags; - hr = pulse_stream_connect(stream, stream->period_bytes); + hr = pulse_stream_connect(stream, params->device, stream->period_bytes); if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); @@ -1967,6 +2081,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_process_attach, pulse_process_detach, pulse_main_loop, + pulse_get_endpoint_ids, pulse_create_stream, pulse_release_stream, pulse_start, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index d28a73c..c4d274c 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -37,9 +37,19 @@ struct main_loop_params HANDLE event; }; +struct get_endpoint_ids_params +{ + EDataFlow flow; + DWORD size; + WCHAR *devices; + HRESULT result; + unsigned int num; +}; + struct create_stream_params { const char *name; + const char *device; EDataFlow dataflow; AUDCLNT_SHAREMODE mode; DWORD flags; @@ -191,6 +201,7 @@ enum unix_funcs process_attach, process_detach, main_loop, + get_endpoint_ids, create_stream, release_stream, start, -- 2.34.1

2 9

[PATCH v2 1/3] kernel32/tests: Add test for GetConsoleProcessList.
by Roman Pišl 15 Feb '22

15 Feb '22

Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5443a611f80..5a399768d9e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1304,8 +1304,8 @@ static void test_GetConsoleProcessList(void) GetLastError()); /* We should only have 1 process but only for these specific unit tests as - * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) would - * give us two processes for example. + * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) + * gives us two processes - see test_AttachConsole. */ list = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); @@ -4354,6 +4354,27 @@ static void test_AttachConsole_child(DWORD console_pid) res = AttachConsole(ATTACH_PARENT_PROCESS); ok(res, "AttachConsole failed: %u\n", GetLastError()); + if (pGetConsoleProcessList) + { + DWORD list[2] = { 0xbabebabe }; + DWORD pid = GetCurrentProcessId(); + + SetLastError(0xdeadbeef); + len = pGetConsoleProcessList(list, 1); + todo_wine + ok(len == 2, "Expected 2 processes, got %d\n", len); + ok(list[0] == 0xbabebabe, "Unexpected value in list %u\n", list[0]); + + len = pGetConsoleProcessList(list, 2); + todo_wine + ok(len == 2, "Expected 2 processes, got %d\n", len); + todo_wine + ok(list[0] == console_pid || list[1] == console_pid, "Parent PID not in list\n"); + todo_wine + ok(list[0] == pid || list[1] == pid, "PID not in list\n"); + ok(GetLastError() == 0xdeadbeef, "Unexpected last error: %u\n", GetLastError()); + } + ok(pipe_in != GetStdHandle(STD_INPUT_HANDLE), "std handle not set to console\n"); ok(pipe_out != GetStdHandle(STD_OUTPUT_HANDLE), "std handle not set to console\n"); -- 2.30.2

2 5

[PATCH v2 0/3] Fix for BZ52048
by Eric Pouech 15 Feb '22

15 Feb '22

As described in bugzilla ticket, when calling CreateProcess: - with "default" console inheritance (no CREATE_NEW_CONSOLE nor DETACHED_PROCESS flags), - when parent is not attached to a console - and when the child's subsystem is CUI , native behaves as if CREATE_NEW_CONSOLE was passed. builtin doesn't... this serie: - adds a test case for showing the CUI/GUI discrepancies - fixes kernelbase accordingly - but also requires to fix all usage of CreateProcess in Wine Code that would now generate the creation of a console + one patch of wow64 redirection (only for CUI executables) + when looking to the other usage of CreateProcess, I only convinced myself to adapt one of them V1 => V2: - don't mess up with the number of patches in the serie - no longer modify makedep for creating cui vs gui test executable, but copy current *_test.exe executable and adapt its subsystem to the need Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52048 A+ --- Eric Pouech (3): dlls/kernel32/tests: add some console tests about creating cui vs gui processes programs: don't recreate a console when redirecting a program to wow64 dlls/kernelbase: handle corner case in CreateProcess dlls/kernel32/tests/console.c | 85 +++++++++++++++++++++++++++++++++++ dlls/kernelbase/process.c | 6 ++- programs/services/services.c | 2 +- programs/uninstaller/main.c | 6 ++- programs/winedbg/winedbg.c | 3 +- programs/wusa/main.c | 3 +- 6 files changed, 99 insertions(+), 6 deletions(-)

2 4

[PATCH] mfplay: Enable rate control methods.
by Nikolay Sivov 15 Feb '22

15 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 62 +++++++++++++++++++++++++++++++++++--- dlls/mfplay/tests/mfplay.c | 37 ++++++++++++++++++++++- 2 files changed, 94 insertions(+), 5 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 6e0629ca0bc..7d9a4da8649 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1104,16 +1104,44 @@ static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID p static HRESULT WINAPI media_player_SetRate(IMFPMediaPlayer *iface, float rate) { - FIXME("%p, %f.\n", iface, rate); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFRateControl *rate_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, rate); + + if (rate == 0.0f) + return MF_E_OUT_OF_RANGE; + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, + (void **)&rate_control))) + { + hr = IMFRateControl_SetRate(rate_control, FALSE, rate); + IMFRateControl_Release(rate_control); + } + + return hr; } static HRESULT WINAPI media_player_GetRate(IMFPMediaPlayer *iface, float *rate) { - FIXME("%p, %p.\n", iface, rate); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFRateControl *rate_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, rate); + + if (!rate) + return E_POINTER; + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, + (void **)&rate_control))) + { + hr = IMFRateControl_GetRate(rate_control, NULL, rate); + IMFRateControl_Release(rate_control); + } + + return hr; } static HRESULT WINAPI media_player_GetSupportedRates(IMFPMediaPlayer *iface, BOOL forward, @@ -2094,6 +2122,17 @@ static void media_player_playback_ended(struct media_player *player, HRESULT eve LeaveCriticalSection(&player->cs); } +static void media_player_rate_changed(struct media_player *player, HRESULT event_status, + float rate, struct media_event **event) +{ + EnterCriticalSection(&player->cs); + + if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_RATE_SET, event_status, player->item, event))) + (*event)->u.rate_set.flRate = rate; + + LeaveCriticalSection(&player->cs); +} + static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -2106,6 +2145,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFTopology *topology; unsigned int status; PROPVARIANT value; + float rate; if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) return S_OK; @@ -2160,6 +2200,20 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba break; + case MESessionRateChanged: + + rate = 0.0f; + if (SUCCEEDED(IMFMediaEvent_GetValue(session_event, &value))) + { + if (value.vt == VT_R4) + rate = value.fltVal; + PropVariantClear(&value); + } + + media_player_rate_changed(player, event_status, rate, &event); + + break; + case MEBufferingStarted: case MEBufferingStopped: case MEExtendedType: diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 12825ba29da..50ecb1b09b9 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -171,10 +171,10 @@ static void test_create_player(void) static void test_shutdown(void) { SIZE size, min_size, max_size; + float slowest, fastest, rate; MFP_MEDIAPLAYER_STATE state; MFVideoNormalizedRect rect; IMFPMediaPlayer *player; - float slowest, fastest; IMFPMediaItem *item; PROPVARIANT propvar; COLORREF color; @@ -263,6 +263,15 @@ static void test_shutdown(void) hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaPlayer_SetRate(player, 2.0f); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaPlayer_Shutdown(player); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -548,6 +557,31 @@ static void test_duration(void) IMFPMediaPlayer_Release(player); } +static void test_playback_rate(void) +{ + IMFPMediaPlayer *player; + float rate; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_SetRate(player, 0.0f); + ok(hr == MF_E_OUT_OF_RANGE, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_SetRate(player, 2.0f); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, &rate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + IMFPMediaPlayer_Release(player); +} + START_TEST(mfplay) { test_create_player(); @@ -555,4 +589,5 @@ START_TEST(mfplay) test_media_item(); test_video_control(); test_duration(); + test_playback_rate(); } -- 2.34.1

2 2

[PATCH 1/3] winegstreamer: Raise MESourceRateChanged on SetRate().
by Nikolay Sivov 15 Feb '22

15 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 85ec31d2498..9a77cf72c07 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1109,6 +1109,8 @@ static ULONG WINAPI media_source_rate_control_Release(IMFRateControl *iface) static HRESULT WINAPI media_source_rate_control_SetRate(IMFRateControl *iface, BOOL thin, float rate) { + struct media_source *source = impl_from_IMFRateControl(iface); + FIXME("%p, %d, %f.\n", iface, thin, rate); if (rate < 0.0f) @@ -1120,7 +1122,7 @@ static HRESULT WINAPI media_source_rate_control_SetRate(IMFRateControl *iface, B if (rate != 1.0f) return MF_E_UNSUPPORTED_RATE; - return S_OK; + return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceRateChanged, &GUID_NULL, S_OK, NULL); } static HRESULT WINAPI media_source_rate_control_GetRate(IMFRateControl *iface, BOOL *thin, float *rate) -- 2.34.1

2 3

[PATCH v2 1/2] inetmib: Avoid overflows in IPv4 address comparisons.
by Francois Gouget 15 Feb '22

15 Feb '22

The difference between two ULONGs may not fit in an int, causing comparison errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Introduce DWORD_cmp() to simplify the comparisons. compareIpAddrRow() and oidToIpForwardRow() should also do byte-swapping which will be done in the next patch. --- dlls/inetmib1/main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 90da277375e..bd39abb6240 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -770,11 +770,15 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) row->dwAddr = oidToIpAddr(oid); } -static int __cdecl compareIpAddrRow(const void *a, const void *b) +static int __cdecl DWORD_cmp(DWORD a, DWORD b) { - const MIB_IPADDRROW *key = a, *value = b; + return a b ? 1 : 0; /* a substraction would overflow */ +} - return key->dwAddr - value->dwAddr; +static int __cdecl compareIpAddrRow(const void *a, const void *b) +{ + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -865,9 +869,8 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { - const MIB_IPFORWARDROW *key = a, *value = b; - - return key->dwForwardDest - value->dwForwardDest; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest); } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -1223,13 +1226,9 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareUdpRow(const void *a, const void *b) { - const MIB_UDPROW *key = a, *value = b; - int ret; - - ret = ntohl(key->dwLocalAddr) - ntohl(value->dwLocalAddr); - if (ret == 0) - ret = ntohs(key->dwLocalPort) - ntohs(value->dwLocalPort); - return ret; + const MIB_UDPROW *rowA = a, *rowB = b; + return DWORD_cmp(ntohl(rowA->dwLocalAddr), ntohl(rowB->dwLocalAddr)) || + ntohs(rowA->dwLocalPort) - ntohs(rowB->dwLocalPort); } static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, -- 2.30.2

2 2

[PATCH] winepulse: Use FAILED() instead of non-zero result check.
by Nikolay Sivov 15 Feb '22

15 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35a66e18d8a..e3d5ea91cf5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -344,7 +344,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); - if (hr) { + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; } -- 2.34.1

2 1

[PATCH 1/2] inetmib: Avoid overflows in IPv4 address comparisons.
by Francois Gouget 15 Feb '22

15 Feb '22

The difference between two ULONGs may not fit in an int, causing comparison errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- compareIpAddrRow() and oidToIpForwardRow() should also do byte-swapping which will be done in the next patch. --- dlls/inetmib1/main.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 90da277375e..d19648ff792 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -772,9 +772,11 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpAddrRow(const void *a, const void *b) { - const MIB_IPADDRROW *key = a, *value = b; + const MIB_IPADDRROW *rowA = a, *rowB = b; - return key->dwAddr - value->dwAddr; + return rowA->dwAddr < rowB->dwAddr ? -1 : /* avoids overflows */ + rowA->dwAddr > rowB->dwAddr ? 1 : + 0; } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -865,9 +867,11 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { - const MIB_IPFORWARDROW *key = a, *value = b; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; - return key->dwForwardDest - value->dwForwardDest; + return rowA->dwForwardDest < rowB->dwForwardDest ? -1 : /* avoids overflows */ + rowA->dwForwardDest > rowB->dwForwardDest ? 1 : + 0; } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -1223,13 +1227,13 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareUdpRow(const void *a, const void *b) { - const MIB_UDPROW *key = a, *value = b; - int ret; + const MIB_UDPROW *rowA = a, *rowB = b; + ULONG addrA = ntohl( rowA->dwLocalAddr ); + ULONG addrB = ntohl( rowB->dwLocalAddr ); - ret = ntohl(key->dwLocalAddr) - ntohl(value->dwLocalAddr); - if (ret == 0) - ret = ntohs(key->dwLocalPort) - ntohs(value->dwLocalPort); - return ret; + return addrA < addrB ? -1 : /* avoids overflows */ + addrA > addrB ? 1 : + ntohs(rowA->dwLocalPort) - ntohs(rowB->dwLocalPort); } static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, -- 2.30.2

2 3

[PATCH 6/6] win32u: Move ThreadDetach driver call from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 7 +------ dlls/user32/user_main.c | 1 - dlls/win32u/driver.c | 2 ++ dlls/win32u/sysparams.c | 2 ++ 4 files changed, 5 insertions(+), 7 deletions(-)

3 2

[PATCH 5/6] win32u: Move NtUserGetAsyncKeyState implementation from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

3 2

[PATCH 4/6] win32u: Reset thread info in NtUserSetThreadDesktop.
by Jacek Caban 15 Feb '22

15 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch introduces ntuser_private.h. It's for things meant to be private to win32u. With (not so pretty) include from user32, we allow it in user32 until the conversion in more complete. We could maybe continue using ntuser.h, but as we go further, moving more internals there (only to move it to ntuser_private.h later) is not very appealing. dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 9 +---- dlls/user32/winstation.c | 19 ----------- dlls/win32u/input.c | 1 + dlls/win32u/ntuser_private.h | 64 ++++++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 1 + dlls/win32u/winstation.c | 10 +++++- include/ntuser.h | 30 ----------------- 8 files changed, 77 insertions(+), 59 deletions(-) create mode 100644 dlls/win32u/ntuser_private.h

3 2

[PATCH 3/6] win32u: Move GetInputState implementation from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 13 +------------ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 19 +++++++++++++++++++ dlls/win32u/sysparams.c | 15 +++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 7 +++++++ 8 files changed, 52 insertions(+), 13 deletions(-)

3 2

[PATCH 2/6] win32u: Move NtUserGetQueueStatus implementation from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

2 1

[PATCH 1/6] win32u: Move window surfaces list from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Those calls will be internal to win32u in the future, but this allows splitting things. This patch series moves check_for_events and its callers to win32u. dlls/user32/win.c | 33 ++++------------------------- dlls/win32u/sysparams.c | 12 +++++++++-- dlls/win32u/win32u_private.h | 5 +++++ dlls/win32u/window.c | 41 ++++++++++++++++++++++++++++++++++++ include/ntuser.h | 3 +++ 5 files changed, 63 insertions(+), 31 deletions(-)

2 1

[PATCH] include: Add single-producer single-consumer ringbuffer implementation.
by me＠davidebeatrici.dev 15 Feb '22

15 Feb '22

From ea32b090c538d0cdd5e2a089554dd89fec97a4d0 Mon Sep 17 00:00:00 2001 From: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue, 15 Feb 2022 01:06:13 +0100 Subject: [PATCH] include: Add single-producer single-consumer ringbuffer implementation. The ringbuffer was written for the PipeWire driver I'm working on. I'm committing it separately because its implementation is generic, allowing it to be used pretty much universally. Signed-off-by: Davide Beatrici <git(a)davidebeatrici.dev> --- include/wine/ringbuffer.h | 156 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 include/wine/ringbuffer.h diff --git a/include/wine/ringbuffer.h b/include/wine/ringbuffer.h new file mode 100644 index 00000000000..50c4651082d --- /dev/null +++ b/include/wine/ringbuffer.h @@ -0,0 +1,156 @@ +/* + * Single-producer single-consumer ringbuffer implementation + * + * Copyright (C) 2022 Davide Beatrici + * + * this library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * this library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SERVER_RINGBUFFER_H +#define __WINE_SERVER_RINGBUFFER_H + +#define WIN32_NO_STATUS +#include "windef.h" + +#include <stdlib.h> +#include <string.h> + +struct ringbuffer +{ + BYTE *buf; + UINT32 head; + UINT32 tail; + UINT32 size; + volatile UINT32 pending; +}; + +static inline struct ringbuffer *ringbuffer_new(const UINT32 size) +{ + struct ringbuffer *ringbuffer = malloc(sizeof(*ringbuffer)); + if (!ringbuffer) + return NULL; + + memset(ringbuffer, 0, sizeof(*ringbuffer)); + + ringbuffer->buf = malloc(size); + if (!ringbuffer->buf) { + free(ringbuffer); + return NULL; + } + + ringbuffer->size = size; + + return ringbuffer; +} + +static inline void ringbuffer_free(struct ringbuffer *ringbuffer) +{ + free(ringbuffer->buf); + free(ringbuffer); +} + +static inline void ringbuffer_reset(struct ringbuffer *ringbuffer) +{ + ringbuffer->head = 0; + ringbuffer->tail = 0; + ringbuffer->pending = 0; +} + +static inline UINT32 ringbuffer_size(const struct ringbuffer *ringbuffer) +{ + return ringbuffer->size; +} + +static inline UINT32 ringbuffer_readable(const struct ringbuffer *ringbuffer) +{ + return ringbuffer->pending; +} + +static inline UINT32 ringbuffer_writable(const struct ringbuffer *ringbuffer) +{ + return ringbuffer->size - ringbuffer->pending; +} + +static inline UINT32 ringbuffer_read(struct ringbuffer *ringbuffer, void *dst, UINT32 size) +{ + BYTE *buf = dst; + const UINT32 avail = ringbuffer_readable(ringbuffer); + + if (size > avail) + size = avail; + + if (!size) + return 0; + + if (ringbuffer->head + size <= ringbuffer->size) { + memcpy(buf, &ringbuffer->buf[ringbuffer->head], size); + + ringbuffer->head += size; + } else { + UINT32 size_part = ringbuffer->size - ringbuffer->head; + + memcpy(buf, &ringbuffer->buf[ringbuffer->head], size_part); + + buf += size_part; + size_part = size - size_part; + memcpy(buf, ringbuffer->buf, size_part); + + ringbuffer->head = size_part; + } + + if (ringbuffer->head == ringbuffer->size) + ringbuffer->head = 0; + + InterlockedExchangeAdd((volatile LONG *)&ringbuffer->pending, -size); + + return size; +} + +static inline UINT32 ringbuffer_write(struct ringbuffer *ringbuffer, const void *src, UINT32 size) +{ + const BYTE *buf = src; + const UINT32 avail = ringbuffer_writable(ringbuffer); + + if (size > avail) + size = avail; + + if (!size) + return size; + + if (ringbuffer->tail + size <= ringbuffer->size) { + memcpy(&ringbuffer->buf[ringbuffer->tail], buf, size); + + ringbuffer->tail += size; + } else { + UINT32 size_part = ringbuffer->size - ringbuffer->tail; + + memcpy(&ringbuffer->buf[ringbuffer->tail], buf, size_part); + + buf += size_part; + size_part = size - size_part; + memcpy(ringbuffer->buf, buf, size_part); + + ringbuffer->tail = size_part; + } + + if (ringbuffer->tail == ringbuffer->size) + ringbuffer->tail = 0; + + InterlockedExchangeAdd((volatile LONG *)&ringbuffer->pending, size); + + return size; +} + +#endif /* __WINE_SERVER_RINGBUFFER_H */ -- 2.34.1

3 2

[PATCH 1/4] wined3d: Move struct wined3d_buffer_ops to buffer.c.
by Zebediah Figura 15 Feb '22

15 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 902ab720396..bb8f9753468 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -37,6 +37,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ +struct wined3d_buffer_ops +{ + BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_unload_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); + void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); +}; + static void wined3d_buffer_evict_sysmem(struct wined3d_buffer *buffer) { if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0e4f0cdfaf..51a7c2ffb10 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5122,18 +5122,6 @@ enum wined3d_buffer_conversion_type CONV_POSITIONT, }; -struct wined3d_buffer_ops -{ - BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_unload_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); - void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); -}; - struct wined3d_buffer { struct wined3d_resource resource; -- 2.34.1

2 7

[PATCH] wined3d: Fix comment in wined3d_texture_vk_download_data().
by Connor McAdams 15 Feb '22

15 Feb '22

For download, vkCmdCopyImageToBuffer() is used, not vkCmdCopyBufferToImage(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 34d76249084..49dca873d64 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4951,7 +4951,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, return; } - /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ + /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyImageToBuffer() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); if (!dst_bo_addr->buffer_object) -- 2.25.1

2 1

[PATCH v3 1/2] rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH.
by Sven Baars 15 Feb '22

15 Feb '22

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 20 ++++++++++---------- dlls/rsaenh/implglue.h | 14 +++++--------- dlls/rsaenh/rsaenh.c | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 9d90ad70f53..d98a08b2f31 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -32,8 +32,8 @@ /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); - -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) + +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) { BCRYPT_ALG_HANDLE provider; NTSTATUS status; @@ -74,27 +74,27 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) if (status) return FALSE; - status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + status = BCryptCreateHash(provider, hash_handle, NULL, 0, NULL, 0, 0); BCryptCloseAlgorithmProvider(provider, 0); return !status; } -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) { - BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); + BCryptHashData(hash_handle, (UCHAR*)pbData, dwDataLen, 0); return TRUE; } -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) { - BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); - BCryptDestroyHash(pHashContext->bcrypt_hash); + BCryptFinishHash(hash_handle, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(hash_handle); return TRUE; } -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle) { - return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); + return !BCryptDuplicateHash(src_hash_handle, dest_hash_handle, NULL, 0, 0); } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 9be642e9b60..06fa3f4430a 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,10 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -typedef union tagHASH_CONTEXT { - BCRYPT_HASH_HANDLE bcrypt_hash; -} HASH_CONTEXT; - typedef union tagKEY_CONTEXT { rc2_key rc2; des_key des; @@ -42,12 +38,12 @@ typedef union tagKEY_CONTEXT { rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, + BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a4deb80b0e1..c913c0c71ee 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -58,7 +58,7 @@ typedef struct tagCRYPTHASH HCRYPTPROV hProv; DWORD dwHashSize; DWORD dwState; - HASH_CONTEXT context; + BCRYPT_HASH_HANDLE hash_handle; BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; PHMAC_INFO pHMACInfo; RSAENH_TLS1PRF_PARAMS tpPRFParams; @@ -627,8 +627,8 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { pAlgInfo = get_algid_info(pCryptHash->hProv, pCryptHash->pHMACInfo->HashAlgid); if (!pAlgInfo) return FALSE; pCryptHash->dwHashSize = pAlgInfo->dwDefaultLen >> 3; - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbInnerString, pCryptHash->pHMACInfo->cbInnerString); } @@ -642,7 +642,7 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { return TRUE; default: - return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->context); + return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->hash_handle); } } @@ -664,7 +664,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD { case CALG_HMAC: if (pCryptHash->pHMACInfo) - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); break; case CALG_MAC: @@ -677,7 +677,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD break; default: - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); } } @@ -699,15 +699,15 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbOuterString, pCryptHash->pHMACInfo->cbOuterString); - update_hash_impl(&pCryptHash->context, + update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } break; @@ -718,7 +718,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { break; default: - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } } @@ -2371,7 +2371,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { *pDestHash = *pSrcHash; - duplicate_hash_impl(&pSrcHash->context, &pDestHash->context); + duplicate_hash_impl(pSrcHash->hash_handle, &pDestHash->hash_handle); copy_hmac_info(&pDestHash->pHMACInfo, pSrcHash->pHMACInfo); copy_data_blob(&pDestHash->tpPRFParams.blobLabel, &pSrcHash->tpPRFParams.blobLabel); copy_data_blob(&pDestHash->tpPRFParams.blobSeed, &pSrcHash->tpPRFParams.blobSeed); -- 2.30.0.335.ge6362826a0

2 3

[PATCH] iphlpapi: Fix ULONG comparisons, most notably for IPv4 addresses.
by Francois Gouget 15 Feb '22

15 Feb '22

The difference between two ULONGs may not fit in an int, causing sorting errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Another approach would be to modify all the comparison functions to return a 64-bit value which would ensure no overflow happensi (they are all internal functions so that should work). The IPv6 address comparisons use memcmp() so the resulting value should fit in an int. My computer has UDP servers listening on 192.* and 0.* but the 192.* entries preceeded the 0.* ones in the UDP table returned by GetUdpTable(). Because of this SnmpExtensionQuery(SNMP_PDU_GETNEXT) found that the last matching UDP entry was lower than the table's first entry and thus returned the first entry instead of the next one. This resulted in an infinite loop in inetmib1:main depending on the exact set of running UDP servers and IPv4 addresses. https://test.winehq.org/data/patterns.html#inetmib1:main --- dlls/iphlpapi/iphlpapi_main.c | 60 ++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 53b5006d771..0366083d44a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1595,7 +1595,12 @@ DWORD WINAPI GetIfEntry( MIB_IFROW *row ) static int ifrow_cmp( const void *a, const void *b ) { - return ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; + DWORD indexA = ((const MIB_IFROW*)a)->dwIndex; + DWORD indexB = ((const MIB_IFROW*)b)->dwIndex; + + return indexA < indexB ? -1 : /* avoids overflows */ + indexA > indexB ? 1 : + 0; } /****************************************************************** @@ -1921,7 +1926,12 @@ done: static int ipaddrrow_cmp( const void *a, const void *b ) { - return ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; + DWORD addrA = ((const MIB_IPADDRROW*)a)->dwAddr; + DWORD addrB = ((const MIB_IPADDRROW*)b)->dwAddr; + + return addrA < addrB ? -1 : /* avoids overflows */ + addrA > addrB ? 1 : + 0; } /****************************************************************** @@ -2028,12 +2038,16 @@ static int ipforward_row_cmp( const void *a, const void *b ) { const MIB_IPFORWARDROW *rowA = a; const MIB_IPFORWARDROW *rowB = b; - int ret; - if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; - if ((ret = rowA->dwForwardProto - rowB->dwForwardProto) != 0) return ret; - if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; - return rowA->dwForwardNextHop - rowB->dwForwardNextHop; + return rowA->dwForwardDest < rowB->dwForwardDest ? -1 : /* avoids overflows */ + rowA->dwForwardDest > rowB->dwForwardDest ? 1 : + rowA->dwForwardProto < rowB->dwForwardProto ? -1 : + rowA->dwForwardProto > rowB->dwForwardProto ? 1 : + rowA->dwForwardPolicy < rowB->dwForwardPolicy ? -1 : + rowA->dwForwardPolicy > rowB->dwForwardPolicy ? 1 : + rowA->dwForwardNextHop < rowB->dwForwardNextHop ? -1 : + rowA->dwForwardNextHop > rowB->dwForwardNextHop ? 1 : + 0; } /****************************************************************** @@ -2277,10 +2291,14 @@ err: static int ipnetrow_cmp( const void *a, const void *b ) { - const MIB_IPNETROW *row_a = a; - const MIB_IPNETROW *row_b = b; + const MIB_IPNETROW *rowA = a; + const MIB_IPNETROW *rowB = b; + ULONG addrA = RtlUlongByteSwap( rowA->dwAddr ); + ULONG addrB = RtlUlongByteSwap( rowB->dwAddr ); - return RtlUlongByteSwap( row_a->dwAddr ) - RtlUlongByteSwap( row_b->dwAddr ); + return addrA < addrB ? -1 : /* avoids overflows */ + addrA > addrB ? 1 : + 0; } /****************************************************************** @@ -3045,11 +3063,21 @@ static int tcp_row_cmp( const void *a, const void *b ) { const MIB_TCPROW *rowA = a; const MIB_TCPROW *rowB = b; + ULONG addrA, addrB; int ret; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; + /* Avoid overflows in IPv4 address comparisons */ + addrA = RtlUlongByteSwap( rowA->dwLocalAddr ); + addrB = RtlUlongByteSwap( rowB->dwLocalAddr ); + if (addrA < addrB) return -1; + if (addrA > addrB) return 1; if ((ret = RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort )) != 0) return ret; - if ((ret = RtlUlongByteSwap( rowA->dwRemoteAddr ) - RtlUlongByteSwap( rowB->dwRemoteAddr )) != 0) return ret; + + /* Avoid overflows in IPv4 address comparisons */ + addrA = RtlUlongByteSwap( rowA->dwRemoteAddr ); + addrB = RtlUlongByteSwap( rowB->dwRemoteAddr ); + if (addrA < addrB) return -1; + if (addrA > addrB) return 1; return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort ); } @@ -3434,10 +3462,12 @@ static int udp_row_cmp( const void *a, const void *b ) { const MIB_UDPROW *rowA = a; const MIB_UDPROW *rowB = b; - int ret; + ULONG addrA = RtlUlongByteSwap( rowA->dwLocalAddr ); + ULONG addrB = RtlUlongByteSwap( rowB->dwLocalAddr ); - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; - return RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); + return addrA < addrB ? -1 : /* avoids overflows */ + addrA > addrB ? 1 : + RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); } static int udp6_row_cmp( const void *a, const void *b ) -- 2.30.2

2 2

[PATCH v3] ncrypt/tests: Test key import of an rsa key.
by Hans Leidekker 15 Feb '22

15 Feb '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v3: Compiler warning fixes and some minor improvements. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 1 + dlls/ncrypt/tests/Makefile.in | 5 ++ dlls/ncrypt/tests/ncrypt.c | 146 ++++++++++++++++++++++++++++++++++ include/ncrypt.h | 4 + 4 files changed, 156 insertions(+) create mode 100644 dlls/ncrypt/tests/Makefile.in create mode 100644 dlls/ncrypt/tests/ncrypt.c diff --git a/configure.ac b/configure.ac index e51e114c45e..a51d5d44ee7 100644 --- a/configure.ac +++ b/configure.ac @@ -3100,6 +3100,7 @@ WINE_CONFIG_MAKEFILE(dlls/msxml4) WINE_CONFIG_MAKEFILE(dlls/msxml6) WINE_CONFIG_MAKEFILE(dlls/mtxdm) WINE_CONFIG_MAKEFILE(dlls/ncrypt) +WINE_CONFIG_MAKEFILE(dlls/ncrypt/tests) WINE_CONFIG_MAKEFILE(dlls/nddeapi) WINE_CONFIG_MAKEFILE(dlls/ndis.sys) WINE_CONFIG_MAKEFILE(dlls/ndis.sys/tests) diff --git a/dlls/ncrypt/tests/Makefile.in b/dlls/ncrypt/tests/Makefile.in new file mode 100644 index 00000000000..d08a32dc312 --- /dev/null +++ b/dlls/ncrypt/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = ncrypt.dll +IMPORTS = ncrypt + +C_SRCS = \ + ncrypt.c diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c new file mode 100644 index 00000000000..045dd60c793 --- /dev/null +++ b/dlls/ncrypt/tests/ncrypt.c @@ -0,0 +1,146 @@ +/* Unit test suite for ncrypt.dll + * + * Copyright 2021 Santino Mazza + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <ncrypt.h> +#include <bcrypt.h> + +#include "wine/test.h" + +UCHAR rsa_key_blob[] = { + 0x52, 0x53, 0x41, 0x31, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0xc7, 0x8f, 0xac, 0x2a, 0xce, 0xbf, 0xc9, 0x6c, 0x7b, + 0x85, 0x74, 0x71, 0xbb, 0xff, 0xbb, 0x9b, 0x20, 0x03, 0x79, 0x17, 0x34, + 0xe7, 0x26, 0x91, 0x5c, 0x1f, 0x1b, 0x03, 0x3d, 0x46, 0xdf, 0xb6, 0xf2, + 0x10, 0x55, 0xf0, 0x39, 0x55, 0x0a, 0xe3, 0x9c, 0x0c, 0x63, 0xc2, 0x14, + 0x03, 0x94, 0x51, 0x0d, 0xb4, 0x22, 0x09, 0xf2, 0x5c, 0xb2, 0xd1, 0xc3, + 0xac, 0x6f, 0xa8, 0xc4, 0xac, 0xb8, 0xbc, 0x59, 0xe7, 0xed, 0x77, 0x6e, + 0xb1, 0x80, 0x58, 0x7d, 0xb2, 0x94, 0x46, 0xe5, 0x00, 0xe2, 0xb7, 0x33, + 0x48, 0x7a, 0xd3, 0x78, 0xe9, 0x26, 0x01, 0xc7, 0x00, 0x7b, 0x41, 0x6d, + 0x94, 0x3a, 0xe1, 0x50, 0x2b, 0x9f, 0x6b, 0x1c, 0x08, 0xa3, 0xfc, 0x0a, + 0x44, 0x81, 0x09, 0x41, 0x80, 0x23, 0x7b, 0xf6, 0x3f, 0xaf, 0x91, 0xa1, + 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd}; + +UCHAR rsa_key_blob_with_invalid_bit_length[] = { + 0x52, 0x53, 0x41, 0x31, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0xc7, 0x8f, 0xac, 0x2a, 0xce, 0xbf, 0xc9, 0x6c, 0x7b, + 0x85, 0x74, 0x71, 0xbb, 0xff, 0xbb, 0x9b, 0x20, 0x03, 0x79, 0x17, 0x34, + 0xe7, 0x26, 0x91, 0x5c, 0x1f, 0x1b, 0x03, 0x3d, 0x46, 0xdf, 0xb6, 0xf2, + 0x10, 0x55, 0xf0, 0x39, 0x55, 0x0a, 0xe3, 0x9c, 0x0c, 0x63, 0xc2, 0x14, + 0x03, 0x94, 0x51, 0x0d, 0xb4, 0x22, 0x09, 0xf2, 0x5c, 0xb2, 0xd1, 0xc3, + 0xac, 0x6f, 0xa8, 0xc4, 0xac, 0xb8, 0xbc, 0x59, 0xe7, 0xed, 0x77, 0x6e, + 0xb1, 0x80, 0x58, 0x7d, 0xb2, 0x94, 0x46, 0xe5, 0x00, 0xe2, 0xb7, 0x33, + 0x48, 0x7a, 0xd3, 0x78, 0xe9, 0x26, 0x01, 0xc7, 0x00, 0x7b, 0x41, 0x6d, + 0x94, 0x3a, 0xe1, 0x50, 0x2b, 0x9f, 0x6b, 0x1c, 0x08, 0xa3, 0xfc, 0x0a, + 0x44, 0x81, 0x09, 0x41, 0x80, 0x23, 0x7b, 0xf6, 0x3f, 0xaf, 0x91, 0xa1, + 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd}; + +UCHAR rsa_key_blob_with_invalid_publicexp_size[] = { + 0x52, 0x53, 0x41, 0x31, 0x00, 0x04, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0xc7, 0x8f, 0xac, 0x2a, 0xce, 0xbf, 0xc9, 0x6c, 0x7b, + 0x85, 0x74, 0x71, 0xbb, 0xff, 0xbb, 0x9b, 0x20, 0x03, 0x79, 0x17, 0x34, + 0xe7, 0x26, 0x91, 0x5c, 0x1f, 0x1b, 0x03, 0x3d, 0x46, 0xdf, 0xb6, 0xf2, + 0x10, 0x55, 0xf0, 0x39, 0x55, 0x0a, 0xe3, 0x9c, 0x0c, 0x63, 0xc2, 0x14, + 0x03, 0x94, 0x51, 0x0d, 0xb4, 0x22, 0x09, 0xf2, 0x5c, 0xb2, 0xd1, 0xc3, + 0xac, 0x6f, 0xa8, 0xc4, 0xac, 0xb8, 0xbc, 0x59, 0xe7, 0xed, 0x77, 0x6e, + 0xb1, 0x80, 0x58, 0x7d, 0xb2, 0x94, 0x46, 0xe5, 0x00, 0xe2, 0xb7, 0x33, + 0x48, 0x7a, 0xd3, 0x78, 0xe9, 0x26, 0x01, 0xc7, 0x00, 0x7b, 0x41, 0x6d, + 0x94, 0x3a, 0xe1, 0x50, 0x2b, 0x9f, 0x6b, 0x1c, 0x08, 0xa3, 0xfc, 0x0a, + 0x44, 0x81, 0x09, 0x41, 0x80, 0x23, 0x7b, 0xf6, 0x3f, 0xaf, 0x91, 0xa1, + 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd}; + +/* RSA public key with invalid magic value. */ +UCHAR invalid_rsa_key_blob[] = { + 0x75, 0x59, 0x41, 0x31, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0xc7, 0x8f, 0xac, 0x2a, 0xce, 0xbf, 0xc9, 0x6c, 0x7b, + 0x85, 0x74, 0x71, 0xbb, 0xff, 0xbb, 0x9b, 0x20, 0x03, 0x79, 0x17, 0x34, + 0xe7, 0x26, 0x91, 0x5c, 0x1f, 0x1b, 0x03, 0x3d, 0x46, 0xdf, 0xb6, 0xf2, + 0x10, 0x55, 0xf0, 0x39, 0x55, 0x0a, 0xe3, 0x9c, 0x0c, 0x63, 0xc2, 0x14, + 0x03, 0x94, 0x51, 0x0d, 0xb4, 0x22, 0x09, 0xf2, 0x5c, 0xb2, 0xd1, 0xc3, + 0xac, 0x6f, 0xa8, 0xc4, 0xac, 0xb8, 0xbc, 0x59, 0xe7, 0xed, 0x77, 0x6e, + 0xb1, 0x80, 0x58, 0x7d, 0xb2, 0x94, 0x46, 0xe5, 0x00, 0xe2, 0xb7, 0x33, + 0x48, 0x7a, 0xd3, 0x78, 0xe9, 0x26, 0x01, 0xc7, 0x00, 0x7b, 0x41, 0x6d, + 0x94, 0x3a, 0xe1, 0x50, 0x2b, 0x9f, 0x6b, 0x1c, 0x08, 0xa3, 0xfc, 0x0a, + 0x44, 0x81, 0x09, 0x41, 0x80, 0x23, 0x7b, 0xf6, 0x3f, 0xaf, 0x91, 0xa1, + 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd}; + +static void test_key_import_rsa(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + + todo_wine { + prov = 0; + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(prov, "got null handle\n"); + } + + todo_wine { + key = 0; + ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(key, "got null handle\n"); + NCryptFreeObject(key); + + key = 0; + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + ok(key, "got null handle\n"); + NCryptFreeObject(key); + + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 49); + ok(ret == NTE_BAD_FLAGS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, invalid_rsa_key_blob, + sizeof(invalid_rsa_key_blob), 0); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + key = 0; + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, rsa_key_blob_with_invalid_bit_length, + sizeof(rsa_key_blob_with_invalid_bit_length), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); /* I'm not sure why, but this returns success */ + ok(key, "got null handle\n"); + NCryptFreeObject(key); + + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, rsa_key_blob_with_invalid_publicexp_size, + sizeof(rsa_key_blob_with_invalid_publicexp_size), 0); + ok(ret == NTE_BAD_DATA, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob) - 1, 0); + ok(ret == NTE_BAD_DATA, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob) + 1, 0); + ok(ret == NTE_BAD_DATA, "got %#lx\n", ret); + + NCryptFreeObject(prov); + } +} + +START_TEST(ncrypt) +{ + test_key_import_rsa(); +} diff --git a/include/ncrypt.h b/include/ncrypt.h index 111693f1d49..84f1fedd0b9 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -69,11 +69,15 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_SCHANNEL_SIGNATURE_INTERFACE 0x00010003 #define NCRYPT_KEY_PROTECTION_INTERFACE 0x00010004 +#define NCRYPT_SILENT_FLAG 0x00000040 + SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE, DWORD); SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); +SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, + NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); -- 2.30.2

2 2

[PATCH v2 01/10] bcrypt: Create BCRYPT_KEY_BLOB struct definition.
by Santino Mazza 15 Feb '22

15 Feb '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- include/bcrypt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index 15c26c1fb0a..484dca0f0c4 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -254,6 +254,10 @@ typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO ULONG dwFlags; } BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; +typedef struct _BCRYPT_KEY_BLOB { + ULONG Magic; +} BCRYPT_KEY_BLOB; + typedef struct _BCRYPT_ECCKEY_BLOB { ULONG dwMagic; -- 2.32.0

3 11

[PATCH] api-ms-win-core-versionansi-l1-1-1: Add dll.
by David Warner 15 Feb '22

15 Feb '22

Add the ANSI analogue to api-ms-win-core-version-l1-1-1 (needed for Adobe DNG Converter 14+). Signed-off-by: David Warner <david.p.warner(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-versionansi-l1-1-1.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec diff --git a/configure b/configure index d6efbbc3cd3..68cfaa36977 100755 --- a/configure +++ b/configure @@ -21577,6 +21577,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-0 enable_api_ms_win_co wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-1 enable_api_ms_win_core_version_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-version-private-l1-1-0 enable_api_ms_win_core_version_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-1 enable_api_ms_win_core_versionansi_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-windowserrorreporting-l1-1-0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-windowserrorreporting-l1-1-1 enable_api_ms_win_core_windowserrorreporting_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 diff --git a/configure.ac b/configure.ac index e51e114c45e..691452805ee 100644 --- a/configure.ac +++ b/configure.ac @@ -2469,6 +2469,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-0) diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in new file mode 100644 index 00000000000..054fa70c479 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-versionansi-l1-1-1.dll diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec new file mode 100644 index 00000000000..a73d8924376 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec @@ -0,0 +1,6 @@ +@ stdcall GetFileVersionInfoExA(long str long long ptr) version.GetFileVersionInfoExA +@ stdcall GetFileVersionInfoSizeExA(long str ptr) version.GetFileVersionInfoSizeExA +@ stdcall GetFileVersionInfoSizeA(str ptr) version.GetFileVersionInfoSizeA +@ stdcall GetFileVersionInfoA(str long long ptr) version.GetFileVersionInfoA +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index 594e01396db..9e1684b99f9 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -444,6 +444,7 @@ my @dll_groups = [ "version", "api-ms-win-core-versionansi-l1-1-0", + "api-ms-win-core-versionansi-l1-1-1", "api-ms-win-core-version-l1-1-0", "api-ms-win-core-version-l1-1-1", "api-ms-win-core-version-private-l1-1-0", -- 2.34.1

1 0

[PATCH] api-ms-win-core-versionansi-l1-1-1: Add dll.
by David Warner 15 Feb '22

15 Feb '22

Add the ANSI analogue to api-ms-win-core-version-l1-1-1 (needed for Adobe DNG Converter 14+). Signed-off-by: David Warner <david.p.warner(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-versionansi-l1-1-1.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec diff --git a/configure b/configure index 69159422456..f38652cc263 100755 --- a/configure +++ b/configure @@ -21545,6 +21545,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-0 enable_api_ms_win_co wine_fn_config_makefile dlls/api-ms-win-core-version-l1-1-1 enable_api_ms_win_core_version_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-version-private-l1-1-0 enable_api_ms_win_core_version_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-versionansi-l1-1-1 enable_api_ms_win_core_versionansi_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-windowserrorreporting-l1-1-0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 diff --git a/configure.ac b/configure.ac index c1eb2f99a8c..57c4e01be61 100644 --- a/configure.ac +++ b/configure.ac @@ -2469,6 +2469,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-version-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-versionansi-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-windowserrorreporting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-error-l1-1-1) diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in new file mode 100644 index 00000000000..054fa70c479 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-versionansi-l1-1-1.dll diff --git a/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec new file mode 100644 index 00000000000..a73d8924376 --- /dev/null +++ b/dlls/api-ms-win-core-versionansi-l1-1-1/api-ms-win-core-versionansi-l1-1-1.spec @@ -0,0 +1,6 @@ +@ stdcall GetFileVersionInfoExA(long str long long ptr) version.GetFileVersionInfoExA +@ stdcall GetFileVersionInfoSizeExA(long str ptr) version.GetFileVersionInfoSizeExA +@ stdcall GetFileVersionInfoSizeA(str ptr) version.GetFileVersionInfoSizeA +@ stdcall GetFileVersionInfoA(str long long ptr) version.GetFileVersionInfoA +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index 49a032ef14c..3e5f54f4947 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -442,6 +442,7 @@ my @dll_groups = [ "version", "api-ms-win-core-versionansi-l1-1-0", + "api-ms-win-core-versionansi-l1-1-1", "api-ms-win-core-version-l1-1-0", "api-ms-win-core-version-l1-1-1", "api-ms-win-core-version-private-l1-1-0", -- 2.33.1

2 1

[PATCH 3/3] webservices/tests: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 15 Feb '22

15 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/Makefile.in | 1 - dlls/webservices/tests/channel.c | 378 ++-- dlls/webservices/tests/msg.c | 502 +++--- dlls/webservices/tests/proxy.c | 118 +- dlls/webservices/tests/reader.c | 2576 ++++++++++++++-------------- dlls/webservices/tests/url.c | 42 +- dlls/webservices/tests/writer.c | 1604 ++++++++--------- 7 files changed, 2610 insertions(+), 2611 deletions(-) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index b8a3137c2a5..63e24e66db0 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = webservices.dll IMPORTS = webservices oleaut32 ole32 user32 rpcrt4 ws2_32 advapi32 diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index ed6e9e829bf..64d134bfaab 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -36,48 +36,48 @@ static void test_WsCreateChannel(void) ULONG size; hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); channel = NULL; hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( channel != NULL, "channel not set\n" ); size = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &size, sizeof(size), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 65536, "got %u\n", size ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( size == 65536, "got %lu\n", size ); encoding = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( encoding == WS_ENCODING_XML_UTF8, "got %u\n", encoding ); env_version = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); addr_version = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); /* read-only property */ state = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); state = WS_CHANNEL_STATE_CREATED; hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); encoding = WS_ENCODING_XML_UTF8; hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeChannel( channel ); encoding = WS_ENCODING_XML_UTF16LE; @@ -85,30 +85,30 @@ static void test_WsCreateChannel(void) prop.value = &encoding; prop.valueSize = sizeof(encoding); hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, &prop, 1, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); encoding = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( encoding == WS_ENCODING_XML_UTF16LE, "got %u\n", encoding ); WsFreeChannel( channel ); hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); encoding = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( encoding == WS_ENCODING_XML_BINARY_SESSION_1, "got %u\n", encoding ); env_version = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); addr_version = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); WsFreeChannel( channel ); } @@ -121,48 +121,48 @@ static void test_WsOpenChannel(void) WS_ENDPOINT_ADDRESS addr; hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeChannel( channel ); hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsOpenChannel( channel, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); memset( &addr, 0, sizeof(addr) ); addr.url.length = ARRAY_SIZE( L"http://localhost" ) - 1; addr.url.chars = (WCHAR *)L"http://localhost"; hr = WsOpenChannel( NULL, &addr, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsOpenChannel( channel, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_CHANNEL_STATE_OPEN, "got %u\n", state ); hr = WsOpenChannel( channel, &addr, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_CHANNEL_STATE_CLOSED, "got %u\n", state ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCloseChannel( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeChannel( channel ); } @@ -177,48 +177,48 @@ static void test_WsResetChannel(void) ULONG size, timeout; hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetChannel( channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); timeout = 5000; size = sizeof(timeout); hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_RESOLVE_TIMEOUT, &timeout, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &addr, 0, sizeof(addr) ); addr.url.length = ARRAY_SIZE( L"http://localhost" ) - 1; addr.url.chars = (WCHAR *)L"http://localhost"; hr = WsOpenChannel( channel, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetChannel( channel, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetChannel( channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; size = sizeof(state); hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); type = 0xdeadbeef; size = sizeof(type); hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( type == WS_CHANNEL_TYPE_REQUEST, "got %u\n", type ); timeout = 0xdeadbeef; size = sizeof(timeout); hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_RESOLVE_TIMEOUT, &timeout, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( timeout == 5000, "got %u\n", timeout ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( timeout == 5000, "got %lu\n", timeout ); WsFreeChannel( channel ); } @@ -234,49 +234,49 @@ static void test_WsCreateListener(void) ULONG size, backlog; hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); listener = NULL; hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( listener != NULL, "listener not set\n" ); backlog = 1000; size = sizeof(backlog); hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_LISTEN_BACKLOG, &backlog, size, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + todo_wine ok( hr == E_INVALIDARG, "got %#lx\n", hr ); version = WS_IP_VERSION_4; size = sizeof(version); hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + todo_wine ok( hr == E_INVALIDARG, "got %#lx\n", hr ); type = 0xdeadbeef; hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); binding = 0xdeadbeef; hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CHANNEL_BINDING, &binding, sizeof(binding), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( binding == WS_TCP_CHANNEL_BINDING, "got %u\n", binding ); version = 0; size = sizeof(version); hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_IP_VERSION, &version, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); todo_wine ok( version == WS_IP_VERSION_AUTO, "got %u\n", version ); state = 0xdeadbeef; size = sizeof(state); hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); state = WS_LISTENER_STATE_CREATED; size = sizeof(state); hr = WsSetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeListener( listener ); } @@ -288,63 +288,63 @@ static void test_WsOpenListener(void) HRESULT hr; hr = WsOpenListener( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeListener( listener ); hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsOpenListener( listener, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); url.length = ARRAY_SIZE( L"net.tcp://+:2017/path" ) - 1; url.chars = (WCHAR *)L"net.tcp://+:2017/path"; hr = WsOpenListener( NULL, &url, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeListener( listener ); hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); url.length = ARRAY_SIZE( L"net.tcp://localhost:2017" ) - 1; url.chars = (WCHAR *)L"net.tcp://localhost:2017"; hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeListener( listener ); hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); url.length = ARRAY_SIZE( L"net.tcp://127.0.0.1:2017" ) - 1; url.chars = (WCHAR *)L"net.tcp://127.0.0.1:2017"; hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCloseListener( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeListener( listener ); } @@ -358,27 +358,27 @@ static void test_WsCreateChannelForListener(void) HRESULT hr; hr = WsCreateChannelForListener( NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateChannelForListener( NULL, NULL, 0, &channel, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); channel = NULL; hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( channel != NULL, "channel not set\n" ); type = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); state = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); WsFreeChannel( channel ); @@ -395,40 +395,40 @@ static void test_WsResetListener(void) HRESULT hr; hr = WsResetListener( NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); prop.id = WS_LISTENER_PROPERTY_CONNECT_TIMEOUT; prop.value = &timeout; prop.valueSize = sizeof(timeout); hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, &prop, 1, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetListener( listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetListener( listener, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetListener( listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; size = sizeof(state); hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); timeout = 0xdeadbeef; size = sizeof(timeout); hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CONNECT_TIMEOUT, &timeout, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( timeout == 1000, "got %u\n", timeout ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( timeout == 1000, "got %lu\n", timeout ); WsFreeListener( listener ); } @@ -449,31 +449,31 @@ static void server_message_read_write( WS_CHANNEL *channel ) HRESULT hr; hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadMessageStart( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadMessageStart( channel, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadMessageStart( NULL, msg, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadMessageStart( channel, msg, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadMessageEnd( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadMessageEnd( channel, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadMessageEnd( NULL, msg, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadMessageEnd( channel, msg, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); } @@ -487,55 +487,55 @@ static void client_message_read_write( const struct listener_info *info ) DWORD err; err = WaitForSingleObject( info->ready, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &addr, 0, sizeof(addr) ); addr.url.length = wsprintfW( buf, L"soap.udp://localhost:%u", info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsShutdownSessionChannel( channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteMessageStart( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteMessageStart( channel, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteMessageStart( NULL, msg, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteMessageStart( channel, msg, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteMessageEnd( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteMessageEnd( channel, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteMessageEnd( NULL, msg, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteMessageEnd( channel, msg, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); err = WaitForSingleObject( info->done, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); WsFreeChannel( channel ); @@ -551,7 +551,7 @@ static void CALLBACK async_callback( HRESULT hr, WS_CALLBACK_MODEL model, void * { struct async_test *test = state; - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( model == WS_LONG_CALLBACK, "got %u\n", model ); test->call_count++; SetEvent( test->wait ); @@ -570,7 +570,7 @@ static void server_duplex_session( WS_CHANNEL *channel ) HRESULT hr; hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); desc_body.elementLocalName = &localname; desc_body.elementNs = &ns; @@ -587,27 +587,27 @@ static void server_duplex_session( WS_CHANNEL *channel ) hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_OPTIONAL_MESSAGE, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL, &ctx, NULL ); - ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %#lx\n", hr ); if (hr == WS_S_ASYNC) { WaitForSingleObject( test.wait, INFINITE ); - ok( test.call_count == 1, "got %u\n", test.call_count ); + ok( test.call_count == 1, "got %lu\n", test.call_count ); } - else ok( !test.call_count, "got %u\n", test.call_count ); + else ok( !test.call_count, "got %lu\n", test.call_count ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); test.call_count = 0; hr = WsReceiveMessage( channel, msg2, desc, 1, WS_RECEIVE_OPTIONAL_MESSAGE, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL, &ctx, NULL ); - ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %#lx\n", hr ); if (hr == WS_S_ASYNC) { WaitForSingleObject( test.wait, INFINITE ); - ok( test.call_count == 1, "got %u\n", test.call_count ); + ok( test.call_count == 1, "got %lu\n", test.call_count ); } - else ok( !test.call_count, "got %u\n", test.call_count ); + else ok( !test.call_count, "got %lu\n", test.call_count ); CloseHandle( test.wait ); WsFreeMessage( msg ); @@ -628,22 +628,22 @@ static void client_duplex_session( const struct listener_info *info ) DWORD err; err = WaitForSingleObject( info->ready, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsShutdownSessionChannel( channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); memset( &addr, 0, sizeof(addr) ); addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); desc_body.elementLocalName = &localname; desc_body.elementNs = &ns; @@ -653,25 +653,25 @@ static void client_duplex_session( const struct listener_info *info ) desc.bodyElementDescription = &desc_body; hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSendMessage( channel, msg2, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); err = WaitForSingleObject( info->done, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); hr = WsShutdownSessionChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsShutdownSessionChannel( channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); WsFreeMessage( msg2 ); @@ -694,13 +694,13 @@ static void client_duplex_session_async( const struct listener_info *info ) DWORD err; err = WaitForSingleObject( info->ready, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsShutdownSessionChannel( channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); test.call_count = 0; test.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -711,16 +711,16 @@ static void client_duplex_session_async( const struct listener_info *info ) addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, &ctx, NULL ); - ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %#lx\n", hr ); if (hr == WS_S_ASYNC) { WaitForSingleObject( test.wait, INFINITE ); - ok( test.call_count == 1, "got %u\n", test.call_count ); + ok( test.call_count == 1, "got %lu\n", test.call_count ); } - else ok( !test.call_count, "got %u\n", test.call_count ); + else ok( !test.call_count, "got %lu\n", test.call_count ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); desc_body.elementLocalName = &localname; desc_body.elementNs = &ns; @@ -732,46 +732,46 @@ static void client_duplex_session_async( const struct listener_info *info ) /* asynchronous call */ test.call_count = 0; hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), &ctx, NULL ); - ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %#lx\n", hr ); if (hr == WS_S_ASYNC) { WaitForSingleObject( test.wait, INFINITE ); - ok( test.call_count == 1, "got %u\n", test.call_count ); + ok( test.call_count == 1, "got %lu\n", test.call_count ); } - else ok( !test.call_count, "got %u\n", test.call_count ); + else ok( !test.call_count, "got %lu\n", test.call_count ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* synchronous call */ hr = WsSendMessage( channel, msg2, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); test.call_count = 0; hr = WsShutdownSessionChannel( channel, &ctx, NULL ); - ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %#lx\n", hr ); if (hr == WS_S_ASYNC) { WaitForSingleObject( test.wait, INFINITE ); - ok( test.call_count == 1, "got %u\n", test.call_count ); + ok( test.call_count == 1, "got %lu\n", test.call_count ); } - else ok( !test.call_count, "got %u\n", test.call_count ); + else ok( !test.call_count, "got %lu\n", test.call_count ); hr = WsShutdownSessionChannel( channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); test.call_count = 0; hr = WsCloseChannel( channel, &ctx, NULL ); - ok( hr == WS_S_ASYNC || hr == S_OK, "got %08x\n", hr ); + ok( hr == WS_S_ASYNC || hr == S_OK, "got %#lx\n", hr ); if (hr == WS_S_ASYNC) { WaitForSingleObject( test.wait, INFINITE ); - ok( test.call_count == 1, "got %u\n", test.call_count ); + ok( test.call_count == 1, "got %lu\n", test.call_count ); } - else ok( !test.call_count, "got %u\n", test.call_count ); + else ok( !test.call_count, "got %lu\n", test.call_count ); err = WaitForSingleObject( info->done, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); CloseHandle( test.wait ); WsFreeMessage( msg ); @@ -790,7 +790,7 @@ static void server_accept_channel( WS_CHANNEL *channel ) HRESULT hr; hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); body.elementLocalName = &localname; body.elementNs = &ns; @@ -803,7 +803,7 @@ static void server_accept_channel( WS_CHANNEL *channel ) hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val == -1, "got %d\n", val ); WsFreeMessage( msg ); } @@ -824,36 +824,36 @@ static void client_accept_channel( const struct listener_info *info ) DWORD err; err = WaitForSingleObject( info->ready, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); hr = WsAcceptChannel( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsAcceptChannel( listener, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsAcceptChannel( listener, channel, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); WsFreeChannel( channel ); WsFreeListener( listener ); hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &addr, 0, sizeof(addr) ); addr.url.length = wsprintfW( buf, fmt, info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); body.elementLocalName = &localname; body.elementNs = &ns; @@ -864,13 +864,13 @@ static void client_accept_channel( const struct listener_info *info ) desc.bodyElementDescription = &body; hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); err = WaitForSingleObject( info->done, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); WsFreeChannel( channel ); @@ -888,7 +888,7 @@ static void server_request_reply( WS_CHANNEL *channel ) HRESULT hr; hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); body.elementLocalName = &localname; body.elementNs = &ns; @@ -901,18 +901,18 @@ static void server_request_reply( WS_CHANNEL *channel ) hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val == -1, "got %d\n", val ); WsFreeMessage( msg ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); out_desc.action = &reply_action; out_desc.bodyElementDescription = &body; hr = WsSendMessage( channel, msg, &out_desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); } @@ -931,25 +931,25 @@ static void client_request_reply( const struct listener_info *info ) DWORD err; err = WaitForSingleObject( info->ready, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &addr, 0, sizeof(addr) ); addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); addr.url.chars = buf; hr = WsOpenChannel( channel, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &req, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &reply, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( req, WS_BLANK_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); body.elementLocalName = &localname; body.elementNs = &ns; @@ -967,10 +967,10 @@ static void client_request_reply( const struct listener_info *info ) ok( val_out == -1, "got %d\n", val_out ); err = WaitForSingleObject( info->done, 3000 ); - ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + ok( err == WAIT_OBJECT_0, "wait failed %lu\n", err ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( req ); WsFreeMessage( reply ); @@ -989,24 +989,24 @@ static DWORD CALLBACK listener_proc( void *arg ) HRESULT hr; hr = WsCreateListener( info->type, info->binding, NULL, 0, NULL, &listener, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); url.length = wsprintfW( buf, fmt, info->port ); url.chars = buf; hr = WsOpenListener( listener, &url, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SetEvent( info->ready ); hr = WsAcceptChannel( listener, channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_CHANNEL_STATE_OPEN, "got %u\n", state ); info->server_func( channel ); @@ -1014,11 +1014,11 @@ static DWORD CALLBACK listener_proc( void *arg ) SetEvent( info->done ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeChannel( channel ); hr = WsCloseListener( listener, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeListener( listener ); return 0; @@ -1027,7 +1027,7 @@ static DWORD CALLBACK listener_proc( void *arg ) static HANDLE start_listener( struct listener_info *info ) { HANDLE thread = CreateThread( NULL, 0, listener_proc, info, 0, NULL ); - ok( thread != NULL, "failed to create listener thread %u\n", GetLastError() ); + ok( thread != NULL, "failed to create listener thread %lu\n", GetLastError() ); return thread; } @@ -1065,18 +1065,18 @@ static BOOL is_firewall_enabled(void) hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); done: if (policy) INetFwPolicy_Release( policy ); @@ -1105,23 +1105,23 @@ static HRESULT set_firewall( enum firewall_op op ) hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr != S_OK) goto done; hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwAuthorizedApplication, (void **)&app ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); @@ -1130,7 +1130,7 @@ static HRESULT set_firewall( enum firewall_op op ) name = SysAllocString( L"webservices_test" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr != S_OK) goto done; if (op == APP_ADD) @@ -1184,7 +1184,7 @@ START_TEST(channel) } if ((hr = set_firewall( APP_ADD )) != S_OK) { - skip( "can't authorize app in firewall %08x\n", hr ); + skip( "can't authorize app in firewall %#lx\n", hr ); return; } } diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 5a5af55e5d8..3c741c48ce3 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -31,16 +31,16 @@ static void test_WsCreateMessage(void) WS_MESSAGE_PROPERTY prop; hr = WsCreateMessage( 0, 0, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( 0, 0, NULL, 0, &msg, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, 0, NULL, 0, &msg, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( 0, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); env_version = WS_ENVELOPE_VERSION_SOAP_1_1; prop.id = WS_MESSAGE_PROPERTY_ENVELOPE_VERSION; @@ -48,42 +48,42 @@ static void test_WsCreateMessage(void) prop.valueSize = sizeof(env_version); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, &prop, 1, &msg, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_EMPTY, "got %u\n", state ); env_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_1, "got %u\n", env_version ); addr_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( addr_version == WS_ADDRESSING_VERSION_0_9, "got %u\n", addr_version ); state = WS_MESSAGE_STATE_EMPTY; hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); env_version = WS_ENVELOPE_VERSION_SOAP_1_1; hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); addr_version = WS_ADDRESSING_VERSION_0_9; hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); WsFreeMessage( msg ); } @@ -99,39 +99,39 @@ static void test_WsCreateMessageForChannel(void) BOOL addressed; hr = WsCreateMessageForChannel( NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( NULL, NULL, 0, &msg, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); /* HTTP */ hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_EMPTY, "got %u\n", state ); env_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); addr_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); WsFreeChannel( channel ); WsFreeMessage( msg ); @@ -142,15 +142,15 @@ static void test_WsCreateMessageForChannel(void) prop.valueSize = sizeof(env_version); hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, &prop, 1, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); env_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_1, "got %u\n", env_version ); WsFreeChannel( channel ); @@ -159,26 +159,26 @@ static void test_WsCreateMessageForChannel(void) /* TCP */ hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_EMPTY, "got %u\n", state ); env_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); addr_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); WsFreeChannel( channel ); @@ -187,21 +187,21 @@ static void test_WsCreateMessageForChannel(void) /* UDP */ hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX, WS_UDP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); env_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); addr_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); WsFreeChannel( channel ); @@ -218,45 +218,45 @@ static void test_WsInitializeMessage(void) BOOL addressed; hr = WsInitializeMessage( NULL, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, 0xdeadbeef, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_INITIALIZED, "got %u\n", state ); addressed = -1; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !addressed, "unexpected value %d\n", addressed ); state = WS_MESSAGE_STATE_EMPTY; hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); env_version = WS_ENVELOPE_VERSION_SOAP_1_1; hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); addr_version = WS_ADDRESSING_VERSION_0_9; hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeMessage( msg ); } @@ -268,55 +268,55 @@ static void test_WsAddressMessage(void) BOOL addressed; hr = WsAddressMessage( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsAddressMessage( msg, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); addressed = -1; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !addressed, "unexpected value %d\n", addressed ); hr = WsAddressMessage( msg, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); addressed = -1; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( addressed == TRUE, "unexpected value %d\n", addressed ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &endpoint, 0, sizeof(endpoint) ); endpoint.url.chars = (WCHAR *)L"http://localhost/"; endpoint.url.length = ARRAY_SIZE( L"http://localhost/" ) - 1; hr = WsAddressMessage( msg, &endpoint, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); addressed = -1; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( addressed == TRUE, "unexpected value %d\n", addressed ); WsFreeMessage( msg ); } @@ -337,8 +337,8 @@ static void check_output( WS_XML_WRITER *writer, const char *expected, int len, if (len == -1) len = strlen( expected ); memset( &bytes, 0, sizeof(bytes) ); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, sizeof(bytes), NULL ); - ok( hr == S_OK, "%u: got %08x\n", line, hr ); - ok( bytes.length == len, "%u: got %u expected %u\n", line, bytes.length, len ); + ok( hr == S_OK, "%u: got %#lx\n", line, hr ); + ok( bytes.length == len, "%u: got %lu expected %d\n", line, bytes.length, len ); if (bytes.length != len) return; if (skip_start) { @@ -360,16 +360,16 @@ static void check_output_header( WS_MESSAGE *msg, const char *expected, int len, HRESULT hr; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_HEADER_BUFFER, &buf, sizeof(buf), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlBuffer( writer, buf, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, expected, len, skip_start, skip_len, line ); WsFreeWriter( writer ); @@ -414,111 +414,111 @@ static void test_WsWriteEnvelopeStart(void) WS_MESSAGE_STATE state; hr = WsWriteEnvelopeStart( NULL, NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( NULL, writer, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_WRITING, "got %u\n", state ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected3, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected4, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected5, -1, strstr(expected5, "urn:uuid:") - expected5, 46, __LINE__ ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected6, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected7, -1, strstr(expected7, "urn:uuid:") - expected7, 46, __LINE__ ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_BLANK_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected8, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeWriter( writer ); } @@ -535,38 +535,38 @@ static void test_WsWriteEnvelopeEnd(void) WS_MESSAGE_STATE state; hr = WsWriteEnvelopeEnd( NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeEnd( msg, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeEnd( msg, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeEnd( msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_DONE, "got %u\n", state ); WsFreeMessage( msg ); @@ -601,25 +601,25 @@ static void test_WsWriteBody(void) hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteBody( NULL, NULL, 0, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteBody( msg, NULL, 0, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -644,22 +644,22 @@ static void test_WsWriteBody(void) ptr = &test; test.val = 1; hr = WsWriteBody( msg, &desc, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, expected, 240, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_WRITING, "got %u\n", state ); hr = WsWriteEnvelopeEnd( msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); hr = WsWriteBody( msg, &desc, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); WsFreeMessage( msg ); WsFreeWriter( writer ); @@ -686,45 +686,45 @@ static void test_WsSetHeader(void) const WCHAR *ptr = L"action"; hr = WsSetHeader( NULL, 0, 0, 0, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetHeader( msg, 0, 0, 0, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetHeader( msg, 0, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, expected, 250, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); /* called after WsWriteEnvelopeStart */ hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &action2, sizeof(action2), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, expected, 250, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); @@ -750,44 +750,44 @@ static void test_WsRemoveHeader(void) WS_MESSAGE *msg; hr = WsSetHeader( NULL, 0, 0, 0, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsRemoveHeader( NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsRemoveHeader( msg, 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); hr = WsRemoveHeader( msg, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &action, sizeof(action), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); /* again */ hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); WsFreeMessage( msg ); @@ -800,29 +800,29 @@ static void test_WsAddMappedHeader(void) HRESULT hr; hr = WsAddMappedHeader( NULL, NULL, 0, 0, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsAddMappedHeader( msg, NULL, 0, 0, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsAddMappedHeader( msg, &header, 0, 0, NULL, 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* again */ hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); } @@ -834,29 +834,29 @@ static void test_WsRemoveMappedHeader(void) HRESULT hr; hr = WsRemoveMappedHeader( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsRemoveMappedHeader( msg, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsRemoveMappedHeader( msg, &header, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsRemoveMappedHeader( msg, &header, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* again */ hr = WsRemoveMappedHeader( msg, &header, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); } @@ -898,13 +898,13 @@ static void test_WsAddCustomHeader(void) } test; hr = WsAddCustomHeader( NULL, NULL, 0, NULL, 0, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsAddCustomHeader( msg, NULL, 0, NULL, 0, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_TEXT_FIELD_MAPPING; @@ -922,29 +922,29 @@ static void test_WsAddCustomHeader(void) desc.type = WS_STRUCT_TYPE; desc.typeDescription = &s; hr = WsAddCustomHeader( msg, &desc, 0, NULL, 0, 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); test.value = L"value"; hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); test.value = L"value2"; hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected3, -1, strstr(expected3, "urn:uuid:") - expected3, 46, __LINE__ ); desc.elementLocalName = &header2; hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected4, -1, strstr(expected4, "urn:uuid:") - expected4, 46, __LINE__ ); hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, NULL, 0, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeMessage( msg ); } @@ -975,16 +975,16 @@ static void test_WsRemoveCustomHeader(void) WS_ELEMENT_DESCRIPTION desc; hr = WsRemoveCustomHeader( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsRemoveCustomHeader( msg, &localname, &ns, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); desc.elementLocalName = &localname; @@ -992,26 +992,26 @@ static void test_WsRemoveCustomHeader(void) desc.type = WS_XML_STRING_TYPE; desc.typeDescription = NULL; hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &value2, sizeof(value2), 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected3, -1, strstr(expected3, "urn:uuid:") - expected3, 46, __LINE__ ); hr = WsRemoveCustomHeader( msg, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsRemoveCustomHeader( msg, &localname, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsRemoveCustomHeader( msg, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); /* again */ hr = WsRemoveCustomHeader( msg, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); } @@ -1038,53 +1038,53 @@ static void test_WsReadEnvelopeStart(void) HRESULT hr; hr = WsReadEnvelopeStart( NULL, NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEnvelopeStart( msg, NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEnvelopeStart( msg, reader, NULL, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, xml, strlen(xml) ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEnvelopeStart( msg2, reader, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg2, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_READING, "got %u\n", state ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); WsFreeMessage( msg ); @@ -1102,35 +1102,35 @@ static void test_WsReadEnvelopeEnd(void) HRESULT hr; hr = WsReadEnvelopeEnd( NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, xml, strlen(xml) ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEnvelopeEnd( msg2, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsReadEnvelopeStart( msg2, reader, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEnvelopeEnd( msg2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg2, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_DONE, "got %u\n", state ); WsFreeMessage( msg ); @@ -1159,34 +1159,34 @@ static void test_WsReadBody(void) HRESULT hr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadBody( NULL, NULL, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadBody( msg2, NULL, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, xml, strlen(xml) ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEnvelopeStart( msg2, reader, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadBody( msg2, NULL, WS_READ_REQUIRED_VALUE, heap, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -1210,16 +1210,16 @@ static void test_WsReadBody(void) memset( &test, 0, sizeof(test) ); hr = WsReadBody( msg2, &desc, WS_READ_REQUIRED_VALUE, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test.val == 1, "got %u\n", test.val ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg2, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_READING, "got %u\n", state ); hr = WsReadEnvelopeEnd( msg2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); WsFreeMessage( msg2 ); @@ -1236,39 +1236,39 @@ static void test_WsResetMessage(void) HRESULT hr; hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_EMPTY, "got %u\n", state ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_INITIALIZED, "got %u\n", state ); hr = WsResetMessage( msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_MESSAGE_STATE_EMPTY, "got %u\n", state ); env_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_1, "got %u\n", env_version ); addr_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, sizeof(addr_version), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( addr_version == WS_ADDRESSING_VERSION_0_9, "got %u\n", addr_version ); WsFreeMessage( msg ); @@ -1295,83 +1295,83 @@ static void test_WsGetHeader(void) HRESULT hr; hr = WsGetHeader( NULL, 0, 0, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetHeader( msg, 0, 0, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetHeader( msg, 0, 0, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetHeader( msg, WS_ACTION_HEADER, 0, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_NILLABLE_POINTER, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, NULL, 0, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); ptr = L"action"; hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); ptr = NULL; hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, &ptr, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); ptr = NULL; hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, &ptr, sizeof(ptr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ptr != NULL, "ptr not set\n" ); ok( !memcmp( ptr, L"action", sizeof(L"action") ), "wrong data\n" ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ptr = L"action"; hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr == S_OK) check_output_header( msg, expected2, -1, 0, 0, __LINE__ ); ptr = NULL; hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, &ptr, sizeof(ptr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ptr != NULL, "ptr not set\n" ); ok( !memcmp( ptr, L"action", sizeof(L"action") ), "wrong data\n" ); WsFreeMessage( msg ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ptr = L"action"; hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr == S_OK) check_output_header( msg, expected3, -1, 0, 0, __LINE__ ); ptr = NULL; hr = WsGetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_READ_REQUIRED_POINTER, NULL, &ptr, sizeof(ptr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ptr != NULL, "ptr not set\n" ); ok( !memcmp( ptr, L"action", sizeof(L"action") ), "wrong data\n" ); WsFreeMessage( msg ); @@ -1393,16 +1393,16 @@ static void test_WsGetCustomHeader(void) } test; hr = WsGetCustomHeader( NULL, NULL, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetCustomHeader( msg, NULL, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_TEXT_FIELD_MAPPING; @@ -1422,22 +1422,22 @@ static void test_WsGetCustomHeader(void) test.value = L"value"; hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_header( msg, expected, -1, 0, 0, __LINE__ ); hr = WsGetCustomHeader( msg, &desc, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 1, 0, NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 0, WS_READ_REQUIRED_VALUE, NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); memset( &test, 0, sizeof(test) ); hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 0, WS_READ_REQUIRED_VALUE, NULL, &test, sizeof(test), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test.value != NULL, "value not set\n" ); ok( !memcmp( test.value, L"value", sizeof(L"value") ), "wrong value\n" ); WsFreeMessage( msg ); diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index e2c6c87b830..9d6292be4c9 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -99,22 +99,22 @@ static void test_WsCreateServiceProxy(void) hr = WsCreateServiceProxy( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, NULL, 0, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); proxy = NULL; hr = WsCreateServiceProxy( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, NULL, 0, NULL, 0, &proxy, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( proxy != NULL, "proxy not set\n" ); /* write-only property */ value = 0xdeadbeef; hr = WsGetServiceProxyProperty( proxy, WS_PROXY_PROPERTY_CALL_TIMEOUT, &value, sizeof(value), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetServiceProxyProperty( proxy, WS_PROXY_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_SERVICE_PROXY_STATE_CREATED, "got %u\n", state ); WsFreeServiceProxy( proxy ); @@ -128,17 +128,17 @@ static void test_WsCreateServiceProxyFromTemplate(void) hr = WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE_REQUEST, NULL, 0, WS_HTTP_BINDING_TEMPLATE_TYPE, NULL, 0, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE_REQUEST, NULL, 0, WS_HTTP_BINDING_TEMPLATE_TYPE, NULL, 0, NULL, 0, &proxy, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); memset( &policy, 0, sizeof(policy) ); proxy = NULL; hr = WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE_REQUEST, NULL, 0, WS_HTTP_BINDING_TEMPLATE_TYPE, NULL, 0, &policy, sizeof(policy), &proxy, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( proxy != NULL, "proxy not set\n" ); WsFreeServiceProxy( proxy ); @@ -155,30 +155,30 @@ static void test_WsOpenServiceProxy(void) memset( &policy, 0, sizeof(policy) ); hr = WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE_REQUEST, NULL, 0, WS_HTTP_BINDING_TEMPLATE_TYPE, NULL, 0, &policy, sizeof(policy), &proxy, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetServiceProxyProperty( proxy, WS_PROXY_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_SERVICE_PROXY_STATE_CREATED, "got %u\n", state ); memset( &addr, 0, sizeof(addr) ); addr.url.length = ARRAY_SIZE( L"http://localhost/" ) - 1; addr.url.chars = (WCHAR *)L"http://localhost/"; hr = WsOpenServiceProxy( proxy, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetServiceProxyProperty( proxy, WS_PROXY_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_SERVICE_PROXY_STATE_OPEN, "got %u\n", state ); hr = WsCloseServiceProxy( proxy , NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetServiceProxyProperty( proxy, WS_PROXY_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_SERVICE_PROXY_STATE_CLOSED, "got %u\n", state ); WsFreeServiceProxy( proxy ); @@ -193,34 +193,34 @@ static void test_WsResetServiceProxy(void) hr = WsCreateServiceProxy( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, NULL, 0, NULL, 0, &proxy, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetServiceProxy( proxy, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetServiceProxyProperty( proxy, WS_PROXY_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_SERVICE_PROXY_STATE_CREATED, "got %u\n", state ); memset( &addr, 0, sizeof(addr) ); addr.url.length = ARRAY_SIZE( L"http://localhost/" ) - 1; addr.url.chars = (WCHAR *)L"http://localhost/"; hr = WsOpenServiceProxy( proxy, &addr, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetServiceProxy( proxy, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCloseServiceProxy( proxy , NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetServiceProxy( proxy, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); state = 0xdeadbeef; hr = WsGetServiceProxyProperty( proxy, WS_PROXY_PROPERTY_STATE, &state, sizeof(state), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( state == WS_SERVICE_PROXY_STATE_CREATED, "got %u\n", state ); WsFreeServiceProxy( proxy ); @@ -278,27 +278,27 @@ static void test_WsSendMessage( int port, WS_XML_STRING *action ) HRESULT hr; hr = create_channel( port, &channel ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); set_elem_desc( &body, &req, &ns, WS_INT32_TYPE, NULL ); set_msg_desc( &desc, action, &body ); hr = WsSendMessage( NULL, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsSendMessage( channel, NULL, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsSendMessage( channel, msg, NULL, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeChannel( channel ); WsFreeMessage( msg ); @@ -316,42 +316,42 @@ static void test_WsReceiveMessage( int port ) HRESULT hr; hr = create_channel( port, &channel ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); set_elem_desc( &body, &req, &ns, WS_INT32_TYPE, NULL ); set_msg_desc( &desc_req, &req, &body ); hr = WsSendMessage( channel, msg, &desc_req, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeMessage( msg ); hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); set_elem_desc( &body, &resp, &ns, WS_INT32_TYPE, NULL ); set_msg_desc( &desc_resp, &resp, &body ); desc[0] = &desc_resp; hr = WsReceiveMessage( NULL, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReceiveMessage( channel, NULL, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReceiveMessage( channel, msg, NULL, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val == -2, "got %d\n", val ); hr = WsCloseChannel( channel, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeChannel( channel ); WsFreeMessage( msg ); @@ -438,20 +438,20 @@ static void check_output_headers( WS_MESSAGE *msg ) HRESULT hr; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_HEADER_BUFFER, &buf, sizeof(buf), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlBuffer( writer, buf, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &bytes, 0, sizeof(bytes) ); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, sizeof(bytes), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeWriter( writer ); } @@ -471,7 +471,7 @@ static HRESULT CALLBACK send_callback( WS_MESSAGE *msg, WS_HEAP *heap, void *sta HRESULT hr; hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_headers( msg ); return S_OK; } @@ -485,7 +485,7 @@ static HRESULT CALLBACK recv_callback( WS_MESSAGE *msg, WS_HEAP *heap, void *sta check_output_headers( msg ); hr = WsGetMappedHeader( msg, &header, WS_SINGLETON_HEADER, 0, WS_WSZ_TYPE, WS_READ_OPTIONAL_POINTER, heap, &str, sizeof(str), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !wcscmp(str, L"value"), "wrong value %s\n", wine_dbgstr_w(str) ); return S_OK; } @@ -532,16 +532,16 @@ static void test_WsCall( int port ) } out; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCall( NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = create_proxy( port, &proxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCall( proxy, NULL, NULL, NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); set_field_desc( &f, WS_ELEMENT_FIELD_MAPPING, &val, &ns, WS_INT32_TYPE, NULL, 0, 0, 0, NULL, NULL ); set_field_desc( &f4, WS_REPEATING_ELEMENT_FIELD_MAPPING, NULL, NULL, WS_WSZ_TYPE, NULL, @@ -573,7 +573,7 @@ static void test_WsCall( int port ) set_op_desc( &op, &input_msg, &output_msg, 6, param ); hr = WsCall( proxy, &op, NULL, NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); in.val = 1; str_array[0] = L"test"; @@ -611,14 +611,14 @@ static void test_WsCall( int port ) prop[1].valueSize = sizeof(ctx_recv); hr = WsCall( proxy, &op, args, heap, prop, ARRAY_SIZE(prop), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !wcscmp( out.str, L"test" ), "wrong data\n" ); - ok( out.count == 2, "got %u\n", out.count ); + ok( out.count == 2, "got %lu\n", out.count ); ok( out.val[0] == 1, "got %u\n", out.val[0] ); ok( out.val[1] == 2, "got %u\n", out.val[1] ); hr = WsCloseServiceProxy( proxy, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeServiceProxy( proxy ); WsFreeHeap( heap ); @@ -659,10 +659,10 @@ static void test_empty_response( int port ) } in; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = create_proxy( port, &proxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); set_field_desc( &f, WS_ELEMENT_FIELD_MAPPING, &val, &ns, WS_INT32_TYPE, NULL, 0, 0, 0, NULL, NULL ); fields[0] = &f; @@ -681,14 +681,14 @@ static void test_empty_response( int port ) in.val = 1; args[0] = &in.val; hr = WsCall( proxy, &op, args, heap, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); set_elem_desc( &output_elem, &resp_elem, &ns, WS_STRUCT_TYPE, &output_struct ); hr = WsCall( proxy, &op, args, heap, NULL, 0, NULL, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = WsCloseServiceProxy( proxy, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeServiceProxy( proxy ); WsFreeHeap( heap ); @@ -829,10 +829,10 @@ START_TEST(proxy) info.port = 7533; info.event = CreateEventW( NULL, 0, 0, NULL ); thread = CreateThread( NULL, 0, server_proc, &info, 0, NULL ); - ok( thread != NULL, "failed to create server thread %u\n", GetLastError() ); + ok( thread != NULL, "failed to create server thread %lu\n", GetLastError() ); ret = WaitForSingleObject( info.event, 3000 ); - ok(ret == WAIT_OBJECT_0, "failed to start test server %u\n", GetLastError()); + ok(ret == WAIT_OBJECT_0, "failed to start test server %lu\n", GetLastError()); if (ret != WAIT_OBJECT_0) { CloseHandle(thread); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7ecb77fe6cd..eacde56928d 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -76,50 +76,50 @@ static void test_WsCreateError(void) LANGID langid; hr = WsCreateError( NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); error = NULL; hr = WsCreateError( NULL, 0, &error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( error != NULL, "error not set\n" ); count = 0xdeadbeef; size = sizeof(count); hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_STRING_COUNT, &count, size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); hr = WsSetErrorProperty( error, WS_ERROR_PROPERTY_STRING_COUNT, &count, size ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); code = 0xdeadbeef; size = sizeof(code); hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !code, "got %u\n", code ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !code, "got %lu\n", code ); code = 0xdeadbeef; hr = WsSetErrorProperty( error, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, size ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( code == 0xdeadbeef, "got %u\n", code ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( code == 0xdeadbeef, "got %lu\n", code ); langid = 0xdead; size = sizeof(langid); hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_LANGID, &langid, size ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( langid == GetUserDefaultUILanguage(), "got %u\n", langid ); langid = MAKELANGID( LANG_DUTCH, SUBLANG_DEFAULT ); hr = WsSetErrorProperty( error, WS_ERROR_PROPERTY_LANGID, &langid, size ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); count = 0xdeadbeef; size = sizeof(count); hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_LANGID + 1, &count, size ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - ok( count == 0xdeadbeef, "got %u\n", count ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); + ok( count == 0xdeadbeef, "got %lu\n", count ); WsFreeError( error ); count = 1; @@ -127,26 +127,26 @@ static void test_WsCreateError(void) prop.value = &count; prop.valueSize = sizeof(count); hr = WsCreateError( &prop, 1, &error ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); code = 0xdeadbeef; prop.id = WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE; prop.value = &code; prop.valueSize = sizeof(code); hr = WsCreateError( &prop, 1, &error ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); langid = MAKELANGID( LANG_DUTCH, SUBLANG_DEFAULT ); prop.id = WS_ERROR_PROPERTY_LANGID; prop.value = &langid; prop.valueSize = sizeof(langid); hr = WsCreateError( &prop, 1, &error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); langid = 0xdead; size = sizeof(langid); hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_LANGID, &langid, size ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( langid == MAKELANGID( LANG_DUTCH, SUBLANG_DEFAULT ), "got %u\n", langid ); WsFreeError( error ); @@ -155,7 +155,7 @@ static void test_WsCreateError(void) prop.value = &count; prop.valueSize = sizeof(count); hr = WsCreateError( &prop, 1, &error ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); } static void test_WsCreateHeap(void) @@ -167,55 +167,55 @@ static void test_WsCreateHeap(void) ULONG size; hr = WsCreateHeap( 0, 0, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); heap = NULL; hr = WsCreateHeap( 0, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( heap != NULL, "heap not set\n" ); WsFreeHeap( heap ); hr = WsCreateHeap( 1 << 16, 1 << 6, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); heap = NULL; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( heap != NULL, "heap not set\n" ); WsFreeHeap( heap ); hr = WsCreateHeap( 1 << 16, 1 << 6, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); max = 0xdeadbeef; size = sizeof(max); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_MAX_SIZE, &max, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max == 1 << 16, "got %u\n", (ULONG)max ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max == 1 << 16, "got %Iu\n", max ); trim = 0xdeadbeef; size = sizeof(trim); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_TRIM_SIZE, &trim, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( trim == 1 << 6, "got %u\n", (ULONG)trim ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( trim == 1 << 6, "got %Iu\n", trim ); requested = 0xdeadbeef; size = sizeof(requested); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !requested, "got %u\n", (ULONG)requested ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !requested, "got %Iu\n", requested ); actual = 0xdeadbeef; size = sizeof(actual); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !actual, "got %u\n", (ULONG)actual ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !actual, "got %Iu\n", actual ); actual = 0xdeadbeef; size = sizeof(actual); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE + 1, &actual, size, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); - ok( actual == 0xdeadbeef, "got %u\n", (ULONG)actual ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); + ok( actual == 0xdeadbeef, "got %Iu\n", actual ); WsFreeHeap( heap ); max = 1 << 16; @@ -223,10 +223,10 @@ static void test_WsCreateHeap(void) prop.value = &max; prop.valueSize = sizeof(max); hr = WsCreateHeap( 1 << 16, 1 << 6, &prop, 1, &heap, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 1 << 6, NULL, 1, &heap, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); } static HRESULT set_input( WS_XML_READER *reader, const char *data, ULONG size ) @@ -251,81 +251,81 @@ static void test_WsCreateReader(void) WS_CHARSET charset; hr = WsCreateReader( NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); reader = NULL; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( reader != NULL, "reader not set\n" ); /* can't retrieve properties before input is set */ max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); ok( max_depth == 0xdeadbeef, "max_depth set\n" ); hr = set_input( reader, data1, sizeof(data1) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* check some defaults */ max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_depth == 32, "got %u\n", max_depth ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_depth == 32, "got %lu\n", max_depth ); allow_fragment = TRUE; size = sizeof(allow_fragment); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_ALLOW_FRAGMENT, &allow_fragment, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !allow_fragment, "got %d\n", allow_fragment ); max_attrs = 0xdeadbeef; size = sizeof(max_attrs); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_ATTRIBUTES, &max_attrs, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_attrs == 128, "got %u\n", max_attrs ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_attrs == 128, "got %lu\n", max_attrs ); read_decl = FALSE; size = sizeof(read_decl); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_READ_DECLARATION, &read_decl, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( read_decl, "got %u\n", read_decl ); charset = 0xdeadbeef; size = sizeof(charset); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); size = sizeof(trim_size); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_UTF8_TRIM_SIZE, &trim_size, size, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + todo_wine ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeReader( reader ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, data1, sizeof(data1) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); size = sizeof(buffer_size); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_STREAM_BUFFER_SIZE, &buffer_size, size, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + todo_wine ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeReader( reader ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, data1, sizeof(data1) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); max_ns = 0xdeadbeef; size = sizeof(max_ns); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_NAMESPACES, &max_ns, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_ns == 32, "got %u\n", max_ns ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_ns == 32, "got %lu\n", max_ns ); WsFreeReader( reader ); /* change a property */ @@ -334,16 +334,16 @@ static void test_WsCreateReader(void) prop.value = &max_depth; prop.valueSize = sizeof(max_depth); hr = WsCreateReader( &prop, 1, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, data1, sizeof(data1) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_depth == 16, "got %u\n", max_depth ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_depth == 16, "got %lu\n", max_depth ); WsFreeReader( reader ); /* show that some properties are read-only */ @@ -352,21 +352,21 @@ static void test_WsCreateReader(void) prop.value = &row; prop.valueSize = sizeof(row); hr = WsCreateReader( &prop, 1, &reader, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); column = 1; prop.id = WS_XML_READER_PROPERTY_COLUMN; prop.value = &column; prop.valueSize = sizeof(column); hr = WsCreateReader( &prop, 1, &reader, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); in_attr = TRUE; prop.id = WS_XML_READER_PROPERTY_IN_ATTRIBUTE; prop.value = &in_attr; prop.valueSize = sizeof(in_attr); hr = WsCreateReader( &prop, 1, &reader, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); } static void test_WsSetInput(void) @@ -444,14 +444,14 @@ static void test_WsSetInput(void) }; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetInput( NULL, NULL, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node != NULL, "node not set\n" ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); @@ -463,17 +463,17 @@ static void test_WsSetInput(void) input.encodedDataSize = sizeof(data1) - 1; hr = WsSetInput( reader, &enc.encoding, &input.input, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node != NULL, "node not set\n" ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); /* multiple calls are allowed */ hr = WsSetInput( reader, &enc.encoding, &input.input, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* charset is detected by WsSetInput */ enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; @@ -484,16 +484,16 @@ static void test_WsSetInput(void) input.encodedData = tests[i].data; input.encodedDataSize = tests[i].size; hr = WsSetInput( reader, &enc.encoding, &input.input, NULL, 0, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); charset = 0xdeadbeef; size = sizeof(charset); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); todo_wine_if (tests[i].todo) { - ok( hr == tests[i].hr, "%u: got %08x expected %08x\n", i, hr, tests[i].hr ); + ok( hr == tests[i].hr, "%lu: got %#lx expected %#lx\n", i, hr, tests[i].hr ); if (hr == S_OK) - ok( charset == tests[i].charset, "%u: got %u expected %u\n", i, charset, tests[i].charset ); + ok( charset == tests[i].charset, "%lu: got %u expected %u\n", i, charset, tests[i].charset ); } } @@ -506,13 +506,13 @@ static void test_WsSetInput(void) prop.value = &max_depth; prop.valueSize = sizeof(max_depth); hr = WsSetInput( reader, &enc.encoding, &input.input, &prop, 1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_depth == 16, "got %u\n", max_depth ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_depth == 16, "got %lu\n", max_depth ); /* show that the reader converts text to UTF-8 */ enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; @@ -520,26 +520,26 @@ static void test_WsSetInput(void) input.encodedData = (void *)test24; input.encodedDataSize = sizeof(test24); hr = WsSetInput( reader, &enc.encoding, &input.input, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr == S_OK) { ok( found == TRUE, "got %d\n", found ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); ok( text->text != NULL, "text not set\n" ); utf8 = (WS_XML_UTF8_TEXT *)text->text; ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); - ok( utf8->value.length == 1, "got %u\n", utf8->value.length ); + ok( utf8->value.length == 1, "got %lu\n", utf8->value.length ); ok( utf8->value.bytes[0] == 'b', "wrong data\n" ); } WsFreeReader( reader ); @@ -556,38 +556,38 @@ static void test_WsSetInputToBuffer(void) ULONG size, max_depth; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetInputToBuffer( NULL, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsSetInputToBuffer( reader, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node != NULL, "node not set\n" ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node != NULL, "node not set\n" ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); /* multiple calls are allowed */ hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* reader properties can be set with WsSetInputToBuffer */ max_depth = 16; @@ -595,13 +595,13 @@ static void test_WsSetInputToBuffer(void) prop.value = &max_depth; prop.valueSize = sizeof(max_depth); hr = WsSetInputToBuffer( reader, buffer, &prop, 1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_depth == 16, "got %u\n", max_depth ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_depth == 16, "got %lu\n", max_depth ); WsFreeReader( reader ); WsFreeHeap( heap ); @@ -615,66 +615,66 @@ static void test_WsFillReader(void) /* what happens of we don't call WsFillReader? */ hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = set_input( reader, data1, sizeof(data1) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); WsFreeReader( reader ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, data1, sizeof(data1) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data1) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, data1, sizeof(data1) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node != NULL, "node not set\n" ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); hr = WsFillReader( NULL, sizeof(data1) - 1, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data1) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node != NULL, "node not set\n" ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); hr = WsFillReader( reader, sizeof(data1) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* min_size larger than input size */ hr = WsFillReader( reader, sizeof(data1), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeReader( reader ); } @@ -686,50 +686,50 @@ static void test_WsReadToStartElement(void) int found; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, data1, sizeof(data1) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data1) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); hr = WsFillReader( reader, sizeof(data1) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( NULL, NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == FALSE, "got %d\n", found ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = set_input( reader, data2, sizeof(data2) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data2) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; @@ -738,47 +738,47 @@ static void test_WsReadToStartElement(void) ok( elem->prefix != NULL, "prefix not set\n" ); if (elem->prefix) { - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); } ok( elem->localName != NULL, "localName not set\n" ); if (elem->localName) { - ok( elem->localName->length == 4, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 4, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "text", 4 ), "wrong data\n" ); } ok( elem->ns != NULL, "ns not set\n" ); if (elem->ns) { - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); } - ok( !elem->attributeCount, "got %u\n", elem->attributeCount ); + ok( !elem->attributeCount, "got %lu\n", elem->attributeCount ); ok( elem->attributes == NULL, "attributes set\n" ); ok( !elem->isEmpty, "isEmpty not zero\n" ); } found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); node2 = NULL; hr = WsGetReaderNode( reader, &node2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node2 == node, "different node\n" ); hr = set_input( reader, data3, sizeof(data3) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data3) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; @@ -787,20 +787,20 @@ static void test_WsReadToStartElement(void) ok( elem->localName != NULL, "localName not set\n" ); if (elem->localName) { - ok( elem->localName->length == 4, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 4, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "text", 4 ), "wrong data\n" ); } } hr = set_input( reader, data4, sizeof(data4) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data4) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); WsFreeReader( reader ); } @@ -813,31 +813,31 @@ static void test_WsReadStartElement(void) int found; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, data2, sizeof(data2) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data2) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); hr = WsReadStartElement( NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_TEXT_NODE *text = (WS_XML_TEXT_NODE *)node; @@ -847,36 +847,36 @@ static void test_WsReadStartElement(void) { WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text->text; ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); - ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( utf8->value.length == 4, "got %lu\n", utf8->value.length ); ok( !memcmp( utf8->value.bytes, "test", 4 ), "wrong data\n" ); } } hr = WsReadStartElement( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); node2 = NULL; hr = WsGetReaderNode( reader, &node2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node2 == node, "different node\n" ); hr = set_input( reader, data8, sizeof(data8) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data8) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; @@ -885,10 +885,10 @@ static void test_WsReadStartElement(void) } hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; @@ -897,46 +897,46 @@ static void test_WsReadStartElement(void) } hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* WsReadEndElement advances reader to EOF */ hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, data3, sizeof(data3) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_TEXT_NODE *text = (WS_XML_TEXT_NODE *)node; @@ -946,20 +946,20 @@ static void test_WsReadStartElement(void) { WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text->text; ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); - ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( utf8->value.length == 4, "got %lu\n", utf8->value.length ); ok( !memcmp( utf8->value.bytes, "test", 4 ), "wrong data\n" ); } } hr = set_input( reader, " <text>test</text>", sizeof(" <text>test</text>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_TEXT_NODE *text = (WS_XML_TEXT_NODE *)node; @@ -969,7 +969,7 @@ static void test_WsReadStartElement(void) { WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text->text; ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); - ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( utf8->value.length == 4, "got %lu\n", utf8->value.length ); ok( !memcmp( utf8->value.bytes, "test", 4 ), "wrong data\n" ); } } @@ -985,181 +985,181 @@ static void test_WsReadEndElement(void) int found; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, data2, sizeof(data2) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data2) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEndElement( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, data2, sizeof(data2) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data2) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = set_input( reader, data2, sizeof(data2) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data2) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* WsReadEndElement advances reader to EOF */ hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, data5, sizeof(data5) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data5) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEndElement( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, data10, sizeof(data10) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data10) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, "<a></A>", sizeof("<a></A>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof("<a></a>") - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, "<a></a>", sizeof("<a></a>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof("<a></a>") - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = set_input( reader, "<a/>", sizeof("<a/>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof("<a/>") - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeReader( reader ); } @@ -1218,24 +1218,24 @@ static void test_WsReadNode(void) }; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_input( reader, tests[i].text, strlen(tests[i].text) ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, strlen(tests[i].text), NULL, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%u: got %#lx\n", i, hr ); hr = WsReadNode( reader, NULL ); todo_wine_if (tests[i].todo) - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr, "%u: got %#lx\n", i, hr ); if (hr == S_OK) { node = NULL; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%u: got %#lx\n", i, hr ); ok( node != NULL, "%u: node not set\n", i ); if (node) { @@ -1246,18 +1246,18 @@ static void test_WsReadNode(void) } hr = set_input( reader, data6, sizeof(data6) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data6) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; @@ -1266,15 +1266,15 @@ static void test_WsReadNode(void) ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); ok( elem->prefix != NULL, "prefix not set\n" ); - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); ok( elem->prefix->bytes == NULL, "bytes set\n" ); ok( elem->localName != NULL, "localName not set\n" ); - ok( elem->localName->length == 4, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 4, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "text", 4 ), "wrong data\n" ); ok( elem->ns != NULL, "ns not set\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %lu\n", elem->attributeCount ); ok( elem->attributes != NULL, "attributes not set\n" ); ok( !elem->isEmpty, "isEmpty not zero\n" ); @@ -1282,74 +1282,74 @@ static void test_WsReadNode(void) ok( !attr->singleQuote, "got %u\n", attr->singleQuote ); ok( !attr->isXmlNs, "got %u\n", attr->isXmlNs ); ok( attr->prefix != NULL, "prefix not set\n" ); - ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( !attr->prefix->length, "got %lu\n", attr->prefix->length ); ok( attr->prefix->bytes == NULL, "bytes set\n" ); ok( attr->localName != NULL, "localName not set\n" ); - ok( attr->localName->length == 4, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 4, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "attr", 4 ), "wrong data\n" ); ok( attr->ns != NULL, "ns not set\n" ); - ok( !attr->ns->length, "got %u\n", attr->ns->length ); + ok( !attr->ns->length, "got %lu\n", attr->ns->length ); ok( attr->ns->bytes == NULL, "bytes set\n" ); ok( attr->value != NULL, "value not set\n" ); text = (WS_XML_UTF8_TEXT *)attr->value; ok( attr->value->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", attr->value->textType ); - ok( text->value.length == 5, "got %u\n", text->value.length ); + ok( text->value.length == 5, "got %lu\n", text->value.length ); ok( !memcmp( text->value.bytes, "value", 5 ), "wrong data\n" ); attr = elem->attributes[1]; ok( attr->singleQuote == 1, "got %u\n", attr->singleQuote ); ok( !attr->isXmlNs, "got %u\n", attr->isXmlNs ); ok( attr->prefix != NULL, "prefix not set\n" ); - ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( !attr->prefix->length, "got %lu\n", attr->prefix->length ); ok( attr->prefix->bytes == NULL, "bytes set\n" ); ok( attr->localName != NULL, "localName not set\n" ); - ok( attr->localName->length == 5, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 5, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "attr2", 5 ), "wrong data\n" ); ok( attr->ns != NULL, "ns not set\n" ); - ok( !attr->ns->length, "got %u\n", attr->ns->length ); + ok( !attr->ns->length, "got %lu\n", attr->ns->length ); ok( attr->ns->bytes == NULL, "bytes set\n" ); ok( attr->value != NULL, "value not set\n" ); text = (WS_XML_UTF8_TEXT *)attr->value; ok( attr->value->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", attr->value->textType ); - ok( text->value.length == 6, "got %u\n", text->value.length ); + ok( text->value.length == 6, "got %lu\n", text->value.length ); ok( !memcmp( text->value.bytes, "value2", 6 ), "wrong data\n" ); } hr = set_input( reader, data7, sizeof(data7) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data7) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_COMMENT_NODE *comment = (WS_XML_COMMENT_NODE *)node; ok( comment->node.nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", comment->node.nodeType ); - ok( comment->value.length == 9, "got %u\n", comment->value.length ); + ok( comment->value.length == 9, "got %lu\n", comment->value.length ); ok( !memcmp( comment->value.bytes, " comment ", 9 ), "wrong data\n" ); } dict = (WS_XML_DICTIONARY *)0xdeadbeef; hr = WsGetDictionary( WS_ENCODING_XML_UTF8, &dict, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( dict == NULL, "got %p\n", dict ); dict = NULL; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( dict != NULL, "dict not set\n" ); dict = NULL; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_SESSION_1, &dict, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( dict != NULL, "dict not set\n" ); WsFreeReader( reader ); @@ -1360,13 +1360,13 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si HRESULT hr; hr = set_input( reader, data, size ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); } static void test_WsReadType(void) @@ -1398,32 +1398,32 @@ static void test_WsReadType(void) WS_XML_QNAME val_qname, *ptr_qname; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); prepare_type_test( reader, data2, sizeof(data2) - 1 ); hr = WsReadType( NULL, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &val_str, sizeof(val_str), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &val_str, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, NULL, sizeof(val_str), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &val_str, sizeof(val_str) + 1, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); val_str = NULL; hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &val_str, sizeof(val_str), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_str != NULL, "pointer not set\n" ); if (val_str) ok( !wcscmp( val_str, L"test" ), "wrong data\n" ); @@ -1431,261 +1431,261 @@ static void test_WsReadType(void) prepare_type_test( reader, "<t>true</t>", sizeof("<t>true</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BOOL_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bool, sizeof(BOOL), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_bool == TRUE, "got %d\n", val_bool ); val_bool = -1; prepare_type_test( reader, "<t>false</t>", sizeof("<t>false</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BOOL_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bool, sizeof(BOOL), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_bool == FALSE, "got %d\n", val_bool ); val_bool = -1; prepare_type_test( reader, "<t>FALSE</t>", sizeof("<t>FALSE</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BOOL_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bool, sizeof(val_bool), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); ok( val_bool == -1, "got %d\n", val_bool ); val_bool = -1; prepare_type_test( reader, "<t>1</t>", sizeof("<t>1</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BOOL_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bool, sizeof(val_bool), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_bool == TRUE, "got %d\n", val_bool ); val_bool = -1; prepare_type_test( reader, "<t>2</t>", sizeof("<t>2</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BOOL_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bool, sizeof(val_bool), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); ok( val_bool == -1, "got %d\n", val_bool ); val_bool = -1; prepare_type_test( reader, "<t>0</t>", sizeof("<t>0</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BOOL_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bool, sizeof(val_bool), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_bool == FALSE, "got %d\n", val_bool ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BOOL_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bool, sizeof(val_bool), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BOOL_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_bool, sizeof(ptr_bool), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_int8 = 0; prepare_type_test( reader, "<t>-128</t>", sizeof("<t>-128</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int8, sizeof(val_int8), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_int8 == -128, "got %d\n", val_int8 ); prepare_type_test( reader, "<t> </t>", sizeof("<t> </t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int8, sizeof(val_int8), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int8, sizeof(val_int8), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t>-</t>", sizeof("<t>-</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int8, sizeof(val_int8), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_int8 = -1; prepare_type_test( reader, "<t>-0</t>", sizeof("<t>-0</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int8, sizeof(val_int8), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !val_int8, "got %d\n", val_int8 ); prepare_type_test( reader, "<t>-129</t>", sizeof("<t>-129</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int8, sizeof(val_int8), NULL ); - ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT8_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_int8, sizeof(ptr_int8), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_int16 = 0; prepare_type_test( reader, "<t>-32768</t>", sizeof("<t>-32768</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT16_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int16, sizeof(val_int16), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_int16 == -32768, "got %d\n", val_int16 ); prepare_type_test( reader, "<t>-32769</t>", sizeof("<t>-32769</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT16_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int16, sizeof(val_int16), NULL ); - ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT16_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int16, sizeof(val_int16), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT16_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_int16, sizeof(ptr_int16), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_int32 = 0; prepare_type_test( reader, "<t>-2147483648</t>", sizeof("<t>-2147483648</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT32_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int32, sizeof(val_int32), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_int32 == -2147483647 - 1, "got %d\n", val_int32 ); prepare_type_test( reader, "<t>-2147483649</t>", sizeof("<t>-2147483649</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT32_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int32, sizeof(val_int32), NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT32_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int32, sizeof(val_int32), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT32_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_int32, sizeof(ptr_int32), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_int64 = 0; prepare_type_test( reader, "<t>-9223372036854775808</t>", sizeof("<t>-9223372036854775808</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT64_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int64, sizeof(val_int64), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_int64 == -9223372036854775807 - 1, "wrong value\n" ); prepare_type_test( reader, "<t>-9223372036854775809</t>", sizeof("<t>-9223372036854775809</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT64_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int64, sizeof(val_int64), NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT64_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_int64, sizeof(val_int64), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_INT64_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_int64, sizeof(ptr_int64), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_uint8 = 0; prepare_type_test( reader, "<t> 255 </t>", sizeof("<t> 255 </t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint8, sizeof(val_uint8), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_uint8 == 255, "got %u\n", val_uint8 ); prepare_type_test( reader, "<t>+255</t>", sizeof("<t>+255</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint8, sizeof(val_uint8), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t>-255</t>", sizeof("<t>-255</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint8, sizeof(val_uint8), NULL ); - todo_wine ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); prepare_type_test( reader, "<t>0xff</t>", sizeof("<t>0xff</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint8, sizeof(val_uint8), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t>256</t>", sizeof("<t>256</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint8, sizeof(val_uint8), NULL ); - ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT8_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint8, sizeof(val_uint8), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT8_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_uint8, sizeof(ptr_uint8), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_uint16 = 0; prepare_type_test( reader, "<t>65535</t>", sizeof("<t>65535</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT16_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint16, sizeof(val_uint16), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_uint16 == 65535, "got %u\n", val_uint16 ); prepare_type_test( reader, "<t>65536</t>", sizeof("<t>65536</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT16_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint16, sizeof(val_uint16), NULL ); - ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT16_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint16, sizeof(val_uint16), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT16_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_uint16, sizeof(ptr_uint16), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_uint32 = 0; prepare_type_test( reader, "<t>4294967295</t>", sizeof("<t>4294967295</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT32_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint32, sizeof(val_uint32), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_uint32 == ~0, "got %u\n", val_uint32 ); prepare_type_test( reader, "<t>4294967296</t>", sizeof("<t>4294967296</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT32_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint32, sizeof(val_uint32), NULL ); - ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT32_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint32, sizeof(val_uint32), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT32_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_uint32, sizeof(ptr_uint32), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_uint64 = 0; prepare_type_test( reader, "<t>18446744073709551615</t>", sizeof("<t>18446744073709551615</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT64_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint64, sizeof(val_uint64), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_uint64 == ~0, "wrong value\n" ); prepare_type_test( reader, "<t>18446744073709551616</t>", sizeof("<t>18446744073709551616</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT64_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint64, sizeof(val_uint64), NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT64_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_uint64, sizeof(val_uint64), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UINT64_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_uint64, sizeof(ptr_uint64), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); enum_desc.values = enum_values; enum_desc.valueCount = ARRAY_SIZE( enum_values ); @@ -1696,31 +1696,31 @@ static void test_WsReadType(void) prepare_type_test( reader, "<t>ONE</t>", sizeof("<t>ONE</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, WS_READ_REQUIRED_VALUE, heap, &val_enum, sizeof(val_enum), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_enum == 1, "got %d\n", val_enum ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, WS_READ_REQUIRED_VALUE, heap, &val_enum, sizeof(val_enum), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, WS_READ_REQUIRED_POINTER, heap, &ptr_enum, sizeof(ptr_enum), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t>{00000000-0000-0000-0000-000000000000}</t>", sizeof("<t>{00000000-0000-0000-0000-000000000000}</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); memset( &val_guid, 0xff, sizeof(val_guid) ); prepare_type_test( reader, "<t> 00000000-0000-0000-0000-000000000000 </t>", sizeof("<t> 00000000-0000-0000-0000-000000000000 </t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( IsEqualGUID( &val_guid, &guid_null ), "wrong guid\n" ); memset( &val_guid, 0, sizeof(val_guid) ); @@ -1728,7 +1728,7 @@ static void test_WsReadType(void) sizeof("<t>00000000-0000-0000-0000-0000000000a1</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( IsEqualGUID( &val_guid, &guid ), "wrong guid\n" ); memset( &val_guid, 0, sizeof(val_guid) ); @@ -1736,61 +1736,61 @@ static void test_WsReadType(void) sizeof("<t>00000000-0000-0000-0000-0000000000A1</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( IsEqualGUID( &val_guid, &guid ), "wrong guid\n" ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_guid, sizeof(ptr_guid), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); memset( &val_bytes, 0, sizeof(val_bytes) ); prepare_type_test( reader, "<t>dGVzdA==</t>", sizeof("<t>dGVzdA==</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BYTES_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bytes, sizeof(val_bytes), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( val_bytes.length == 4, "got %u\n", val_bytes.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( val_bytes.length == 4, "got %lu\n", val_bytes.length ); ok( !memcmp( val_bytes.bytes, "test", 4 ), "wrong data\n" ); memset( &val_bytes, 0, sizeof(val_bytes) ); prepare_type_test( reader, "<t> dGVzdA== </t>", sizeof("<t> dGVzdA== </t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BYTES_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bytes, sizeof(val_bytes), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( val_bytes.length == 4, "got %u\n", val_bytes.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( val_bytes.length == 4, "got %lu\n", val_bytes.length ); ok( !memcmp( val_bytes.bytes, "test", 4 ), "wrong data\n" ); prepare_type_test( reader, "<t>dGVzdA===</t>", sizeof("<t>dGVzdA===</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BYTES_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bytes, sizeof(val_bytes), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); val_bytes.length = 0xdeadbeef; val_bytes.bytes = (BYTE *)0xdeadbeef; prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BYTES_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_bytes, sizeof(val_bytes), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !val_bytes.length, "got %u\n", val_bytes.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !val_bytes.length, "got %lu\n", val_bytes.length ); todo_wine ok( val_bytes.bytes != NULL, "got %p\n", val_bytes.bytes ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_BYTES_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_bytes, sizeof(ptr_bytes), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !ptr_bytes->length, "got %u\n", ptr_bytes->length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !ptr_bytes->length, "got %lu\n", ptr_bytes->length ); todo_wine ok( ptr_bytes->bytes != NULL, "got %p\n", ptr_bytes->bytes ); val_str = NULL; prepare_type_test( reader, utf8, sizeof(utf8) ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &val_str, sizeof(val_str), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_str != NULL, "pointer not set\n" ); ok( !lstrcmpW( val_str, L"\x2019" ), "got %s\n", wine_dbgstr_w(val_str) ); @@ -1798,7 +1798,7 @@ static void test_WsReadType(void) prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &val_str, sizeof(val_str), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val_str != NULL, "got %p\n", val_str ); ok( !val_str[0], "got %s\n", wine_dbgstr_w(val_str) ); @@ -1806,8 +1806,8 @@ static void test_WsReadType(void) prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_XML_STRING_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_xmlstr, sizeof(val_xmlstr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( val_xmlstr.length == 6, "got %u\n", val_xmlstr.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( val_xmlstr.length == 6, "got %lu\n", val_xmlstr.length ); ok( !memcmp( val_xmlstr.bytes, " test ", 6 ), "wrong data\n" ); val_xmlstr.length = 0xdeadbeef; @@ -1815,22 +1815,22 @@ static void test_WsReadType(void) prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_XML_STRING_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_xmlstr, sizeof(val_xmlstr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !val_xmlstr.length, "got %u\n", val_bytes.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !val_xmlstr.length, "got %lu\n", val_bytes.length ); todo_wine ok( val_xmlstr.bytes != NULL, "got %p\n", val_bytes.bytes ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_XML_STRING_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_xmlstr, sizeof(ptr_xmlstr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !ptr_xmlstr->length, "got %u\n", ptr_bytes->length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !ptr_xmlstr->length, "got %lu\n", ptr_bytes->length ); todo_wine ok( ptr_xmlstr->bytes != NULL, "got %p\n", ptr_bytes->bytes ); memset( &val_string, 0, sizeof(val_string) ); prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRING_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_string, sizeof(val_string), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( val_string.length == 6, "got %u\n", val_string.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( val_string.length == 6, "got %lu\n", val_string.length ); ok( !memcmp( val_string.chars, L" test ", 12 ), "wrong data\n" ); val_string.length = 0xdeadbeef; @@ -1838,14 +1838,14 @@ static void test_WsReadType(void) prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRING_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_string, sizeof(val_string), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !val_string.length, "got %u\n", val_string.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !val_string.length, "got %lu\n", val_string.length ); todo_wine ok( val_string.chars != NULL, "got %p\n", val_string.chars ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRING_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_string, sizeof(ptr_string), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !ptr_string->length, "got %u\n", ptr_string->length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !ptr_string->length, "got %lu\n", ptr_string->length ); todo_wine ok( ptr_string->chars != NULL, "got %p\n", ptr_string->chars ); memset( &val_id, 0, sizeof(val_id) ); @@ -1853,8 +1853,8 @@ static void test_WsReadType(void) prepare_type_test( reader, "<t> test </t>", sizeof("<t> test </t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_id, sizeof(val_id), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( val_id.uri.length == 6, "got %u\n", val_string.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( val_id.uri.length == 6, "got %lu\n", val_string.length ); ok( !memcmp( val_id.uri.chars, L" test ", 12 ), "wrong data\n" ); ok( IsEqualGUID( &val_id.guid, &guid_null ), "wrong guid\n" ); @@ -1863,62 +1863,62 @@ static void test_WsReadType(void) sizeof("<t>urn:uuid:00000000-0000-0000-0000-0000000000a1</t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_id, sizeof(val_id), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !val_id.uri.length, "got %u\n", val_string.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !val_id.uri.length, "got %lu\n", val_string.length ); ok( val_id.uri.chars == NULL, "chars set %s\n", wine_dbgstr_wn(val_id.uri.chars, val_id.uri.length) ); ok( IsEqualGUID( &val_id.guid, &guid ), "wrong guid\n" ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_id, sizeof(val_id), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_type_test( reader, "<t></t>", sizeof("<t></t>") - 1 ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_id, sizeof(ptr_id), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); memset( &val_qname, 0, sizeof(val_qname) ); hr = set_input( reader, "<t>u</t>", sizeof("<t>u</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_XML_QNAME_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_qname, sizeof(val_qname), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( val_qname.localName.length == 1, "got %u\n", val_qname.localName.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( val_qname.localName.length == 1, "got %lu\n", val_qname.localName.length ); ok( val_qname.localName.bytes[0] == 'u', "wrong data\n" ); - ok( !val_qname.ns.length, "got %u\n", val_qname.ns.length ); + ok( !val_qname.ns.length, "got %lu\n", val_qname.ns.length ); ok( val_qname.ns.bytes != NULL, "bytes not set\n" ); memset( &val_qname, 0, sizeof(val_qname) ); hr = set_input( reader, "<p:t xmlns:p=\"ns\"> p:u </p:t>", sizeof("<p:t xmlns:p=\"ns\"> p:u </p:t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_XML_QNAME_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_qname, sizeof(val_qname), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( val_qname.localName.length == 1, "got %u\n", val_qname.localName.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( val_qname.localName.length == 1, "got %lu\n", val_qname.localName.length ); ok( val_qname.localName.bytes[0] == 'u', "wrong data\n" ); - ok( val_qname.ns.length == 2, "got %u\n", val_qname.ns.length ); + ok( val_qname.ns.length == 2, "got %lu\n", val_qname.ns.length ); ok( !memcmp( val_qname.ns.bytes, "ns", 2 ), "wrong data\n" ); hr = set_input( reader, "<t></t>", sizeof("<t></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_XML_QNAME_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_qname, sizeof(val_qname), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, "<t></t>", sizeof("<t></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_XML_QNAME_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &ptr_qname, sizeof(ptr_qname), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeReader( reader ); WsFreeHeap( heap ); @@ -1935,20 +1935,20 @@ static void test_WsGetXmlAttribute(void) int found; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, data9, sizeof(data9) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(data9) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); xmlstr.bytes = (BYTE *)"attr"; @@ -1958,9 +1958,9 @@ static void test_WsGetXmlAttribute(void) str = NULL; count = 0; hr = WsGetXmlAttribute( reader, &xmlstr, heap, &str, &count, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( hr == S_OK, "got %#lx\n", hr ); todo_wine ok( str != NULL, "str not set\n" ); - todo_wine ok( count == 5, "got %u\n", count ); + todo_wine ok( count == 5, "got %lu\n", count ); /* string is not null-terminated */ if (str) ok( !memcmp( str, L"value", count * sizeof(WCHAR) ), "wrong data\n" ); @@ -1971,9 +1971,9 @@ static void test_WsGetXmlAttribute(void) str = (WCHAR *)0xdeadbeef; count = 0xdeadbeef; hr = WsGetXmlAttribute( reader, &xmlstr, heap, &str, &count, NULL ); - todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); + todo_wine ok( hr == S_FALSE, "got %#lx\n", hr ); todo_wine ok( str == NULL, "str not set\n" ); - todo_wine ok( !count, "got %u\n", count ); + todo_wine ok( !count, "got %lu\n", count ); WsFreeReader( reader ); WsFreeHeap( heap ); @@ -1986,44 +1986,44 @@ static void test_WsXmlStringEquals(void) HRESULT hr; hr = WsXmlStringEquals( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsXmlStringEquals( &str1, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsXmlStringEquals( NULL, &str2, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsXmlStringEquals( &str1, &str2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); str1.length = 1; str1.bytes = (BYTE *)"a"; hr = WsXmlStringEquals( &str1, &str1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); str2.length = 1; str2.bytes = (BYTE *)"b"; hr = WsXmlStringEquals( &str1, &str2, NULL ); - ok( hr == S_FALSE, "got %08x\n", hr ); + ok( hr == S_FALSE, "got %#lx\n", hr ); str2.length = 1; str2.bytes = bom; hr = WsXmlStringEquals( &str1, &str2, NULL ); - ok( hr == S_FALSE, "got %08x\n", hr ); + ok( hr == S_FALSE, "got %#lx\n", hr ); str1.length = 3; hr = WsXmlStringEquals( &str1, &str2, NULL ); - ok( hr == S_FALSE, "got %08x\n", hr ); + ok( hr == S_FALSE, "got %#lx\n", hr ); str2.length = 3; hr = WsXmlStringEquals( &str1, &str2, NULL ); - ok( hr == S_FALSE, "got %08x\n", hr ); + ok( hr == S_FALSE, "got %#lx\n", hr ); str1.length = 3; str1.bytes = bom; hr = WsXmlStringEquals( &str1, &str2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); } static void test_WsAlloc(void) @@ -2035,34 +2035,34 @@ static void test_WsAlloc(void) ULONG size; hr = WsCreateHeap( 256, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ptr = (void *)0xdeadbeef; hr = WsAlloc( NULL, 16, &ptr, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); ok( ptr == (void *)0xdeadbeef, "ptr set\n" ); ptr = (void *)0xdeadbeef; hr = WsAlloc( heap, 512, &ptr, NULL ); - ok( hr == WS_E_QUOTA_EXCEEDED, "got %08x\n", hr ); + ok( hr == WS_E_QUOTA_EXCEEDED, "got %#lx\n", hr ); ok( ptr == (void *)0xdeadbeef, "ptr set\n" ); ptr = NULL; hr = WsAlloc( heap, 16, &ptr, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ptr != NULL, "ptr not set\n" ); requested = 0xdeadbeef; size = sizeof(requested); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( requested == 16, "got %u\n", (ULONG)requested ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( requested == 16, "got %Iu\n", requested ); actual = 0xdeadbeef; size = sizeof(actual); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( actual == 128, "got %u\n", (ULONG)actual ); + ok( hr == S_OK, "got %#lx\n", hr ); + todo_wine ok( actual == 128, "got %Iu\n", actual ); WsFreeHeap( heap ); } @@ -2080,236 +2080,236 @@ static void test_WsMoveReader(void) WS_XML_UTF8_TEXT utf8; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveReader( NULL, WS_MOVE_TO_EOF, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); /* reader must be set to an XML buffer */ hr = WsMoveReader( reader, WS_MOVE_TO_EOF, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_input( reader, data8, sizeof(data8) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveReader( reader, WS_MOVE_TO_EOF, NULL, NULL ); - todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); WsFreeReader( reader ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* <a></a> */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveReader( reader, WS_MOVE_TO_EOF, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* first element is child node of BOF node */ hr = WsMoveReader( reader, WS_MOVE_TO_BOF, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveReader( reader, WS_MOVE_TO_CHILD_NODE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "a", 1 ), "wrong data\n" ); hr = WsMoveReader( reader, WS_MOVE_TO_CHILD_NODE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "b", 1 ), "wrong data\n" ); hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* EOF node is last child of BOF node */ hr = WsMoveReader( reader, WS_MOVE_TO_BOF, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveReader( reader, WS_MOVE_TO_CHILD_NODE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "a", 1 ), "wrong data\n" ); hr = WsMoveReader( reader, WS_MOVE_TO_CHILD_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "b", 1 ), "wrong data\n" ); hr = WsMoveReader( reader, WS_MOVE_TO_END_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "b", 1 ), "wrong data\n" ); hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "a", 1 ), "wrong data\n" ); hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeWriter( writer ); WsFreeHeap( heap ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* <a>test</a> */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset(&utf8, 0, sizeof(utf8)); utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; utf8.value.bytes = (BYTE *)"test"; utf8.value.length = sizeof("test") - 1; hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveReader( reader, WS_MOVE_TO_CHILD_NODE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "b", 1 ), "wrong data\n" ); hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); WsFreeReader( reader ); @@ -2323,7 +2323,7 @@ static void prepare_struct_type_test( WS_XML_READER *reader, const char *data ) ULONG size = strlen( data ); hr = set_input( reader, data, size ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); } static void test_simple_struct_type(void) @@ -2340,18 +2340,18 @@ static void test_simple_struct_type(void) struct test { WCHAR *str; } *test; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<str>test</str>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, NULL, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); /* element field mapping */ @@ -2373,25 +2373,25 @@ static void test_simple_struct_type(void) prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str><str>test2</str>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str><str>test2</str>" ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); s.structOptions = WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT; prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str><str>test2</str>" ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); s.structOptions = 0; test = NULL; prepare_struct_type_test( reader, "<?xml version=\"1.0\" encoding=\"utf-8\"?><str>test</str>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); if (test) { @@ -2400,14 +2400,14 @@ static void test_simple_struct_type(void) } hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); test = NULL; prepare_struct_type_test( reader, "<str>test</str>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); if (test) { @@ -2416,14 +2416,14 @@ static void test_simple_struct_type(void) } hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); test = NULL; prepare_struct_type_test( reader, "<str>test</str>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); if (test) { @@ -2432,24 +2432,24 @@ static void test_simple_struct_type(void) } hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); prepare_struct_type_test( reader, "<str>test</str>" ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (const WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 3, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 3, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "str", 3 ), "wrong data\n" ); test = NULL; hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); if (test) { @@ -2458,7 +2458,7 @@ static void test_simple_struct_type(void) } hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); /* attribute field mapping */ @@ -2467,11 +2467,11 @@ static void test_simple_struct_type(void) test = NULL; prepare_struct_type_test( reader, "<test str=\"test\"/>" ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); if (test) { @@ -2480,7 +2480,7 @@ static void test_simple_struct_type(void) } hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); WsFreeReader( reader ); @@ -2495,33 +2495,33 @@ static void test_cdata(void) const WS_XML_NODE *node; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, test, sizeof(test) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof(test) - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_CDATA, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_TEXT_NODE *text = (WS_XML_TEXT_NODE *)node; @@ -2531,23 +2531,23 @@ static void test_cdata(void) { WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text->text; ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); - ok( utf8->value.length == 6, "got %u\n", utf8->value.length ); + ok( utf8->value.length == 6, "got %lu\n", utf8->value.length ); ok( !memcmp( utf8->value.bytes, "<data>", 6 ), "wrong data\n" ); } } hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_CDATA, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); WsFreeReader( reader ); @@ -2564,106 +2564,106 @@ static void test_WsFindAttribute(void) HRESULT hr; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, test, sizeof(test) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFindAttribute( reader, &localname, &ns, TRUE, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, test, sizeof(test) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFindAttribute( reader, &localname, NULL, TRUE, &index, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, test, sizeof(test) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFindAttribute( reader, NULL, &ns, TRUE, &index, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, test, sizeof(test) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); index = 0xdeadbeef; hr = WsFindAttribute( reader, &localname, &ns, TRUE, &index, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !index, "got %u\n", index ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !index, "got %lu\n", index ); index = 0xdeadbeef; hr = WsFindAttribute( reader, &localname2, &ns, TRUE, &index, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( index == 1, "got %u\n", index ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( index == 1, "got %lu\n", index ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); index = 0xdeadbeef; hr = WsFindAttribute( reader, &localname, &ns, TRUE, &index, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - ok( index == 0xdeadbeef, "got %u\n", index ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); + ok( index == 0xdeadbeef, "got %lu\n", index ); hr = set_input( reader, test, sizeof(test) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); index = 0xdeadbeef; hr = WsFindAttribute( reader, &localname3, &ns, TRUE, &index, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); - ok( index == 0xdeadbeef, "got %u\n", index ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); + ok( index == 0xdeadbeef, "got %lu\n", index ); hr = set_input( reader, test, sizeof(test) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); index = 0xdeadbeef; hr = WsFindAttribute( reader, &localname3, &ns, FALSE, &index, NULL ); - ok( hr == S_FALSE, "got %08x\n", hr ); - ok( index == ~0u, "got %u\n", index ); + ok( hr == S_FALSE, "got %#lx\n", hr ); + ok( index == ~0u, "got %lu\n", index ); hr = set_input( reader, test2, sizeof(test2) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); index = 0xdeadbeef; hr = WsFindAttribute( reader, &localname, &ns, TRUE, &index, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !index, "got %u\n", index ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !index, "got %lu\n", index ); hr = WsFindAttribute( reader, &localname2, &ns2, TRUE, &index, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFindAttribute( reader, &localname2, &ns, TRUE, &index, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, test2, sizeof(test2) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFindAttribute( reader, &localname, &ns2, TRUE, &index, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeReader( reader ); } @@ -2674,10 +2674,10 @@ static void prepare_namespace_test( WS_XML_READER *reader, const char *data ) ULONG size = strlen( data ); hr = set_input( reader, data, size ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); } static void test_WsGetNamespaceFromPrefix(void) @@ -2689,78 +2689,78 @@ static void test_WsGetNamespaceFromPrefix(void) HRESULT hr; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetNamespaceFromPrefix( NULL, NULL, FALSE, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetNamespaceFromPrefix( NULL, NULL, FALSE, &ns, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetNamespaceFromPrefix( NULL, &prefix, FALSE, &ns, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); ns = (const WS_XML_STRING *)0xdeadbeef; hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); ok( ns == (const WS_XML_STRING *)0xdeadbeef, "ns set\n" ); hr = set_input( reader, "<prefix:t xmlns:prefix2='ns'/>", sizeof("<prefix:t xmlns:prefix2='ns'/>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_namespace_test( reader, "<t></t>" ); ns = NULL; hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ns != NULL, "ns not set\n" ); - if (ns) ok( !ns->length, "got %u\n", ns->length ); + if (ns) ok( !ns->length, "got %lu\n", ns->length ); prepare_namespace_test( reader, "<t xmls='ns'></t>" ); ns = NULL; hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ns != NULL, "ns not set\n" ); - if (ns) ok( !ns->length, "got %u\n", ns->length ); + if (ns) ok( !ns->length, "got %lu\n", ns->length ); prepare_namespace_test( reader, "<prefix:t xmlns:prefix='ns'></t>" ); ns = NULL; hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ns != NULL, "ns not set\n" ); - if (ns) ok( !ns->length, "got %u\n", ns->length ); + if (ns) ok( !ns->length, "got %lu\n", ns->length ); prepare_namespace_test( reader, "<prefix:t xmlns:prefix='ns'></t>" ); prefix.bytes = (BYTE *)"prefix"; prefix.length = 6; ns = NULL; hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ns != NULL, "ns not set\n" ); if (ns) { - ok( ns->length == 2, "got %u\n", ns->length ); + ok( ns->length == 2, "got %lu\n", ns->length ); ok( !memcmp( ns->bytes, "ns", 2 ), "wrong data\n" ); } prepare_namespace_test( reader, "<t xmlns:prefix='ns'></t>" ); ns = NULL; hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ns != NULL, "ns not set\n" ); if (ns) { - ok( ns->length == 2, "got %u\n", ns->length ); + ok( ns->length == 2, "got %lu\n", ns->length ); ok( !memcmp( ns->bytes, "ns", 2 ), "wrong data\n" ); } hr = set_input( reader, "<t xmlns:prefix='ns'></t>", sizeof("<t xmlns:prefix='ns'></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; @@ -2769,54 +2769,54 @@ static void test_WsGetNamespaceFromPrefix(void) ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); ok( elem->prefix != NULL, "prefix not set\n" ); - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); ok( elem->prefix->bytes == NULL, "bytes not set\n" ); ok( elem->ns != NULL, "ns not set\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( elem->attributes != NULL, "attributes not set\n" ); attr = elem->attributes[0]; ok( attr->singleQuote, "singleQuote not set\n" ); ok( attr->isXmlNs, "isXmlNs not set\n" ); ok( attr->prefix != NULL, "prefix not set\n" ); - ok( attr->prefix->length == 6, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 6, "got %lu\n", attr->prefix->length ); ok( attr->prefix->bytes != NULL, "bytes not set\n" ); ok( !memcmp( attr->prefix->bytes, "prefix", 6 ), "wrong data\n" ); ok( attr->localName != NULL, "localName not set\n" ); - ok( attr->localName->length == 6, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 6, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "prefix", 6 ), "wrong data\n" ); ok( attr->ns != NULL, "ns not set\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( attr->ns->bytes != NULL, "bytes not set\n" ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong data\n" ); ok( attr->value != NULL, "value not set\n" ); text = (WS_XML_UTF8_TEXT *)attr->value; ok( attr->value->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", attr->value->textType ); - ok( !text->value.length, "got %u\n", text->value.length ); + ok( !text->value.length, "got %lu\n", text->value.length ); ok( text->value.bytes == NULL, "bytes set\n" ); } prepare_namespace_test( reader, "<t xmlns:prefix='ns'></t>" ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_namespace_test( reader, "<t></t>" ); ns = NULL; prefix.bytes = (BYTE *)"xml"; prefix.length = 3; hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ns != NULL, "ns not set\n" ); if (ns) { - ok( ns->length == 36, "got %u\n", ns->length ); + ok( ns->length == 36, "got %lu\n", ns->length ); ok( !memcmp( ns->bytes, "http://www.w3.org/XML/1998/namespace", 36 ), "wrong data\n" ); } @@ -2825,11 +2825,11 @@ static void test_WsGetNamespaceFromPrefix(void) prefix.bytes = (BYTE *)"xmlns"; prefix.length = 5; hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( ns != NULL, "ns not set\n" ); if (ns) { - ok( ns->length == 29, "got %u\n", ns->length ); + ok( ns->length == 29, "got %lu\n", ns->length ); ok( !memcmp( ns->bytes, "http://www.w3.org/2000/xmlns/", 29 ), "wrong data\n" ); } @@ -2838,7 +2838,7 @@ static void test_WsGetNamespaceFromPrefix(void) prefix.bytes = (BYTE *)"prefix2"; prefix.length = 7; hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); ok( ns == (WS_XML_STRING *)0xdeadbeef, "ns set\n" ); prepare_namespace_test( reader, "<t></t>" ); @@ -2846,84 +2846,84 @@ static void test_WsGetNamespaceFromPrefix(void) prefix.bytes = (BYTE *)"prefix2"; prefix.length = 7; hr = WsGetNamespaceFromPrefix( reader, &prefix, FALSE, &ns, NULL ); - ok( hr == S_FALSE, "got %08x\n", hr ); + ok( hr == S_FALSE, "got %#lx\n", hr ); ok( ns == NULL, "ns not set\n" ); hr = set_input( reader, "<t prefix:attr='' xmlns:prefix='ns'></t>", sizeof("<t prefix:attr='' xmlns:prefix='ns'></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; WS_XML_ATTRIBUTE *attr; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %lu\n", elem->attributeCount ); ok( elem->attributes != NULL, "attributes not set\n" ); attr = elem->attributes[0]; ok( attr->singleQuote, "singleQuote not set\n" ); ok( !attr->isXmlNs, "isXmlNs is set\n" ); ok( attr->prefix != NULL, "prefix not set\n" ); - ok( attr->prefix->length == 6, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 6, "got %lu\n", attr->prefix->length ); ok( attr->prefix->bytes != NULL, "bytes not set\n" ); ok( !memcmp( attr->prefix->bytes, "prefix", 6 ), "wrong data\n" ); ok( attr->localName != NULL, "localName not set\n" ); - ok( attr->localName->length == 4, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 4, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "attr", 4 ), "wrong data\n" ); ok( attr->ns != NULL, "ns not set\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( attr->ns->bytes != NULL, "bytes not set\n" ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong data\n" ); } hr = set_input( reader, "<t xmlns:p='ns'></t>", sizeof("<t xmlns:p='ns'></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, "<t xmlns:p='ns'><p:u p:a=''/></t>", sizeof("<t xmlns:p='ns'><p:u p:a=''/></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; WS_XML_ATTRIBUTE *attr; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( elem->attributes != NULL, "attributes not set\n" ); attr = elem->attributes[0]; ok( attr->prefix != NULL, "prefix not set\n" ); - ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 1, "got %lu\n", attr->prefix->length ); ok( attr->prefix->bytes != NULL, "bytes set\n" ); ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong data\n" ); ok( attr->localName != NULL, "localName not set\n" ); - ok( attr->localName->length == 1, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 1, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "a", 1 ), "wrong data\n" ); ok( attr->ns != NULL, "ns not set\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( attr->ns->bytes != NULL, "bytes not set\n" ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong data\n" ); } hr = set_input( reader, "<t xmlns='ns'></t>", sizeof("<t xmlns='ns'></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (node) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)node; @@ -2931,41 +2931,41 @@ static void test_WsGetNamespaceFromPrefix(void) ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); ok( elem->prefix != NULL, "prefix not set\n" ); - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); ok( elem->prefix->bytes == NULL, "bytes not set\n" ); ok( elem->ns != NULL, "ns not set\n" ); - ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( elem->ns->length == 2, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong data\n" ); attr = elem->attributes[0]; ok( attr->isXmlNs, "isXmlNs is not set\n" ); ok( attr->prefix != NULL, "prefix not set\n" ); - ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( !attr->prefix->length, "got %lu\n", attr->prefix->length ); ok( attr->prefix->bytes == NULL, "bytes set\n" ); ok( attr->localName != NULL, "localName not set\n" ); - ok( attr->localName->length == 5, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 5, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "xmlns", 5 ), "wrong data\n" ); ok( attr->ns != NULL, "ns not set\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( attr->ns->bytes != NULL, "bytes not set\n" ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong data\n" ); } hr = set_input( reader, "<t xmlns:p='ns' xmlns:p='ns2'></t>", sizeof("<t xmlns:p='ns' xmlns:p='ns2'></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, "<t xmlns:p='ns' xmlns:p='ns'></t>", sizeof("<t xmlns:p='ns' xmlns:p='ns'></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_input( reader, "<t xmlns:p='ns' xmlns:P='ns2'></t>", sizeof("<t xmlns:p='ns' xmlns:P='ns2'></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeReader( reader ); } @@ -2983,10 +2983,10 @@ static void test_text_field_mapping(void) } *test; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<a>test</a>" ); @@ -3004,7 +3004,7 @@ static void test_text_field_mapping(void) test = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); ok( test->str != NULL, "str not set\n" ); ok( !wcscmp( test->str, L"test" ), "got %s\n", wine_dbgstr_w(test->str) ); @@ -3053,35 +3053,35 @@ static void test_complex_struct_type(void) prop.value = &langid; prop.valueSize = sizeof(langid); hr = WsCreateError( &prop, 1, &error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* element content type mapping */ prepare_struct_type_test( reader, data ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (const WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 12, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 12, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "OfficeConfig", 12 ), "wrong data\n" ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (const WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 8, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 8, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "services", 8 ), "wrong data\n" ); memset( &f2, 0, sizeof(f2) ); @@ -3120,70 +3120,70 @@ static void test_complex_struct_type(void) test = NULL; hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); ok( !wcscmp( test->services->generationtime, L"2015-09-03T18:47:54" ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); /* element type mapping */ prepare_struct_type_test( reader, data ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); elem = (const WS_XML_ELEMENT_NODE *)node; ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); - ok( elem->localName->length == 12, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 12, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "OfficeConfig", 12 ), "wrong data\n" ); test = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); if (test) ok( !wcscmp( test->services->generationtime, L"2015-09-03T18:47:54" ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); /* trailing content */ prepare_struct_type_test( reader, data2 ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); s.structOptions = WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); prepare_struct_type_test( reader, data2 ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); s.structOptions = 0; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeReader( reader ); WsFreeHeap( heap ); @@ -3267,10 +3267,10 @@ static void test_repeating_element(void) } *test5; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); prepare_struct_type_test( reader, data ); @@ -3307,10 +3307,10 @@ static void test_repeating_element(void) test = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); ok( test->service != NULL, "service not set\n" ); - ok( test->service_count == 2, "got %u\n", test->service_count ); + ok( test->service_count == 2, "got %lu\n", test->service_count ); ok( test->service[0].id == 1, "got %u\n", test->service[0].id ); ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); @@ -3320,11 +3320,11 @@ static void test_repeating_element(void) test4 = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test4, sizeof(test4), NULL ); - ok( hr == S_OK || broken(hr == E_INVALIDARG) /* win7 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == E_INVALIDARG) /* win7 */, "got %#lx\n", hr ); if (test4) { ok( test4->service != NULL, "service not set\n" ); - ok( test4->service_count == 2, "got %u\n", test4->service_count ); + ok( test4->service_count == 2, "got %lu\n", test4->service_count ); ok( test4->service[0]->id == 1, "got %u\n", test4->service[0]->id ); ok( test4->service[1]->id == 2, "got %u\n", test4->service[1]->id ); } @@ -3338,10 +3338,10 @@ static void test_repeating_element(void) test = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); ok( test->service != NULL, "service not set\n" ); - ok( !test->service_count, "got %u\n", test->service_count ); + ok( !test->service_count, "got %lu\n", test->service_count ); /* wrapper element */ prepare_struct_type_test( reader, data3 ); @@ -3351,10 +3351,10 @@ static void test_repeating_element(void) test = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); ok( test->service != NULL, "service not set\n" ); - ok( test->service_count == 2, "got %u\n", test->service_count ); + ok( test->service_count == 2, "got %lu\n", test->service_count ); ok( test->service[0].id == 1, "got %u\n", test->service[0].id ); ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); @@ -3369,10 +3369,10 @@ static void test_repeating_element(void) test2 = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test2, sizeof(test2), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test2 != NULL, "test2 not set\n" ); ok( test2->service != NULL, "service not set\n" ); - ok( test2->service_count == 2, "got %u\n", test2->service_count ); + ok( test2->service_count == 2, "got %lu\n", test2->service_count ); ok( !wcscmp( test2->service[0].id, L"1" ), "wrong data\n" ); ok( !wcscmp( test2->service[1].id, L"2" ), "wrong data\n" ); @@ -3392,10 +3392,10 @@ static void test_repeating_element(void) test3 = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test3, sizeof(test3), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test3 != NULL, "test3 not set\n" ); ok( test3->service != NULL, "service not set\n" ); - ok( test3->service_count == 2, "got %u\n", test3->service_count ); + ok( test3->service_count == 2, "got %lu\n", test3->service_count ); ok( !wcscmp( test3->service[0].name, L"1" ), "wrong data\n" ); ok( !wcscmp( test3->service[0].id, L"1" ), "wrong data\n" ); ok( !wcscmp( test3->service[1].name, L"2" ), "wrong data\n" ); @@ -3440,11 +3440,11 @@ static void test_repeating_element(void) test5 = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test5, sizeof(test5), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test5 != NULL, "test5 not set\n" ); ok( test5->service != NULL, "service not set\n" ); - ok( test5->service_count == 1, "got %u\n", test5->service_count ); - ok( !test5->service[0].name.length, "got %u\n", test5->service[0].name.length ); + ok( test5->service_count == 1, "got %lu\n", test5->service_count ); + ok( !test5->service[0].name.length, "got %lu\n", test5->service[0].name.length ); todo_wine ok( test5->service[0].name.chars != NULL, "chars set\n" ); WsFreeReader( reader ); @@ -3460,67 +3460,67 @@ static void test_WsResetHeap(void) void *ptr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); requested = 0xdeadbeef; size = sizeof(requested); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !requested, "got %u\n", (ULONG)requested ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !requested, "got %Iu\n", requested ); actual = 0xdeadbeef; size = sizeof(actual); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !actual, "got %u\n", (ULONG)actual ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !actual, "got %Iu\n", actual ); hr = WsAlloc( heap, 128, &ptr, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); requested = 0xdeadbeef; size = sizeof(requested); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( requested == 128, "got %u\n", (ULONG)requested ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( requested == 128, "got %Iu\n", requested ); actual = 0xdeadbeef; size = sizeof(actual); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( actual == 128, "got %u\n", (ULONG)actual ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( actual == 128, "got %Iu\n", actual ); hr = WsAlloc( heap, 1, &ptr, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); requested = 0xdeadbeef; size = sizeof(requested); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( requested == 129, "got %u\n", (ULONG)requested ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( requested == 129, "got %Iu\n", requested ); actual = 0xdeadbeef; size = sizeof(actual); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( actual == 384, "got %u\n", (ULONG)actual ); + ok( hr == S_OK, "got %#lx\n", hr ); + todo_wine ok( actual == 384, "got %Iu\n", actual ); hr = WsResetHeap( NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsResetHeap( heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); requested = 0xdeadbeef; size = sizeof(requested); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !requested, "got %u\n", (ULONG)requested ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !requested, "got %Iu\n", requested ); actual = 0xdeadbeef; size = sizeof(actual); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( actual == 128, "got %u\n", (ULONG)actual ); + ok( hr == S_OK, "got %#lx\n", hr ); + todo_wine ok( actual == 128, "got %Iu\n", actual ); WsFreeHeap( heap ); } @@ -3588,21 +3588,21 @@ static void test_datetime(void) ULONG i; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { memset( &date, 0, sizeof(date) ); prepare_type_test( reader, tests[i].str, strlen(tests[i].str) ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_DATETIME_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &date, sizeof(date), NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); if (hr == S_OK) { - ok( date.ticks == tests[i].ticks, "%u: got %s\n", i, wine_dbgstr_longlong(date.ticks) ); - ok( date.format == tests[i].format, "%u: got %u\n", i, date.format ); + ok( date.ticks == tests[i].ticks, "%lu: got %s\n", i, wine_dbgstr_longlong(date.ticks) ); + ok( date.format == tests[i].format, "%lu: got %u\n", i, date.format ); } } @@ -3634,25 +3634,25 @@ static void test_WsDateTimeToFileTime(void) ULONG i; hr = WsDateTimeToFileTime( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); dt.ticks = 0x701ce172277000; dt.format = WS_DATETIME_FORMAT_UTC; hr = WsDateTimeToFileTime( &dt, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsDateTimeToFileTime( NULL, &ft, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { memset( &ft, 0, sizeof(ft) ); hr = WsDateTimeToFileTime( &tests[i].dt, &ft, NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); if (hr == S_OK) { - ok( ft.dwLowDateTime == tests[i].ft.dwLowDateTime, "%u: got %08x\n", i, ft.dwLowDateTime ); - ok( ft.dwHighDateTime == tests[i].ft.dwHighDateTime, "%u: got %08x\n", i, ft.dwHighDateTime ); + ok( ft.dwLowDateTime == tests[i].ft.dwLowDateTime, "%lu: got %#lx\n", i, ft.dwLowDateTime ); + ok( ft.dwHighDateTime == tests[i].ft.dwHighDateTime, "%lu: got %#lx\n", i, ft.dwHighDateTime ); } } } @@ -3664,41 +3664,41 @@ static void test_WsFileTimeToDateTime(void) HRESULT hr; hr = WsFileTimeToDateTime( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); ft.dwLowDateTime = ft.dwHighDateTime = 0; hr = WsFileTimeToDateTime( &ft, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsFileTimeToDateTime( NULL, &dt, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); dt.ticks = 0xdeadbeef; dt.format = 0xdeadbeef; hr = WsFileTimeToDateTime( &ft, &dt, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( dt.ticks == 0x701ce1722770000, "got %s\n", wine_dbgstr_longlong(dt.ticks) ); ok( dt.format == WS_DATETIME_FORMAT_UTC, "got %u\n", dt.format ); ft.dwLowDateTime = 0xd1c03fff; ft.dwHighDateTime = 0x24c85a5e; hr = WsFileTimeToDateTime( &ft, &dt, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( dt.ticks == 0x2bca2875f4373fff, "got %s\n", wine_dbgstr_longlong(dt.ticks) ); ok( dt.format == WS_DATETIME_FORMAT_UTC, "got %u\n", dt.format ); ft.dwLowDateTime++; hr = WsFileTimeToDateTime( &ft, &dt, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); ft.dwLowDateTime = 0xdd88ffff; ft.dwHighDateTime = 0xf8fe31e8; hr = WsFileTimeToDateTime( &ft, &dt, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); ft.dwLowDateTime++; hr = WsFileTimeToDateTime( &ft, &dt, NULL ); - ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); } static void test_double(void) @@ -3780,10 +3780,10 @@ static void test_double(void) ULONG i; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { @@ -3791,8 +3791,8 @@ static void test_double(void) prepare_type_test( reader, tests[i].str, strlen(tests[i].str) ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_DOUBLE_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val, sizeof(val), NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); - if (hr == tests[i].hr) ok( val == tests[i].val, "%u: got %s\n", i, wine_dbgstr_longlong(val) ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); + if (hr == tests[i].hr) ok( val == tests[i].val, "%lu: got %s\n", i, wine_dbgstr_longlong(val) ); } WsFreeReader( reader ); @@ -3808,7 +3808,7 @@ static void test_WsReadElement(void) UINT32 val; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); desc.elementLocalName = &localname; desc.elementNs = &ns; @@ -3817,20 +3817,20 @@ static void test_WsReadElement(void) prepare_struct_type_test( reader, "<t>1</t>" ); hr = WsReadElement( NULL, &desc, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); hr = WsReadElement( reader, NULL, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); hr = WsReadElement( reader, &desc, WS_READ_REQUIRED_VALUE, NULL, NULL, sizeof(val), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); val = 0xdeadbeef; hr = WsReadElement( reader, &desc, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val == 1, "got %u\n", val ); WsFreeReader( reader ); @@ -3843,46 +3843,46 @@ static void test_WsReadValue(void) UINT32 val; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); hr = WsReadValue( NULL, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, NULL, sizeof(val), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); /* reader must be positioned correctly */ prepare_struct_type_test( reader, "<t>1</t>" ); hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<t>1</t>" ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); val = 0xdeadbeef; hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val == 1, "got %u\n", val ); prepare_struct_type_test( reader, "" ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadValue( reader, WS_UINT32_VALUE_TYPE, &val, sizeof(val), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeReader( reader ); } @@ -3896,26 +3896,26 @@ static void test_WsResetError(void) HRESULT hr; hr = WsResetError( NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); error = NULL; hr = WsCreateError( NULL, 0, &error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( error != NULL, "error not set\n" ); code = 0xdeadbeef; size = sizeof(code); hr = WsSetErrorProperty( error, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, size ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetError( error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); code = 0xdeadbeef; size = sizeof(code); hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !code, "got %u\n", code ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !code, "got %lu\n", code ); WsFreeError( error ); @@ -3924,21 +3924,21 @@ static void test_WsResetError(void) prop.value = &langid; prop.valueSize = sizeof(langid); hr = WsCreateError( &prop, 1, &error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); langid = 0xdead; size = sizeof(langid); hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_LANGID, &langid, size ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( langid == MAKELANGID( LANG_DUTCH, SUBLANG_DEFAULT ), "got %u\n", langid ); hr = WsResetError( error ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); langid = 0xdead; size = sizeof(langid); hr = WsGetErrorProperty( error, WS_ERROR_PROPERTY_LANGID, &langid, size ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( langid == MAKELANGID( LANG_DUTCH, SUBLANG_DEFAULT ), "got %u\n", langid ); WsFreeError( error ); @@ -3953,36 +3953,36 @@ static void test_WsGetReaderPosition(void) HRESULT hr; hr = WsGetReaderPosition( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* reader must be set to an XML buffer */ hr = WsGetReaderPosition( reader, &pos, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_input( reader, "<t/>", sizeof("<t/>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderPosition( reader, &pos, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderPosition( reader, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); pos.buffer = pos.node = NULL; hr = WsGetReaderPosition( reader, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( pos.buffer != NULL, "buffer not set\n" ); ok( pos.node != NULL, "node not set\n" ); @@ -3999,39 +3999,39 @@ static void test_WsSetReaderPosition(void) HRESULT hr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetReaderPosition( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buf1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetInputToBuffer( reader, buf1, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetReaderPosition( reader, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); pos.buffer = pos.node = NULL; hr = WsGetReaderPosition( reader, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( pos.buffer == buf1, "wrong buffer\n" ); ok( pos.node != NULL, "node not set\n" ); hr = WsSetReaderPosition( reader, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* different buffer */ hr = WsCreateXmlBuffer( heap, NULL, 0, &buf2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); pos.buffer = buf2; hr = WsSetReaderPosition( reader, &pos, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeReader( reader ); WsFreeHeap( heap ); @@ -4131,39 +4131,39 @@ static void test_entities(void) ULONG i; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_input( reader, tests[i].str, strlen(tests[i].str) ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsReadNode( reader, NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); if (hr != S_OK) continue; hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); utf8 = (const WS_XML_UTF8_TEXT *)((const WS_XML_TEXT_NODE *)node)->text; - ok( utf8->value.length == strlen(tests[i].res), "%u: got %u\n", i, utf8->value.length ); - ok( !memcmp( utf8->value.bytes, tests[i].res, strlen(tests[i].res) ), "%u: wrong data\n", i ); + ok( utf8->value.length == strlen(tests[i].res), "%lu: got %lu\n", i, utf8->value.length ); + ok( !memcmp( utf8->value.bytes, tests[i].res, strlen(tests[i].res) ), "%lu: wrong data\n", i ); } hr = set_input( reader, "<t a='

'/>", sizeof("<t a='

'/>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); utf8 = (const WS_XML_UTF8_TEXT *)((const WS_XML_ELEMENT_NODE *)node)->attributes[0]->value; - ok( utf8->value.length == 2, "got %u\n", utf8->value.length ); + ok( utf8->value.length == 2, "got %lu\n", utf8->value.length ); ok( !memcmp( utf8->value.bytes, "\n\n", 2 ), "wrong data\n" ); WsFreeReader( reader ); @@ -4196,13 +4196,13 @@ static void test_field_options(void) } *test; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, xml, sizeof(xml) - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -4266,7 +4266,7 @@ static void test_field_options(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !test->wsz, "wsz is set\n" ); ok( !test->s, "s is set\n" ); ok( test->int32 == -1, "got %d\n", test->int32 ); @@ -4287,106 +4287,106 @@ static void test_WsReadBytes(void) ULONG count; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadBytes( NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadBytes( reader, NULL, 0, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_input( reader, "<t>dGV4dA==</t>", sizeof("<t>dGV4dA==</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadBytes( reader, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, "<t>dGV4dA==</t>", sizeof("<t>dGV4dA==</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadBytes( reader, buf, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, "<t>dGV4dA==</t>", sizeof("<t>dGV4dA==</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = WsReadBytes( reader, NULL, 0, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); count = 0xdeadbeef; hr = WsReadBytes( reader, NULL, 1, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadBytes( reader, buf, 0, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); ok( !buf[0], "wrong data\n" ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadBytes( reader, buf, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); ok( !buf[0], "wrong data\n" ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadBytes( reader, buf, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); ok( !buf[0], "wrong data\n" ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = WsReadBytes( reader, NULL, 0, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadBytes( reader, buf, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); ok( !memcmp( buf, "te", 2 ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (const WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); utf8 = (const WS_XML_UTF8_TEXT *)text->text; ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); - ok( utf8->value.length == 8, "got %u\n", utf8->value.length ); + ok( utf8->value.length == 8, "got %lu\n", utf8->value.length ); ok( !memcmp( utf8->value.bytes, "dGV4dA==", 8 ), "wrong data\n" ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadBytes( reader, buf, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); ok( !memcmp( buf, "xt", 2 ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (const WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); count = 0xdeadbeef; hr = WsReadBytes( reader, buf, 1, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (const WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", text->node.nodeType ); @@ -4405,107 +4405,107 @@ static void test_WsReadChars(void) ULONG count; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadChars( NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadChars( reader, NULL, 0, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadChars( reader, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadChars( reader, bufW, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = WsReadChars( reader, NULL, 0, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); count = 0xdeadbeef; hr = WsReadChars( reader, NULL, 1, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadChars( reader, bufW, 0, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); ok( !buf[0], "wrong data\n" ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadChars( reader, bufW, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); ok( !buf[0], "wrong data\n" ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadChars( reader, bufW, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); ok( !buf[0], "wrong data\n" ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = WsReadChars( reader, NULL, 0, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadChars( reader, bufW, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); ok( !memcmp( bufW, L"te", 2 * sizeof(WCHAR) ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (const WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); utf8 = (const WS_XML_UTF8_TEXT *)text->text; ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); - ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( utf8->value.length == 4, "got %lu\n", utf8->value.length ); ok( !memcmp( utf8->value.bytes, "text", 4 ), "wrong data\n" ); /* continue reading in a different encoding */ buf[0] = 0; count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); ok( !memcmp( buf, "xt", 2 ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (const WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, buf, 1, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (const WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", text->node.nodeType ); @@ -4523,106 +4523,106 @@ static void test_WsReadCharsUtf8(void) ULONG count; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadCharsUtf8( NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadCharsUtf8( reader, NULL, 0, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadCharsUtf8( reader, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadCharsUtf8( reader, buf, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, "<t>text</t>", sizeof("<t>text</t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, NULL, 0, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, NULL, 1, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, buf, 0, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); ok( !buf[0], "wrong data\n" ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); ok( !buf[0], "wrong data\n" ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); ok( !buf[0], "wrong data\n" ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, NULL, 0, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); ok( !memcmp( buf, "te", 2 ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (const WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); utf8 = (const WS_XML_UTF8_TEXT *)text->text; ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); - ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( utf8->value.length == 4, "got %lu\n", utf8->value.length ); ok( !memcmp( utf8->value.bytes, "text", 4 ), "wrong data\n" ); buf[0] = 0; count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, buf, 2, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); ok( !memcmp( buf, "xt", 2 ), "wrong data\n" ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (const WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", text->node.nodeType ); count = 0xdeadbeef; hr = WsReadCharsUtf8( reader, buf, 1, &count, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text = (const WS_XML_TEXT_NODE *)node; ok( text->node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", text->node.nodeType ); @@ -4672,66 +4672,66 @@ static void test_WsReadQualifiedName(void) }; hr = WsReadQualifiedName( NULL, NULL, NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadQualifiedName( reader, NULL, NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadQualifiedName( reader, heap, NULL, NULL, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_input( reader, "<t/>", sizeof("<t/>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadQualifiedName( reader, heap, NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_input( reader, "<t/>", sizeof("<t/>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadQualifiedName( reader, heap, NULL, &localname, NULL, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_input( reader, tests[i].str, strlen(tests[i].str) ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); prefix.length = localname.length = ns.length = 0xdeadbeef; prefix.bytes = localname.bytes = ns.bytes = (BYTE *)0xdeadbeef; hr = WsReadQualifiedName( reader, heap, &prefix, &localname, &ns, NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); if (tests[i].hr == S_OK && hr == S_OK) { - ok( prefix.length == strlen( tests[i].prefix ), "%u: got %u\n", i, prefix.length ); - ok( !memcmp( prefix.bytes, tests[i].prefix, prefix.length ), "%u: wrong data\n", i ); + ok( prefix.length == strlen( tests[i].prefix ), "%lu: got %lu\n", i, prefix.length ); + ok( !memcmp( prefix.bytes, tests[i].prefix, prefix.length ), "%lu: wrong data\n", i ); - ok( localname.length == strlen( tests[i].localname ), "%u: got %u\n", i, localname.length ); - ok( !memcmp( localname.bytes, tests[i].localname, localname.length ), "%u: wrong data\n", i ); + ok( localname.length == strlen( tests[i].localname ), "%lu: got %lu\n", i, localname.length ); + ok( !memcmp( localname.bytes, tests[i].localname, localname.length ), "%lu: wrong data\n", i ); - ok( ns.length == strlen( tests[i].ns ), "%u: got %u\n", i, ns.length ); - ok( !memcmp( ns.bytes, tests[i].ns, ns.length ), "%u: wrong data\n", i ); + ok( ns.length == strlen( tests[i].ns ), "%lu: got %lu\n", i, ns.length ); + ok( !memcmp( ns.bytes, tests[i].ns, ns.length ), "%lu: wrong data\n", i ); } else if (tests[i].hr != S_OK) { - ok( prefix.length == 0xdeadbeef, "got %u\n", prefix.length ); + ok( prefix.length == 0xdeadbeef, "got %lu\n", prefix.length ); ok( prefix.bytes == (BYTE *)0xdeadbeef, "got %p\n", prefix.bytes ); - ok( localname.length == 0xdeadbeef, "got %u\n", localname.length ); + ok( localname.length == 0xdeadbeef, "got %lu\n", localname.length ); ok( localname.bytes == (BYTE *)0xdeadbeef, "got %p\n", localname.bytes ); - ok( ns.length == 0xdeadbeef, "got %u\n", ns.length ); + ok( ns.length == 0xdeadbeef, "got %lu\n", ns.length ); ok( ns.bytes == (BYTE *)0xdeadbeef, "got %p\n", ns.bytes ); } } @@ -4751,40 +4751,40 @@ static void test_WsReadAttribute(void) HRESULT hr; hr = WsReadAttribute( NULL, NULL, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadAttribute( reader, NULL, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); desc.attributeLocalName = &localname; desc.attributeNs = &ns; desc.type = WS_UINT32_TYPE; desc.typeDescription = NULL; hr = WsReadAttribute( reader, &desc, 0, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadAttribute( reader, &desc, WS_READ_REQUIRED_POINTER, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 8, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadAttribute( reader, &desc, WS_READ_REQUIRED_POINTER, heap, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsReadAttribute( reader, &desc, WS_READ_REQUIRED_POINTER, heap, &val, sizeof(val), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); prepare_struct_type_test( reader, "<t a='1'>" ); hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); val = NULL; hr = WsReadAttribute( reader, &desc, WS_READ_REQUIRED_POINTER, heap, &val, sizeof(val), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( val != NULL, "val not set\n" ); ok( *val == 1, "got %u\n", *val ); @@ -4799,53 +4799,53 @@ static void test_WsSkipNode(void) HRESULT hr; hr = WsSkipNode( NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSkipNode( reader, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_input( reader, "<t></t>", sizeof("<t></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); /* BOF */ hr = WsSkipNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); /* element */ hr = WsSkipNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); /* EOF */ hr = WsSkipNode( reader, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_input( reader, "<t></t>", sizeof("<t></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* non-element */ hr = WsSkipNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", node->nodeType ); hr = WsSkipNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); WsFreeReader( reader ); @@ -4985,147 +4985,147 @@ static void test_binary_encoding(void) } *typetest3; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* short element */ hr = set_input_bin( reader, test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); ok( elem->prefix->bytes == NULL, "bytes set\n" ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); ok( elem->localName->dictionary != NULL, "dictionary not set\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( !elem->attributeCount, "got %u\n", elem->attributeCount ); + ok( !elem->attributeCount, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* single character prefix element */ hr = set_input_bin( reader, test2, sizeof(test2), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( elem->prefix->length == 1, "got %u\n", elem->prefix->length ); + ok( elem->prefix->length == 1, "got %lu\n", elem->prefix->length ); ok( !memcmp( elem->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( elem->ns->length == 2, "got %lu\n", elem->ns->length ); ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 1, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* element */ hr = set_input_bin( reader, test3, sizeof(test3), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( elem->prefix->length == 2, "got %u\n", elem->prefix->length ); + ok( elem->prefix->length == 2, "got %lu\n", elem->prefix->length ); ok( !memcmp( elem->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( elem->ns->length == 2, "got %lu\n", elem->ns->length ); ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 2, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* element with text */ hr = set_input_bin( reader, test4, sizeof(test4), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( elem->prefix->length == 2, "got %u\n", elem->prefix->length ); + ok( elem->prefix->length == 2, "got %lu\n", elem->prefix->length ); ok( !memcmp( elem->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( elem->ns->length == 2, "got %lu\n", elem->ns->length ); ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 2, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); text_node = (const WS_XML_TEXT_NODE *)node; ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (const WS_XML_UTF8_TEXT *)text_node->text; - ok( utf8_text->value.length == 4, "got %u\n", utf8_text->value.length ); + ok( utf8_text->value.length == 4, "got %lu\n", utf8_text->value.length ); ok( !memcmp( utf8_text->value.bytes, "test", 4 ), "wrong text\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* bool text, TRUE */ hr = set_input_bin( reader, test7, sizeof(test7), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); @@ -5134,7 +5134,7 @@ static void test_binary_encoding(void) /* bool text, FALSE */ hr = set_input_bin( reader, test8, sizeof(test8), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); @@ -5143,7 +5143,7 @@ static void test_binary_encoding(void) /* zero text */ hr = set_input_bin( reader, test9, sizeof(test9), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); @@ -5152,7 +5152,7 @@ static void test_binary_encoding(void) /* one text */ hr = set_input_bin( reader, test10, sizeof(test10), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); @@ -5161,7 +5161,7 @@ static void test_binary_encoding(void) /* false text */ hr = set_input_bin( reader, test11, sizeof(test11), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); @@ -5170,7 +5170,7 @@ static void test_binary_encoding(void) /* true text */ hr = set_input_bin( reader, test12, sizeof(test12), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); @@ -5179,7 +5179,7 @@ static void test_binary_encoding(void) /* int32 text, int8 record */ hr = set_input_bin( reader, test13, sizeof(test13), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); @@ -5188,7 +5188,7 @@ static void test_binary_encoding(void) /* int32 text, int16 record */ hr = set_input_bin( reader, test14, sizeof(test14), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); @@ -5197,7 +5197,7 @@ static void test_binary_encoding(void) /* int32 text, int32 record */ hr = set_input_bin( reader, test15, sizeof(test15), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); @@ -5206,7 +5206,7 @@ static void test_binary_encoding(void) /* int64 text, int64 record */ hr = set_input_bin( reader, test16, sizeof(test16), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT64, "got %u\n", text_node->text->textType ); @@ -5215,7 +5215,7 @@ static void test_binary_encoding(void) /* double text */ hr = set_input_bin( reader, test17, sizeof(test17), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_DOUBLE, "got %u\n", text_node->text->textType ); @@ -5224,7 +5224,7 @@ static void test_binary_encoding(void) /* datetime text */ hr = set_input_bin( reader, test18, sizeof(test18), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_DATETIME, "got %u\n", text_node->text->textType ); @@ -5234,88 +5234,88 @@ static void test_binary_encoding(void) /* utf8 text, chars8 record */ hr = set_input_bin( reader, test19, sizeof(test19), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; - ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); + ok( utf8_text->value.length == 1, "got %lu\n", utf8_text->value.length ); ok( utf8_text->value.bytes[0] == 'a', "got %02x\n", utf8_text->value.bytes[0] ); /* utf8 text, chars16 record */ hr = set_input_bin( reader, test20, sizeof(test20), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; - ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); + ok( utf8_text->value.length == 1, "got %lu\n", utf8_text->value.length ); ok( utf8_text->value.bytes[0] == 'a', "got %02x\n", utf8_text->value.bytes[0] ); /* utf8 text, chars32 record */ hr = set_input_bin( reader, test21, sizeof(test21), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; - ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); + ok( utf8_text->value.length == 1, "got %lu\n", utf8_text->value.length ); ok( utf8_text->value.bytes[0] == 'a', "got %02x\n", utf8_text->value.bytes[0] ); /* base64 text, bytes8 record */ hr = set_input_bin( reader, test22, sizeof(test22), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; - ok( base64_text->length == 1, "got %u\n", base64_text->length ); + ok( base64_text->length == 1, "got %lu\n", base64_text->length ); ok( base64_text->bytes[0] == 'a', "got %02x\n", base64_text->bytes[0] ); /* base64 text, bytes16 record */ hr = set_input_bin( reader, test23, sizeof(test23), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; - ok( base64_text->length == 1, "got %u\n", base64_text->length ); + ok( base64_text->length == 1, "got %lu\n", base64_text->length ); ok( base64_text->bytes[0] == 'a', "got %02x\n", base64_text->bytes[0] ); /* base64 text, bytes32 record */ hr = set_input_bin( reader, test24, sizeof(test24), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; - ok( base64_text->length == 1, "got %u\n", base64_text->length ); + ok( base64_text->length == 1, "got %lu\n", base64_text->length ); ok( base64_text->bytes[0] == 'a', "got %02x\n", base64_text->bytes[0] ); /* empty text */ hr = set_input_bin( reader, test25, sizeof(test25), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; - ok( !utf8_text->value.length, "got %u\n", utf8_text->value.length ); + ok( !utf8_text->value.length, "got %lu\n", utf8_text->value.length ); ok( utf8_text->value.bytes != NULL, "bytes not set\n" ); /* dictionary text */ hr = set_input_bin( reader, test26, sizeof(test26), dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; - ok( utf8_text->value.length == 2, "got %u\n", utf8_text->value.length ); + ok( utf8_text->value.length == 2, "got %lu\n", utf8_text->value.length ); ok( utf8_text->value.bytes[0] == 'T', "got %02x\n", utf8_text->value.bytes[0] ); ok( utf8_text->value.bytes[1] == 'o', "got %02x\n", utf8_text->value.bytes[0] ); /* unique id text */ hr = set_input_bin( reader, test27, sizeof(test27), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UNIQUE_ID, "got %u\n", text_node->text->textType ); @@ -5324,7 +5324,7 @@ static void test_binary_encoding(void) /* guid text */ hr = set_input_bin( reader, test28, sizeof(test28), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_GUID, "got %u\n", text_node->text->textType ); @@ -5333,7 +5333,7 @@ static void test_binary_encoding(void) /* uint64 text */ hr = set_input_bin( reader, test29, sizeof(test29), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UINT64, "got %u\n", text_node->text->textType ); @@ -5342,282 +5342,282 @@ static void test_binary_encoding(void) /* short xmlns attribute */ hr = set_input_bin( reader, test30, sizeof(test30), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); ok( elem->prefix->bytes == NULL, "bytes set\n" ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( elem->ns->length == 2, "got %lu\n", elem->ns->length ); ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( !attr->prefix->length, "got %lu\n", attr->prefix->length ); ok( attr->prefix->bytes == NULL, "bytes set\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); /* xmlns attribute */ hr = set_input_bin( reader, test31, sizeof(test31), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); ok( elem->prefix->bytes == NULL, "bytes set\n" ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 1, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); /* short attribute */ hr = set_input_bin( reader, test100, sizeof(test100), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( !attr->isXmlNs, "is xmlns\n" ); - ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); - ok( attr->localName->length == 1, "got %u\n", attr->localName->length ); + ok( !attr->prefix->length, "got %lu\n", attr->prefix->length ); + ok( attr->localName->length == 1, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( !attr->ns->length, "got %u\n", attr->ns->length ); + ok( !attr->ns->length, "got %lu\n", attr->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); ok( attr->value != NULL, "value not set\n" ); utf8_text = (const WS_XML_UTF8_TEXT *)attr->value; ok( utf8_text->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8_text->text.textType ); - ok( !utf8_text->value.length, "got %u\n", utf8_text->value.length ); + ok( !utf8_text->value.length, "got %lu\n", utf8_text->value.length ); ok( utf8_text->value.bytes != NULL, "bytes not set\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* single character prefix attribute */ hr = set_input_bin( reader, test101, sizeof(test101), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "ns not set\n" ); - ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( !attr->isXmlNs, "is xmlns\n" ); - ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 1, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( attr->localName->length == 1, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 1, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); ok( attr->value != NULL, "value not set\n" ); utf8_text = (const WS_XML_UTF8_TEXT *)attr->value; ok( utf8_text->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8_text->text.textType ); - ok( !utf8_text->value.length, "got %u\n", utf8_text->value.length ); + ok( !utf8_text->value.length, "got %lu\n", utf8_text->value.length ); ok( utf8_text->value.bytes != NULL, "bytes not set\n" ); attr = elem->attributes[1]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 1, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* attribute */ hr = set_input_bin( reader, test102, sizeof(test102), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "ns not set\n" ); - ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( !attr->isXmlNs, "is xmlns\n" ); - ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 2, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( attr->localName->length == 1, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 1, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); ok( attr->value != NULL, "value not set\n" ); utf8_text = (const WS_XML_UTF8_TEXT *)attr->value; ok( utf8_text->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8_text->text.textType ); - ok( !utf8_text->value.length, "got %u\n", utf8_text->value.length ); + ok( !utf8_text->value.length, "got %lu\n", utf8_text->value.length ); ok( utf8_text->value.bytes != NULL, "bytes not set\n" ); attr = elem->attributes[1]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 2, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* attribute with value */ hr = set_input_bin( reader, test103, sizeof(test103), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "ns not set\n" ); - ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( !attr->isXmlNs, "is xmlns\n" ); - ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 2, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( attr->localName->length == 1, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 1, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); ok( attr->value != NULL, "value not set\n" ); utf8_text = (const WS_XML_UTF8_TEXT *)attr->value; ok( utf8_text->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8_text->text.textType ); - ok( utf8_text->value.length == 4, "got %u\n", utf8_text->value.length ); + ok( utf8_text->value.length == 4, "got %lu\n", utf8_text->value.length ); ok( !memcmp( utf8_text->value.bytes, "test", 4 ), "wrong value\n" ); attr = elem->attributes[1]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 2, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); /* comment */ hr = set_input_bin( reader, test200, sizeof(test200), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", node->nodeType ); comment = (const WS_XML_COMMENT_NODE *)node; - ok( comment->value.length == 7, "got %u\n", comment->value.length ); + ok( comment->value.length == 7, "got %lu\n", comment->value.length ); ok( !memcmp( comment->value.bytes, "comment", 7 ), "wrong data\n" ); hr = set_input_bin( reader, test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); found = -1; hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( found == TRUE, "got %d\n", found ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadEndElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* element with byte record text */ hr = set_input_bin( reader, test5, sizeof(test5), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); text_node = (const WS_XML_TEXT_NODE *)node; ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (const WS_XML_BASE64_TEXT *)text_node->text; - ok( base64_text->length == 1, "got %u\n", base64_text->length ); + ok( base64_text->length == 1, "got %lu\n", base64_text->length ); ok( base64_text->bytes[0] == 'a', "wrong data %02x\n", base64_text->bytes[0] ); /* element with mixed byte record text */ hr = set_input_bin( reader, test6, sizeof(test6), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 8, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -5635,16 +5635,16 @@ static void test_binary_encoding(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &typetest, sizeof(typetest), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( typetest->data.length == 2, "got %u\n", typetest->data.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( typetest->data.length == 2, "got %lu\n", typetest->data.length ); ok( !memcmp( typetest->data.bytes, "ab", 2 ), "wrong data\n" ); /* record value too large for description type */ hr = set_input_bin( reader, test32, sizeof(test32), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 8, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -5662,14 +5662,14 @@ static void test_binary_encoding(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &typetest2, sizeof(typetest2), NULL ); - ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); /* record value too small for description type */ hr = set_input_bin( reader, test16, sizeof(test16), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 8, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -5687,7 +5687,7 @@ static void test_binary_encoding(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &typetest3, sizeof(typetest3), NULL ); - ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); WsFreeHeap( heap ); WsFreeReader( reader ); @@ -5727,7 +5727,7 @@ static void test_dictionary(void) HRESULT hr; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); strings[0].length = 0; strings[0].bytes = NULL; @@ -5761,333 +5761,333 @@ static void test_dictionary(void) /* short dictionary element */ hr = set_input_bin( reader, test, sizeof(test), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); ok( elem->prefix->bytes == NULL, "bytes set\n" ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); ok( elem->localName->dictionary == &dict, "unexpected dict\n" ); - ok( elem->localName->id == ~0u, "unexpected id %08x\n", elem->localName->id ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( elem->localName->id == ~0u, "unexpected id %#lx\n", elem->localName->id ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( !elem->attributeCount, "got %u\n", elem->attributeCount ); + ok( !elem->attributeCount, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* single character prefix dictionary element */ hr = set_input_bin( reader, test2, sizeof(test2), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( elem->prefix->length == 1, "got %u\n", elem->prefix->length ); + ok( elem->prefix->length == 1, "got %lu\n", elem->prefix->length ); ok( !memcmp( elem->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "u", 1 ), "wrong name\n" ); - ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( elem->ns->length == 2, "got %lu\n", elem->ns->length ); ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 1, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); ok( attr->ns->dictionary == &dict, "unexpected dict\n" ); - ok( attr->ns->id == 5, "unexpected id %08x\n", attr->ns->id ); + ok( attr->ns->id == 5, "unexpected id %#lx\n", attr->ns->id ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* dictionary element */ hr = set_input_bin( reader, test3, sizeof(test3), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( elem->prefix->length == 2, "got %u\n", elem->prefix->length ); + ok( elem->prefix->length == 2, "got %lu\n", elem->prefix->length ); ok( !memcmp( elem->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "u", 1 ), "wrong name\n" ); ok( elem->localName->dictionary == &dict, "unexpected dict\n" ); - ok( elem->localName->id == 3, "unexpected id %08x\n", elem->localName->id ); - ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( elem->localName->id == 3, "unexpected id %#lx\n", elem->localName->id ); + ok( elem->ns->length == 2, "got %lu\n", elem->ns->length ); ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 2, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* short dictionary attribute */ hr = set_input_bin( reader, test4, sizeof(test4), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "u", 1 ), "wrong name\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( !attr->isXmlNs, "is xmlns\n" ); - ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); - ok( attr->localName->length == 1, "got %u\n", attr->localName->length ); + ok( !attr->prefix->length, "got %lu\n", attr->prefix->length ); + ok( attr->localName->length == 1, "got %lu\n", attr->localName->length ); ok( attr->localName->dictionary == &dict, "unexpected dict\n" ); - ok( attr->localName->id == 3, "unexpected id %08x\n", attr->localName->id ); + ok( attr->localName->id == 3, "unexpected id %#lx\n", attr->localName->id ); ok( !memcmp( attr->localName->bytes, "u", 1 ), "wrong name\n" ); - ok( !attr->ns->length, "got %u\n", attr->ns->length ); + ok( !attr->ns->length, "got %lu\n", attr->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); ok( attr->value != NULL, "value not set\n" ); utf8 = (const WS_XML_UTF8_TEXT *)attr->value; ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); - ok( !utf8->value.length, "got %u\n", utf8->value.length ); + ok( !utf8->value.length, "got %lu\n", utf8->value.length ); ok( utf8->value.bytes != NULL, "bytes not set\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* single character prefix dictionary attribute */ hr = set_input_bin( reader, test5, sizeof(test5), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "u", 1 ), "wrong name\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "ns not set\n" ); - ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( !attr->isXmlNs, "is xmlns\n" ); - ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 1, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( attr->localName->length == 1, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 1, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "u", 1 ), "wrong name\n" ); ok( attr->localName->dictionary == &dict, "unexpected dict\n" ); - ok( attr->localName->id == 3, "unexpected id %08x\n", attr->localName->id ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->localName->id == 3, "unexpected id %#lx\n", attr->localName->id ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); ok( attr->value != NULL, "value not set\n" ); utf8 = (const WS_XML_UTF8_TEXT *)attr->value; ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); - ok( !utf8->value.length, "got %u\n", utf8->value.length ); + ok( !utf8->value.length, "got %lu\n", utf8->value.length ); ok( utf8->value.bytes != NULL, "bytes not set\n" ); attr = elem->attributes[1]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 1, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* dictionary attribute */ hr = set_input_bin( reader, test6, sizeof(test6), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "u", 1 ), "wrong name\n" ); - ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( !elem->ns->length, "got %lu\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "ns not set\n" ); - ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( !attr->isXmlNs, "is xmlns\n" ); - ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 2, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( attr->localName->length == 1, "got %u\n", attr->localName->length ); + ok( attr->localName->length == 1, "got %lu\n", attr->localName->length ); ok( !memcmp( attr->localName->bytes, "u", 1 ), "wrong name\n" ); ok( attr->localName->dictionary == &dict, "unexpected dict\n" ); - ok( attr->localName->id == 3, "unexpected id %08x\n", attr->localName->id ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->localName->id == 3, "unexpected id %#lx\n", attr->localName->id ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); ok( attr->value != NULL, "value not set\n" ); utf8 = (const WS_XML_UTF8_TEXT *)attr->value; ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); - ok( !utf8->value.length, "got %u\n", utf8->value.length ); + ok( !utf8->value.length, "got %lu\n", utf8->value.length ); ok( utf8->value.bytes != NULL, "bytes not set\n" ); attr = elem->attributes[1]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 2, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); /* short dictionary xmlns attribute */ hr = set_input_bin( reader, test7, sizeof(test7), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( !attr->prefix->length, "got %lu\n", attr->prefix->length ); ok( attr->prefix->bytes == NULL, "bytes set\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); ok( attr->ns->dictionary == &dict, "unexpected dict\n" ); - ok( attr->ns->id == 5, "unexpected id %08x\n", attr->ns->id ); + ok( attr->ns->id == 5, "unexpected id %#lx\n", attr->ns->id ); utf8 = (const WS_XML_UTF8_TEXT *)attr->value; ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); - ok( !utf8->value.length, "got %u\n", utf8->value.length ); + ok( !utf8->value.length, "got %lu\n", utf8->value.length ); todo_wine ok( utf8->value.bytes != NULL, "bytes not set\n" ); /* dictionary xmlns attribute */ hr = set_input_bin( reader, test8, sizeof(test8), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); elem = (const WS_XML_ELEMENT_NODE *)node; - ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !elem->prefix->length, "got %lu\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 1, "got %lu\n", elem->attributeCount ); ok( !elem->isEmpty, "empty\n" ); attr = elem->attributes[0]; ok( !attr->singleQuote, "single quote\n" ); ok( attr->isXmlNs, "not xmlns\n" ); - ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( attr->prefix->length == 1, "got %lu\n", attr->prefix->length ); ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); - ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( attr->ns->length == 2, "got %lu\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); ok( attr->ns->dictionary == &dict, "unexpected dict\n" ); - ok( attr->ns->id == 5, "unexpected id %08x\n", attr->ns->id ); + ok( attr->ns->id == 5, "unexpected id %#lx\n", attr->ns->id ); utf8 = (const WS_XML_UTF8_TEXT *)attr->value; ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); - ok( !utf8->value.length, "got %u\n", utf8->value.length ); + ok( !utf8->value.length, "got %lu\n", utf8->value.length ); todo_wine ok( utf8->value.bytes != NULL, "bytes not set\n" ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* element name string id out of range */ hr = set_input_bin( reader, test9, sizeof(test9), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); /* text string id out of range */ hr = set_input_bin( reader, test10, sizeof(test10), &dict ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsReadNode( reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = WsGetDictionary( 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetDictionary( WS_ENCODING_XML_UTF8, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); dict2 = (WS_XML_DICTIONARY *)0xdeadbeef; hr = WsGetDictionary( WS_ENCODING_XML_UTF8, &dict2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( dict2 == NULL, "got %p\n", dict2 ); dict2 = NULL; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( dict2 != NULL, "dict2 not set\n" ); ok( dict2 != &dict, "got %p\n", dict2 ); dict2 = NULL; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_SESSION_1, &dict2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( dict2 != NULL, "dict2 not set\n" ); ok( dict2 != &dict, "got %p\n", dict2 ); ok( !memcmp( &dict2->guid, &dict_static, sizeof(dict_static) ), "got %s\n", wine_dbgstr_guid(&dict2->guid) ); - ok( dict2->stringCount == 488 || dict2->stringCount == 487 /* < win10 */, "got %u\n", dict2->stringCount ); - ok( dict2->strings[0].length == 14, "got %u\n", dict2->strings[0].length ); + ok( dict2->stringCount == 488 || dict2->stringCount == 487 /* < win10 */, "got %lu\n", dict2->stringCount ); + ok( dict2->strings[0].length == 14, "got %lu\n", dict2->strings[0].length ); ok( !memcmp( dict2->strings[0].bytes, "mustUnderstand", 14 ), "wrong data\n" ); WsFreeReader( reader ); @@ -6109,18 +6109,18 @@ static void check_output_buffer( WS_XML_BUFFER *buffer, const char *expected, un HRESULT hr; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlBuffer( writer, buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &bytes, 0, sizeof(bytes) ); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); - ok( hr == S_OK, "%u: got %08x\n", line, hr ); - ok( bytes.length == len, "%u: got %u expected %u\n", line, bytes.length, len ); + ok( hr == S_OK, "%u: got %#lx\n", line, hr ); + ok( bytes.length == len, "%u: got %lu expected %d\n", line, bytes.length, len ); if (bytes.length != len) return; ok( !memcmp( bytes.bytes, expected, len ), "%u: got %s expected %s\n", line, bytes.bytes, expected ); @@ -6135,25 +6135,25 @@ static HRESULT prepare_xml_buffer_test( WS_XML_READER *reader, WS_HEAP *heap ) HRESULT hr; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); WsFreeWriter( writer ); return S_OK; } @@ -6167,124 +6167,124 @@ static void test_WsReadXmlBuffer(void) HRESULT hr; hr = WsReadXmlBuffer( NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadXmlBuffer( reader, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadXmlBuffer( reader, heap, NULL, NULL ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %#lx\n", hr ); hr = WsReadXmlBuffer( reader, heap, &buffer, NULL ); - todo_wine ok( hr == E_FAIL, "got %08x\n", hr ); + todo_wine ok( hr == E_FAIL, "got %#lx\n", hr ); hr = set_input( reader, "<t><v/></t></w>", sizeof("<t><v/></t></w>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); /* reader positioned at element */ buffer = NULL; hr = WsReadXmlBuffer( reader, heap, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( buffer != NULL, "buffer not set\n" ); check_output_buffer( buffer, "<v/>", __LINE__ ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* reader positioned at end element */ hr = WsReadXmlBuffer( reader, heap, &buffer, NULL ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %#lx\n", hr ); hr = set_input( reader, "<t></t><v/>", sizeof("<t></t><v/>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); /* reader positioned at BOF */ hr = WsReadXmlBuffer( reader, heap, &buffer, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); todo_wine ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = set_input( reader, "<t></t>", sizeof("<t></t>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", node->nodeType ); /* reader positioned at non-element */ hr = WsReadXmlBuffer( reader, heap, &buffer, NULL ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %#lx\n", hr ); hr = prepare_xml_buffer_test( reader, heap ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); /* reader positioned at BOF, input buffer */ hr = WsReadXmlBuffer( reader, heap, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<t></t>", __LINE__ ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); /* reader positioned at EOF, input buffer */ hr = WsReadXmlBuffer( reader, heap, &buffer, NULL ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %#lx\n", hr ); hr = prepare_xml_buffer_test( reader, heap ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadNode( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); /* reader positioned at element, input buffer */ hr = WsReadXmlBuffer( reader, heap, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "", __LINE__ ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* reader positioned at end element, input buffer */ hr = WsReadXmlBuffer( reader, heap, &buffer, NULL ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %#lx\n", hr ); WsFreeReader( reader ); WsFreeHeap( heap ); @@ -6314,10 +6314,10 @@ static void test_union_type(void) } *test; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.value = CHOICE_A; @@ -6363,19 +6363,19 @@ static void test_union_type(void) prepare_struct_type_test( reader, "<a>test</a>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); ok( test->choice == CHOICE_A, "got %d\n", test->choice ); ok( !wcscmp(test->value.a, L"test"), "got %s\n", wine_dbgstr_w(test->value.a) ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); test = NULL; prepare_struct_type_test( reader, "123" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); ok( test->choice == CHOICE_B, "got %d\n", test->choice ); ok( test->value.b == 123, "got %u\n", test->value.b ); @@ -6383,36 +6383,36 @@ static void test_union_type(void) prepare_struct_type_test( reader, "<c>456</c>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); f_struct.options = WS_FIELD_NILLABLE; hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); f_struct.options = WS_FIELD_POINTER|WS_FIELD_NILLABLE; hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); f_struct.options = WS_FIELD_POINTER; hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); test = NULL; f_struct.options = WS_FIELD_OPTIONAL; prepare_struct_type_test( reader, "<c>456</c>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); ok( test->choice == CHOICE_NONE, "got %d\n", test->choice ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); WsFreeReader( reader ); @@ -6488,10 +6488,10 @@ static void test_float(void) ULONG val, i; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { @@ -6499,8 +6499,8 @@ static void test_float(void) prepare_type_test( reader, tests[i].str, strlen(tests[i].str) ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_FLOAT_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val, sizeof(val), NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); - if (hr == tests[i].hr) ok( val == tests[i].val, "%u: got %08x\n", i, val ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); + if (hr == tests[i].hr) ok( val == tests[i].val, "%lu: got %#lx\n", i, val ); } WsFreeReader( reader ); @@ -6536,10 +6536,10 @@ static void test_repeating_element_choice(void) } *test; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.value = CHOICE_A; @@ -6588,9 +6588,9 @@ static void test_repeating_element_choice(void) prepare_struct_type_test( reader, "<t><a>test</a></t>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); - ok( test->count == 1, "got %u\n", test->count ); + ok( test->count == 1, "got %lu\n", test->count ); ok( test->items[0].choice == CHOICE_A, "got %d\n", test->items[0].choice ); ok( !wcscmp(test->items[0].value.a, L"test"), "got %s\n", wine_dbgstr_w(test->items[0].value.a) ); @@ -6598,9 +6598,9 @@ static void test_repeating_element_choice(void) prepare_struct_type_test( reader, "<t>123</t>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); - ok( test->count == 1, "got %u\n", test->count ); + ok( test->count == 1, "got %lu\n", test->count ); ok( test->items[0].choice == CHOICE_B, "got %d\n", test->items[0].choice ); ok( test->items[0].value.b == 123, "got %u\n", test->items[0].value.b ); @@ -6608,9 +6608,9 @@ static void test_repeating_element_choice(void) prepare_struct_type_test( reader, "<t><a>test</a>123</t>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); - ok( test->count == 2, "got %u\n", test->count ); + ok( test->count == 2, "got %lu\n", test->count ); ok( test->items[0].choice == CHOICE_A, "got %d\n", test->items[0].choice ); ok( !wcscmp(test->items[0].value.a, L"test"), "got %s\n", wine_dbgstr_w(test->items[0].value.a) ); ok( test->items[1].choice == CHOICE_B, "got %d\n", test->items[1].choice ); @@ -6619,27 +6619,27 @@ static void test_repeating_element_choice(void) prepare_struct_type_test( reader, "<t><c>123</c></t>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); todo_wine ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); if (node->nodeType == WS_XML_NODE_TYPE_ELEMENT) { const WS_XML_ELEMENT_NODE *elem = (const WS_XML_ELEMENT_NODE *)node; - ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( elem->localName->length == 1, "got %lu\n", elem->localName->length ); ok( elem->localName->bytes[0] == 'c', "got '%c'\n", elem->localName->bytes[0] ); } prepare_struct_type_test( reader, "<t></t>" ); hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); - ok( !test->count, "got %u\n", test->count ); + ok( !test->count, "got %lu\n", test->count ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); WsFreeReader( reader ); @@ -6676,10 +6676,10 @@ static void test_empty_text_field(void) } *test5; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_TEXT_FIELD_MAPPING; @@ -6699,9 +6699,9 @@ static void test_empty_text_field(void) prepare_struct_type_test( reader, "<t></t>" ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); - ok( !test->str.length, "got %u\n", test->str.length ); + ok( !test->str.length, "got %lu\n", test->str.length ); todo_wine ok( test->str.chars != NULL, "chars not set\n" ); memset( &f, 0, sizeof(f) ); @@ -6722,7 +6722,7 @@ static void test_empty_text_field(void) prepare_struct_type_test( reader, "<t></t>" ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test2, sizeof(test2), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test2 != NULL, "test2 not set\n" ); ok( test2->str != NULL, "str not set\n" ); ok( !test2->str[0], "not empty\n" ); @@ -6744,7 +6744,7 @@ static void test_empty_text_field(void) prepare_struct_type_test( reader, "<t></t>" ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test3, sizeof(test3), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_TEXT_FIELD_MAPPING; @@ -6764,9 +6764,9 @@ static void test_empty_text_field(void) prepare_struct_type_test( reader, "<t></t>" ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test4, sizeof(test4), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test4 != NULL, "test4 not set\n" ); - ok( !test4->str.length, "got %u\n", test4->str.length ); + ok( !test4->str.length, "got %lu\n", test4->str.length ); todo_wine ok( test4->str.bytes != NULL, "bytes not set\n" ); memset( &f, 0, sizeof(f) ); @@ -6787,9 +6787,9 @@ static void test_empty_text_field(void) prepare_struct_type_test( reader, "<t></t>" ); hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test5, sizeof(test5), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test5 != NULL, "test5 not set\n" ); - ok( !test5->bytes.length, "got %u\n", test5->bytes.length ); + ok( !test5->bytes.length, "got %lu\n", test5->bytes.length ); todo_wine ok( test5->bytes.bytes != NULL, "bytes not set\n" ); WsFreeReader( reader ); @@ -6840,61 +6840,61 @@ static void test_stream_input(void) ULONG i, size; hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); stream.input.inputType = WS_XML_READER_INPUT_TYPE_STREAM; stream.readCallback = read_callback; stream.readCallbackState = (void *)&stream_tests[2]; hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); size = sizeof(charset); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); - todo_wine ok( hr == WS_E_QUOTA_EXCEEDED, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_QUOTA_EXCEEDED, "got %#lx\n", hr ); hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, strlen(stream_tests[2].xml), NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); charset = 0xdeadbeef; size = sizeof(charset); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); found = -1; hr = WsReadToStartElement( reader, &str_t, &str_ns, &found, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE(stream_tests); i++) { stream.readCallbackState = (void *)&stream_tests[i]; hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsFillReader( reader, strlen( stream_tests[i].xml ), NULL, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); found = -1; hr = WsReadToStartElement( reader, &str_t, &str_ns, &found, NULL ); - todo_wine_if(stream_tests[i].todo) ok( hr == stream_tests[i].hr, "%u: got %08x\n", i, hr ); + todo_wine_if(stream_tests[i].todo) ok( hr == stream_tests[i].hr, "%lu: got %#lx\n", i, hr ); if (hr == S_OK) { - ok( found == TRUE, "%u: got %d\n", i, found ); + ok( found == TRUE, "%lu: got %d\n", i, found ); hr = WsReadStartElement( reader, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); - if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "%u: got %u\n", i, node->nodeType ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "%lu: got %u\n", i, node->nodeType ); } } @@ -6917,10 +6917,10 @@ static void test_description_type(void) } *test; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_TYPE_ATTRIBUTE_FIELD_MAPPING; @@ -6945,12 +6945,12 @@ static void test_description_type(void) prepare_struct_type_test( reader, "<t val=\"-1\" xmlns=\"ns\"/>" ); hr = WsReadToStartElement( reader, &localname, &ns2, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); test = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( test != NULL, "test not set\n" ); if (test) { diff --git a/dlls/webservices/tests/url.c b/dlls/webservices/tests/url.c index 4343dc6a3dd..054752c0665 100644 --- a/dlls/webservices/tests/url.c +++ b/dlls/webservices/tests/url.c @@ -109,20 +109,20 @@ static void test_WsDecodeUrl(void) UINT i; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsDecodeUrl( NULL, 0, heap, (WS_URL **)&url, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); str.chars = NULL; str.length = 0; hr = WsDecodeUrl( &str, 0, heap, (WS_URL **)&url, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); str.chars = (WCHAR *)url1; str.length = lstrlenW( url1 ); hr = WsDecodeUrl( &str, 0, NULL, (WS_URL **)&url, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { @@ -132,7 +132,7 @@ static void test_WsDecodeUrl(void) hr = WsDecodeUrl( &str, 0, heap, (WS_URL **)&url, NULL ); ok( hr == tests[i].hr || broken(hr == WS_E_INVALID_FORMAT && str.length >= 8 && !memcmp(L"net.pipe", str.chars, 8)), - "%u: got %08x\n", i, hr ); + "%u: got %#lx\n", i, hr ); if (hr != S_OK) continue; ok( url->url.scheme == tests[i].scheme, "%u: got %u\n", i, url->url.scheme ); @@ -140,43 +140,43 @@ static void test_WsDecodeUrl(void) if (tests[i].host) { - ok( url->host.length == tests[i].host_len, "%u: got %u\n", i, url->host.length ); + ok( url->host.length == tests[i].host_len, "%u: got %lu\n", i, url->host.length ); ok( !memcmp( url->host.chars, tests[i].host, url->host.length * sizeof(WCHAR) ), "%u: got %s\n", i, wine_dbgstr_wn(url->host.chars, url->host.length) ); } - else ok( !url->host.length, "%u: got %u\n", i, url->host.length ); + else ok( !url->host.length, "%u: got %lu\n", i, url->host.length ); if (tests[i].port_str) { - ok( url->portAsString.length == tests[i].port_len, "%u: got %u\n", i, url->portAsString.length ); + ok( url->portAsString.length == tests[i].port_len, "%u: got %lu\n", i, url->portAsString.length ); ok( !memcmp( url->portAsString.chars, tests[i].port_str, url->portAsString.length * sizeof(WCHAR) ), "%u: got %s\n", i, wine_dbgstr_wn(url->portAsString.chars, url->portAsString.length) ); } - else ok( !url->portAsString.length, "%u: got %u\n", i, url->portAsString.length ); + else ok( !url->portAsString.length, "%u: got %lu\n", i, url->portAsString.length ); if (tests[i].path) { - ok( url->path.length == tests[i].path_len, "%u: got %u\n", i, url->path.length ); + ok( url->path.length == tests[i].path_len, "%u: got %lu\n", i, url->path.length ); ok( !memcmp( url->path.chars, tests[i].path, url->path.length * sizeof(WCHAR) ), "%u: got %s\n", i, wine_dbgstr_wn(url->path.chars, url->path.length) ); } - else ok( !url->path.length, "%u: got %u\n", i, url->path.length ); + else ok( !url->path.length, "%u: got %lu\n", i, url->path.length ); if (tests[i].query) { - ok( url->query.length == tests[i].query_len, "%u: got %u\n", i, url->query.length ); + ok( url->query.length == tests[i].query_len, "%u: got %lu\n", i, url->query.length ); ok( !memcmp( url->query.chars, tests[i].query, url->query.length * sizeof(WCHAR) ), "%u: got %s\n", i, wine_dbgstr_wn(url->query.chars, url->query.length) ); } - else ok( !url->query.length, "%u: got %u\n", i, url->query.length ); + else ok( !url->query.length, "%u: got %lu\n", i, url->query.length ); if (tests[i].fragment) { - ok( url->fragment.length == tests[i].fragment_len, "%u: got %u\n", i, url->fragment.length ); + ok( url->fragment.length == tests[i].fragment_len, "%u: got %lu\n", i, url->fragment.length ); ok( !memcmp( url->fragment.chars, tests[i].fragment, url->fragment.length * sizeof(WCHAR) ), "%u: got %s\n", i, wine_dbgstr_wn(url->fragment.chars, url->fragment.length) ); } - else ok( !url->fragment.length, "%u: got %u\n", i, url->fragment.length ); + else ok( !url->fragment.length, "%u: got %lu\n", i, url->fragment.length ); } WsFreeHeap( heap ); @@ -240,16 +240,16 @@ static void test_WsEncodeUrl(void) UINT i; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsEncodeUrl( NULL, 0, heap, &str, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsEncodeUrl( (const WS_URL *)&url, 0, NULL, &str, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsEncodeUrl( (const WS_URL *)&url, 0, heap, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { @@ -269,10 +269,10 @@ static void test_WsEncodeUrl(void) memset( &str, 0, sizeof(str) ); hr = WsEncodeUrl( (const WS_URL *)&url, 0, heap, &str, NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr, "%u: got %#lx\n", i, hr ); if (hr != S_OK) continue; - ok( str.length == tests[i].len, "%u: got %u\n", i, str.length ); + ok( str.length == tests[i].len, "%u: got %lu\n", i, str.length ); ok( !memcmp( str.chars, tests[i].chars, tests[i].len * sizeof(WCHAR) ), "%u: wrong url %s\n", i, wine_dbgstr_wn(str.chars, str.length) ); } diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index ab74c2e84e3..c09a9916120 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -43,107 +43,107 @@ static void test_WsCreateWriter(void) WS_BYTES bytes; hr = WsCreateWriter( NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); writer = NULL; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( writer != NULL, "writer not set\n" ); /* can't retrieve properties before output is set */ max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); ok( max_depth == 0xdeadbeef, "max_depth set\n" ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* check some defaults */ max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_depth == 32, "got %u\n", max_depth ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_depth == 32, "got %lu\n", max_depth ); allow_fragment = TRUE; size = sizeof(allow_fragment); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT, &allow_fragment, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !allow_fragment, "got %d\n", allow_fragment ); max_attrs = 0xdeadbeef; size = sizeof(max_attrs); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES, &max_attrs, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_attrs == 128, "got %u\n", max_attrs ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_attrs == 128, "got %lu\n", max_attrs ); write_decl = TRUE; size = sizeof(write_decl); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_WRITE_DECLARATION, &write_decl, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !write_decl, "got %d\n", write_decl ); indent = 0xdeadbeef; size = sizeof(indent); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_INDENT, &indent, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !indent, "got %u\n", indent ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !indent, "got %lu\n", indent ); trim_size = 0xdeadbeef; size = sizeof(trim_size); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE, &trim_size, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( trim_size == 4096, "got %u\n", trim_size ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( trim_size == 4096, "got %lu\n", trim_size ); charset = 0xdeadbeef; size = sizeof(charset); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_CHARSET, &charset, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); buffers.bufferCount = 0xdeadbeef; buffers.buffers = (WS_BYTES *)0xdeadbeef; size = sizeof(buffers); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFERS, &buffers, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !buffers.bufferCount, "got %u\n", buffers.bufferCount ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !buffers.bufferCount, "got %lu\n", buffers.bufferCount ); ok( !buffers.buffers, "got %p\n", buffers.buffers ); max_size = 0xdeadbeef; size = sizeof(max_size); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, &max_size, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_size == 65536, "got %u\n", max_size ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_size == 65536, "got %lu\n", max_size ); bytes.length = 0xdeadbeef; bytes.bytes = (BYTE *)0xdeadbeef; size = sizeof(bytes); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !bytes.length, "got %u\n", bytes.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !bytes.length, "got %lu\n", bytes.length ); ok( bytes.bytes != NULL, "got %p\n", bytes.bytes ); max_size = 0xdeadbeef; size = sizeof(max_size); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE, &max_size, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_size == 65536, "got %u\n", max_size ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_size == 65536, "got %lu\n", max_size ); bytes.length = 0xdeadbeef; bytes.bytes = (BYTE *)0xdeadbeef; size = sizeof(bytes); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_INITIAL_BUFFER, &bytes, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !bytes.length, "got %u\n", bytes.length ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !bytes.length, "got %lu\n", bytes.length ); ok( !bytes.bytes, "got %p\n", bytes.bytes ); max_ns = 0xdeadbeef; size = sizeof(max_ns); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_NAMESPACES, &max_ns, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_ns == 32, "got %u\n", max_ns ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_ns == 32, "got %lu\n", max_ns ); WsFreeWriter( writer ); /* change a property */ @@ -152,16 +152,16 @@ static void test_WsCreateWriter(void) prop.value = &max_depth; prop.valueSize = sizeof(max_depth); hr = WsCreateWriter( &prop, 1, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_depth == 16, "got %u\n", max_depth ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_depth == 16, "got %lu\n", max_depth ); WsFreeWriter( writer ); /* show that some properties are read-only */ @@ -170,21 +170,21 @@ static void test_WsCreateWriter(void) prop.value = &in_attr; prop.valueSize = sizeof(in_attr); hr = WsCreateWriter( &prop, 1, &writer, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); size = 1; prop.id = WS_XML_WRITER_PROPERTY_BYTES_WRITTEN; prop.value = &size; prop.valueSize = sizeof(size); hr = WsCreateWriter( &prop, 1, &writer, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); size = 1; prop.id = WS_XML_WRITER_PROPERTY_BYTES_TO_CLOSE; prop.value = &size; prop.valueSize = sizeof(size); hr = WsCreateWriter( &prop, 1, &writer, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); } static void test_WsCreateXmlBuffer(void) @@ -197,35 +197,35 @@ static void test_WsCreateXmlBuffer(void) ULONG size; hr = WsCreateXmlBuffer( NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( NULL, NULL, 0, &buffer, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); buffer = NULL; hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( buffer != NULL, "buffer not set\n" ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); size = sizeof(bytes); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); size = sizeof(bytes); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + todo_wine ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeWriter( writer ); WsFreeHeap( heap ); @@ -241,10 +241,10 @@ static void test_WsSetOutput(void) ULONG size, max_depth; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutput( NULL, NULL, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); encoding.encoding.encodingType = WS_XML_WRITER_ENCODING_TYPE_TEXT; encoding.charSet = WS_CHARSET_UTF8; @@ -252,11 +252,11 @@ static void test_WsSetOutput(void) output.output.outputType = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; hr = WsSetOutput( writer, &encoding.encoding, &output.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* multiple calls are allowed */ hr = WsSetOutput( writer, &encoding.encoding, &output.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* writer properties can be set with WsSetOutput */ max_depth = 16; @@ -264,13 +264,13 @@ static void test_WsSetOutput(void) prop.value = &max_depth; prop.valueSize = sizeof(max_depth); hr = WsSetOutput( writer, &encoding.encoding, &output.output, &prop, 1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_depth == 16, "got %u\n", max_depth ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_depth == 16, "got %lu\n", max_depth ); WsFreeWriter( writer ); } @@ -284,26 +284,26 @@ static void test_WsSetOutputToBuffer(void) ULONG size, max_depth; hr = WsSetOutputToBuffer( NULL, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* multiple calls are allowed */ hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* writer properties can be set with WsSetOutputToBuffer */ max_depth = 16; @@ -311,13 +311,13 @@ static void test_WsSetOutputToBuffer(void) prop.value = &max_depth; prop.valueSize = sizeof(max_depth); hr = WsSetOutputToBuffer( writer, buffer, &prop, 1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); max_depth = 0xdeadbeef; size = sizeof(max_depth); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( max_depth == 16, "got %u\n", max_depth ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( max_depth == 16, "got %lu\n", max_depth ); WsFreeWriter( writer ); WsFreeHeap( heap ); @@ -367,8 +367,8 @@ static void check_output( WS_XML_WRITER *writer, const char *expected, unsigned memset( &bytes, 0, sizeof(bytes) ); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); - ok( hr == S_OK, "%u: got %08x\n", line, hr ); - ok( bytes.length == len, "%u: got %u expected %u\n", line, bytes.length, len ); + ok( hr == S_OK, "%u: got %#lx\n", line, hr ); + ok( bytes.length == len, "%u: got %lu expected %d\n", line, bytes.length, len ); if (bytes.length != len) return; ok( !memcmp( bytes.bytes, expected, len ), "%u: got %s expected %s\n", line, debugstr_bytes(bytes.bytes, bytes.length), expected ); @@ -382,86 +382,86 @@ static void test_WsWriteStartElement(void) WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}, empty = {0, NULL}; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( NULL, &prefix, &localname, &ns, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); /* first call to WsWriteStartElement doesn't output anything */ hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); /* two ways to close an element */ hr = WsWriteEndStartElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\"></p:a>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\"/>", __LINE__ ); /* nested elements */ hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\"><p:b/>", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\"><p:b/></p:a>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:a xmlns:p=\"ns\"></p:a>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &empty, &localname, &empty, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndStartElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<a></a>", __LINE__ ); WsFreeWriter( writer ); @@ -476,72 +476,72 @@ static void test_WsWriteStartAttribute(void) WS_XML_UTF8_TEXT text = {{WS_XML_TEXT_TYPE_UTF8}}; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( NULL, &prefix, &localname, &ns, FALSE, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); /* WsWriteStartAttribute doesn't output anything */ hr = WsWriteStartAttribute( writer, &prefix, &localname2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); text.value.length = 1; text.value.bytes = (BYTE *)"0"; hr = WsWriteText( writer, &text.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); /* WsWriteEndAttribute doesn't output anything */ hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:str p:len=\"0\" xmlns:p=\"ns\"/>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, &empty, &localname2, &empty, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:str len=\"\" xmlns:p=\"ns\"/>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname2, &empty, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:str len=\"\" p:str=\"\" xmlns:p=\"ns\"/>", __LINE__ ); WsFreeWriter( writer ); @@ -560,93 +560,93 @@ static void test_WsWriteType(void) int val_enum; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); val_str = L"test"; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* required value */ hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, NULL, sizeof(L"test"), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, L"test", sizeof(L"test"), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); /* required pointer */ hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, NULL, sizeof(val_str), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, L"test", sizeof(L"test"), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(WCHAR **), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:str xmlns:p=\"ns\">test", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); val_str = L"test"; hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:str p:str=\"test\" xmlns:p=\"ns\"/>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); val_str = L"test"; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &val_str, sizeof(val_str), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:str xmlns:p=\"ns\">test", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); enum_desc.values = enum_values; enum_desc.valueCount = ARRAY_SIZE(enum_values); @@ -656,20 +656,20 @@ static void test_WsWriteType(void) val_enum = 0; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); val_enum = 3; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); val_enum = ONE; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:str xmlns:p=\"ns\">ONE</p:str>", __LINE__ ); WsFreeWriter( writer ); @@ -681,9 +681,9 @@ static void prepare_basic_type_test( WS_XML_WRITER *writer ) HRESULT hr; hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); } static void test_basic_type(void) @@ -723,7 +723,7 @@ static void test_basic_type(void) }; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* element content type mapping */ for (i = 0; i < ARRAY_SIZE( tests ); i++) @@ -731,10 +731,10 @@ static void test_basic_type(void) prepare_basic_type_test( writer ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, tests[i].type, NULL, WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, tests[i].result, __LINE__ ); } @@ -746,10 +746,10 @@ static void test_basic_type(void) prepare_basic_type_test( writer ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, tests[i].type, NULL, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, tests[i].result, __LINE__ ); } @@ -758,17 +758,17 @@ static void test_basic_type(void) { prepare_basic_type_test( writer ); hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, tests[i].type, NULL, WS_WRITE_REQUIRED_VALUE, &tests[i].val, tests[i].size, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, tests[i].result2, __LINE__ ); } @@ -776,9 +776,9 @@ static void test_basic_type(void) memset( &guid, 0, sizeof(guid) ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &guid, sizeof(guid), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>00000000-0000-0000-0000-000000000000</t>", __LINE__ ); prepare_basic_type_test( writer ); @@ -786,18 +786,18 @@ static void test_basic_type(void) string.length = 4; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRING_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &string, sizeof(string), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>test</t>", __LINE__ ); prepare_basic_type_test( writer ); str = L"test"; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &str, sizeof(str), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>test</t>", __LINE__ ); prepare_basic_type_test( writer ); @@ -805,9 +805,9 @@ static void test_basic_type(void) xmlstr.length = 4; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_XML_STRING_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &xmlstr, sizeof(xmlstr), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>test</t>", __LINE__ ); prepare_basic_type_test( writer ); @@ -815,35 +815,35 @@ static void test_basic_type(void) bytes.length = 4; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_BYTES_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &bytes, sizeof(bytes), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>dGVzdA==</t>", __LINE__ ); prepare_basic_type_test( writer ); bytes.length = 0; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_BYTES_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &bytes, sizeof(bytes), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t/>", __LINE__ ); prepare_basic_type_test( writer ); bytes.bytes = NULL; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_BYTES_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &bytes, sizeof(bytes), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t/>", __LINE__ ); prepare_basic_type_test( writer ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_BYTES_TYPE, NULL, WS_WRITE_NILLABLE_VALUE, &bytes, sizeof(bytes), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t a:nil=\"true\" xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/>", __LINE__ ); @@ -851,9 +851,9 @@ static void test_basic_type(void) memset( &id, 0, sizeof(id) ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &id, sizeof(id), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>urn:uuid:00000000-0000-0000-0000-000000000000</t>", __LINE__ ); prepare_basic_type_test( writer ); @@ -861,9 +861,9 @@ static void test_basic_type(void) id.uri.chars = (WCHAR *)L"test"; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_UNIQUE_ID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &id, sizeof(id), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>test</t>", __LINE__ ); WsFreeWriter( writer ); @@ -882,13 +882,13 @@ static void test_simple_struct_type(void) } *test; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_TEXT_FIELD_MAPPING; @@ -905,67 +905,67 @@ static void test_simple_struct_type(void) test->field = L"value"; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, NULL, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, test, sizeof(*test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<struct>value</struct>", __LINE__ ); /* required value */ hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, test, sizeof(*test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<struct>value</struct>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<struct>value</struct>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<struct struct=\"value\"/>", __LINE__ ); free( test ); @@ -983,10 +983,10 @@ static void test_WsWriteElement(void) struct test { const WCHAR *str; } *test; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* text field mapping */ memset( &f, 0, sizeof(f) ); @@ -1008,45 +1008,45 @@ static void test_WsWriteElement(void) test = malloc( sizeof(*test) ); test->str = L"test"; hr = WsWriteElement( NULL, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteElement( writer, NULL, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<str>test</str>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<str><str>test</str>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* attribute field mapping */ f.mapping = WS_ATTRIBUTE_FIELD_MAPPING; /* requires localName and ns to be set */ hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); f.localName = &localname; f.ns = &ns; hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<str str=\"test\"/>", __LINE__ ); free( test ); @@ -1085,51 +1085,51 @@ static void test_WsWriteValue(void) }; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteValue( NULL, tests[0].type, &tests[0].val, tests[0].size, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteValue( writer, tests[0].type, &tests[0].val, tests[0].size, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* zero size */ hr = WsWriteValue( writer, tests[0].type, &tests[0].val, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* NULL value */ hr = WsWriteValue( writer, tests[0].type, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); /* element type mapping */ for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteValue( writer, tests[i].type, &tests[i].val, tests[i].size, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, tests[i].result, __LINE__ ); } @@ -1137,22 +1137,22 @@ static void test_WsWriteValue(void) for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteValue( writer, tests[i].type, &tests[i].val, tests[i].size, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, tests[i].result2, __LINE__ ); } @@ -1170,10 +1170,10 @@ static void test_WsWriteAttribute(void) struct test { const WCHAR *str; } *test; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* text field mapping */ memset( &f, 0, sizeof(f) ); @@ -1195,28 +1195,28 @@ static void test_WsWriteAttribute(void) test = malloc( sizeof(*test) ); test->str = L"test"; hr = WsWriteAttribute( NULL, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteAttribute( writer, NULL, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteAttribute( writer, &desc, WS_WRITE_REQUIRED_POINTER, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsWriteAttribute( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteAttribute( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<str str=\"test\"/>", __LINE__ ); free( test ); @@ -1231,40 +1231,40 @@ static void test_WsWriteStartCData(void) WS_XML_UTF8_TEXT text = {{WS_XML_TEXT_TYPE_UTF8}}; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndCData( writer, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteStartCData( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t><![CDATA[", __LINE__ ); text.value.bytes = (BYTE *)"<data>"; text.value.length = 6; hr = WsWriteText( writer, &text.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t><![CDATA[<data>", __LINE__ ); hr = WsWriteEndCData( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t><![CDATA[<data>]]>", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t><![CDATA[<data>]]></t>", __LINE__ ); WsFreeWriter( writer ); @@ -1279,18 +1279,18 @@ static void check_output_buffer( WS_XML_BUFFER *buffer, const char *expected, un HRESULT hr; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlBuffer( writer, buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &bytes, 0, sizeof(bytes) ); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); - ok( hr == S_OK, "%u: got %08x\n", line, hr ); - ok( bytes.length == len, "%u: got %u expected %u\n", line, bytes.length, len ); + ok( hr == S_OK, "%u: got %#lx\n", line, hr ); + ok( bytes.length == len, "%u: got %lu expected %d\n", line, bytes.length, len ); if (bytes.length != len) return; ok( !memcmp( bytes.bytes, expected, len ), "%u: got %s expected %s\n", line, bytes.bytes, expected ); @@ -1303,16 +1303,16 @@ static void prepare_xmlns_test( WS_XML_WRITER *writer, WS_HEAP **heap, WS_XML_BU HRESULT hr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( *heap, NULL, 0, buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, *buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); } static void test_WsWriteXmlnsAttribute(void) @@ -1327,149 +1327,149 @@ static void test_WsWriteXmlnsAttribute(void) HRESULT hr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlnsAttribute( NULL, NULL, NULL, FALSE, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeHeap( heap ); prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, NULL, NULL, FALSE, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeHeap( heap ); prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix2, NULL, FALSE, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlnsAttribute( writer, NULL, &ns, FALSE, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); WsFreeHeap( heap ); /* no prefix */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, NULL, &ns2, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<prefix:t xmlns:prefix=\"ns\" xmlns=\"ns2\"/>", __LINE__ ); WsFreeHeap( heap ); /* prefix */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns2, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<prefix:t xmlns:prefix2=\"ns2\" xmlns:prefix=\"ns\"/>", __LINE__ ); WsFreeHeap( heap ); /* implicitly set element prefix namespace */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<prefix:t xmlns:prefix=\"ns\"/>", __LINE__ ); WsFreeHeap( heap ); /* explicitly set element prefix namespace */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix, &ns, TRUE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<prefix:t xmlns:prefix='ns'/>", __LINE__ ); WsFreeHeap( heap ); /* repeated calls, same namespace */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<prefix:t xmlns:prefix2=\"ns\" xmlns:prefix=\"ns\"/>", __LINE__ ); WsFreeHeap( heap ); /* repeated calls, different namespace */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns2, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeHeap( heap ); /* single quotes */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns, TRUE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<prefix:t xmlns:prefix2='ns' xmlns:prefix=\"ns\"/>", __LINE__ ); WsFreeHeap( heap ); /* different namespace, different prefix */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns2, TRUE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<prefix:t xmlns:prefix2='ns2' xmlns:prefix=\"ns\"/>", __LINE__ ); WsFreeHeap( heap ); /* different namespace, same prefix */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix, &ns2, TRUE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeHeap( heap ); /* regular attribute */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteStartAttribute( writer, &xmlns, &prefix2, &ns2, TRUE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeHeap( heap ); /* attribute order */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix, &ns, TRUE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, &prefix, &attr, &ns, TRUE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns2, TRUE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<prefix:t prefix:attr='' xmlns:prefix='ns' xmlns:prefix2='ns2'/>", __LINE__ ); WsFreeHeap( heap ); /* scope */ prepare_xmlns_test( writer, &heap, &buffer ); hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns2, TRUE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix2, &localname, &ns2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<prefix:t xmlns:prefix2='ns2' xmlns:prefix=\"ns\"><prefix2:u/></prefix:t>", __LINE__ ); WsFreeHeap( heap ); @@ -1483,11 +1483,11 @@ static void prepare_prefix_test( WS_XML_WRITER *writer ) HRESULT hr; hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndStartElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); } static void test_WsGetPrefixFromNamespace(void) @@ -1498,72 +1498,72 @@ static void test_WsGetPrefixFromNamespace(void) HRESULT hr; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetPrefixFromNamespace( NULL, NULL, FALSE, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetPrefixFromNamespace( NULL, NULL, FALSE, &prefix, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsGetPrefixFromNamespace( writer, NULL, FALSE, &prefix, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); /* element must be committed */ hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetPrefixFromNamespace( writer, &ns, TRUE, &prefix, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); /* but writer can't be positioned on end element node */ hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetPrefixFromNamespace( writer, &ns, TRUE, &prefix, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); /* required = TRUE */ prefix = NULL; prepare_prefix_test( writer ); hr = WsGetPrefixFromNamespace( writer, &ns, TRUE, &prefix, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( prefix != NULL, "prefix not set\n" ); if (prefix) { - ok( prefix->length == 1, "got %u\n", prefix->length ); + ok( prefix->length == 1, "got %lu\n", prefix->length ); ok( !memcmp( prefix->bytes, "p", 1 ), "wrong prefix\n" ); } prefix = (const WS_XML_STRING *)0xdeadbeef; hr = WsGetPrefixFromNamespace( writer, &ns2, TRUE, &prefix, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); ok( prefix == (const WS_XML_STRING *)0xdeadbeef, "prefix set\n" ); /* required = FALSE */ prefix = NULL; prepare_prefix_test( writer ); hr = WsGetPrefixFromNamespace( writer, &ns, FALSE, &prefix, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( prefix != NULL, "prefix not set\n" ); if (prefix) { - ok( prefix->length == 1, "got %u\n", prefix->length ); + ok( prefix->length == 1, "got %lu\n", prefix->length ); ok( !memcmp( prefix->bytes, "p", 1 ), "wrong prefix\n" ); } prefix = (const WS_XML_STRING *)0xdeadbeef; hr = WsGetPrefixFromNamespace( writer, &ns2, FALSE, &prefix, NULL ); - ok( hr == S_FALSE, "got %08x\n", hr ); + ok( hr == S_FALSE, "got %#lx\n", hr ); ok( prefix == NULL, "prefix not set\n" ); WsFreeWriter( writer ); @@ -1598,19 +1598,19 @@ static void test_complex_struct_type(void) } *test; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &str_officeconfig, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f2, 0, sizeof(f2) ); f2.mapping = WS_ATTRIBUTE_FIELD_MAPPING; @@ -1657,10 +1657,10 @@ static void test_complex_struct_type(void) test->services->generationtime = L"2015-09-03T18:47:54"; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, expected, __LINE__ ); free( test ); @@ -1677,63 +1677,63 @@ static void test_WsMoveWriter(void) HRESULT hr; hr = WsMoveWriter( NULL, WS_MOVE_TO_EOF, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* writer must be set to an XML buffer */ hr = WsMoveWriter( writer, WS_MOVE_TO_EOF, NULL, NULL ); - todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveWriter( writer, WS_MOVE_TO_EOF, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* <a></a> */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveWriter( writer, WS_MOVE_TO_EOF, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveWriter( writer, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveWriter( writer, WS_MOVE_TO_CHILD_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveWriter( writer, WS_MOVE_TO_END_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveWriter( writer, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveWriter( writer, WS_MOVE_TO_END_ELEMENT, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsMoveWriter( writer, WS_MOVE_TO_BOF, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); WsFreeWriter( writer ); WsFreeHeap( heap ); @@ -1748,36 +1748,36 @@ static void test_WsGetWriterPosition(void) HRESULT hr; hr = WsGetWriterPosition( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetWriterPosition( writer, &pos, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* writer must be set to an XML buffer */ hr = WsGetWriterPosition( writer, &pos, NULL ); - todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetWriterPosition( writer, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); pos.buffer = pos.node = NULL; hr = WsGetWriterPosition( writer, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( pos.buffer != NULL, "buffer not set\n" ); ok( pos.node != NULL, "node not set\n" ); @@ -1795,62 +1795,62 @@ static void test_WsSetWriterPosition(void) HRESULT hr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetWriterPosition( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buf1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buf1, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetWriterPosition( writer, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); pos.buffer = pos.node = NULL; hr = WsGetWriterPosition( writer, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( pos.buffer == buf1, "wrong buffer\n" ); ok( pos.node != NULL, "node not set\n" ); hr = WsSetWriterPosition( writer, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* different buffer */ hr = WsCreateXmlBuffer( heap, NULL, 0, &buf2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); pos.buffer = buf2; hr = WsSetWriterPosition( writer, &pos, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buf1, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* try to write at non-final position */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); pos.buffer = pos.node = NULL; hr = WsGetWriterPosition( writer, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( pos.buffer == buf1, "wrong buffer\n" ); ok( pos.node != NULL, "node not set\n" ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buf1, "<t/>", __LINE__ ); hr = WsSetWriterPosition( writer, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeWriter( writer ); WsFreeHeap( heap ); @@ -1865,48 +1865,48 @@ static void test_WsWriteXmlBuffer(void) HRESULT hr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( NULL, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer1, buffer1, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer1, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer1, "<t/>", __LINE__ ); hr = WsCreateWriter( NULL, 0, &writer2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer2, buffer2, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlBuffer( writer2, buffer1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer2, "<t/>", __LINE__ ); hr = WsMoveWriter( writer2, WS_MOVE_TO_PREVIOUS_ELEMENT, NULL, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteXmlBuffer( writer2, buffer1, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeWriter( writer1 ); WsFreeWriter( writer2 ); @@ -1928,22 +1928,22 @@ static void test_WsWriteNode(void) HRESULT hr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteNode( NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteNode( writer, NULL, NULL ); - todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); utf8.value.bytes = (BYTE *)"value"; utf8.value.length = sizeof("value") - 1; @@ -1964,43 +1964,43 @@ static void test_WsWriteNode(void) elem.attributes = attrs; elem.isEmpty = FALSE; hr = WsWriteNode( writer, &elem.node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); comment.value.bytes = (BYTE *)"comment"; comment.value.length = sizeof("comment") - 1; hr = WsWriteNode( writer, &comment.node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node.nodeType = WS_XML_NODE_TYPE_EOF; hr = WsWriteNode( writer, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node.nodeType = WS_XML_NODE_TYPE_BOF; hr = WsWriteNode( writer, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node.nodeType = WS_XML_NODE_TYPE_CDATA; hr = WsWriteNode( writer, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); utf8.value.bytes = (BYTE *)"cdata"; utf8.value.length = sizeof("cdata") - 1; text.text = &utf8.text; hr = WsWriteNode( writer, &text.node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node.nodeType = WS_XML_NODE_TYPE_END_CDATA; hr = WsWriteNode( writer, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); utf8.value.bytes = (BYTE *)"text"; utf8.value.length = sizeof("text") - 1; hr = WsWriteNode( writer, &text.node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); node.nodeType = WS_XML_NODE_TYPE_END_ELEMENT; hr = WsWriteNode( writer, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<t attr='value'><![CDATA[cdata]]>text</t>", __LINE__ ); WsFreeWriter( writer ); @@ -2027,112 +2027,112 @@ static void test_WsCopyNode(void) HRESULT hr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetWriterPosition( writer, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<t></t>", __LINE__ ); hr = WsCreateReader( NULL, 0, &reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_input( reader, "<v/>", sizeof("<v/>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof("<v/>") - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetWriterPosition( writer, &pos, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCopyNode( writer, reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_buffer( buffer, "<t><v/></t>", __LINE__ ); hr = WsGetWriterPosition( writer, &pos2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( pos2.buffer == pos.buffer, "wrong buffer\n" ); ok( pos2.node == pos.node, "wrong node\n" ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); /* reader positioned at EOF */ hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCopyNode( writer, reader, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); /* reader positioned at BOF */ hr = set_input( reader, "<v/>", sizeof("<v/>") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFillReader( reader, sizeof("<v/>") - 1, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCopyNode( writer, reader, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<v/>", __LINE__ ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); memset( &bufs, 0, sizeof(bufs) ); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFERS, &bufs, sizeof(bufs), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( bufs.bufferCount == 1, "got %u\n", bufs.bufferCount ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( bufs.bufferCount == 1, "got %lu\n", bufs.bufferCount ); ok( bufs.buffers != NULL, "buffers not set\n" ); /* reader positioned at BOF, single text node */ hr = set_input( reader, "text", sizeof("text") - 1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsCopyNode( writer, reader, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); WsFreeReader( reader ); WsFreeWriter( writer ); @@ -2185,36 +2185,36 @@ static void test_text_types(void) val_qname.ns = &ns; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteText( writer, tests[i].text, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); check_output( writer, tests[i].result, __LINE__ ); } hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); val_qname.prefix = &prefix; val_qname.localName = &localname2; val_qname.ns = &ns2; hr = WsWriteText( writer, &val_qname.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:t xmlns:p=\"ns\">p:u</p:t>", __LINE__ ); WsFreeWriter( writer ); @@ -2253,83 +2253,83 @@ static void test_double(void) ULONG i; hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text.text.textType = WS_XML_TEXT_TYPE_DOUBLE; for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); text.value = tests[i].val; hr = WsWriteText( writer, &text.text, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); check_output( writer, tests[i].result, __LINE__ ); } hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text.value = NAN; hr = WsWriteText( writer, &text.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>NaN</t>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text.value = INFINITY; hr = WsWriteText( writer, &text.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>INF</t>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text.value = -INFINITY; hr = WsWriteText( writer, &text.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>-INF</t>", __LINE__ ); fpword_orig = _control87( 0, 0 ); fpword = _control87( _MCW_EM | _RC_CHOP | _PC_64, _MCW_EM | _MCW_RC | _MCW_PC ); - ok( fpword == (_MCW_EM | _RC_CHOP | _PC_64), "got %08x\n", fpword ); + ok( fpword == (_MCW_EM | _RC_CHOP | _PC_64), "got %#x\n", fpword ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); text.value = 100000000000000; hr = WsWriteText( writer, &text.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>100000000000000</t>", __LINE__ ); fpword = _control87( 0, 0 ); - ok( fpword == (_MCW_EM | _RC_CHOP | _PC_64), "got %08x\n", fpword ); + ok( fpword == (_MCW_EM | _RC_CHOP | _PC_64), "got %#x\n", fpword ); _control87( fpword_orig, _MCW_EM | _MCW_RC | _MCW_PC ); WsFreeWriter( writer ); @@ -2358,13 +2358,13 @@ static void test_field_options(void) } test; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -2420,10 +2420,10 @@ static void test_field_options(void) test.int32_ptr = &val; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, expected, __LINE__ ); WsFreeWriter( writer ); @@ -2439,185 +2439,185 @@ static void test_WsWriteText(void) WS_XML_GUID_TEXT guid = {{WS_XML_TEXT_TYPE_GUID}}; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); utf8.value.bytes = (BYTE *)"test"; utf8.value.length = 4; hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* element, utf8 */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>test", __LINE__ ); utf8.value.bytes = (BYTE *)"tset"; hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>testtset", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>testtset</t>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* attribute, utf8 */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); utf8.value.bytes = (BYTE *)"test"; hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t a=\"tsettest\"/>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* element, utf16 */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); utf16.bytes = (BYTE *)L"test"; utf16.byteCount = 8; hr = WsWriteText( writer, &utf16.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>test", __LINE__ ); hr = WsWriteText( writer, &utf16.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>testtest", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>testtest</t>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* attribute, utf16 */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteText( writer, &utf16.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteText( writer, &utf16.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t a=\"testtest\"/>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* element, guid */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteText( writer, &guid.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>00000000-0000-0000-0000-000000000000", __LINE__ ); hr = WsWriteText( writer, &guid.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>00000000-0000-0000-0000-00000000000000000000-0000-0000-0000-000000000000", __LINE__ ); /* continue with different text type */ hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>00000000-0000-0000-0000-00000000000000000000-0000-0000-0000-000000000000test", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* attribute, guid */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteText( writer, &guid.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteText( writer, &guid.text, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* attribute, mix allowed text types */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteText( writer, &utf16.text, NULL ); - todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* cdata */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartCData( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteText( writer, &guid.text, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndCData( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t><![CDATA[test00000000-0000-0000-0000-000000000000]]></t>", __LINE__ ); WsFreeWriter( writer ); @@ -2632,78 +2632,78 @@ static void test_WsWriteArray(void) HRESULT hr; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteArray( writer, NULL, NULL, 0, NULL, 0, 0, 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteArray( writer, NULL, NULL, 0, NULL, 0, 0, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteArray( writer, &localname, NULL, 0, NULL, 0, 0, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteArray( writer, &localname, &ns, 0, NULL, 0, 0, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteArray( writer, &localname, &ns, ~0u, NULL, 0, 0, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, NULL, 0, 0, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); array_bool[0] = FALSE; hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, 0, 0, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool), 0, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, NULL, sizeof(array_bool), 0, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, NULL, sizeof(array_bool), 0, 1, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool), 0, 1, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<item>false</item>", __LINE__ ); hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool) - 1, 0, 2, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool), 0, 3, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); array_bool[1] = TRUE; hr = WsWriteArray( writer, &localname, &ns, WS_BOOL_VALUE_TYPE, array_bool, sizeof(array_bool), 0, 2, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<array><item>false</item><item>true</item></array>", __LINE__ ); WsFreeWriter( writer ); @@ -2761,68 +2761,68 @@ static void test_escapes(void) ULONG i; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests_elem ); i++) { hr = set_output( writer ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); utf8.value.bytes = (BYTE *)tests_elem[i].text; utf8.value.length = strlen( tests_elem[i].text ); hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); check_output( writer, tests_elem[i].result, __LINE__ ); } for (i = 0; i < ARRAY_SIZE( tests_attr ); i++) { hr = set_output( writer ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, tests_attr[i].single, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); utf8.value.bytes = (BYTE *)tests_attr[i].text; utf8.value.length = strlen( tests_attr[i].text ); hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); check_output( writer, tests_attr[i].result, __LINE__ ); } for (i = 0; i < ARRAY_SIZE( tests_cdata ); i++) { hr = set_output( writer ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartCData( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); utf8.value.bytes = (BYTE *)tests_cdata[i].text; utf8.value.length = strlen( tests_cdata[i].text ); hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndCData( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); check_output( writer, tests_cdata[i].result, __LINE__ ); } @@ -2831,17 +2831,17 @@ static void test_escapes(void) WS_XML_COMMENT_NODE comment = {{WS_XML_NODE_TYPE_COMMENT}}; hr = set_output( writer ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); comment.value.bytes = (BYTE *)tests_comment[i].text; comment.value.length = strlen( tests_comment[i].text ); hr = WsWriteNode( writer, &comment.node, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); check_output( writer, tests_comment[i].result, __LINE__ ); } @@ -2942,16 +2942,16 @@ static void test_write_option(void) ULONG i; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, tests[i].type, NULL, tests[i].option, tests[i].value, tests[i].size, NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); WsWriteEndElement( writer, NULL ); if (hr == S_OK) check_output( writer, tests[i].result, __LINE__ ); } @@ -3030,11 +3030,11 @@ static void test_datetime(void) ULONG i; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); date.ticks = tests[i].ticks; date.format = tests[i].format; @@ -3042,13 +3042,13 @@ static void test_datetime(void) hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_DATETIME_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &date, sizeof(date), NULL ); WsWriteEndElement( writer, NULL ); - ok( hr == tests[i].hr || broken(hr == tests[i].hr_broken), "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr || broken(hr == tests[i].hr_broken), "%lu: got %#lx\n", i, hr ); if (hr != tests[i].hr && hr == tests[i].hr_broken) break; if (hr == S_OK) { ok( check_result( writer, tests[i].result ) || (tests[i].result2 && broken(check_result( writer, tests[i].result2 ))), - "%u: wrong result\n", i ); + "%lu: wrong result\n", i ); } } @@ -3085,13 +3085,13 @@ static void test_repeating_element(void) } *test3; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* array of strings, wrapper */ hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_REPEATING_ELEMENT_FIELD_MAPPING; @@ -3112,9 +3112,9 @@ static void test_repeating_element(void) s.fieldCount = 1; hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); test = malloc( sizeof(*test) + 2 * sizeof(const WCHAR *) ); test->val = (const WCHAR **)(test + 1); @@ -3123,17 +3123,17 @@ static void test_repeating_element(void) test->count = 2; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<test><wrapper><val>1</val><val>2</val></wrapper></test>", __LINE__ ); free( test ); /* array of integers, no wrapper */ hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); f.type = WS_INT32_TYPE; f.localName = NULL; @@ -3146,16 +3146,16 @@ static void test_repeating_element(void) test2->count = 2; hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test2, sizeof(test2), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<test><val>1</val><val>2</val></test>", __LINE__ ); /* item range has no effect */ hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); range.minItemCount = 0; range.maxItemCount = 0; @@ -3163,17 +3163,17 @@ static void test_repeating_element(void) hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test2, sizeof(test2), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<test><val>1</val><val>2</val></test>", __LINE__ ); free( test2 ); /* nillable item */ hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f2, 0, sizeof(f2) ); f2.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -3206,9 +3206,9 @@ static void test_repeating_element(void) hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_POINTER, &test3, sizeof(test3), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<test><wrapper><val><data>-1</data></val><val a:nil=\"true\" " "xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/></wrapper></test>", __LINE__ ); free( test3 ); @@ -3259,19 +3259,19 @@ static void test_WsWriteQualifiedName(void) }; hr = WsWriteQualifiedName( NULL, NULL, NULL, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteQualifiedName( writer, NULL, NULL, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteQualifiedName( writer, NULL, NULL, NULL, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( tests ); i++) { @@ -3279,17 +3279,17 @@ static void test_WsWriteQualifiedName(void) const WS_XML_STRING *prefix_ptr, *localname_ptr, *ns_ptr; hr = set_output( writer ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); prefix_ptr = init_xmlstring( tests[i].prefix, &prefix2 ); localname_ptr = init_xmlstring( tests[i].localname, &localname2 ); ns_ptr = init_xmlstring( tests[i].ns, &ns2 ); hr = WsWriteQualifiedName( writer, prefix_ptr, localname_ptr, ns_ptr, NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); if (tests[i].hr == S_OK && hr == S_OK) check_output( writer, tests[i].result, __LINE__ ); } @@ -3303,61 +3303,61 @@ static void test_WsWriteBytes(void) HRESULT hr; hr = WsWriteBytes( NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteBytes( writer, NULL, 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsWriteBytes( writer, "test", 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsWriteBytes( writer, NULL, 1, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* element */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>dGVzdAA=</t>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* attribute */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t a=\"dGVzdAA=\"/>", __LINE__ ); WsFreeWriter( writer ); @@ -3370,67 +3370,67 @@ static void test_WsWriteChars(void) HRESULT hr; hr = WsWriteChars( NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteChars( writer, NULL, 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsWriteChars( writer, L"test", 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsWriteChars( writer, NULL, 1, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsWriteChars( writer, L"test", 4, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteChars( writer, L"test", 4, NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* element */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteChars( writer, L"test", 4, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteChars( writer, L"test", 4, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>testtest</t>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* attribute */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteChars( writer, L"test", 4, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteChars( writer, L"test", 4, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t a=\"testtest\"/>", __LINE__ ); WsFreeWriter( writer ); @@ -3444,67 +3444,67 @@ static void test_WsWriteCharsUtf8(void) HRESULT hr; hr = WsWriteCharsUtf8( NULL, NULL, 0, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteCharsUtf8( writer, NULL, 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsWriteCharsUtf8( writer, test, 0, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsWriteCharsUtf8( writer, NULL, 1, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* element */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>testtest</t>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); /* attribute */ hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t a=\"testtest\"/>", __LINE__ ); WsFreeWriter( writer ); @@ -3518,8 +3518,8 @@ static void check_output_bin( WS_XML_WRITER *writer, const char *expected, int l memset( &bytes, 0, sizeof(bytes) ); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); - ok( hr == S_OK, "%u: got %08x\n", line, hr ); - ok( bytes.length == len, "%u: got %u expected %u\n", line, bytes.length, len ); + ok( hr == S_OK, "%u: got %#lx\n", line, hr ); + ok( bytes.length == len, "%u: got %lu expected %d\n", line, bytes.length, len ); if (bytes.length != len) return; ok( !memcmp( bytes.bytes, expected, bytes.length ), "%u: got %s expected %s\n", line, debugstr_bytes(bytes.bytes, bytes.length), debugstr_bytes((const BYTE *)expected, len) ); @@ -3590,65 +3590,65 @@ static void test_binary_encoding(void) }; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( elem_tests ); i++) { hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); prefix_ptr = init_xmlstring( elem_tests[i].prefix, &str ); localname_ptr = init_xmlstring( elem_tests[i].localname, &str2 ); ns_ptr = init_xmlstring( elem_tests[i].ns, &str3 ); hr = WsWriteStartElement( writer, prefix_ptr, localname_ptr, ns_ptr, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); if (elem_tests[i].text) { utf8.value.length = strlen( elem_tests[i].text ); utf8.value.bytes = (BYTE *)elem_tests[i].text; hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); } hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); if (hr == S_OK) check_output_bin( writer, elem_tests[i].result, elem_tests[i].len_result, __LINE__ ); } for (i = 0; i < ARRAY_SIZE( attr_tests ); i++) { hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); prefix_ptr = init_xmlstring( attr_tests[i].prefix, &str ); localname_ptr = init_xmlstring( attr_tests[i].localname, &str2 ); ns_ptr = init_xmlstring( elem_tests[i].ns, &str3 ); hr = WsWriteStartElement( writer, NULL, &localname2, &empty, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartAttribute( writer, prefix_ptr, localname_ptr, ns_ptr, FALSE, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); if (attr_tests[i].value) { utf8.value.length = strlen( attr_tests[i].value ); utf8.value.bytes = (BYTE *)attr_tests[i].value; hr = WsWriteText( writer, &utf8.text, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); } hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); if (hr == S_OK) check_output_bin( writer, attr_tests[i].result, attr_tests[i].len_result, __LINE__ ); } hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); comment.value.bytes = (BYTE *)"comment"; comment.value.length = sizeof("comment") - 1; hr = WsWriteNode( writer, &comment.node, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (hr == S_OK) check_output_bin( writer, res200, sizeof(res200), __LINE__ ); WsFreeWriter( writer ); @@ -3663,18 +3663,18 @@ static void test_namespaces(void) HRESULT hr; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartAttribute( writer, &prefix2, &localname2, &ns2, FALSE, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<p:t q:a=\"\" xmlns:p=\"n\" xmlns:q=\"o\"/>", __LINE__ ); WsFreeWriter( writer ); @@ -3790,7 +3790,7 @@ static void test_dictionary(void) }; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); strings[0].length = 0; strings[0].bytes = NULL; @@ -3827,36 +3827,36 @@ static void test_dictionary(void) for (i = 0; i < ARRAY_SIZE( elem_tests ); i++) { hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); prefix_ptr = init_xmlstring_dict( &dict, elem_tests[i].prefix, &prefix ); localname_ptr = init_xmlstring_dict( &dict, elem_tests[i].localname, &localname ); ns_ptr = init_xmlstring_dict( &dict, elem_tests[i].ns, &ns ); hr = WsWriteStartElement( writer, prefix_ptr, localname_ptr, ns_ptr, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); if (hr == S_OK) check_output_bin( writer, elem_tests[i].result, elem_tests[i].len_result, __LINE__ ); } for (i = 0; i < ARRAY_SIZE( attr_tests ); i++) { hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); prefix_ptr = init_xmlstring_dict( &dict, attr_tests[i].prefix, &prefix ); localname_ptr = init_xmlstring_dict( &dict, attr_tests[i].localname, &localname ); ns_ptr = init_xmlstring_dict( &dict, attr_tests[i].ns, &ns ); hr = WsWriteStartElement( writer, NULL, &strings[3], &strings[0], NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartAttribute( writer, prefix_ptr, localname_ptr, ns_ptr, FALSE, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndAttribute( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); if (hr == S_OK) check_output_bin( writer, attr_tests[i].result, attr_tests[i].len_result, __LINE__ ); } @@ -3866,85 +3866,85 @@ static void test_dictionary(void) bin.dynamicStringCallbackState = &call_count; hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); init_xmlstring( "t", &localname ); init_xmlstring( "ns", &ns ); call_count = 0; hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( call_count == 2, "got %u\n", call_count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( call_count == 2, "got %lu\n", call_count ); check_output_bin( writer, res5, sizeof(res5), __LINE__ ); /* unknown string */ hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); init_xmlstring( "u", &localname ); init_xmlstring( "ns", &ns ); call_count = 0; hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( call_count == 2, "got %u\n", call_count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( call_count == 2, "got %lu\n", call_count ); check_output_bin( writer, res6, sizeof(res6), __LINE__ ); /* unknown string, error return from callback */ hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); init_xmlstring( "v", &localname ); init_xmlstring( "ns", &ns ); call_count = 0; hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( call_count == 2, "got %u\n", call_count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( call_count == 2, "got %lu\n", call_count ); check_output_bin( writer, res7, sizeof(res7), __LINE__ ); /* dictionary and callback */ hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict_builtin, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); bin.staticDictionary = dict_builtin; /* string in dictionary, no string dictionary set */ hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); init_xmlstring( "t", &localname ); init_xmlstring( "ns", &ns ); call_count = 0; hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( call_count == 2, "got %u\n", call_count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( call_count == 2, "got %lu\n", call_count ); check_output_bin( writer, res8, sizeof(res8), __LINE__ ); /* string not in dictionary, no string dictionary set */ hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); init_xmlstring( "z", &localname ); init_xmlstring( "ns", &ns ); call_count = 0; hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( call_count == 2, "got %u\n", call_count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( call_count == 2, "got %lu\n", call_count ); check_output_bin( writer, res9, sizeof(res9), __LINE__ ); /* string in dictionary, string dictionary set */ hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); init_xmlstring_dict( dict_builtin, 235, &localname ); init_xmlstring( "ns", &ns ); call_count = 0; hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( call_count == 1, "got %u\n", call_count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( call_count == 1, "got %lu\n", call_count ); check_output_bin( writer, res10, sizeof(res10), __LINE__ ); WsFreeWriter( writer ); @@ -3974,7 +3974,7 @@ static void test_union_type(void) } test; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.value = CHOICE_A; @@ -4017,49 +4017,49 @@ static void test_union_type(void) s.typeNs = &str_ns; hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); test.choice = CHOICE_A; test.value.a = L"test"; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t><a>test</a></t>", __LINE__ ); u.valueIndices = index; hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); test.choice = CHOICE_B; test.value.b = 123; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t>123</t>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); test.choice = CHOICE_C; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); test.choice = CHOICE_NONE; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); /* field value equals noneEnumValue */ memset( &f3, 0, sizeof(f3) ); @@ -4074,28 +4074,28 @@ static void test_union_type(void) u.fieldCount = 3; u.valueIndices = NULL; hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); test.choice = CHOICE_NONE; test.value.none = TRUE; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t><none>true</none></t>", __LINE__ ); hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); f_struct.options = WS_FIELD_OPTIONAL; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t/>", __LINE__ ); WsFreeWriter( writer ); @@ -4109,9 +4109,9 @@ static void prepare_binary_type_test( WS_XML_WRITER *writer, const WS_XML_STRING HRESULT hr; hr = WsSetOutput( writer, &bin.encoding, &buf.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, prefix, localname, ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); } static void test_text_types_binary(void) @@ -4221,7 +4221,7 @@ static void test_text_types_binary(void) BYTE buf[256]; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.value = WS_XML_TEXT_TYPE_UTF8; @@ -4349,9 +4349,9 @@ static void test_text_types_binary(void) test.u.val_utf8.length = 4; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res, sizeof(res), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4360,9 +4360,9 @@ static void test_text_types_binary(void) test.u.val_utf16.length = 4; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res, sizeof(res), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4371,9 +4371,9 @@ static void test_text_types_binary(void) test.u.val_bytes.length = 4; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res2, sizeof(res2), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4382,9 +4382,9 @@ static void test_text_types_binary(void) test.u.val_bytes.length = 3; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res2a, sizeof(res2a), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4393,9 +4393,9 @@ static void test_text_types_binary(void) test.u.val_bytes.length = 1; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res2b, sizeof(res2b), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4404,9 +4404,9 @@ static void test_text_types_binary(void) test.u.val_bytes.length = 0; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res2c, sizeof(res2c), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4416,9 +4416,9 @@ static void test_text_types_binary(void) test.u.val_bytes.length = 255; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res2d, sizeof(res2d), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4427,9 +4427,9 @@ static void test_text_types_binary(void) test.u.val_bytes.length = 256; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res2e, sizeof(res2e), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4438,9 +4438,9 @@ static void test_text_types_binary(void) test.u.val_bytes.length = 6; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res2f, sizeof(res2f), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4448,9 +4448,9 @@ static void test_text_types_binary(void) test.u.val_bool = TRUE; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res3, sizeof(res3), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4458,9 +4458,9 @@ static void test_text_types_binary(void) test.u.val_int32 = -1; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res4, sizeof(res4), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4468,9 +4468,9 @@ static void test_text_types_binary(void) test.u.val_int64 = -1; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res4, sizeof(res4), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4478,9 +4478,9 @@ static void test_text_types_binary(void) test.u.val_uint64 = 1; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res5, sizeof(res5), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4488,9 +4488,9 @@ static void test_text_types_binary(void) test.u.val_uint64 = 2; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res5b, sizeof(res5b), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4498,9 +4498,9 @@ static void test_text_types_binary(void) test.u.val_double = 0.0; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res6, sizeof(res6), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4508,9 +4508,9 @@ static void test_text_types_binary(void) test.u.val_double = 2.0; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res7, sizeof(res7), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4518,9 +4518,9 @@ static void test_text_types_binary(void) test.u.val_double = 2.1; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res8, sizeof(res8), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4528,9 +4528,9 @@ static void test_text_types_binary(void) test.u.val_double = INFINITY; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res8a, sizeof(res8a), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4538,9 +4538,9 @@ static void test_text_types_binary(void) test.u.val_double = -INFINITY; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res8b, sizeof(res8b), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4548,9 +4548,9 @@ static void test_text_types_binary(void) test.u.val_double = NAN; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res8c, sizeof(res8c), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4558,9 +4558,9 @@ static void test_text_types_binary(void) memset( &test.u.val_guid, 0, sizeof(test.u.val_guid) ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res9, sizeof(res9), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4568,9 +4568,9 @@ static void test_text_types_binary(void) memset( &test.u.val_unique_id, 0, sizeof(test.u.val_unique_id) ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res10, sizeof(res10), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4578,9 +4578,9 @@ static void test_text_types_binary(void) memset( &test.u.val_datetime, 0, sizeof(test.u.val_datetime) ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res11, sizeof(res11), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4589,9 +4589,9 @@ static void test_text_types_binary(void) test.u.val_datetime.format = WS_DATETIME_FORMAT_LOCAL; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res11b, sizeof(res11b), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4600,9 +4600,9 @@ static void test_text_types_binary(void) test.u.val_datetime.format = WS_DATETIME_FORMAT_NONE; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res11c, sizeof(res11c), __LINE__ ); prepare_binary_type_test( writer, NULL, &str_t, &str_ns ); @@ -4611,9 +4611,9 @@ static void test_text_types_binary(void) test.u.val_datetime.ticks = 1; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output_bin( writer, res11d, sizeof(res11d), __LINE__ ); WsFreeWriter( writer ); @@ -4646,7 +4646,7 @@ static void test_repeating_element_choice(void) } test; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.value = CHOICE_A; @@ -4699,25 +4699,25 @@ static void test_repeating_element_choice(void) test.count = 2; hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t><a>test</a>1</t>", __LINE__ ); items[0].choice = CHOICE_NONE; hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %#lx\n", hr ); test.count = 0; hr = set_output( writer ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t/>", __LINE__ ); WsFreeWriter( writer ); @@ -4740,9 +4740,9 @@ static CALLBACK HRESULT write_callback( void *state, const WS_BYTES *buf, ULONG const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { ULONG i = *(ULONG *)state; - ok( buf->length == stream_tests[i].ret_size, "%u: got %u\n", i, buf->length ); - ok( !memcmp( buf->bytes, "<t/>", stream_tests[i].ret_size ), "%u: wrong data\n", i ); - ok( count == 1, "%u: got %u\n", i, count ); + ok( buf->length == stream_tests[i].ret_size, "%lu: got %lu\n", i, buf->length ); + ok( !memcmp( buf->bytes, "<t/>", stream_tests[i].ret_size ), "%lu: wrong data\n", i ); + ok( count == 1, "%lu: got %lu\n", i, count ); return S_OK; } @@ -4756,38 +4756,38 @@ static void test_stream_output(void) ULONG i = 0; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFlushWriter( writer, 0, NULL, NULL ); - ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); stream.output.outputType = WS_XML_WRITER_OUTPUT_TYPE_STREAM; stream.writeCallback = write_callback; stream.writeCallbackState = &i; hr = WsSetOutput( writer, &text.encoding, &stream.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsSetOutput( writer, &text.encoding, &stream.output, NULL, 0, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsFlushWriter( writer, 0, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE(stream_tests); i++) { stream.writeCallbackState = &i; hr = WsSetOutput( writer, &text.encoding, &stream.output, NULL, 0, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); hr = WsFlushWriter( writer, stream_tests[i].min_size, NULL, NULL ); - ok( hr == S_OK, "%u: got %08x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); } WsFreeWriter( writer ); @@ -4807,7 +4807,7 @@ static void test_description_type(void) } test; hr = WsCreateWriter( NULL, 0, &writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); memset( &f, 0, sizeof(f) ); f.mapping = WS_TYPE_ATTRIBUTE_FIELD_MAPPING; @@ -4835,14 +4835,14 @@ static void test_description_type(void) hr = set_output( writer ); hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = WsWriteEndElement( writer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_output( writer, "<t val=\"-1\"/>", __LINE__ ); WsFreeWriter( writer ); -- 2.30.2

1 0

[PATCH 2/3] webservices: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 15 Feb '22

15 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/Makefile.in | 1 - dlls/webservices/channel.c | 70 +++++++++++++-------------- dlls/webservices/error.c | 14 +++--- dlls/webservices/heap.c | 12 ++--- dlls/webservices/listener.c | 22 ++++----- dlls/webservices/msg.c | 80 +++++++++++++++---------------- dlls/webservices/proxy.c | 18 +++---- dlls/webservices/reader.c | 84 ++++++++++++++++---------------- dlls/webservices/url.c | 12 ++--- dlls/webservices/writer.c | 92 ++++++++++++++++++------------------ 10 files changed, 202 insertions(+), 203 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index ac0600a5b9e..b58714d3253 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = webservices.dll IMPORTLIB = webservices IMPORTS = winhttp rpcrt4 user32 ws2_32 diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9315334c23f..a9142bedee9 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -141,7 +141,7 @@ static void CALLBACK queue_runner( TP_CALLBACK_INSTANCE *instance, void *ctx ) return; default: - ERR( "wait failed %u\n", err ); + ERR( "wait failed %lu\n", err ); return; } } @@ -497,8 +497,8 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, { const WS_CHANNEL_PROPERTY *prop = &properties[i]; - TRACE( "property id %u value %p size %u\n", prop->id, prop->value, prop->valueSize ); - if (prop->valueSize == sizeof(ULONG) && prop->value) TRACE( " value %08x\n", *(ULONG *)prop->value ); + TRACE( "property id %u value %p size %lu\n", prop->id, prop->value, prop->valueSize ); + if (prop->valueSize == sizeof(ULONG) && prop->value) TRACE( " value %#lx\n", *(ULONG *)prop->value ); switch (prop->id) { @@ -559,7 +559,7 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding struct channel *channel; HRESULT hr; - TRACE( "%u %u %p %u %p %p %p\n", type, binding, properties, count, desc, handle, error ); + TRACE( "%u %u %p %lu %p %p %p\n", type, binding, properties, count, desc, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (desc) FIXME( "ignoring security description\n" ); @@ -596,7 +596,7 @@ HRESULT WINAPI WsCreateChannelForListener( WS_LISTENER *listener_handle, const W WS_CHANNEL_BINDING binding; HRESULT hr; - TRACE( "%p %p %u %p %p\n", listener_handle, properties, count, handle, error ); + TRACE( "%p %p %lu %p %p\n", listener_handle, properties, count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!listener_handle || !handle) return E_INVALIDARG; @@ -669,7 +669,7 @@ HRESULT WINAPI WsResetChannel( WS_CHANNEL *handle, WS_ERROR *error ) } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -682,7 +682,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID struct channel *channel = (struct channel *)handle; HRESULT hr = S_OK; - TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!channel) return E_INVALIDARG; @@ -717,7 +717,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -730,7 +730,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID struct channel *channel = (struct channel *)handle; HRESULT hr; - TRACE( "%p %u %p %u\n", handle, id, value, size ); + TRACE( "%p %u %p %lu %p\n", handle, id, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!channel) return E_INVALIDARG; @@ -746,7 +746,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID hr = prop_set( channel->prop, channel->prop_count, id, value, size ); LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -838,7 +838,7 @@ static void shutdown_session_proc( struct task *task ) hr = shutdown_session( s->channel ); - TRACE( "calling %p(%08x)\n", s->ctx.callback, hr ); + TRACE( "calling %p(%#lx)\n", s->ctx.callback, hr ); s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState ); TRACE( "%p returned\n", s->ctx.callback ); } @@ -888,7 +888,7 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -959,7 +959,7 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1196,7 +1196,7 @@ static void open_channel_proc( struct task *task ) hr = open_channel( o->channel, o->endpoint ); - TRACE( "calling %p(%08x)\n", o->ctx.callback, hr ); + TRACE( "calling %p(%#lx)\n", o->ctx.callback, hr ); o->ctx.callback( hr, WS_LONG_CALLBACK, o->ctx.callbackState ); TRACE( "%p returned\n", o->ctx.callback ); } @@ -1252,7 +1252,7 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1362,7 +1362,7 @@ static enum session_mode map_channel_type( struct channel *channel ) { case WS_CHANNEL_TYPE_DUPLEX_SESSION: return SESSION_MODE_DUPLEX; default: - FIXME( "unhandled channel type %08x\n", channel->type ); + FIXME( "unhandled channel type %#x\n", channel->type ); return SESSION_MODE_INVALID; } } @@ -1712,7 +1712,7 @@ static void send_message_proc( struct task *task ) hr = send_message( s->channel, s->msg, s->desc, s->option, s->body, s->size ); - TRACE( "calling %p(%08x)\n", s->ctx.callback, hr ); + TRACE( "calling %p(%#lx)\n", s->ctx.callback, hr ); s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState ); TRACE( "%p returned\n", s->ctx.callback ); } @@ -1746,7 +1746,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS struct async async; HRESULT hr; - TRACE( "%p %p %p %08x %p %u %p %p\n", handle, msg, desc, option, body, size, ctx, error ); + TRACE( "%p %p %p %u %p %lu %p %p\n", handle, msg, desc, option, body, size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!channel || !msg || !desc) return E_INVALIDARG; @@ -1775,7 +1775,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1792,7 +1792,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS GUID id; HRESULT hr; - TRACE( "%p %p %p %08x %p %u %p %p %p\n", handle, msg, desc, option, body, size, request, ctx, error ); + TRACE( "%p %p %p %u %p %lu %p %p %p\n", handle, msg, desc, option, body, size, request, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!channel || !msg || !desc || !request) return E_INVALIDARG; @@ -1824,7 +1824,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS done: LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2362,7 +2362,7 @@ static void receive_message_proc( struct task *task ) hr = receive_message( r->channel, r->msg, r->desc, r->count, r->option, r->read_option, r->heap, r->value, r->size, r->index ); - TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); + TRACE( "calling %p(%#lx)\n", r->ctx.callback, hr ); r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); TRACE( "%p returned\n", r->ctx.callback ); } @@ -2402,7 +2402,7 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M struct async async; HRESULT hr; - TRACE( "%p %p %p %u %08x %08x %p %p %u %p %p %p\n", handle, msg, desc, count, option, read_option, heap, + TRACE( "%p %p %p %lu %u %u %p %p %lu %p %p %p\n", handle, msg, desc, count, option, read_option, heap, value, size, index, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -2426,7 +2426,7 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2471,7 +2471,7 @@ static void request_reply_proc( struct task *task ) hr = request_reply( r->channel, r->request, r->request_desc, r->write_option, r->request_body, r->request_size, r->reply, r->reply_desc, r->read_option, r->heap, r->value, r->size ); - TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); + TRACE( "calling %p(%#lx)\n", r->ctx.callback, hr ); r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); TRACE( "%p returned\n", r->ctx.callback ); } @@ -2515,7 +2515,7 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS struct async async; HRESULT hr; - TRACE( "%p %p %p %08x %p %u %p %p %08x %p %p %u %p %p\n", handle, request, request_desc, write_option, + TRACE( "%p %p %p %u %p %lu %p %p %u %p %p %lu %p %p\n", handle, request, request_desc, write_option, request_body, request_size, reply, reply_desc, read_option, heap, value, size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -2546,7 +2546,7 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2573,7 +2573,7 @@ static void read_message_start_proc( struct task *task ) hr = read_message_start( r->channel, r->msg ); - TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); + TRACE( "calling %p(%#lx)\n", r->ctx.callback, hr ); r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); TRACE( "%p returned\n", r->ctx.callback ); } @@ -2627,7 +2627,7 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2650,7 +2650,7 @@ static void read_message_end_proc( struct task *task ) hr = read_message_end( r->msg ); - TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); + TRACE( "calling %p(%#lx)\n", r->ctx.callback, hr ); r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); TRACE( "%p returned\n", r->ctx.callback ); } @@ -2698,7 +2698,7 @@ HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_A } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2725,7 +2725,7 @@ static void write_message_start_proc( struct task *task ) hr = write_message_start( w->channel, w->msg ); - TRACE( "calling %p(%08x)\n", w->ctx.callback, hr ); + TRACE( "calling %p(%#lx)\n", w->ctx.callback, hr ); w->ctx.callback( hr, WS_LONG_CALLBACK, w->ctx.callbackState ); TRACE( "%p returned\n", w->ctx.callback ); } @@ -2779,7 +2779,7 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2805,7 +2805,7 @@ static void write_message_end_proc( struct task *task ) hr = write_message_end( w->channel, w->msg ); - TRACE( "calling %p(%08x)\n", w->ctx.callback, hr ); + TRACE( "calling %p(%#lx)\n", w->ctx.callback, hr ); w->ctx.callback( hr, WS_LONG_CALLBACK, w->ctx.callbackState ); TRACE( "%p returned\n", w->ctx.callback ); } @@ -2859,7 +2859,7 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index d1a679b2ff6..d5364e42bff 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -81,7 +81,7 @@ HRESULT WINAPI WsCreateError( const WS_ERROR_PROPERTY *properties, ULONG count, HRESULT hr; ULONG i; - TRACE( "%p %u %p\n", properties, count, handle ); + TRACE( "%p %lu %p\n", properties, count, handle ); if (!handle) return E_INVALIDARG; if (!(error = alloc_error())) return E_OUTOFMEMORY; @@ -164,7 +164,7 @@ HRESULT WINAPI WsResetError( WS_ERROR *handle ) reset_error( error ); LeaveCriticalSection( &error->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -177,7 +177,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo struct error *error = (struct error *)handle; HRESULT hr; - TRACE( "%p %u %p %u\n", handle, id, buf, size ); + TRACE( "%p %u %p %lu\n", handle, id, buf, size ); if (!error) return E_INVALIDARG; @@ -192,7 +192,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo hr = prop_get( error->prop, error->prop_count, id, buf, size ); LeaveCriticalSection( &error->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -201,7 +201,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo */ HRESULT WINAPI WsGetErrorString( WS_ERROR *handle, ULONG index, WS_STRING *str ) { - FIXME( "%p %u %p: stub\n", handle, index, str ); + FIXME( "%p %lu %p: stub\n", handle, index, str ); return E_NOTIMPL; } @@ -214,7 +214,7 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co struct error *error = (struct error *)handle; HRESULT hr; - TRACE( "%p %u %p %u\n", handle, id, value, size ); + TRACE( "%p %u %p %lu\n", handle, id, value, size ); if (!error) return E_INVALIDARG; @@ -230,6 +230,6 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co else hr = prop_set( error->prop, error->prop_count, id, value, size ); LeaveCriticalSection( &error->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index a202b8308f0..93c57d523bd 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -166,7 +166,7 @@ HRESULT WINAPI WsAlloc( WS_HEAP *handle, SIZE_T size, void **ptr, WS_ERROR *erro { void *mem; - TRACE( "%p %u %p %p\n", handle, (ULONG)size, ptr, error ); + TRACE( "%p %Iu %p %p\n", handle, size, ptr, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!handle || !ptr) return E_INVALIDARG; @@ -200,7 +200,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR { struct heap *heap; - TRACE( "%u %u %p %u %p %p\n", (ULONG)max_size, (ULONG)trim_size, properties, count, handle, error ); + TRACE( "%Iu %Iu %p %lu %p %p\n", max_size, trim_size, properties, count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!handle || count) return E_INVALIDARG; @@ -274,7 +274,7 @@ HRESULT WINAPI WsResetHeap( WS_HEAP *handle, WS_ERROR *error ) reset_heap( heap ); LeaveCriticalSection( &heap->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -287,7 +287,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void struct heap *heap = (struct heap *)handle; HRESULT hr = S_OK; - TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!heap) return E_INVALIDARG; @@ -315,7 +315,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void } LeaveCriticalSection( &heap->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -357,7 +357,7 @@ HRESULT WINAPI WsCreateXmlBuffer( WS_HEAP *heap, const WS_XML_BUFFER_PROPERTY *p { struct xmlbuf *xmlbuf; - TRACE( "%p %p %u %p %p\n", heap, properties, count, handle, error ); + TRACE( "%p %p %lu %p %p\n", heap, properties, count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!heap || !handle) return E_INVALIDARG; diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 01b739084ed..6b9dca05486 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -234,7 +234,7 @@ HRESULT WINAPI WsCreateListener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING bindin struct listener *listener; HRESULT hr; - TRACE( "%u %u %p %u %p %p %p\n", type, binding, properties, count, desc, handle, error ); + TRACE( "%u %u %p %lu %p %p %p\n", type, binding, properties, count, desc, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (desc) FIXME( "ignoring security description\n" ); @@ -471,7 +471,7 @@ HRESULT WINAPI WsOpenListener( WS_LISTENER *handle, WS_STRING *url, const WS_ASY else hr = open_listener( listener, url ); LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -506,7 +506,7 @@ HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx close_listener( listener ); LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -537,7 +537,7 @@ HRESULT WINAPI WsResetListener( WS_LISTENER *handle, WS_ERROR *error ) reset_listener( listener ); LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -550,7 +550,7 @@ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ struct listener *listener = (struct listener *)handle; HRESULT hr = S_OK; - TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!listener) return E_INVALIDARG; @@ -585,7 +585,7 @@ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ } LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -598,7 +598,7 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ struct listener *listener = (struct listener *)handle; HRESULT hr; - TRACE( "%p %u %p %u\n", handle, id, value, size ); + TRACE( "%p %u %p %lu %p\n", handle, id, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!listener) return E_INVALIDARG; @@ -614,7 +614,7 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ hr = prop_set( listener->prop, listener->prop_count, id, value, size ); LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -660,7 +660,7 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, LeaveCriticalSection( &listener->cs ); hr = channel_accept_tcp( socket, wait, cancel, channel_handle ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } case WS_UDP_CHANNEL_BINDING: @@ -669,7 +669,7 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, LeaveCriticalSection( &listener->cs ); hr = channel_accept_udp( socket, wait, cancel, channel_handle ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } default: @@ -679,6 +679,6 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, } LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index bd585b176fc..092e9aabc5d 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -216,7 +216,7 @@ HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_V { HRESULT hr; - TRACE( "%u %u %p %u %p %p\n", env_version, addr_version, properties, count, handle, error ); + TRACE( "%u %u %p %lu %p %p\n", env_version, addr_version, properties, count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!handle || !env_version || !addr_version || @@ -240,7 +240,7 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M WS_ADDRESSING_VERSION version_addr; HRESULT hr; - TRACE( "%p %p %u %p %p\n", channel_handle, properties, count, handle, error ); + TRACE( "%p %p %lu %p %p\n", channel_handle, properties, count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!channel_handle || !handle) return E_INVALIDARG; @@ -307,7 +307,7 @@ HRESULT WINAPI WsResetMessage( WS_MESSAGE *handle, WS_ERROR *error ) reset_msg( msg ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -320,7 +320,7 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID struct msg *msg = (struct msg *)handle; HRESULT hr = S_OK; - TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!msg) return E_INVALIDARG; @@ -380,7 +380,7 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -393,7 +393,7 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID struct msg *msg = (struct msg *)handle; HRESULT hr; - TRACE( "%p %u %p %u\n", handle, id, value, size ); + TRACE( "%p %u %p %lu %p\n", handle, id, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!msg) return E_INVALIDARG; @@ -421,7 +421,7 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -464,7 +464,7 @@ HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS * if (hr == S_OK) msg->is_addressed = TRUE; LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -760,7 +760,7 @@ HRESULT WINAPI WsWriteEnvelopeStart( WS_MESSAGE *handle, WS_XML_WRITER *writer, } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -790,7 +790,7 @@ HRESULT WINAPI WsWriteEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) msg->state = WS_MESSAGE_STATE_DONE; LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -803,7 +803,7 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de struct msg *msg = (struct msg *)handle; HRESULT hr; - TRACE( "%p %p %08x %p %u %p\n", handle, desc, option, value, size, error ); + TRACE( "%p %p %u %p %lu %p\n", handle, desc, option, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!msg || !desc) return E_INVALIDARG; @@ -833,7 +833,7 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de done: LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -845,7 +845,7 @@ HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTE struct msg *msg = (struct msg *)handle; HRESULT hr; - TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + TRACE( "%p %lu %p %p\n", handle, size, ctx, error ); if (!msg) return E_INVALIDARG; @@ -860,7 +860,7 @@ HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTE hr = WsFlushWriter( msg->writer_body, size, ctx, error ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -967,7 +967,7 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -997,7 +997,7 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) msg->state = WS_MESSAGE_STATE_DONE; LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1010,7 +1010,7 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des struct msg *msg = (struct msg *)handle; HRESULT hr; - TRACE( "%p %p %08x %p %p %u %p\n", handle, desc, option, heap, value, size, error ); + TRACE( "%p %p %u %p %p %lu %p\n", handle, desc, option, heap, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!msg || !desc) return E_INVALIDARG; @@ -1027,7 +1027,7 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des else hr = WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1039,7 +1039,7 @@ HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEX struct msg *msg = (struct msg *)handle; HRESULT hr; - TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + TRACE( "%p %lu %p %p\n", handle, size, ctx, error ); if (!msg) return E_INVALIDARG; @@ -1054,7 +1054,7 @@ HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEX hr = WsFillReader( msg->reader_body, size, ctx, error ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1093,7 +1093,7 @@ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATIO } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1194,7 +1194,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val HRESULT hr; ULONG i; - TRACE( "%p %u %u %08x %p %u %p\n", handle, type, value_type, option, value, size, error ); + TRACE( "%p %u %u %u %p %lu %p\n", handle, type, value_type, option, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!msg || type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) return E_INVALIDARG; @@ -1239,7 +1239,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val done: LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1288,7 +1288,7 @@ HRESULT WINAPI WsGetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val struct msg *msg = (struct msg *)handle; HRESULT hr; - TRACE( "%p %u %u %08x %p %p %u %p\n", handle, type, value_type, option, heap, value, size, error ); + TRACE( "%p %u %u %u %p %p %lu %p\n", handle, type, value_type, option, heap, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!msg || type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER || option < WS_READ_REQUIRED_VALUE || @@ -1306,7 +1306,7 @@ HRESULT WINAPI WsGetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val else hr = get_standard_header( msg, type, value_type, option, heap, value, size ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1357,7 +1357,7 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1490,7 +1490,7 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, struct msg *msg = (struct msg *)handle; HRESULT hr; - TRACE( "%p %s %u %08x %p %u %p\n", handle, debugstr_xmlstr(name), type, option, value, size, error ); + TRACE( "%p %s %u %u %p %lu %p\n", handle, debugstr_xmlstr(name), type, option, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!msg || !name) return E_INVALIDARG; @@ -1507,7 +1507,7 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, else hr = add_mapped_header( msg, name, type, option, value, size ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1548,7 +1548,7 @@ HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *na } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1636,7 +1636,7 @@ HRESULT WINAPI WsGetMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, struct msg *msg = (struct msg *)handle; HRESULT hr; - TRACE( "%p %s %u %u %u %u %p %p %u %p\n", handle, debugstr_xmlstr(name), option, index, type, read_option, + TRACE( "%p %s %u %lu %u %u %p %p %lu %p\n", handle, debugstr_xmlstr(name), option, index, type, read_option, heap, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (option != WS_SINGLETON_HEADER) @@ -1659,7 +1659,7 @@ HRESULT WINAPI WsGetMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, else hr = get_mapped_header( msg, name, type, read_option, heap, value, size ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1707,7 +1707,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI struct header *header; HRESULT hr; - TRACE( "%p %p %08x %p %u %08x %p\n", handle, desc, option, value, size, attrs, error ); + TRACE( "%p %p %u %p %lu %#lx %p\n", handle, desc, option, value, size, attrs, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!msg || !desc) return E_INVALIDARG; @@ -1734,7 +1734,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI done: LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1761,7 +1761,7 @@ HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI struct msg *msg = (struct msg *)handle; HRESULT hr; - TRACE( "%p %p %08x %u %08x %p %p %u %p %p\n", handle, desc, repeat_option, index, option, heap, value, + TRACE( "%p %p %u %lu %u %p %p %lu %p %p\n", handle, desc, repeat_option, index, option, heap, value, size, attrs, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -1791,7 +1791,7 @@ HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI else hr = get_custom_header( msg, desc, option, heap, value, size ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1837,7 +1837,7 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1993,7 +1993,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) done: free( header ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2051,7 +2051,7 @@ HRESULT message_map_http_response_headers( WS_MESSAGE *handle, HINTERNET req, co hr = map_http_response_headers( msg, req, mapping ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2108,7 +2108,7 @@ void message_do_send_callback( WS_MESSAGE *handle ) HRESULT hr; TRACE( "executing callback %p\n", msg->ctx_send.callback ); hr = msg->ctx_send.callback( handle, msg->heap, msg->ctx_send.state, NULL ); - TRACE( "callback %p returned %08x\n", msg->ctx_send.callback, hr ); + TRACE( "callback %p returned %#lx\n", msg->ctx_send.callback, hr ); } LeaveCriticalSection( &msg->cs ); @@ -2131,7 +2131,7 @@ void message_do_receive_callback( WS_MESSAGE *handle ) HRESULT hr; TRACE( "executing callback %p\n", msg->ctx_receive.callback ); hr = msg->ctx_receive.callback( handle, msg->heap, msg->ctx_receive.state, NULL ); - TRACE( "callback %p returned %08x\n", msg->ctx_receive.callback, hr ); + TRACE( "callback %p returned %#lx\n", msg->ctx_receive.callback, hr ); } LeaveCriticalSection( &msg->cs ); diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 80e5965ce3e..09f6e2bee00 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -125,7 +125,7 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE WS_CHANNEL *channel; HRESULT hr; - TRACE( "%u %u %p %p %u %p %u %p %p\n", type, binding, desc, proxy_props, proxy_props_count, + TRACE( "%u %u %p %p %lu %p %lu %p %p\n", type, binding, desc, proxy_props, proxy_props_count, channel_props, channel_props_count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (desc) FIXME( "ignoring security description\n" ); @@ -160,7 +160,7 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, WS_CHANNEL *channel; HRESULT hr; - TRACE( "%u %p %u %u %p %u %p %u %p %p\n", channel_type, properties, count, type, value, size, desc, + TRACE( "%u %p %lu %u %p %lu %p %lu %p %p\n", channel_type, properties, count, type, value, size, desc, desc_size, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -236,7 +236,7 @@ HRESULT WINAPI WsResetServiceProxy( WS_SERVICE_PROXY *handle, WS_ERROR *error ) reset_proxy( proxy ); LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -274,7 +274,7 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO struct proxy *proxy = (struct proxy *)handle; HRESULT hr = S_OK; - TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!proxy) return E_INVALIDARG; @@ -299,7 +299,7 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO } LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -330,7 +330,7 @@ HRESULT WINAPI WsOpenServiceProxy( WS_SERVICE_PROXY *handle, const WS_ENDPOINT_A proxy->state = WS_SERVICE_PROXY_STATE_OPEN; LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -360,7 +360,7 @@ HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CON proxy->state = WS_SERVICE_PROXY_STATE_CLOSED; LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -505,7 +505,7 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION HRESULT hr; ULONG i; - TRACE( "%p %p %p %p %p %u %p %p\n", handle, desc, args, heap, properties, count, ctx, error ); + TRACE( "%p %p %p %p %p %lu %p %p\n", handle, desc, args, heap, properties, count, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); for (i = 0; i < count; i++) @@ -542,6 +542,6 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION done: WsFreeMessage( msg ); LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index d01222bd518..7da0c8335ea 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -561,7 +561,7 @@ HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG c BOOL read_decl = TRUE; HRESULT hr; - TRACE( "%p %u %p %p\n", properties, count, handle, error ); + TRACE( "%p %lu %p %p\n", properties, count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!handle) return E_INVALIDARG; @@ -651,7 +651,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY struct reader *reader = (struct reader *)handle; HRESULT hr; - TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); + TRACE( "%p %lu %p %p\n", handle, min_size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); @@ -677,7 +677,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -754,7 +754,7 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR } } - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -783,7 +783,7 @@ HRESULT WINAPI WsGetReaderNode( WS_XML_READER *handle, const WS_XML_NODE **node, *node = &reader->current->hdr.node; LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return S_OK; } @@ -804,7 +804,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT struct reader *reader = (struct reader *)handle; HRESULT hr; - TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader) return E_INVALIDARG; @@ -822,7 +822,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT else hr = prop_get( reader->prop, reader->prop_count, id, buf, size ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3161,7 +3161,7 @@ HRESULT WINAPI WsReadEndElement( WS_XML_READER *handle, WS_ERROR *error ) hr = read_endelement( reader ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3189,7 +3189,7 @@ HRESULT WINAPI WsReadNode( WS_XML_READER *handle, WS_ERROR *error ) hr = read_node( reader ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3236,7 +3236,7 @@ HRESULT WINAPI WsSkipNode( WS_XML_READER *handle, WS_ERROR *error ) hr = skip_node( reader ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3264,7 +3264,7 @@ HRESULT WINAPI WsReadStartElement( WS_XML_READER *handle, WS_ERROR *error ) hr = read_startelement( reader ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3294,7 +3294,7 @@ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING hr = read_to_startelement( reader, found ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3595,7 +3595,7 @@ HRESULT WINAPI WsMoveReader( WS_XML_READER *handle, WS_MOVE_TO move, BOOL *found else hr = read_move_to( reader, move, found ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3608,7 +3608,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO const WS_XML_ELEMENT_NODE *elem; HRESULT hr = S_OK; - TRACE( "%p %u %p\n", handle, index, error ); + TRACE( "%p %lu %p\n", handle, index, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader) return E_INVALIDARG; @@ -3630,7 +3630,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return S_OK; } @@ -3659,7 +3659,7 @@ HRESULT WINAPI WsReadEndAttribute( WS_XML_READER *handle, WS_ERROR *error ) else reader->state = READER_STATE_STARTELEMENT; LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4053,7 +4053,7 @@ HRESULT WINAPI WsReadQualifiedName( WS_XML_READER *handle, WS_HEAP *heap, WS_XML else hr = read_qualified_name( reader, heap, prefix, localname, ns ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4283,7 +4283,7 @@ HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *loca } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -6296,7 +6296,7 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO if (desc->itemRange && (nb_items < desc->itemRange->minItemCount || nb_items > desc->itemRange->maxItemCount)) { - TRACE( "number of items %u out of range (%u-%u)\n", nb_items, desc->itemRange->minItemCount, + TRACE( "number of items %lu out of range (%lu-%lu)\n", nb_items, desc->itemRange->minItemCount, desc->itemRange->maxItemCount ); ws_free( heap, buf, nb_allocated * item_size ); return WS_E_INVALID_FORMAT; @@ -6341,7 +6341,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_STRUCT_DESCRIPTI if (!desc) return E_INVALIDARG; if (desc->options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) { - FIXME( "options %08x not supported\n", desc->options ); + FIXME( "options %#lx not supported\n", desc->options ); return E_NOTIMPL; } if (!(option = get_field_read_option( desc->type, desc->options ))) return E_INVALIDARG; @@ -6430,7 +6430,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, if (!desc) return E_INVALIDARG; if (desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT) { - FIXME( "struct options %08x not supported\n", + FIXME( "struct options %#lx not supported\n", desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT ); } @@ -6716,7 +6716,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY BOOL found; HRESULT hr; - TRACE( "%p %u %u %p %u %p %p %u %p\n", handle, mapping, type, desc, option, heap, value, + TRACE( "%p %u %u %p %#x %p %p %lu %p\n", handle, mapping, type, desc, option, heap, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -6745,7 +6745,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -6783,7 +6783,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO BOOL found; HRESULT hr; - TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); + TRACE( "%p %p %#x %p %p %lu %p\n", handle, desc, option, heap, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader || !desc || !value) return E_INVALIDARG; @@ -6800,7 +6800,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO desc->elementNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -6815,7 +6815,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi BOOL found; HRESULT hr; - TRACE( "%p %u %p %u %p\n", handle, type, value, size, error ); + TRACE( "%p %u %p %lu %p\n", handle, type, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader || !value || type == ~0u) return E_INVALIDARG; @@ -6832,7 +6832,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi NULL, value, size, &found ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -6847,7 +6847,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI BOOL found; HRESULT hr; - TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); + TRACE( "%p %p %#x %p %p %lu %p\n", handle, desc, option, heap, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader || !desc || !value) return E_INVALIDARG; @@ -6865,7 +6865,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI desc->attributeNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -6968,7 +6968,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * ULONG i, offset = 0; HRESULT hr; - TRACE( "%p %p %p %p %u %p\n", handle, encoding, input, properties, count, error ); + TRACE( "%p %p %p %p %lu %p\n", handle, encoding, input, properties, count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader) return E_INVALIDARG; @@ -7051,7 +7051,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7099,7 +7099,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, HRESULT hr; ULONG i; - TRACE( "%p %p %p %u %p\n", handle, buffer, properties, count, error ); + TRACE( "%p %p %p %lu %p\n", handle, buffer, properties, count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader || !xmlbuf) return E_INVALIDARG; @@ -7127,7 +7127,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7160,7 +7160,7 @@ HRESULT WINAPI WsGetReaderPosition( WS_XML_READER *handle, WS_XML_NODE_POSITION } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7189,7 +7189,7 @@ HRESULT WINAPI WsSetReaderPosition( WS_XML_READER *handle, const WS_XML_NODE_POS else reader->current = pos->node; LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7209,7 +7209,7 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, struct reader *reader = (struct reader *)handle; HRESULT hr = S_OK; - TRACE( "%p %p %u %p %p\n", handle, bytes, max_count, count, error ); + TRACE( "%p %p %lu %p %p\n", handle, bytes, max_count, count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader) return E_INVALIDARG; @@ -7254,7 +7254,7 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7275,7 +7275,7 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count struct reader *reader = (struct reader *)handle; HRESULT hr = S_OK; - TRACE( "%p %p %u %p %p\n", handle, chars, max_count, count, error ); + TRACE( "%p %p %lu %p %p\n", handle, chars, max_count, count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader) return E_INVALIDARG; @@ -7321,7 +7321,7 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7333,7 +7333,7 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co struct reader *reader = (struct reader *)handle; HRESULT hr = S_OK; - TRACE( "%p %p %u %p %p\n", handle, bytes, max_count, count, error ); + TRACE( "%p %p %lu %p %p\n", handle, bytes, max_count, count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!reader) return E_INVALIDARG; @@ -7375,7 +7375,7 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7443,7 +7443,7 @@ done: if (hr != S_OK) free_xmlbuf( (struct xmlbuf *)buffer ); WsFreeWriter( writer ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 7585abadee8..c2db435e3d7 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -176,14 +176,14 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS WS_HTTP_URL *url = NULL; ULONG len, len_decoded, port = 0; - TRACE( "%s %08x %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, heap, ret, error ); + TRACE( "%s %#lx %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, heap, ret, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!str || !heap) return E_INVALIDARG; if (!str->length) return WS_E_INVALID_FORMAT; if (flags) { - FIXME( "unimplemented flags %08x\n", flags ); + FIXME( "unimplemented flags %#lx\n", flags ); return E_NOTIMPL; } if (!(decoded = url_decode( str->chars, str->length, heap, &len_decoded )) || @@ -269,7 +269,7 @@ done: if (decoded != str->chars) ws_free( heap, decoded, len_decoded ); ws_free( heap, url, sizeof(*url) ); } - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -433,13 +433,13 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S ULONG port = 0; HRESULT hr = WS_E_INVALID_FORMAT; - TRACE( "%p %08x %p %p %p\n", base, flags, heap, ret, error ); + TRACE( "%p %#lx %p %p %p\n", base, flags, heap, ret, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!url || !heap || !ret) return E_INVALIDARG; if (flags) { - FIXME( "unimplemented flags %08x\n", flags ); + FIXME( "unimplemented flags %#lx\n", flags ); return E_NOTIMPL; } if (!(scheme = scheme_str( url->url.scheme, &len_scheme ))) goto done; @@ -534,6 +534,6 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S done: if (hr != S_OK) ws_free( heap, str, ret_size ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1dacc10ec43..cd40b8ad8f6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -195,7 +195,7 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c WS_CHARSET charset = WS_CHARSET_UTF8; HRESULT hr; - TRACE( "%p %u %p %p\n", properties, count, handle, error ); + TRACE( "%p %lu %p %p\n", properties, count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!handle) return E_INVALIDARG; @@ -273,7 +273,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT struct writer *writer = (struct writer *)handle; HRESULT hr = S_OK; - TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer) return E_INVALIDARG; @@ -321,7 +321,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -359,7 +359,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING HRESULT hr; ULONG i; - TRACE( "%p %p %p %p %u %p\n", handle, encoding, output, properties, count, error ); + TRACE( "%p %p %p %p %lu %p\n", handle, encoding, output, properties, count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer) return E_INVALIDARG; @@ -450,7 +450,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -467,7 +467,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer HRESULT hr; ULONG i; - TRACE( "%p %p %p %u %p\n", handle, buffer, properties, count, error ); + TRACE( "%p %p %p %lu %p\n", handle, buffer, properties, count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer || !xmlbuf) return E_INVALIDARG; @@ -498,7 +498,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -525,7 +525,7 @@ HRESULT WINAPI WsFlushWriter( WS_XML_WRITER *handle, ULONG min_size, const WS_AS struct writer *writer = (struct writer *)handle; HRESULT hr; - TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); + TRACE( "%p %lu %p %p\n", handle, min_size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); @@ -543,7 +543,7 @@ HRESULT WINAPI WsFlushWriter( WS_XML_WRITER *handle, ULONG min_size, const WS_AS else hr = flush_writer( writer, min_size, ctx, error ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1536,7 +1536,7 @@ HRESULT WINAPI WsGetPrefixFromNamespace( WS_XML_WRITER *handle, const WS_XML_STR } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1733,7 +1733,7 @@ HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error ) writer->state = WRITER_STATE_STARTELEMENT; LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1976,7 +1976,7 @@ HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error ) hr = write_endelement_node( writer ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2032,7 +2032,7 @@ HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error ) done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2101,7 +2101,7 @@ HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING writer->state = WRITER_STATE_STARTATTRIBUTE; LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2180,7 +2180,7 @@ HRESULT WINAPI WsWriteStartCData( WS_XML_WRITER *handle, WS_ERROR *error ) hr = write_cdata_node( writer ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2226,7 +2226,7 @@ HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error ) else hr = write_endcdata_node( writer ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2313,7 +2313,7 @@ HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING * hr = write_element_node( writer, prefix, localname, ns ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2969,7 +2969,7 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E else hr = write_text_node( writer, text ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2982,7 +2982,7 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou WS_XML_BASE64_TEXT base64; HRESULT hr; - TRACE( "%p %p %u %p\n", handle, bytes, count, error ); + TRACE( "%p %p %lu %p\n", handle, bytes, count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer) return E_INVALIDARG; @@ -3007,7 +3007,7 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3020,7 +3020,7 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co WS_XML_UTF16_TEXT utf16; HRESULT hr; - TRACE( "%p %s %u %p\n", handle, debugstr_wn(chars, count), count, error ); + TRACE( "%p %s %lu %p\n", handle, debugstr_wn(chars, count), count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer) return E_INVALIDARG; @@ -3045,7 +3045,7 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3058,7 +3058,7 @@ HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG WS_XML_UTF8_TEXT utf8; HRESULT hr; - TRACE( "%p %s %u %p\n", handle, debugstr_an((const char *)bytes, count), count, error ); + TRACE( "%p %s %lu %p\n", handle, debugstr_an((const char *)bytes, count), count, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer) return E_INVALIDARG; @@ -3083,7 +3083,7 @@ HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3768,7 +3768,7 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI if (field_options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) { - FIXME( "options 0x%x not supported\n", desc->options ); + FIXME( "options %#lx not supported\n", desc->options ); return E_NOTIMPL; } @@ -3883,7 +3883,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping HRESULT hr; if (!desc) return E_INVALIDARG; - if (desc->structOptions) FIXME( "struct options 0x%x not supported\n", desc->structOptions ); + if (desc->structOptions) FIXME( "struct options %#lx not supported\n", desc->structOptions ); if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); @@ -4022,7 +4022,7 @@ HRESULT WINAPI WsWriteAttribute( WS_XML_WRITER *handle, const WS_ATTRIBUTE_DESCR struct writer *writer = (struct writer *)handle; HRESULT hr; - TRACE( "%p %p %u %p %u %p\n", handle, desc, option, value, size, error ); + TRACE( "%p %p %u %p %lu %p\n", handle, desc, option, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer || !desc || !desc->attributeLocalName || !desc->attributeNs || !value) @@ -4044,7 +4044,7 @@ HRESULT WINAPI WsWriteAttribute( WS_XML_WRITER *handle, const WS_ATTRIBUTE_DESCR } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4058,7 +4058,7 @@ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTI struct writer *writer = (struct writer *)handle; HRESULT hr; - TRACE( "%p %p %u %p %u %p\n", handle, desc, option, value, size, error ); + TRACE( "%p %p %u %p %lu %p\n", handle, desc, option, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer || !desc || !desc->elementLocalName || !desc->elementNs || !value) @@ -4081,7 +4081,7 @@ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTI done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4095,7 +4095,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T struct writer *writer = (struct writer *)handle; HRESULT hr; - TRACE( "%p %u %u %p %u %p %u %p\n", handle, mapping, type, desc, option, value, + TRACE( "%p %u %u %p %u %p %lu %p\n", handle, mapping, type, desc, option, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -4128,7 +4128,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4168,7 +4168,7 @@ HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, co HRESULT hr = S_OK; WS_TYPE type; - TRACE( "%p %u %p %u %p\n", handle, value_type, value, size, error ); + TRACE( "%p %u %p %lu %p\n", handle, value_type, value, size, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer || !value || (type = map_value_type( value_type )) == ~0u) return E_INVALIDARG; @@ -4198,7 +4198,7 @@ HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, co if (hr == S_OK) hr = write_type( writer, mapping, type, NULL, WS_WRITE_REQUIRED_VALUE, value, size ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4214,7 +4214,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna ULONG type_size, i; HRESULT hr = S_OK; - TRACE( "%p %s %s %u %p %u %u %u %p\n", handle, debugstr_xmlstr(localname), debugstr_xmlstr(ns), + TRACE( "%p %s %s %u %p %lu %lu %lu %p\n", handle, debugstr_xmlstr(localname), debugstr_xmlstr(ns), value_type, array, size, offset, count, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -4258,7 +4258,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4297,7 +4297,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4315,7 +4315,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu char *buf; ULONG i; - TRACE( "%p %p %p %p %u %p %p %p %p\n", handle, buffer, encoding, properties, count, heap, + TRACE( "%p %p %p %p %lu %p %p %p %p\n", handle, buffer, encoding, properties, count, heap, bytes, size, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -4352,7 +4352,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4384,7 +4384,7 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING hr = add_namespace_attribute( writer, prefix, ns, single ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4435,7 +4435,7 @@ HRESULT WINAPI WsWriteQualifiedName( WS_XML_WRITER *handle, const WS_XML_STRING else hr = write_qualified_name( writer, prefix, localname, ns ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4535,7 +4535,7 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found else hr = write_move_to( writer, move, found ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4568,7 +4568,7 @@ HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4597,7 +4597,7 @@ HRESULT WINAPI WsSetWriterPosition( WS_XML_WRITER *handle, const WS_XML_NODE_POS else writer->current = pos->node; LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4757,7 +4757,7 @@ HRESULT WINAPI WsWriteNode( WS_XML_WRITER *handle, const WS_XML_NODE *node, WS_E else hr = write_node( writer, node ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4888,7 +4888,7 @@ HRESULT WINAPI WsCopyNode( WS_XML_WRITER *handle, WS_XML_READER *reader, WS_ERRO done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } -- 2.30.2

1 0

[PATCH 1/3] wldap32: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 15 Feb '22

15 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wldap32/Makefile.in | 1 - dlls/wldap32/bind.c | 10 +++---- dlls/wldap32/dn.c | 4 +-- dlls/wldap32/error.c | 8 +++--- dlls/wldap32/extended.c | 2 +- dlls/wldap32/init.c | 20 +++++++------- dlls/wldap32/main.c | 2 +- dlls/wldap32/misc.c | 8 +++--- dlls/wldap32/option.c | 2 +- dlls/wldap32/page.c | 15 +++++----- dlls/wldap32/search.c | 20 +++++++------- dlls/wldap32/tests/Makefile.in | 1 - dlls/wldap32/tests/ber.c | 2 +- dlls/wldap32/tests/parse.c | 50 +++++++++++++++++----------------- 14 files changed, 72 insertions(+), 73 deletions(-) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index ba60d525ac6..088b1c3abf5 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wldap32.dll UNIXLIB = wldap32.so IMPORTLIB = wldap32 diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 9dc9b29bac4..160a3d1ed30 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -41,7 +41,7 @@ ULONG CDECL ldap_bindA( LDAP *ld, char *dn, char *cred, ULONG method ) ULONG ret = LDAP_NO_MEMORY; WCHAR *dnW = NULL, *credW = NULL; - TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_a(dn), cred, method ); + TRACE( "(%p, %s, %p, %#lx)\n", ld, debugstr_a(dn), cred, method ); if (!ld) return ~0u; @@ -81,7 +81,7 @@ ULONG CDECL ldap_bindW( LDAP *ld, WCHAR *dn, WCHAR *cred, ULONG method ) struct bervalU pwd = { 0, NULL }; int msg; - TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method ); + TRACE( "(%p, %s, %p, %#lx)\n", ld, debugstr_w(dn), cred, method ); if (!ld) return ~0u; if (method != LDAP_AUTH_SIMPLE) return LDAP_PARAM_ERROR; @@ -119,7 +119,7 @@ ULONG CDECL ldap_bind_sA( LDAP *ld, char *dn, char *cred, ULONG method ) ULONG ret = LDAP_NO_MEMORY; WCHAR *dnW = NULL, *credW = NULL; - TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_a(dn), cred, method ); + TRACE( "(%p, %s, %p, %#lx)\n", ld, debugstr_a(dn), cred, method ); if (!ld) return LDAP_PARAM_ERROR; @@ -162,7 +162,7 @@ ULONG CDECL ldap_bind_sW( LDAP *ld, WCHAR *dn, WCHAR *cred, ULONG method ) char *dnU = NULL, *credU = NULL; struct bervalU pwd = { 0, NULL }; - TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method ); + TRACE( "(%p, %s, %p, %#lx)\n", ld, debugstr_w(dn), cred, method ); if (!ld) return LDAP_PARAM_ERROR; @@ -224,7 +224,7 @@ ULONG CDECL ldap_bind_sW( LDAP *ld, WCHAR *dn, WCHAR *cred, ULONG method ) } else { - FIXME( "method %#x not supported\n", method ); + FIXME( "method %#lx not supported\n", method ); return LDAP_PARAM_ERROR; } diff --git a/dlls/wldap32/dn.c b/dlls/wldap32/dn.c index 40e62fafa1e..d18ff88d9aa 100644 --- a/dlls/wldap32/dn.c +++ b/dlls/wldap32/dn.c @@ -96,7 +96,7 @@ char ** CDECL ldap_explode_dnA( char *dn, ULONG notypes ) char **ret; WCHAR *dnW, **retW; - TRACE( "(%s, 0x%08x)\n", debugstr_a(dn), notypes ); + TRACE( "(%s, %#lx)\n", debugstr_a(dn), notypes ); if (!(dnW = strAtoW( dn ))) return NULL; @@ -130,7 +130,7 @@ WCHAR ** CDECL ldap_explode_dnW( WCHAR *dn, ULONG notypes ) WCHAR **ret = NULL; char *dnU, **retU; - TRACE( "(%s, 0x%08x)\n", debugstr_w(dn), notypes ); + TRACE( "(%s, %#lx)\n", debugstr_w(dn), notypes ); if ((dnU = strWtoU( dn ))) { diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index 8b6881bdc90..a72babf830d 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -67,7 +67,7 @@ char * CDECL ldap_err2stringA( ULONG err ) { static char buf[256] = ""; - TRACE( "(0x%08x)\n", err ); + TRACE( "(%#lx)\n", err ); if (err <= LDAP_REFERRAL_LIMIT_EXCEEDED) LoadStringA( hwldap32, err, buf, 256 ); @@ -97,7 +97,7 @@ WCHAR * CDECL ldap_err2stringW( ULONG err ) { static WCHAR buf[256] = { 0 }; - TRACE( "(0x%08x)\n", err ); + TRACE( "(%#lx)\n", err ); if (err <= LDAP_REFERRAL_LIMIT_EXCEEDED) LoadStringW( hwldap32, err, buf, 256 ); @@ -148,7 +148,7 @@ ULONG CDECL ldap_result2error( LDAP *ld, LDAPMessage *res, ULONG free ) { int error; - TRACE( "(%p, %p, 0x%08x)\n", ld, res, free ); + TRACE( "(%p, %p, %#lx)\n", ld, res, free ); if (ld && res) { @@ -289,7 +289,7 @@ static const ULONG errormap[] = { */ ULONG CDECL LdapMapErrorToWin32( ULONG err ) { - TRACE( "(0x%08x)\n", err ); + TRACE( "(%#lx)\n", err ); if (err >= ARRAY_SIZE( errormap )) return ERROR_DS_GENERIC_ERROR; return errormap[err]; diff --git a/dlls/wldap32/extended.c b/dlls/wldap32/extended.c index 85e000f52c1..e693ae034f1 100644 --- a/dlls/wldap32/extended.c +++ b/dlls/wldap32/extended.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); */ ULONG CDECL ldap_close_extended_op( LDAP *ld, ULONG msgid ) { - TRACE( "(%p, 0x%08x)\n", ld, msgid ); + TRACE( "(%p, %#lx)\n", ld, msgid ); if (!ld) return LDAP_PARAM_ERROR; return LDAP_SUCCESS; diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index e62fd2fe794..bd9c8cb4277 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -118,10 +118,10 @@ static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnum { char *res, *p, *q, **v; unsigned int i = 0, size = 0; - static const char sep[] = " ", fmt[] = ":%d"; + static const char sep[] = " "; char port[7]; - sprintf( port, fmt, portnumber ); + sprintf( port, ":%lu", portnumber ); for (v = hostnames; *v; v++) { @@ -220,7 +220,7 @@ LDAP * CDECL cldap_openA( char *hostname, ULONG portnumber ) LDAP *ld; WCHAR *hostnameW = NULL; - TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_a(hostname), portnumber ); if (hostname && !(hostnameW = strAtoW( hostname ))) return NULL; @@ -256,7 +256,7 @@ LDAP * CDECL cldap_openW( WCHAR *hostname, ULONG portnumber ) LDAP *ld = NULL; char *hostnameU, *url = NULL; - TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_w(hostname), portnumber ); if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "cldap://", hostnameU, portnumber ))) goto exit; @@ -305,7 +305,7 @@ LDAP * CDECL ldap_initA( const PCHAR hostname, ULONG portnumber ) LDAP *ld; WCHAR *hostnameW = NULL; - TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_a(hostname), portnumber ); if (hostname && !(hostnameW = strAtoW( hostname ))) return NULL; @@ -342,7 +342,7 @@ LDAP * CDECL ldap_initW( const PWCHAR hostname, ULONG portnumber ) LDAP *ld = NULL; char *hostnameU, *url = NULL; - TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_w(hostname), portnumber ); if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; @@ -365,7 +365,7 @@ LDAP * CDECL ldap_openA( char *hostname, ULONG portnumber ) LDAP *ld; WCHAR *hostnameW = NULL; - TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_a(hostname), portnumber ); if (hostname && !(hostnameW = strAtoW( hostname ))) return NULL; @@ -401,7 +401,7 @@ LDAP * CDECL ldap_openW( WCHAR *hostname, ULONG portnumber ) LDAP *ld = NULL; char *hostnameU, *url = NULL; - TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_w(hostname), portnumber ); if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; @@ -424,7 +424,7 @@ LDAP * CDECL ldap_sslinitA( char *hostname, ULONG portnumber, int secure ) LDAP *ld; WCHAR *hostnameW = NULL; - TRACE( "(%s, %d, 0x%08x)\n", debugstr_a(hostname), portnumber, secure ); + TRACE( "(%s, %lu, %d)\n", debugstr_a(hostname), portnumber, secure ); if (hostname && !(hostnameW = strAtoW( hostname ))) return NULL; @@ -462,7 +462,7 @@ LDAP * CDECL ldap_sslinitW( WCHAR *hostname, ULONG portnumber, int secure ) LDAP *ld = NULL; char *hostnameU, *url = NULL; - TRACE( "(%s, %d, 0x%08x)\n", debugstr_w(hostname), portnumber, secure ); + TRACE( "(%s, %lu, %d)\n", debugstr_w(hostname), portnumber, secure ); if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; diff --git a/dlls/wldap32/main.c b/dlls/wldap32/main.c index 375730ddeca..2fffb11f064 100644 --- a/dlls/wldap32/main.c +++ b/dlls/wldap32/main.c @@ -34,7 +34,7 @@ unixlib_handle_t ldap_handle = 0; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { - TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); + TRACE( "(%p, %#lx, %p)\n", hinst, reason, reserved ); switch (reason) { diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index c3821056693..697f1d3ad5e 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); */ ULONG CDECL ldap_abandon( LDAP *ld, ULONG msgid ) { - TRACE( "(%p, 0x%08x)\n", ld, msgid ); + TRACE( "(%p, %#lx)\n", ld, msgid ); if (!ld) return ~0u; else @@ -223,7 +223,7 @@ ULONG CDECL ldap_escape_filter_elementA( char *src, ULONG srclen, char *dst, ULO { ULONG len = get_escape_size( src, srclen ); - TRACE( "(%p, 0x%08x, %p, 0x%08x)\n", src, srclen, dst, dstlen ); + TRACE( "(%p, %#lx, %p, %#lx)\n", src, srclen, dst, dstlen ); if (!dst) return len; if (!src || dstlen < len) return LDAP_PARAM_ERROR; @@ -251,7 +251,7 @@ ULONG CDECL ldap_escape_filter_elementW( char *src, ULONG srclen, WCHAR *dst, UL { ULONG len = get_escape_size( src, srclen ); - TRACE( "(%p, 0x%08x, %p, 0x%08x)\n", src, srclen, dst, dstlen ); + TRACE( "(%p, %#lx, %p, %#lx)\n", src, srclen, dst, dstlen ); if (!dst) return len; @@ -629,7 +629,7 @@ ULONG CDECL ldap_result( LDAP *ld, ULONG msgid, ULONG all, struct l_timeval *tim void *msgU = NULL; ULONG ret = ~0u; - TRACE( "(%p, 0x%08x, 0x%08x, %p, %p)\n", ld, msgid, all, timeout, res ); + TRACE( "(%p, %#lx, %#lx, %p, %p)\n", ld, msgid, all, timeout, res ); if (ld && res && msgid != ~0u) { diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index d68c3a9981c..efd0d4586b9 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -395,7 +395,7 @@ static BOOL query_supported_server_ctrls( LDAP *ld ) struct ldap_get_values_len_params get_params = { CTX(ld), entry, attrs[0], &ctrls }; LDAP_CALL( ldap_get_values_len, &get_params ); count = LDAP_CALL( ldap_count_values_len, ctrls ); - for (i = 0; i < count; i++) TRACE("%u: %s\n", i, debugstr_an( ctrls[i]->bv_val, ctrls[i]->bv_len )); + for (i = 0; i < count; i++) TRACE( "%lu: %s\n", i, debugstr_an( ctrls[i]->bv_val, ctrls[i]->bv_len ) ); *(struct bervalU ***)&SERVER_CTRLS(ld) = ctrls; } } diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 9f4acbdaa16..e36d0ad5615 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -45,7 +45,7 @@ ULONG CDECL ldap_create_page_controlA( LDAP *ld, ULONG pagesize, struct berval * ULONG ret; LDAPControlW *controlW = NULL; - TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); + TRACE( "(%p, %#lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); if (!ld || !control || pagesize > INT_MAX) return LDAP_PARAM_ERROR; @@ -129,7 +129,7 @@ static ULONG create_page_control( ULONG pagesize, struct berval *cookie, UCHAR c ULONG CDECL ldap_create_page_controlW( LDAP *ld, ULONG pagesize, struct berval *cookie, UCHAR critical, LDAPControlW **control ) { - TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); + TRACE( "(%p, %#lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); if (!ld || !control || pagesize > INT_MAX) return LDAP_PARAM_ERROR; return create_page_control( pagesize, cookie, critical, control ); @@ -137,7 +137,7 @@ ULONG CDECL ldap_create_page_controlW( LDAP *ld, ULONG pagesize, struct berval * ULONG CDECL ldap_get_next_page( LDAP *ld, LDAPSearch *search, ULONG pagesize, ULONG *message ) { - FIXME( "(%p, %p, 0x%08x, %p)\n", ld, search, pagesize, message ); + FIXME( "(%p, %p, %#lx, %p)\n", ld, search, pagesize, message ); if (!ld) return ~0u; return LDAP_NOT_SUPPORTED; @@ -148,7 +148,7 @@ ULONG CDECL ldap_get_next_page_s( LDAP *ld, LDAPSearch *search, struct l_timeval { ULONG ret; - TRACE( "(%p, %p, %p, %u, %p, %p)\n", ld, search, timeout, pagesize, count, results ); + TRACE( "(%p, %p, %p, %lu, %p, %p)\n", ld, search, timeout, pagesize, count, results ); if (!ld || !search || !count || !results) return ~0u; @@ -203,7 +203,8 @@ ULONG CDECL ldap_get_paged_count( LDAP *ld, LDAPSearch *search, ULONG *count, LD ret = ldap_parse_page_controlW( ld, server_ctrls, count, &search->cookie ); if (ret == LDAP_SUCCESS) - TRACE("new search->cookie: %s, count %u\n", debugstr_an(search->cookie->bv_val, search->cookie->bv_len), *count); + TRACE( "new search->cookie: %s, count %lu\n", + debugstr_an(search->cookie->bv_val, search->cookie->bv_len), *count ); ldap_controls_freeW( server_ctrls ); return ret; @@ -292,7 +293,7 @@ LDAPSearch * CDECL ldap_search_init_pageA( LDAP *ld, char *dn, ULONG scope, char ULONG attrsonly, LDAPControlA **serverctrls, LDAPControlA **clientctrls, ULONG timelimit, ULONG sizelimit, LDAPSortKeyA **sortkeys ) { - FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", ld, debugstr_a(dn), scope, + FIXME( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %#lx, %#lx, %p)\n", ld, debugstr_a(dn), scope, debugstr_a(filter), attrs, attrsonly, serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); return NULL; } @@ -304,7 +305,7 @@ LDAPSearch * CDECL ldap_search_init_pageW( LDAP *ld, WCHAR *dn, ULONG scope, WCH LDAPSearch *search; DWORD i, len; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", ld, debugstr_w(dn), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %#lx, %#lx, %p)\n", ld, debugstr_w(dn), scope, debugstr_w(filter), attrs, attrsonly, serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); if (!(search = calloc( 1, sizeof(*search) ))) diff --git a/dlls/wldap32/search.c b/dlls/wldap32/search.c index b360ab5366c..a673851b148 100644 --- a/dlls/wldap32/search.c +++ b/dlls/wldap32/search.c @@ -40,7 +40,7 @@ ULONG CDECL ldap_searchA( LDAP *ld, char *base, ULONG scope, char *filter, char ULONG ret = LDAP_NO_MEMORY; WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly ); + TRACE( "(%p, %s, %#lx, %s, %p, %#lx)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly ); if (!ld) return ~0u; @@ -83,7 +83,7 @@ exit: ULONG CDECL ldap_searchW( LDAP *ld, WCHAR *base, ULONG scope, WCHAR *filter, WCHAR **attrs, ULONG attrsonly ) { ULONG ret, msg; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly ); + TRACE( "(%p, %s, %#lx, %s, %p, %#lx)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly ); ret = ldap_search_extW( ld, base, scope, filter, attrs, attrsonly, NULL, NULL, 0, 0, &msg ); if (ret == LDAP_SUCCESS) return msg; @@ -102,7 +102,7 @@ ULONG CDECL ldap_search_extA( LDAP *ld, char *base, ULONG scope, char *filter, c WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", ld, debugstr_a(base), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %#lx, %#lx, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, serverctrls, clientctrls, timelimit, sizelimit, message ); if (!ld) return LDAP_PARAM_ERROR; @@ -162,7 +162,7 @@ ULONG CDECL ldap_search_extW( LDAP *ld, WCHAR *base, ULONG scope, WCHAR *filter, LDAPControlU **serverctrlsU = NULL, **clientctrlsU = NULL; struct timevalU timevalU; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", ld, debugstr_w(base), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %#lx, %#lx, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, serverctrls, clientctrls, timelimit, sizelimit, message ); if (!ld) return ~0u; @@ -203,7 +203,7 @@ ULONG CDECL ldap_search_ext_sA( LDAP *ld, char *base, ULONG scope, char *filter, WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, %p, 0x%08x, %p)\n", ld, debugstr_a(base), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %p, %#lx, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res ); if (!ld || !res) return LDAP_PARAM_ERROR; @@ -262,7 +262,7 @@ ULONG CDECL ldap_search_ext_sW( LDAP *ld, WCHAR *base, ULONG scope, WCHAR *filte struct timevalU timevalU; void *msgU = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, %p, 0x%08x, %p)\n", ld, debugstr_w(base), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %p, %#lx, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res ); if (!ld || !res) return LDAP_PARAM_ERROR; @@ -320,7 +320,7 @@ ULONG CDECL ldap_search_sA( LDAP *ld, char *base, ULONG scope, char *filter, cha ULONG ret = LDAP_NO_MEMORY; WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, res ); if (!ld || !res) return LDAP_PARAM_ERROR; @@ -363,7 +363,7 @@ exit: ULONG CDECL ldap_search_sW( LDAP *ld, WCHAR *base, ULONG scope, WCHAR *filter, WCHAR **attrs, ULONG attrsonly, LDAPMessage **res ) { - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, res ); return ldap_search_ext_sW( ld, base, scope, filter, attrs, attrsonly, NULL, NULL, NULL, 0, res ); } @@ -379,7 +379,7 @@ ULONG CDECL ldap_search_stA( LDAP *ld, const PCHAR base, ULONG scope, const PCHA ULONG ret = LDAP_NO_MEMORY; WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, timeout, res ); if (!ld || !res) return LDAP_PARAM_ERROR; @@ -423,7 +423,7 @@ exit: ULONG CDECL ldap_search_stW( LDAP *ld, const PWCHAR base, ULONG scope, const PWCHAR filter, WCHAR **attrs, ULONG attrsonly, struct l_timeval *timeout, LDAPMessage **res ) { - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, timeout, res ); return ldap_search_ext_sW( ld, base, scope, filter, attrs, attrsonly, NULL, NULL, timeout, 0, res ); } diff --git a/dlls/wldap32/tests/Makefile.in b/dlls/wldap32/tests/Makefile.in index 7fc7a026023..05fe5b9af6d 100644 --- a/dlls/wldap32/tests/Makefile.in +++ b/dlls/wldap32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wldap32.dll IMPORTS = wldap32 diff --git a/dlls/wldap32/tests/ber.c b/dlls/wldap32/tests/ber.c index 56d54fa6f5a..64565efbcbe 100644 --- a/dlls/wldap32/tests/ber.c +++ b/dlls/wldap32/tests/ber.c @@ -41,7 +41,7 @@ static void test_ber_printf(void) ret = ber_flatten( ber, &bv ); ok( !ret, "got %d\n", ret ); - todo_wine ok( bv->bv_len == 12, "got %d\n", bv->bv_len ); + todo_wine ok( bv->bv_len == 12, "got %ld\n", bv->bv_len ); if (bv->bv_len == 12) ok( !memcmp( bv->bv_val, "0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff", 12 ), "got %s\n", wine_dbgstr_an(bv->bv_val, 12) ); ber_bvfree( bv ); diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 8deebcbc6bf..8ed95dd03f2 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -51,7 +51,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) sortkeys[0] = &key; sortkeys[1] = NULL; ret = ldap_create_sort_controlA( ld, sortkeys, 0, &sort ); - ok( !ret, "ldap_create_sort_controlA failed 0x%x\n", ret ); + ok( !ret, "ldap_create_sort_controlA failed %#lx\n", ret ); ctrls[0] = sort; ctrls[1] = NULL; @@ -64,33 +64,33 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ldap_control_freeA( sort ); return; } - ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret ); + ok( !ret, "ldap_search_ext_sA failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); if (GetProcAddress(GetModuleHandleA("wldap32.dll"), "ber_init")) { ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); - ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed 0x%x\n", ret ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed %#lx\n", ret ); } else win_skip("Test would crash on older wldap32 versions\n"); result = ~0u; ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); - ok( !ret, "ldap_parse_resultA failed 0x%x\n", ret ); - ok( !result, "got 0x%x expected 0\n", result ); + ok( !ret, "ldap_parse_resultA failed %#lx\n", ret ); + ok( !result, "got %#lx expected 0\n", result ); ret = ldap_parse_sort_controlA( NULL, NULL, NULL, NULL ); - ok( ret == LDAP_PARAM_ERROR, "ldap_parse_sort_controlA failed 0x%d\n", ret ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_sort_controlA failed %#lx\n", ret ); ret = ldap_parse_sort_controlA( ld, NULL, NULL, NULL ); - ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed 0x%x\n", ret ); + ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed %#lx\n", ret ); ret = ldap_parse_sort_controlA( ld, NULL, &result, NULL ); - ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed 0x%x\n", ret ); + ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed %#lx\n", ret ); ret = ldap_parse_sort_controlA( ld, server_ctrls, &result, NULL ); - ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed 0x%x\n", ret ); + ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed %#lx\n", ret ); ldap_control_freeA( sort ); ldap_controls_freeA( server_ctrls ); @@ -108,11 +108,11 @@ static void test_ldap_search_extW( LDAP *ld ) skip("test server can't be reached\n"); return; } - ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); + ok( !ret, "ldap_search_extW failed %#lx\n", ret ); timelimit = 0; ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); - ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); + ok( !ret, "ldap_search_extW failed %#lx\n", ret ); } static void test_ldap_set_optionW( LDAP *ld ) @@ -127,10 +127,10 @@ static void test_ldap_set_optionW( LDAP *ld ) } ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF ); - ok( !ret || broken(ret == LDAP_PARAM_ERROR) /* nt4, win2k */, "ldap_set_optionW failed 0x%08x\n", ret ); + ok( !ret || broken(ret == LDAP_PARAM_ERROR) /* nt4, win2k */, "ldap_set_optionW failed %#lx\n", ret ); ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, (void *)&oldvalue ); - ok( !ret, "ldap_set_optionW failed 0x%08x\n", ret ); + ok( !ret, "ldap_set_optionW failed %#lx\n", ret ); } static void test_ldap_get_optionW( LDAP *ld ) @@ -138,8 +138,8 @@ static void test_ldap_get_optionW( LDAP *ld ) ULONG ret, version; ret = ldap_get_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); - ok( !ret, "ldap_get_optionW failed 0x%08x\n", ret ); - ok( version == LDAP_VERSION3, "got %u\n", version ); + ok( !ret, "ldap_get_optionW failed %#lx\n", ret ); + ok( version == LDAP_VERSION3, "got %lu\n", version ); } static void test_ldap_bind_sA( void ) @@ -161,10 +161,10 @@ static void test_ldap_bind_sA( void ) } ret = ldap_connect( ld, NULL ); - ok( !ret, "ldap_connect failed 0x%08x\n", ret ); + ok( !ret, "ldap_connect failed %#lx\n", ret ); ret = ldap_bind_sA( ld, (char *)"CN=read-only-admin,DC=example,DC=com", (char *)"password", LDAP_AUTH_SIMPLE ); - ok( !ret, "ldap_bind_s failed 0x%08x\n", ret ); + ok( !ret, "ldap_bind_s failed %#lx\n", ret ); ldap_unbind( ld ); } @@ -192,7 +192,7 @@ static void test_ldap_server_control( void ) } ret = ldap_connect( ld, NULL ); - ok( !ret, "ldap_connect failed 0x%08x\n", ret ); + ok( !ret, "ldap_connect failed %#lx\n", ret ); /* test setting a not supported server control */ mask.ldctl_oid = (WCHAR *)L"1.2.840.113556.1.4.801"; @@ -202,11 +202,11 @@ static void test_ldap_server_control( void ) ctrls[0] = &mask; ctrls[1] = NULL; ret = ldap_set_optionW(ld, LDAP_OPT_SERVER_CONTROLS, ctrls); - ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionW should fail: 0x%x\n", ret ); + ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionW should fail: %#lx\n", ret ); res = NULL; ret = ldap_search_sA( ld, (char *)"OU=scientists,DC=example,DC=com", LDAP_SCOPE_BASE, (char *)"(objectclass=*)", NULL, FALSE, &res ); - ok( !ret, "ldap_search_sA failed 0x%x\n", ret ); + ok( !ret, "ldap_search_sA failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); ldap_msgfree( res ); @@ -242,12 +242,12 @@ static void test_ldap_paged_search(void) count = 0xdeadbeef; res = NULL; ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); - ok( !ret, "ldap_get_next_page_s failed 0x%x\n", ret ); + ok( !ret, "ldap_get_next_page_s failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); - ok( count == 0, "got %u\n", count ); + ok( count == 0, "got %lu\n", count ); count = ldap_count_entries( ld, res); - ok( count == 1, "got %u\n", count ); + ok( count == 1, "got %lu\n", count ); entry = ldap_first_entry( ld, res); ok( res != NULL, "expected entry != NULL\n" ); @@ -264,9 +264,9 @@ static void test_ldap_paged_search(void) count = 0xdeadbeef; res = (void *)0xdeadbeef; ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); - ok( ret == LDAP_NO_RESULTS_RETURNED, "got 0x%x\n", ret ); + ok( ret == LDAP_NO_RESULTS_RETURNED, "got %#lx\n", ret ); ok( !res, "expected res == NULL\n" ); - ok( count == 0, "got %u\n", count ); + ok( count == 0, "got %lu\n", count ); ldap_search_abandon_page( ld, search ); ldap_unbind( ld ); -- 2.30.2

1 0

[PATCH] xinput1_3: Use WM_DEVICECHANGE device path to add or remove devices.
by Rémi Bernon 15 Feb '22

15 Feb '22

Instead of iterating the entire device list every time. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 95 ++++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 18f4546de9f..c8ce6622dcb 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -127,7 +127,7 @@ static HANDLE stop_event; static HANDLE done_event; static HANDLE update_event; -static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) +static BOOL find_opened_device(const WCHAR *device_path, int *free_slot) { int i; @@ -135,7 +135,7 @@ static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *f for (i = XUSER_MAX_COUNT; i > 0; i--) { if (!controllers[i - 1].device) *free_slot = i - 1; - else if (!wcscmp(detail->DevicePath, controllers[i - 1].device_path)) return TRUE; + else if (!wcsicmp(device_path, controllers[i - 1].device_path)) return TRUE; } return FALSE; } @@ -411,7 +411,7 @@ static void controller_disable(struct xinput_controller *controller) } static BOOL controller_init(struct xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, - HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) + HIDP_CAPS *caps, HANDLE device, const WCHAR *device_path) { HANDLE event = NULL; @@ -493,19 +493,60 @@ static BOOL device_is_overriden(HANDLE device) return disable; } +static BOOL try_add_device(const WCHAR *device_path) +{ + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + PHIDP_PREPARSED_DATA preparsed; + HIDP_CAPS caps; + NTSTATUS status; + HANDLE device; + int i; + + if (find_opened_device(device_path, &i)) return TRUE; /* already opened */ + if (i == XUSER_MAX_COUNT) return FALSE; /* no more slots */ + + device = CreateFileW(device_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); + if (device == INVALID_HANDLE_VALUE) return TRUE; + + preparsed = NULL; + if (!HidD_GetPreparsedData(device, &preparsed)) + WARN("ignoring HID device, HidD_GetPreparsedData failed with error %lu\n", GetLastError()); + else if ((status = HidP_GetCaps(preparsed, &caps)) != HIDP_STATUS_SUCCESS) + WARN("ignoring HID device, HidP_GetCaps returned %#lx\n", status); + else if (caps.UsagePage != HID_USAGE_PAGE_GENERIC) + WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); + else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && + caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) + WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); + else if (device_is_overriden(device)) + WARN("ignoring HID device, overriden for dinput\n"); + else if (!controller_init(&controllers[i], preparsed, &caps, device, device_path)) + WARN("ignoring HID device, failed to initialize\n"); + else + return TRUE; + + CloseHandle(device); + HidD_FreePreparsedData(preparsed); + return TRUE; +} + +static void try_remove_device(const WCHAR *device_path) +{ + int i; + + if (find_opened_device(device_path, &i)) + controller_destroy(&controllers[i], TRUE); +} + static void update_controller_list(void) { char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; - PHIDP_PREPARSED_DATA preparsed; - HIDP_CAPS caps; - NTSTATUS status; HDEVINFO set; - HANDLE device; DWORD idx; GUID guid; - int i; guid = GUID_DEVINTERFACE_WINEXINPUT; @@ -517,34 +558,8 @@ static void update_controller_list(void) { if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, sizeof(buffer), NULL, NULL)) continue; - - if (find_opened_device(detail, &i)) continue; /* already opened */ - if (i == XUSER_MAX_COUNT) break; /* no more slots */ - - device = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); - if (device == INVALID_HANDLE_VALUE) continue; - - preparsed = NULL; - if (!HidD_GetPreparsedData(device, &preparsed)) - WARN("ignoring HID device, HidD_GetPreparsedData failed with error %lu\n", GetLastError()); - else if ((status = HidP_GetCaps(preparsed, &caps)) != HIDP_STATUS_SUCCESS) - WARN("ignoring HID device, HidP_GetCaps returned %#lx\n", status); - else if (caps.UsagePage != HID_USAGE_PAGE_GENERIC) - WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); - else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && - caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) - WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (device_is_overriden(device)) - WARN("ignoring HID device, overriden for dinput\n"); - else if (!controller_init(&controllers[i], preparsed, &caps, device, detail->DevicePath)) - WARN("ignoring HID device, failed to initialize\n"); - else - continue; - - CloseHandle(device); - HidD_FreePreparsedData(preparsed); + if (!try_add_device(detail->DevicePath)) + break; } SetupDiDestroyDeviceInfoList(set); @@ -698,7 +713,13 @@ static void read_controller_state(struct xinput_controller *controller) static LRESULT CALLBACK xinput_devnotify_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - if (msg == WM_DEVICECHANGE && wparam == DBT_DEVICEARRIVAL) update_controller_list(); + if (msg == WM_DEVICECHANGE) + { + DEV_BROADCAST_DEVICEINTERFACE_W *iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)lparam; + if (wparam == DBT_DEVICEARRIVAL) try_add_device(iface->dbcc_name); + if (wparam == DBT_DEVICEREMOVECOMPLETE) try_remove_device(iface->dbcc_name); + } + return DefWindowProcW(hwnd, msg, wparam, lparam); } -- 2.34.1

1 0

[PATCH 1/5] xinput1_3: Use the implicit Stop waveform ordinal to stop the effects.
by Rémi Bernon 15 Feb '22

15 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index e669fa0af71..2179da1db72 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -81,6 +81,8 @@ struct xinput_controller char *feature_report_buf; BYTE haptics_report; + BYTE haptics_none_ordinal; + BYTE haptics_stop_ordinal; BYTE haptics_rumble_ordinal; BYTE haptics_buzz_ordinal; } hid; @@ -244,6 +246,8 @@ static BOOL controller_check_caps(struct xinput_controller *controller, HANDLE d return TRUE; } + controller->hid.haptics_none_ordinal = 1; /* implicit None waveform ordinal, from the HID spec */ + controller->hid.haptics_stop_ordinal = 2; /* implicit Stop waveform ordinal, from the HID spec */ controller->hid.haptics_buzz_ordinal = 0; controller->hid.haptics_rumble_ordinal = 0; for (i = 3; status == HIDP_STATUS_SUCCESS; ++i) @@ -291,6 +295,22 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO if (!controller->enabled) return ERROR_SUCCESS; + if (!state->wLeftMotorSpeed && !state->wRightMotorSpeed) + { + status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, + controller->hid.haptics_stop_ordinal, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + { + WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); + return GetLastError(); + } + + return 0; + } + /* send haptics rumble report (left motor) */ status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); -- 2.34.1

1 4

[PATCH v2 1/2] httpapi: Build without -DWINE_NO_LONG_TYPES.
by Zebediah Figura 15 Feb '22

15 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Fix the subject. dlls/httpapi/Makefile.in | 1 - dlls/httpapi/httpapi_main.c | 54 ++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in index ea9c4223059..94020e9c17e 100644 --- a/dlls/httpapi/Makefile.in +++ b/dlls/httpapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = httpapi.dll IMPORTLIB = httpapi IMPORTS = advapi32 diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 52fa6cc1d80..4d2d307ffcb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -53,12 +53,12 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved { SC_HANDLE manager, service; - TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, + TRACE("version %u.%u, flags %#lx, reserved %p.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, flags, reserved); if (flags & ~HTTP_INITIALIZE_SERVER) { - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); return ERROR_SUCCESS; } @@ -67,14 +67,14 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved if (!(service = OpenServiceW(manager, L"http", SERVICE_START))) { - ERR("Failed to open HTTP service, error %u.\n", GetLastError()); + ERR("Failed to open HTTP service, error %lu.\n", GetLastError()); CloseServiceHandle(manager); return GetLastError(); } if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) { - ERR("Failed to start HTTP service, error %u.\n", GetLastError()); + ERR("Failed to start HTTP service, error %lu.\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); return GetLastError(); @@ -100,7 +100,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved */ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) { - FIXME( "(0x%x, %p): stub!\n", flags, reserved ); + FIXME( "(0x%lx, %p): stub!\n", flags, reserved ); return NO_ERROR; } @@ -123,7 +123,7 @@ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) ULONG WINAPI HttpDeleteServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, PVOID config, ULONG length, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } @@ -150,7 +150,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I PVOID query, ULONG query_len, PVOID buffer, ULONG buffer_len, PULONG data_len, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p, %d, %p, %p): stub!\n", handle, type, query, query_len, + FIXME( "(%p, %d, %p, %ld, %p, %ld, %p, %p): stub!\n", handle, type, query, query_len, buffer, buffer_len, data_len, overlapped ); return ERROR_FILE_NOT_FOUND; } @@ -174,7 +174,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, PVOID config, ULONG length, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } @@ -197,7 +197,7 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) UNICODE_STRING string; IO_STATUS_BLOCK iosb; - TRACE("handle %p, reserved %#x.\n", handle, reserved); + TRACE("handle %p, reserved %#lx.\n", handle, reserved); if (!handle) return ERROR_INVALID_PARAMETER; @@ -289,11 +289,11 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl; - TRACE("queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#lx, buffer %p, size %#lx, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl); if (flags) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!ovl) { @@ -334,11 +334,11 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl; - TRACE("queue %p, id %s, flags %#x, request %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#lx, request %p, size %#lx, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, request, size, ret_size, ovl); if (flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY) - FIXME("Ignoring flags %#x.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); + FIXME("Ignoring flags %#lx.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); if (size < sizeof(HTTP_REQUEST_V1)) return ERROR_INSUFFICIENT_BUFFER; @@ -426,15 +426,15 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, char *p, dummy[12]; USHORT i; - TRACE("queue %p, id %s, flags %#x, response %p, cache_policy %p, " - "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p.\n", + TRACE("queue %p, id %s, flags %#lx, response %p, cache_policy %p, " + "ret_size %p, reserved1 %p, reserved2 %#lx, ovl %p, log_data %p.\n", queue, wine_dbgstr_longlong(id), flags, response, cache_policy, ret_size, reserved1, reserved2, ovl, log_data); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); if (response->s.Flags) - FIXME("Unhandled response flags %#x.\n", response->s.Flags); + FIXME("Unhandled response flags %#lx.\n", response->s.Flags); if (cache_policy) WARN("Ignoring cache_policy.\n"); if (log_data) @@ -563,7 +563,7 @@ ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSIO { struct server_session *session; - TRACE("version %u.%u, id %p, reserved %u.\n", version.HttpApiMajorVersion, + TRACE("version %u.%u, id %p, reserved %lu.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved); if (!id) @@ -613,7 +613,7 @@ ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROU struct server_session *session; struct url_group *group; - TRACE("session_id %s, group_id %p, reserved %#x.\n", + TRACE("session_id %s, group_id %p, reserved %#lx.\n", wine_dbgstr_longlong(session_id), group_id, reserved); if (!(session = get_server_session(session_id))) @@ -655,7 +655,7 @@ ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY { struct url_group *group = get_url_group(id); - TRACE("id %s, property %u, value %p, length %u.\n", + TRACE("id %s, property %u, value %p, length %lu.\n", wine_dbgstr_longlong(id), property, value, length); switch (property) @@ -687,7 +687,7 @@ ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, { struct url_group *group = get_url_group(id); - TRACE("id %s, url %s, context %s, reserved %#x.\n", wine_dbgstr_longlong(id), + TRACE("id %s, url %s, context %s, reserved %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), wine_dbgstr_longlong(context), reserved); if (group->url) @@ -713,13 +713,13 @@ ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, U { struct url_group *group = get_url_group(id); - TRACE("id %s, url %s, flags %#x.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); + TRACE("id %s, url %s, flags %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); if (!group->url) return ERROR_FILE_NOT_FOUND; if (flags) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); heap_free(group->url); group->url = NULL; @@ -740,14 +740,14 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, UNICODE_STRING string; IO_STATUS_BLOCK iosb; - TRACE("version %u.%u, name %s, sa %p, flags %#x, handle %p.\n", + TRACE("version %u.%u, name %s, sa %p, flags %#lx, handle %p.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, debugstr_w(name), sa, flags, handle); if (name) FIXME("Unhandled name %s.\n", debugstr_w(name)); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; @@ -775,7 +775,7 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2) { - FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n", + FIXME("queue %p, property %u, value %p, length %lu, reserved1 %#lx, reserved2 %p, stub!\n", queue, property, value, length, reserved1, reserved2); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -786,7 +786,7 @@ ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY prop ULONG WINAPI HttpSetServerSessionProperty(HTTP_SERVER_SESSION_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length) { - TRACE("id %s, property %u, value %p, length %u.\n", + TRACE("id %s, property %u, value %p, length %lu.\n", wine_dbgstr_longlong(id), property, value, length); switch (property) -- 2.34.1

1 1

[PATCH resend] include: Add single-producer single-consumer ringbuffer implementation.
by me＠davidebeatrici.dev 15 Feb '22

15 Feb '22

Please note that I wrote a test for the ringbuffer, but I'm not sure where I should put it in the repository.

1 0

[tools 1/3] testbot/LibvirtTool: Wait a bit between shutting down and reverting a VM.
by Francois Gouget 15 Feb '22

15 Feb '22

Also rename ShutDown() to the more descriptive ShutDownIfOffSnapshot() and document it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Without this delay reverting from a PCI-passthrough configuration to a regular VGA live snapshot sometimes results in a black VM screen. --- testbot/bin/LibvirtTool.pl | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index ef94a2be09..1fc7dc1d4c 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -280,7 +280,20 @@ sub GetPrivilegedTA($) return $TA->SetTime() ? $TA : $VM->GetAgent(1); } -sub ShutDown() +=pod +=over 12 + +=item C<ShutDownIfOffSnapshot()> + +Attempt a clean shutdown of the VM if it is running a snapshot that requests +them (snapshot name containing '-off'). + +Returns 0 if the shutdown failed, 2 if it was successful and 1 if the VM was +already powered off or a shutdown was not needed. +=back +=cut + +sub ShutDownIfOffSnapshot() { my $Domain = $VM->GetDomain(); my $CurrentSnapshot = $Domain->GetSnapshotName(); @@ -311,7 +324,7 @@ sub ShutDown() { Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); LogMsg "Successfully shut down $VMKey\n"; - return 1; + return 2; } sleep(1); } @@ -365,7 +378,7 @@ sub Monitor() if ($IsReady and $VM->GetDomain()->IsPoweredOn()) { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); my $ErrMessage = $VM->GetDomain()->PowerOff(); if (defined $ErrMessage) @@ -391,7 +404,7 @@ sub Monitor() sub PowerOff() { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; @@ -431,7 +444,7 @@ sub CheckOff() if ($SnapshotName eq $VM->IdleSnapshot) { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); @@ -612,8 +625,10 @@ sub Revert() $VM->Save(); } - # Before reverting, try to perform a clean shutdown if requested - ShutDown(); + # Before reverting, try to perform a clean shutdown if requested. + # After a shutdown a small wait is also sometimes required, at least when + # switching from a PCI-passthrough configuration to a regular one. + sleep(1) if (ShutDownIfOffSnapshot() == 2); # Revert the VM (and power it on if necessary) Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); -- 2.30.2

1 2

[PATCH 1/5] kernelbase: Also return E_FAIL when trying to parse username, password, or port for non-Internet URLs.
by Zebediah Figura 15 Feb '22

15 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 34 ++++++++++++++++++---------------- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b753ce3dd2e..28717c25f79 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4329,6 +4329,24 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p hr = parse_url(url, &pl); + switch (scheme) + { + case URL_SCHEME_FILE: + case URL_SCHEME_FTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + case URL_SCHEME_TELNET: + case URL_SCHEME_NEWS: + case URL_SCHEME_NNTP: + case URL_SCHEME_SNEWS: + break; + + default: + if (part != URL_PART_SCHEME && part != URL_PART_QUERY) + return E_FAIL; + } + switch (part) { case URL_PART_SCHEME: @@ -4344,22 +4362,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_HOSTNAME: - switch (scheme) - { - case URL_SCHEME_FILE: - case URL_SCHEME_FTP: - case URL_SCHEME_GOPHER: - case URL_SCHEME_HTTP: - case URL_SCHEME_HTTPS: - case URL_SCHEME_TELNET: - case URL_SCHEME_NEWS: - case URL_SCHEME_NNTP: - case URL_SCHEME_SNEWS: - break; - default: - return E_FAIL; - } - if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) { *out = '\0'; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 729b069a772..904d3e7bb5b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -601,10 +601,10 @@ static void test_UrlGetPart(void) tests[] = { {"hi", URL_PART_SCHEME, 0, S_FALSE, ""}, - {"hi", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"hi", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_USERNAME, 0, E_FAIL}, + {"hi", URL_PART_PASSWORD, 0, E_FAIL}, {"hi", URL_PART_HOSTNAME, 0, E_FAIL}, - {"hi", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_PORT, 0, E_FAIL}, {"hi", URL_PART_QUERY, 0, S_FALSE, ""}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, 0, S_OK, "http"}, -- 2.34.1

1 4

[PATCH] include: Add missing CreateProcessWithTokenW() declaration.
by Zebediah Figura 15 Feb '22

15 Feb '22

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..a8744eb417a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1901,6 +1901,7 @@ WINBASEAPI BOOL WINAPI CreateProcessInternalA(HANDLE,LPCSTR,LPSTR,LPSECUR WINBASEAPI BOOL WINAPI CreateProcessInternalW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION,HANDLE*); #define CreateProcessInternal WINELIB_NAME_AW(CreateProcessInternal) WINADVAPI BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); +WINADVAPI BOOL WINAPI CreateProcessWithTokenW(HANDLE,DWORD,LPCWSTR,LPWSTR,DWORD,void *,LPCWSTR,STARTUPINFOW *,PROCESS_INFORMATION *); WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateRemoteThreadEx(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPPROC_THREAD_ATTRIBUTE_LIST,LPDWORD); WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE); -- 2.34.1

1 0

[PATCH] ntdll: Fix the spelling of SystemPrioritySeparation.
by Francois Gouget 15 Feb '22

15 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I see no evidence that Microsoft has misspelled this constant... because as far as I can tell it's not defined in the Windows headers. Also online I find about as many places where it is misspelled as places that have it spelled correctly. So I'd be in favor of using the correct spelling. --- include/winternl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index 5be28856920..81fd5f45665 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1624,7 +1624,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemContextSwitchInformation = 36, SystemRegistryQuotaInformation = 37, SystemExtendServiceTableInformation = 38, - SystemPrioritySeperation = 39, + SystemPrioritySeparation = 39, SystemVerifierAddDriverInformation = 40, SystemVerifierRemoveDriverInformation = 41, SystemProcessorIdleInformation = 42, -- 2.30.2

1 0

[PATCH] ntdll: Use YieldProcessor() in RtlEnterCriticalSection().
by Zebediah Figura 15 Feb '22

15 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/sync.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 06b594c633f..43864325b35 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -373,15 +373,6 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) } -static inline void small_pause(void) -{ -#ifdef __i386__ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#else - __asm__ __volatile__( "" : : : "memory" ); -#endif -} - /****************************************************************************** * RtlEnterCriticalSection (NTDLL.@) */ @@ -399,7 +390,7 @@ NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) { if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) goto done; } - small_pause(); + YieldProcessor(); } } -- 2.34.1

1 0

[PATCH] include: Add single-producer single-consumer ringbuffer implementation.
by me＠davidebeatrici.dev 15 Feb '22

15 Feb '22

Please note that I wrote a test for the ringbuffer, but I'm not sure where I should put it in the repository.

1 0

[PATCH v3 1/4] d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx().
by Zebediah Figura 14 Feb '22

14 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 57 +++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 310e5c0bf17..6ea138e632f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6422,15 +6422,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) - { - effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); - pool->lpVtbl->AddRef(pool); - } - - IDirect3DDevice9_AddRef(device); - effect->device = device; - effect->flags = flags; list_init(&effect->parameter_block_list); @@ -6487,6 +6478,15 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev TRACE("Tag: %x\n", tag); } + if (pool) + { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); + pool->lpVtbl->AddRef(pool); + } + + IDirect3DDevice9_AddRef(device); + effect->device = device; + if (skip_constants_string) { skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, @@ -6495,7 +6495,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev { if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } strcpy(skip_constants_buffer, skip_constants_string); @@ -6504,7 +6505,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev HeapFree(GetProcessHeap(), 0, skip_constants_buffer); if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } } read_dword(&ptr, &offset); @@ -6518,7 +6520,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev FIXME("Failed to parse effect.\n"); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return hr; + goto fail; } for (i = 0; i < skip_constants_count; ++i) @@ -6535,7 +6537,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return D3DERR_INVALIDCALL; + hr = D3DERR_INVALIDCALL; + goto fail; } } } @@ -6557,6 +6560,33 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } return D3D_OK; + +fail: + if (effect->techniques) + { + for (i = 0; i < effect->technique_count; ++i) + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + } + + if (effect->parameters) + { + for (i = 0; i < effect->parameter_count; ++i) + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + } + + if (effect->objects) + { + for (i = 0; i < effect->object_count; ++i) + free_object(&effect->objects[i]); + heap_free(effect->objects); + } + + IDirect3DDevice9_Release(effect->device); + if (pool) + pool->lpVtbl->Release(pool); + return hr; } HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, @@ -6593,7 +6623,6 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object, hr %#x.\n", hr); - d3dx_effect_cleanup(object); return hr; } -- 2.34.1

3 8

[PATCH 1/7] mfplat/tests: Check that buffers are properly aligned.
by Giovanni Mascellani 14 Feb '22

14 Feb '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f89a5202d80..0d86f041c1e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2248,10 +2248,10 @@ static void test_system_memory_buffer(void) IMFMediaBuffer_Release(buffer); /* Aligned buffer. */ - hr = MFCreateAlignedMemoryBuffer(16, MF_8_BYTE_ALIGNMENT, NULL); + hr = MFCreateAlignedMemoryBuffer(16, MF_512_BYTE_ALIGNMENT, NULL); ok(FAILED(hr), "Unexpected hr %#x.\n", hr); - hr = MFCreateAlignedMemoryBuffer(201, MF_8_BYTE_ALIGNMENT, &buffer); + hr = MFCreateAlignedMemoryBuffer(201, MF_512_BYTE_ALIGNMENT, &buffer); ok(hr == S_OK, "Failed to create memory buffer, hr %#x.\n", hr); hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); @@ -2279,6 +2279,8 @@ static void test_system_memory_buffer(void) hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); ok(hr == S_OK, "Failed to lock, hr %#x.\n", hr); ok(max == 201 && length == 10, "Unexpected length.\n"); + todo_wine + ok(((uintptr_t)data & MF_512_BYTE_ALIGNMENT) == 0, "Data at %p is insufficiently aligned.\n", data); hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock, hr %#x.\n", hr); -- 2.34.1

2 8

[PATCH] dlls/msacm32: use extended structure definition for driver configuration
by Eric Pouech 14 Feb '22

14 Feb '22

1a) fixes a too short memory allocation on 64bit (DRVCONFIGINFO is 20 byte large while only 16 bytes were allocated) 1b) incidentally, removes a bunch of GCC11 warnings (generated by 1a) 2) introduces DRVCONFIGINFOEX (note, in SDK, it's defined in mmiscapi.h; since it doesn't exist yet in Wine, I added the structure to mmsystem.h, where DRVCONFIGINFO already exists) 3) initializes the missing field Note: my testing don't show on Win10's msacm32 that DRV_CONFIGURE uses the DRVCONFIGINFOEX structure. So, maybe (wild guess here), the extended structure is only used when the driver is linked to some hardware. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msacm32/driver.c | 18 +++++++++--------- include/mmsystem.h | 6 ++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index a8d6f3cf6d7..036461800b1 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -400,7 +400,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA { PWINE_ACMDRIVERID padid; LRESULT lResult; - LPDRVCONFIGINFO pConfigInfo = NULL; + LPDRVCONFIGINFOEX pConfigInfo = NULL; LPWSTR section_name = NULL; LPWSTR alias_name = NULL; @@ -425,16 +425,15 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA } if (pAlias != NULL) { - /* DRVCONFIGINFO is only 12 bytes long, but native msacm - * reports a 16-byte structure to codecs, so allocate 16 bytes, - * just to be on the safe side. - */ - const unsigned int iStructSize = 16; - pConfigInfo = HeapAlloc(MSACM_hHeap, 0, iStructSize); + pConfigInfo = HeapAlloc(MSACM_hHeap, 0, sizeof(*pConfigInfo)); if (!pConfigInfo) { - ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); + ERR("OOM while supplying DRVCONFIGINFOEX for DRV_CONFIGURE, using NULL\n"); } else { - pConfigInfo->dwDCISize = iStructSize; + /* In some cases (seen in the 32bit world), a DRVCONFIGINFOEX struct is passed + * (with extended size) instead of the documented DRVCONFIGINFO. + * So, always pass a DRVCONFIGINFOEX to be one the safe side + */ + pConfigInfo->dwDCISize = sizeof(*pConfigInfo); section_name = HeapAlloc(MSACM_hHeap, 0, sizeof(L"Drivers32")); if (section_name) lstrcpyW(section_name, L"Drivers32"); @@ -442,6 +441,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA alias_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(pAlias) + 1) * sizeof(WCHAR)); if (alias_name) lstrcpyW(alias_name, pAlias); pConfigInfo->lpszDCIAliasName = alias_name; + pConfigInfo->dnDevNode = 0; /* FIXME */ if (pConfigInfo->lpszDCISectionName == NULL || pConfigInfo->lpszDCIAliasName == NULL) { HeapFree(MSACM_hHeap, 0, alias_name); diff --git a/include/mmsystem.h b/include/mmsystem.h index 2a0782d0cb9..5684ff20683 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -225,6 +225,12 @@ typedef struct tagDRVCONFIGINFO { LPCWSTR lpszDCIAliasName; } DRVCONFIGINFO, *LPDRVCONFIGINFO; +typedef struct tagDRVCONFIGINFOEX { + DWORD dwDCISize; + LPCWSTR lpszDCISectionName; + LPCWSTR lpszDCIAliasName; + DWORD dnDevNode; +} DRVCONFIGINFOEX, *LPDRVCONFIGINFOEX; LRESULT WINAPI DefDriverProc(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM); /* this sounds odd, but it's the way it is. OpenDriverA even disappeared

2 1

[PATCH v2 1/2] rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH.
by Sven Baars 14 Feb '22

14 Feb '22

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 20 ++++++++++---------- dlls/rsaenh/implglue.h | 14 +++++--------- dlls/rsaenh/rsaenh.c | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 9d90ad70f53..d98a08b2f31 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -32,8 +32,8 @@ /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); - -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) + +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) { BCRYPT_ALG_HANDLE provider; NTSTATUS status; @@ -74,27 +74,27 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) if (status) return FALSE; - status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + status = BCryptCreateHash(provider, hash_handle, NULL, 0, NULL, 0, 0); BCryptCloseAlgorithmProvider(provider, 0); return !status; } -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) { - BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); + BCryptHashData(hash_handle, (UCHAR*)pbData, dwDataLen, 0); return TRUE; } -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) { - BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); - BCryptDestroyHash(pHashContext->bcrypt_hash); + BCryptFinishHash(hash_handle, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(hash_handle); return TRUE; } -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle) { - return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); + return !BCryptDuplicateHash(src_hash_handle, dest_hash_handle, NULL, 0, 0); } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 9be642e9b60..06fa3f4430a 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,10 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -typedef union tagHASH_CONTEXT { - BCRYPT_HASH_HANDLE bcrypt_hash; -} HASH_CONTEXT; - typedef union tagKEY_CONTEXT { rc2_key rc2; des_key des; @@ -42,12 +38,12 @@ typedef union tagKEY_CONTEXT { rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, + BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a4deb80b0e1..c913c0c71ee 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -58,7 +58,7 @@ typedef struct tagCRYPTHASH HCRYPTPROV hProv; DWORD dwHashSize; DWORD dwState; - HASH_CONTEXT context; + BCRYPT_HASH_HANDLE hash_handle; BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; PHMAC_INFO pHMACInfo; RSAENH_TLS1PRF_PARAMS tpPRFParams; @@ -627,8 +627,8 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { pAlgInfo = get_algid_info(pCryptHash->hProv, pCryptHash->pHMACInfo->HashAlgid); if (!pAlgInfo) return FALSE; pCryptHash->dwHashSize = pAlgInfo->dwDefaultLen >> 3; - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbInnerString, pCryptHash->pHMACInfo->cbInnerString); } @@ -642,7 +642,7 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { return TRUE; default: - return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->context); + return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->hash_handle); } } @@ -664,7 +664,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD { case CALG_HMAC: if (pCryptHash->pHMACInfo) - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); break; case CALG_MAC: @@ -677,7 +677,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD break; default: - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); } } @@ -699,15 +699,15 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbOuterString, pCryptHash->pHMACInfo->cbOuterString); - update_hash_impl(&pCryptHash->context, + update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } break; @@ -718,7 +718,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { break; default: - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } } @@ -2371,7 +2371,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { *pDestHash = *pSrcHash; - duplicate_hash_impl(&pSrcHash->context, &pDestHash->context); + duplicate_hash_impl(pSrcHash->hash_handle, &pDestHash->hash_handle); copy_hmac_info(&pDestHash->pHMACInfo, pSrcHash->pHMACInfo); copy_data_blob(&pDestHash->tpPRFParams.blobLabel, &pSrcHash->tpPRFParams.blobLabel); copy_data_blob(&pDestHash->tpPRFParams.blobSeed, &pSrcHash->tpPRFParams.blobSeed); -- 2.30.0.335.ge6362826a0

3 4

[PATCH 6/6] win32u: Move GetCursorPos implementation from user.
by Jacek Caban 14 Feb '22

14 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 13 +------------ dlls/user32/input.c | 28 +--------------------------- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/input.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 7 files changed, 46 insertions(+), 39 deletions(-)

3 2

[PATCH] dinput/tests: Remove an unneeded NULL cast.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dinput/tests/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 71e9f66834c..83635146324 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -3547,7 +3547,7 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) ok( !status, "RegSetValueExW returned %#lx\n", status ); status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)&caps, sizeof(caps) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, (void *)NULL, 0 ); + status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#lx\n", status ); status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#lx\n", status ); -- 2.30.2

2 1

[PATCH] dinput/tests: Remove spaces before linefeeds.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dinput/tests/keyboard.c | 2 +- dlls/dinput/tests/mouse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index a5dfe5edafc..251a12073df 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -499,7 +499,7 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) hr = IDirectInputDevice_GetDeviceInfo(pKey, (DIDEVICEINSTANCEA *)&inst3A); ok(SUCCEEDED(hr), "got %#lx\n", hr); - ok(instA.dwSize != inst3A.dwSize, "got %ld, %ld \n", instA.dwSize, inst3A.dwSize); + ok(instA.dwSize != inst3A.dwSize, "got %ld, %ld\n", instA.dwSize, inst3A.dwSize); ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index dc11f4d8ae9..8be808e5da6 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -246,7 +246,7 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) hr = IDirectInputDevice_GetDeviceInfo(pMouse, (DIDEVICEINSTANCEA *)&inst3A); ok(SUCCEEDED(hr), "got %#lx\n", hr); - ok(instA.dwSize != inst3A.dwSize, "got %lu, %lu \n", instA.dwSize, inst3A.dwSize); + ok(instA.dwSize != inst3A.dwSize, "got %lu, %lu\n", instA.dwSize, inst3A.dwSize); ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", -- 2.30.2

2 1

Re: [PATCH 4/6] dlls/quartz: use VIDEOINFOHEADER instead of partially allocated VIDEOINFO structure
by Zebediah Figura 14 Feb '22

14 Feb '22

On 2/14/22 12:27, Eric Pouech wrote: > Le 14/02/2022 à 19:07, Zebediah Figura a écrit : >> On 2/14/22 03:28, Eric Pouech wrote: >>> this fixes a couple of GCC11 warnings (-Wbounds) >>> >>> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> >>> >>> --- >>> dlls/quartz/avidec.c | 9 +++++---- >>> 1 file changed, 5 insertions(+), 4 deletions(-) >>> >>> diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c >>> index f8660890273..1295e8704df 100644 >>> --- a/dlls/quartz/avidec.c >>> +++ b/dlls/quartz/avidec.c >>> @@ -331,7 +331,7 @@ static HRESULT >>> avi_decompressor_source_get_media_type(struct strmbase_pin *iface >>> struct avi_decompressor *filter = >>> impl_from_strmbase_filter(iface->filter); >>> const VIDEOINFOHEADER *sink_format; >>> - VIDEOINFO *format; >>> + VIDEOINFOHEADER *format; >>> if (!filter->sink.pin.peer) >>> return VFW_S_NO_MORE_ITEMS; >>> @@ -363,9 +363,10 @@ static HRESULT >>> avi_decompressor_source_get_media_type(struct strmbase_pin *iface >>> if (IsEqualGUID(formats[index].subtype, >>> &MEDIASUBTYPE_RGB565)) >>> { >>> - format->dwBitMasks[iRED] = 0xf800; >>> - format->dwBitMasks[iGREEN] = 0x07e0; >>> - format->dwBitMasks[iBLUE] = 0x001f; >>> + DWORD *dwBitMasks = (DWORD *)(format + 1); >>> + dwBitMasks[iRED] = 0xf800; >>> + dwBitMasks[iGREEN] = 0x07e0; >>> + dwBitMasks[iBLUE] = 0x001f; >>> mt->cbFormat = offsetof(VIDEOINFO, dwBitMasks[3]); >>> } >>> else >>> >>> >> >> I don't think this is an improvement. >> >> I also don't get the warning with gcc 11.2.0. How exactly are you >> compiling and with which version? >> > Hi Zebdiah > > compiling with stock gcc version from fedora and regular wine's > configure (no parameter added) > > this is what I get with compiling a 64bit tree, configured with > > ./configure --enable-wine64 > > make[1]: Entering directory '/home/eric/work/wine-format/build64' > x86_64-w64-mingw32-gcc -c -o dlls/quartz/avidec.cross.o > /home/eric/work/wine-format/dlls/quartz/avidec.c -Idlls/quartz \ > -I/home/eric/work/wine-format/dlls/quartz -Iinclude > -I/home/eric/work/wine-format/include \ > -I/home/eric/work/wine-format/include/msvcrt -D__WINESRC__ -D_UCRT > -D__WINE_PE_BUILD -Wall \ > -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body > -Wignored-qualifiers -Winit-self \ > -Wno-packed-not-aligned -Wshift-overflow=2 -Wstrict-prototypes > -Wtype-limits \ > -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith > -Wlogical-op -Wabsolute-value \ > -Wno-format -Wformat-overflow -Wnonnull -mcx16 -gdwarf-4 -Wformat -g -O2 > /home/eric/work/wine-format/dlls/quartz/avidec.c: In function > 'avi_decompressor_source_get_media_type': > /home/eric/work/wine-format/dlls/quartz/avidec.c:349:15: warning: array > subscript 'VIDEOINFO {aka struct tagVIDEOINFO}[0]' is partly outside > array bounds of 'unsigned char[100]' [-Warray-bounds] > 349 | format->rcSource = sink_format->rcSource; > | ^~ > /home/eric/work/wine-format/dlls/quartz/avidec.c:345:24: note: > referencing an object of size 100 allocated by 'CoTaskMemAlloc' > 345 | if (!(format = CoTaskMemAlloc(offsetof(VIDEOINFO, > dwBitMasks[3])))) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Okay, I was wrong about my gcc version; for some reason Debian ships gcc and mingw-w64 gcc versions that are different. I think this is a gcc bug. It now warns about *any* access to a structure which was allocated with anything but sizeof(). E.g. the following will generate warnings with -O2 -Warray-bounds=1: -- #include <stddef.h> #include <stdlib.h> struct apple { unsigned int u; char v[10]; }; struct apple *func(void) { struct apple *a = malloc(offsetof(struct apple, v[10])); a->u = 1; a->v[9] = 3; return a; } -- Same with malloc(14). Only malloc(sizeof(struct apple)) works, even though the three expressions are obviously identical. If we must work around this in Wine, I'd rather either disable -Warray-bounds or else just use sizeof() and over-allocate.

1 0

[PATCH 1/2] mfplat/tests: Add a separate test function for MFGetPlaneSize().
by Nikolay Sivov 14 Feb '22

14 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 206 ++++++++++++++++++++----------------- 1 file changed, 114 insertions(+), 92 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cabcc1b06b0..50f4e059205 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4117,104 +4117,102 @@ static void test_stream_descriptor(void) IMFStreamDescriptor_Release(stream_desc); } -static void test_MFCalculateImageSize(void) +static const struct image_size_test { - static const struct image_size_test - { - const GUID *subtype; - UINT32 width; - UINT32 height; - UINT32 size; - UINT32 plane_size; /* Matches image size when 0. */ - } - image_size_tests[] = - { - { &MFVideoFormat_RGB8, 3, 5, 20 }, - { &MFVideoFormat_RGB8, 1, 1, 4 }, - { &MFVideoFormat_RGB555, 3, 5, 40 }, - { &MFVideoFormat_RGB555, 1, 1, 4 }, - { &MFVideoFormat_RGB565, 3, 5, 40 }, - { &MFVideoFormat_RGB565, 1, 1, 4 }, - { &MFVideoFormat_RGB24, 3, 5, 60 }, - { &MFVideoFormat_RGB24, 1, 1, 4 }, - { &MFVideoFormat_RGB32, 3, 5, 60 }, - { &MFVideoFormat_RGB32, 1, 1, 4 }, - { &MFVideoFormat_ARGB32, 3, 5, 60 }, - { &MFVideoFormat_ARGB32, 1, 1, 4 }, - { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, - { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, - { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, - { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + const GUID *subtype; + UINT32 width; + UINT32 height; + UINT32 size; + UINT32 plane_size; /* Matches image size when 0. */ +} +image_size_tests[] = +{ + { &MFVideoFormat_RGB8, 3, 5, 20 }, + { &MFVideoFormat_RGB8, 1, 1, 4 }, + { &MFVideoFormat_RGB555, 3, 5, 40 }, + { &MFVideoFormat_RGB555, 1, 1, 4 }, + { &MFVideoFormat_RGB565, 3, 5, 40 }, + { &MFVideoFormat_RGB565, 1, 1, 4 }, + { &MFVideoFormat_RGB24, 3, 5, 60 }, + { &MFVideoFormat_RGB24, 1, 1, 4 }, + { &MFVideoFormat_RGB32, 3, 5, 60 }, + { &MFVideoFormat_RGB32, 1, 1, 4 }, + { &MFVideoFormat_ARGB32, 3, 5, 60 }, + { &MFVideoFormat_ARGB32, 1, 1, 4 }, + { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, + { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, + { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, + { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + + /* YUV */ + { &MFVideoFormat_NV12, 1, 3, 9, 4 }, + { &MFVideoFormat_NV12, 1, 2, 6, 3 }, + { &MFVideoFormat_NV12, 2, 2, 6, 6 }, + { &MFVideoFormat_NV12, 3, 2, 12, 9 }, + { &MFVideoFormat_NV12, 4, 2, 12 }, + { &MFVideoFormat_NV12, 320, 240, 115200 }, + { &MFVideoFormat_AYUV, 1, 1, 4 }, + { &MFVideoFormat_AYUV, 2, 1, 8 }, + { &MFVideoFormat_AYUV, 1, 2, 8 }, + { &MFVideoFormat_AYUV, 4, 3, 48 }, + { &MFVideoFormat_AYUV, 320, 240, 307200 }, + { &MFVideoFormat_IMC1, 1, 1, 4 }, + { &MFVideoFormat_IMC1, 2, 1, 4 }, + { &MFVideoFormat_IMC1, 1, 2, 8 }, + { &MFVideoFormat_IMC1, 4, 3, 24 }, + { &MFVideoFormat_IMC1, 320, 240, 153600 }, + { &MFVideoFormat_IMC3, 1, 1, 4 }, + { &MFVideoFormat_IMC3, 2, 1, 4 }, + { &MFVideoFormat_IMC3, 1, 2, 8 }, + { &MFVideoFormat_IMC3, 4, 3, 24 }, + { &MFVideoFormat_IMC3, 320, 240, 153600 }, + { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, + { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, + { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, + { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, + { &MFVideoFormat_IMC2, 4, 2, 12 }, + { &MFVideoFormat_IMC2, 320, 240, 115200 }, + { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, + { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, + { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, + { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, + { &MFVideoFormat_IMC4, 4, 2, 12 }, + { &MFVideoFormat_IMC4, 320, 240, 115200 }, + { &MFVideoFormat_YV12, 1, 1, 3, 1 }, + { &MFVideoFormat_YV12, 2, 1, 3 }, + { &MFVideoFormat_YV12, 1, 2, 6, 3 }, + { &MFVideoFormat_YV12, 4, 3, 18 }, + { &MFVideoFormat_YV12, 320, 240, 115200 }, + + { &MFVideoFormat_I420, 1, 1, 3, 1 }, + { &MFVideoFormat_I420, 2, 1, 3 }, + { &MFVideoFormat_I420, 1, 2, 6, 3 }, + { &MFVideoFormat_I420, 4, 3, 18 }, + { &MFVideoFormat_I420, 320, 240, 115200 }, + + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + + { &MFVideoFormat_YUY2, 2, 1, 4 }, + { &MFVideoFormat_YUY2, 4, 3, 24 }, + { &MFVideoFormat_YUY2, 128, 128, 32768 }, + { &MFVideoFormat_YUY2, 320, 240, 153600 }, + + { &MFVideoFormat_UYVY, 2, 1, 4 }, + { &MFVideoFormat_UYVY, 4, 3, 24 }, + { &MFVideoFormat_UYVY, 128, 128, 32768 }, + { &MFVideoFormat_UYVY, 320, 240, 153600 }, +}; - /* YUV */ - { &MFVideoFormat_NV12, 1, 3, 9, 4 }, - { &MFVideoFormat_NV12, 1, 2, 6, 3 }, - { &MFVideoFormat_NV12, 2, 2, 6, 6 }, - { &MFVideoFormat_NV12, 3, 2, 12, 9 }, - { &MFVideoFormat_NV12, 4, 2, 12 }, - { &MFVideoFormat_NV12, 320, 240, 115200 }, - { &MFVideoFormat_AYUV, 1, 1, 4 }, - { &MFVideoFormat_AYUV, 2, 1, 8 }, - { &MFVideoFormat_AYUV, 1, 2, 8 }, - { &MFVideoFormat_AYUV, 4, 3, 48 }, - { &MFVideoFormat_AYUV, 320, 240, 307200 }, - { &MFVideoFormat_IMC1, 1, 1, 4 }, - { &MFVideoFormat_IMC1, 2, 1, 4 }, - { &MFVideoFormat_IMC1, 1, 2, 8 }, - { &MFVideoFormat_IMC1, 4, 3, 24 }, - { &MFVideoFormat_IMC1, 320, 240, 153600 }, - { &MFVideoFormat_IMC3, 1, 1, 4 }, - { &MFVideoFormat_IMC3, 2, 1, 4 }, - { &MFVideoFormat_IMC3, 1, 2, 8 }, - { &MFVideoFormat_IMC3, 4, 3, 24 }, - { &MFVideoFormat_IMC3, 320, 240, 153600 }, - { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC2, 4, 2, 12 }, - { &MFVideoFormat_IMC2, 320, 240, 115200 }, - { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC4, 4, 2, 12 }, - { &MFVideoFormat_IMC4, 320, 240, 115200 }, - { &MFVideoFormat_YV12, 1, 1, 3, 1 }, - { &MFVideoFormat_YV12, 2, 1, 3 }, - { &MFVideoFormat_YV12, 1, 2, 6, 3 }, - { &MFVideoFormat_YV12, 4, 3, 18 }, - { &MFVideoFormat_YV12, 320, 240, 115200 }, - - { &MFVideoFormat_I420, 1, 1, 3, 1 }, - { &MFVideoFormat_I420, 2, 1, 3 }, - { &MFVideoFormat_I420, 1, 2, 6, 3 }, - { &MFVideoFormat_I420, 4, 3, 18 }, - { &MFVideoFormat_I420, 320, 240, 115200 }, - - { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, - { &MFVideoFormat_IYUV, 2, 1, 3 }, - { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, - { &MFVideoFormat_IYUV, 4, 3, 18 }, - { &MFVideoFormat_IYUV, 320, 240, 115200 }, - - { &MFVideoFormat_YUY2, 2, 1, 4 }, - { &MFVideoFormat_YUY2, 4, 3, 24 }, - { &MFVideoFormat_YUY2, 128, 128, 32768 }, - { &MFVideoFormat_YUY2, 320, 240, 153600 }, - - { &MFVideoFormat_UYVY, 2, 1, 4 }, - { &MFVideoFormat_UYVY, 4, 3, 24 }, - { &MFVideoFormat_UYVY, 128, 128, 32768 }, - { &MFVideoFormat_UYVY, 320, 240, 153600 }, - }; +static void test_MFCalculateImageSize(void) +{ unsigned int i; UINT32 size; HRESULT hr; - if (!pMFGetPlaneSize) - win_skip("MFGetPlaneSize() is not available.\n"); - size = 1; hr = MFCalculateImageSize(&IID_IUnknown, 1, 1, &size); ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Vista */, "Unexpected hr %#x.\n", hr); @@ -4244,6 +4242,29 @@ static void test_MFCalculateImageSize(void) } } +static void test_MFGetPlaneSize(void) +{ + unsigned int i; + UINT32 size; + HRESULT hr; + + if (!pMFGetPlaneSize) + { + win_skip("MFGetPlaneSize() is not available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) + { + const struct image_size_test *ptr = &image_size_tests[i]; + unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; + + hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); + ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); + ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); + } +} + static void test_MFCompareFullToPartialMediaType(void) { IMFMediaType *full_type, *partial_type; @@ -7940,6 +7961,7 @@ START_TEST(mfplat) test_MFInvokeCallback(); test_stream_descriptor(); test_MFCalculateImageSize(); + test_MFGetPlaneSize(); test_MFCompareFullToPartialMediaType(); test_attributes_serialization(); test_wrapped_media_type(); -- 2.34.1

1 1

[PATCH 01/10] bcrypt: Create BCRYPT_KEY_BLOB struct definition.
by Santino Mazza 14 Feb '22

14 Feb '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- include/bcrypt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index 15c26c1fb0a..484dca0f0c4 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -254,6 +254,10 @@ typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO ULONG dwFlags; } BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; +typedef struct _BCRYPT_KEY_BLOB { + ULONG Magic; +} BCRYPT_KEY_BLOB; + typedef struct _BCRYPT_ECCKEY_BLOB { ULONG dwMagic; -- 2.25.1

4 18

[PATCH] d3d1/tests: Fix the spelling of an ok() message.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- 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 b3691d91173..a425395e64a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5134,7 +5134,7 @@ 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, "Test %u: Got unexpect hr %#lx, expected %#lx.\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)) -- 2.30.2

5 4

[PATCH] d3d11/tests: Fix the spelling of a couple of comments.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3d11/tests/d3d11.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 52c8816b689..236fa85a257 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5960,7 +5960,7 @@ static void test_pipeline_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); /* WARP devices randomly return all-zeroed structures as if the draw did not happen. Flushing and - * sleeping a second before ending the query reduces the likelyhood of hitting the bug a lot, but + * sleeping a second before ending the query reduces the likelihood of hitting the bug a lot, but * does not eliminate it entirely. To make things work reliably ignore such broken results. */ if (is_warp_device(device) && !memcmp(&data, &zero_data, sizeof(data))) { @@ -7453,8 +7453,8 @@ static void test_device_context_state(void) * * The tests below suggest that a ContextState object stores its own state * for every device it is used with. This isn't entirely true, e.g. the - * primitive topology can be transfered between devices, but will cause odd - * refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 + * primitive topology can be transferred between devices, but will cause + * odd refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 * references on the context's device for example). */ if (0) { -- 2.30.2

2 1

[PATCH v2 1/4] wined3d: Allow up to 128 MiB of persistently mapped memory on 32-bit architectures.
by Zebediah Figura 14 Feb '22

14 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Fix a typo in the subject line, and another copy-paste error as pointed out... This is a second version of [1]. I've reduced the cap to 128 MiB, which is enough for at least one and ideally two chunk buffers. If necessary it can probably be raised further in the future. I haven't done much testing personally—I'm trying to springboard off of others' testing, and also to get the code structure correct and upstream first and tune numbers later. This still uses the same crude scheme for determining what buffers to keep mapped. An LRU list, as proposed in a reply to [1], would be an obviously better scheme, although that perhaps is less true with the kind of chunk allocation that we do in practice. I haven't implemented that now because it's not nearly as trivial, and not clear enough that it would offer a performance improvement. Unlike [1], though, it should be easier to change the scheme with this patch, and with the subsequent patches for 32-bit map acceleration. [1] https://www.winehq.org/pipermail/wine-devel/2022-January/206187.html dlls/wined3d/adapter_vk.c | 24 +++++++++---- dlls/wined3d/context_gl.c | 61 ++++++++++++++++++++-------------- dlls/wined3d/context_vk.c | 20 ++++++++--- dlls/wined3d/directx.c | 9 +++++ dlls/wined3d/wined3d_private.h | 9 +++++ 5 files changed, 87 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index fdae15fe940..f09cd1b0fae 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -381,7 +381,10 @@ static void wined3d_allocator_vk_destroy_chunk(struct wined3d_allocator_chunk *c vk_info = &device_vk->vk_info; if (chunk_vk->c.map_ptr) + { VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); + adapter_adjust_mapped_memory(device_vk->d.adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); + } VK_CALL(vkFreeMemory(device_vk->vk_device, chunk_vk->vk_memory, NULL)); TRACE("Freed memory 0x%s.\n", wine_dbgstr_longlong(chunk_vk->vk_memory)); wined3d_allocator_chunk_cleanup(&chunk_vk->c); @@ -801,10 +804,15 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ return NULL; } } - else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->b.map_ptr))) < 0) + else { - ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); - return NULL; + if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->b.map_ptr))) < 0) + { + ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); + return NULL; + } + + adapter_adjust_mapped_memory(device_vk->d.adapter, bo->size); } return bo->b.map_ptr; @@ -812,12 +820,16 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context_vk *context_vk) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info; - struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; - if (wined3d_map_persistent()) + /* This may race with the client thread, but it's not a hard limit anyway. */ + if (device_vk->d.adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) + { + TRACE("Not unmapping BO %p.\n", bo); return; + } bo->b.map_ptr = NULL; @@ -834,8 +846,8 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context } vk_info = context_vk->vk_info; - device_vk = wined3d_device_vk(context_vk->c.device); VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); + adapter_adjust_mapped_memory(device_vk->d.adapter, -bo->size); } static void wined3d_bo_slab_vk_lock(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9153b7fd95f..a6e9d566eb3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2803,6 +2803,8 @@ static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *c ERR("Failed to map chunk memory.\n"); return NULL; } + + adapter_adjust_mapped_memory(context_gl->c.device->adapter, WINED3D_ALLOCATOR_CHUNK_SIZE); } ++chunk_gl->c.map_count; @@ -2817,12 +2819,14 @@ static void wined3d_allocator_chunk_gl_unmap(struct wined3d_allocator_chunk_gl * TRACE("chunk_gl %p, context_gl %p.\n", chunk_gl, context_gl); - if (!--chunk_gl->c.map_count && !wined3d_map_persistent()) - { - wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); - GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); - chunk_gl->c.map_ptr = NULL; - } + if (--chunk_gl->c.map_count) + return; + + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + chunk_gl->c.map_ptr = NULL; + + adapter_adjust_mapped_memory(context_gl->c.device->adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); } static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) @@ -2891,18 +2895,11 @@ map: * resources are mapped. On the other hand, we don't want to use the * access flags used to create the bo for non-persistent maps, because * that may imply dropping GL_MAP_UNSYNCHRONIZED_BIT. */ - if (wined3d_map_persistent()) - { - gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; - if (!(gl_flags & GL_MAP_READ_BIT)) - gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; - if (gl_flags & GL_MAP_WRITE_BIT) - gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; - } - else - { - gl_flags = wined3d_resource_gl_map_flags(bo, flags); - } + gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + if (!(gl_flags & GL_MAP_READ_BIT)) + gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (gl_flags & GL_MAP_WRITE_BIT) + gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; bo->b.map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)); @@ -2916,6 +2913,9 @@ map: bo->b.map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); } + if (bo->b.map_ptr) + adapter_adjust_mapped_memory(device_gl->d.adapter, bo->size); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Map buffer object"); @@ -2926,20 +2926,30 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - if (wined3d_map_persistent()) + if (context_gl->c.device->adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) + { + TRACE("Not unmapping BO %p.\n", bo); return; + } + + if (bo->memory) + { + struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(bo->memory->chunk); + + wined3d_allocator_chunk_gl_unmap(chunk_gl, context_gl); + if (!chunk_gl->c.map_ptr) + bo->b.map_ptr = NULL; + return; + } bo->b.map_ptr = NULL; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - - if (bo->memory) - wined3d_allocator_chunk_gl_unmap(wined3d_allocator_chunk_gl(bo->memory->chunk), context_gl); - else - GL_EXTCALL(glUnmapBuffer(bo->binding)); - + GL_EXTCALL(glUnmapBuffer(bo->binding)); wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Unmap buffer object"); + + adapter_adjust_mapped_memory(context_gl->c.device->adapter, -bo->size); } void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, @@ -3104,6 +3114,7 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct { wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); GL_EXTCALL(glUnmapBuffer(bo->binding)); + adapter_adjust_mapped_memory(context_gl->c.device->adapter, -bo->size); } TRACE("Destroying GL buffer %u.\n", bo->id); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 1b5b177bb16..98610d65c5d 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -269,12 +269,17 @@ void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk wined3d_allocator_chunk_vk_lock(chunk_vk); - if (!chunk_vk->c.map_ptr && (vr = VK_CALL(vkMapMemory(device_vk->vk_device, - chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &chunk_vk->c.map_ptr))) < 0) + if (!chunk_vk->c.map_ptr) { - ERR("Failed to map chunk memory, vr %s.\n", wined3d_debug_vkresult(vr)); - wined3d_allocator_chunk_vk_unlock(chunk_vk); - return NULL; + if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, + chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &chunk_vk->c.map_ptr))) < 0) + { + ERR("Failed to map chunk memory, vr %s.\n", wined3d_debug_vkresult(vr)); + wined3d_allocator_chunk_vk_unlock(chunk_vk); + return NULL; + } + + adapter_adjust_mapped_memory(device_vk->d.adapter, WINED3D_ALLOCATOR_CHUNK_SIZE); } ++chunk_vk->c.map_count; @@ -305,6 +310,8 @@ void wined3d_allocator_chunk_vk_unmap(struct wined3d_allocator_chunk_vk *chunk_v chunk_vk->c.map_ptr = NULL; wined3d_allocator_chunk_vk_unlock(chunk_vk); + + adapter_adjust_mapped_memory(device_vk->d.adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); } VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, @@ -1012,7 +1019,10 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const } if (bo->b.map_ptr) + { VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); + adapter_adjust_mapped_memory(device_vk->d.adapter, -bo->size); + } wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1b34d2eceaa..36ca1be5b79 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -157,6 +157,15 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) return adapter->vram_bytes_used; } +ssize_t adapter_adjust_mapped_memory(struct wined3d_adapter *adapter, ssize_t size) +{ + /* Note that this needs to be thread-safe; the Vulkan adapter may map from + * client threads. */ + ssize_t ret = InterlockedExchangeAddSizeT(&adapter->mapped_size, size) + size; + TRACE("Adjusted mapped adapter memory by %zd to %zd.\n", size, ret); + return ret; +} + void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { unsigned int output_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fef887071a9..dd0a49db3b5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3470,6 +3470,12 @@ struct wined3d_output HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wined3d_gamma_ramp *ramp) DECLSPEC_HIDDEN; +#ifdef _WIN64 +#define MAX_PERSISTENT_MAPPED_BYTES SSIZE_MAX +#else +#define MAX_PERSISTENT_MAPPED_BYTES (128 * 1024 * 1024) +#endif + /* The adapter structure */ struct wined3d_adapter { @@ -3488,6 +3494,8 @@ struct wined3d_adapter void *formats; size_t format_size; + ssize_t mapped_size; + const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct wined3d_fragment_pipe_ops *fragment_pipe; const struct wined3d_state_entry_template *misc_state_template; @@ -3567,6 +3575,7 @@ BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk, const struct wined3d_vk_info *vk_info) DECLSPEC_HIDDEN; +ssize_t adapter_adjust_mapped_memory(struct wined3d_adapter *adapter, ssize_t size) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; -- 2.34.1

2 7

[PATCH] wined3d: Clear GL backbuffer in wined3d_context_gl_init().
by Paul Gofman 14 Feb '22

14 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes Serious Sam: The Random Encounter when WGL_SWAP_COPY_ARB is supported and game letterboxes itself in case of aspect ratio mismatch. In which case there is currently garbage dispayed outside the area being updated by the game. dlls/wined3d/context_gl.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 7b40b1de0fb..ff33b8a4d74 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1897,7 +1897,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, } static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl, - struct wined3d_swapchain_gl *swapchain_gl) + struct wined3d_swapchain_gl *swapchain_gl, BOOL *new_drawable) { enum wined3d_swap_effect swap_effect = swapchain_gl->s.state.desc.swap_effect; const struct wined3d_format *colour_format, *ds_format; @@ -1920,6 +1920,8 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context swap_effect_copy = swap_effect == WINED3D_SWAP_EFFECT_COPY || swap_effect == WINED3D_SWAP_EFFECT_COPY_VSYNC; + *new_drawable = !GetPixelFormat(context_gl->dc); + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { static const enum wined3d_format_id ds_formats[] = @@ -2018,7 +2020,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context } context_gl->dc_is_private = TRUE; - return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl); + return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl, new_drawable); } share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL; @@ -2064,6 +2066,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; struct wined3d_device *device; + BOOL new_drawable; unsigned int i; TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl); @@ -2142,7 +2145,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi sizeof(*context_gl->texture_type)))) goto fail; - if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl)) + if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl, &new_drawable)) goto fail; /* Set up the context defaults. */ @@ -2299,6 +2302,14 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); checkGLcall("glScissor"); + if (new_drawable) + { + gl_info->gl_ops.gl.p_glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + gl_info->gl_ops.gl.p_glClearDepth(1.0f); + gl_info->gl_ops.gl.p_glClearStencil(0); + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + checkGLcall("glClear"); + } return WINED3D_OK; fail: -- 2.34.1

2 1

[PATCH vkd3d v2] vkd3d: Lock the heap mutex while binding heap memory.
by Conor McCarthy 14 Feb '22

14 Feb '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7b94ac92..4c48e22e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1941,11 +1941,17 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, goto allocate_memory; } + /* Syncronisation is not required for binding, but vkMapMemory() may be called + * from another thread and it requires exclusive access. */ + vkd3d_mutex_lock(&heap->mutex); + if (d3d12_resource_is_buffer(resource)) vr = VK_CALL(vkBindBufferMemory(vk_device, resource->u.vk_buffer, heap->vk_memory, heap_offset)); else vr = VK_CALL(vkBindImageMemory(vk_device, resource->u.vk_image, heap->vk_memory, heap_offset)); + vkd3d_mutex_unlock(&heap->mutex); + if (vr == VK_SUCCESS) { resource->heap = heap; -- 2.34.1

2 1

[PATCH vkd3d 1/7] vkd3d-shader/sm4: Skip non-color outputs in shader output mapping.
by Matteo Bruni 14 Feb '22

14 Feb '22

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d28c303a..27993c73 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1672,6 +1672,9 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t { struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; + if (version.type == VKD3D_SHADER_TYPE_PIXEL + && ascii_strcasecmp(e->semantic_name, "SV_Target")) + continue; if (e->register_index >= ARRAY_SIZE(sm4->output_map)) { WARN("Invalid output index %u.\n", e->register_index); -- 2.34.1

3 14

[PATCH v2 1/5] winebus.sys: Only call SDL_HapticRumbleInit if supported, as a fallback.
by Rémi Bernon 14 Feb '22

14 Feb '22

The SDL_HAPTIC_LEFTRIGHT effect should be preferred when available. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Avoid passing possibly NULL impl->sdl_haptic as a parameter. dlls/winebus.sys/bus_sdl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index eba8a959cb4..d036ec2b98e 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -187,11 +187,10 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) else { impl->effect_support = pSDL_HapticQuery(impl->sdl_haptic); - if (pSDL_HapticRumbleSupported(impl->sdl_haptic)) + if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && + pSDL_HapticRumbleSupported(impl->sdl_haptic) && + pSDL_HapticRumbleInit(impl->sdl_haptic) == 0) impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; - - pSDL_HapticStopAll(impl->sdl_haptic); - pSDL_HapticRumbleInit(impl->sdl_haptic); } if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && pSDL_JoystickRumble && -- 2.34.1

1 4

[tools] testbot: Use rebase when updating the Wine source.
by Francois Gouget 14 Feb '22

14 Feb '22

The TestBot's Wine source should be unmodified so there should be no difference between 'git merge' and 'git rebase'. If there are local patches (for debugging?) rebase will keep them more visible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This avoids a git warning. testbot/lib/Build/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index a56a4f2a49..9d169633e6 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -89,7 +89,7 @@ sub GitPull($) else { InfoMsg "\nUpdating the $Dir source\n"; - system("cd '$DataDir/$Dir' && (set -x && git pull) && ". + system("cd '$DataDir/$Dir' && (set -x && git pull --rebase) && ". "echo $Dir:HEAD=`git rev-parse HEAD`"); } if ($? != 0) -- 2.30.2

1 0

[tools] testbot/WineRunReconfig: Use rebase when updating the TestBot source.
by Francois Gouget 14 Feb '22

14 Feb '22

The TestBot source should be unmodified so there should be no difference between 'git merge' and 'git rebase'. If there are local patches (for debugging?) rebase will keep them more visible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This avoids a git warning. testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9bd9429930..c91966d385 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -362,7 +362,7 @@ if ($Step->FileType ne "none") my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". - " git pull &&\n". + " git pull --rebase &&\n". " ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); -- 2.30.2

1 0

[tools] testbot/Janitor: Make the TestLauncher and WineTest matches stricter.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c68920e7c5..1b5bb33c34 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -321,8 +321,8 @@ if (opendir(my $dh, "$DataDir/latest")) # Needed to update Windows VMs next if ($Entry eq "TestAgentd.exe"); # Needed to run the tests - next if ($Entry =~ /^TestLauncher[0-9]*\.exe$/); - next if ($Entry =~ /^winetest[0-9]*-latest\.exe$/); + next if ($Entry =~ /^TestLauncher(?:32|64)\.exe$/); + next if ($Entry =~ /^winetest(?:64)?-latest\.exe$/); $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/latest/$1"; -- 2.30.2

1 0

[tools] testbot/WineRunReconfig: Only the build VMs produce TestAgentd.
by Francois Gouget 14 Feb '22

14 Feb '22

Usually this is not an issue because the TestBot server has the TestAgentd.exe binary and the build log does not contain the "Updated TestAgentd.exe" line. But during the initial setup the TestBot server would still try to download TestAgentd.exe from the Wine VMs which would cause a failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Also I apparently manually built TestAgentd.exe when preparing the Wine VMs (or WineReconfig.pl used to do so) so they do have an (out of date) binary available for download. testbot/bin/WineRunReconfig.pl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c6f2342916..373e657dc4 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -457,11 +457,20 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq "completed") { use File::Copy; - foreach my $FileName ("../src/testagentd/TestAgentd.exe", - "../src/TestLauncher/TestLauncher32.exe", - "../src/TestLauncher/TestLauncher64.exe", - "latest/winefiles.txt", - "latest/wine-parentsrc.txt") + my @FileNames = ( + # TestLauncher is used by both Windows and Wine VMs + "../src/TestLauncher/TestLauncher32.exe", + "../src/TestLauncher/TestLauncher64.exe", + # Needed by the TestBot server + "latest/winefiles.txt", + "latest/wine-parentsrc.txt", + ); + if ($VM->Type eq "build") + { + # Only needed for the Windows VMs and only built by the build VMs. + push @FileNames, "../src/testagentd/TestAgentd.exe"; + } + foreach my $FileName (@FileNames) { my $BaseName = basename($FileName); if ($FileName !~ m~^latest/~ and !$LogInfo->{$BaseName} and -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Move waiting for the X session start to its own function.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 43 ++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e2f2fd3c46..ef94a2be09 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -441,6 +441,30 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub WaitForSession($) +{ + my ($TA) = @_; + + if ($VM->Type eq "wine") + { + # For Wine VMs we have to wait some more for the X session to start. + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + FatalError("Could not check for the $VMKey X session\n") if (!$Pid); + + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the $VMKey X session\n"); + } + FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); + } + } +} + sub SetupTestAgentd($$$) { my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; @@ -506,24 +530,7 @@ sub SetupTestAgentd($$$) FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); } - if ($Booting and $VM->Type eq "wine") - { - # Make sure the X session has had time to start - Debug(Elapsed($Start), " Waiting for the X session\n"); - LogMsg "Waiting for the $VMKey X session\n"; - my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - FatalError("Could not check for the $VMKey X session\n") if (!$Pid); - - if (!defined $TA->Wait($Pid, $SleepAfterBoot)) - { - my $ErrMessage = $TA->GetLastError(); - if ($ErrMessage =~ /timed out waiting for the child process/) - { - FatalError("Timed out waiting for the $VMKey X session\n"); - } - FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); - } - } + WaitForSession($TA) if ($Booting); if ($ResetStartCount) { -- 2.30.2

1 0

[PATCH 5/6] win32u: Move MessageBeep implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 12 +----------- dlls/user32/message.c | 5 +---- dlls/win32u/driver.c | 19 ++++++++++++++++--- dlls/win32u/sysparams.c | 10 ++++++++++ include/ntuser.h | 1 + 5 files changed, 29 insertions(+), 18 deletions(-)

2 1

[PATCH 4/6] win32u: Move NtUserSetCursorPos implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

2 1

[PATCH 3/6] win32u: Move GetClipCursor implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 27 +-------------------------- dlls/win32u/cursoricon.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 4 ++++ include/ntuser.h | 1 + 5 files changed, 36 insertions(+), 26 deletions(-)

2 1

[PATCH 2/6] win32u: Move NtUserClipCursor implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

2 1

[PATCH 1/6] win32u: Move monitor_from_rect implementation from user32.
by Jacek Caban 14 Feb '22

14 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 79 +---------------------------------------- dlls/win32u/sysparams.c | 68 +++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 70 insertions(+), 78 deletions(-)

2 1

[PATCH 1/2] msvcirt/tests: Fix uninitialized variable warning.
by Piotr Caban 14 Feb '22

14 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/tests/msvcirt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

3 2

[PATCH 2/2 v2] msvcirt/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 14 Feb '22

14 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/tests/Makefile.in | 1 - dlls/msvcirt/tests/msvcirt.c | 84 +++++++++++++++++----------------- 2 files changed, 42 insertions(+), 43 deletions(-)

1 0

[PATCH 1/2 v2] msvcirt/tests: Fix uninitialized variable warning.
by Piotr Caban 14 Feb '22

14 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - removed const from all call_func macros as suggested by Eric dlls/msvcirt/tests/msvcirt.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)

1 0

[PATCH] msi/tests: Fix the trailing linefeed in an ok() message.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msi/tests/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 39cbaf56b79..fcdcd60a9f8 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -4553,7 +4553,7 @@ static void test_MsiGetProductInfo(void) ok(r == ERROR_UNKNOWN_PROPERTY, "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r); ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); - ok(sz == MAX_PATH, "%lun", sz); + ok(sz == MAX_PATH, "%lu\n", sz); res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); -- 2.30.2

2 1

[PATCH] hnetcfg: Fix the spelling of a TRACE() message.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/hnetcfg/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index bda9455a2b5..61513f97746 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -1522,7 +1522,7 @@ static HRESULT WINAPI static_ports_Add( struct port_mapping mapping_data; HRESULT ret; - TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, descritption %s, mapping %p.\n", + TRACE( "iface %p, external %ld, protocol %s, internal %ld, client %s, enabled %d, description %s, mapping %p.\n", iface, external, debugstr_w(protocol), internal, debugstr_w(client), enabled, debugstr_w(description), mapping ); -- 2.30.2

1 0

[PATCH] kernel32/tests: Add a trailing linefeed to an ok() message.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index f73ef627c67..053e103bf14 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3081,7 +3081,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL res = pCancelIoEx(reader, &read_overlapped2); ok(res, "CancelIoEx failed with error %d\n", GetLastError()); res = pCancelIoEx(reader, &read_overlapped2); - ok(!res, "CancelIOEx succeeded unexpectedly"); + ok(!res, "CancelIOEx succeeded unexpectedly\n"); ok(GetLastError() == ERROR_NOT_FOUND, "In CancelIoEx failure, expected ERROR_NOT_FOUND, got %d\n", GetLastError()); test_overlapped_failure(reader, &read_overlapped2, ERROR_OPERATION_ABORTED); -- 2.30.2

1 0

[PATCH] msdasql: Remove a couple of unneeded NULL casts.
by Francois Gouget 14 Feb '22

14 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msdasql/msdasql_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 3e1af95b1a7..60d46349590 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -547,7 +547,7 @@ static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) } ret = SQLConnectW( provider->hdbc, (SQLWCHAR *)V_BSTR(&provider->properties[i].value), - SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS ); + SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS ); TRACE("SQLConnectW ret %d\n", ret); if (ret != SQL_SUCCESS) { -- 2.30.2

1 0

[PATCH 1/5] winebus.sys: Only call SDL_HapticRumbleInit if supported, as a fallback.
by Rémi Bernon 14 Feb '22

14 Feb '22

The SDL_HAPTIC_LEFTRIGHT effect should be preferred when available. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index eba8a959cb4..ce696f5b42f 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -185,14 +185,12 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) !(impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick))) impl->effect_support = 0; else - { impl->effect_support = pSDL_HapticQuery(impl->sdl_haptic); - if (pSDL_HapticRumbleSupported(impl->sdl_haptic)) - impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; - pSDL_HapticStopAll(impl->sdl_haptic); - pSDL_HapticRumbleInit(impl->sdl_haptic); - } + if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && + pSDL_HapticRumbleSupported(impl->sdl_haptic) && + pSDL_HapticRumbleInit(impl->sdl_haptic) == 0) + impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && pSDL_JoystickRumble && !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) -- 2.34.1

1 4

[PATCH] mf: Handle MESourceSeeked and MEStreamSeeked state change events.
by Rémi Bernon 14 Feb '22

14 Feb '22

If a session is paused then started again, or if a start position is provided we wait forever for the source to send a MESourceStarted event, when it sends a MESourceSeeked instead. This causes a deadlock in Bright Memory: Infinite as the game then waits for the Start command to complete, while the session is stuck in the SESSION_STATE_STARTING_SOURCES state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/session.c | 8 ++++++++ dlls/mfplat/tests/mfplat.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 05b7af81df7..6ee3c454c6e 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2295,6 +2295,8 @@ static enum object_state session_get_object_state_for_event(MediaEventType event { switch (event) { + case MESourceSeeked: + case MEStreamSeeked: case MESourceStarted: case MEStreamStarted: case MEStreamSinkStarted: @@ -2471,6 +2473,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn switch (event_type) { + case MESourceSeeked: case MESourceStarted: case MESourcePaused: case MESourceStopped: @@ -2485,6 +2488,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn } } break; + case MEStreamSeeked: case MEStreamStarted: case MEStreamPaused: case MEStreamStopped: @@ -3172,6 +3176,10 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM switch (event_type) { + case MESourceSeeked: + case MEStreamSeeked: + FIXME("Source/stream seeking, semi-stub!\n"); + /* fallthrough */ case MESourceStarted: case MESourcePaused: case MESourceStopped: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c70d8a9ca81..cabcc1b06b0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -942,6 +942,44 @@ static void test_source_resolver(void) video_stream = (IMFMediaStream *)var.punkVal; } + hr = IMFMediaSource_Pause(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_EMPTY; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + hr = IMFMediaSource_Pause(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_I8; + var.uhVal.QuadPart = 0; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceSeeked, &var)) + ok(var.vt == VT_I8, "Unexpected value type.\n"); + + hr = IMFMediaSource_Stop(mediasource); + ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr); + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStopped, &var)) + ok(var.vt == VT_EMPTY, "Unexpected value type.\n"); + + var.vt = VT_I8; + var.uhVal.QuadPart = 0; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var)) + ok(var.vt == VT_I8, "Unexpected value type.\n"); + sample_count = 10; for (i = 0; i < sample_count; ++i) -- 2.34.1

3 2

[PATCH 1/3] mfplay: Implement UpdateVideo().
by Nikolay Sivov 14 Feb '22

14 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 18 ++++++++++++++++-- dlls/mfplay/tests/mfplay.c | 3 --- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 7f9188e5619..31c8e094cd2 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1524,9 +1524,23 @@ static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND * static HRESULT WINAPI media_player_UpdateVideo(IMFPMediaPlayer *iface) { - FIXME("%p.\n", iface); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; + RECT rect; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) + { + if (GetClientRect(player->output_window, &rect)) + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &rect); + if (SUCCEEDED(hr)) + hr = IMFVideoDisplayControl_RepaintVideo(display_control); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORREF color) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 3c2782a9412..44526801c22 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -203,7 +203,6 @@ static void test_shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); - todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); @@ -316,7 +315,6 @@ static void test_video_control(void) ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); - todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); @@ -356,7 +354,6 @@ static void test_video_control(void) ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); - todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); -- 2.34.1

1 2

[PATCH] mfreadwrite/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 14 Feb '22

14 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/Makefile.in | 1 - dlls/mfreadwrite/tests/mfplat.c | 314 ++++++++++++++--------------- 2 files changed, 157 insertions(+), 158 deletions(-) diff --git a/dlls/mfreadwrite/tests/Makefile.in b/dlls/mfreadwrite/tests/Makefile.in index 52f738897d3..c7476c14c6b 100644 --- a/dlls/mfreadwrite/tests/Makefile.in +++ b/dlls/mfreadwrite/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mfreadwrite.dll IMPORTS = ole32 user32 d3d9 dxva2 mfplat mfreadwrite mfuuid diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8417a0d37b7..04c646b51c0 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -210,22 +210,22 @@ static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUn return E_NOTIMPL; hr = MFCreateSample(&sample); - ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_SetSampleTime(sample, 123); - ok(hr == S_OK, "Failed to set sample time, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (token) IMFSample_SetUnknown(sample, &MFSampleExtension_Token, token); /* Reader expects buffers, empty samples are considered an error. */ hr = MFCreateMemoryBuffer(8, &buffer); - ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_AddBuffer(sample, buffer); - ok(hr == S_OK, "Failed to add a buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaBuffer_Release(buffer); hr = IMFMediaEventQueue_QueueEventParamUnk(stream->event_queue, MEMediaSample, &GUID_NULL, S_OK, (IUnknown *)sample); - ok(hr == S_OK, "Failed to submit event, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFSample_Release(sample); return S_OK; @@ -355,23 +355,23 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i for (i = 0; i < source->stream_count; ++i) { hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 32); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateStreamDescriptor(i, 1, &media_type, &sds[i]); - ok(hr == S_OK, "Failed to create stream descriptor, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); } hr = MFCreatePresentationDescriptor(source->stream_count, sds, &source->pd); - ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < source->stream_count; ++i) IMFStreamDescriptor_Release(sds[i]); @@ -413,7 +413,7 @@ static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDe event_type = source->state == SOURCE_RUNNING ? MESourceSeeked : MESourceStarted; hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL); - ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < source->stream_count; ++i) { @@ -425,12 +425,12 @@ static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDe event_type = source->streams[i]->is_new ? MENewStream : MEUpdatedStream; source->streams[i]->is_new = FALSE; hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, &var); - ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); event_type = source->state == SOURCE_RUNNING ? MEStreamSeeked : MEStreamStarted; hr = IMFMediaEventQueue_QueueEventParamVar(source->streams[i]->event_queue, event_type, &GUID_NULL, S_OK, NULL); - ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); } source->state = SOURCE_RUNNING; @@ -458,7 +458,7 @@ static HRESULT WINAPI test_source_Shutdown(IMFMediaSource *iface) HRESULT hr; hr = IMFMediaEventQueue_Shutdown(source->event_queue); - ok(hr == S_OK, "Failed to shut down event queue, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); return S_OK; } @@ -491,7 +491,7 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl; stream->refcount = 1; hr = MFCreateEventQueue(&stream->event_queue); - ok(hr == S_OK, "Failed to create event queue, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); stream->source = source; IMFMediaSource_AddRef(stream->source); stream->is_new = TRUE; @@ -535,13 +535,13 @@ static IMFByteStream *get_resource_stream(const char *name) ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Failed to create memory stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IStream_Write(stream, ptr, SizeofResource(GetModuleHandleA(NULL), res), &written); - ok(hr == S_OK, "Failed to write stream content, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); - ok(hr == S_OK, "Failed to create bytestream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); return bytestream; @@ -556,11 +556,11 @@ static void test_factory(void) hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory, (void **)&factory); - ok(hr == S_OK, "Failed to create class factory, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory, (void **)&factory2); - ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#lx.\n", hr); IMFReadWriteClassFactory_Release(factory); @@ -680,64 +680,64 @@ static void test_source_reader(void) IMFByteStream_Release(stream); return; } - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Access underlying media source object. */ hr = IMFSourceReader_GetServiceForStream(reader, MF_SOURCE_READER_MEDIASOURCE, &GUID_NULL, &IID_IMFMediaSource, (void **)&source); - ok(hr == S_OK, "Failed to get media source interface, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaSource_Release(source); /* Stream selection. */ hr = IMFSourceReader_GetStreamSelection(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, &selected); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetStreamSelection(reader, 100, &selected); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); selected = FALSE; hr = IMFSourceReader_GetStreamSelection(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &selected); - ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(selected, "Unexpected selection.\n"); selected = FALSE; hr = IMFSourceReader_GetStreamSelection(reader, 0, &selected); - ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(selected, "Unexpected selection.\n"); hr = IMFSourceReader_SetStreamSelection(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, TRUE); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 100, TRUE); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, FALSE); - ok(hr == S_OK, "Failed to deselect a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); selected = TRUE; hr = IMFSourceReader_GetStreamSelection(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &selected); - ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!selected, "Unexpected selection.\n"); hr = IMFSourceReader_SetStreamSelection(reader, MF_SOURCE_READER_ALL_STREAMS, TRUE); - ok(hr == S_OK, "Failed to deselect a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); selected = FALSE; hr = IMFSourceReader_GetStreamSelection(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &selected); - ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(selected, "Unexpected selection.\n"); /* Native media type. */ hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, &mediatype); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetNativeMediaType(reader, 100, 0, &mediatype); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype); - ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype2); - ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(mediatype != mediatype2, "Unexpected media type instance.\n"); IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); @@ -745,56 +745,56 @@ static void test_source_reader(void) /* MF_SOURCE_READER_CURRENT_TYPE_INDEX is Win8+ */ hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CURRENT_TYPE_INDEX, &mediatype); - ok(hr == S_OK || broken(hr == MF_E_NO_MORE_TYPES), "Failed to get native mediatype, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == MF_E_NO_MORE_TYPES), "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IMFMediaType_Release(mediatype); /* Current media type. */ hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, &mediatype); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetCurrentMediaType(reader, 100, &mediatype); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, &mediatype); - ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(mediatype); hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &mediatype); - ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(mediatype); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr != S_OK) goto skip_read_sample; - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); IMFSample_Release(sample); /* There is no video stream. */ hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); - ok(actual_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); + ok(actual_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM, "Unexpected stream index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#lx.\n", stream_flags); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, &stream_flags, &timestamp, &sample); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, NULL, &timestamp, &sample); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); /* TODO: gstreamer outputs .wav sample in increments of 4096, instead of 4410 */ todo_wine { - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); } if(!stream_flags) @@ -803,82 +803,82 @@ todo_wine hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); } hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == 0, "Unexpected stream index %lu\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, &stream_flags, &timestamp, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, NULL, &timestamp, &sample); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, NULL, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, &stream_flags, NULL, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, &actual_index, &stream_flags, NULL, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == 0, "Unexpected stream index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#lx.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); skip_read_sample: /* Flush. */ hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_Flush(reader, 100); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM); - ok(hr == S_OK, "Failed to flush stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM); - ok(hr == S_OK, "Failed to flush stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_ALL_STREAMS); - ok(hr == S_OK, "Failed to flush all streams, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); refcount = IMFSourceReader_Release(reader); - ok(!refcount, "Unexpected refcount %u.\n", refcount); + ok(!refcount, "Unexpected refcount %lu.\n", refcount); /* Async mode. */ callback = create_async_callback(); hr = MFCreateAttributes(&attributes, 1); - ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, (IUnknown *)&callback->IMFSourceReaderCallback_iface); - ok(hr == S_OK, "Failed to set attribute value, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); refcount = get_refcount(attributes); hr = MFCreateSourceReaderFromByteStream(stream, attributes, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(get_refcount(attributes) > refcount, "Unexpected refcount.\n"); IMFAttributes_Release(attributes); IMFSourceReader_Release(reader); @@ -905,60 +905,60 @@ static void test_source_reader_from_media_source(void) ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* MF_SOURCE_READER_ANY_STREAM */ hr = IMFSourceReader_SetStreamSelection(reader, 0, FALSE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 1, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); pos.vt = VT_I8; pos.hVal.QuadPart = 0; hr = IMFSourceReader_SetCurrentPosition(reader, &GUID_NULL, &pos); - ok(hr == S_OK, "Failed to seek to beginning of stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 1, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == 1, "Unexpected stream index %lu\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 2, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %lu.\n", i, actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); } hr = IMFSourceReader_SetStreamSelection(reader, 0, FALSE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %lu.\n", i, actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); @@ -971,31 +971,31 @@ static void test_source_reader_from_media_source(void) ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* MF_SOURCE_READER_ANY_STREAM with a single stream */ hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); pos.vt = VT_I8; pos.hVal.QuadPart = 0; hr = IMFSourceReader_SetCurrentPosition(reader, &GUID_NULL, &pos); - ok(hr == S_OK, "Failed to seek to beginning of stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); @@ -1008,29 +1008,29 @@ static void test_source_reader_from_media_source(void) ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu.\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); /* Request from deselected stream. */ hr = IMFSourceReader_SetStreamSelection(reader, 1, FALSE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); actual_index = 0; stream_flags = 0; hr = IMFSourceReader_ReadSample(reader, 1, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); - ok(actual_index == 1, "Unexpected stream index %u\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); + ok(actual_index == 1, "Unexpected stream index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 0, "Unexpected timestamp.\n"); ok(!sample, "Expected sample object.\n"); @@ -1042,41 +1042,41 @@ static void test_source_reader_from_media_source(void) ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 16); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); - ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected success setting current media type, hr %#x.\n", hr); + ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); hr = MFCreateMediaType(&media_type); - ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 32); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); - ok(hr == S_OK, "Failed to set current media type, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); - ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected stream index %lu\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); IMFSample_Release(sample); @@ -1092,40 +1092,40 @@ static void test_source_reader_from_media_source(void) callback = create_async_callback(); hr = MFCreateAttributes(&attributes, 1); - ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, (IUnknown *)&callback->IMFSourceReaderCallback_iface); - ok(hr == S_OK, "Failed to set attribute value, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); refcount = get_refcount(attributes); hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(get_refcount(attributes) > refcount, "Unexpected refcount.\n"); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Return values are delivered to callback only. */ hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, &stream_flags, &timestamp, &sample); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, &timestamp, &sample); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, &sample); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Flush() arguments validation. */ hr = IMFSourceReader_Flush(reader, 123); - ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, NULL); - ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#lx.\n", hr); IMFSourceReader_Release(reader); IMFMediaSource_Release(source); @@ -1137,36 +1137,36 @@ static void test_source_reader_from_media_source(void) fail_request_sample = TRUE; hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); - ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); actual_index = ~0u; stream_flags = 0; hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected index %u.\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#x.\n", stream_flags); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#lx.\n", stream_flags); actual_index = ~0u; stream_flags = 0; hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected index %u.\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#x.\n", stream_flags); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#lx.\n", stream_flags); actual_index = ~0u; stream_flags = 0; hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); - ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); - ok(actual_index == 0, "Unexpected index %u.\n", actual_index); - ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#x.\n", stream_flags); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(!actual_index, "Unexpected index %lu.\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected flags %#lx.\n", stream_flags); IMFSourceReader_Release(reader); IMFMediaSource_Release(source); @@ -1196,22 +1196,22 @@ static void test_reader_d3d9(void) } hr = DXVA2CreateDirect3DDeviceManager9(&token, &d3d9_manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(d3d9_manager, d3d9_device, token); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); hr = MFCreateAttributes(&attributes, 1); - ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_D3D_MANAGER, (IUnknown *)d3d9_manager); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader); - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFAttributes_Release(attributes); @@ -1230,7 +1230,7 @@ START_TEST(mfplat) HRESULT hr; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); init_functions(); @@ -1240,5 +1240,5 @@ START_TEST(mfplat) test_reader_d3d9(); hr = MFShutdown(); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); } -- 2.34.1

1 0

[PATCH] mfmediaengine/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 14 Feb '22

14 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/tests/Makefile.in | 1 - dlls/mfmediaengine/tests/mfmediaengine.c | 255 +++++++++++------------ 2 files changed, 126 insertions(+), 130 deletions(-) diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in index d8331277412..421b75587a0 100644 --- a/dlls/mfmediaengine/tests/Makefile.in +++ b/dlls/mfmediaengine/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mfmediaengine.dll IMPORTS = ole32 mfplat oleaut32 mfuuid uuid diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index d5a118677e5..f67b6512db7 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -45,7 +45,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %ld, expected %ld.\n", rc, ref); } #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) @@ -58,7 +58,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -148,18 +148,18 @@ static IMFMediaEngine *create_media_engine(IMFMediaEngineNotify *callback) HRESULT hr; hr = pMFCreateDXGIDeviceManager(&token, &manager); - ok(hr == S_OK, "Failed to create dxgi device manager, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateAttributes(&attributes, 3); - ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)callback); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineClassFactory_CreateInstance(factory, 0, attributes, &media_engine); - ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); @@ -193,7 +193,7 @@ static void test_factory(void) hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFMediaEngineClassFactory, (void **)&factory); - ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, "Failed to create class factory, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, "Failed to create class factory, hr %#lx.\n", hr); if (FAILED(hr)) { win_skip("Media Engine is not supported.\n"); @@ -205,32 +205,29 @@ static void test_factory(void) /* Aggregation is not supported. */ hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, &IID_IMFMediaEngineClassFactory, (void **)&factory2); - ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#lx.\n", hr); hr = pMFCreateDXGIDeviceManager(&token, &manager); - ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateAttributes(&attributes, 3); - ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); - ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); IMFAttributes_DeleteAllItems(attributes); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)&notify->IMFMediaEngineNotify_iface); - ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); - ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(factory, 1); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(factory, 1); IMFMediaEngine_Release(media_engine); @@ -253,36 +250,36 @@ static void test_CreateInstance(void) notify = create_callback(); hr = pMFCreateDXGIDeviceManager(&token, &manager); - ok(hr == S_OK, "Failed to create dxgi device manager, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateAttributes(&attributes, 3); - ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); IMFAttributes_DeleteAllItems(attributes); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)&notify->IMFMediaEngineNotify_iface); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); - ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_interface(media_engine, &IID_IMFMediaEngine, TRUE); hr = IMFMediaEngine_QueryInterface(media_engine, &IID_IMFGetService, (void **)&unk); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* supported since win10 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* supported since win10 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); @@ -310,16 +307,16 @@ static void test_Shutdown(void) media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == MF_E_SHUTDOWN || broken(hr == S_OK) /* before win10 */, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN || broken(hr == S_OK) /* before win10 */, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_SetSource(media_engine, NULL); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_GetCurrentSource(media_engine, &str); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetNetworkState(media_engine); ok(!state, "Unexpected state %d.\n", state); @@ -329,26 +326,26 @@ static void test_Shutdown(void) ok(!state, "Unexpected state %d.\n", state); hr = IMFMediaEngine_SetPreload(media_engine, MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetPreload(media_engine); ok(state == MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC, "Unexpected state %d.\n", state); hr = IMFMediaEngine_SetPreload(media_engine, 100); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetPreload(media_engine); ok(state == 100, "Unexpected state %d.\n", state); hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_Load(media_engine); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"video/mp4"); hr = IMFMediaEngine_CanPlayType(media_engine, str, &state); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); SysFreeString(str); state = IMFMediaEngine_GetReadyState(media_engine); @@ -361,7 +358,7 @@ static void test_Shutdown(void) ok(val == 0.0, "Unexpected time %f.\n", val); hr = IMFMediaEngine_SetCurrentTime(media_engine, 1.0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); val = IMFMediaEngine_GetStartTime(media_engine); ok(val == 0.0, "Unexpected time %f.\n", val); @@ -373,16 +370,16 @@ static void test_Shutdown(void) ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_SetDefaultPlaybackRate(media_engine, 2.0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); val = IMFMediaEngine_GetPlaybackRate(media_engine); ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_GetPlayed(media_engine, &time_range); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_GetSeekable(media_engine, &time_range); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_IsEnded(media_engine); ok(!state, "Unexpected state %d.\n", state); @@ -392,7 +389,7 @@ static void test_Shutdown(void) ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetAutoPlay(media_engine, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetAutoPlay(media_engine); ok(!!state, "Unexpected state.\n"); @@ -402,28 +399,28 @@ static void test_Shutdown(void) ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetLoop(media_engine, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetLoop(media_engine); ok(!!state, "Unexpected state.\n"); hr = IMFMediaEngine_Play(media_engine); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_Pause(media_engine); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetMuted(media_engine); ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetMuted(media_engine, TRUE); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); val = IMFMediaEngine_GetVolume(media_engine); ok(val == 1.0, "Unexpected value %f.\n", val); hr = IMFMediaEngine_SetVolume(media_engine, 2.0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_HasVideo(media_engine); ok(!state, "Unexpected state.\n"); @@ -432,27 +429,27 @@ static void test_Shutdown(void) ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_GetNativeVideoSize(media_engine, &cx, &cy); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(IMFMediaEngine_QueryInterface(media_engine, &IID_IMFMediaEngineEx, (void **)&media_engine_ex))) { hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine_ex, NULL, NULL); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_GetAudioStreamCategory(media_engine_ex, &value); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_GetAudioEndpointRole(media_engine_ex, &value); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_SetAudioStreamCategory(media_engine_ex, AudioCategory_ForegroundOnlyMedia); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_SetAudioEndpointRole(media_engine_ex, eConsole); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); IMFMediaEngineEx_Release(media_engine_ex); } @@ -476,13 +473,13 @@ static void test_Play(void) media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); hr = IMFMediaEngine_GetBuffered(media_engine, &range); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_GetBuffered(media_engine, &range1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(range != range1, "Unexpected pointer.\n"); count = IMFMediaTimeRange_GetLength(range); - ok(!count, "Unexpected count %u.\n", count); + ok(!count, "Unexpected count %lu.\n", count); IMFMediaTimeRange_Release(range); IMFMediaTimeRange_Release(range1); @@ -491,30 +488,30 @@ static void test_Play(void) ok(ret, "Unexpected state %d.\n", ret); hr = IMFMediaEngine_OnVideoStreamTick(media_engine, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); pts = 0; hr = IMFMediaEngine_OnVideoStreamTick(media_engine, &pts); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(pts == MINLONGLONG, "Unexpected timestamp.\n"); hr = IMFMediaEngine_Play(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_IsPaused(media_engine); ok(!ret, "Unexpected state %d.\n", ret); hr = IMFMediaEngine_Play(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_OnVideoStreamTick(media_engine, NULL); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_OnVideoStreamTick(media_engine, &pts); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_IsPaused(media_engine); ok(!ret, "Unexpected state %d.\n", ret); @@ -525,13 +522,13 @@ static void test_Play(void) media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); hr = IMFMediaEngine_Play(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_IsPaused(media_engine); ok(!ret, "Unexpected state %d.\n", ret); hr = IMFMediaEngine_Pause(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_IsPaused(media_engine); ok(!!ret, "Unexpected state %d.\n", ret); @@ -558,13 +555,13 @@ static void test_playback_rate(void) ok(rate == 1.0, "Unexpected default rate.\n"); hr = IMFMediaEngine_SetPlaybackRate(media_engine, 0.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); rate = IMFMediaEngine_GetPlaybackRate(media_engine); ok(rate == 0.0, "Unexpected default rate.\n"); hr = IMFMediaEngine_SetDefaultPlaybackRate(media_engine, 0.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaEngine_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); @@ -585,13 +582,13 @@ static void test_mute(void) ok(!ret, "Unexpected state.\n"); hr = IMFMediaEngine_SetMuted(media_engine, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_GetMuted(media_engine); ok(ret, "Unexpected state.\n"); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_GetMuted(media_engine); ok(ret, "Unexpected state.\n"); @@ -614,73 +611,73 @@ static void test_error(void) eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!eo, "Unexpected instance.\n"); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ENCRYPTED + 1); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ABORTED); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); eo = NULL; hr = IMFMediaEngine_GetError(media_engine, &eo); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!eo, "Unexpected instance.\n"); eo2 = NULL; hr = IMFMediaEngine_GetError(media_engine, &eo2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(eo2 != eo, "Unexpected instance.\n"); IMFMediaError_Release(eo2); IMFMediaError_Release(eo); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_NOERROR); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!eo, "Unexpected instance.\n"); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); ok(!eo, "Unexpected instance.\n"); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_NOERROR); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); IMFMediaEngine_Release(media_engine); /* Error object. */ hr = IMFMediaEngineClassFactory_CreateError(factory, &eo); - ok(hr == S_OK, "Failed to create error object, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); code = IMFMediaError_GetErrorCode(eo); ok(code == MF_MEDIA_ENGINE_ERR_NOERROR, "Unexpected code %u.\n", code); hr = IMFMediaError_GetExtendedErrorCode(eo); - ok(hr == S_OK, "Unexpected code %#x.\n", hr); + ok(hr == S_OK, "Unexpected code %#lx.\n", hr); hr = IMFMediaError_SetErrorCode(eo, MF_MEDIA_ENGINE_ERR_ENCRYPTED + 1); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFMediaError_SetErrorCode(eo, MF_MEDIA_ENGINE_ERR_ABORTED); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); code = IMFMediaError_GetErrorCode(eo); ok(code == MF_MEDIA_ENGINE_ERR_ABORTED, "Unexpected code %u.\n", code); hr = IMFMediaError_SetExtendedErrorCode(eo, E_FAIL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaError_GetExtendedErrorCode(eo); - ok(hr == E_FAIL, "Unexpected code %#x.\n", hr); + ok(hr == E_FAIL, "Unexpected code %#lx.\n", hr); IMFMediaError_Release(eo); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); @@ -695,11 +692,11 @@ static void test_time_range(void) BOOL ret; hr = IMFMediaEngineClassFactory_CreateTimeRange(factory, &range); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Empty ranges. */ hr = IMFMediaTimeRange_Clear(range); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaTimeRange_ContainsTime(range, 10.0); ok(!ret, "Unexpected return value %d.\n", ret); @@ -708,155 +705,155 @@ static void test_time_range(void) ok(!count, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Add a range. */ hr = IMFMediaTimeRange_AddRange(range, 10.0, 1.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 10.0, "Unexpected start %.e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 1.0, "Unexpected end %.e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 2.0, 3.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 3.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 10.0, 9.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 2, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 3.0, "Unexpected end %.8e.\n", end); start = 0.0; hr = IMFMediaTimeRange_GetStart(range, 1, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 10.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 1, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 9.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 2.0, 9.1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 2, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 9.1, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_GetStart(range, 1, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 10.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 1, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 9.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 8.5, 2.5); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 2, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 9.1, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 20.0, 20.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 3, "Unexpected range count.\n"); hr = IMFMediaTimeRange_Clear(range); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(!count, "Unexpected range count.\n"); /* Intersect */ hr = IMFMediaTimeRange_AddRange(range, 5.0, 10.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTimeRange_AddRange(range, 6.0, 12.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 5.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 12.0, "Unexpected end %.8e.\n", end); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_AddRange(range, 4.0, 6.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 4.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 12.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 5.0, 3.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 4.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 12.0, "Unexpected end %.8e.\n", end); IMFMediaTimeRange_Release(range); @@ -879,7 +876,7 @@ static void test_SetSourceFromByteStream(void) } hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); IMFMediaEngineEx_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); @@ -902,11 +899,11 @@ static void test_audio_configuration(void) } hr = IMFMediaEngineEx_GetAudioStreamCategory(media_engine, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value == AudioCategory_Other, "Unexpected value %u.\n", value); hr = IMFMediaEngineEx_GetAudioEndpointRole(media_engine, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value == eMultimedia, "Unexpected value %u.\n", value); IMFMediaEngineEx_Release(media_engine); @@ -931,7 +928,7 @@ START_TEST(mfmediaengine) init_functions(); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "MFStartup failed: %#x.\n", hr); + ok(hr == S_OK, "MFStartup failed: %#lx.\n", hr); test_factory(); test_CreateInstance(); -- 2.34.1

1 0

[PATCH 4/4] wmiutils: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 14 Feb '22

14 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wmiutils/Makefile.in | 1 - dlls/wmiutils/path.c | 46 ++--- dlls/wmiutils/statuscode.c | 4 +- dlls/wmiutils/tests/Makefile.in | 1 - dlls/wmiutils/tests/path.c | 323 ++++++++++++++++---------------- 5 files changed, 185 insertions(+), 190 deletions(-) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index 8086851e047..22d756c1f5a 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmiutils.dll IMPORTS = oleaut32 ole32 advapi32 diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 6a7587ad23f..ce2fc90ba1f 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -145,7 +145,7 @@ static HRESULT WINAPI keylist_SetKey( ULONG uCimType, LPVOID pKeyVal ) { - FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + FIXME("%p, %s, %#lx, %lu, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); return E_NOTIMPL; } @@ -156,7 +156,7 @@ static HRESULT WINAPI keylist_SetKey2( ULONG uCimType, VARIANT *pKeyVal ) { - FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + FIXME("%p, %s, %#lx, %lu, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); return E_NOTIMPL; } @@ -170,7 +170,7 @@ static HRESULT WINAPI keylist_GetKey( LPVOID pKeyVal, ULONG *puApparentCimType ) { - FIXME("%p, %u, 0x%x, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + FIXME("%p, %lu, %#lx, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, pszKeyName, puKeyValBufSize, pKeyVal, puApparentCimType); return E_NOTIMPL; } @@ -184,7 +184,7 @@ static HRESULT WINAPI keylist_GetKey2( VARIANT *pKeyValue, ULONG *puApparentCimType ) { - FIXME("%p, %u, 0x%x, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + FIXME("%p, %lu, %#lx, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, pszKeyName, pKeyValue, puApparentCimType); return E_NOTIMPL; } @@ -194,7 +194,7 @@ static HRESULT WINAPI keylist_RemoveKey( LPCWSTR wszName, ULONG uFlags ) { - FIXME("%p, %s, 0x%x\n", iface, debugstr_w(wszName), uFlags); + FIXME("%p, %s, %#lx\n", iface, debugstr_w(wszName), uFlags); return E_NOTIMPL; } @@ -217,7 +217,7 @@ static HRESULT WINAPI keylist_RemoveAllKeys( struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); struct path *parent = impl_from_IWbemPath( keylist->parent ); - TRACE("%p, 0x%x\n", iface, uFlags); + TRACE("%p, %#lx\n", iface, uFlags); if (uFlags) return WBEM_E_INVALID_PARAMETER; @@ -244,7 +244,7 @@ static HRESULT WINAPI keylist_GetInfo( ULONG uRequestedInfo, ULONGLONG *puResponse ) { - FIXME("%p, %u, %p\n", iface, uRequestedInfo, puResponse); + FIXME("%p, %lu, %p\n", iface, uRequestedInfo, puResponse); return E_NOTIMPL; } @@ -254,7 +254,7 @@ static HRESULT WINAPI keylist_GetText( ULONG *puBuffLength, LPWSTR pszText ) { - FIXME("%p, 0x%x, %p, %p\n", iface, lFlags, puBuffLength, pszText); + FIXME("%p, %#lx, %p, %p\n", iface, lFlags, puBuffLength, pszText); return E_NOTIMPL; } @@ -517,7 +517,7 @@ static HRESULT WINAPI path_SetText( HRESULT hr = S_OK; int len; - TRACE("%p, %u, %s\n", iface, uMode, debugstr_w(pszPath)); + TRACE("%p, %lu, %s\n", iface, uMode, debugstr_w(pszPath)); if (!uMode || !pszPath) return WBEM_E_INVALID_PARAMETER; @@ -761,7 +761,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) return strdupW( path->text ); default: - ERR("unhandled flags 0x%x\n", flags); + ERR( "unhandled flags %#lx\n", flags ); return NULL; } } @@ -777,7 +777,7 @@ static HRESULT WINAPI path_GetText( WCHAR *str; int len; - TRACE("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); + TRACE("%p, %#lx, %p, %p\n", iface, lFlags, puBufferLength, pszText); if (!puBufferLength) return WBEM_E_INVALID_PARAMETER; @@ -813,7 +813,7 @@ static HRESULT WINAPI path_GetInfo( { struct path *path = impl_from_IWbemPath( iface ); - TRACE("%p, %u, %p\n", iface, info, response); + TRACE("%p, %lu, %p\n", iface, info, response); if (info || !response) return WBEM_E_INVALID_PARAMETER; @@ -934,7 +934,7 @@ static HRESULT WINAPI path_SetNamespaceAt( WCHAR **tmp, *new; DWORD size; - TRACE("%p, %u, %s\n", iface, idx, debugstr_w(name)); + TRACE( "%p, %lu, %s\n", iface, idx, debugstr_w(name) ); EnterCriticalSection( &path->cs ); @@ -990,7 +990,7 @@ static HRESULT WINAPI path_GetNamespaceAt( { struct path *path = impl_from_IWbemPath( iface ); - TRACE("%p, %u, %p, %p\n", iface, idx, len, name); + TRACE( "%p, %lu, %p, %p\n", iface, idx, len, name ); EnterCriticalSection( &path->cs ); @@ -1012,7 +1012,7 @@ static HRESULT WINAPI path_RemoveNamespaceAt( { struct path *path = impl_from_IWbemPath( iface ); - TRACE("%p, %u\n", iface, idx); + TRACE( "%p, %lu\n", iface, idx ); EnterCriticalSection( &path->cs ); @@ -1068,7 +1068,7 @@ static HRESULT WINAPI path_SetScope( ULONG uIndex, LPWSTR pszClass) { - FIXME("%p, %u, %s\n", iface, uIndex, debugstr_w(pszClass)); + FIXME("%p, %lu, %s\n", iface, uIndex, debugstr_w(pszClass)); return E_NOTIMPL; } @@ -1077,7 +1077,7 @@ static HRESULT WINAPI path_SetScopeFromText( ULONG uIndex, LPWSTR pszText) { - FIXME("%p, %u, %s\n", iface, uIndex, debugstr_w(pszText)); + FIXME("%p, %lu, %s\n", iface, uIndex, debugstr_w(pszText)); return E_NOTIMPL; } @@ -1088,7 +1088,7 @@ static HRESULT WINAPI path_GetScope( LPWSTR pszClass, IWbemPathKeyList **pKeyList) { - FIXME("%p, %u, %p, %p, %p\n", iface, uIndex, puClassNameBufSize, pszClass, pKeyList); + FIXME("%p, %lu, %p, %p, %p\n", iface, uIndex, puClassNameBufSize, pszClass, pKeyList); return E_NOTIMPL; } @@ -1098,7 +1098,7 @@ static HRESULT WINAPI path_GetScopeAsText( ULONG *puTextBufSize, LPWSTR pszText) { - FIXME("%p, %u, %p, %p\n", iface, uIndex, puTextBufSize, pszText); + FIXME("%p, %lu, %p, %p\n", iface, uIndex, puTextBufSize, pszText); return E_NOTIMPL; } @@ -1106,7 +1106,7 @@ static HRESULT WINAPI path_RemoveScope( IWbemPath *iface, ULONG uIndex) { - FIXME("%p, %u\n", iface, uIndex); + FIXME("%p, %lu\n", iface, uIndex); return E_NOTIMPL; } @@ -1192,7 +1192,7 @@ static HRESULT WINAPI path_CreateClassPart( LONG lFlags, LPCWSTR Name) { - FIXME("%p, 0x%x, %s\n", iface, lFlags, debugstr_w(Name)); + FIXME("%p, %#lx, %s\n", iface, lFlags, debugstr_w(Name)); return E_NOTIMPL; } @@ -1200,7 +1200,7 @@ static HRESULT WINAPI path_DeleteClassPart( IWbemPath *iface, LONG lFlags) { - FIXME("%p, 0x%x\n", iface, lFlags); + FIXME("%p, %#lx\n", iface, lFlags); return E_NOTIMPL; } @@ -1219,7 +1219,7 @@ static BOOL WINAPI path_IsRelativeOrChild( LPWSTR wszNamespace, LONG lFlags) { - FIXME("%p, %s, %s, 0x%x\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); + FIXME("%p, %s, %s, %#lx\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); return FALSE; } diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index 7137bf1c699..b9a3e71eb68 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -94,7 +94,7 @@ static HRESULT WINAPI status_code_GetErrorCodeText( { WCHAR msg[32]; - FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + FIXME("%p, %#lx, %#lx, %#lx, %p\n", iface, res, lcid, flags, text); swprintf(msg, ARRAY_SIZE(msg), L"Error code: 0x%08x", res); *text = SysAllocString(msg); @@ -110,7 +110,7 @@ static HRESULT WINAPI status_code_GetFacilityCodeText( { WCHAR msg[32]; - FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + FIXME("%p, %#lx, %#lx, %#lx, %p\n", iface, res, lcid, flags, text); swprintf(msg, ARRAY_SIZE(msg), L"Facility code: 0x%08x", res); *text = SysAllocString(msg); diff --git a/dlls/wmiutils/tests/Makefile.in b/dlls/wmiutils/tests/Makefile.in index 60135dcc0a1..3099d506bed 100644 --- a/dlls/wmiutils/tests/Makefile.in +++ b/dlls/wmiutils/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wmiutils.dll IMPORTS = ole32 diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 0b5473c4d0d..879d86af32e 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -105,16 +105,16 @@ static void test_IWbemPath_SetText(void) if (!(path = create_path())) return; hr = IWbemPath_SetText( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE(test); i++) { hr = IWbemPath_SetText( path, test[i].mode, test[i].path ); todo_wine_if (test[i].todo) - ok( hr == test[i].ret, "%u got %08x\n", i, hr ); + ok( hr == test[i].ret, "%u got %#lx\n", i, hr ); if (test[i].ret == S_OK) { @@ -124,9 +124,9 @@ static void test_IWbemPath_SetText(void) memset( buf, 0x55, sizeof(buf) ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, buf ); - ok( hr == S_OK, "%u got %08x\n", i, hr ); + ok( hr == S_OK, "%u got %#lx\n", i, hr ); ok( !lstrcmpW( buf, test[i].path ), "%u unexpected path %s\n", i, wine_dbgstr_w(buf) ); - ok( len == lstrlenW( test[i].path ) + 1, "%u unexpected length %u\n", i, len ); + ok( len == lstrlenW( test[i].path ) + 1, "%u unexpected length %lu\n", i, len ); } } IWbemPath_Release( path ); @@ -147,181 +147,181 @@ static void test_IWbemPath_GetText(void) if (!(path = create_path())) return; hr = IWbemPath_GetText( path, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == 1, "unexpected length %u\n", len ); + ok( len == 1, "unexpected length %lu\n", len ); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == 1, "unexpected length %u\n", len ); + ok( len == 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); todo_wine ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - todo_wine ok( len == 1, "unexpected length %u\n", len ); + todo_wine ok( len == 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path8 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path9 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path9 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path9 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path13 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path13 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path13 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path14 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path14 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path14 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path15 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path15 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path15 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path12 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path12 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path12 ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path6 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); len = 0; hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( len == lstrlenW( path16 ) + 1, "unexpected length %u\n", len ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( len == lstrlenW( path16 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path16 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path16 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path16 ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path17 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path17 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path17 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, expected1W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( expected1W ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( expected1W ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, expected2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( expected2W ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( expected2W ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path15 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, expected3W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( expected3W ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( expected3W ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path18 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path19 ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path20 ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); IWbemPath_Release( path ); if (!(path = create_path())) return; hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, serviceW ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, serviceW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( serviceW ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( serviceW ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); if (!(path = create_path())) return; hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, classW ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } @@ -337,39 +337,39 @@ static void test_IWbemPath_GetClassName(void) if (!(path = create_path())) return; hr = IWbemPath_GetClassName( path, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); - ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } @@ -386,23 +386,23 @@ static void test_IWbemPath_SetClassName(void) if (!(path = create_path())) return; hr = IWbemPath_SetClassName( path, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetClassName( path, L"" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_SetClassName( path, classW ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), @@ -421,39 +421,39 @@ static void test_IWbemPath_GetServer(void) if (!(path = create_path())) return; hr = IWbemPath_GetServer( path, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"." ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW(L"." ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW(L"." ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } @@ -467,29 +467,29 @@ static void test_IWbemPath_GetInfo(void) if (!(path = create_path())) return; hr = IWbemPath_GetInfo( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_GetInfo( path, 1, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_GetInfo( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_GetInfo( path, 1, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), @@ -499,22 +499,22 @@ static void test_IWbemPath_GetInfo(void) if (!(path = create_path())) return; hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path12 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), "got %s\n", wine_dbgstr_longlong(resp) ); @@ -532,42 +532,42 @@ static void test_IWbemPath_SetServer(void) if (!(path = create_path())) return; hr = IWbemPath_SetServer( path, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr ); hr = IWbemPath_SetServer( path, L"" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_SetServer( path, L"server" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"server" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == (WBEMPATH_INFO_HAS_MACHINE_NAME | WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY | WBEMPATH_INFO_PATH_HAD_SERVER), "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_SetServer( path, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), "got %s\n", wine_dbgstr_longlong(flags) ); @@ -584,46 +584,46 @@ static void test_IWbemPath_GetNamespaceAt(void) if (!(path = create_path())) return; hr = IWbemPath_GetNamespaceAt( path, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetNamespaceAt( path, 2, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } @@ -643,30 +643,30 @@ static void test_IWbemPath_RemoveAllNamespaces(void) if (!(path = create_path())) return; hr = IWbemPath_RemoveAllNamespaces( path ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_RemoveAllNamespaces( path ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); IWbemPath_Release( path ); } @@ -686,61 +686,60 @@ static void test_IWbemPath_RemoveNamespaceAt(void) if (!(path = create_path())) return; hr = IWbemPath_RemoveNamespaceAt( path, 0 ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); hr = IWbemPath_RemoveNamespaceAt( path, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 1, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 1, "got %lu\n", count ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_RemoveNamespaceAt( path, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == expected_flags, - "got %s\n", wine_dbgstr_longlong(flags) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); IWbemPath_Release( path ); } @@ -760,59 +759,57 @@ static void test_IWbemPath_SetNamespaceAt(void) if (!(path = create_path())) return; hr = IWbemPath_SetNamespaceAt( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetNamespaceAt( path, 1, L"cimv2" ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetNamespaceAt( path, 0, L"cimv2" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 1, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 1, "got %lu\n", count ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == expected_flags, - "got %s\n", wine_dbgstr_longlong(flags) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetNamespaceAt( path, 0, L"root" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == expected_flags, - "got %s\n", wine_dbgstr_longlong(flags) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } -- 2.30.2

1 0

[PATCH 3/4] wbemdisp: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 14 Feb '22

14 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/Makefile.in | 1 - dlls/wbemdisp/locator.c | 104 ++++++++++---------- dlls/wbemdisp/tests/Makefile.in | 1 - dlls/wbemdisp/tests/wbemdisp.c | 163 ++++++++++++++++---------------- 4 files changed, 134 insertions(+), 135 deletions(-) diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in index 88de6e935bd..682cee35391 100644 --- a/dlls/wbemdisp/Makefile.in +++ b/dlls/wbemdisp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wbemdisp.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index ffd6debec4d..6966e7f356d 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -109,7 +109,7 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = LoadRegTypeLib( &LIBID_WbemScripting, 1, 2, LOCALE_SYSTEM_DEFAULT, &typelib ); if (FAILED( hr )) { - ERR( "LoadRegTypeLib failed: %08x\n", hr ); + ERR( "LoadRegTypeLib failed: %#lx\n", hr ); return hr; } if (InterlockedCompareExchangePointer( (void **)&wbemdisp_typelib, typelib, NULL )) @@ -122,7 +122,7 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = ITypeLib_GetTypeInfoOfGuid( wbemdisp_typelib, wbemdisp_tid_id[tid], &typeinfo ); if (FAILED( hr )) { - ERR( "GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(wbemdisp_tid_id[tid]), hr ); + ERR( "GetTypeInfoOfGuid(%s) failed: %#lx\n", debugstr_guid(wbemdisp_tid_id[tid]), hr ); return hr; } if (InterlockedCompareExchangePointer( (void **)(wbemdisp_typeinfo + tid), typeinfo, NULL )) @@ -199,7 +199,7 @@ static HRESULT WINAPI property_GetTypeInfo( ISWbemProperty *iface, UINT index, LCID lcid, ITypeInfo **info ) { struct property *property = impl_from_ISWbemProperty( iface ); - TRACE( "%p, %u, %u, %p\n", property, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", property, index, lcid, info ); return get_typeinfo( ISWbemProperty_tid, info ); } @@ -211,7 +211,7 @@ static HRESULT WINAPI property_GetIDsOfNames( ISWbemProperty *iface, REFIID riid ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", property, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", property, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -232,7 +232,7 @@ static HRESULT WINAPI property_Invoke( ISWbemProperty *iface, DISPID member, REF ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", property, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", property, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemProperty_tid, &typeinfo ); @@ -398,7 +398,7 @@ static HRESULT WINAPI propertyset_GetTypeInfo( ISWbemPropertySet *iface, UINT index, LCID lcid, ITypeInfo **info ) { struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); - TRACE( "%p, %u, %u, %p\n", propertyset, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", propertyset, index, lcid, info ); return get_typeinfo( ISWbemPropertySet_tid, info ); } @@ -410,7 +410,7 @@ static HRESULT WINAPI propertyset_GetIDsOfNames( ISWbemPropertySet *iface, REFII ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", propertyset, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", propertyset, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -431,7 +431,7 @@ static HRESULT WINAPI propertyset_Invoke( ISWbemPropertySet *iface, DISPID membe ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", propertyset, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", propertyset, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemPropertySet_tid, &typeinfo ); @@ -457,7 +457,7 @@ static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, HRESULT hr; VARIANT var; - TRACE( "%p, %s, %08x, %p\n", propertyset, debugstr_w(name), flags, prop ); + TRACE( "%p, %s, %#lx, %p\n", propertyset, debugstr_w(name), flags, prop ); hr = IWbemClassObject_Get( propertyset->object, name, 0, &var, NULL, NULL ); if (SUCCEEDED(hr)) @@ -637,7 +637,7 @@ static HRESULT WINAPI method_GetTypeInfo( { struct method *method = impl_from_ISWbemMethod( iface ); - TRACE( "%p, %u, %u, %p\n", method, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", method, index, lcid, info ); return get_typeinfo( ISWbemMethod_tid, info ); } @@ -654,7 +654,7 @@ static HRESULT WINAPI method_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", method, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", method, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -682,7 +682,7 @@ static HRESULT WINAPI method_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", method, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", method, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemMethod_tid, &typeinfo ); @@ -858,7 +858,7 @@ static HRESULT WINAPI methodset_GetTypeInfo( ISWbemMethodSet *iface, { struct methodset *set = impl_from_ISWbemMethodSet( iface ); - TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", set, index, lcid, info ); return get_typeinfo( ISWbemMethodSet_tid, info ); } @@ -875,7 +875,7 @@ static HRESULT WINAPI methodset_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -903,7 +903,7 @@ static HRESULT WINAPI methodset_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemMethodSet_tid, &typeinfo ); @@ -935,7 +935,7 @@ static HRESULT WINAPI methodset_Item( IWbemClassObject *in_sign, *out_sign; HRESULT hr; - TRACE("%p, %s, %#x, %p\n", set, debugstr_w(name), flags, method); + TRACE("%p, %s, %#lx, %p\n", set, debugstr_w(name), flags, method); *method = NULL; @@ -1069,7 +1069,7 @@ static HRESULT WINAPI object_GetTypeInfo( ITypeInfo **info ) { struct object *object = impl_from_ISWbemObject( iface ); - FIXME( "%p, %u, %u, %p\n", object, index, lcid, info ); + FIXME( "%p, %u, %#lx, %p\n", object, index, lcid, info ); return E_NOTIMPL; } @@ -1189,7 +1189,7 @@ static HRESULT WINAPI object_GetIDsOfNames( UINT i; ITypeInfo *typeinfo; - TRACE( "%p, %s, %p, %u, %u, %p\n", object, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", object, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -1251,7 +1251,7 @@ static 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; @@ -1276,7 +1276,7 @@ static HRESULT WINAPI object_Invoke( CIMTYPE type; HRESULT hr; - TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); if (member <= DISPID_BASE_METHOD) @@ -1318,7 +1318,7 @@ static HRESULT WINAPI object_Invoke( } else { - FIXME( "flags %x not supported\n", flags ); + FIXME( "flags %#x not supported\n", flags ); return E_NOTIMPL; } } @@ -1486,7 +1486,7 @@ static HRESULT WINAPI object_ExecMethod_( VARIANT path; HRESULT hr; - TRACE( "%p, %s, %p, %#x, %p, %p\n", object, debugstr_w(method), in_params, flags, valueset, out_params ); + TRACE( "%p, %s, %p, %#lx, %p, %p\n", object, debugstr_w(method), in_params, flags, valueset, out_params ); V_VT( &path ) = VT_EMPTY; hr = IWbemClassObject_Get( object->object, L"__PATH", 0, &path, NULL, NULL ); @@ -1536,7 +1536,7 @@ static HRESULT WINAPI object_GetObjectText_( { struct object *object = impl_from_ISWbemObject( iface ); - TRACE( "%p, %#x, %p\n", object, flags, text ); + TRACE( "%p, %#lx, %p\n", object, flags, text ); return IWbemClassObject_GetObjectText( object->object, flags, text ); } @@ -1769,7 +1769,7 @@ static HRESULT WINAPI objectset_GetTypeInfo( ITypeInfo **info ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); - TRACE( "%p, %u, %u, %p\n", objectset, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", objectset, index, lcid, info ); return get_typeinfo( ISWbemObjectSet_tid, info ); } @@ -1786,7 +1786,7 @@ static HRESULT WINAPI objectset_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", objectset, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", objectset, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -1814,7 +1814,7 @@ static HRESULT WINAPI objectset_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", objectset, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", objectset, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo ); @@ -1886,7 +1886,7 @@ static HRESULT WINAPI objectset_ItemIndex( IEnumVARIANT *enum_var; VARIANT var; - TRACE( "%p, %d, %p\n", objectset, lIndex, objWbemObject ); + TRACE( "%p, %ld, %p\n", objectset, lIndex, objWbemObject ); *objWbemObject = NULL; hr = ISWbemObjectSet_get_Count( iface, &count ); @@ -2025,7 +2025,7 @@ static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *va IWbemClassObject *obj; ULONG count = 0; - TRACE( "%p, %u, %p, %p\n", iface, celt, var, fetched ); + TRACE( "%p, %lu, %p, %p\n", iface, celt, var, fetched ); if (celt) IEnumWbemClassObject_Next( enumvar->objectenum, WBEM_INFINITE, 1, &obj, &count ); if (count) @@ -2048,7 +2048,7 @@ static HRESULT WINAPI enumvar_Skip( IEnumVARIANT *iface, ULONG celt ) { struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); - TRACE( "%p, %u\n", iface, celt ); + TRACE( "%p, %lu\n", iface, celt ); return IEnumWbemClassObject_Skip( enumvar->objectenum, WBEM_INFINITE, celt ); } @@ -2166,7 +2166,7 @@ static HRESULT WINAPI services_GetTypeInfo( ITypeInfo **info ) { struct services *services = impl_from_ISWbemServices( iface ); - TRACE( "%p, %u, %u, %p\n", services, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", services, index, lcid, info ); return get_typeinfo( ISWbemServices_tid, info ); } @@ -2183,7 +2183,7 @@ static HRESULT WINAPI services_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", services, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", services, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -2211,7 +2211,7 @@ static HRESULT WINAPI services_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", services, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", services, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); @@ -2235,7 +2235,7 @@ static HRESULT WINAPI services_Get( IWbemClassObject *obj; HRESULT hr; - TRACE( "%p, %s, %d, %p, %p\n", iface, debugstr_w(strObjectPath), iFlags, objWbemNamedValueSet, + TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(strObjectPath), iFlags, objWbemNamedValueSet, objWbemObject ); if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); @@ -2303,7 +2303,7 @@ static HRESULT WINAPI services_InstancesOf( BSTR query, wql = SysAllocString( L"WQL" ); HRESULT hr; - TRACE( "%p, %s, %x, %p, %p\n", iface, debugstr_w(strClass), iFlags, objWbemNamedValueSet, + TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(strClass), iFlags, objWbemNamedValueSet, objWbemObjectSet ); if (!(query = build_query_string( strClass ))) @@ -2364,7 +2364,7 @@ static HRESULT WINAPI services_ExecQuery( IEnumWbemClassObject *iter; HRESULT hr; - TRACE( "%p, %s, %s, %x, %p, %p\n", iface, debugstr_w(strQuery), debugstr_w(strQueryLanguage), + TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQuery), debugstr_w(strQueryLanguage), iFlags, objWbemNamedValueSet, objWbemObjectSet ); if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); @@ -2502,7 +2502,7 @@ static HRESULT WINAPI services_ExecMethod( IWbemContext *context; HRESULT hr; - TRACE( "%p, %s, %s, %p, %#x, %p, %p\n", services, debugstr_w(path), debugstr_w(method), in_sparams, + TRACE( "%p, %s, %s, %p, %#lx, %p, %p\n", services, debugstr_w(path), debugstr_w(method), in_sparams, flags, valueset, out_sparams ); in_params = unsafe_object_impl_from_IDispatch( in_sparams ); @@ -2671,7 +2671,7 @@ static HRESULT WINAPI locator_GetTypeInfo( ITypeInfo **info ) { struct locator *locator = impl_from_ISWbemLocator( iface ); - TRACE( "%p, %u, %u, %p\n", locator, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", locator, index, lcid, info ); return get_typeinfo( ISWbemLocator_tid, info ); } @@ -2688,7 +2688,7 @@ static HRESULT WINAPI locator_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", locator, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", locator, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -2716,7 +2716,7 @@ static HRESULT WINAPI locator_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", locator, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", locator, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemLocator_tid, &typeinfo ); @@ -2771,7 +2771,7 @@ static HRESULT WINAPI locator_ConnectServer( BSTR resource; HRESULT hr; - TRACE( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strServer), + TRACE( "%p, %s, %s, %s, %p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strServer), debugstr_w(strNamespace), debugstr_w(strUser), strPassword, debugstr_w(strLocale), debugstr_w(strAuthority), iSecurityFlags, objWbemNamedValueSet, objWbemServices ); @@ -2910,7 +2910,7 @@ static HRESULT WINAPI security_GetTypeInfo( ITypeInfo **info ) { struct security *security = impl_from_ISWbemSecurity( iface ); - TRACE( "%p, %u, %u, %p\n", security, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", security, index, lcid, info ); return get_typeinfo( ISWbemSecurity_tid, info ); } @@ -2927,7 +2927,7 @@ static HRESULT WINAPI security_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -2955,7 +2955,7 @@ static HRESULT WINAPI security_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); @@ -3143,7 +3143,7 @@ static HRESULT WINAPI namedvalue_GetTypeInfo( { struct namedvalue *value = impl_from_ISWbemNamedValue( iface ); - TRACE( "%p, %u, %u, %p\n", value, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", value, index, lcid, info ); return get_typeinfo( ISWbemNamedValue_tid, info ); } @@ -3160,7 +3160,7 @@ static HRESULT WINAPI namedvalue_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", value, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", value, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -3188,7 +3188,7 @@ static HRESULT WINAPI namedvalue_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemNamedValue_tid, &typeinfo ); @@ -3321,7 +3321,7 @@ static HRESULT WINAPI namedvalueset_GetTypeInfo( { struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); - TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", set, index, lcid, info ); return get_typeinfo( ISWbemNamedValueSet_tid, info ); } @@ -3338,7 +3338,7 @@ static HRESULT WINAPI namedvalueset_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -3366,7 +3366,7 @@ static HRESULT WINAPI namedvalueset_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); @@ -3398,7 +3398,7 @@ static HRESULT WINAPI namedvalueset_Item( VARIANT var; HRESULT hr; - TRACE("%p, %s, %#x, %p\n", set, debugstr_w(name), flags, value); + TRACE("%p, %s, %#lx, %p\n", set, debugstr_w(name), flags, value); if (SUCCEEDED(hr = IWbemContext_GetValue( set->context, name, flags, &var ))) { @@ -3428,7 +3428,7 @@ static HRESULT WINAPI namedvalueset_Add( struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); HRESULT hr; - TRACE("%p, %s, %s, %#x, %p\n", set, debugstr_w(name), debugstr_variant(var), flags, value); + TRACE("%p, %s, %s, %#lx, %p\n", set, debugstr_w(name), debugstr_variant(var), flags, value); if (!name || !var || !value) return WBEM_E_INVALID_PARAMETER; @@ -3448,7 +3448,7 @@ static HRESULT WINAPI namedvalueset_Remove( { struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); - TRACE("%p, %s, %#x\n", set, debugstr_w(name), flags); + TRACE("%p, %s, %#lx\n", set, debugstr_w(name), flags); return IWbemContext_DeleteValue( set->context, name, flags ); } diff --git a/dlls/wbemdisp/tests/Makefile.in b/dlls/wbemdisp/tests/Makefile.in index 0a8d63bddb5..f509d374f24 100644 --- a/dlls/wbemdisp/tests/Makefile.in +++ b/dlls/wbemdisp/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wbemdisp.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 4ce847fac84..187cb8d9e80 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -56,7 +56,8 @@ static void test_ParseDisplayName(void) IMoniker *moniker; IUnknown *obj; BSTR str; - ULONG i, eaten, count; + ULONG i, eaten; + UINT count; HRESULT hr; CLSID clsid; @@ -68,7 +69,7 @@ static void test_ParseDisplayName(void) } hr = CreateBindCtx( 0, &ctx ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i =0; i < ARRAY_SIZE( tests ); i++) { @@ -77,17 +78,17 @@ static void test_ParseDisplayName(void) moniker = NULL; hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); SysFreeString( str ); - ok( hr == tests[i].hr, "%u: got %x\n", i, hr ); - ok( eaten == tests[i].eaten, "%u: got %u\n", i, eaten ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); + ok( eaten == tests[i].eaten, "%lu: got %lu\n", i, eaten ); if (moniker) { hr = IMoniker_GetClassID( moniker, &clsid ); - ok( hr == S_OK, "%u: got %x\n", i, hr ); - ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "%u: got %s\n", i, wine_dbgstr_guid( &clsid ) ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); + ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "%lu: got %s\n", i, wine_dbgstr_guid( &clsid ) ); obj = NULL; hr = IMoniker_BindToObject( moniker, ctx, NULL, tests[i].iid, (void **)&obj ); - ok( hr == S_OK, "%u: got %x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); if (obj) IUnknown_Release( obj ); IMoniker_Release( moniker ); } @@ -98,18 +99,18 @@ static void test_ParseDisplayName(void) moniker = NULL; hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); - ok( eaten == lstrlenW(name1), "got %u\n", eaten ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( eaten == lstrlenW(name1), "got %lu\n", eaten ); if (moniker) { ISWbemServices *services = NULL; hr = IMoniker_GetClassID( moniker, &clsid ); - ok( hr == S_OK, "%u: got %x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "got %s\n", wine_dbgstr_guid( &clsid ) ); hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_IUnknown, (void **)&services ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (services) { ISWbemObjectSet *objectset = NULL; @@ -117,17 +118,17 @@ static void test_ParseDisplayName(void) str = SysAllocString( L"Win32_Bios" ); hr = ISWbemServices_InstancesOf( services, str, 0, NULL, &objectset ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (objectset) { hr = ISWbemObjectSet_get__NewEnum( objectset, &obj ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (obj) { IEnumVARIANT *enumvar = NULL; hr = IUnknown_QueryInterface( obj, &IID_IEnumVARIANT, (void **)&enumvar ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (enumvar) { @@ -140,51 +141,51 @@ static void test_ParseDisplayName(void) fetched = 0xdeadbeef; hr = IEnumVARIANT_Next( enumvar, 0, &var, &fetched ); - ok( hr == S_OK, "got %x\n", hr ); - ok( !fetched, "got %u\n", fetched ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !fetched, "got %lu\n", fetched ); fetched = 0xdeadbeef; V_VT( &var ) = VT_ERROR; V_ERROR( &var ) = 0xdeadbeef; hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); - ok( hr == S_OK, "got %x\n", hr ); - ok( fetched == 1, "got %u\n", fetched ); - ok( V_VT( &var ) == VT_DISPATCH, "got %u\n", V_VT( &var ) ); - ok( V_DISPATCH( &var ) != (IDispatch *)0xdeadbeef, "got %u\n", V_VT( &var ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( fetched == 1, "got %lu\n", fetched ); + ok( V_VT( &var ) == VT_DISPATCH, "got %#x\n", V_VT( &var ) ); + ok( V_DISPATCH( &var ) != (IDispatch *)0xdeadbeef, "got %#x\n", V_VT( &var ) ); dispatch = V_DISPATCH( &var ); count = 0; hr = IDispatch_GetTypeInfoCount( dispatch, &count ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( count == 1, "got %u\n", count ); str = SysAllocString( L"Manufacturer" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); - ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %#lx\n", dispid ); str = SysAllocString( L"version" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); - ok( dispid == 0x1800002 || dispid == 0x119 /* win2k */, "got %x\n", dispid ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( dispid == 0x1800002 || dispid == 0x119 /* win2k */, "got %#lx\n", dispid ); str = SysAllocString( L"NoSuch" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); - ok( hr == DISP_E_UNKNOWNNAME, "got %x\n", hr ); - ok( dispid == DISPID_UNKNOWN, "got %x\n", dispid ); + ok( hr == DISP_E_UNKNOWNNAME, "got %#lx\n", hr ); + ok( dispid == DISPID_UNKNOWN, "got %#lx\n", dispid ); str = SysAllocString( L"Manufacturer" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); - ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %#lx\n", dispid ); if (dispid == 0x1800001) /* crashes on win2k */ { @@ -197,7 +198,7 @@ static void test_ParseDisplayName(void) hr = IDispatch_Invoke( dispatch, DISPID_UNKNOWN, &IID_NULL, english, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, &res, NULL, &arg_err ); - ok( hr == DISP_E_MEMBERNOTFOUND || hr == S_OK /* winxp */, "got %x\n", hr ); + ok( hr == DISP_E_MEMBERNOTFOUND || hr == S_OK /* winxp */, "got %#lx\n", hr ); ok( params.rgvarg == (VARIANTARG *)0xdeadbeef, "got %p\n", params.rgvarg ); ok( params.rgdispidNamedArgs == (DISPID *)0xdeadbeef, "got %p\n", params.rgdispidNamedArgs ); ok( params.cArgs == 0xdeadbeef, "got %u\n", params.cArgs ); @@ -214,7 +215,7 @@ static void test_ParseDisplayName(void) hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, english, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, &res, NULL, NULL ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( params.rgvarg == NULL, "got %p\n", params.rgvarg ); ok( params.rgdispidNamedArgs == NULL, "got %p\n", params.rgdispidNamedArgs ); ok( !params.cArgs, "got %u\n", params.cArgs ); @@ -226,8 +227,8 @@ static void test_ParseDisplayName(void) fetched = 0xdeadbeef; hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); - ok( hr == S_FALSE, "got %x\n", hr ); - ok( !fetched, "got %u\n", fetched ); + ok( hr == S_FALSE, "got %#lx\n", hr ); + ok( !fetched, "got %lu\n", fetched ); IEnumVARIANT_Release( enumvar ); } @@ -243,11 +244,11 @@ static void test_ParseDisplayName(void) IBindCtx_Release( ctx ); hr = CreateBindCtx( 0, &ctx ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); str = SysAllocString( L"winmgmts:\\\\.\\root\\default:StdRegProv" ); hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( str ); if (moniker) @@ -255,19 +256,19 @@ static void test_ParseDisplayName(void) ISWbemObject *sobj = NULL; hr = IMoniker_GetClassID( moniker, &clsid ); - ok( hr == S_OK, "%u: got %x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "got %s\n", wine_dbgstr_guid( &clsid ) ); hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_ISWbemObject, (void **)&sobj ); - ok( hr == S_OK, "got %x\n",hr ); + ok( hr == S_OK, "got %#lx\n",hr ); if (sobj) { DISPID dispid = 0xdeadbeef; str = SysAllocString( L"GetStringValue" ); hr = ISWbemObject_GetIDsOfNames( sobj, &IID_NULL, &str, 1, english, &dispid ); - ok( hr == S_OK, "got %x\n", hr ); - ok( dispid == 0x1000001, "got %x\n", dispid ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( dispid == 0x1000001, "got %#lx\n", dispid ); ISWbemObject_Release( sobj ); SysFreeString( str ); @@ -285,7 +286,7 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); + ok_(__FILE__,line)(rc == ref, "expected refcount %ld, got %lu\n", ref, rc); } static void test_locator(void) @@ -307,12 +308,12 @@ static void test_locator(void) WbemAuthenticationLevelEnum auth_level; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); host_bstr = SysAllocString( L"localhost" ); root_bstr = SysAllocString( L"root\\CIMV2" ); hr = ISWbemLocator_ConnectServer( locator, host_bstr, root_bstr, NULL, NULL, NULL, NULL, 0, NULL, &services); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( root_bstr ); SysFreeString( host_bstr ); @@ -320,87 +321,87 @@ static void test_locator(void) query_bstr = SysAllocString( L"Select ProcessorId from Win32_Processor" ); lang_bstr = SysAllocString( L"WQL" ); hr = ISWbemServices_ExecQuery( services, query_bstr, lang_bstr, wbemFlagForwardOnly, NULL, &object_set); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( lang_bstr ); SysFreeString( query_bstr ); EXPECT_REF( services, 2 ); hr = ISWbemLocator_get_Security_( locator, &security ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); imp_level = 0xdeadbeef; hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); hr = ISWbemSecurity_put_ImpersonationLevel( security, wbemImpersonationLevelAnonymous ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); imp_level = 0xdeadbeef; hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( imp_level == wbemImpersonationLevelAnonymous, "got %u\n", imp_level ); auth_level = 0xdeadbeef; hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); todo_wine { - ok( hr == WBEM_E_FAILED, "got %x\n", hr ); + ok( hr == WBEM_E_FAILED, "got %#lx\n", hr ); ok( auth_level == 0xdeadbeef, "got %u\n", auth_level ); } hr = ISWbemSecurity_put_AuthenticationLevel( security, wbemAuthenticationLevelNone ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); auth_level = 0xdeadbeef; hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( auth_level == wbemAuthenticationLevelNone, "got %u\n", auth_level ); ISWbemSecurity_Release( security ); security = NULL; hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantInit( &var ); hr = IEnumVARIANT_Next( enum_var, 1, &var, NULL ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT(&var) == VT_DISPATCH, "got %x\n", V_VT(&var)); props_bstr = SysAllocString( L"Properties_" ); hr = IDispatch_GetIDsOfNames( V_DISPATCH(&var), &IID_NULL, &props_bstr, 1, english, &id ); - ok( hr == S_OK, "got %x\n", hr ); - ok( id == 21, "got %d\n", id ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( id == 21, "got %ld\n", id ); hr = IDispatch_QueryInterface( V_DISPATCH(&var), &IID_ISWbemObject, (void**)&object ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantClear( &var ); hr = ISWbemObject_get_Properties_( object, &prop_set ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = ISWbemPropertySet_Item( prop_set, props_bstr, 0, &prop ); - ok( hr == WBEM_E_NOT_FOUND, "got %x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "got %#lx\n", hr ); SysFreeString( props_bstr ); procid_bstr = SysAllocString( L"ProcessorId" ); hr = ISWbemPropertySet_Item( prop_set, procid_bstr, 0, &prop ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( procid_bstr ); count = 0; hr = ISWbemPropertySet_get_Count( prop_set, &count ); - ok( hr == S_OK, "got %x\n", hr ); - ok( count > 0, "got %d\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count > 0, "got %lu\n", count ); hr = ISWbemProperty_get_Value( prop, &var ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); VariantClear( &var ); hr = ISWbemServices_get_Security_( services, &security ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); imp_level = 0xdeadbeef; hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); auth_level = 0xdeadbeef; hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( auth_level == wbemAuthenticationLevelPktPrivacy, "got %u\n", auth_level ); ISWbemSecurity_Release(security); @@ -424,33 +425,33 @@ static void test_namedvalueset(void) LONG count; hr = CoCreateInstance( &CLSID_SWbemNamedValueSet, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemNamedValueSet, (void **)&set ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); name = SysAllocString( L"name" ); V_VT(&var) = VT_I4; V_I4(&var) = 10; hr = ISWbemNamedValueSet_Add( set, name, &var, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#lx.\n", hr ); hr = ISWbemNamedValueSet_Add( set, name, &var, 0, &value ); - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); /* New instance is returned, referencing same entry. */ hr = ISWbemNamedValueSet_Item( set, name, 0, &value2 ); - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); ok( value != value2, "Unexpected value instance.\n" ); V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value2, &var ); todo_wine - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); V_I4(&var) = 0; hr = ISWbemNamedValue_get_Value( value, &var ); todo_wine { - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); - ok( V_I4(&var) == 20, "Unexpected value %d.\n", V_I4(&var) ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok( V_I4(&var) == 20, "Unexpected value %ld.\n", V_I4(&var) ); } ISWbemNamedValue_Release( value ); ISWbemNamedValue_Release( value2 ); @@ -460,39 +461,39 @@ todo_wine { /* Embedded nulls in names */ name = SysAllocStringLen(nameW, ARRAY_SIZE(nameW)); hr = ISWbemNamedValueSet_Item( set, name, 0, &value ); - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); ISWbemNamedValue_Release( value ); V_I4(&var) = 11; hr = ISWbemNamedValueSet_Add( set, name, &var, 0, &value ); - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); count = 0; hr = ISWbemNamedValueSet_get_Count( set, &count ); todo_wine { - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); - ok( count == 1, "Unexpected count %d.\n", count ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok( count == 1, "Unexpected count %ld.\n", count ); } hr = ISWbemNamedValueSet_DeleteAll( set ); todo_wine - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); count = 1; hr = ISWbemNamedValueSet_get_Count( set, &count ); todo_wine { - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); - ok( count == 0, "Unexpected count %d.\n", count ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok( count == 0, "Unexpected count %ld.\n", count ); } V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value, &var ); todo_wine - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); count = 0; hr = ISWbemNamedValueSet_get_Count( set, &count ); todo_wine { - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); - ok( count == 1, "Unexpected count %d.\n", count ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok( count == 1, "Unexpected count %ld.\n", count ); } ISWbemNamedValue_Release( value ); SysFreeString( name ); -- 2.30.2

1 0

[PATCH 2/4] wbemprox/tests: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 14 Feb '22

14 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/Makefile.in | 1 - dlls/wbemprox/tests/query.c | 538 ++++++++++++++++---------------- dlls/wbemprox/tests/services.c | 78 +++-- 3 files changed, 307 insertions(+), 310 deletions(-) diff --git a/dlls/wbemprox/tests/Makefile.in b/dlls/wbemprox/tests/Makefile.in index 92a15b6c8e9..565edd0a289 100644 --- a/dlls/wbemprox/tests/Makefile.in +++ b/dlls/wbemprox/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wbemprox.dll IMPORTS = uuid oleaut32 ole32 user32 advapi32 diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 954d39d244b..0a8c97ad166 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -60,10 +60,10 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC } hr = IWbemClassObject_GetQualifierSet( obj, &qualifiers ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemQualifierSet_GetNames( qualifiers, 0, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); IWbemQualifierSet_Release( qualifiers ); @@ -103,29 +103,29 @@ static void test_select( IWbemServices *services ) UINT i; hr = IWbemServices_ExecQuery( services, NULL, NULL, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); hr = IWbemServices_ExecQuery( services, NULL, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); hr = IWbemServices_ExecQuery( services, wql, NULL, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); hr = IWbemServices_ExecQuery( services, sql, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_QUERY_TYPE, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_QUERY_TYPE, "query failed %#lx\n", hr ); hr = IWbemServices_ExecQuery( services, sql, NULL, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); SysFreeString( query ); query = SysAllocString( L"" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); - ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + ok( hr == S_OK, "query %u failed: %#lx\n", i, hr ); if (result) IEnumWbemClassObject_Release( result ); } @@ -153,7 +153,7 @@ static void test_associators( IWbemServices *services ) for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); - ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + ok( hr == S_OK, "query %u failed: %#lx\n", i, hr ); if (result) IEnumWbemClassObject_Release( result ); } } @@ -168,20 +168,20 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) int i; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 2; hr = IEnumWbemClassObject_Next( result, 10000, 1, NULL, &count ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( count == 2, "expected 0, got %u\n", count ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( count == 2, "expected 0, got %lu\n", count ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); count = 2; hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 0, "expected 0, got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 0, "expected 0, got %lu\n", count ); for (;;) { @@ -192,25 +192,25 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) } hr = IEnumWbemClassObject_Reset( result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); obj = malloc( num_objects * sizeof( IWbemClassObject * ) ); count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == num_objects, "expected %lu, got %lu\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); hr = IEnumWbemClassObject_Reset( result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); - ok( hr == S_FALSE, "got %08x\n", hr ); - ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_FALSE, "got %#lx\n", hr ); + ok( count == num_objects, "expected %lu, got %lu\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); @@ -230,9 +230,9 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro VariantInit( &val ); hr = IWbemClassObject_Get( obj, prop, 0, &val, &type, NULL ); - ok( hr == S_OK, "%u: failed to get description %08x\n", line, hr ); - ok( V_VT( &val ) == vartype, "%u: unexpected variant type 0x%x\n", line, V_VT(&val) ); - ok( type == cimtype, "%u: unexpected type 0x%x\n", line, type ); + ok( hr == S_OK, "%lu: failed to get description %#lx\n", line, hr ); + ok( V_VT( &val ) == vartype, "%lu: unexpected variant type 0x%x\n", line, V_VT(&val) ); + ok( type == cimtype, "%lu: unexpected type %#lx\n", line, type ); switch (V_VT(&val)) { case VT_BSTR: @@ -242,7 +242,7 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro trace( "%s: %d\n", wine_dbgstr_w(prop), V_I2(&val) ); break; case VT_I4: - trace( "%s: %d\n", wine_dbgstr_w(prop), V_I4(&val) ); + trace( "%s: %ld\n", wine_dbgstr_w(prop), V_I4(&val) ); break; case VT_R4: trace( "%s: %f\n", wine_dbgstr_w(prop), V_R4(&val) ); @@ -278,45 +278,45 @@ static void test_Win32_Service( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &state ); hr = IWbemClassObject_Get( service, L"State", 0, &state, &type, NULL ); - ok( hr == S_OK, "failed to get service state %08x\n", hr ); + ok( hr == S_OK, "failed to get service state %#lx\n", hr ); ok( V_VT( &state ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &state ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); if (!lstrcmpW( V_BSTR( &state ), L"Stopped" )) { out = NULL; method = SysAllocString( L"StartService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( !V_I4( &retval ), "unexpected error %lu\n", V_UI4( &retval ) ); IWbemClassObject_Release( out ); } out = NULL; method = SysAllocString( L"PauseService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_I4( &retval ), "unexpected success\n" ); IWbemClassObject_Release( out ); out = NULL; method = SysAllocString( L"ResumeService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_I4( &retval ), "unexpected success\n" ); IWbemClassObject_Release( out ); @@ -325,13 +325,13 @@ static void test_Win32_Service( IWbemServices *services ) out = NULL; method = SysAllocString( L"StopService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( !V_I4( &retval ), "unexpected error %lu\n", V_UI4( &retval ) ); IWbemClassObject_Release( out ); } VariantClear( &state ); @@ -339,20 +339,20 @@ static void test_Win32_Service( IWbemServices *services ) service = NULL; hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !!service, "expected non-NULL service\n" ); VariantInit(&classvar); V_VT(&classvar) = VT_BSTR; V_BSTR(&classvar) = SysAllocString(L"MyClass"); hr = IWbemClassObject_Put(service, L"__CLASS", 0, &classvar, 0); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantClear(&classvar); IWbemClassObject_Release( service ); service = NULL; hr = IWbemServices_GetObject( services, empty, 0, NULL, &service, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !!service, "expected non-NULL service\n" ); IWbemClassObject_Release( service ); @@ -362,7 +362,7 @@ static void test_Win32_Service( IWbemServices *services ) class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); service = (IWbemClassObject *)0xdeadbeef; hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); - ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "got %#lx\n", hr ); ok( service == NULL, "expected NULL service, got %p\n", service ); SysFreeString( class ); } @@ -378,10 +378,10 @@ static void test_Win32_Bios( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %#lx\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %#lx\n", hr ); check_property( obj, L"Description", VT_BSTR, CIM_STRING ); check_property( obj, L"IdentificationCode", VT_NULL, CIM_STRING ); @@ -392,10 +392,10 @@ static void test_Win32_Bios( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get serial number %08x\n", hr ); + ok( hr == S_OK, "failed to get serial number %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL /* Testbot VMs */, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); VariantClear( &val ); check_property( obj, L"SMBIOSBIOSVersion", VT_BSTR, CIM_STRING ); @@ -420,7 +420,7 @@ static void test_Win32_Baseboard( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %#lx\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) @@ -428,16 +428,16 @@ static void test_Win32_Baseboard( IWbemServices *services ) win_skip( "Win32_Baseboard not available\n" ); return; } - ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %#lx\n", hr ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"Model", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get model %08x\n", hr ); + ok( hr == S_OK, "failed to get model %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "model: %s\n", wine_dbgstr_w(V_BSTR(&val)) ); VariantClear( &val ); @@ -498,15 +498,15 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) } names = NULL; hr = IWbemClassObject_GetNames( process, NULL, 0, NULL, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( names != NULL, "names not set\n" ); hr = SafeArrayGetUBound( names, 1, &bound ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i <= bound; i++) { BSTR str; hr = SafeArrayGetElement( names, &i, &str ); - ok( hr == S_OK, "%d: got %08x\n", i, hr ); + ok( hr == S_OK, "%ld: got %#lx\n", i, hr ); SysFreeString( str ); } SafeArrayDestroy( names ); @@ -514,116 +514,116 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) sig_in = (void *)0xdeadbeef; sig_out = (void *)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"unknown", 0, &sig_in, &sig_out ); - ok( hr == WBEM_E_NOT_FOUND, "Got unexpected hr %#x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "Got unexpected hr %#lx\n", hr ); ok( !sig_in, "Got unexpected sig_in %p.\n", sig_in ); ok( !sig_out, "Got unexpected sig_out %p.\n", sig_out ); sig_in = (void *)0xdeadbeef; sig_out = (void *)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"Create", 0, &sig_in, &sig_out ); - ok( hr == S_OK, "Got unexpected hr %#x\n", hr ); + ok( hr == S_OK, "Got unexpected hr %#lx\n", hr ); ok( !!sig_in, "Got unexpected sig_in %p.\n", sig_in ); ok( !!sig_out, "Got unexpected sig_out %p.\n", sig_out ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &params ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); out = NULL; class = SysAllocString( L"Win32_Process" ); method = SysAllocString( L"Create" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); SysFreeString( class ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( V_I4( &retval ) == 21, "unexpected error %u\n", V_I4( &retval ) ); + ok( V_I4( &retval ) == 21, "unexpected error %ld\n", V_I4( &retval ) ); IWbemClassObject_Release( out ); V_VT( &val ) = VT_BSTR; V_BSTR( &val ) = SysAllocString( L"unknown" ); hr = IWbemClassObject_Put( params, L"CommandLine", 0, &val, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantClear( &val ); out = NULL; class = SysAllocString( L"Win32_Process" ); method = SysAllocString( L"Create" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); SysFreeString( class ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( V_I4( &retval ) == 9, "unexpected error %u\n", V_I4( &retval ) ); + ok( V_I4( &retval ) == 9, "unexpected error %ld\n", V_I4( &retval ) ); VariantInit( &retval ); V_VT( &retval ) = VT_I4; hr = IWbemClassObject_Get( out, L"ProcessId", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - todo_wine ok( V_VT( &retval ) == VT_NULL && type == CIM_UINT32, "unexpected variant type 0x%x, type %u\n", + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + todo_wine ok( V_VT( &retval ) == VT_NULL && type == CIM_UINT32, "unexpected variant type %#x, type %lu\n", V_VT( &retval ), type ); IWbemClassObject_Release( out ); ret = GetModuleFileNameW( NULL, cmdlineW, MAX_PATH + 1 ); - ok( ret < MAX_PATH + 1, "Got unexpected ret %u.\n", ret ); + ok( ret < MAX_PATH + 1, "got unexpected ret %lu\n", ret ); lstrcatW( cmdlineW, L" query created_process"); V_VT( &val ) = VT_BSTR; V_BSTR( &val ) = SysAllocString( cmdlineW ); hr = IWbemClassObject_Put( params, L"CommandLine", 0, &val, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantClear( &val ); out = NULL; class = SysAllocString( L"Win32_Process" ); method = SysAllocString( L"Create" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); SysFreeString( class ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_I4( &retval ) ); VariantInit( &retval ); V_VT( &retval ) = VT_I4; hr = IWbemClassObject_Get( out, L"ProcessId", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4 && type == CIM_UINT32, "unexpected variant type 0x%x, type %u\n", + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4 && type == CIM_UINT32, "unexpected variant type %#x, type %lu\n", V_VT( &retval ), type ); ok( !!V_UI4( &retval ), "unexpected zero pid\n" ); IWbemClassObject_Release( out ); h = OpenProcess( SYNCHRONIZE, FALSE, V_UI4( &retval )); - ok( !!h, "failed to open process %#x.\n", V_UI4( &retval )); + ok( !!h, "failed to open process %#lx\n", V_UI4( &retval )); ret = WaitForSingleObject( h, INFINITE ); - ok( ret == WAIT_OBJECT_0, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError() ); + ok( ret == WAIT_OBJECT_0, "got unexpected ret %lu, GetLastError() %lu\n", ret, GetLastError() ); CloseHandle( h ); refcount = IWbemClassObject_Release( params ); - ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + ok( !refcount, "got unexpected refcount %lu\n", refcount ); refcount = IWbemClassObject_Release( sig_in ); - ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + ok( !refcount, "got unexpected refcount %lu\n", refcount ); refcount = IWbemClassObject_Release( sig_out ); - ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + ok( !refcount, "got unexpected refcount %lu\n", refcount ); sig_in = (void*)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"getowner", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); + ok( hr == S_OK, "failed to get GetOwner method %#lx\n", hr ); ok( !sig_in, "sig_in != NULL\n"); IWbemClassObject_Release( process ); @@ -633,54 +633,54 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) memcpy( class, full_path, full_path_len * sizeof(WCHAR) ); wsprintfW( class + full_path_len, L"Win32_Process.Handle=\"%u\"", GetCurrentProcessId() ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); SysFreeString( class ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_I4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); check_property( out, L"User", VT_BSTR, CIM_STRING ); check_property( out, L"Domain", VT_BSTR, CIM_STRING ); hr = IWbemClassObject_GetPropertyQualifierSet( out, L"User", &qualifiers ); - ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); + ok( hr == S_OK, "failed to get qualifier set %#lx\n", hr ); flavor = -1; V_I4(&val) = -1; V_VT(&val) = VT_ERROR; hr = IWbemQualifierSet_Get( qualifiers, L"ID", 0, &val, &flavor ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flavor == expected_flavor, "got %d\n", flavor ); - ok( V_VT(&val) == VT_I4, "got %u\n", V_VT(&val) ); - ok( V_I4(&val) == 0, "got %u\n", V_I4(&val) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flavor == expected_flavor, "got %ld\n", flavor ); + ok( V_VT(&val) == VT_I4, "got %#x\n", V_VT(&val) ); + ok( V_I4(&val) == 0, "got %ld\n", V_I4(&val) ); VariantClear( &val ); IWbemQualifierSet_Release( qualifiers ); hr = IWbemClassObject_GetPropertyQualifierSet( out, L"Domain", &qualifiers ); - ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); + ok( hr == S_OK, "failed to get qualifier set %#lx\n", hr ); flavor = -1; V_I4(&val) = -1; V_VT(&val) = VT_ERROR; hr = IWbemQualifierSet_Get( qualifiers, L"ID", 0, &val, &flavor ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flavor == expected_flavor, "got %d\n", flavor ); - ok( V_VT(&val) == VT_I4, "got %u\n", V_VT(&val) ); - ok( V_I4(&val) == 1, "got %u\n", V_I4(&val) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flavor == expected_flavor, "got %ld\n", flavor ); + ok( V_VT(&val) == VT_I4, "got %#x\n", V_VT(&val) ); + ok( V_I4(&val) == 1, "got %ld\n", V_I4(&val) ); VariantClear( &val ); IWbemQualifierSet_Release( qualifiers ); hr = IWbemClassObject_GetPropertyQualifierSet( out, L"ReturnValue", &qualifiers ); - ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); + ok( hr == S_OK, "failed to get qualifier set %#lx\n", hr ); hr = IWbemQualifierSet_Get( qualifiers, L"ID", 0, &val, &flavor ); - ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "got %#lx\n", hr ); IWbemQualifierSet_Release( qualifiers ); IWbemClassObject_Release( out ); @@ -722,33 +722,33 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) } hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); type = 0xdeadbeef; VariantInit( &value ); hr = IWbemClassObject_Get( obj, L"MemoryType", 0, &value, &type, NULL ); - ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "got %#lx\n", hr ); check_property( obj, L"Model", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &value ); hr = IWbemClassObject_Get( obj, L"Name", 0, &value, &type, NULL ); - ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( hr == S_OK, "failed to get computer name %#lx\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); ok( !lstrcmpiW( V_BSTR( &value ), compname ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(compname) ); VariantClear( &value ); type = 0xdeadbeef; VariantInit( &value ); hr = IWbemClassObject_Get( obj, L"NumberOfLogicalProcessors", 0, &value, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %#lx\n", hr ); if (hr == S_OK) { - ok( V_VT( &value ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "numlogicalprocessors %u\n", V_I4( &value ) ); + ok( V_VT( &value ) == VT_I4, "unexpected variant type %#x\n", V_VT( &value ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "numlogicalprocessors %ld\n", V_I4( &value ) ); } check_property( obj, L"NumberOfProcessors", VT_I4, CIM_UINT32 ); @@ -756,9 +756,9 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &value ); hr = IWbemClassObject_Get( obj, L"UserName", 0, &value, &type, NULL ); - ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( hr == S_OK, "failed to get computer name %#lx\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); ok( !lstrcmpiW( V_BSTR( &value ), username ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(username) ); VariantClear( &value ); @@ -781,36 +781,36 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %#lx\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %#lx\n", hr ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"ChassisTypes", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); - ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get chassis types %#lx\n", hr ); + ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type %#lx\n", type ); hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data ); - ok( hr == S_OK, "SafeArrayAccessData failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayAccessData failed %#lx\n", hr ); if (SUCCEEDED(hr)) { LONG i, lower, upper; hr = SafeArrayGetLBound( V_ARRAY( &val ), 1, &lower ); - ok( hr == S_OK, "SafeArrayGetLBound failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayGetLBound failed %#lx\n", hr ); hr = SafeArrayGetUBound( V_ARRAY( &val ), 1, &upper ); - ok( hr == S_OK, "SafeArrayGetUBound failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayGetUBound failed %#lx\n", hr ); if (V_VT( &val ) == (VT_I4|VT_ARRAY)) { for (i = 0; i < upper - lower + 1; i++) - trace( "chassis type: %u\n", data[i] ); + trace( "chassis type: %lu\n", data[i] ); } hr = SafeArrayUnaccessData( V_ARRAY( &val ) ); - ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayUnaccessData failed %#lx\n", hr ); } VariantClear( &val ); @@ -843,7 +843,7 @@ static void test_StdRegProv( IWbemServices *services ) } hr = IWbemClassObject_BeginMethodEnumeration( reg, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); while (IWbemClassObject_NextMethod( reg, 0, &name, &sig_in, &sig_out ) == S_OK) { @@ -853,59 +853,59 @@ static void test_StdRegProv( IWbemServices *services ) } hr = IWbemClassObject_EndMethodEnumeration( reg ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemClassObject_BeginEnumeration( reg, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); while (IWbemClassObject_Next( reg, 0, &name, NULL, NULL, NULL ) == S_OK) SysFreeString( name ); hr = IWbemClassObject_EndEnumeration( reg ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemClassObject_GetMethod( reg, L"CreateKey", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get CreateKey method %08x\n", hr ); + ok( hr == S_OK, "failed to get CreateKey method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); hr = IWbemClassObject_BeginEnumeration( in, 0 ); - ok( hr == S_OK, "failed to start enumeration %08x\n", hr ); + ok( hr == S_OK, "failed to start enumeration %#lx\n", hr ); hr = IWbemClassObject_Next( in, 0, &name, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( name ); hr = IWbemClassObject_EndEnumeration( in ); - ok( hr == S_OK, "failed to end enumeration %08x\n", hr ); + ok( hr == S_OK, "failed to end enumeration %#lx\n", hr ); V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000001; hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); - ok( hr == S_OK, "failed to set root %08x\n", hr ); + ok( hr == S_OK, "failed to set root %#lx\n", hr ); V_VT( &subkey ) = VT_BSTR; V_BSTR( &subkey ) = SysAllocString( L"Software\\StdRegProvTest" ); hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); - ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + ok( hr == S_OK, "failed to set subkey %#lx\n", hr ); out = NULL; method = SysAllocString( L"CreateKey" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type %#x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_UI4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); res = RegDeleteKeyW( HKEY_CURRENT_USER, L"Software\\StdRegProvTest" ); - ok( !res, "got %d\n", res ); + ok( !res, "got %ld\n", res ); VariantClear( &subkey ); IWbemClassObject_Release( in ); @@ -913,34 +913,34 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( sig_in ); hr = IWbemClassObject_GetMethod( reg, L"EnumKey", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get EnumKey method %08x\n", hr ); + ok( hr == S_OK, "failed to get EnumKey method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000002; hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); - ok( hr == S_OK, "failed to set root %08x\n", hr ); + ok( hr == S_OK, "failed to set root %#lx\n", hr ); V_VT( &subkey ) = VT_BSTR; V_BSTR( &subkey ) = SysAllocString( L"Software\\microsoft\\Windows\\CurrentVersion" ); hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); - ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + ok( hr == S_OK, "failed to set subkey %#lx\n", hr ); out = NULL; method = SysAllocString( L"EnumKey" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( !V_I4( &retval ), "unexpected error %lu\n", V_UI4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); check_property( out, L"sNames", VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); @@ -950,34 +950,34 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( sig_in ); hr = IWbemClassObject_GetMethod( reg, L"EnumValues", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get EnumValues method %08x\n", hr ); + ok( hr == S_OK, "failed to get EnumValues method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000002; hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); - ok( hr == S_OK, "failed to set root %08x\n", hr ); + ok( hr == S_OK, "failed to set root %#lx\n", hr ); V_VT( &subkey ) = VT_BSTR; V_BSTR( &subkey ) = SysAllocString( L"Software\\microsoft\\Windows\\CurrentVersion" ); hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); - ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + ok( hr == S_OK, "failed to set subkey %#lx\n", hr ); out = NULL; method = SysAllocString( L"EnumValues" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type %#x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_I4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); check_property( out, L"sNames", VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); check_property( out, L"Types", VT_I4|VT_ARRAY, CIM_SINT32|CIM_FLAG_ARRAY ); @@ -988,39 +988,39 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( sig_in ); hr = IWbemClassObject_GetMethod( reg, L"GetStringValue", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get GetStringValue method %08x\n", hr ); + ok( hr == S_OK, "failed to get GetStringValue method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000002; hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); - ok( hr == S_OK, "failed to set root %08x\n", hr ); + ok( hr == S_OK, "failed to set root %#lx\n", hr ); V_VT( &subkey ) = VT_BSTR; V_BSTR( &subkey ) = SysAllocString( L"Software\\microsoft\\Windows\\CurrentVersion" ); hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); - ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + ok( hr == S_OK, "failed to set subkey %#lx\n", hr ); V_VT( &valuename ) = VT_BSTR; V_BSTR( &valuename ) = SysAllocString( L"ProgramFilesDir" ); hr = IWbemClassObject_Put( in, L"sValueName", 0, &valuename, 0 ); - ok( hr == S_OK, "failed to set value name %08x\n", hr ); + ok( hr == S_OK, "failed to set value name %#lx\n", hr ); out = NULL; method = SysAllocString( L"GetStringValue" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type %#x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_I4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); check_property( out, L"sValue", VT_BSTR, CIM_STRING ); @@ -1064,14 +1064,14 @@ static ULONG WINAPI sink_Release( static HRESULT WINAPI sink_Indicate( IWbemObjectSink *iface, LONG count, IWbemClassObject **objects ) { - trace("Indicate: %d, %p\n", count, objects); + trace( "Indicate: %ld, %p\n", count, objects ); return S_OK; } static HRESULT WINAPI sink_SetStatus( IWbemObjectSink *iface, LONG flags, HRESULT hresult, BSTR str_param, IWbemClassObject *obj_param ) { - trace("SetStatus: %08x, %08x, %s, %p\n", flags, hresult, wine_dbgstr_w(str_param), obj_param); + trace( "SetStatus: %#lx, %#lx, %s, %p\n", flags, hresult, wine_dbgstr_w(str_param), obj_param ); return S_OK; } @@ -1093,15 +1093,15 @@ static void test_notification_query_async( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecNotificationQueryAsync( services, wql, query, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); prev_sink_refs = sink_refs; hr = IWbemServices_ExecNotificationQueryAsync( services, wql, query, 0, NULL, &sink ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); - ok( sink_refs > prev_sink_refs || broken(!sink_refs), "got %u refs\n", sink_refs ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %#lx\n", hr ); + ok( sink_refs > prev_sink_refs || broken(!sink_refs), "got %lu refs\n", sink_refs ); hr = IWbemServices_CancelAsyncCall( services, &sink ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %#lx\n", hr ); SysFreeString( wql ); SysFreeString( query ); @@ -1113,16 +1113,16 @@ static void test_query_async( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQueryAsync( services, wql, query, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemServices_ExecQueryAsync( services, wql, query, 0, NULL, &sink ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %#lx\n", hr ); hr = IWbemServices_CancelAsyncCall( services, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemServices_CancelAsyncCall( services, &sink ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( wql ); SysFreeString( query ); @@ -1138,15 +1138,15 @@ static void test_query_semisync( IWbemServices *services ) hr = IWbemServices_ExecQuery( services, wql, query, WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 1; obj = (void *)0xdeadbeef; hr = IEnumWbemClassObject_Next( result, -1, 1, &obj, &count ); todo_wine - ok( hr == WBEM_E_INVALID_CLASS, "Unexpected hr %#x.\n", hr ); - ok( count == 0, "Unexpected count %u.\n", count ); - ok( obj == (void *)0xdeadbeef, "Got object %p\n", obj ); + ok( hr == WBEM_E_INVALID_CLASS, "unexpected hr %#lx\n", hr ); + ok( count == 0, "unexpected count %lu\n", count ); + ok( obj == (void *)0xdeadbeef, "got object %p\n", obj ); IEnumWbemClassObject_Release( result ); @@ -1161,7 +1161,7 @@ static void test_GetNames( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1174,23 +1174,23 @@ static void test_GetNames( IWbemServices *services ) if (!count) break; hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS, NULL, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN, NULL, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); VariantInit( &val ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); IWbemClassObject_Release( obj ); @@ -1229,7 +1229,7 @@ static void test_SystemSecurity( IWbemServices *services ) out = NULL; method = SysAllocString( L"GetSD" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); + ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %#lx\n", hr ); SysFreeString( method ); if (SUCCEEDED(hr)) @@ -1237,20 +1237,20 @@ static void test_SystemSecurity( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type %#x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %lu\n", V_UI4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); type = 0xdeadbeef; VariantInit( &var_sd ); hr = IWbemClassObject_Get( out, L"SD", 0, &var_sd, &type, NULL ); - ok( hr == S_OK, "failed to get names %08x\n", hr ); - ok( V_VT( &var_sd ) == (VT_UI1|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &var_sd ) ); - ok( type == (CIM_UINT8|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get names %#lx\n", hr ); + ok( V_VT( &var_sd ) == (VT_UI1|VT_ARRAY), "unexpected variant type %#x\n", V_VT( &var_sd ) ); + ok( type == (CIM_UINT8|CIM_FLAG_ARRAY), "unexpected type %#lx\n", type ); hr = SafeArrayAccessData( V_ARRAY( &var_sd ), &data ); - ok( hr == S_OK, "SafeArrayAccessData failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayAccessData failed %#lx\n", hr ); if (SUCCEEDED(hr)) { sd = data; @@ -1262,7 +1262,7 @@ static void test_SystemSecurity( IWbemServices *services ) ok( EqualSid( (PSID)((LPBYTE)sd + sd->Group), sid_admin ), "unexpected group SID\n" ); hr = SafeArrayUnaccessData( V_ARRAY( &var_sd ) ); - ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayUnaccessData failed %#lx\n", hr ); } VariantClear( &var_sd ); @@ -1283,7 +1283,7 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1301,10 +1301,10 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"ServiceName", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get service name %08x\n", hr ); + ok( hr == S_OK, "failed to get service name %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || broken(V_VT( &val ) == VT_NULL) /* win2k8 */, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); VariantClear( &val ); IWbemClassObject_Release( obj ); @@ -1315,12 +1315,12 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\\\%\"" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( query ); query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\%\"" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - todo_wine ok( hr == WBEM_E_INVALID_QUERY, "got %08x\n", hr ); + todo_wine ok( hr == WBEM_E_INVALID_QUERY, "got %#lx\n", hr ); SysFreeString( query ); SysFreeString( wql ); } @@ -1336,7 +1336,7 @@ static void test_Win32_NetworkAdapterConfiguration( IWbemServices *services ) VARIANT val; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1350,9 +1350,9 @@ static void test_Win32_NetworkAdapterConfiguration( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"DNSDomain", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "DNSDomain %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1375,18 +1375,18 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %#lx\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %#lx\n", hr ); hr = IWbemClassObject_BeginEnumeration( obj, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); while (IWbemClassObject_Next( obj, 0, NULL, NULL, NULL, NULL ) == S_OK) {} hr = IWbemClassObject_EndEnumeration( obj ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_property( obj, L"BuildNumber", VT_BSTR, CIM_STRING ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); @@ -1394,9 +1394,9 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"CSDVersion", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get csdversion %08x\n", hr ); + ok( hr == S_OK, "failed to get csdversion %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "csdversion: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1406,22 +1406,22 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"OperatingSystemSKU", 0, &val, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* winxp */, "failed to get operatingsystemsku %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* winxp */, "failed to get operatingsystemsku %#lx\n", hr ); if (hr == S_OK) { ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "operatingsystemsku: %08x\n", V_I4( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "operatingsystemsku: %#lx\n", V_I4( &val ) ); VariantClear( &val ); } type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"OSProductSuite", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get osproductsuite %08x\n", hr ); + ok( hr == S_OK, "failed to get osproductsuite %#lx\n", hr ); ok( V_VT( &val ) == VT_I4 || broken(V_VT( &val ) == VT_NULL) /* winxp */, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "osproductsuite: %d (%08x)\n", V_I4( &val ), V_I4( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "osproductsuite: %ld (%#lx)\n", V_I4( &val ), V_I4( &val ) ); VariantClear( &val ); check_property( obj, L"CSName", VT_BSTR, CIM_STRING ); @@ -1460,7 +1460,7 @@ static void test_Win32_ComputerSystemProduct( IWbemServices *services ) } hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_property( obj, L"IdentifyingNumber", VT_BSTR, CIM_STRING ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); @@ -1507,29 +1507,29 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"ConfiguredClockSpeed", 0, &val, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* < win10 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* < win10 */, "got %#lx\n", hr ); if (hr == S_OK) { - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "ConfiguredClockSpeed %u\n", V_I4( &val ) ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "ConfiguredClockSpeed %ld\n", V_I4( &val ) ); } type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "PartNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "SerialNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1583,7 +1583,7 @@ static void test_Win32_Processor( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1604,23 +1604,23 @@ static void test_Win32_Processor( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"NumberOfLogicalProcessors", 0, &val, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %#lx\n", hr ); if (hr == S_OK) { - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "numlogicalprocessors %u\n", V_I4( &val ) ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "numlogicalprocessors %ld\n", V_I4( &val ) ); } type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"NumberOfCores", 0, &val, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %#lx\n", hr ); if (hr == S_OK) { - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "numcores %u\n", V_I4( &val ) ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "numcores %ld\n", V_I4( &val ) ); } IWbemClassObject_Release( obj ); @@ -1669,9 +1669,9 @@ static void test_Win32_VideoController( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"InstalledDisplayDrivers", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "installeddisplaydrivers %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1738,9 +1738,9 @@ static void test_Win32_Printer( IWbemServices *services ) type = 0xdeadbeef; memset( &val, 0, sizeof(val) ); hr = IWbemClassObject_Get( obj, L"Location", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "location %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1765,7 +1765,7 @@ static void test_Win32_PnPEntity( IWbemServices *services ) bstr = SysAllocString( L"Win32_PnPEntity" ); hr = IWbemServices_CreateInstanceEnum( services, bstr, 0, NULL, &enm ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( bstr ); bstr = SysAllocString( L"DeviceId" ); @@ -1774,7 +1774,7 @@ static void test_Win32_PnPEntity( IWbemServices *services ) hr = IEnumWbemClassObject_Next( enm, 1000, 1, &obj, &count ); ok( (count == 1 && (hr == WBEM_S_FALSE || hr == WBEM_S_NO_ERROR)) || (count == 0 && (hr == WBEM_S_FALSE || hr == WBEM_S_TIMEDOUT)), - "got %08x with %u objects returned\n", hr, count ); + "got %#lx with %lu objects returned\n", hr, count ); if (count == 0) break; @@ -1782,12 +1782,12 @@ static void test_Win32_PnPEntity( IWbemServices *services ) for (i = 0; i < count; ++i) { hr = IWbemClassObject_Get( obj, bstr, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (SUCCEEDED( hr )) { - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); VariantClear( &val ); } } @@ -1807,7 +1807,7 @@ static void test_Win32_WinSAT( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK || broken(hr == WBEM_E_INVALID_CLASS) /* win2k8 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_INVALID_CLASS) /* win2k8 */, "got %#lx\n", hr ); if (hr == WBEM_E_INVALID_CLASS) { win_skip( "class not found\n" ); @@ -1843,7 +1843,7 @@ static void test_SoftwareLicensingProduct( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK , "got %08x\n", hr ); + ok( hr == S_OK , "got %#lx\n", hr ); for (;;) { @@ -1868,7 +1868,7 @@ static void test_Win32_DesktopMonitor( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1894,7 +1894,7 @@ static void test_Win32_DiskDrive( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1920,7 +1920,7 @@ static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1951,7 +1951,7 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) CIMTYPE type; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1961,10 +1961,10 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &caption ); hr = IWbemClassObject_Get( obj, L"Caption", 0, &caption, &type, NULL ); - ok( hr == S_OK, "failed to get caption %08x\n", hr ); + ok( hr == S_OK, "failed to get caption %#lx\n", hr ); ok( V_VT( &caption ) == VT_BSTR || V_VT( &caption ) == VT_NULL /* winxp */, - "unexpected variant type 0x%x\n", V_VT( &caption ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + "unexpected variant type %#x\n", V_VT( &caption ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); check_property( obj, L"HotFixID", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); @@ -1986,7 +1986,7 @@ static void test_Win32_SoundDevice( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -2037,28 +2037,28 @@ static void test_SystemRestore( IWbemServices *services ) method = SysAllocString( L"Enable" ); sig_in = NULL; hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + ok( hr == S_OK, "failed to get Enable method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); GetWindowsDirectoryW(path, ARRAY_SIZE(path)); path[3] = 0; /* otherwise XP fails */ V_VT( &var ) = VT_BSTR; V_BSTR( &var ) = SysAllocString( path ); hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); - ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + ok( hr == S_OK, "failed to set Drive %#lx\n", hr ); SysFreeString( V_BSTR( &var ) ); out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); + ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %#lx\n", hr ); if (hr == S_OK) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %ld\n", V_UI4( &var ) ); IWbemClassObject_Release( out ); } @@ -2082,7 +2082,7 @@ static void test_Win32_LogicalDisk( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -2109,16 +2109,16 @@ static void test_empty_namespace( IWbemLocator *locator ) HRESULT hr; hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); query = SysAllocString( L"SELECT * FROM __ASSOCIATORS" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_CLASS, "Query failed: %08x\n", hr ); + ok( hr == WBEM_E_INVALID_CLASS, "Query failed: %#lx\n", hr ); SysFreeString( query ); query = SysAllocString( L"SELECT * FROM Win32_OperatingSystem" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_CLASS, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_CLASS, "got %#lx\n", hr ); SysFreeString( query ); SysFreeString( wql ); @@ -2139,20 +2139,20 @@ static void test_MSSMBios_RawSMBiosTables( IWbemLocator *locator ) HRESULT hr; hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = IWbemServices_CreateInstanceEnum( services, bios, 0, NULL, &iter ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); type = 0; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"SMBiosData", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( V_VT( &val ) == (VT_UI1 | VT_ARRAY), "got %08x\n", V_VT(&val) ); - ok( type == (CIM_UINT8 | CIM_FLAG_ARRAY), "got %08x\n", type ); + ok( hr == S_OK, "got %#lx\n", hr ); + todo_wine ok( V_VT( &val ) == (VT_UI1 | VT_ARRAY), "got %#x\n", V_VT(&val) ); + ok( type == (CIM_UINT8 | CIM_FLAG_ARRAY), "got %#lx\n", type ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( iter ); @@ -2190,17 +2190,17 @@ START_TEST(query) return; } hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = CoQueryProxyBlanket( (IUnknown *)services, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + ok( hr == S_OK, "failed to query proxy blanket %#lx\n", hr ); hr = CoQueryProxyBlanket( (IUnknown *)services, &authn_svc, NULL, NULL, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + ok( hr == S_OK, "failed to query proxy blanket %#lx\n", hr ); hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); - ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + ok( hr == S_OK, "failed to set proxy blanket %#lx\n", hr ); test_GetNames( services ); test_IEnumWbemClassObject_Next( services ); @@ -2248,10 +2248,10 @@ START_TEST(query) /* Some tests need other connection point */ path = SysAllocString( L"ROOT\\DEFAULT" ); hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); - ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + ok( hr == S_OK, "failed to set proxy blanket %#lx\n", hr ); test_StdRegProv( services ); test_SystemRestore( services ); diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 651beaef6a2..e7fbc90cf61 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -30,7 +30,7 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); + ok_(__FILE__,line)(rc == ref, "expected refcount %lu, got %lu\n", ref, rc); } static void test_IClientSecurity(void) @@ -48,45 +48,45 @@ static void test_IClientSecurity(void) win_skip("can't create instance of WbemLocator\n"); return; } - ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + ok( hr == S_OK, "failed to create IWbemLocator interface %#lx\n", hr ); refs = IWbemLocator_Release( locator ); - ok( refs == 0, "unexpected refcount %u\n", refs ); + ok( refs == 0, "unexpected refcount %lu\n", refs ); hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void **)&locator ); - ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + ok( hr == S_OK, "failed to create IWbemLocator interface %#lx\n", hr ); hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); refs = IWbemServices_Release( services ); - ok( refs == 0, "unexpected refcount %u\n", refs ); + ok( refs == 0, "unexpected refcount %lu\n", refs ); hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = IWbemServices_QueryInterface( services, &IID_IClientSecurity, (void **)&security ); - ok( hr == S_OK, "failed to query IClientSecurity interface %08x\n", hr ); + ok( hr == S_OK, "failed to query IClientSecurity interface %#lx\n", hr ); ok( (void *)services != (void *)security, "expected pointers to be different\n" ); refs = IClientSecurity_Release( security ); - ok( refs == 1, "unexpected refcount %u\n", refs ); + ok( refs == 1, "unexpected refcount %lu\n", refs ); refs = IWbemServices_Release( services ); - ok( refs == 0, "unexpected refcount %u\n", refs ); + ok( refs == 0, "unexpected refcount %lu\n", refs ); hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = IWbemServices_QueryInterface( services, &IID_IClientSecurity, (void **)&security ); - ok( hr == S_OK, "failed to query IClientSecurity interface %08x\n", hr ); + ok( hr == S_OK, "failed to query IClientSecurity interface %#lx\n", hr ); ok( (void *)services != (void *)security, "expected pointers to be different\n" ); refs = IWbemServices_Release( services ); - todo_wine ok( refs == 1, "unexpected refcount %u\n", refs ); + todo_wine ok( refs == 1, "unexpected refcount %lu\n", refs ); refs = IClientSecurity_Release( security ); - todo_wine ok( refs == 0, "unexpected refcount %u\n", refs ); + todo_wine ok( refs == 0, "unexpected refcount %lu\n", refs ); IWbemLocator_Release( locator ); SysFreeString( path ); @@ -144,7 +144,7 @@ static void test_IWbemLocator(void) win_skip("can't create instance of WbemLocator\n"); return; } - ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + ok( hr == S_OK, "failed to create IWbemLocator interface %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( test ); i++) { @@ -152,24 +152,22 @@ static void test_IWbemLocator(void) hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); todo_wine_if (test[i].todo) ok( hr == test[i].result || broken(hr == test[i].result_broken), - "%u: expected %08x got %08x\n", i, test[i].result, hr ); + "%u: expected %#lx got %#lx\n", i, test[i].result, hr ); SysFreeString( resource ); if (hr == S_OK) IWbemServices_Release( services ); } hr = CoCreateInstance( &CLSID_WbemContext, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemContext, (void **)&context ); - ok(hr == S_OK, "Failed to create context object, hr %#x.\n", hr); + ok(hr == S_OK, "failed to create context object, hr %#lx\n", hr); EXPECT_REF(context, 1); resource = SysAllocString( L"root\\default" ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, context, &services ); - ok(hr == S_OK, "Failed to connect, hr %#x.\n", hr); + ok(hr == S_OK, "failed to connect, hr %#lx\n", hr); SysFreeString( resource ); EXPECT_REF(context, 1); IWbemServices_Release( services ); - IWbemContext_Release( context ); - IWbemLocator_Release( locator ); } @@ -181,68 +179,68 @@ static void test_IWbemContext(void) BSTR str; hr = CoCreateInstance( &CLSID_WbemContext, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemContext, (void **)&context ); - ok(hr == S_OK, "Failed to create context object, hr %#x.\n", hr); + ok(hr == S_OK, "failed to create context object, hr %#lx\n", hr); hr = IWbemContext_SetValue(context, L"name", 0, NULL); - ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_INVALID_PARAMETER, "unexpected hr %#lx\n", hr); V_VT(&var) = VT_I4; V_I4(&var) = 12; hr = IWbemContext_SetValue(context, NULL, 0, &var); - ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_INVALID_PARAMETER, "unexpected hr %#lx\n", hr); hr = IWbemContext_SetValue(context, L"name", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); hr = IWbemContext_GetValue(context, NULL, 0, &var); - ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_INVALID_PARAMETER, "unexpected hr %#lx\n", hr); hr = IWbemContext_GetValue(context, L"name", 0, NULL); - ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_INVALID_PARAMETER, "unexpected hr %#lx\n", hr); hr = IWbemContext_GetValue(context, L"noname", 0, &var); - ok(hr == WBEM_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_NOT_FOUND, "unexpected hr %#lx\n", hr); V_VT(&var) = VT_EMPTY; hr = IWbemContext_GetValue(context, L"NAME", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(V_VT(&var) == VT_I4, "Unexpected value type.\n"); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); + ok(V_VT(&var) == VT_I4, "unexpected value type\n"); V_VT(&var) = VT_I4; V_I4(&var) = 13; hr = IWbemContext_SetValue(context, L"name2", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); hr = IWbemContext_Next(context, 0, &str, &var); todo_wine - ok(hr == WBEM_E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_UNEXPECTED, "unexpected hr %#lx\n", hr); hr = IWbemContext_BeginEnumeration(context, 0); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); str = NULL; hr = IWbemContext_Next(context, 0, &str, &var); todo_wine { - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!lstrcmpW(str, L"name"), "Unexpected name %s.\n", wine_dbgstr_w(str)); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); + ok(!lstrcmpW(str, L"name"), "unexpected name %s\n", wine_dbgstr_w(str)); SysFreeString(str); } hr = IWbemContext_EndEnumeration(context); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); /* Overwrite */ V_VT(&var) = VT_I4; V_I4(&var) = 14; hr = IWbemContext_SetValue(context, L"name", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); V_VT(&var) = VT_EMPTY; hr = IWbemContext_GetValue(context, L"name", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(V_VT(&var) == VT_I4, "Unexpected value type.\n"); - ok(V_I4(&var) == 14, "Unexpected value.\n"); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); + ok(V_VT(&var) == VT_I4, "unexpected value type\n"); + ok(V_I4(&var) == 14, "unexpected value\n"); IWbemContext_Release( context ); } @@ -277,7 +275,7 @@ static void test_namespaces(void) { resource = SysAllocString( tests[i].path ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK || broken( tests[i].broken && hr == WBEM_E_INVALID_NAMESPACE ), "%u: got %08x\n", i, hr ); + ok( hr == S_OK || broken( tests[i].broken && hr == WBEM_E_INVALID_NAMESPACE ), "%u: got %#lx\n", i, hr ); SysFreeString( resource ); if (hr == S_OK) IWbemServices_Release( services ); -- 2.30.2

1 0

[PATCH 1/4] wbemprox: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 14 Feb '22

14 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/Makefile.in | 1 - dlls/wbemprox/builtin.c | 9 +++---- dlls/wbemprox/class.c | 44 +++++++++++++++++----------------- dlls/wbemprox/process.c | 10 ++++---- dlls/wbemprox/qualifier.c | 16 ++++++------- dlls/wbemprox/query.c | 4 ++-- dlls/wbemprox/reg.c | 4 ++-- dlls/wbemprox/service.c | 2 +- dlls/wbemprox/services.c | 48 ++++++++++++++++++------------------- dlls/wbemprox/table.c | 4 ++-- dlls/wbemprox/wbemlocator.c | 4 ++-- 11 files changed, 73 insertions(+), 73 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..fb6fb654400 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3128,7 +3128,8 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co struct record_printer *rec; enum fill_status status = FILL_STATUS_UNFILTERED; PRINTER_INFO_2W *info; - DWORD i, offset = 0, count = 0, size = 0, num_rows = 0; + DWORD i, offset = 0, count = 0, size = 0; + UINT num_rows = 0; WCHAR id[20]; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); @@ -3656,7 +3657,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 %#lx\n", type ); return NULL; } static const WCHAR *get_service_state( DWORD state ) @@ -3668,7 +3669,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 +3683,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 %#lx\n", mode ); return L"Unknown"; } } diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 6f93c58a0df..37150769816 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, %#lx, %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, %#lx, %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, %#lx, %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 %#lx 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, %#lx\n", iface, lEnumFlags ); - if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); + if (lEnumFlags) FIXME( "flags %#lx 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, %#lx, %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, %#lx, %p\n", iface, lFlags, pstrObjectText ); - if (lFlags) FIXME("flags %08x not implemented\n", lFlags); + if (lFlags) FIXME( "flags %#lx 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, %#lx, %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, %#lx, %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, %#lx, %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, %#lx, %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, %#lx, %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, %#lx\n", iface, lEnumFlags ); - if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); + if (lEnumFlags) FIXME( "flags %#lx 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, %#lx, %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..0fdd9340d16 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, &current_directory, &type, NULL )) || V_VT( &current_directory ) != VT_BSTR) - WARN("Invalid CurrentDirectory, hr %#x, type %u.\n", hr, V_VT( &current_directory )); + WARN("invalid CurrentDirectory, hr %#lx, type %u\n", hr, V_VT( &current_directory )); else TRACE( "CurrentDirectory %s.\n", debugstr_w( V_BSTR( &current_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( &current_directory ) == VT_BSTR ? V_BSTR( &current_directory ) : NULL, NULL, &si, &pi ); - TRACE( "CreateProcessW ret %#x, GetLastError() %u.\n", bret, GetLastError() ); + TRACE( "CreateProcessW ret %d, GetLastError() %lu\n", bret, GetLastError() ); if (bret) { CloseHandle( pi.hThread ); @@ -217,6 +217,6 @@ done: VariantClear( &command_line ); VariantClear( &current_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..826c48e9d93 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, %#lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor ); if (lFlags) { - FIXME("flags %08x not supported\n", lFlags); + FIXME( "flags %#lx 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, %#lx, %p\n", iface, lFlags, pNames ); if (lFlags) { - FIXME("flags %08x not supported\n", lFlags); + FIXME( "flags %#lx 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, %#lx\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, %#lx, %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..d02ae82420c 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..81ed914ae2f 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -564,12 +564,12 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem } static void set_dwordvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, DWORD value, IWbemContext *context, - VARIANT *retval ) + VARIANT *retval ) { 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..a0988d83b54 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..9b9e1f37abd 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -122,8 +122,8 @@ 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, - debugstr_w(princname), AuthnLevel, ImpLevel, pAuthInfo, Capabilities); + FIXME( "%p, %p, %lu, %lu, %s, %lu, %lu, %p, %#lx\n", iface, pProxy, AuthnSvc, AuthzSvc, + debugstr_w(princname), AuthnLevel, ImpLevel, pAuthInfo, Capabilities ); return WBEM_NO_ERROR; } @@ -290,8 +290,8 @@ 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, - pCtx, ppWorkingNamespace, ppResult); + TRACE( "%p, %s, %#lx, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags, + pCtx, ppWorkingNamespace, ppResult ); if (ws->ns != WBEMPROX_NAMESPACE_LAST || !strNamespace) return WBEM_E_INVALID_NAMESPACE; @@ -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, - pCtx, ppObject, ppCallResult); + TRACE( "%p, %s, %#lx, %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 %#lx\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, %#lx, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum ); - if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); + if (lFlags) FIXME( "unsupported flags %#lx\n", lFlags ); hr = parse_path( strClass, &path ); if (hr != S_OK) return hr; @@ -678,8 +678,8 @@ 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), - debugstr_w(strQuery), lFlags, pCtx, ppEnum); + TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQueryLanguage), + debugstr_w(strQuery), lFlags, pCtx, ppEnum ); if (!strQueryLanguage || !strQuery || !strQuery[0]) return WBEM_E_INVALID_PARAMETER; if (wcsicmp( strQueryLanguage, L"WQL" )) return WBEM_E_INVALID_QUERY_TYPE; @@ -724,8 +724,8 @@ 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), - lFlags, pCtx, pResponseHandler); + TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), + lFlags, pCtx, pResponseHandler ); if (!pResponseHandler) return WBEM_E_INVALID_PARAMETER; @@ -794,8 +794,8 @@ 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), - lFlags, pCtx, pResponseHandler); + TRACE( "%p, %s, %s, %#lx, %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), - debugstr_w(strMethodName), lFlags, context, pInParams, ppOutParams, ppCallResult); + TRACE( "%p, %s, %s, %#lx, %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 %#lx 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..005c7678170 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..32408cf6a90 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -165,8 +165,8 @@ 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), - debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), context, ppNamespace); + TRACE( "%p, %s, %s, %s, %s, %#lx, %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 ); if (hr != S_OK) return hr; -- 2.30.2

1 0

[PATCH] ntoskrnl.exe/tests: Fix some memory leaks (Valgrind).
by Sven Baars 14 Feb '22

14 Feb '22

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f53663f17d0..6207ce00ccb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -235,11 +235,15 @@ static void testsign_cleanup(struct testsign_context *ctx) ret = CertDeleteCertificateFromStore(ctx->root_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertFreeCertificateContext(ctx->root_cert); + ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); ret = CertDeleteCertificateFromStore(ctx->publisher_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertFreeCertificateContext(ctx->publisher_cert); + ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); @@ -1360,6 +1364,8 @@ static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) sizeof(L"2:6.0"), (BYTE *)L"2:6.0"); ok(ret, "Failed to write attr, error %u\n", GetLastError()); } + + free(indirect_data); } static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; @@ -1816,6 +1822,8 @@ static void test_pnp_driver(struct testsign_context *ctx) ok(ret, "failed to remove device, error %#x\n", GetLastError()); } + SetupDiDestroyDeviceInfoList(set); + /* Windows stops the service but does not delete it. */ manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); ok(!!manager, "failed to open service manager, error %u\n", GetLastError()); -- 2.30.0.335.ge6362826a0

2 2

[PATCH resend] comctl32/tests: Drop mru test workarounds for Windows <= 2000
by Alex Henrie 14 Feb '22

14 Feb '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/tests/mru.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 87677b33902..6a9a04d9663 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -340,15 +340,11 @@ static void test_MRUListA(void) iRet, GetLastError()); /* Add (NULL string) */ - if (0) - { - /* Some native versions crash when passed NULL or fail to SetLastError() */ SetLastError(0); iRet = pAddMRUStringA(hMRU, NULL); - ok(iRet == 0 && GetLastError() == ERROR_INVALID_PARAMETER, - "AddMRUStringA(NULL str) expected 0,ERROR_INVALID_PARAMETER got %d,%d\n", + todo_wine ok(iRet == 0 && !GetLastError(), + "AddMRUStringA(NULL str) expected 0,0 got %d,%d\n", iRet, GetLastError()); - } /* Add 3 strings. Check the registry is correct after each add */ SetLastError(0); @@ -450,7 +446,7 @@ static void test_MRUListA(void) pFreeMRUList(hMRU); } - /* FreeMRUList(NULL) crashes on Win98 OSR0 */ + pFreeMRUList(NULL); /* should not crash */ } typedef struct { @@ -504,13 +500,9 @@ static void test_EnumMRUList(void) return; } - /* NULL handle */ - if (0) - { - /* crashes on NT4, passed on Win2k, XP, 2k3, Vista, 2k8 */ - pEnumMRUListA(NULL, 0, NULL, 0); - pEnumMRUListW(NULL, 0, NULL, 0); - } + /* NULL handle - should not crash */ + pEnumMRUListA(NULL, 0, NULL, 0); + pEnumMRUListW(NULL, 0, NULL, 0); } static void test_FindMRUData(void) -- 2.35.1

1 0

[PATCH v2 1/4] d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx().
by Zebediah Figura 14 Feb '22

14 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 57 +++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 310e5c0bf17..6ea138e632f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6422,15 +6422,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) - { - effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); - pool->lpVtbl->AddRef(pool); - } - - IDirect3DDevice9_AddRef(device); - effect->device = device; - effect->flags = flags; list_init(&effect->parameter_block_list); @@ -6487,6 +6478,15 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev TRACE("Tag: %x\n", tag); } + if (pool) + { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); + pool->lpVtbl->AddRef(pool); + } + + IDirect3DDevice9_AddRef(device); + effect->device = device; + if (skip_constants_string) { skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, @@ -6495,7 +6495,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev { if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } strcpy(skip_constants_buffer, skip_constants_string); @@ -6504,7 +6505,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev HeapFree(GetProcessHeap(), 0, skip_constants_buffer); if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } } read_dword(&ptr, &offset); @@ -6518,7 +6520,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev FIXME("Failed to parse effect.\n"); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return hr; + goto fail; } for (i = 0; i < skip_constants_count; ++i) @@ -6535,7 +6537,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return D3DERR_INVALIDCALL; + hr = D3DERR_INVALIDCALL; + goto fail; } } } @@ -6557,6 +6560,33 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } return D3D_OK; + +fail: + if (effect->techniques) + { + for (i = 0; i < effect->technique_count; ++i) + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + } + + if (effect->parameters) + { + for (i = 0; i < effect->parameter_count; ++i) + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + } + + if (effect->objects) + { + for (i = 0; i < effect->object_count; ++i) + free_object(&effect->objects[i]); + heap_free(effect->objects); + } + + IDirect3DDevice9_Release(effect->device); + if (pool) + pool->lpVtbl->Release(pool); + return hr; } HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, @@ -6593,7 +6623,6 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object, hr %#x.\n", hr); - d3dx_effect_cleanup(object); return hr; } -- 2.34.1

3 8

[PATCH vkd3d] vkd3d: Lock the heap mutex while binding heap memory.
by Conor McCarthy 14 Feb '22

14 Feb '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 19a163be..dff785da 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1941,11 +1941,17 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, goto allocate_memory; } + /* Syncronisation is not required for binding, but vkMapMemory() may be called + * and it requires exclusive access. */ + pthread_mutex_lock(&heap->mutex); + if (d3d12_resource_is_buffer(resource)) vr = VK_CALL(vkBindBufferMemory(vk_device, resource->u.vk_buffer, heap->vk_memory, heap_offset)); else vr = VK_CALL(vkBindImageMemory(vk_device, resource->u.vk_image, heap->vk_memory, heap_offset)); + pthread_mutex_unlock(&heap->mutex); + if (vr == VK_SUCCESS) { resource->heap = heap; -- 2.34.1

1 0

[PATCH 1/5] kernelbase: Include the null terminator in the length passed to WideCharToMultiByte() in UrlGetPartA().
by Zebediah Figura 13 Feb '22

13 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 4 ++-- dlls/shlwapi/tests/url.c | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 7cfff358fdb..15280a7ea4b 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4148,10 +4148,10 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par return hr; } - len2 = WideCharToMultiByte(CP_ACP, 0, outW, len, NULL, 0, NULL, NULL); + len2 = WideCharToMultiByte(CP_ACP, 0, outW, len + 1, NULL, 0, NULL, NULL); if (len2 > *out_len) { - *out_len = len2 + 1; + *out_len = len2; heap_free(inW); return E_POINTER; } diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 212ee039a0b..b4b66aec2f1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -782,7 +782,7 @@ static void test_UrlGetPart(void) size = 1; strcpy(buffer, "x"); hr = UrlGetPartA(url, buffer, &size, part, flags); - todo_wine_if (tests[i].todo_hr || !strcmp(url, "http://host?a:b@c:d")) + todo_wine_if (tests[i].todo_hr) { if (tests[i].hr == S_OK) ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -807,11 +807,9 @@ static void test_UrlGetPart(void) } else { - todo_wine_if (hr == S_OK) - ok(size == 1, "Got size %u.\n", size); + ok(size == 1, "Got size %u.\n", size); } - todo_wine_if (hr == S_OK) - ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); } size = sizeof(buffer); -- 2.34.1

1 4

Wine staging 7.2 release
by Alistair Leslie-Hughes 13 Feb '22

13 Feb '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.2 (567 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * d3dx9_*: Add D3DXSHProjectCubeMap stub Added: * [47331] Stop Steam browser flickering. Updated: * xactengine3_7-callbacks * winepulse-PulseAudio_Support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/4] d3dx9: Return D3DERR_INVALIDCALL from ID3DXEffect::BeginPass() if the effect is not started.
by Zebediah Figura 12 Feb '22

12 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 6 ++++++ dlls/d3dx9_36/tests/effect.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 22afa649db3..e623c10035a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4001,6 +4001,12 @@ static HRESULT WINAPI d3dx_effect_BeginPass(ID3DXEffect *iface, UINT pass) TRACE("iface %p, pass %u\n", effect, pass); + if (!effect->started) + { + WARN("Effect is not started, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + if (technique && pass < technique->pass_count && !effect->active_pass) { HRESULT hr; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ea90299f936..d4efc1101d9 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3081,6 +3081,12 @@ static void test_effect_states(IDirect3DDevice9 *device) NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + /* State affected in passes saved/restored even if no pass was performed. States not present in passes are not saved & restored */ -- 2.34.1

3 10

[PATCH] oleaut32: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 12 Feb '22

12 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/Makefile.in | 2 +- dlls/oleaut32/connpt.c | 120 +++-------------- dlls/oleaut32/dispatch.c | 13 +- dlls/oleaut32/hash.c | 4 +- dlls/oleaut32/oleaut.c | 10 +- dlls/oleaut32/olefont.c | 53 +++----- dlls/oleaut32/olepicture.c | 79 ++++------- dlls/oleaut32/olepropframe.c | 10 +- dlls/oleaut32/recinfo.c | 23 ++-- dlls/oleaut32/safearray.c | 20 +-- dlls/oleaut32/typelib.c | 254 +++++++++++++++-------------------- dlls/oleaut32/usrmarshal.c | 97 ++++++------- dlls/oleaut32/varformat.c | 36 ++--- dlls/oleaut32/variant.c | 40 +++--- dlls/oleaut32/vartype.c | 24 ++-- 15 files changed, 312 insertions(+), 473 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index d9e7c7df332..a7dea7a37c7 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -2,7 +2,7 @@ MODULE = oleaut32.dll IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_OLEAUT32_ +EXTRADEFS = -D_OLEAUT32_ C_SRCS = \ connpt.c \ diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index 0405d3857c8..993f2d9cf08 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -101,9 +101,6 @@ static inline EnumConnectionsImpl *impl_from_IEnumConnections(IEnumConnections * return CONTAINING_RECORD(iface, EnumConnectionsImpl, IEnumConnections_iface); } -/************************************************************************ - * ConnectionPointImpl_Destroy - */ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj) { DWORD i; @@ -118,11 +115,6 @@ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj) return; } -/************************************************************************ - * ConnectionPointImpl_QueryInterface (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( IConnectionPoint* iface, REFIID riid, @@ -160,47 +152,29 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( return S_OK; } - -/************************************************************************ - * ConnectionPointImpl_AddRef (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface) { ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); + TRACE("%p, refcount %lu.\n", iface, refCount); return refCount; } -/************************************************************************ - * ConnectionPointImpl_Release (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI ConnectionPointImpl_Release( IConnectionPoint* iface) { ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); + TRACE("%p, refcount %lu.\n", iface, refCount); - /* - * If the reference count goes down to 0, perform suicide. - */ if (!refCount) ConnectionPointImpl_Destroy(This); return refCount; } -/************************************************************************ - * ConnectionPointImpl_GetConnectionInterface (IConnectionPoint) - * - */ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface( IConnectionPoint *iface, IID *piid) @@ -211,10 +185,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface( return S_OK; } -/************************************************************************ - * ConnectionPointImpl_GetConnectionPointContainer (IConnectionPoint) - * - */ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( IConnectionPoint *iface, IConnectionPointContainer **ppCPC) @@ -225,10 +195,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( return IUnknown_QueryInterface(This->Obj, &IID_IConnectionPointContainer, (void**)ppCPC); } -/************************************************************************ - * ConnectionPointImpl_Advise (IConnectionPoint) - * - */ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, IUnknown *lpUnk, DWORD *pdwCookie) @@ -258,15 +224,11 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, } -/************************************************************************ - * ConnectionPointImpl_Unadvise (IConnectionPoint) - * - */ -static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, - DWORD dwCookie) +static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); - TRACE("(%p)->(%d)\n", This, dwCookie); + + TRACE("%p, %#lx.\n", iface, dwCookie); if(dwCookie == 0 || dwCookie > This->maxSinks) return E_INVALIDARG; @@ -278,13 +240,7 @@ static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, return S_OK; } -/************************************************************************ - * ConnectionPointImpl_EnumConnections (IConnectionPoint) - * - */ -static HRESULT WINAPI ConnectionPointImpl_EnumConnections( - IConnectionPoint *iface, - LPENUMCONNECTIONS *ppEnum) +static HRESULT WINAPI ConnectionPointImpl_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum) { ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); CONNECTDATA *pCD; @@ -337,9 +293,6 @@ static const IConnectionPointVtbl ConnectionPointImpl_VTable = static const IEnumConnectionsVtbl EnumConnectionsImpl_VTable; -/************************************************************************ - * EnumConnectionsImpl_Construct - */ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, DWORD nSinks, CONNECTDATA *pCD) @@ -361,9 +314,6 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, return Obj; } -/************************************************************************ - * EnumConnectionsImpl_Destroy - */ static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj) { DWORD i; @@ -376,11 +326,6 @@ static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj) return; } -/************************************************************************ - * EnumConnectionsImpl_QueryInterface (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( IEnumConnections* iface, REFIID riid, @@ -417,56 +362,37 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( return S_OK; } - -/************************************************************************ - * EnumConnectionsImpl_AddRef (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); + TRACE("%p, refcount %lu.\n", iface, refCount); IUnknown_AddRef(This->pUnk); return refCount; } -/************************************************************************ - * EnumConnectionsImpl_Release (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); + TRACE("%p, refcount %lu.\n", iface, refCount); IUnknown_Release(This->pUnk); - /* - * If the reference count goes down to 0, perform suicide. - */ if (!refCount) EnumConnectionsImpl_Destroy(This); return refCount; } -/************************************************************************ - * EnumConnectionsImpl_Next (IEnumConnections) - * - */ -static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, - ULONG cConn, LPCONNECTDATA pCD, - ULONG *pEnum) +static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, ULONG cConn, LPCONNECTDATA pCD, ULONG *pEnum) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); DWORD nRet = 0; - TRACE("(%p)->(%d, %p, %p)\n", This, cConn, pCD, pEnum); + + TRACE("%p, %lu, %p, %p.\n", iface, cConn, pCD, pEnum); if(pEnum == NULL) { if(cConn != 1) @@ -491,16 +417,11 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, return S_OK; } - -/************************************************************************ - * EnumConnectionsImpl_Skip (IEnumConnections) - * - */ -static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, - ULONG cSkip) +static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, ULONG cSkip) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); - TRACE("(%p)->(%d)\n", This, cSkip); + + TRACE("%p, %lu.\n", iface, cSkip); if(This->nCur + cSkip >= This->nConns) return S_FALSE; @@ -510,11 +431,6 @@ static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, return S_OK; } - -/************************************************************************ - * EnumConnectionsImpl_Reset (IEnumConnections) - * - */ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); @@ -525,13 +441,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) return S_OK; } - -/************************************************************************ - * EnumConnectionsImpl_Clone (IEnumConnections) - * - */ -static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface, - LPENUMCONNECTIONS *ppEnum) +static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface, IEnumConnections **ppEnum) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *newObj; diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 39d6fddee51..7fa96e5af83 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -248,7 +248,7 @@ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface) StdDispatch *This = impl_from_IDispatch(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); + TRACE("%p, refcount %lu.\n", iface, refCount); return refCount; } @@ -263,7 +263,7 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) StdDispatch *This = impl_from_IDispatch(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("%p, refcount %lu.\n", iface, refCount); if (!refCount) { @@ -319,7 +319,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pcti static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) { StdDispatch *This = impl_from_IDispatch(iface); - TRACE("(%d, %x, %p)\n", iTInfo, lcid, ppTInfo); + + TRACE("%d, %#lx, %p.\n", iTInfo, lcid, ppTInfo); *ppTInfo = NULL; if (iTInfo != 0) @@ -360,7 +361,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI static HRESULT WINAPI StdDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { StdDispatch *This = impl_from_IDispatch(iface); - TRACE("(%s, %p, %d, 0x%x, %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + TRACE("%s, %p, %d, %#lx, %p.\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); if (!IsEqualGUID(riid, &IID_NULL)) { @@ -398,7 +400,8 @@ static HRESULT WINAPI StdDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember, EXCEPINFO * pExcepInfo, UINT * puArgErr) { StdDispatch *This = impl_from_IDispatch(iface); - TRACE("(%d, %s, 0x%x, 0x%x, %p, %p, %p, %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + TRACE("%ld, %s, %#lx, 0x%x, %p, %p, %p, %p.\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); if (!IsEqualGUID(riid, &IID_NULL)) { diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c index 43043980adb..f1df69ef5e3 100644 --- a/dlls/oleaut32/hash.c +++ b/dlls/oleaut32/hash.c @@ -509,7 +509,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) ULONG nHiWord, nLoWord = 0x0deadbee; const unsigned char *str = (const unsigned char *)lpStr, *pnLookup = NULL; - TRACE("(%d, 0x%x, %s) %s\n", skind, lcid, debugstr_a(lpStr), + TRACE("%d, %#lx, %s, %s.\n", skind, lcid, debugstr_a(lpStr), (skind == SYS_WIN16) ? "SYS_WIN16" : (skind == SYS_WIN32) ? "SYS_WIN32" : ""); if (!str) @@ -520,7 +520,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { default: - ERR("Unknown lcid %x, treating as latin-based, please report\n", lcid); + ERR("Unknown lcid %lx, treating as latin-based, please report\n", lcid); /* .. Fall Through .. */ case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN: case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE: diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index c29e64a4091..858622c833c 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -691,7 +691,7 @@ HRESULT WINAPI OleTranslateColor( COLORREF colorref; BYTE b = HIBYTE(HIWORD(clr)); - TRACE("(%08x, %p, %p)\n", clr, hpal, pColorRef); + TRACE("%#lx, %p, %p.\n", clr, hpal, pColorRef); /* * In case pColorRef is NULL, provide our own to simplify the code. @@ -814,7 +814,7 @@ static BOOL actctx_get_typelib_module(REFIID iid, WCHAR *module, DWORD len) if (tlib->name_len/sizeof(WCHAR) >= len) { - ERR("need larger module buffer, %u\n", tlib->name_len); + ERR("need larger module buffer, %lu.\n", tlib->name_len); return FALSE; } @@ -979,7 +979,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateProxy(IPSFactoryBuffer *iface, hr = dispatch_create_proxy(outer, proxy, out); if (FAILED(hr)) - ERR("Failed to create proxy, hr %#x.\n", hr); + ERR("Failed to create proxy, hr %#lx.\n", hr); ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); @@ -1025,7 +1025,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface, hr = dispatch_create_stub(server, stub); if (FAILED(hr)) - ERR("Failed to create proxy, hr %#x.\n", hr); + ERR("Failed to create proxy, hr %#lx.\n", hr); ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); @@ -1173,7 +1173,7 @@ HRESULT WINAPI GetAltMonthNames(LCID lcid, LPOLESTR **str) NULL }; - TRACE("%#x, %p\n", lcid, str); + TRACE("%#lx, %p.\n", lcid, str); if (PRIMARYLANGID(LANGIDFROMLCID(lcid)) == LANG_ARABIC) *str = (LPOLESTR *)arabic_hijri; diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index f071d00c602..28cfcdf933c 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -489,28 +489,20 @@ static HRESULT WINAPI OLEFontImpl_QueryInterface( return S_OK; } -/************************************************************************ - * OLEFontImpl_AddRef (IUnknown) - */ -static ULONG WINAPI OLEFontImpl_AddRef( - IFont* iface) +static ULONG WINAPI OLEFontImpl_AddRef(IFont* iface) { OLEFontImpl *this = impl_from_IFont(iface); - TRACE("(%p)->(ref=%d)\n", this, this->ref); - return InterlockedIncrement(&this->ref); + ULONG ref = InterlockedIncrement(&this->ref); + TRACE("%p, refcount %lu.\n", iface, ref); + return ref; } -/************************************************************************ - * OLEFontImpl_Release (IUnknown) - */ static ULONG WINAPI OLEFontImpl_Release(IFont* iface) { OLEFontImpl *this = impl_from_IFont(iface); - ULONG ref; + ULONG ref = InterlockedDecrement(&this->ref); - TRACE("(%p)->(ref=%d)\n", this, this->ref); - - ref = InterlockedDecrement(&this->ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (ref == 0) { @@ -712,15 +704,10 @@ static HRESULT WINAPI OLEFontImpl_get_Size( return S_OK; } -/************************************************************************ - * OLEFontImpl_put_Size (IFont) - */ -static HRESULT WINAPI OLEFontImpl_put_Size( - IFont* iface, - CY size) +static HRESULT WINAPI OLEFontImpl_put_Size(IFont *iface, CY size) { OLEFontImpl *this = impl_from_IFont(iface); - TRACE("(%p)->(%d)\n", this, size.s.Lo); + TRACE("%p, %ld.\n", iface, size.s.Lo); this->description.cySize.s.Hi = 0; this->description.cySize.s.Lo = size.s.Lo; OLEFont_SendNotify(this, DISPID_FONT_SIZE); @@ -728,14 +715,7 @@ static HRESULT WINAPI OLEFontImpl_put_Size( return S_OK; } -/************************************************************************ - * OLEFontImpl_get_Bold (IFont) - * - * See Windows documentation for more details on IFont methods. - */ -static HRESULT WINAPI OLEFontImpl_get_Bold( - IFont* iface, - BOOL* pbold) +static HRESULT WINAPI OLEFontImpl_get_Bold(IFont *iface, BOOL *pbold) { OLEFontImpl *this = impl_from_IFont(iface); TRACE("(%p)->(%p)\n", this, pbold); @@ -1063,7 +1043,8 @@ static HRESULT WINAPI OLEFontImpl_SetRatio( LONG cyHimetric) { OLEFontImpl *this = impl_from_IFont(iface); - TRACE("(%p)->(%d, %d)\n", this, cyLogical, cyHimetric); + + TRACE("%p, %ld, %ld.\n", iface, cyLogical, cyHimetric); if(cyLogical == 0 || cyHimetric == 0) return E_FAIL; @@ -1243,9 +1224,9 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo( } hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IFontDisp, ppTInfo); ITypeLib_Release(tl); - if (FAILED(hres)) { - FIXME("Did not IDispatch typeinfo from typelib, hres %x\n",hres); - } + if (FAILED(hres)) + FIXME("Did not IDispatch typeinfo from typelib, hres %#lx.\n", hres); + return hres; } @@ -1302,7 +1283,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( OLEFontImpl *this = impl_from_IDispatch(iface); HRESULT hr; - TRACE("%p->(%d,%s,0x%x,0x%x,%p,%p,%p,%p)\n", this, dispIdMember, + TRACE("%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); @@ -1499,7 +1480,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( } break; default: - ERR("member not found for dispid 0x%x\n", dispIdMember); + ERR("member not found for dispid %#lx.\n", dispIdMember); return DISP_E_MEMBERNOTFOUND; } } @@ -2006,7 +1987,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (FAILED(iRes)) - WARN("-- 0x%08x\n", iRes); + WARN("-- %#lx.\n", iRes); return iRes; } diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5dac8e4ee61..2f9e27042d9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -401,49 +401,30 @@ static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj) HeapFree(GetProcessHeap(), 0, Obj); } - -/************************************************************************ - * OLEPictureImpl_AddRef (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI OLEPictureImpl_AddRef( IPicture* iface) { OLEPictureImpl *This = impl_from_IPicture(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); + TRACE("%p, refcount %lu.\n", iface, refCount); return refCount; } -/************************************************************************ - * OLEPictureImpl_Release (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI OLEPictureImpl_Release( IPicture* iface) { OLEPictureImpl *This = impl_from_IPicture(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); + TRACE("%p, refcount %lu.\n", iface, refCount); - /* - * If the reference count goes down to 0, perform suicide. - */ if (!refCount) OLEPictureImpl_Destroy(This); return refCount; } -/************************************************************************ - * OLEPictureImpl_QueryInterface (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static HRESULT WINAPI OLEPictureImpl_QueryInterface( IPicture* iface, REFIID riid, @@ -578,26 +559,18 @@ static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface, return S_OK; } -/************************************************************************ - * OLEPictureImpl_get_Width - */ -static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface, - OLE_XSIZE_HIMETRIC *pwidth) +static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface, OLE_XSIZE_HIMETRIC *pwidth) { OLEPictureImpl *This = impl_from_IPicture(iface); - TRACE("(%p)->(%p): width is %d\n", This, pwidth, This->himetricWidth); + TRACE("%p, %p.\n", iface, pwidth); *pwidth = This->himetricWidth; return S_OK; } -/************************************************************************ - * OLEPictureImpl_get_Height - */ -static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, - OLE_YSIZE_HIMETRIC *pheight) +static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, OLE_YSIZE_HIMETRIC *pheight) { OLEPictureImpl *This = impl_from_IPicture(iface); - TRACE("(%p)->(%p): height is %d\n", This, pheight, This->himetricHeight); + TRACE("%p, %p.\n", iface, pheight); *pheight = This->himetricHeight; return S_OK; } @@ -656,8 +629,8 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, LPCRECT prcWBounds) { OLEPictureImpl *This = impl_from_IPicture(iface); - TRACE("(%p)->(%p, (%d,%d), (%d,%d) <- (%d,%d), (%d,%d), %p)\n", - This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds); + TRACE("%p, %p, (%ld,%ld), (%ld,%ld), (%ld,%ld), (%ld,%ld), %p)\n", iface, hdc, x, y, cx, cy, xSrc, ySrc, + cxSrc, cySrc, prcWBounds); if(prcWBounds) TRACE("prcWBounds %s\n", wine_dbgstr_rect(prcWBounds)); @@ -1225,7 +1198,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x HDC hdcRef; int i; - TRACE("(this %p, xbuf %p, xread %u)\n", This, xbuf, xread); + TRACE("(this %p, xbuf %p, xread %lu)\n", This, xbuf, xread); /* FIXME("icon.idReserved=%d\n",cifd->idReserved); @@ -1263,7 +1236,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x } if (xread < cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize) { - ERR("Icon data address %u is over %u bytes available.\n", + ERR("Icon data address %lu is over %lu bytes available.\n", cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize, xread); return E_FAIL; } @@ -1402,7 +1375,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) */ hr = IStream_Stat(pStm,&statstg,STATFLAG_NONAME); if (hr != S_OK) { - TRACE("stat failed with hres %x, proceeding to read all data.\n",hr); + TRACE("stat failed with hres %#lx, proceeding to read all data.\n",hr); statfailed = TRUE; /* we will read at least 8 byte ... just right below */ statstg.cbSize.QuadPart = 8; @@ -1414,7 +1387,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) do { hr = IStream_Read(pStm, header, 8, &xread); if (hr != S_OK || xread!=8) { - ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); + ERR("Failure while reading picture header (hr is %#lx, nread is %ld).\n",hr,xread); return (hr?hr:E_FAIL); } headerread += xread; @@ -1422,7 +1395,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) { if (toread != 0 && toread != header[1]) - FIXME("varying lengths of image data (prev=%u curr=%u), only last one will be used\n", + FIXME("varying lengths of image data (prev=%lu curr=%lu), only last one will be used\n", toread, header[1]); toread = header[1]; if (statfailed) @@ -1447,7 +1420,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) else toread -= 8; xread = 8; } else { - FIXME("Unknown stream header magic: %08x\n", header[0]); + FIXME("Unknown stream header magic: %#lx.\n", header[0]); toread = header[1]; } } @@ -1478,8 +1451,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) } } if (hr != S_OK) - TRACE("hr in no-stat loader case is %08x\n", hr); - TRACE("loaded %d bytes.\n", xread); + TRACE("hr in no-stat loader case is %#lx.\n", hr); + TRACE("loaded %ld bytes.\n", xread); This->datalen = xread; This->data = xbuf; } else { @@ -1499,7 +1472,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) break; } if (xread != This->datalen) - ERR("Could only read %d of %d bytes out of stream?\n",xread,This->datalen); + ERR("Could only read %ld of %d bytes out of stream?\n", xread, This->datalen); } if (This->datalen == 0) { /* Marks the "NONE" picture */ This->desc.picType = PICTYPE_NONE; @@ -1542,7 +1515,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) hr = OLEPictureImpl_LoadEnhMetafile(This, xbuf, xread); if (hr == S_OK) break; - FIXME("Unknown magic %04x, %d read bytes:\n",magic,xread); + FIXME("Unknown magic %04x, %ld read bytes:\n", magic, xread); hr=E_FAIL; for (i=0;i<xread+8;i++) { if (i<8) MESSAGE("%02x ",((unsigned char*)header)[i]); @@ -1771,8 +1744,7 @@ static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) if (infoIcon.hbmColor) DeleteObject(infoIcon.hbmColor); HeapFree(GetProcessHeap(), 0, pInfoBitmap); } else { - printf("ERROR: Unable to get icon information (error %u)\n", - GetLastError()); + ERR("Unable to get icon information (error %lu)\n", GetLastError()); } return success; } @@ -1964,7 +1936,7 @@ static HRESULT WINAPI OLEPictureImpl_GetTypeInfo( hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IPictureDisp, ppTInfo); if (FAILED(hres)) - ERR("Did not get IPictureDisp typeinfo from typelib, hres %x\n", hres); + ERR("Did not get IPictureDisp typeinfo from typelib, hres %#lx.\n", hres); return hres; } @@ -2160,7 +2132,7 @@ static HRESULT WINAPI OLEPictureImpl_Invoke( break; } - ERR("invalid dispid 0x%x or wFlags 0x%x\n", dispIdMember, wFlags); + ERR("invalid dispid %#lx or wFlags 0x%x\n", dispIdMember, wFlags); return DISP_E_MEMBERNOTFOUND; } @@ -2259,7 +2231,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, IPicture *newpic; HRESULT hr; - TRACE("(%p,%d,%d,%s,%p), partially implemented.\n", + TRACE("%p, %ld, %d, %s, %p), partially implemented.\n", lpstream, lSize, fRunmode, debugstr_guid(riid), ppvObj); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); @@ -2298,7 +2270,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, IPicture *newpic; HRESULT hr; - FIXME("(%p,%d,%d,%s,x=%d,y=%d,f=%x,%p), partially implemented.\n", + FIXME("%p, %ld, %d, %s, %lu, %lu, %#lx, %p, partially implemented.\n", lpstream, lSize, fRunmode, debugstr_guid(riid), xsiz, ysiz, flags, ppvObj); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); @@ -2365,9 +2337,8 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, WCHAR *file_candidate; WCHAR path_buf[MAX_PATH]; - TRACE("(%s,%p,%d,%08x,%s,%p): stub\n", - debugstr_w(szURLorPath), punkCaller, dwReserved, clrReserved, - debugstr_guid(riid), ppvRet); + TRACE("%s, %p, %ld, %#lx, %s, %p.\n", debugstr_w(szURLorPath), punkCaller, dwReserved, + clrReserved, debugstr_guid(riid), ppvRet); if (!szURLorPath || !ppvRet) return E_INVALIDARG; diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index a351d73d468..6ffd8f3d3e4 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -93,7 +93,7 @@ static ULONG WINAPI PropertyPageSite_AddRef(IPropertyPageSite* iface) PropertyPageSite *this = impl_from_IPropertyPageSite(iface); LONG ref = InterlockedIncrement(&this->ref); - TRACE("(%p) ref=%d\n", this, ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -102,7 +102,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface) PropertyPageSite *this = impl_from_IPropertyPageSite(iface); LONG ref = InterlockedDecrement(&this->ref); - TRACE("(%p) ref=%d\n", this, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if(!ref) HeapFree(GetProcessHeap(), 0, this); return ref; @@ -111,7 +111,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface) static HRESULT WINAPI PropertyPageSite_OnStatusChange( IPropertyPageSite *iface, DWORD dwFlags) { - TRACE("(%p, %x)\n", iface, dwFlags); + TRACE("%p, %lx.\n", iface, dwFlags); return S_OK; } @@ -178,7 +178,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) if(!lpParams) return E_POINTER; - TRACE("(%d %p %d %d %s %d %p %d %p %d %d)\n", lpParams->cbStructSize, + TRACE("%ld, %p, %d, %d, %s, %ld, %p, %ld, %p, %ld, %ld.\n", lpParams->cbStructSize, lpParams->hWndOwner, lpParams->x, lpParams->y, debugstr_w(lpParams->lpszCaption), lpParams->cObjects, lpParams->lplpUnk, lpParams->cPages, lpParams->lpPages, @@ -286,7 +286,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) res = IPropertyPage_SetObjects(property_page[i], lpParams->cObjects, lpParams->lplpUnk); if(FAILED(res)) - WARN("SetObjects() failed, hr %#x.\n", res); + WARN("SetObjects() failed, hr %#lx.\n", res); res = IPropertyPage_GetPageInfo(property_page[i], &page_info); if(FAILED(res)) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 44d46595e85..7d46d6c4299 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -163,7 +163,7 @@ static ULONG WINAPI IRecordInfoImpl_AddRef(IRecordInfo *iface) { IRecordInfoImpl *This = impl_from_IRecordInfo(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) -> %d\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -172,7 +172,7 @@ static ULONG WINAPI IRecordInfoImpl_Release(IRecordInfo *iface) IRecordInfoImpl *This = impl_from_IRecordInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) -> %d\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if(!ref) { int i; @@ -441,8 +441,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutField(IRecordInfo *iface, ULONG wFlags, IRecordInfoImpl *This = impl_from_IRecordInfo(iface); int i; - TRACE("(%p)->(%08x %p %s %p)\n", This, wFlags, pvData, debugstr_w(szFieldName), - pvarField); + TRACE("%p, %#lx, %p, %s, %p.\n", iface, wFlags, pvData, debugstr_w(szFieldName), pvarField); if(!pvData || !szFieldName || !pvarField || (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT)) @@ -469,7 +468,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutFieldNoCopy(IRecordInfo *iface, ULONG w IRecordInfoImpl *This = impl_from_IRecordInfo(iface); int i; - FIXME("(%p)->(%08x %p %s %p) stub\n", This, wFlags, pvData, debugstr_w(szFieldName), pvarField); + FIXME("%p, %#lx, %p, %s, %p stub\n", iface, wFlags, pvData, debugstr_w(szFieldName), pvarField); if(!pvData || !szFieldName || !pvarField || (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT)) @@ -597,8 +596,8 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID rGuidTypeLib, ULONG uVerMajor, ITypeInfo *pTypeInfo; ITypeLib *pTypeLib; HRESULT hres; - - TRACE("(%p,%d,%d,%d,%s,%p)\n", rGuidTypeLib, uVerMajor, uVerMinor, + + TRACE("%p, %lu, %lu, %#lx, %s, %p.\n", rGuidTypeLib, uVerMajor, uVerMinor, lcid, debugstr_guid(rGuidTypeInfo), ppRecInfo); hres = LoadRegTypeLib(rGuidTypeLib, uVerMajor, uVerMinor, lcid, &pTypeLib); @@ -637,7 +636,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo hres = ITypeInfo_GetTypeAttr(pTI, &typeattr); if(FAILED(hres) || !typeattr) { - WARN("GetTypeAttr failed: %08x\n", hres); + WARN("GetTypeAttr failed: %#lx.\n", hres); return hres; } @@ -646,13 +645,13 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo guid = typeattr->guid; ITypeInfo_ReleaseTypeAttr(pTI, typeattr); if(FAILED(hres)) { - WARN("GetRefTypeInfo failed: %08x\n", hres); + WARN("GetRefTypeInfo failed: %#lx.\n", hres); return hres; } hres = ITypeInfo_GetTypeAttr(pTypeInfo, &typeattr); if(FAILED(hres)) { ITypeInfo_Release(pTypeInfo); - WARN("GetTypeAttr failed for referenced type: %08x\n", hres); + WARN("GetTypeAttr failed for referenced type: %#lx.\n", hres); return hres; } }else { @@ -702,8 +701,8 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo hres = ITypeInfo_GetDocumentation(pTypeInfo, vardesc->memid, &ret->fields[i].name, NULL, NULL, NULL); if(FAILED(hres)) - WARN("GetDocumentation failed: %08x\n", hres); - TRACE("field=%s, offset=%d\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset); + WARN("GetDocumentation failed: %#lx.\n", hres); + TRACE("field=%s, offset=%ld\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset); ITypeInfo_ReleaseVarDesc(pTypeInfo, vardesc); } diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 0b769358f65..92d55752e8a 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -287,7 +287,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell) ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); if (ulStartCell > ulCellCount) { - FIXME("unexpected ulCellCount %d, start %d\n",ulCellCount,ulStartCell); + FIXME("unexpected ulCellCount %ld, start %ld\n", ulCellCount, ulStartCell); return E_UNEXPECTED; } @@ -372,7 +372,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) /* destination is cleared automatically */ hRet = VariantCopy(dest_var, src_var); - if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%08x, element %u\n", hRet, ulCellCount); + if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx, element %lu.\n", hRet, ulCellCount); src_var++; dest_var++; } @@ -495,7 +495,7 @@ HRESULT WINAPI SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut) (*ppsaOut)->cDims = cDims; - TRACE("(%d): %u bytes allocated for descriptor.\n", cDims, allocSize); + TRACE("%d: %lu bytes allocated for descriptor.\n", cDims, allocSize); return S_OK; } @@ -569,7 +569,7 @@ HRESULT WINAPI SafeArrayAllocData(SAFEARRAY *psa) if (psa->pvData) { hRet = S_OK; - TRACE("%u bytes allocated for data at %p (%u objects).\n", + TRACE("%lu bytes allocated for data at %p (%lu objects).\n", ulSize * psa->cbElements, psa->pvData, ulSize); } else @@ -676,7 +676,7 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsa */ SAFEARRAY* WINAPI SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements) { - TRACE("(%s,%d,%u)\n", debugstr_vt(vt), lLbound, cElements); + TRACE("%s, %ld, %lu.\n", debugstr_vt(vt), lLbound, cElements); if (vt == VT_RECORD) return NULL; @@ -708,7 +708,7 @@ SAFEARRAY* WINAPI SafeArrayCreateVectorEx(VARTYPE vt, LONG lLbound, ULONG cEleme IRecordInfo* iRecInfo = pvExtra; SAFEARRAY* psa; - TRACE("(%s,%d,%u,%p)\n", debugstr_vt(vt), lLbound, cElements, pvExtra); + TRACE("%s, %ld, %lu, %p.\n", debugstr_vt(vt), lLbound, cElements, pvExtra); if (vt == VT_RECORD) { @@ -886,7 +886,7 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData VARIANT* lpDest = lpvDest; hRet = VariantCopy(lpDest, lpVariant); - if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet); + if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx.\n", hRet); } else if (psa->fFeatures & FADF_BSTR) { @@ -971,7 +971,7 @@ HRESULT WINAPI SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData /* The original content of pvData is ignored. */ V_VT(lpDest) = VT_EMPTY; hRet = VariantCopy(lpDest, lpVariant); - if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet); + if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx.\n", hRet); } else if (psa->fFeatures & FADF_BSTR) { @@ -1113,8 +1113,8 @@ UINT WINAPI SafeArrayGetDim(SAFEARRAY *psa) */ UINT WINAPI SafeArrayGetElemsize(SAFEARRAY *psa) { - TRACE("(%p) returning %d\n", psa, psa ? psa->cbElements : 0u); - return psa ? psa->cbElements : 0; + TRACE("%p, returning %ld.\n", psa, psa ? psa->cbElements : 0u); + return psa ? psa->cbElements : 0; } /************************************************************************* diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2a453a1f0e0..cdc48e9c7fe 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -297,7 +297,7 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, WCHAR Path[MAX_PATH]; LONG res; - TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path); + TRACE_(typelib)("%s, %x.%x, %#lx, %p\n", debugstr_guid(guid), wMaj, wMin, lcid, path); if (redir) { @@ -370,7 +370,7 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, } } RegCloseKey( hkey ); - TRACE_(typelib)("-- 0x%08x\n", hr); + TRACE_(typelib)("-- %#lx\n", hr); return hr; } @@ -486,7 +486,7 @@ HRESULT WINAPI LoadTypeLibEx( break; } - TRACE(" returns %08x\n",res); + TRACE(" returns %#lx\n",res); return res; } @@ -1018,7 +1018,7 @@ HRESULT WINAPI UnRegisterTypeLibForUser( LCID lcid, /* [in] locale id */ SYSKIND syskind) { - FIXME("(%s, %u, %u, %u, %u) unregistering the typelib system-wide\n", + FIXME("%s, %u, %u, %#lx, %u unregistering the typelib system-wide\n", debugstr_guid(libid), wVerMajor, wVerMinor, lcid, syskind); return UnRegisterTypeLib(libid, wVerMajor, wVerMinor, lcid, syskind); } @@ -1352,8 +1352,7 @@ static void dump_TypeDesc(const TYPEDESC *pTD,char *szVarType) { case VT_VARIANT: sprintf(szVarType, "VT_VARIANT"); break; case VT_VOID: sprintf(szVarType, "VT_VOID"); break; case VT_HRESULT: sprintf(szVarType, "VT_HRESULT"); break; - case VT_USERDEFINED: sprintf(szVarType, "VT_USERDEFINED ref = %x", - pTD->u.hreftype); break; + case VT_USERDEFINED: sprintf(szVarType, "VT_USERDEFINED ref = %lx", pTD->u.hreftype); break; case VT_LPSTR: sprintf(szVarType, "VT_LPSTR"); break; case VT_LPWSTR: sprintf(szVarType, "VT_LPWSTR"); break; case VT_PTR: sprintf(szVarType, "ptr to "); @@ -1389,7 +1388,7 @@ static void dump_ELEMDESC(const ELEMDESC *edesc) { } static void dump_FUNCDESC(const FUNCDESC *funcdesc) { int i; - MESSAGE("memid is %08x\n",funcdesc->memid); + MESSAGE("memid is %#lx\n", funcdesc->memid); for (i=0;i<funcdesc->cParams;i++) { MESSAGE("Param %d:\n",i); dump_ELEMDESC(funcdesc->lprgelemdescParam+i); @@ -1482,8 +1481,7 @@ static void dump_TLBImpLib(const TLBImpLib *import) { TRACE_(typelib)("%s %s\n", debugstr_guid(TLB_get_guidref(import->guid)), debugstr_w(import->name)); - TRACE_(typelib)("v%d.%d lcid=%x offset=%x\n", import->wVersionMajor, - import->wVersionMinor, import->lcid, import->offset); + TRACE_(typelib)("v%d.%d lcid %#lx offset=%x\n", import->wVersionMajor, import->wVersionMinor, import->lcid, import->offset); } static void dump_TLBRefType(const ITypeLibImpl *pTL) @@ -1492,7 +1490,7 @@ static void dump_TLBRefType(const ITypeLibImpl *pTL) LIST_FOR_EACH_ENTRY(ref, &pTL->ref_list, TLBRefType, entry) { - TRACE_(typelib)("href:0x%08x\n", ref->reference); + TRACE_(typelib)("href:%#lx\n", ref->reference); if(ref->index == -1) TRACE_(typelib)("%s\n", debugstr_guid(TLB_get_guidref(ref->guid))); else @@ -1511,7 +1509,7 @@ static void dump_TLBImplType(const TLBImplType * impl, UINT n) if(!impl) return; while (n) { - TRACE_(typelib)("implementing/inheriting interface hRef = %x implflags %x\n", + TRACE_(typelib)("implementing/inheriting interface hRef = %lx implflags %x\n", impl->hRef, impl->implflags); ++impl; --n; @@ -1528,7 +1526,7 @@ static void dump_DispParms(const DISPPARAMS * pdp) { TRACE("named args:\n"); for (index = 0; index < pdp->cNamedArgs; index++) - TRACE( "\t0x%x\n", pdp->rgdispidNamedArgs[index] ); + TRACE( "\t0x%lx\n", pdp->rgdispidNamedArgs[index] ); } if (pdp->cArgs && pdp->rgvarg) @@ -1541,7 +1539,7 @@ static void dump_DispParms(const DISPPARAMS * pdp) static void dump_TypeInfo(const ITypeInfoImpl * pty) { - TRACE("%p ref=%u\n", pty, pty->ref); + TRACE("%p ref %lu\n", pty, pty->ref); TRACE("%s %s\n", debugstr_w(TLB_get_bstr(pty->Name)), debugstr_w(TLB_get_bstr(pty->DocString))); TRACE("attr:%s\n", debugstr_guid(TLB_get_guidref(pty->guid))); TRACE("kind:%s\n", typekind_desc[pty->typeattr.typekind]); @@ -1557,9 +1555,9 @@ static void dump_TypeInfo(const ITypeInfoImpl * pty) static void dump_VARDESC(const VARDESC *v) { - MESSAGE("memid %d\n",v->memid); + MESSAGE("memid %ld\n",v->memid); MESSAGE("lpstrSchema %s\n",debugstr_w(v->lpstrSchema)); - MESSAGE("oInst %d\n",v->u.oInst); + MESSAGE("oInst %ld\n", v->u.oInst); dump_ELEMDESC(&(v->elemdescVar)); MESSAGE("wVarFlags %x\n",v->wVarFlags); MESSAGE("varkind %d\n",v->varkind); @@ -2033,7 +2031,7 @@ static inline void MSFT_Seek(TLBContext *pcx, LONG where) if (where > pcx->length) { /* FIXME */ - ERR("seek beyond end (%d/%d)\n", where, pcx->length ); + ERR("seek beyond end (%ld/%d)\n", where, pcx->length ); TLB_abort(); } pcx->pos = where; @@ -2043,7 +2041,7 @@ static inline void MSFT_Seek(TLBContext *pcx, LONG where) /* read function */ static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, LONG where ) { - TRACE_(typelib)("pos=0x%08x len=0x%08x 0x%08x 0x%08x 0x%08x\n", + TRACE_(typelib)("pos=0x%08x len %#lx, %u, %u, %#lx\n", pcx->pos, count, pcx->oStart, pcx->length, where); MSFT_Seek(pcx, where); @@ -3371,7 +3369,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); else { - FIXME("Header type magic 0x%08x not supported.\n",dwSignature); + FIXME("Header type magic %#lx not supported.\n", dwSignature); ret = TYPE_E_CANTLOADLIBRARY; } } @@ -3398,7 +3396,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath else { if(ret != E_FAIL) - ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError()); + ERR("Loading of typelib %s failed with error %ld\n", debugstr_w(pszFileName), GetLastError()); ret = TYPE_E_CANTLOADLIBRARY; } @@ -3446,7 +3444,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) ITypeLibImpl * pTypeLibImpl; int i; - TRACE("%p, TLB length = %d\n", pLib, dwTLBLength); + TRACE("%p, TLB length = %ld\n", pLib, dwTLBLength); pTypeLibImpl = TypeLibImpl_Constructor(); if (!pTypeLibImpl) return NULL; @@ -3474,14 +3472,14 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) lPSegDir = sizeof(tlbHeader) + (tlbHeader.nrtypeinfos)*4 + ((tlbHeader.varflags & HELPDLLFLAG)? 4 :0); /* now read the segment directory */ - TRACE("read segment directory (at %d)\n",lPSegDir); + TRACE("read segment directory (at %ld)\n",lPSegDir); MSFT_ReadLEDWords(&tlbSegDir, sizeof(tlbSegDir), &cx, lPSegDir); cx.pTblDir = &tlbSegDir; /* just check two entries */ if ( tlbSegDir.pTypeInfoTab.res0c != 0x0F || tlbSegDir.pImpInfo.res0c != 0x0F) { - ERR("cannot find the table directory, ptr=0x%x\n",lPSegDir); + ERR("cannot find the table directory, ptr %#lx\n",lPSegDir); heap_free(pTypeLibImpl); return NULL; } @@ -3930,7 +3928,7 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL, import->offset = lib_offs; TLB_GUIDFromString( pNameTable + lib_offs + 4, &tmpguid); import->guid = TLB_append_guid(&pTL->guid_list, &tmpguid, 2); - if(sscanf(pNameTable + lib_offs + 40, "}#%hd.%hd#%x#%s", + if(sscanf(pNameTable + lib_offs + 40, "}#%hd.%hd#%lx#%s", &import->wVersionMajor, &import->wVersionMinor, &import->lcid, fname) != 4) { @@ -4035,7 +4033,7 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign TRACE_(typelib)("name: %s\n", debugstr_w(TLB_get_bstr(pVarDesc->Name))); TRACE_(typelib)("byte_offs = 0x%x\n", pItem->byte_offs); - TRACE_(typelib)("memid = 0x%x\n", pItem->memid); + TRACE_(typelib)("memid = %#lx\n", pItem->memid); if(pItem->flags & 0x02) pType = &pItem->type; @@ -4402,7 +4400,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) DWORD len, order; ITypeInfoImpl **ppTypeInfoImpl; - TRACE_(typelib)("%p, TLB length = %d\n", pLib, dwTLBLength); + TRACE_(typelib)("%p, TLB length = %ld\n", pLib, dwTLBLength); pTypeLibImpl = TypeLibImpl_Constructor(); @@ -4411,11 +4409,11 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) pHeader = pLib; TRACE_(typelib)("header:\n"); - TRACE_(typelib)("\tmagic=0x%08x, file blocks = %d\n", pHeader->SLTG_magic, + TRACE_(typelib)("\tmagic %#lx, file blocks = %d\n", pHeader->SLTG_magic, pHeader->nrOfFileBlks ); - if (pHeader->SLTG_magic != SLTG_SIGNATURE) { - FIXME_(typelib)("Header type magic 0x%08x not supported.\n", - pHeader->SLTG_magic); + if (pHeader->SLTG_magic != SLTG_SIGNATURE) + { + FIXME_(typelib)("Header type magic %#lx not supported.\n", pHeader->SLTG_magic); return NULL; } @@ -4566,8 +4564,8 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) heap_free(pOtherTypeInfoBlks); return NULL; } - TRACE_(typelib)("pTIHeader->res06 = %x, pTIHeader->res0e = %x, " - "pTIHeader->res16 = %x, pTIHeader->res1e = %x\n", + TRACE_(typelib)("pTIHeader->res06 = %lx, pTIHeader->res0e = %lx, " + "pTIHeader->res16 = %lx, pTIHeader->res1e = %lx\n", pTIHeader->res06, pTIHeader->res0e, pTIHeader->res16, pTIHeader->res1e); *ppTypeInfoImpl = ITypeInfoImpl_Constructor(); @@ -4710,7 +4708,7 @@ static ULONG WINAPI ITypeLib2_fnAddRef( ITypeLib2 *iface) ITypeLibImpl *This = impl_from_ITypeLib2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -4720,7 +4718,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) ITypeLibImpl *This = impl_from_ITypeLib2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n",This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -5036,8 +5034,7 @@ static HRESULT WINAPI ITypeLib2_fnIsName( int tic; UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR), fdc, vrc; - TRACE("(%p)->(%s,%08x,%p)\n", This, debugstr_w(szNameBuf), lHashVal, - pfName); + TRACE("%p, %s, %#lx, %p.\n", iface, debugstr_w(szNameBuf), lHashVal, pfName); *pfName=TRUE; for(tic = 0; tic < This->TypeInfoCount; ++tic){ @@ -5086,7 +5083,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName( UINT count = 0; UINT len; - TRACE("(%p)->(%s %u %p %p %p)\n", This, debugstr_w(name), hash, ppTInfo, memid, found); + TRACE("%p, %s %#lx, %p, %p, %p.\n", iface, debugstr_w(name), hash, ppTInfo, memid, found); if ((!name && hash == 0) || !ppTInfo || !memid || !found) return E_INVALIDARG; @@ -5207,7 +5204,7 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation2( HRESULT result; ITypeInfo *pTInfo; - FIXME("(%p) index %d lcid %d half implemented stub!\n", This, index, lcid); + FIXME("%p, %d, %#lx, partially implemented stub!\n", iface, index, lcid); /* the help string should be obtained from the helpstringdll, * using the _DLLGetDocumentation function, based on the supplied @@ -5353,7 +5350,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( BOOL typemismatch = FALSE; int i; - TRACE("(%p)->(%s, 0x%x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + TRACE("%p, %s, %#lx, %#x, %p, %p, %p.\n", iface, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); *pDescKind = DESCKIND_NONE; pBindPtr->lptcomp = NULL; @@ -5489,7 +5486,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( ITypeLibImpl *This = impl_from_ITypeComp(iface); ITypeInfoImpl *info; - TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); + TRACE("%p, %s, %#lx, %p, %p.\n", iface, debugstr_w(szName), lHash, ppTInfo, ppTComp); if(!szName || !ppTInfo || !ppTComp) return E_INVALIDARG; @@ -5573,14 +5570,12 @@ static HRESULT WINAPI ITypeInfo_fnQueryInterface( return E_NOINTERFACE; } -/* ITypeInfo::AddRef - */ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->ref is %u\n",This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (ref == 1 /* incremented from 0 */) ITypeLib2_AddRef(&This->pTypeLib->ITypeLib2_iface); @@ -5642,14 +5637,12 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) heap_free(This); } -/* ITypeInfo::Release - */ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n",This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -5663,12 +5656,6 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) return ref; } -/* ITypeInfo::GetTypeAttr - * - * Retrieves a TYPEATTR structure that contains the attributes of the type - * description. - * - */ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, LPTYPEATTR *ppTypeAttr) { @@ -6018,7 +6005,7 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, if ((This->typeattr.typekind == TKIND_DISPATCH) && hrefoffset) ITypeInfoImpl_FuncDescAddHrefOffset(*ppFuncDesc, hrefoffset); - TRACE("-- 0x%08x\n", hr); + TRACE("-- %#lx.\n", hr); return hr; } @@ -6182,7 +6169,7 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - TRACE("(%p) memid 0x%08x max_names %d\n", This, memid, max_names); + TRACE("%p, %#lx, %p, %d, %p\n", iface, memid, names, max_names, num_names); if (!names) return E_INVALIDARG; @@ -6243,9 +6230,9 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( if(TRACE_ON(ole)) { if(SUCCEEDED(hr)) - TRACE("SUCCESS -- hRef = 0x%08x\n", *pRefType ); + TRACE("SUCCESS -- hRef %#lx.\n", *pRefType ); else - TRACE("FAILURE -- hresult = 0x%08x\n", hr); + TRACE("FAILURE -- hresult %#lx.\n", hr); } return hr; @@ -6291,8 +6278,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, HRESULT ret=S_OK; UINT i, fdc; - TRACE("(%p) Name %s cNames %d\n", This, debugstr_w(*rgszNames), - cNames); + TRACE("%p, %s, %d.\n", iface, debugstr_w(*rgszNames), cNames); /* init out parameters in case of failure */ for (i = 0; i < cNames; i++) @@ -6312,7 +6298,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, else ret=DISP_E_UNKNOWNNAME; }; - TRACE("-- 0x%08x\n", ret); + TRACE("-- %#lx.\n", ret); return ret; } } @@ -6547,7 +6533,7 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART DWORD_PTR *args; void *func; - TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + TRACE("%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d).\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); @@ -7013,15 +6999,13 @@ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, hr = ITypeInfo_GetRefTypeInfo(tinfo, tdesc->u.hreftype, &tinfo2); if (hr) { - ERR("Could not get typeinfo of hreftype %x for VT_USERDEFINED, " - "hr = 0x%08x\n", - tdesc->u.hreftype, hr); + ERR("Could not get typeinfo of hreftype %lx for VT_USERDEFINED, hr %#lx.\n", tdesc->u.hreftype, hr); return hr; } hr = ITypeInfo_GetTypeAttr(tinfo2, &tattr); if (hr) { - ERR("ITypeInfo_GetTypeAttr failed, hr = 0x%08x\n", hr); + ERR("ITypeInfo_GetTypeAttr failed, hr %#lx.\n", hr); ITypeInfo_Release(tinfo2); return hr; } @@ -7224,9 +7208,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( const TLBFuncDesc *pFuncInfo; UINT fdc; - TRACE("(%p)(%p,id=%d,flags=0x%08x,%p,%p,%p,%p)\n", - This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr - ); + TRACE("%p, %p, %ld, %#x, %p, %p, %p, %p.\n", iface, pIUnk, memid, wFlags, pDispParams, + pVarResult, pExcepInfo, pArgErr); if( This->typeattr.wTypeFlags & TYPEFLAG_FRESTRICTED ) return DISP_E_MEMBERNOTFOUND; @@ -7406,7 +7389,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = SafeArrayAccessData(a, (LPVOID)&v); if (hres != S_OK) { - ERR("SafeArrayAccessData failed with %x\n", hres); + ERR("SafeArrayAccessData failed with %#lx.\n", hres); SafeArrayDestroy(a); break; } @@ -7415,7 +7398,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = SafeArrayUnaccessData(a); if (hres != S_OK) { - ERR("SafeArrayUnaccessData failed with %x\n", hres); + ERR("SafeArrayUnaccessData failed with %#lx.\n", hres); SafeArrayDestroy(a); break; } @@ -7585,13 +7568,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = SafeArrayGetUBound(a, 1, &ubound); if (hres != S_OK) { - ERR("SafeArrayGetUBound failed with %x\n", hres); + ERR("SafeArrayGetUBound failed with %#lx.\n", hres); break; } hres = SafeArrayAccessData(a, (LPVOID)&v); if (hres != S_OK) { - ERR("SafeArrayAccessData failed with %x\n", hres); + ERR("SafeArrayAccessData failed with %#lx.\n", hres); break; } for (j = 0; j <= ubound; j++) @@ -7599,7 +7582,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = SafeArrayUnaccessData(a); if (hres != S_OK) { - ERR("SafeArrayUnaccessData failed with %x\n", hres); + ERR("SafeArrayUnaccessData failed with %#lx.\n", hres); break; } } @@ -7617,7 +7600,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if ((V_VT(&varresult) == VT_ERROR) && FAILED(V_ERROR(&varresult))) { - WARN("invoked function failed with error 0x%08x\n", V_ERROR(&varresult)); + WARN("invoked function failed with error %#lx.\n", V_ERROR(&varresult)); hres = DISP_E_EXCEPTION; if (pExcepInfo) { @@ -7685,7 +7668,7 @@ func_fail: pVarResult,pExcepInfo,pArgErr ); if (FAILED(hres)) - FIXME("IDispatch::Invoke failed with %08x. (Could be not a real error?)\n", hres); + FIXME("IDispatch::Invoke failed with %#lx. (Could be not a real error?)\n", hres); IDispatch_Release(disp); } else FIXME("FUNC_DISPATCH used on object without IDispatch iface?\n"); @@ -7697,7 +7680,7 @@ func_fail: break; } - TRACE("-- 0x%08x\n", hres); + TRACE("-- %#lx\n", hres); return hres; } else if(SUCCEEDED(hres = ITypeInfo2_GetVarIndexOfMemId(iface, memid, &var_index))) { @@ -7727,7 +7710,7 @@ func_fail: WARN("Could not search inherited interface!\n"); } } - WARN("did not find member id %d, flags 0x%x!\n", memid, wFlags); + WARN("did not find member id %ld, flags 0x%x!\n", memid, wFlags); return DISP_E_MEMBERNOTFOUND; } @@ -7745,9 +7728,8 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); const TLBFuncDesc *pFDesc; const TLBVarDesc *pVDesc; - TRACE("(%p) memid %d Name(%p) DocString(%p)" - " HelpContext(%p) HelpFile(%p)\n", - This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("%p, %ld, %p, %p, %p, %p.\n", + iface, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); if(memid==MEMBERID_NIL){ /* documentation for the typeinfo */ if(pBstrName) *pBstrName=SysAllocString(TLB_get_bstr(This->Name)); @@ -7800,7 +7782,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, WARN("Could not search inherited interface!\n"); } - WARN("member %d not found\n", memid); + WARN("member %ld not found\n", memid); return TYPE_E_ELEMENTNOTFOUND; } @@ -7816,7 +7798,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); const TLBFuncDesc *pFDesc; - TRACE("(%p)->(memid %x, %d, %p, %p, %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + TRACE("%p, %#lx, %d, %p, %p, %p.\n", iface, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); if (pBstrDllName) *pBstrDllName = NULL; if (pBstrName) *pBstrName = NULL; @@ -7854,7 +7836,7 @@ static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface, ITypeInfoImpl *This = impl_from_ITypeInfo(iface); HRESULT hr; - TRACE("%p, 0x%x\n", iface, *hRefType); + TRACE("%p, %#lx.\n", iface, *hRefType); if (This->impltypes && (*hRefType & DISPATCH_HREF_MASK)) { @@ -7959,7 +7941,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( } if(&ref_type->entry == &This->pTypeLib->ref_list) { - FIXME("Can't find pRefType for ref %x\n", hRefType); + FIXME("Can't find pRefType for ref %lx\n", hRefType); return E_FAIL; } @@ -8028,7 +8010,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeLib_Release(pTLib); if (FAILED(result)) { - WARN("(%p) failed hreftype 0x%04x\n", This, hRefType); + WARN("(%p) failed hreftype %#lx.\n", iface, hRefType); return result; } } @@ -8037,7 +8019,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeInfo_Release(type_info); else *ppTInfo = type_info; - TRACE("(%p) hreftype 0x%04x loaded %s (%p)\n", This, hRefType, + TRACE("%p, hreftype %#lx, loaded %s (%p)\n", iface, hRefType, SUCCEEDED(result)? "SUCCESS":"FAILURE", *ppTInfo); return result; } @@ -8050,13 +8032,12 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( static HRESULT WINAPI ITypeInfo_fnAddressOfMember( ITypeInfo2 *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) { - ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); HRESULT hr; BSTR dll, entry; WORD ordinal; HMODULE module; - TRACE("(%p)->(0x%x, 0x%x, %p)\n", This, memid, invKind, ppv); + TRACE("%p, %lx, %#x, %p.\n", iface, memid, invKind, ppv); hr = ITypeInfo2_GetDllEntry(iface, memid, invKind, &dll, &entry, &ordinal); if (FAILED(hr)) @@ -8138,7 +8119,7 @@ static HRESULT WINAPI ITypeInfo_fnCreateInstance( ITypeInfo2 *iface, { IUnknown *pUnk; hr = GetActiveObject(&pTA->guid, NULL, &pUnk); - TRACE("GetActiveObject rets %08x\n", hr); + TRACE("GetActiveObject rets %#lx.\n", hr); if(hr == S_OK) { hr = IUnknown_QueryInterface(pUnk, riid, ppvObj); @@ -8160,11 +8141,9 @@ end: * * Retrieves marshalling information. */ -static HRESULT WINAPI ITypeInfo_fnGetMops( ITypeInfo2 *iface, MEMBERID memid, - BSTR *pBstrMops) +static HRESULT WINAPI ITypeInfo_fnGetMops( ITypeInfo2 *iface, MEMBERID memid, BSTR *pBstrMops) { - ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - FIXME("(%p %d) stub!\n", This, memid); + FIXME("%p, %ld stub!\n", iface, memid); *pBstrMops = NULL; return S_OK; } @@ -8264,8 +8243,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeKind( ITypeInfo2 * iface, static HRESULT WINAPI ITypeInfo2_fnGetTypeFlags( ITypeInfo2 *iface, ULONG *pTypeFlags) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); + TRACE("%p, %p.\n", iface, pTypeFlags); *pTypeFlags=This->typeattr.wTypeFlags; - TRACE("(%p) flags 0x%x\n", This,*pTypeFlags); return S_OK; } @@ -8292,8 +8271,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncIndexOfMemId( ITypeInfo2 * iface, } else result = TYPE_E_ELEMENTNOTFOUND; - TRACE("(%p) memid 0x%08x invKind 0x%04x -> %s\n", This, - memid, invKind, SUCCEEDED(result) ? "SUCCESS" : "FAILED"); + TRACE("%p, %#lx, %#x, hr %#lx.\n", iface, memid, invKind, result); return result; } @@ -8309,7 +8287,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarIndexOfMemId( ITypeInfo2 * iface, ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); TLBVarDesc *pVarInfo; - TRACE("%p %d %p\n", iface, memid, pVarIndex); + TRACE("%p, %ld, %p.\n", iface, memid, pVarIndex); pVarInfo = TLB_get_vardesc_by_memberid(This, memid); if(!pVarInfo) @@ -8490,9 +8468,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation2( ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); const TLBFuncDesc *pFDesc; const TLBVarDesc *pVDesc; - TRACE("(%p) memid %d lcid(0x%x) HelpString(%p) " - "HelpStringContext(%p) HelpStringDll(%p)\n", - This, memid, lcid, pbstrHelpString, pdwHelpStringContext, + TRACE("%p, %ld, %#lx, %p, %p, %p.\n", + iface, memid, lcid, pbstrHelpString, pdwHelpStringContext, pbstrHelpStringDll ); /* the help string should be obtained from the helpstringdll, * using the _DLLGetDocumentation function, based on the supplied @@ -8842,7 +8819,7 @@ static HRESULT WINAPI ITypeComp_fnBind( HRESULT hr = DISP_E_MEMBERNOTFOUND; UINT fdc; - TRACE("(%p)->(%s, %x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + TRACE("%p, %s, %#lx, 0x%x, %p, %p, %p.\n", iface, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); *pDescKind = DESCKIND_NONE; pBindPtr->lpfuncdesc = NULL; @@ -8923,7 +8900,7 @@ static HRESULT WINAPI ITypeComp_fnBindType( ITypeInfo ** ppTInfo, ITypeComp ** ppTComp) { - TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); + TRACE("%s, %#lx, %p, %p.\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); /* strange behaviour (does nothing) but like the * original */ @@ -9142,7 +9119,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 *iface, { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - TRACE("%p %d\n", This, helpContext); + TRACE("%p, %ld.\n", iface, helpContext); This->dwHelpContext = helpContext; @@ -9154,7 +9131,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface, { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - TRACE("%p %x\n", This, lcid); + TRACE("%p, %#lx.\n", iface, lcid); This->set_lcid = lcid; @@ -9387,7 +9364,7 @@ static DWORD WMSFT_encode_variant(VARIANT *value, WMSFT_TLBFile *file) if(V_VT(value) != arg_type) { hres = VariantChangeType(&v, value, 0, arg_type); if(FAILED(hres)){ - ERR("VariantChangeType failed: %08x\n", hres); + ERR("VariantChangeType failed: %#lx.\n", hres); return -1; } } @@ -10314,61 +10291,61 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) running_offset = 0; - TRACE("header at: 0x%x\n", running_offset); + TRACE("header at: 0x%lx\n", running_offset); running_offset += sizeof(file.header); - TRACE("junk at: 0x%x\n", running_offset); + TRACE("junk at: 0x%lx\n", running_offset); running_offset += junk_size; - TRACE("segdir at: 0x%x\n", running_offset); + TRACE("segdir at: 0x%lx\n", running_offset); running_offset += sizeof(file.segdir); - TRACE("typeinfo at: 0x%x\n", running_offset); + TRACE("typeinfo at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pTypeInfoTab, &file.typeinfo_seg, &running_offset); - TRACE("guidhashtab at: 0x%x\n", running_offset); + TRACE("guidhashtab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pGuidHashTab, &file.guidhash_seg, &running_offset); - TRACE("guidtab at: 0x%x\n", running_offset); + TRACE("guidtab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pGuidTab, &file.guid_seg, &running_offset); - TRACE("reftab at: 0x%x\n", running_offset); + TRACE("reftab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pRefTab, &file.ref_seg, &running_offset); - TRACE("impinfo at: 0x%x\n", running_offset); + TRACE("impinfo at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pImpInfo, &file.impinfo_seg, &running_offset); - TRACE("impfiles at: 0x%x\n", running_offset); + TRACE("impfiles at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pImpFiles, &file.impfile_seg, &running_offset); - TRACE("namehashtab at: 0x%x\n", running_offset); + TRACE("namehashtab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pNameHashTab, &file.namehash_seg, &running_offset); - TRACE("nametab at: 0x%x\n", running_offset); + TRACE("nametab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pNametab, &file.name_seg, &running_offset); - TRACE("stringtab at: 0x%x\n", running_offset); + TRACE("stringtab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pStringtab, &file.string_seg, &running_offset); - TRACE("typdesc at: 0x%x\n", running_offset); + TRACE("typdesc at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pTypdescTab, &file.typdesc_seg, &running_offset); - TRACE("arraydescriptions at: 0x%x\n", running_offset); + TRACE("arraydescriptions at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pArrayDescriptions, &file.arraydesc_seg, &running_offset); - TRACE("custdata at: 0x%x\n", running_offset); + TRACE("custdata at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pCustData, &file.custdata_seg, &running_offset); - TRACE("cdguids at: 0x%x\n", running_offset); + TRACE("cdguids at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pCDGuids, &file.cdguids_seg, &running_offset); - TRACE("res0e at: 0x%x\n", running_offset); + TRACE("res0e at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.res0e, NULL, &running_offset); - TRACE("res0f at: 0x%x\n", running_offset); + TRACE("res0f at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.res0f, NULL, &running_offset); - TRACE("aux_seg at: 0x%x\n", running_offset); + TRACE("aux_seg at: 0x%lx\n", running_offset); WMSFT_fixup_typeinfos(This, &file, running_offset); @@ -10452,8 +10429,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetCustData(ICreateTypeLib2 *iface, static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringContext(ICreateTypeLib2 *iface, ULONG helpStringContext) { - ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %u - stub\n", This, helpStringContext); + FIXME("%p, %lu - stub\n", iface, helpStringContext); return E_NOTIMPL; } @@ -10587,7 +10563,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(ICreateTypeInfo2 *iface, { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - TRACE("%p %d\n", This, helpContext); + TRACE("%p, %ld.\n", iface, helpContext); This->dwHelpContext = helpContext; @@ -10663,7 +10639,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(ICreateTypeInfo2 *iface, libattr->wMinorVerNum, libattr->lcid, &implib->name); if(FAILED(hres)){ implib->name = NULL; - TRACE("QueryPathOfRegTypeLib failed, no name stored: %08x\n", hres); + TRACE("QueryPathOfRegTypeLib failed, no name stored: %#lx.\n", hres); } } @@ -10845,7 +10821,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface, TLBImplType *impl_type; HRESULT hres; - TRACE("%p %u %d\n", This, index, refType); + TRACE("%p, %u, %ld.\n", iface, index, refType); switch(This->typeattr.typekind){ case TKIND_COCLASS: { @@ -11134,7 +11110,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext(ICreateTypeInfo2 *if ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); TLBFuncDesc *func_desc = &This->funcdescs[index]; - TRACE("%p %u %d\n", This, index, helpContext); + TRACE("%p, %u, %ld.\n", iface, index, helpContext); if(index >= This->typeattr.cFuncs) return TYPE_E_ELEMENTNOTFOUND; @@ -11150,7 +11126,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(ICreateTypeInfo2 *ifa ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); TLBVarDesc *var_desc = &This->vardescs[index]; - TRACE("%p %u %d\n", This, index, helpContext); + TRACE("%p, %u, %ld.\n", iface, index, helpContext); if(index >= This->typeattr.cVars) return TYPE_E_ELEMENTNOTFOUND; @@ -11347,24 +11323,21 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface, static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2 *iface, MEMBERID memid, INVOKEKIND invKind) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %x %d - stub\n", This, memid, invKind); + FIXME("%p, %#lx, %d - stub\n", iface, memid, invKind); return E_NOTIMPL; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDesc(ICreateTypeInfo2 *iface, UINT index) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, index); + FIXME("%p, %u - stub\n", iface, index); return E_NOTIMPL; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDescByMemId(ICreateTypeInfo2 *iface, MEMBERID memid) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %x - stub\n", This, memid); + FIXME("%p, %#lx - stub\n", iface, memid); return E_NOTIMPL; } @@ -11447,7 +11420,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 * { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - TRACE("%p %u\n", This, helpStringContext); + TRACE("%p, %lu.\n", iface, helpStringContext); This->dwHelpStringContext = helpStringContext; @@ -11457,23 +11430,20 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 * static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpStringContext(ICreateTypeInfo2 *iface, UINT index, ULONG helpStringContext) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %u - stub\n", This, index, helpStringContext); + FIXME("%p, %u, %lu - stub\n", iface, index, helpStringContext); return E_NOTIMPL; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpStringContext(ICreateTypeInfo2 *iface, UINT index, ULONG helpStringContext) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %u - stub\n", This, index, helpStringContext); + FIXME("%p, %u, %lu - stub\n", iface, index, helpStringContext); return E_NOTIMPL; } static HRESULT WINAPI ICreateTypeInfo2_fnInvalidate(ICreateTypeInfo2 *iface) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p - stub\n", This); + FIXME("%p - stub\n", iface); return E_NOTIMPL; } diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index fe21520b2e7..aa54a2b092b 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -102,7 +102,7 @@ unsigned char * WINAPI CLEANLOCALSTORAGE_UserMarshal(ULONG *pFlags, unsigned cha break; default: - ERR("Unknown type %x\n", pstg->flags); + ERR("Unknown type %lx\n", pstg->flags); } *(VOID**)pstg->pStorage = NULL; @@ -135,11 +135,11 @@ typedef struct ULONG WINAPI BSTR_UserSize(ULONG *pFlags, ULONG Start, BSTR *pstr) { - TRACE("(%x,%d,%p) => %p\n", *pFlags, Start, pstr, *pstr); + TRACE("%#lx, %lu, %p => %p\n", *pFlags, Start, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); ALIGN_LENGTH(Start, 3); Start += sizeof(bstr_wire_t) + ((SysStringByteLen(*pstr) + 1) & ~1); - TRACE("returning %d\n", Start); + TRACE("returning %ld\n", Start); return Start; } @@ -148,7 +148,7 @@ unsigned char * WINAPI BSTR_UserMarshal(ULONG *pFlags, unsigned char *Buffer, BS bstr_wire_t *header; DWORD len = SysStringByteLen(*pstr); - TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + TRACE("%#lx, %p, %p => %p\n", *pFlags, Buffer, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); ALIGN_POINTER(Buffer, 3); @@ -168,12 +168,12 @@ unsigned char * WINAPI BSTR_UserMarshal(ULONG *pFlags, unsigned char *Buffer, BS unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, BSTR *pstr) { bstr_wire_t *header; - TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + TRACE("%#lx, %p, %p => %p\n", *pFlags, Buffer, pstr, *pstr); ALIGN_POINTER(Buffer, 3); header = (bstr_wire_t*)Buffer; if(header->len != header->len2) - FIXME("len %08x != len2 %08x\n", header->len, header->len2); + FIXME("len %#lx != len2 %#lx\n", header->len, header->len2); if (header->byte_len == 0xffffffff) { @@ -188,7 +188,7 @@ unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, void WINAPI BSTR_UserFree(ULONG *pFlags, BSTR *pstr) { - TRACE("(%x,%p) => %p\n", *pFlags, pstr, *pstr); + TRACE("%#lx, %p => %p\n", *pFlags, pstr, *pstr); SysFreeString(*pstr); *pstr = NULL; } @@ -282,7 +282,7 @@ static unsigned interface_user_size(ULONG *pFlags, ULONG Start, REFIID riid, IUn } } size += sizeof(ULONG); - TRACE("wire-size extra of interface variant is %d\n", size); + TRACE("wire-size extra of interface variant is %ld.\n", size); return Start + size; } @@ -327,7 +327,7 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) static unsigned char* interface_user_marshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown *punk) { - TRACE("pFlags=%d, Buffer=%p, pUnk=%p\n", *pFlags, Buffer, punk); + TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, punk); /* first DWORD is used to store pointer itself, truncated on win64 */ if(!punk) @@ -350,7 +350,7 @@ static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buf { DWORD ptr; - TRACE("pFlags=%d, Buffer=%p, ppUnk=%p\n", *pFlags, Buffer, ppunk); + TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, ppunk); /* skip pointer part itself */ ptr = *(DWORD*)Buffer; @@ -365,7 +365,7 @@ static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buf ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar) { int align; - TRACE("(%x,%d,%p)\n", *pFlags, Start, pvar); + TRACE("%#lx, %lu, %p.\n", *pFlags, Start, pvar); TRACE("vt=%04x\n", V_VT(pvar)); ALIGN_LENGTH(Start, 7); @@ -381,7 +381,7 @@ ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar) Start += get_type_size(pFlags, V_VT(pvar)); Start = wire_extra_user_size(pFlags, Start, pvar); - TRACE("returning %d\n", Start); + TRACE("returning %ld\n", Start); return Start; } @@ -392,7 +392,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, int align; unsigned char *Pos; - TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar); + TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, pvar); TRACE("vt=%04x\n", V_VT(pvar)); ALIGN_POINTER(Buffer, 7); @@ -479,7 +479,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, } } header->clSize = ((Pos - Buffer) + 7) >> 3; - TRACE("marshalled size=%d\n", header->clSize); + TRACE("marshalled size %ld\n", header->clSize); return Pos; } @@ -490,7 +490,7 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe int align; unsigned char *Pos; - TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar); + TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, pvar); ALIGN_POINTER(Buffer, 7); @@ -617,7 +617,7 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar) VARTYPE vt = V_VT(pvar); PVOID ref = NULL; - TRACE("(%x,%p)\n", *pFlags, pvar); + TRACE("%#lx, %p.\n", *pFlags, pvar); TRACE("vt=%04x\n", V_VT(pvar)); if (vt & VT_BYREF) ref = pvar->n1.n2.n3.byref; @@ -773,7 +773,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY { ULONG size = StartingSize; - TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, *ppsa); + TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *ppsa); ALIGN_LENGTH(size, 3); size += sizeof(ULONG); @@ -1248,7 +1248,7 @@ HRESULT CALLBACK IDispatch_Invoke_Proxy( UINT uArgErr; EXCEPINFO ExcepInfo; - TRACE("(%p)->(%d,%s,%x,%x,%p,%p,%p,%p)\n", This, + TRACE("%p, %ld, %s, %#lx, %x, %p, %p, %p, %p.\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -1488,7 +1488,7 @@ HRESULT CALLBACK ITypeComp_Bind_Proxy( VARDESC *vardesc; HRESULT hr; - TRACE("(%p, %s, %#x, %#x, %p, %p, %p)\n", This, debugstr_w(name), lHashVal, flags, ti, + TRACE("%p, %s, %#lx, %#x, %p, %p, %p.\n", This, debugstr_w(name), lHashVal, flags, ti, desckind, bindptr); *desckind = DESCKIND_NONE; @@ -1534,7 +1534,7 @@ HRESULT __RPC_STUB ITypeComp_Bind_Stub( BINDPTR bindptr; HRESULT hr; - TRACE("(%p, %s, %#x, %#x, %p, %p, %p, %p, %p, %p)\n", This, debugstr_w(name), + TRACE("%p, %s, %#lx, %#x, %p, %p, %p, %p, %p, %p.\n", This, debugstr_w(name), lHashVal, flags, ti, desckind, funcdesc, vardesc, typecomp, stg); memset(stg, 0, sizeof(*stg)); @@ -1586,7 +1586,7 @@ HRESULT CALLBACK ITypeComp_BindType_Proxy( { HRESULT hr; - TRACE("(%p, %s, %#x, %p, %p)\n", This, debugstr_w(name), lHashVal, ti, typecomp); + TRACE("%p, %s, %#lx, %p, %p.\n", This, debugstr_w(name), lHashVal, ti, typecomp); hr = ITypeComp_RemoteBindType_Proxy(This, name, lHashVal, ti); if (hr == S_OK) @@ -1606,7 +1606,7 @@ HRESULT __RPC_STUB ITypeComp_BindType_Stub( ITypeComp *typecomp = NULL; HRESULT hr; - TRACE("(%p, %s, %#x, %p)\n", This, debugstr_w(name), lHashVal, ti); + TRACE("%p, %s, %#lx, %p.\n", This, debugstr_w(name), lHashVal, ti); hr = ITypeComp_BindType(This, name, lHashVal, ti, &typecomp); @@ -1729,7 +1729,7 @@ HRESULT CALLBACK ITypeInfo_GetNames_Proxy( UINT cMaxNames, UINT* pcNames) { - TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("%p, %#lx, %p, %d, %p.\n", This, memid, rgBstrNames, cMaxNames, pcNames); return ITypeInfo_RemoteGetNames_Proxy(This, memid, rgBstrNames, cMaxNames, pcNames); } @@ -1741,7 +1741,7 @@ HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( UINT cMaxNames, UINT* pcNames) { - TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("%p, %#lx, %p, %d, %p.\n", This, memid, rgBstrNames, cMaxNames, pcNames); return ITypeInfo_GetNames(This, memid, rgBstrNames, cMaxNames, pcNames); } @@ -1791,7 +1791,8 @@ HRESULT CALLBACK ITypeInfo_GetDocumentation_Proxy(ITypeInfo *This, MEMBERID memi DWORD dummy_help_context, flags = 0; BSTR dummy_name, dummy_doc_string, dummy_help_file; HRESULT hr; - TRACE("(%p, %08x, %p, %p, %p, %p)\n", This, memid, name, doc_string, help_context, help_file); + + TRACE("%p, %#lx, %p, %p, %p, %p.\n", This, memid, name, doc_string, help_context, help_file); if(!name) name = &dummy_name; else flags = 1; @@ -1816,7 +1817,7 @@ HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub(ITypeInfo *This, MEMBERID mem DWORD flags, BSTR *name, BSTR *doc_string, DWORD *help_context, BSTR *help_file) { - TRACE("(%p, %08x, %08x, %p, %p, %p, %p)\n", This, memid, flags, name, doc_string, help_context, help_file); + TRACE("%p, %#lx, %#lx, %p, %p, %p, %p.\n", This, memid, flags, name, doc_string, help_context, help_file); *name = *doc_string = *help_file = NULL; *help_context = 0; @@ -1837,7 +1838,8 @@ HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy(ITypeInfo *This, MEMBERID memid, BSTR dummy_dll_name, dummy_name; WORD dummy_ordinal; HRESULT hr; - TRACE("(%p, %08x, %x, %p, %p, %p)\n", This, memid, invkind, dll_name, name, ordinal); + + TRACE("%p, %#lx, %#x, %p, %p, %p.\n", This, memid, invkind, dll_name, name, ordinal); if(!dll_name) dll_name = &dummy_dll_name; else flags = 1; @@ -1860,7 +1862,7 @@ HRESULT __RPC_STUB ITypeInfo_GetDllEntry_Stub(ITypeInfo *This, MEMBERID memid, BSTR *dll_name, BSTR *name, WORD *ordinal) { - TRACE("(%p, %08x, %x, %p, %p, %p)\n", This, memid, invkind, dll_name, name, ordinal); + TRACE("%p, %#lx, %x, %p, %p, %p.\n", This, memid, invkind, dll_name, name, ordinal); *dll_name = *name = NULL; *ordinal = 0; @@ -2017,7 +2019,8 @@ HRESULT CALLBACK ITypeInfo2_GetDocumentation2_Proxy(ITypeInfo2 *This, MEMBERID m DWORD dummy_help_context, flags = 0; BSTR dummy_help_string, dummy_help_dll; HRESULT hr; - TRACE("(%p, %08x, %08x, %p, %p, %p)\n", This, memid, lcid, help_string, help_context, help_dll); + + TRACE("%p, %#lx, %#lx, %p, %p, %p.\n", This, memid, lcid, help_string, help_context, help_dll); if(!help_string) help_string = &dummy_help_string; else flags = 1; @@ -2040,7 +2043,7 @@ HRESULT __RPC_STUB ITypeInfo2_GetDocumentation2_Stub(ITypeInfo2 *This, MEMBERID BSTR *help_string, DWORD *help_context, BSTR *help_dll) { - TRACE("(%p, %08x, %08x, %08x, %p, %p, %p)\n", This, memid, lcid, flags, help_string, help_context, help_dll); + TRACE("%p, %#lx, %#lx, %#lx, %p, %p, %p.\n", This, memid, lcid, flags, help_string, help_context, help_dll); *help_string = *help_dll = NULL; *help_context = 0; @@ -2139,7 +2142,7 @@ HRESULT __RPC_STUB ITypeLib_GetDocumentation_Stub(ITypeLib *This, INT index, DWO BSTR *name, BSTR *doc_string, DWORD *help_context, BSTR *help_file) { - TRACE("(%p, %d, %08x, %p, %p, %p, %p)\n", This, index, flags, name, doc_string, help_context, help_file); + TRACE("%p, %d, %#lx, %p, %p, %p, %p.\n", This, index, flags, name, doc_string, help_context, help_file); *name = *doc_string = *help_file = NULL; *help_context = 0; @@ -2241,7 +2244,8 @@ HRESULT CALLBACK ITypeLib2_GetDocumentation2_Proxy(ITypeLib2 *This, INT index, DWORD dummy_help_context, flags = 0; BSTR dummy_help_string, dummy_help_dll; HRESULT hr; - TRACE("(%p, %d, %08x, %p, %p, %p)\n", This, index, lcid, help_string, help_context, help_dll); + + TRACE("%p, %d, %#lx, %p, %p, %p.\n", This, index, lcid, help_string, help_context, help_dll); if(!help_string) help_string = &dummy_help_string; else flags = 1; @@ -2263,7 +2267,7 @@ HRESULT __RPC_STUB ITypeLib2_GetDocumentation2_Stub(ITypeLib2 *This, INT index, DWORD flags, BSTR *help_string, DWORD *help_context, BSTR *help_dll) { - TRACE("(%p, %d, %08x, %08x, %p, %p, %p)\n", This, index, lcid, flags, help_string, help_context, help_dll); + TRACE("%p, %d, %#lx, %#lx, %p, %p, %p.\n", This, index, lcid, flags, help_string, help_context, help_dll); *help_string = *help_dll = NULL; *help_context = 0; @@ -2323,7 +2327,8 @@ HRESULT __RPC_STUB IPropertyBag_Read_Stub( { IDispatch *disp; HRESULT hr; - TRACE("(%p, %s, %p, %p, %x, %p)\n", This, debugstr_w(pszPropName), pVar, + + TRACE("%p, %s, %p, %p, %lx, %p.\n", This, debugstr_w(pszPropName), pVar, pErrorLog, varType, pUnkObj); if(varType & (VT_BYREF | VT_ARRAY | VT_VECTOR)) @@ -2402,7 +2407,7 @@ HRESULT CALLBACK IEnumConnections_Next_Proxy( { ULONG fetched; - TRACE("(%u, %p %p)\n", cConnections, rgcd, pcFetched); + TRACE("%lu, %p, %p.\n", cConnections, rgcd, pcFetched); if (!pcFetched) pcFetched = &fetched; @@ -2418,7 +2423,7 @@ HRESULT __RPC_STUB IEnumConnections_Next_Stub( { HRESULT hr; - TRACE("(%u, %p, %p)\n", cConnections, rgcd, pcFetched); + TRACE("%lu, %p, %p.\n", cConnections, rgcd, pcFetched); *pcFetched = 0; hr = IEnumConnections_Next(This, cConnections, rgcd, pcFetched); @@ -2436,7 +2441,7 @@ HRESULT CALLBACK IEnumConnectionPoints_Next_Proxy( { ULONG fetched; - TRACE("(%u, %p %p)\n", cConnections, ppCP, pcFetched); + TRACE("%lu, %p %p.\n", cConnections, ppCP, pcFetched); if (!pcFetched) pcFetched = &fetched; @@ -2452,7 +2457,7 @@ HRESULT __RPC_STUB IEnumConnectionPoints_Next_Stub( { HRESULT hr; - TRACE("(%u, %p, %p)\n", cConnections, ppCP, pcFetched); + TRACE("%lu, %p, %p.\n", cConnections, ppCP, pcFetched); *pcFetched = 0; hr = IEnumConnectionPoints_Next(This, cConnections, ppCP, pcFetched); @@ -2467,7 +2472,7 @@ HRESULT CALLBACK IPersistMemory_Load_Proxy( LPVOID pMem, ULONG cbSize) { - TRACE("(%p, %u)\n", pMem, cbSize); + TRACE("%p, %lu.\n", pMem, cbSize); if (!pMem) return E_POINTER; @@ -2480,7 +2485,7 @@ HRESULT __RPC_STUB IPersistMemory_Load_Stub( BYTE *pMem, ULONG cbSize) { - TRACE("(%p, %u)\n", pMem, cbSize); + TRACE("%p, %lu.\n", pMem, cbSize); return IPersistMemory_Load(This, pMem, cbSize); } @@ -2490,7 +2495,7 @@ HRESULT CALLBACK IPersistMemory_Save_Proxy( BOOL fClearDirty, ULONG cbSize) { - TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize); + TRACE("%p, %d, %lu.\n", pMem, fClearDirty, cbSize); if (!pMem) return E_POINTER; @@ -2504,7 +2509,7 @@ HRESULT __RPC_STUB IPersistMemory_Save_Stub( BOOL fClearDirty, ULONG cbSize) { - TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize); + TRACE("%p, %d, %lu.\n", pMem, fClearDirty, cbSize); return IPersistMemory_Save(This, pMem, fClearDirty, cbSize); } @@ -2512,7 +2517,7 @@ void CALLBACK IAdviseSinkEx_OnViewStatusChange_Proxy( IAdviseSinkEx* This, DWORD dwViewStatus) { - TRACE("(%p, 0x%08x)\n", This, dwViewStatus); + TRACE("%p, %#lx.\n", This, dwViewStatus); IAdviseSinkEx_RemoteOnViewStatusChange_Proxy(This, dwViewStatus); } @@ -2520,7 +2525,7 @@ HRESULT __RPC_STUB IAdviseSinkEx_OnViewStatusChange_Stub( IAdviseSinkEx* This, DWORD dwViewStatus) { - TRACE("(%p, 0x%08x)\n", This, dwViewStatus); + TRACE("%p, %#lx.\n", This, dwViewStatus); IAdviseSinkEx_OnViewStatusChange(This, dwViewStatus); return S_OK; } @@ -2533,7 +2538,7 @@ HRESULT CALLBACK IEnumOleUndoUnits_Next_Proxy( { ULONG fetched; - TRACE("(%u, %p %p)\n", cElt, rgElt, pcEltFetched); + TRACE("%lu, %p %p.\n", cElt, rgElt, pcEltFetched); if (!pcEltFetched) pcEltFetched = &fetched; @@ -2549,7 +2554,7 @@ HRESULT __RPC_STUB IEnumOleUndoUnits_Next_Stub( { HRESULT hr; - TRACE("(%u, %p, %p)\n", cElt, rgElt, pcEltFetched); + TRACE("%lu, %p, %p.\n", cElt, rgElt, pcEltFetched); *pcEltFetched = 0; hr = IEnumOleUndoUnits_Next(This, cElt, rgElt, pcEltFetched); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 8ed8f790d14..1d6fac4c518 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -492,7 +492,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, DWORD fmt_state = 0; LPCWSTR pFormat = lpszFormat; - TRACE("(%s,%p,%d,%d,%d,0x%08x,%p)\n", debugstr_w(lpszFormat), rgbTok, cbTok, + TRACE("%s, %p, %d, %d, %d, %#lx, %p.\n", debugstr_w(lpszFormat), rgbTok, cbTok, nFirstDay, nFirstWeek, lcid, pcbActual); if (!rgbTok || @@ -1162,7 +1162,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes = S_OK; - TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vString) = VT_EMPTY; @@ -1570,7 +1570,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes; - TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), + TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vDate) = VT_EMPTY; @@ -1909,7 +1909,7 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, BOOL bUpper = FALSE; HRESULT hRes = S_OK; - TRACE("%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vStr) = VT_EMPTY; @@ -2035,7 +2035,7 @@ HRESULT WINAPI VarFormatFromTokens(LPVARIANT pVarIn, LPOLESTR lpszFormat, VARIANT vTmp; HRESULT hres; - TRACE("(%p,%s,%p,%x,%p,0x%08x)\n", pVarIn, debugstr_w(lpszFormat), + TRACE("%p, %s, %p, %#lx, %p, %#lx.\n", pVarIn, debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); if (!pbstrOut) @@ -2122,7 +2122,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, BYTE buff[256]; HRESULT hres; - TRACE("(%s,%s,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + TRACE("%s, %s, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), nFirstDay, nFirstWeek, dwFlags, pbstrOut); if (!pbstrOut) @@ -2134,7 +2134,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, if (SUCCEEDED(hres)) hres = VarFormatFromTokens(pVarIn, lpszFormat, buff, dwFlags, pbstrOut, LOCALE_USER_DEFAULT); - TRACE("returning 0x%08x, %s\n", hres, debugstr_w(*pbstrOut)); + TRACE("returning %#lx, %s\n", hres, debugstr_w(*pbstrOut)); return hres; } @@ -2172,7 +2172,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B static WCHAR szEmpty[] = L""; const BYTE* lpFmt = NULL; - TRACE("%s,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); + TRACE("%s, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4) return E_INVALIDARG; @@ -2224,7 +2224,7 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vStr; - TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) @@ -2329,7 +2329,7 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vDbl; - TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) @@ -2403,7 +2403,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, VARIANT vStr; CY cy; - TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) @@ -2512,7 +2512,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO return E_INVALIDARG; if (dwFlags) - FIXME("Does not support dwFlags 0x%x, ignoring.\n", dwFlags); + FIXME("Does not support flags %#lx, ignoring.\n", dwFlags); if (fAbbrev) localeValue = LOCALE_SABBREVMONTHNAME1 + iMonth - 1; @@ -2521,7 +2521,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, NULL, 0); if (!size) { - ERR("GetLocaleInfo 0x%x failed.\n", localeValue); + ERR("GetLocaleInfo %#lx failed.\n", localeValue); return HRESULT_FROM_WIN32(GetLastError()); } *pbstrOut = SysAllocStringLen(NULL,size - 1); @@ -2529,7 +2529,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO return E_OUTOFMEMORY; size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, *pbstrOut, size); if (!size) { - ERR("GetLocaleInfo of 0x%x failed in 2nd stage?!\n", localeValue); + ERR("GetLocaleInfo of %#lx failed in 2nd stage?!\n", localeValue); SysFreeString(*pbstrOut); return HRESULT_FROM_WIN32(GetLastError()); } @@ -2569,7 +2569,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, return E_INVALIDARG; if (dwFlags) - FIXME("Does not support dwFlags 0x%x, ignoring.\n", dwFlags); + FIXME("Does not support flags %#lx, ignoring.\n", dwFlags); /* If we have to use the default firstDay, find which one it is */ if (iFirstDay == 0) { @@ -2578,7 +2578,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, (LPWSTR)&firstDay, sizeof(firstDay) / sizeof(WCHAR)); if (!size) { - ERR("GetLocaleInfo 0x%x failed.\n", localeValue); + ERR("GetLocaleInfo %#lx failed.\n", localeValue); return HRESULT_FROM_WIN32(GetLastError()); } iFirstDay = firstDay + 2; @@ -2591,7 +2591,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, /* Determine the size of the data, allocate memory and retrieve the data */ size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, NULL, 0); if (!size) { - ERR("GetLocaleInfo 0x%x failed.\n", localeValue); + ERR("GetLocaleInfo %#lx failed.\n", localeValue); return HRESULT_FROM_WIN32(GetLastError()); } *pbstrOut = SysAllocStringLen(NULL, size - 1); @@ -2599,7 +2599,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, return E_OUTOFMEMORY; size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, *pbstrOut, size); if (!size) { - ERR("GetLocaleInfo 0x%x failed in 2nd stage?!\n", localeValue); + ERR("GetLocaleInfo %#lx failed in 2nd stage?!\n", localeValue); SysFreeString(*pbstrOut); return HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 010b1143172..bf8f041b9c6 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -51,7 +51,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARTYPE vtFrom = V_TYPE(ps); DWORD dwFlags = 0; - TRACE("(%s,0x%08x,0x%04x,%s,%s)\n", debugstr_variant(pd), lcid, wFlags, + TRACE("%s, %#lx, 0x%04x, %s, %s.\n", debugstr_variant(pd), lcid, wFlags, debugstr_variant(ps), debugstr_vt(vt)); if (vt == VT_BSTR || vtFrom == VT_BSTR) @@ -918,7 +918,7 @@ VariantCopyInd_Return: if (pSrc != pvargSrc) VariantClear(&vTmp); - TRACE("returning 0x%08x, %s\n", hres, debugstr_variant(pvargDest)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(pvargDest)); return hres; } @@ -972,7 +972,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar { HRESULT res = S_OK; - TRACE("(%s,%s,0x%08x,0x%04x,%s)\n", debugstr_variant(pvargDest), + TRACE("%s, %s, %#lx, 0x%04x, %s.\n", debugstr_variant(pvargDest), debugstr_variant(pvargSrc), lcid, wFlags, debugstr_vt(vt)); if (vt == VT_CLSID) @@ -1021,7 +1021,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar } } - TRACE("returning 0x%08x, %s\n", res, debugstr_variant(pvargDest)); + TRACE("returning %#lx, %s\n", res, debugstr_variant(pvargDest)); return res; } @@ -1329,7 +1329,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT UDATE ud; double dateVal = 0; - TRACE("(%p->%d/%d/%d %d:%d:%d:%d %d %d,0x%08x,0x%08x,%p)\n", pUdateIn, + TRACE("%p, %d/%d/%d, %d:%d:%d:%d, %#x, %d, %#lx, %#lx, %p.\n", pUdateIn, pUdateIn->st.wMonth, pUdateIn->st.wDay, pUdateIn->st.wYear, pUdateIn->st.wHour, pUdateIn->st.wMinute, pUdateIn->st.wSecond, pUdateIn->st.wMilliseconds, pUdateIn->st.wDayOfWeek, @@ -1338,7 +1338,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT if (lcid != MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)) FIXME("lcid possibly not handled, treating as en-us\n"); if (dwFlags & ~(VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY)) - FIXME("unsupported flags: %x\n", dwFlags); + FIXME("unsupported flags: %lx\n", dwFlags); ud = *pUdateIn; @@ -1416,7 +1416,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) double datePart, timePart; int julianDays; - TRACE("(%g,0x%08x,%p)\n", dateIn, dwFlags, lpUdate); + TRACE("%g, %#lx, %p.\n", dateIn, dwFlags, lpUdate); if (dateIn <= (DATE_MIN - 1.0) || dateIn >= (DATE_MAX + 1.0)) return E_INVALIDARG; @@ -1507,7 +1507,7 @@ typedef struct tagVARIANT_NUMBER_CHARS WARN("buffer too small for " #fld "\n"); \ else \ if (buff[0]) lpChars->name = buff[0]; \ - TRACE("lcid 0x%x, " #name "=%s\n", lcid, wine_dbgstr_wn(&lpChars->name, 1)) + TRACE("lcid 0x%lx, " #name "=%s\n", lcid, wine_dbgstr_wn(&lpChars->name, 1)) /* Get the valid number characters for an lcid */ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) @@ -1533,7 +1533,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID if (!*lpChars->sCurrency) wcscpy(lpChars->sCurrency, L"$"); lpChars->sCurrencyLen = wcslen(lpChars->sCurrency); - TRACE("lcid 0x%x, sCurrency=%u %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency)); + TRACE("lcid %#lx, sCurrency %lu %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency)); } /* Number Parsing States */ @@ -1590,7 +1590,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla int cchUsed = 0; OLECHAR cDigitSeparator2; - TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); + TRACE("%s, %#lx, %#lx, %p, %p.\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); if (!pNumprs || !rgbDig) return E_INVALIDARG; @@ -2083,7 +2083,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, int wholeNumberDigits, fractionalDigits, divisor10 = 0, multiplier10 = 0; - TRACE("(%p,%p,0x%x,%p)\n", pNumprs, rgbDig, dwVtBits, pVarDst); + TRACE("%p, %p, %lx, %p.\n", pNumprs, rgbDig, dwVtBits, pVarDst); if (pNumprs->nBaseShift) { @@ -2182,7 +2182,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, return S_OK; } - TRACE("Overflow: possible return types: 0x%x, value: %s\n", dwVtBits, wine_dbgstr_longlong(ul64)); + TRACE("Overflow: possible return types: %#lx, value: %s\n", dwVtBits, wine_dbgstr_longlong(ul64)); return DISP_E_OVERFLOW; } @@ -2783,7 +2783,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) DWORD xmask; HRESULT rc; - TRACE("(%s,%s,0x%08x,0x%08x)\n", debugstr_variant(left), debugstr_variant(right), lcid, flags); + TRACE("%s, %s, %#lx, %#lx.\n", debugstr_variant(left), debugstr_variant(right), lcid, flags); lvt = V_VT(left) & VT_TYPEMASK; rvt = V_VT(right) & VT_TYPEMASK; @@ -3378,7 +3378,7 @@ end: VariantClear(&tv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(result)); return hres; } @@ -3567,7 +3567,7 @@ end: VariantClear(&tv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(result)); return hres; } @@ -3729,7 +3729,7 @@ end: VariantClear(&rv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(result)); return hres; } @@ -3992,7 +3992,7 @@ end: VariantClear(&rv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(result)); return hres; } @@ -5225,7 +5225,7 @@ VarRound_Exit: V_VT(pVarOut) = VT_EMPTY; VariantClear(&temp); - TRACE("returning 0x%08x %s\n", hRet, debugstr_variant(pVarOut)); + TRACE("returning %#lx, %s\n", hRet, debugstr_variant(pVarOut)); return hRet; } @@ -5585,14 +5585,14 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) rc = VariantChangeType(&lv, left, 0, VT_I8); if(FAILED(rc)) { - FIXME("Could not convert left type %d to %d? rc == 0x%X\n", V_VT(left), VT_I8, rc); + FIXME("Could not convert left type %d to %d? rc == %#lx.\n", V_VT(left), VT_I8, rc); goto end; } rc = VariantChangeType(&rv, right, 0, VT_I8); if(FAILED(rc)) { - FIXME("Could not convert right type %d to %d? rc == 0x%X\n", V_VT(right), VT_I8, rc); + FIXME("Could not convert right type %d to %d? rc == %#lx.\n", V_VT(right), VT_I8, rc); goto end; } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 916a4858607..3850fec7066 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6723,7 +6723,7 @@ BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st, }; if(flags & ~(LOCALE_NOUSEROVERRIDE|VAR_DATEVALUEONLY)) - FIXME("ignoring flags %x\n", flags); + FIXME("ignoring flags %lx\n", flags); flags &= LOCALE_NOUSEROVERRIDE; while(*fmt && date_len) { @@ -6814,7 +6814,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst DWORD dwFormatFlags = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR date[128], fmt_buff[80], *time; - TRACE("(%g,0x%08x,0x%08x,%p)\n", dateIn, lcid, dwFlags, pbstrOut); + TRACE("%g, %#lx, %#lx, %p.\n", dateIn, lcid, dwFlags, pbstrOut); if (!pbstrOut || !VariantTimeToSystemTime(dateIn, &st)) return E_INVALIDARG; @@ -6888,7 +6888,7 @@ HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BS DWORD dwResId = IDS_TRUE; LANGID langId; - TRACE("%d,0x%08x,0x%08x,%p\n", boolIn, lcid, dwFlags, pbstrOut); + TRACE("%d, %#lx, %#lx, %p.\n", boolIn, lcid, dwFlags, pbstrOut); if (!pbstrOut) return E_INVALIDARG; @@ -7193,7 +7193,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl HRESULT hres; int ret; - TRACE("%s,%s,%d,%08x\n", + TRACE("%s, %s, %#lx, %#lx.\n", debugstr_wn(pbstrLeft, SysStringLen(pbstrLeft)), debugstr_wn(pbstrRight, SysStringLen(pbstrRight)), lcid, dwFlags); @@ -7233,7 +7233,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl hres = CompareStringW(lcid, dwFlags, pbstrLeft, lenLeft, pbstrRight, lenRight) - CSTR_LESS_THAN; - TRACE("%d\n", hres); + TRACE("%ld\n", hres); return hres; } } @@ -7448,7 +7448,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate, else v3 = dp->dwValues[offset + 2]; - TRACE("(%d,%d,%d,%d,%d)\n", v1, v2, v3, iDate, offset); + TRACE("%ld, %ld, %ld, %ld, %ld.\n", v1, v2, v3, iDate, offset); /* If one number must be a month (Because a month name was given), then only * consider orders with the month in that position. @@ -7476,7 +7476,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate, } VARIANT_MakeDate_Start: - TRACE("dwAllOrders is 0x%08x\n", dwAllOrders); + TRACE("dwAllOrders is %#lx\n", dwAllOrders); while (dwAllOrders) { @@ -7508,7 +7508,7 @@ VARIANT_MakeDate_Start: dwTry = dwAllOrders; } - TRACE("Attempt %d, dwTry is 0x%08x\n", dwCount, dwTry); + TRACE("Attempt %ld, dwTry is %#lx\n", dwCount, dwTry); dwCount++; if (!dwTry) @@ -7604,7 +7604,7 @@ VARIANT_MakeDate_OK: * But Wine doesn't have/use that key at the time of writing. */ st->wYear = v3 <= 49 ? 2000 + v3 : v3 <= 99 ? 1900 + v3 : v3; - TRACE("Returning date %d/%d/%d\n", v1, v2, st->wYear); + TRACE("Returning date %ld/%ld/%d\n", v1, v2, st->wYear); return S_OK; } @@ -7673,13 +7673,13 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA *pdateOut = 0.0; - TRACE("(%s,0x%08x,0x%08x,%p)\n", debugstr_w(strIn), lcid, dwFlags, pdateOut); + TRACE("%s, %#lx, %#lx, %p.\n", debugstr_w(strIn), lcid, dwFlags, pdateOut); memset(&dp, 0, sizeof(dp)); GetLocaleInfoW(lcid, LOCALE_IDATE|LOCALE_RETURN_NUMBER|(dwFlags & LOCALE_NOUSEROVERRIDE), (LPWSTR)&iDate, sizeof(iDate)/sizeof(WCHAR)); - TRACE("iDate is %d\n", iDate); + TRACE("iDate is %ld\n", iDate); /* Get the month/day/am/pm tokens for this locale */ for (i = 0; i < ARRAY_SIZE(tokens); i++) @@ -7831,7 +7831,7 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA * magic here occurs in VARIANT_MakeDate() above, where we determine what * each date number must represent in the context of iDate. */ - TRACE("0x%08x\n", TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4)); + TRACE("%#lx\n", TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4)); switch (TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4)) { -- 2.34.1

1 0

[PATCH 1/3] kernel32/tests: Add test for GetConsoleProcessList.
by Roman Pišl 12 Feb '22

12 Feb '22

Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/kernel32/tests/console.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e4d9d43f4c4..94a0a370462 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1304,8 +1304,8 @@ static void test_GetConsoleProcessList(void) GetLastError()); /* We should only have 1 process but only for these specific unit tests as - * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) would - * give us two processes for example. + * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) + * gives us two processes - see test_AttachConsole. */ list = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); @@ -4354,6 +4354,20 @@ static void test_AttachConsole_child(DWORD console_pid) res = AttachConsole(ATTACH_PARENT_PROCESS); ok(res, "AttachConsole failed: %u\n", GetLastError()); + if (pGetConsoleProcessList) + { + DWORD list[2]; + DWORD pid = GetCurrentProcessId(); + SetLastError(0xdeadbeef); + len = pGetConsoleProcessList(list, 2); + todo_wine + ok(len == 2, "Expected 2, got %d\n", len); + todo_wine + ok(list[0] == console_pid || list[1] == console_pid, "Parent PID not in list\n"); + todo_wine + ok(list[0] == pid || list[1] == pid, "PID not in list\n"); + } + ok(pipe_in != GetStdHandle(STD_INPUT_HANDLE), "std handle not set to console\n"); ok(pipe_out != GetStdHandle(STD_OUTPUT_HANDLE), "std handle not set to console\n"); -- 2.30.2

2 5

[PATCH 01/27] dlls/dpvoice: enable compilation with long types
by Eric Pouech 12 Feb '22

12 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dpvoice/Makefile.in | 1 - dlls/dpvoice/client.c | 28 ++++++++++++++-------------- dlls/dpvoice/server.c | 18 +++++++++--------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index a3d85b093c6..7767d141fa8 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpvoice.dll IMPORTS = dxguid uuid diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index b611370659e..b84f27b0a22 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -74,7 +74,7 @@ static ULONG WINAPI dpvclient_AddRef(IDirectPlayVoiceClient *iface) IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -84,7 +84,7 @@ static ULONG WINAPI dpvclient_Release(IDirectPlayVoiceClient *iface) IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -97,7 +97,7 @@ static HRESULT WINAPI dpvclient_Initialize(IDirectPlayVoiceClient *iface,LPUNKNO void *pUserContext, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %p %d\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %p %p %p %ld\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } @@ -105,14 +105,14 @@ static HRESULT WINAPI dpvclient_Connect(IDirectPlayVoiceClient *iface, PDVSOUNDD PDVCLIENTCONFIG pdvClientConfig, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %d\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags); + FIXME("%p %p %p %ld\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_Disconnect(IDirectPlayVoiceClient *iface, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d\n", This, dwFlags); + FIXME("%p %ld\n", This, dwFlags); return E_NOTIMPL; } @@ -148,7 +148,7 @@ static HRESULT WINAPI dpvclient_GetCompressionTypes(IDirectPlayVoiceClient *ifac DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } @@ -156,7 +156,7 @@ static HRESULT WINAPI dpvclient_SetTransmitTargets(IDirectPlayVoiceClient *iface DWORD dwNumTargets, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d %d\n", This, pdvIDTargets, dwNumTargets, dwFlags); + FIXME("%p %p %ld %ld\n", This, pdvIDTargets, dwNumTargets, dwFlags); return E_NOTIMPL; } @@ -164,7 +164,7 @@ static HRESULT WINAPI dpvclient_GetTransmitTargets(IDirectPlayVoiceClient *iface DWORD *pdwNumTargets, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d\n", This, pdwNumTargets, dwFlags); + FIXME("%p %p %ld\n", This, pdwNumTargets, dwFlags); return E_NOTIMPL; } @@ -173,21 +173,21 @@ static HRESULT WINAPI dpvclient_Create3DSoundBuffer(IDirectPlayVoiceClient *ifac LPDIRECTSOUND3DBUFFER *lpUserBuffer) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d %p %d %d %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer); + FIXME("%p %ld %p %ld %ld %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_Delete3DSoundBuffer(IDirectPlayVoiceClient *iface, DVID dvID, LPDIRECTSOUND3DBUFFER *lpUserBuffer) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d %p\n", This, dvID, lpUserBuffer); + FIXME("%p %ld %p\n", This, dvID, lpUserBuffer); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_SetNotifyMask(IDirectPlayVoiceClient *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } @@ -261,7 +261,7 @@ static ULONG WINAPI dpvtest_AddRef(IDirectPlayVoiceTest *iface) IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -271,7 +271,7 @@ static ULONG WINAPI dpvtest_Release(IDirectPlayVoiceTest *iface) IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -284,7 +284,7 @@ static HRESULT WINAPI dpvtest_CheckAudioSetup(IDirectPlayVoiceTest *iface, const HWND hwndParent, DWORD dwFlags) { IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); - FIXME("%p %s %s %p %d\n", This, debugstr_guid(pguidPlaybackDevice), + FIXME("%p %s %s %p %ld\n", This, debugstr_guid(pguidPlaybackDevice), debugstr_guid(pguidCaptureDevice), hwndParent, dwFlags); return E_NOTIMPL; } diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index a476a2e585d..42fea27a192 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -100,7 +100,7 @@ static ULONG WINAPI dpvserver_AddRef(IDirectPlayVoiceServer *iface) IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -110,7 +110,7 @@ static ULONG WINAPI dpvserver_Release(IDirectPlayVoiceServer *iface) IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -123,21 +123,21 @@ static HRESULT WINAPI dpvserver_Initialize(IDirectPlayVoiceServer *iface, IUnkno void *pUserContext, DWORD *lpdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %p %d\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %p %p %p %ld\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_StartSession(IDirectPlayVoiceServer *iface, PDVSESSIONDESC pSessionDesc, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %d\n", This, pSessionDesc, dwFlags); + FIXME("%p %p %ld\n", This, pSessionDesc, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_StopSession(IDirectPlayVoiceServer *iface, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d\n", This, dwFlags); + FIXME("%p %ld\n", This, dwFlags); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *ifac DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } @@ -174,7 +174,7 @@ static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface DWORD dwNumTargets, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d %p %d %d\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); + FIXME("%p %ld %p %ld %ld\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); return E_NOTIMPL; } @@ -182,14 +182,14 @@ static HRESULT WINAPI dpvserver_GetTransmitTargets(IDirectPlayVoiceServer *iface DWORD *pdwNumTargets, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d %p %p %d\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); + FIXME("%p %ld %p %p %ld\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_SetNotifyMask(IDirectPlayVoiceServer *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; }

5 30

ucrtbase/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/Makefile.in | 2 +- dlls/ucrtbase/tests/misc.c | 20 +++++++++--------- dlls/ucrtbase/tests/printf.c | 4 ++-- dlls/ucrtbase/tests/string.c | 2 +- dlls/ucrtbase/tests/thread.c | 36 ++++++++++++++++----------------- 5 files changed, 32 insertions(+), 32 deletions(-)

1 0

msvcrt/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/Makefile.in | 1 - dlls/msvcrt/tests/data.c | 10 ++++----- dlls/msvcrt/tests/file.c | 42 +++++++++++++++++------------------ dlls/msvcrt/tests/locale.c | 6 ++--- dlls/msvcrt/tests/misc.c | 22 +++++++++--------- dlls/msvcrt/tests/string.c | 26 +++++++++++----------- dlls/msvcrt/tests/time.c | 14 ++++++------ 7 files changed, 60 insertions(+), 61 deletions(-)

1 0

msvcr90/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/Makefile.in | 1 - dlls/msvcr90/tests/msvcr90.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-)

1 0

msvcrtd/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrtd/tests/Makefile.in | 1 - dlls/msvcrtd/tests/debug.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)

1 0

msvcr120/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/tests/Makefile.in | 1 - dlls/msvcr120/tests/msvcr120.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-)

1 0

msvcr100/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/tests/Makefile.in | 1 - dlls/msvcr100/tests/msvcr100.c | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-)

1 0

msvcp90/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/tests/Makefile.in | 1 - dlls/msvcp90/tests/ios.c | 14 +++++++------- dlls/msvcp90/tests/misc.c | 8 ++++---- dlls/msvcp90/tests/string.c | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-)

1 0

msvcp140/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/tests/Makefile.in | 1 - dlls/msvcp140/tests/msvcp140.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-)

1 0

msvcp140_atomic_wait/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/tests/Makefile.in | 1 - .../tests/msvcp140_atomic_wait.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)

1 0

msvcp120/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/Makefile.in | 1 - dlls/msvcp120/tests/msvcp120.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-)

1 0

[PATCH v2 1/5] include/windows.foundation.collections.idl: Add IVector<T> interface.
by Bernhard Kölbl 11 Feb '22

11 Feb '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: Added missing parameters and attributes. This and more incoming patches are part of a bigger branch: https://github.com/besentv/wine-patches/tree/main/windows.media.speech --- include/windows.foundation.collections.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 876e15336a2..a2d2d75ec4f 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -118,6 +118,26 @@ cpp_quote("#endif") HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(913337e9-11a1-4345-a3a2-4e7f956e222d) + ] + interface IVector<T> : IInspectable + { + HRESULT GetAt([in, optional] UINT32 index, [out, retval] T *value); + [propget] HRESULT Size([out, retval] UINT32 *value); + HRESULT GetView([out, retval] IVectorView<T> **value); + HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); + HRESULT SetAt([in] UINT32 index, [in, optional] T value); + HRESULT InsertAt([in] UINT32 index, [in, optional] T value); + HRESULT RemoveAt([in] UINT32 index); + HRESULT Append([in, optional] T value); + HRESULT RemoveAtEnd(); + HRESULT Clear(); + HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); + HRESULT ReplaceAll([in] UINT32 count, [in] T *items); + } } #endif } -- 2.34.1

2 5

[PATCH 2/2] msvcirt/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcirt/tests/Makefile.in | 1 - dlls/msvcirt/tests/msvcirt.c | 84 +++++++++++++++++----------------- 2 files changed, 42 insertions(+), 43 deletions(-)

1 0

[PATCH vkd3d v5 1/6] tests: Test matrix multiplication.
by Giovanni Mascellani 11 Feb '22

11 Feb '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v2: * Split to many individual tests --- Makefile.am | 2 + tests/hlsl-mul.shader_test | 290 +++++++++++++++++++++++++++++++++++++ 2 files changed, 292 insertions(+) create mode 100644 tests/hlsl-mul.shader_test diff --git a/Makefile.am b/Makefile.am index 7a7bd6a7..687b624c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,7 @@ vkd3d_shader_tests = \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ @@ -319,6 +320,7 @@ XFAIL_TESTS = \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl-mul.shader_test new file mode 100644 index 00000000..7b453187 --- /dev/null +++ b/tests/hlsl-mul.shader_test @@ -0,0 +1,290 @@ + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (30.0, 70.0, 110.0, 150.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (90.0, 100.0, 110.0, 120.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float3 y = float3(1.0, 2.0, 3.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (14.0, 38.0, 62.0, 86.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3 x = float3(1.0, 2.0, 3.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (38.0, 44.0, 50.0, 56.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3x3 x = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + + return float4(mul(x, y), 0.0); +} + +[test] +draw quad +probe all rgba (14.0, 32.0, 50.0, 0.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float3x3 y = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + + return float4(mul(x, y), 0.0); +} + +[test] +draw quad +probe all rgba (30.0, 36.0, 42.0, 0.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float x = 10.0; + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (50.0, 60.0, 70.0, 80.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float y = 10.0; + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (50.0, 60.0, 70.0, 80.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1 x = float1(10.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 20.0, 30.0, 40.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1 y = float1(10.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 50.0, 90.0, 130.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1x1 x = float1x1(10.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 20.0, 30.0, 40.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x1 y = float1x1(10.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (10.0, 50.0, 90.0, 130.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (90.0, 100.0, 110.0, 120.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (5.0, 10.0, 15.0, 20.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + + return mul(x, y); +} + +[test] +draw quad +probe all rgba (30.0, 70.0, 110.0, 150.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float3x3 x = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + return mul(x, y)[1]; +} + +[test] +draw quad +probe all rgba (83.0, 98.0, 113.0, 128.0) + +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float3x3 y = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + + return float4(mul(x, y)[1], 0.0); +} + +[test] +draw quad +probe all rgba (78.0, 96.0, 114.0, 0.0) -- 2.34.1

2 6

[PATCH] concrt140/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 11 Feb '22

11 Feb '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/tests/Makefile.in | 1 - dlls/concrt140/tests/concrt140.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-)

1 0

[PATCH v2 1/5] comctl32/tests: Print id value as decimal.
by Dmitry Timoshkov 11 Feb '22

11 Feb '22

All the notification codes (printed as an id) have negative base value (SBN_, UDN_, HDN_, BCN_, TBN_, TTN_, RBN_, TRBN_, PGN_, TVN_, LVN_, TCN_, CBEN_, IPN_, MCN_, DTN_), and printing them as decimal helps to quickly identify the corresponding notification value in cases when an id in the message sequence doesn't match. Custom ids in the message sequences have small numbers (0, 1, 2, ...), so they also get printed correctly. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/msg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 7337c724a5c..8ba2efddb0a 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -261,14 +261,14 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, failcount++; dump++; ok_(file, line) (FALSE, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); } } else { ok_(file, line) (expected->id == actual->id, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); if (expected->id != actual->id) dump++; } -- 2.34.1

2 1

[PATCH 1/2] wined3d: Reinitialize query pool's free list entry when it runs out.
by Jan Sikorski 11 Feb '22

11 Feb '22

We check if it's empty to put it back in. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 97c60719489..60132dc81b5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1445,6 +1445,7 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, if (wined3d_query_pool_vk_allocate_query(pool_vk, &idx)) goto done; list_remove(&pool_vk->entry); + list_init(&pool_vk->entry); } if (!(pool_vk = heap_alloc_zero(sizeof(*pool_vk)))) -- 2.32.0

2 4

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel