wine-devel

wine-devel@winehq.org

7 participants
84466 discussions

[PATCH 7/8] winex11: Directly use win32u for user functions in mouse.c.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 86 ++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-)

2 1

[PATCH 6/8] win32u: Introduce NtUserGetMessagePos.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 3 +++ include/ntuser.h | 6 ++++++ 2 files changed, 9 insertions(+)

2 1

[PATCH 4/8] win32u: Introduce NtUserMapWindowPoints.
by Jacek Caban 14 Apr '22

14 Apr '22

And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 22 ++-------------------- dlls/win32u/window.c | 7 +++++++ include/ntuser.h | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 20 deletions(-)

2 1

[PATCH 3/8] win32u: Move EnableWindow implementation from user32.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 30 +----------------------------- dlls/win32u/window.c | 37 +++++++++++++++++++++++++++++++++++++ include/ntuser.h | 6 ++++++ 3 files changed, 44 insertions(+), 29 deletions(-)

2 1

[PATCH 2/8] win32u: Move NtUserChildWindowFromPointEx implementation from user32.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 42 +++++++---------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 58 insertions(+), 36 deletions(-)

2 1

[PATCH 1/8] win32u: Move NtUserExcludeUpdateRgn implementation from user32.
by Jacek Caban 14 Apr '22

14 Apr '22

2 1

[PATCH 01/12] regedit: Use wide character string literals in childwnd.c
by Hugh McMaster 14 Apr '22

14 Apr '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 582f3c0c177..704299be837 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -32,12 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); ChildWnd* g_pChildWnd; static int last_split; -static const WCHAR wszLastKey[] = {'L','a','s','t','K','e','y',0}; -static const WCHAR wszKeyName[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'A','p','p','l','e','t','s','\\','R','e','g','e','d','i','t',0}; +static const WCHAR wszLastKey[] = L"LastKey"; +static const WCHAR wszKeyName[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; /******************************************************************************* * Local module support methods @@ -58,11 +54,7 @@ static LPCWSTR GetRootKeyName(HKEY hRootKey) if(hRootKey == HKEY_DYN_DATA) return reg_class_namesW[INDEX_HKEY_DYN_DATA]; else - { - static const WCHAR unknown_key[] = {'U','N','K','N','O','W','N',' ','H','K','E','Y',',',' ', - 'P','L','E','A','S','E',' ','R','E','P','O','R','T',0}; - return unknown_key; - } + return L"Unknown HKEY. Please report."; } static void draw_splitbar(HWND hWnd, int x) -- 2.35.2

1 11

[PATCH vkd3d 1/4] tests: Transition back to D3D12_RESOURCE_STATE_RENDER_TARGET in d3d12_runner_probe_vec4().
by Zebediah Figura 14 Apr '22

14 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tests/shader_runner_d3d12.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 06221691e..c3eb56864 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -296,8 +296,6 @@ static void d3d12_runner_draw(struct shader_runner *r, ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, test_context->rtv, clear_color, 0, NULL); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, 1, 0, 0); - transition_resource_state(command_list, test_context->render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); /* Finish the command list so that we can destroy objects. */ hr = ID3D12GraphicsCommandList_Close(command_list); @@ -314,11 +312,15 @@ static void d3d12_runner_probe_vec4(struct shader_runner *r, struct test_context *test_context = &runner->test_context; struct resource_readback rb; + transition_resource_state(test_context->list, test_context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(test_context->render_target, 0, &rb, test_context->queue, test_context->list); check_readback_data_vec4(&rb, rect, v, ulps); release_resource_readback(&rb); reset_command_list(test_context->list, test_context->allocator); + transition_resource_state(test_context->list, test_context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } static const struct shader_runner_ops d3d12_runner_ops = -- 2.35.1

3 14

[PATCH 3/3] winepulse: Implement Wow64 entry points in the Unix library.
by Huw Davies 14 Apr '22

14 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 383 +++++++++++++++++++++++++++++++++++++ 1 file changed, 383 insertions(+) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 34955a5ee8d..6daf1650f9b 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2306,3 +2306,386 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_is_started, pulse_get_prop_value, }; + +#ifdef _WIN64 + +typedef UINT PTR32; + +static NTSTATUS pulse_wow64_main_loop(void *args) +{ + struct + { + PTR32 event; + } *params32 = args; + struct main_loop_params params = + { + .event = ULongToHandle(params32->event) + }; + return pulse_main_loop(&params); +} + +static NTSTATUS pulse_wow64_get_endpoint_ids(void *args) +{ + struct + { + EDataFlow flow; + PTR32 endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; + } *params32 = args; + struct get_endpoint_ids_params params = + { + .flow = params32->flow, + .endpoints = ULongToPtr(params32->endpoints), + .size = params32->size + }; + pulse_get_endpoint_ids(&params); + params32->size = params.size; + params32->result = params.result; + params32->num = params.num; + params32->default_idx = params.default_idx; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_create_stream(void *args) +{ + struct + { + PTR32 name; + PTR32 pulse_name; + EDataFlow dataflow; + AUDCLNT_SHAREMODE mode; + DWORD flags; + REFERENCE_TIME duration; + PTR32 fmt; + HRESULT result; + PTR32 channel_count; + PTR32 stream; + } *params32 = args; + struct create_stream_params params = + { + .name = ULongToPtr(params32->name), + .pulse_name = ULongToPtr(params32->pulse_name), + .dataflow = params32->dataflow, + .mode = params32->mode, + .flags = params32->flags, + .duration = params32->duration, + .fmt = ULongToPtr(params32->fmt), + .channel_count = ULongToPtr(params32->channel_count), + .stream = ULongToPtr(params32->stream) + }; + pulse_create_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_release_stream(void *args) +{ + struct + { + unsigned int stream; + PTR32 timer; + HRESULT result; + } *params32 = args; + struct release_stream_params params = + { + .stream = params32->stream, + .timer = ULongToHandle(params32->timer) + }; + pulse_release_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_render_buffer(void *args) +{ + struct + { + unsigned int stream; + UINT32 frames; + HRESULT result; + PTR32 data; + } *params32 = args; + BYTE *data = NULL; + struct get_render_buffer_params params = + { + .stream = params32->stream, + .frames = params32->frames, + .data = &data + }; + pulse_get_render_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_capture_buffer(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 data; + PTR32 frames; + PTR32 flags; + PTR32 devpos; + PTR32 qpcpos; + } *params32 = args; + BYTE *data = NULL; + struct get_capture_buffer_params params = + { + .stream = params32->stream, + .data = &data, + .frames = ULongToPtr(params32->frames), + .flags = ULongToPtr(params32->flags), + .devpos = ULongToPtr(params32->devpos), + .qpcpos = ULongToPtr(params32->qpcpos) + }; + pulse_get_capture_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +}; + +static NTSTATUS pulse_wow64_get_buffer_size(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 size; + } *params32 = args; + struct get_buffer_size_params params = + { + .stream = params32->stream, + .size = ULongToPtr(params32->size) + }; + pulse_get_buffer_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_latency(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 latency; + } *params32 = args; + struct get_latency_params params = + { + .stream = params32->stream, + .latency = ULongToPtr(params32->latency) + }; + pulse_get_latency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_current_padding(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 padding; + } *params32 = args; + struct get_current_padding_params params = + { + .stream = params32->stream, + .padding = ULongToPtr(params32->padding) + }; + pulse_get_current_padding(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_next_packet_size(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 frames; + } *params32 = args; + struct get_next_packet_size_params params = + { + .stream = params32->stream, + .frames = ULongToPtr(params32->frames) + }; + pulse_get_next_packet_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_frequency(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 freq; + } *params32 = args; + struct get_frequency_params params = + { + .stream = params32->stream, + .freq = ULongToPtr(params32->freq) + }; + pulse_get_frequency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_position(void *args) +{ + struct + { + unsigned int stream; + BOOL device; + HRESULT result; + PTR32 pos; + PTR32 qpctime; + } *params32 = args; + struct get_position_params params = + { + .stream = params32->stream, + .device = params32->device, + .pos = ULongToPtr(params32->pos), + .qpctime = ULongToPtr(params32->qpctime) + }; + pulse_get_position(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_set_volumes(void *args) +{ + struct + { + unsigned int stream; + float master_volume; + PTR32 volumes; + PTR32 session_volumes; + } *params32 = args; + struct set_volumes_params params = + { + .stream = params32->stream, + .master_volume = params32->master_volume, + .volumes = ULongToPtr(params32->volumes), + .session_volumes = ULongToPtr(params32->session_volumes) + }; + return pulse_set_volumes(&params); +} + +static NTSTATUS pulse_wow64_set_event_handle(void *args) +{ + struct + { + unsigned int stream; + PTR32 event; + HRESULT result; + } *params32 = args; + struct set_event_handle_params params = + { + .stream = params32->stream, + .event = ULongToHandle(params32->event) + }; + pulse_set_event_handle(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_test_connect(void *args) +{ + struct + { + PTR32 name; + HRESULT result; + PTR32 config; + } *params32 = args; + struct test_connect_params params = + { + .name = ULongToPtr(params32->name), + .config = ULongToPtr(params32->config), /* struct pulse_config is identical */ + }; + pulse_test_connect(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_prop_value(void *args) +{ + struct + { + PTR32 pulse_name; + PTR32 guid; + PTR32 prop; + EDataFlow flow; + HRESULT result; + VARTYPE vt; + union + { + WCHAR wstr[128]; + ULONG ulVal; + }; + } *params32 = args; + struct get_prop_value_params params = + { + .pulse_name = ULongToPtr(params32->pulse_name), + .guid = ULongToPtr(params32->guid), + .prop = ULongToPtr(params32->prop), + .flow = params32->flow, + }; + pulse_get_prop_value(&params); + params32->result = params.result; + params32->vt = params.vt; + if (SUCCEEDED(params.result)) + { + switch (params.vt) + { + case VT_UI4: + params32->ulVal = params.ulVal; + break; + case VT_LPWSTR: + wcscpy(params32->wstr, params.wstr); + break; + default: + FIXME("Unhandled vt %04x\n", params.vt); + } + } + return STATUS_SUCCESS; +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + pulse_process_attach, + pulse_process_detach, + pulse_wow64_main_loop, + pulse_wow64_get_endpoint_ids, + pulse_wow64_create_stream, + pulse_wow64_release_stream, + pulse_start, + pulse_stop, + pulse_reset, + pulse_timer_loop, + pulse_wow64_get_render_buffer, + pulse_release_render_buffer, + pulse_wow64_get_capture_buffer, + pulse_release_capture_buffer, + pulse_wow64_get_buffer_size, + pulse_wow64_get_latency, + pulse_wow64_get_current_padding, + pulse_wow64_get_next_packet_size, + pulse_wow64_get_frequency, + pulse_wow64_get_position, + pulse_wow64_set_volumes, + pulse_wow64_set_event_handle, + pulse_wow64_test_connect, + pulse_is_started, + pulse_wow64_get_prop_value, +}; + +#endif /* _WIN64 */ -- 2.25.1

1 0

[PATCH v2] crypt32: Support CERT_QUERY_OBJECT_BLOB in CRYPT_QueryEmbeddedMessageObject().
by Paul Gofman 14 Apr '22

14 Apr '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The concern with the first patch version was that we probably should avoid using temporary file and change the underlying code to use memory directly instead. That is not straightforward to do as the current code heavily relies on the object being in the file throughout the call chain which ends in imagehlp.dll. Given CERT_QUERY_OBJECT_BLOB is supported for exe files since Win7 (as this test shows on Testbot) my initial guess was that Windows currently has the dependencies and call relation between the dlls some other way around, as some redesign around advapi32, crypt32, cryptsp, cryptbase probably happened around that time. Now I got back to this and tried to guess how that could be implemented but I could not find anything obviously usable for this purpose across MS docs and those dlls export dumps. It seems like Windows is also using temporary file in such a case, at least my added test indirectly suggests so. v2: - add test suggesting that temporary file is used; - rebase on top of upstream changes. dlls/crypt32/object.c | 40 +++++++++-- dlls/crypt32/tests/object.c | 140 ++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 6fbd3d25496..8123ed73351 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -629,15 +629,45 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, TRACE("%s\n", debugstr_w(pvObject)); - if (dwObjectType != CERT_QUERY_OBJECT_FILE) + if (dwObjectType == CERT_QUERY_OBJECT_BLOB) { - WARN("don't know what to do for type %ld embedded signed messages\n", - dwObjectType); + WCHAR temp_path[MAX_PATH], temp_name[MAX_PATH]; + const CERT_BLOB *b = pvObject; + + TRACE("cbData %lu, pbData %p.\n", b->cbData, b->pbData); + + if (!GetTempPathW(MAX_PATH, temp_path) || !GetTempFileNameW(temp_path, L"blb", 0, temp_name)) + { + ERR("Failed getting temp file name.\n"); + return FALSE; + } + file = CreateFileW(temp_name, GENERIC_READ | GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); + if (file == INVALID_HANDLE_VALUE) + { + ERR("Could not create temp file.\n"); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + if (!WriteFile(file, b->pbData, b->cbData, NULL, NULL)) + { + CloseHandle(file); + ERR("Could not write temp file.\n"); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + } + else if (dwObjectType == CERT_QUERY_OBJECT_FILE) + { + file = CreateFileW(pvObject, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + } + else + { + WARN("Unknown dwObjectType %lu.\n", dwObjectType); SetLastError(E_INVALIDARG); return FALSE; } - file = CreateFileW(pvObject, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) { ret = CryptSIPRetrieveSubjectGuid(pvObject, file, &subject); diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index a3c7c8c0743..0fd082c57db 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -95,10 +95,130 @@ L"MIIBiQYJKoZIhvcNAQcCoIIBejCCAXYCAQExDjAMBggqhkiG9w0CBQUAMBMGCSqG" "s+9Z0WbRm8CatppebW9tDVmpqm7pLKAe7sJgvFm+P2MGjckRHSNkku8u/FcppK/g" "7pMZOVHkRLgLKPSoDQ=="; +/* Self-signed .exe, built with tcc, signed with signtool + * (and a certificate generated on a self-signed CA). + * + * small.c: + * int _start() + * { + * return 0; + * } + * + * tcc -nostdlib small.c + * signtool sign /v /f codesign.pfx small.exe + */ +static const BYTE signed_pe_blob[] = +{ + 0x4D,0x5A,0x90,0x00,0x03,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0xB8,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x0E,0x1F,0xBA,0x0E,0x00,0xB4,0x09,0xCD, + 0x21,0xB8,0x01,0x4C,0xCD,0x21,0x54,0x68,0x69,0x73,0x20,0x70,0x72,0x6F,0x67,0x72,0x61,0x6D,0x20,0x63,0x61,0x6E,0x6E,0x6F, + 0x74,0x20,0x62,0x65,0x20,0x72,0x75,0x6E,0x20,0x69,0x6E,0x20,0x44,0x4F,0x53,0x20,0x6D,0x6F,0x64,0x65,0x2E,0x0D,0x0D,0x0A, + 0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x45,0x00,0x00,0x4C,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0xE0,0x00,0x0F,0x03,0x0B,0x01,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x10,0x00,0x00,0x00,0x02,0x00,0x00, + 0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x02,0x00,0x00, + 0xE7,0x0C,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x68,0x05,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2E,0x74,0x65,0x78,0x74,0x00,0x00,0x00, + 0x18,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x55,0x89,0xE5,0x81,0xEC,0x00,0x00,0x00,0x00,0x90,0xB8,0x00,0x00,0x00,0x00,0xE9, + 0x00,0x00,0x00,0x00,0xC9,0xC3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x05,0x00,0x00,0x00,0x02,0x02,0x00, + /* Start of the signature overlay */ + 0x30,0x82,0x05,0x5A,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02,0xA0,0x82,0x05,0x4B,0x30,0x82,0x05,0x47,0x02, + 0x01,0x01,0x31,0x0B,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x30,0x4C,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01, + 0x82,0x37,0x02,0x01,0x04,0xA0,0x3E,0x30,0x3C,0x30,0x17,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0F,0x30, + 0x09,0x03,0x01,0x00,0xA0,0x04,0xA2,0x02,0x80,0x00,0x30,0x21,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05,0x00,0x04, + 0x14,0xA0,0x95,0xDE,0xBD,0x1A,0xB7,0x86,0xAF,0x50,0x63,0xD8,0x8F,0x90,0xD5,0x49,0x96,0x4E,0x44,0xF0,0x71,0xA0,0x82,0x03, + 0x1D,0x30,0x82,0x03,0x19,0x30,0x82,0x02,0x01,0xA0,0x03,0x02,0x01,0x02,0x02,0x10,0x96,0x53,0x2C,0xC9,0x23,0x56,0x8A,0x87, + 0x42,0x30,0x3E,0xD5,0x8D,0x72,0xD5,0x25,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x30, + 0x17,0x31,0x15,0x30,0x13,0x06,0x03,0x55,0x04,0x03,0x13,0x0C,0x54,0x65,0x73,0x74,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74, + 0x30,0x1E,0x17,0x0D,0x31,0x36,0x30,0x33,0x30,0x33,0x32,0x30,0x32,0x37,0x30,0x37,0x5A,0x17,0x0D,0x34,0x39,0x31,0x32,0x33, + 0x31,0x32,0x33,0x30,0x30,0x30,0x30,0x5A,0x30,0x17,0x31,0x15,0x30,0x13,0x06,0x03,0x55,0x04,0x03,0x13,0x0C,0x43,0x6F,0x64, + 0x65,0x53,0x69,0x67,0x6E,0x54,0x65,0x73,0x74,0x30,0x82,0x01,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, + 0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0F,0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,0xB2,0xC9,0x91,0x98,0x8C,0xDC, + 0x80,0xBC,0x16,0xBF,0xC1,0x04,0x77,0x90,0xC0,0xFD,0x8C,0xBA,0x68,0x26,0xAC,0xB7,0x20,0x68,0x41,0xED,0xC3,0x9C,0x47,0x7C, + 0x36,0xC2,0x7B,0xE1,0x5E,0xFD,0xA9,0x99,0xF4,0x29,0x36,0x86,0x93,0x40,0x55,0x53,0x65,0x79,0xBC,0x9F,0x8F,0x6E,0x2B,0x05, + 0x84,0xE1,0xFD,0xD2,0xEF,0xEA,0x89,0x8C,0xEC,0xF9,0x55,0xF0,0x2C,0xE5,0xA7,0x29,0xF9,0x7E,0x50,0xDC,0x9C,0xA1,0x23,0xA5, + 0xD9,0x78,0xA1,0xE7,0x7C,0xD7,0x04,0x4F,0x11,0xAC,0x9F,0x4A,0x47,0xA1,0x1E,0xD5,0x9E,0xE7,0x5B,0xB5,0x8C,0x9C,0x67,0x7A, + 0xD0,0xF8,0x54,0xD1,0x64,0x7F,0x39,0x48,0xB6,0xCF,0x2F,0x26,0x7D,0x7B,0x13,0x2B,0xC2,0x8F,0xA6,0x3F,0x42,0x71,0x95,0x3E, + 0x59,0x0F,0x12,0xFA,0xC2,0x70,0x89,0xB7,0xB6,0x10,0x49,0xE0,0x7D,0x4D,0xFC,0x80,0x61,0x53,0x50,0x72,0xFD,0x46,0x35,0x51, + 0x36,0xE6,0x06,0xA9,0x4C,0x0D,0x82,0x15,0xF6,0x5D,0xDE,0xD4,0xDB,0xE7,0x82,0x10,0x40,0xA1,0x47,0x68,0x88,0x0C,0x0A,0x80, + 0xD1,0xE5,0x9A,0x35,0x28,0x82,0x1F,0x0F,0x80,0x5A,0x6E,0x1D,0x22,0x22,0xB3,0xA7,0xA2,0x9E,0x82,0x2D,0xC0,0x7F,0x5A,0xD0, + 0xBA,0xB2,0xCA,0x20,0xE2,0x97,0xE9,0x72,0x41,0xB7,0xD6,0x1A,0x93,0x23,0x97,0xF0,0xA9,0x61,0xD2,0x91,0xBD,0xB6,0x6B,0x95, + 0x12,0x67,0x16,0xAC,0x0A,0xB7,0x55,0x02,0x0D,0xA5,0xAD,0x17,0x95,0x77,0xF9,0x96,0x03,0x41,0xD3,0xE1,0x61,0x68,0xBB,0x0A, + 0xB5,0xC4,0xEE,0x70,0x40,0x08,0x05,0xC4,0xF1,0x5D,0x02,0x03,0x01,0x00,0x01,0xA3,0x61,0x30,0x5F,0x30,0x13,0x06,0x03,0x55, + 0x1D,0x25,0x04,0x0C,0x30,0x0A,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x03,0x30,0x48,0x06,0x03,0x55,0x1D,0x01,0x04, + 0x41,0x30,0x3F,0x80,0x10,0x35,0x40,0x67,0x8F,0x7D,0x03,0x1B,0x76,0x52,0x62,0x2D,0xF5,0x21,0xF6,0x7C,0xBC,0xA1,0x19,0x30, + 0x17,0x31,0x15,0x30,0x13,0x06,0x03,0x55,0x04,0x03,0x13,0x0C,0x54,0x65,0x73,0x74,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74, + 0x82,0x10,0xA0,0x4B,0xEB,0xAC,0xFA,0x08,0xF2,0x8B,0x47,0xD2,0xB3,0x54,0x60,0x6C,0xE6,0x29,0x30,0x0D,0x06,0x09,0x2A,0x86, + 0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x03,0x82,0x01,0x01,0x00,0x5F,0x8C,0x7F,0xDA,0x1D,0x21,0x7A,0x15,0xD8,0x20, + 0x04,0x53,0x7F,0x44,0x6D,0x7B,0x57,0xBE,0x7F,0x86,0x77,0x58,0xC4,0xD4,0x80,0xC7,0x2E,0x64,0x9B,0x44,0xC5,0x2D,0x6D,0xDB, + 0x35,0x5A,0xFE,0xA4,0xD8,0x66,0x9B,0xF7,0x6E,0xFC,0xEF,0x52,0x7B,0xC5,0x16,0xE6,0xA3,0x7D,0x59,0xB7,0x31,0x28,0xEB,0xB5, + 0x45,0xC9,0xB1,0xD1,0x08,0x67,0xC6,0x37,0xE7,0xD7,0x2A,0xE6,0x1F,0xD9,0x6A,0xE5,0x04,0xDF,0x6A,0x9D,0x91,0xFA,0x41,0xBD, + 0x2A,0x50,0xEA,0x99,0x24,0xA9,0x0F,0x2B,0x50,0x51,0x5F,0xD9,0x0B,0x89,0x1B,0xCB,0xDB,0x88,0xE8,0xEC,0x87,0xB0,0x16,0xCC, + 0x43,0xEE,0x5A,0xBD,0x57,0xE2,0x46,0xA7,0x56,0x54,0x23,0x32,0x8A,0xFB,0x25,0x51,0x39,0x38,0xE6,0x87,0xF5,0x73,0x63,0xD0, + 0x5B,0xC7,0x3F,0xFD,0x04,0x75,0x74,0x4C,0x3D,0xB5,0x31,0x22,0x7D,0xF1,0x8D,0xB4,0xE0,0xAA,0xE1,0xFF,0x8F,0xDD,0xB8,0x04, + 0x6A,0x31,0xEE,0x30,0x2D,0x6E,0x74,0x0F,0x37,0x71,0x77,0x2B,0xB8,0x9E,0x62,0x47,0x00,0x9C,0xA5,0x82,0x2B,0x9F,0x24,0x67, + 0x50,0x86,0x8B,0xC9,0x36,0x81,0xEB,0x44,0xC2,0xF1,0x91,0xA6,0x84,0x75,0x15,0x8F,0x22,0xDE,0xAC,0xB5,0x16,0xE3,0x96,0x74, + 0x72,0x2F,0x15,0xD5,0xFB,0x01,0x22,0xC4,0x24,0xEE,0x3D,0xDF,0x9E,0xA9,0x0A,0x5B,0x16,0x21,0xE8,0x4A,0x8C,0x7E,0x3A,0x9C, + 0x22,0xA0,0x49,0x60,0x97,0x1B,0x3E,0x2D,0x80,0x91,0xDB,0xF7,0x78,0x38,0x76,0x78,0x0C,0xE3,0xD4,0x27,0x77,0x69,0x96,0xE6, + 0x41,0xC7,0x2E,0xE9,0x61,0xD6,0x31,0x82,0x01,0xC4,0x30,0x82,0x01,0xC0,0x02,0x01,0x01,0x30,0x2B,0x30,0x17,0x31,0x15,0x30, + 0x13,0x06,0x03,0x55,0x04,0x03,0x13,0x0C,0x54,0x65,0x73,0x74,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74,0x02,0x10,0x96,0x53, + 0x2C,0xC9,0x23,0x56,0x8A,0x87,0x42,0x30,0x3E,0xD5,0x8D,0x72,0xD5,0x25,0x30,0x09,0x06,0x05,0x2B,0x0E,0x03,0x02,0x1A,0x05, + 0x00,0xA0,0x70,0x30,0x10,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0C,0x31,0x02,0x30,0x00,0x30,0x19,0x06, + 0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x03,0x31,0x0C,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x04, + 0x30,0x1C,0x06,0x0A,0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0B,0x31,0x0E,0x30,0x0C,0x06,0x0A,0x2B,0x06,0x01,0x04, + 0x01,0x82,0x37,0x02,0x01,0x15,0x30,0x23,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x04,0x31,0x16,0x04,0x14,0x3D, + 0x08,0xC8,0xA3,0xEE,0x05,0x1A,0x61,0xD9,0xFE,0x1A,0x63,0xC0,0x8A,0x6E,0x9D,0xF9,0xC3,0x13,0x98,0x30,0x0D,0x06,0x09,0x2A, + 0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x04,0x82,0x01,0x00,0x90,0xF9,0xC0,0x7F,0x1D,0x70,0x8C,0x04,0x22,0x82, + 0xB6,0x2D,0x48,0xBF,0x30,0x51,0x29,0xF8,0xE3,0x11,0x39,0xE0,0x64,0x23,0x72,0xE2,0x4C,0x09,0x9F,0x39,0xF2,0x6F,0xDD,0xB9, + 0x5A,0x3D,0xEF,0xEB,0xBE,0xEC,0x3B,0xE6,0x58,0x4C,0xC9,0x4F,0xED,0xCB,0x6E,0x9D,0x67,0x8E,0x89,0x92,0x40,0x39,0xA2,0x5F, + 0xF9,0xEF,0xD3,0xF5,0x24,0x27,0x8D,0xF7,0x3C,0x92,0x66,0x56,0xC8,0x2B,0xEA,0x04,0xA1,0x0E,0xDA,0x89,0x30,0xA7,0x01,0xD8, + 0x0B,0xF8,0xFD,0x99,0xB6,0xC0,0x38,0xB0,0x21,0x50,0x3A,0x86,0x01,0xD0,0xF3,0x86,0x72,0xE3,0x5A,0xBB,0x2A,0x6E,0xBD,0xFB, + 0x22,0xF9,0x42,0xD3,0x04,0xFE,0x8D,0xD8,0x79,0xD1,0xEE,0x61,0xC6,0x48,0x04,0x99,0x9A,0xA2,0x73,0xE5,0xFB,0x24,0x10,0xD5, + 0x6B,0x71,0x80,0x0E,0x09,0xEA,0x85,0x9A,0xBD,0xBB,0xDE,0x99,0x5D,0xA3,0x18,0x4D,0xED,0x20,0x73,0x3E,0x32,0xEF,0x2C,0xAC, + 0x5A,0x83,0x87,0x1F,0x7F,0x19,0x61,0x35,0x53,0xC1,0xAA,0x89,0x97,0xB3,0xDD,0x8D,0xA8,0x67,0x5B,0xC2,0xE2,0x09,0xB7,0xDD, + 0x6A,0xCB,0xD5,0xBF,0xD6,0x08,0xE2,0x23,0x1A,0x41,0x9D,0xD5,0x6A,0x6B,0x8D,0x3C,0x29,0x1B,0xF1,0x3F,0x4E,0x4A,0x8F,0x29, + 0x33,0xF9,0x1C,0x60,0xA0,0x92,0x7E,0x4F,0x35,0xB8,0xDD,0xEB,0xD1,0x68,0x1A,0x9D,0xA2,0xA6,0x97,0x1F,0x5F,0xC6,0x2C,0xFB, + 0xCA,0xDF,0xF7,0x95,0x33,0x95,0xD4,0x79,0x5C,0x73,0x87,0x49,0x1F,0x8C,0x6E,0xCE,0x3E,0x6D,0x3D,0x2B,0x6B,0xD7,0x66,0xE9, + 0x88,0x6F,0xF2,0x83,0xB9,0x9B,0x00,0x00 +}; + static void test_query_object(void) { + WCHAR tmp_path[MAX_PATH]; BOOL ret; CRYPT_DATA_BLOB blob; + DWORD content_type; /* Test the usual invalid arguments */ SetLastError(0xdeadbeef); @@ -188,6 +308,26 @@ static void test_query_object(void) CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); + + GetEnvironmentVariableW( L"TMP", tmp_path, MAX_PATH ); + SetEnvironmentVariableW(L"TMP", L"C:\\nonexistent"); + blob.pbData = (BYTE *)signed_pe_blob; + blob.cbData = sizeof(signed_pe_blob); + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, &content_type, + NULL, NULL, NULL, NULL); + ok(!ret, "CryptQueryObject succeded\n"); + ok(GetLastError() == CRYPT_E_NO_MATCH, "Unexpected error %lu.\n", GetLastError()); + SetEnvironmentVariableW(L"TMP", tmp_path); + + blob.pbData = (BYTE *)signed_pe_blob; + blob.cbData = sizeof(signed_pe_blob); + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, &content_type, + NULL, NULL, NULL, NULL); + ok(ret, "CryptQueryObject failed: %08lx\n", GetLastError()); + ok(content_type == CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED, + "Got unexpected content_type %#lx.\n", content_type); } START_TEST(object) -- 2.35.1

2 1

[PATCH 1/2] webservices: Set proper minor version for .NET Message Framing Protocol.
by Connor McAdams 14 Apr '22

14 Apr '22

According to MC-NMF, the .Net Framing Protocol, "An implementation conforming to this specification MUST set this field to 0x00." Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/webservices/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index a9142bedee9..1148744346c 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1415,7 +1415,7 @@ static enum known_encoding map_channel_encoding( struct channel *channel ) } #define FRAME_VERSION_MAJOR 1 -#define FRAME_VERSION_MINOR 1 +#define FRAME_VERSION_MINOR 0 static HRESULT write_preamble( struct channel *channel ) { -- 2.25.1

2 3

[PATCH 1/6] conhost: Move console registry key path into 'struct console'
by Hugh McMaster 14 Apr '22

14 Apr '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 8ca09bb80d0..2cb9515037a 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -77,6 +77,7 @@ struct console HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ struct screen_buffer *active; /* active screen buffer */ + WCHAR *config_key; /* registry key name for app-specific settings */ int is_unix; /* UNIX terminal mode */ int use_relative_cursor; /* use relative cursor positionning */ INPUT_RECORD *records; /* input records */ diff --git a/programs/conhost/window.c b/programs/conhost/window.c index fb02ef9fd94..77e17313f9b 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -49,7 +49,6 @@ struct console_window COORD selection_start; /* selection coordinates */ COORD selection_end; unsigned int ui_charset; /* default UI charset */ - WCHAR *config_key; /* config registry key name */ LONG ext_leading; /* external leading for font */ BOOL quick_edit; /* whether mouse ops are sent to app or used for content selection */ @@ -820,7 +819,7 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW /* since we've modified the current config with new font information, * set this information as the new default. */ - load_config( fc->console->window->config_key, &config ); + load_config( fc->console->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; memcpy( config.face_name, fc->console->active->font.face_name, @@ -830,7 +829,7 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW /* Force also its writing back to the registry so that we can get it * the next time. */ - save_config( fc->console->window->config_key, &config ); + save_config( fc->console->config_key, &config ); return 0; } } @@ -1955,7 +1954,7 @@ static BOOL config_dialog( struct console *console, BOOL current ) update_window( di.console ); } if (save) - save_config( current ? console->window->config_key : NULL, &di.config ); + save_config( current ? console->config_key : NULL, &di.config ); return TRUE; } @@ -2405,14 +2404,14 @@ BOOL init_window( struct console *console ) if (si.lpTitle) { size_t i, title_len = wcslen( si.lpTitle ); - if (!(console->window->config_key = malloc( (title_len + 1) * sizeof(WCHAR) ))) + if (!(console->config_key = malloc( (title_len + 1) * sizeof(WCHAR) ))) return FALSE; for (i = 0; i < title_len; i++) - console->window->config_key[i] = si.lpTitle[i] == '\\' ? '_' : si.lpTitle[i]; - console->window->config_key[title_len] = 0; + console->config_key[i] = si.lpTitle[i] == '\\' ? '_' : si.lpTitle[i]; + console->config_key[title_len] = 0; } - load_config( console->window->config_key, &config ); + load_config( console->config_key, &config ); if (si.dwFlags & STARTF_USECOUNTCHARS) { config.sb_width = si.dwXCountChars; -- 2.35.1

2 7

[PATCH] server: clear area when file size is not full page.
by Chao Long 14 Apr '22

14 Apr '22

From: chenjiangyi <chenjiangyi(a)uniontech.com> Signed-off-by: chenjiangyi <chenjiangyi(a)uniontech.com> --- server/mapping.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 8d4332d240f..4730d93be90 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -558,7 +558,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, struct file *file; unsigned int i; mem_size_t total_size; - size_t file_size, map_size, max_size; + size_t file_size, map_size, max_size, file_roundsize; off_t shared_pos, read_pos, write_pos; char *buffer = NULL; int shared_fd; @@ -595,6 +595,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, { if (!(sec[i].Characteristics & IMAGE_SCN_MEM_SHARED)) continue; if (!(sec[i].Characteristics & IMAGE_SCN_MEM_WRITE)) continue; + memset(buffer, 0, max_size); get_section_sizes( &sec[i], &map_size, &read_pos, &file_size ); write_pos = shared_pos; shared_pos += map_size; @@ -612,7 +613,16 @@ static int build_shared_mapping( struct mapping *mapping, int fd, toread -= res; read_pos += res; } - if (pwrite( shared_fd, buffer, file_size, write_pos ) != file_size) goto error; + if (file_size & page_mask) + { + file_roundsize = ROUND_SIZE( file_size ); + if (file_roundsize > map_size) file_roundsize = map_size; + if (pwrite( shared_fd, buffer, file_roundsize, write_pos ) != file_roundsize) goto error; + } + else + { + if (pwrite( shared_fd, buffer, file_size, write_pos ) != file_size) goto error; + } } if (!(shared = alloc_object( &shared_map_ops ))) goto error; -- 2.20.1

1 0

[PATCH 1/5] include: Add amva.h.
by Zebediah Figura 13 Apr '22

13 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/Makefile.in | 1 + include/amva.h | 74 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 include/amva.h diff --git a/include/Makefile.in b/include/Makefile.in index 047e7ff9146..c76e2ec7d0d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ SOURCES = \ amaudio.h \ amsi.idl \ amstream.idl \ + amva.h \ amvideo.idl \ appcompatapi.h \ appmgmt.h \ diff --git a/include/amva.h b/include/amva.h new file mode 100644 index 00000000000..faf103270fc --- /dev/null +++ b/include/amva.h @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2022 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 __AMVA_INCLUDED__ +#define __AMVA_INCLUDED__ + +typedef struct _tag_AMVABeginFrameInfo +{ + DWORD dwDestSurfaceIndex; + void *pInputData; + DWORD dwSizeInputData; + void *pOutputData; + DWORD dwSizeOutputData; +} AMVABeginFrameInfo, *LPAMVABeginFrameInfo; + +typedef struct _tag_AMVABUFFERINFO +{ + DWORD dwTypeIndex; + DWORD dwBufferIndex; + DWORD dwDataOffset; + DWORD dwDataSize; +} AMVABUFFERINFO, *LPAMVABUFFERINFO; + +typedef struct _tag_AMVACompBufferInfo +{ + DWORD dwNumCompBuffers; + DWORD dwWidthToCreate; + DWORD dwHeightToCreate; + DWORD dwBytesToAllocate; + DDSCAPS2 ddCompCaps; + DDPIXELFORMAT ddPixelFormat; +} AMVACompBufferInfo, *LPAMVACompBufferInfo; + +typedef struct _tag_AMVAEndFrameInfo +{ + DWORD dwSizeMiscData; + void *pMiscData; +} AMVAEndFrameInfo, *LPAMVAEndFrameInfo; + +typedef struct _tag_AMVAInternalMemInfo +{ + DWORD dwScratchMemAlloc; +} AMVAInternalMemInfo, *LPAMVAInternalMemInfo; + +typedef struct _tag_AMVAUncompBufferInfo +{ + DWORD dwMinNumSurfaces; + DWORD dwMaxNumSurfaces; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompBufferInfo, *LPAMVAUncompBufferInfo; + +typedef struct _tag_AMVAUncompDataInfo +{ + DWORD dwUncompWidth; + DWORD dwUncompHeight; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompDataInfo, *LPAMVAUncompDataInfo; + +#endif -- 2.35.1

1 4

[PATCH 1/1] dbghelp: downgrade a FIXME to a WARN
by Austin English 13 Apr '22

13 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52790 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5cc105d35c9..0076b19e5cb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1248,7 +1248,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in if (low < *plow) *plow = low; if (high > *phigh) *phigh = high; } - if (*plow == UMAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;} + if (*plow == UMAX || *phigh == 0) {WARN("no entry found\n"); return FALSE;} if (*plow == *phigh) {WARN("entry found, but low=high %Ix %Ix\n", low, high); return FALSE;} return TRUE; -- 2.35.1

1 0

[PATCH 8/8] wineoss: Move reset to the unixlib.
by Huw Davies 13 Apr '22

13 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 29 ++++------------------------- dlls/wineoss.drv/oss.c | 27 +++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 75661f917cc..77548045702 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -977,38 +977,17 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct reset_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - if(stream->playing){ - oss_unlock(stream); - return AUDCLNT_E_NOT_STOPPED; - } - - if(stream->getbuf_last){ - oss_unlock(stream); - return AUDCLNT_E_BUFFER_OPERATION_PENDING; - } - - if(stream->flow == eRender){ - stream->written_frames = 0; - stream->last_pos_frames = 0; - }else{ - stream->written_frames += stream->held_frames; - } - stream->held_frames = 0; - stream->lcl_offs_frames = 0; - stream->in_oss_frames = 0; - - oss_unlock(stream); + params.stream = This->stream; + OSS_CALL(reset, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index bcd07c2d2fc..72e917dfd76 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -661,6 +661,32 @@ static NTSTATUS stop(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS reset(void *args) +{ + struct reset_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + if(stream->playing) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + if(stream->getbuf_last) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_OPERATION_PENDING); + + if(stream->flow == eRender){ + stream->written_frames = 0; + stream->last_pos_frames = 0; + }else{ + stream->written_frames += stream->held_frames; + } + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->in_oss_frames = 0; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) { WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; @@ -1025,6 +1051,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, start, stop, + reset, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index c69ef1c3e4b..bd4b065c61e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -102,6 +102,12 @@ struct stop_params HRESULT result; }; +struct reset_params +{ + struct oss_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct oss_stream *stream; @@ -154,6 +160,7 @@ enum oss_funcs oss_release_stream, oss_start, oss_stop, + oss_reset, oss_timer_loop, oss_is_format_supported, oss_get_mix_format, -- 2.25.1

2 1

[PATCH 7/8] wineoss: Move stop to the unixlib.
by Huw Davies 13 Apr '22

13 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 17 ++++------------- dlls/wineoss.drv/oss.c | 17 +++++++++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e50a7b32338..75661f917cc 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -961,26 +961,17 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct stop_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - if(!stream->playing){ - oss_unlock(stream); - return S_FALSE; - } - - stream->playing = FALSE; - stream->in_oss_frames = 0; - - oss_unlock(stream); + params.stream = This->stream; + OSS_CALL(stop, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 241b6d014ec..bcd07c2d2fc 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -645,6 +645,22 @@ static NTSTATUS start(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS stop(void *args) +{ + struct stop_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + if(!stream->playing) + return oss_unlock_result(stream, &params->result, S_FALSE); + + stream->playing = FALSE; + stream->in_oss_frames = 0; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) { WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; @@ -1008,6 +1024,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = create_stream, release_stream, start, + stop, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 7418261282d..c69ef1c3e4b 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -96,6 +96,12 @@ struct start_params HRESULT result; }; +struct stop_params +{ + struct oss_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct oss_stream *stream; @@ -147,6 +153,7 @@ enum oss_funcs oss_create_stream, oss_release_stream, oss_start, + oss_stop, oss_timer_loop, oss_is_format_supported, oss_get_mix_format, -- 2.25.1

2 1

[PATCH 6/8] wineoss: Move start to the unixlib.
by Huw Davies 13 Apr '22

13 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 24 +++++------------------- dlls/wineoss.drv/oss.c | 19 +++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8f2b19c8faa..e50a7b32338 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -934,7 +934,7 @@ static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frame static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct start_params params; TRACE("(%p)\n", This); @@ -945,31 +945,17 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - oss_lock(stream); - - if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ - oss_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_EVENTHANDLE_NOT_SET; - } - - if(stream->playing){ - oss_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_NOT_STOPPED; - } + params.stream = This->stream; + OSS_CALL(start, &params); - if(!This->timer_thread){ + if(SUCCEEDED(params.result) && !This->timer_thread){ This->timer_thread = CreateThread(NULL, 0, timer_thread, This->stream, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } - stream->playing = TRUE; - - oss_unlock(stream); LeaveCriticalSection(&g_sessions_lock); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index b0dc22a500f..241b6d014ec 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -627,6 +627,24 @@ static NTSTATUS release_stream(void *args) return STATUS_SUCCESS; } +static NTSTATUS start(void *args) +{ + struct start_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_SET); + + if(stream->playing) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + stream->playing = TRUE; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) { WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; @@ -989,6 +1007,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_endpoint_ids, create_stream, release_stream, + start, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 2902bceb949..7418261282d 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -90,6 +90,12 @@ struct release_stream_params HRESULT result; }; +struct start_params +{ + struct oss_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct oss_stream *stream; @@ -140,6 +146,7 @@ enum oss_funcs oss_get_endpoint_ids, oss_create_stream, oss_release_stream, + oss_start, oss_timer_loop, oss_is_format_supported, oss_get_mix_format, -- 2.25.1

2 1

[PATCH 5/8] wineoss: Move timer_loop to the unixlib.
by Huw Davies 13 Apr '22

13 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 199 ++++-------------------------------- dlls/wineoss.drv/oss.c | 196 +++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 +- 3 files changed, 223 insertions(+), 181 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e61c3c95df2..8f2b19c8faa 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -114,7 +114,7 @@ struct ACImpl { UINT32 channel_count; struct oss_stream *stream; - HANDLE timer; + HANDLE timer_thread; AudioSession *session; AudioSessionWrapper *session_wrapper; @@ -147,8 +147,6 @@ static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'w','i','n','e','o','s','s','.','d','r','v','\\','d','e','v','i','c','e','s',0}; static const WCHAR guidW[] = {'g','u','i','d',0}; -static HANDLE g_timer_q; - static CRITICAL_SECTION g_sessions_lock; static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = { @@ -230,9 +228,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, &oss_handle, sizeof(oss_handle), NULL)) return FALSE; - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return FALSE; break; case DLL_PROCESS_DETACH: @@ -260,16 +255,28 @@ int WINAPI AUDDRV_GetPriority(void) return params.priority; } -static HRESULT stream_release(struct oss_stream *stream) +static HRESULT stream_release(struct oss_stream *stream, HANDLE timer_thread) { struct release_stream_params params; params.stream = stream; + params.timer_thread = timer_thread; OSS_CALL(release_stream, &params); return params.result; } +static DWORD WINAPI timer_thread(void *user) +{ + struct oss_stream *stream = user; + struct timer_loop_params params; + + params.stream = stream; + OSS_CALL(timer_loop, &params); + + return 0; +} + static void oss_lock(struct oss_stream *stream) { pthread_mutex_lock(&stream->lock); @@ -532,17 +539,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ - if(This->timer){ - HANDLE event; - DWORD wait; - event = CreateEventW(NULL, TRUE, FALSE, NULL); - wait = !DeleteTimerQueueTimer(g_timer_q, This->timer, event); - wait = wait && GetLastError() == ERROR_IO_PENDING; - if(event && wait) - WaitForSingleObject(event, INFINITE); - CloseHandle(event); - } - IAudioClient3_Stop(iface); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); @@ -553,7 +549,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); if(This->stream) - stream_release(This->stream); + stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -765,7 +761,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, exit: if(FAILED(params.result)){ - stream_release(stream); + stream_release(stream, NULL); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; } else { @@ -935,161 +931,6 @@ static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frame memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static void oss_write_data(struct oss_stream *stream) -{ - ssize_t written_bytes; - UINT32 written_frames, in_oss_frames, write_limit, max_period, write_offs_frames, new_frames; - SIZE_T to_write_frames, to_write_bytes, advanced; - audio_buf_info bi; - BYTE *buf; - - if(ioctl(stream->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){ - WARN("GETOSPACE failed: %d (%s)\n", errno, strerror(errno)); - return; - } - - max_period = max(bi.fragsize / stream->fmt->nBlockAlign, stream->period_frames); - - if(bi.bytes > stream->oss_bufsize_bytes){ - TRACE("New buffer size (%u) is larger than old buffer size (%u)\n", - bi.bytes, stream->oss_bufsize_bytes); - stream->oss_bufsize_bytes = bi.bytes; - in_oss_frames = 0; - }else - in_oss_frames = (stream->oss_bufsize_bytes - bi.bytes) / stream->fmt->nBlockAlign; - - if(in_oss_frames > stream->in_oss_frames){ - TRACE("Capping reported frames from %u to %u\n", - in_oss_frames, stream->in_oss_frames); - in_oss_frames = stream->in_oss_frames; - } - - write_limit = 0; - while(write_limit + in_oss_frames < max_period * 3) - write_limit += max_period; - if(write_limit == 0) - return; - - /* vvvvvv - in_oss_frames - * [--xxxxxxxxxx] - * [xxxxxxxxxx--] - * ^^^^^^^^^^ - held_frames - * ^ - lcl_offs_frames - */ - advanced = stream->in_oss_frames - in_oss_frames; - if(advanced > stream->held_frames) - advanced = stream->held_frames; - stream->lcl_offs_frames += advanced; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->held_frames -= advanced; - stream->in_oss_frames = in_oss_frames; - TRACE("advanced by %lu, lcl_offs: %u, held: %u, in_oss: %u\n", - advanced, stream->lcl_offs_frames, stream->held_frames, stream->in_oss_frames); - - - if(stream->held_frames == stream->in_oss_frames) - return; - - write_offs_frames = (stream->lcl_offs_frames + stream->in_oss_frames) % stream->bufsize_frames; - new_frames = stream->held_frames - stream->in_oss_frames; - - if(write_offs_frames + new_frames > stream->bufsize_frames) - to_write_frames = stream->bufsize_frames - write_offs_frames; - else - to_write_frames = new_frames; - - to_write_frames = min(to_write_frames, write_limit); - to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; - TRACE("going to write %lu frames from %u (%lu of %u)\n", to_write_frames, - write_offs_frames, to_write_frames + write_offs_frames, - stream->bufsize_frames); - - buf = stream->local_buffer + write_offs_frames * stream->fmt->nBlockAlign; - - if(stream->mute) - silence_buffer(stream, buf, to_write_frames); - - written_bytes = write(stream->fd, buf, to_write_bytes); - if(written_bytes < 0){ - /* EAGAIN is OSS buffer full, log that too */ - WARN("write failed: %d (%s)\n", errno, strerror(errno)); - return; - } - written_frames = written_bytes / stream->fmt->nBlockAlign; - - stream->in_oss_frames += written_frames; - - if(written_frames < to_write_frames){ - /* OSS buffer probably full */ - return; - } - - if(new_frames > written_frames && written_frames < write_limit){ - /* wrapped and have some data back at the start to write */ - - to_write_frames = min(write_limit - written_frames, new_frames - written_frames); - to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; - - if(stream->mute) - silence_buffer(stream, stream->local_buffer, to_write_frames); - - TRACE("wrapping to write %lu frames from beginning\n", to_write_frames); - - written_bytes = write(stream->fd, stream->local_buffer, to_write_bytes); - if(written_bytes < 0){ - WARN("write failed: %d (%s)\n", errno, strerror(errno)); - return; - } - written_frames = written_bytes / stream->fmt->nBlockAlign; - stream->in_oss_frames += written_frames; - } -} - -static void oss_read_data(struct oss_stream *stream) -{ - UINT64 pos, readable; - ssize_t nread; - - pos = (stream->held_frames + stream->lcl_offs_frames) % stream->bufsize_frames; - readable = (stream->bufsize_frames - pos) * stream->fmt->nBlockAlign; - - nread = read(stream->fd, stream->local_buffer + pos * stream->fmt->nBlockAlign, - readable); - if(nread < 0){ - WARN("read failed: %d (%s)\n", errno, strerror(errno)); - return; - } - - stream->held_frames += nread / stream->fmt->nBlockAlign; - - if(stream->held_frames > stream->bufsize_frames){ - WARN("Overflow of unread data\n"); - stream->lcl_offs_frames += stream->held_frames; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->held_frames = stream->bufsize_frames; - } -} - -static void CALLBACK oss_period_callback(void *user, BOOLEAN timer) -{ - ACImpl *This = user; - struct oss_stream *stream = This->stream; - - oss_lock(stream); - - if(stream->playing){ - if(stream->flow == eRender && stream->held_frames) - oss_write_data(stream); - else if(stream->flow == eCapture) - oss_read_data(stream); - } - - if(stream->event) - SetEvent(stream->event); - - oss_unlock(stream); -} - static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); @@ -1118,11 +959,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_STOPPED; } - if(!This->timer){ - if(!CreateTimerQueueTimer(&This->timer, g_timer_q, - oss_period_callback, This, 0, stream->period / 10000, - WT_EXECUTEINTIMERTHREAD)) - ERR("Unable to create period timer: %u\n", GetLastError()); + if(!This->timer_thread){ + This->timer_thread = CreateThread(NULL, 0, timer_thread, This->stream, 0, NULL); + SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } stream->playing = TRUE; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index b00925d6e9b..b0dc22a500f 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -604,6 +604,12 @@ static NTSTATUS release_stream(void *args) struct oss_stream *stream = params->stream; SIZE_T size; + if(params->timer_thread){ + stream->please_quit = TRUE; + NtWaitForSingleObject(params->timer_thread, FALSE, NULL); + NtClose(params->timer_thread); + } + close(stream->fd); if(stream->local_buffer){ size = 0; @@ -621,6 +627,195 @@ static NTSTATUS release_stream(void *args) return STATUS_SUCCESS; } +static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); + else + memset(buffer, 0, frames * stream->fmt->nBlockAlign); +} + +static void oss_write_data(struct oss_stream *stream) +{ + ssize_t written_bytes; + UINT32 written_frames, in_oss_frames, write_limit, max_period, write_offs_frames, new_frames; + SIZE_T to_write_frames, to_write_bytes, advanced; + audio_buf_info bi; + BYTE *buf; + + if(ioctl(stream->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){ + WARN("GETOSPACE failed: %d (%s)\n", errno, strerror(errno)); + return; + } + + max_period = max(bi.fragsize / stream->fmt->nBlockAlign, stream->period_frames); + + if(bi.bytes > stream->oss_bufsize_bytes){ + TRACE("New buffer size (%u) is larger than old buffer size (%u)\n", + bi.bytes, stream->oss_bufsize_bytes); + stream->oss_bufsize_bytes = bi.bytes; + in_oss_frames = 0; + }else + in_oss_frames = (stream->oss_bufsize_bytes - bi.bytes) / stream->fmt->nBlockAlign; + + if(in_oss_frames > stream->in_oss_frames){ + TRACE("Capping reported frames from %u to %u\n", + in_oss_frames, stream->in_oss_frames); + in_oss_frames = stream->in_oss_frames; + } + + write_limit = 0; + while(write_limit + in_oss_frames < max_period * 3) + write_limit += max_period; + if(write_limit == 0) + return; + + /* vvvvvv - in_oss_frames + * [--xxxxxxxxxx] + * [xxxxxxxxxx--] + * ^^^^^^^^^^ - held_frames + * ^ - lcl_offs_frames + */ + advanced = stream->in_oss_frames - in_oss_frames; + if(advanced > stream->held_frames) + advanced = stream->held_frames; + stream->lcl_offs_frames += advanced; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->held_frames -= advanced; + stream->in_oss_frames = in_oss_frames; + TRACE("advanced by %lu, lcl_offs: %u, held: %u, in_oss: %u\n", + advanced, stream->lcl_offs_frames, stream->held_frames, stream->in_oss_frames); + + + if(stream->held_frames == stream->in_oss_frames) + return; + + write_offs_frames = (stream->lcl_offs_frames + stream->in_oss_frames) % stream->bufsize_frames; + new_frames = stream->held_frames - stream->in_oss_frames; + + if(write_offs_frames + new_frames > stream->bufsize_frames) + to_write_frames = stream->bufsize_frames - write_offs_frames; + else + to_write_frames = new_frames; + + to_write_frames = min(to_write_frames, write_limit); + to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; + TRACE("going to write %lu frames from %u (%lu of %u)\n", to_write_frames, + write_offs_frames, to_write_frames + write_offs_frames, + stream->bufsize_frames); + + buf = stream->local_buffer + write_offs_frames * stream->fmt->nBlockAlign; + + if(stream->mute) + silence_buffer(stream, buf, to_write_frames); + + written_bytes = write(stream->fd, buf, to_write_bytes); + if(written_bytes < 0){ + /* EAGAIN is OSS buffer full, log that too */ + WARN("write failed: %d (%s)\n", errno, strerror(errno)); + return; + } + written_frames = written_bytes / stream->fmt->nBlockAlign; + + stream->in_oss_frames += written_frames; + + if(written_frames < to_write_frames){ + /* OSS buffer probably full */ + return; + } + + if(new_frames > written_frames && written_frames < write_limit){ + /* wrapped and have some data back at the start to write */ + + to_write_frames = min(write_limit - written_frames, new_frames - written_frames); + to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; + + if(stream->mute) + silence_buffer(stream, stream->local_buffer, to_write_frames); + + TRACE("wrapping to write %lu frames from beginning\n", to_write_frames); + + written_bytes = write(stream->fd, stream->local_buffer, to_write_bytes); + if(written_bytes < 0){ + WARN("write failed: %d (%s)\n", errno, strerror(errno)); + return; + } + written_frames = written_bytes / stream->fmt->nBlockAlign; + stream->in_oss_frames += written_frames; + } +} + +static void oss_read_data(struct oss_stream *stream) +{ + UINT64 pos, readable; + ssize_t nread; + + pos = (stream->held_frames + stream->lcl_offs_frames) % stream->bufsize_frames; + readable = (stream->bufsize_frames - pos) * stream->fmt->nBlockAlign; + + nread = read(stream->fd, stream->local_buffer + pos * stream->fmt->nBlockAlign, + readable); + if(nread < 0){ + WARN("read failed: %d (%s)\n", errno, strerror(errno)); + return; + } + + stream->held_frames += nread / stream->fmt->nBlockAlign; + + if(stream->held_frames > stream->bufsize_frames){ + WARN("Overflow of unread data\n"); + stream->lcl_offs_frames += stream->held_frames; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->held_frames = stream->bufsize_frames; + } +} + +static NTSTATUS timer_loop(void *args) +{ + struct timer_loop_params *params = args; + struct oss_stream *stream = params->stream; + LARGE_INTEGER delay, now, next; + int adjust; + + oss_lock(stream); + + delay.QuadPart = -stream->period; + NtQueryPerformanceCounter(&now, NULL); + next.QuadPart = now.QuadPart + stream->period; + + while(!stream->please_quit){ + if(stream->playing){ + if(stream->flow == eRender && stream->held_frames) + oss_write_data(stream); + else if(stream->flow == eCapture) + oss_read_data(stream); + } + if(stream->event) + NtSetEvent(stream->event, NULL); + oss_unlock(stream); + + NtDelayExecution(FALSE, &delay); + + oss_lock(stream); + NtQueryPerformanceCounter(&now, NULL); + adjust = next.QuadPart - now.QuadPart; + if(adjust > stream->period / 2) + adjust = stream->period / 2; + else if(adjust < -stream->period / 2) + adjust = -stream->period / 2; + delay.QuadPart = -(stream->period + adjust); + next.QuadPart += stream->period; + } + + oss_unlock(stream); + + return STATUS_SUCCESS; +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -794,6 +989,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_endpoint_ids, create_stream, release_stream, + timer_loop, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 64c954cc769..2902bceb949 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -28,7 +28,7 @@ struct oss_stream int fd; - BOOL playing, mute; + BOOL playing, mute, please_quit; UINT64 written_frames, last_pos_frames; UINT32 period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ @@ -86,9 +86,15 @@ struct create_stream_params struct release_stream_params { struct oss_stream *stream; + HANDLE timer_thread; HRESULT result; }; +struct timer_loop_params +{ + struct oss_stream *stream; +}; + struct is_format_supported_params { const char *device; @@ -134,6 +140,7 @@ enum oss_funcs oss_get_endpoint_ids, oss_create_stream, oss_release_stream, + oss_timer_loop, oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size, -- 2.25.1

2 1

[PATCH 4/8] wineoss: Store the period in 100ns units.
by Huw Davies 13 Apr '22

13 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/oss.c | 4 ++-- dlls/wineoss.drv/unixlib.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fb71aa7562a..e61c3c95df2 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1120,7 +1120,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) if(!This->timer){ if(!CreateTimerQueueTimer(&This->timer, g_timer_q, - oss_period_callback, This, 0, stream->period_us / 1000, + oss_period_callback, This, 0, stream->period / 10000, WT_EXECUTEINTIMERTHREAD)) ERR("Unable to create period timer: %u\n", GetLastError()); } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 7e716ef4704..b00925d6e9b 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -564,7 +564,7 @@ static NTSTATUS create_stream(void *args) } stream->fmt = &fmtex->Format; - stream->period_us = params->period / 10; + stream->period = params->period; stream->period_frames = muldiv(params->fmt->nSamplesPerSec, params->period, 10000000); stream->bufsize_frames = muldiv(params->duration, params->fmt->nSamplesPerSec, 10000000); @@ -771,7 +771,7 @@ static NTSTATUS get_latency(void *args) /* pretend we process audio in Period chunks, so max latency includes * the period time. Some native machines add .6666ms in shared mode. */ - *params->latency = (REFERENCE_TIME)stream->period_us * 10 + 6666; + *params->latency = stream->period + 6666; return oss_unlock_result(stream, &params->result, S_OK); } diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index bc88be80db2..64c954cc769 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -30,8 +30,9 @@ struct oss_stream BOOL playing, mute; UINT64 written_frames, last_pos_frames; - UINT32 period_us, period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; + UINT32 period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ + REFERENCE_TIME period; BYTE *local_buffer, *tmp_buffer; INT32 getbuf_last; /* <0 when using tmp_buffer */ -- 2.25.1

2 1

[PATCH 3/8] wineoss: Move get_current_padding to the unixlib.
by Huw Davies 13 Apr '22

13 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 13 +++++-------- dlls/wineoss.drv/oss.c | 13 +++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8a2329d1f04..fb71aa7562a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -827,7 +827,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *numpad) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct get_current_padding_params params; TRACE("(%p)->(%p)\n", This, numpad); @@ -837,15 +837,12 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - *numpad = stream->held_frames; - + params.stream = This->stream; + params.padding = numpad; + OSS_CALL(get_current_padding, &params); TRACE("padding: %u\n", *numpad); - oss_unlock(stream); - - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a80557b2c15..7e716ef4704 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -776,6 +776,18 @@ static NTSTATUS get_latency(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_current_padding(void *args) +{ + struct get_current_padding_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + *params->padding = stream->held_frames; + + return oss_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -786,4 +798,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_mix_format, get_buffer_size, get_latency, + get_current_padding, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 9f4c736fe4e..bc88be80db2 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -120,6 +120,13 @@ struct get_latency_params REFERENCE_TIME *latency; }; +struct get_current_padding_params +{ + struct oss_stream *stream; + HRESULT result; + UINT32 *padding; +}; + enum oss_funcs { oss_test_connect, @@ -130,6 +137,7 @@ enum oss_funcs oss_get_mix_format, oss_get_buffer_size, oss_get_latency, + oss_get_current_padding, }; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 2/8] wineoss: Move get_latency to the unixlib.
by Huw Davies 13 Apr '22

13 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 14 +++++--------- dlls/wineoss.drv/oss.c | 15 +++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index a2f75d7a479..8a2329d1f04 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -806,7 +806,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct get_latency_params params; TRACE("(%p)->(%p)\n", This, latency); @@ -816,15 +816,11 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - /* pretend we process audio in Period chunks, so max latency includes - * the period time. Some native machines add .6666ms in shared mode. */ - *latency = (REFERENCE_TIME)stream->period_us * 10 + 6666; - - oss_unlock(stream); + params.stream = This->stream; + params.latency = latency; + OSS_CALL(get_latency, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index fdad419abfa..a80557b2c15 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -762,6 +762,20 @@ static NTSTATUS get_buffer_size(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_latency(void *args) +{ + struct get_latency_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + /* pretend we process audio in Period chunks, so max latency includes + * the period time. Some native machines add .6666ms in shared mode. */ + *params->latency = (REFERENCE_TIME)stream->period_us * 10 + 6666; + + return oss_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -771,4 +785,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_format_supported, get_mix_format, get_buffer_size, + get_latency, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index b57798ef435..9f4c736fe4e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -113,6 +113,13 @@ struct get_buffer_size_params UINT32 *size; }; +struct get_latency_params +{ + struct oss_stream *stream; + HRESULT result; + REFERENCE_TIME *latency; +}; + enum oss_funcs { oss_test_connect, @@ -122,6 +129,7 @@ enum oss_funcs oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size, + oss_get_latency, }; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 1/8] wineoss: Move get_buffer_size to the unixlib.
by Huw Davies 13 Apr '22

13 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 12 +++++------- dlls/wineoss.drv/oss.c | 31 +++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 2ea3c80f3ca..a2f75d7a479 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -783,7 +783,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct get_buffer_size_params params; TRACE("(%p)->(%p)\n", This, frames); @@ -793,15 +793,13 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - *frames = stream->bufsize_frames; + params.stream = This->stream; + params.size = frames; + OSS_CALL(get_buffer_size, &params); TRACE("buffer size: %u\n", *frames); - oss_unlock(stream); - - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 628d0c5818a..fdad419abfa 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -70,6 +70,24 @@ static int muldiv( int a, int b, int c ) return ret; } +static void oss_lock(struct oss_stream *stream) +{ + pthread_mutex_lock(&stream->lock); +} + +static void oss_unlock(struct oss_stream *stream) +{ + pthread_mutex_unlock(&stream->lock); +} + +static NTSTATUS oss_unlock_result(struct oss_stream *stream, + HRESULT *result, HRESULT value) +{ + *result = value; + oss_unlock(stream); + return STATUS_SUCCESS; +} + static NTSTATUS test_connect(void *args) { struct test_connect_params *params = args; @@ -732,6 +750,18 @@ static NTSTATUS get_mix_format(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_buffer_size(void *args) +{ + struct get_buffer_size_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + *params->size = stream->bufsize_frames; + + return oss_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -740,4 +770,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, is_format_supported, get_mix_format, + get_buffer_size, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index c0a0b25c374..b57798ef435 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -106,6 +106,13 @@ struct get_mix_format_params HRESULT result; }; +struct get_buffer_size_params +{ + struct oss_stream *stream; + HRESULT result; + UINT32 *size; +}; + enum oss_funcs { oss_test_connect, @@ -114,6 +121,7 @@ enum oss_funcs oss_release_stream, oss_is_format_supported, oss_get_mix_format, + oss_get_buffer_size, }; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH] d3dxof/tests: Remove redundant skips after ok() calls.
by Matteo Bruni 13 Apr '22

13 Apr '22

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- No point in special handling unexpected test failures. This patch is to be applied on top of 232366 and 232365. dlls/d3dxof/tests/d3dxof.c | 60 -------------------------------------- 1 file changed, 60 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index edb5d8547e6..820afd87426 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -418,11 +418,6 @@ static void test_refcount(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); @@ -490,11 +485,6 @@ static void test_CreateEnumObject(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -565,11 +555,6 @@ static void test_file_types(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, empty_txt_file, sizeof(empty_txt_file) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -639,11 +624,6 @@ static void test_templates(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_type1, sizeof(templates_bad_file_type1) - 1); ok(hr == DXFILEERR_BADFILETYPE, "Unexpected hr %#lx.\n", hr); @@ -681,11 +661,6 @@ static void test_compressed_files(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, compressed_template, sizeof(compressed_template) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -728,11 +703,6 @@ static void test_getname(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -816,11 +786,6 @@ static void test_syntax(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_array_mixed, sizeof(template_syntax_array_mixed) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -929,11 +894,6 @@ static void test_syntax_semicolon_comma(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, template_syntax_array_mixed, sizeof(template_syntax_array_mixed) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -1029,11 +989,6 @@ static void test_complex_object(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, templates_complex_object, sizeof(templates_complex_object) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -1063,11 +1018,6 @@ static void test_standard_templates(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -1088,11 +1038,6 @@ static void test_type_index_color(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } /* Test that 'indexColor' can be used (same as IndexedColor in standard templates) and is case sensitive */ hr = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); @@ -1241,11 +1186,6 @@ static void test_dump(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if(!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - goto exit; - } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, pvData, cbSize); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); -- 2.34.1

2 1

[PATCH 1/2] d3dxof/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 13 Apr '22

13 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dxof/tests/Makefile.in | 1 - dlls/d3dxof/tests/d3dxof.c | 382 +++++++++++++++++----------------- 2 files changed, 191 insertions(+), 192 deletions(-) diff --git a/dlls/d3dxof/tests/Makefile.in b/dlls/d3dxof/tests/Makefile.in index eecca6f9d8c..5144ff63b97 100644 --- a/dlls/d3dxof/tests/Makefile.in +++ b/dlls/d3dxof/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dxof.dll IMPORTS = d3dxof diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 9d9e4035b66..05f92bab8cb 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -416,7 +416,7 @@ static void test_refcount(void) } hr = pDirectXFileCreate(&lpDirectXFile); - ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); @@ -424,50 +424,50 @@ static void test_refcount(void) } ref = getRefcount( (IUnknown *) lpDirectXFile); - ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_AddRef(lpDirectXFile); - ok(ref == 2, "Got refcount %d, expected 2\n", ref); + ok(ref == 2, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_Release(lpDirectXFile); - ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ok(ref == 1, "Unexpected refcount %ld.\n", ref); hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); dxflm.lpMemory = &object; dxflm.dSize = sizeof(object) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); ref = getRefcount( (IUnknown *) lpDirectXFile); - ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = getRefcount( (IUnknown *) lpdxfeo); - ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ok(ref == 1, "Unexpected refcount %ld.\n", ref); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); - ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); ref = getRefcount( (IUnknown *) lpDirectXFile); - ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = getRefcount( (IUnknown *) lpdxfeo); - ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ok(ref == 1, "Unexpected refcount %ld.\n", ref); /* Enum object gets references to all top level objects */ ref = getRefcount( (IUnknown *) lpdxfd); - ok(ref == 2, "Got refcount %d, expected 2\n", ref); + ok(ref == 2, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_Release(lpDirectXFile); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); /* Nothing changes for all other objects */ ref = getRefcount( (IUnknown *) lpdxfeo); - ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = getRefcount( (IUnknown *) lpdxfd); - ok(ref == 2, "Got refcount %d, expected 2\n", ref); + ok(ref == 2, "Unexpected refcount %ld.\n", ref); ref = IDirectXFileEnumObject_Release(lpdxfeo); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); /* Enum object releases references to all top level objects */ ref = getRefcount( (IUnknown *) lpdxfd); - ok(ref == 1, "Got refcount %d, expected 1\n", ref); + ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = IDirectXFileData_Release(lpdxfd); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); } static void test_CreateEnumObject(void) @@ -488,7 +488,7 @@ static void test_CreateEnumObject(void) } hr = pDirectXFileCreate(&lpDirectXFile); - ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); @@ -496,57 +496,57 @@ static void test_CreateEnumObject(void) } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); dxflm.lpMemory = &object; dxflm.dSize = sizeof(object) - 1; /* Check that only lowest 4 bits are relevant in DXFILELOADOPTIONS */ hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, 0xFFFFFFF0 + DXFILELOAD_FROMMEMORY, &lpdxfeo); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); - ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Get all data (szMember == NULL) */ hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&pdata); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ok(size == 8, "Retrieved data size is wrong (%u instead of 8)\n", size); + ok(size == 8, "Unexpected data size %lu.\n", size); ok((*((WORD*)pdata) == 1) && (*((WORD*)(pdata+2)) == 2) && (*((DWORD*)(pdata+4)) == 3), "Retrieved data is wrong\n"); /* Get only "major" member (szMember == "major") */ hr = IDirectXFileData_GetData(lpdxfd, "major", &size, (void**)&pdata); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ok(size == 2, "Retrieved data size is wrong (%u instead of 2)\n", size); + ok(size == 2, "Unexpected data size %lu.\n", size); ok(*((WORD*)pdata) == 1, "Retrieved data is wrong (%u instead of 1)\n", *((WORD*)pdata)); /* Get only "minor" member (szMember == "minor") */ hr = IDirectXFileData_GetData(lpdxfd, "minor", &size, (void**)&pdata); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ok(size == 2, "Retrieved data size is wrong (%u instead of 2)\n", size); + ok(size == 2, "Unexpected data size %lu.\n", size); ok(*((WORD*)pdata) == 2, "Retrieved data is wrong (%u instead of 2)\n", *((WORD*)pdata)); /* Get only "flags" member (szMember == "flags") */ hr = IDirectXFileData_GetData(lpdxfd, "flags", &size, (void**)&pdata); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ok(size == 4, "Retrieved data size is wrong (%u instead of 4)\n", size); + ok(size == 4, "Unexpected data size %lu.\n", size); ok(*((WORD*)pdata) == 3, "Retrieved data is wrong (%u instead of 3)\n", *((WORD*)pdata)); /* Try to get not existing member (szMember == "unknown") */ hr = IDirectXFileData_GetData(lpdxfd, "unknown", &size, (void**)&pdata); - ok(hr == DXFILEERR_BADDATAREFERENCE, "IDirectXFileData_GetData: %x\n", hr); + ok(hr == DXFILEERR_BADDATAREFERENCE, "Unexpected hr %#lx.\n", hr); ref = IDirectXFileEnumObject_Release(lpdxfeo); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_Release(lpDirectXFile); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IDirectXFileData_Release(lpdxfd); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); } static void test_file_types(void) @@ -563,7 +563,7 @@ static void test_file_types(void) } hr = pDirectXFileCreate(&dxfile); - ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!dxfile) { skip("Couldn't create DirectXFile interface\n"); @@ -571,64 +571,64 @@ static void test_file_types(void) } hr = IDirectXFile_RegisterTemplates(dxfile, empty_txt_file, sizeof(empty_txt_file) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFile_RegisterTemplates(dxfile, empty_bin_file, sizeof(empty_bin_file) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFile_RegisterTemplates(dxfile, empty_tzip_file, sizeof(empty_tzip_file) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFile_RegisterTemplates(dxfile, empty_bzip_file, sizeof(empty_bzip_file) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFile_RegisterTemplates(dxfile, empty_cmp_file, sizeof(empty_cmp_file) - 1); - ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILEERR_BADFILETYPE, "Unexpected hr %#lx.\n", hr); hr = IDirectXFile_RegisterTemplates(dxfile, empty_xxxx_file, sizeof(empty_xxxx_file) - 1); - ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILEERR_BADFILETYPE, "Unexpected hr %#lx.\n", hr); lminfo.lpMemory = empty_txt_file; lminfo.dSize = sizeof(empty_txt_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); lminfo.lpMemory = empty_bin_file; lminfo.dSize = sizeof(empty_bin_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); lminfo.lpMemory = empty_tzip_file; lminfo.dSize = sizeof(empty_tzip_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); lminfo.lpMemory = empty_bzip_file; lminfo.dSize = sizeof(empty_bzip_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (hr == DXFILE_OK) IDirectXFileEnumObject_Release(enum_object); lminfo.lpMemory = empty_cmp_file; lminfo.dSize = sizeof(empty_cmp_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILEERR_BADFILETYPE, "Unexpected hr %#lx.\n", hr); lminfo.lpMemory = empty_xxxx_file; lminfo.dSize = sizeof(empty_xxxx_file) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILEERR_BADFILETYPE, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILEERR_BADFILETYPE, "Unexpected hr %#lx.\n", hr); IDirectXFile_Release(dxfile); } static void test_templates(void) { - HRESULT ret; IDirectXFile *dxfile = NULL; + HRESULT hr; if (!pDirectXFileCreate) { @@ -636,28 +636,28 @@ static void test_templates(void) return; } - ret = pDirectXFileCreate(&dxfile); - ok(ret == DXFILE_OK, "DirectXFileCreate: %x\n", ret); + hr = pDirectXFileCreate(&dxfile); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!dxfile) { skip("Couldn't create DirectXFile interface\n"); return; } - ret = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_type1, sizeof(templates_bad_file_type1) - 1); - ok(ret == DXFILEERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILETYPE); + hr = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_type1, sizeof(templates_bad_file_type1) - 1); + ok(hr == DXFILEERR_BADFILETYPE, "Unexpected hr %#lx.\n", hr); - ret = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_version, sizeof(templates_bad_file_version) - 1); - ok(ret == DXFILEERR_BADFILEVERSION, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILEVERSION); + hr = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_version, sizeof(templates_bad_file_version) - 1); + ok(hr == DXFILEERR_BADFILEVERSION, "Unexpected hr %#lx.\n", hr); - ret = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_type2, sizeof(templates_bad_file_type2) - 1); - ok(ret == DXFILEERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILETYPE); + hr = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_type2, sizeof(templates_bad_file_type2) - 1); + ok(hr == DXFILEERR_BADFILETYPE, "Unexpected hr %#lx.\n", hr); - ret = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_float_size, sizeof(templates_bad_file_float_size) - 1); - ok(ret == DXFILEERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILEFLOATSIZE); + hr = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_float_size, sizeof(templates_bad_file_float_size) - 1); + ok(hr == DXFILEERR_BADFILEFLOATSIZE, "Unexpected hr %#lx.\n", hr); - ret = IDirectXFile_RegisterTemplates(dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); - ok(ret == DXFILEERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = IDirectXFile_RegisterTemplates(dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); IDirectXFile_Release(dxfile); } @@ -679,7 +679,7 @@ static void test_compressed_files(void) } hr = pDirectXFileCreate(&dxfile); - ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!dxfile) { skip("Couldn't create DirectXFile interface\n"); @@ -687,18 +687,18 @@ static void test_compressed_files(void) } hr = IDirectXFile_RegisterTemplates(dxfile, compressed_template, sizeof(compressed_template) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); lminfo.lpMemory = compressed_object; lminfo.dSize = sizeof(compressed_object) - 1; hr = IDirectXFile_CreateEnumObject(dxfile, &lminfo, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &file_data); - ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetData(file_data, NULL, &size, (void**)&data); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); ok(size == 8, "Retrieved data size is wrong\n"); ok((*((WORD*)data) == 1) && (*((WORD*)(data+2)) == 2) && (*((DWORD*)(data+4)) == 3), "Retrieved data is wrong\n"); @@ -726,7 +726,7 @@ static void test_getname(void) } hr = pDirectXFileCreate(&lpDirectXFile); - ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); @@ -734,67 +734,67 @@ static void test_getname(void) } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Check object with name */ dxflm.lpMemory = &object; dxflm.dSize = sizeof(object) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); - ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetName(lpdxfd, NULL, NULL); - ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + ok(hr == DXFILEERR_BADVALUE, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetName(lpdxfd, name, NULL); - ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + ok(hr == DXFILEERR_BADVALUE, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); - ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); - ok(length == 7, "Returned length should be 7 instead of %u\n", length); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + ok(length == 7, "Unexpected length %lu.\n", length); length = sizeof(name); hr = IDirectXFileData_GetName(lpdxfd, name, &length); - ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); - ok(length == 7, "Returned length should be 7 instead of %u\n", length); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + ok(length == 7, "Unexpected length %lu.\n", length); ok(!strcmp(name, "Object"), "Returned string should be 'Object' instead of '%s'\n", name); length = 3; hr = IDirectXFileData_GetName(lpdxfd, name, &length); - ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + ok(hr == DXFILEERR_BADVALUE, "Unexpected hr %#lx.\n", hr); ref = IDirectXFileEnumObject_Release(lpdxfeo); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IDirectXFileData_Release(lpdxfd); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); /* Check object without name */ dxflm.lpMemory = &object_noname; dxflm.dSize = sizeof(object_noname) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); - ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); - ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); - ok(length == 0, "Returned length should be 0 instead of %u\n", length); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + ok(!length, "Unexpected length %lu.\n", length); length = 0; name[0] = 0x7f; hr = IDirectXFileData_GetName(lpdxfd, name, &length); - ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); - ok(length == 0, "Returned length should be 0 instead of %u\n", length); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + ok(!length, "Unexpected length %lu.\n", length); ok(name[0] == 0x7f, "First character is %#x instead of 0x7f\n", name[0]); length = sizeof(name); name[0] = 0x7f; hr = IDirectXFileData_GetName(lpdxfd, name, &length); - ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); - ok(length == 0, "Returned length should be 0 instead of %u\n", length); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + ok(!length, "Unexpected length %lu.\n", length); ok(name[0] == 0, "First character is %#x instead of 0x00\n", name[0]); ref = IDirectXFileEnumObject_Release(lpdxfeo); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IDirectXFileData_Release(lpdxfd); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_Release(lpDirectXFile); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); } static void test_syntax(void) @@ -814,7 +814,7 @@ static void test_syntax(void) } hr = pDirectXFileCreate(&lpDirectXFile); - ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); @@ -822,32 +822,32 @@ static void test_syntax(void) } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_array_mixed, sizeof(template_syntax_array_mixed) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test empty array */ dxflm.lpMemory = &object_syntax_empty_array; dxflm.dSize = sizeof(object_syntax_empty_array) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); - ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (hr == DXFILE_OK) IDirectXFileData_Release(lpdxfd); IDirectXFileEnumObject_Release(lpdxfeo); hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_string, sizeof(template_syntax_string) - 1); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test normal string */ dxflm.lpMemory = &object_syntax_string_normal; dxflm.dSize = sizeof(object_syntax_string_normal) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); - ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&string); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - ok(size == sizeof(char*), "Got wrong data size %d\n", size); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + ok(size == sizeof(char*), "Got wrong data size %ld.\n", size); ok(!strcmp(*string, "foobar"), "Got string %s, expected foobar\n", *string); if (hr == DXFILE_OK) IDirectXFileData_Release(lpdxfd); @@ -857,12 +857,12 @@ static void test_syntax(void) dxflm.lpMemory = &object_syntax_string_with_separator; dxflm.dSize = sizeof(object_syntax_string_with_separator) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); - ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&string); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - ok(size == sizeof(char*), "Got wrong data size %d\n", size); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + ok(size == sizeof(char*), "Got wrong data size %ld.\n", size); ok(!strcmp(*string, "foo;bar"), "Got string %s, expected foo;bar\n", *string); if (hr == DXFILE_OK) IDirectXFileData_Release(lpdxfd); @@ -872,12 +872,12 @@ static void test_syntax(void) dxflm.lpMemory = &object_syntax_string_bin; dxflm.dSize = sizeof(object_syntax_string_bin); hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); - ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&string); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - ok(size == sizeof(char*), "Got wrong data size %d\n", size); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + ok(size == sizeof(char*), "Got wrong data size %ld.\n", size); ok(!strcmp(*string, "foobar"), "Got string %s, expected foobar\n", *string); if (hr == DXFILE_OK) IDirectXFileData_Release(lpdxfd); @@ -899,14 +899,14 @@ static HRESULT test_buffer_object(IDirectXFile *dxfile, char* object_data, DWORD load_info.lpMemory = object_data; load_info.dSize = object_size; hr = IDirectXFile_CreateEnumObject(dxfile, &load_info, DXFILELOAD_FROMMEMORY, &enum_object); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); ret = IDirectXFileEnumObject_GetNextDataObject(enum_object, &file_data); if (ret == DXFILE_OK) { hr = IDirectXFileData_GetData(file_data, NULL, &size, (void**)&array); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - ok(size == sizeof(values), "Got wrong data size %d\n", size); - ok(!memcmp(array, values, sizeof(values)), "Got values [%u, %u, %u, %u, %u], expected [%u, %u, %u, %u, %u]\n", + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + ok(size == sizeof(values), "Got wrong data size %ld.\n", size); + ok(!memcmp(array, values, sizeof(values)), "Got values [%lu, %lu, %lu, %lu, %lu], expected [%lu, %lu, %lu, %lu, %lu]\n", array[0], array[1], array[2], array[3], array[4], values[0], values[1], values[2], values[3], values[4]); IDirectXFileData_Release(file_data); } @@ -917,8 +917,8 @@ static HRESULT test_buffer_object(IDirectXFile *dxfile, char* object_data, DWORD static void test_syntax_semicolon_comma(void) { - HRESULT ret; IDirectXFile *dxfile = NULL; + HRESULT hr; if (!pDirectXFileCreate) { @@ -926,99 +926,99 @@ static void test_syntax_semicolon_comma(void) return; } - ret = pDirectXFileCreate(&dxfile); - ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + hr = pDirectXFileCreate(&dxfile); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!dxfile) { skip("Couldn't create DirectXFile interface\n"); return; } - ret = IDirectXFile_RegisterTemplates(dxfile, template_syntax_array_mixed, sizeof(template_syntax_array_mixed) - 1); - ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + hr = IDirectXFile_RegisterTemplates(dxfile, template_syntax_array_mixed, sizeof(template_syntax_array_mixed) - 1); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test semicolon separators in text mode */ - ret = test_buffer_object(dxfile, object_syntax_semicolon_txt, sizeof(object_syntax_semicolon_txt) - 1); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_semicolon_txt, sizeof(object_syntax_semicolon_txt) - 1); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test semicolon separators in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_semicolon_bin, sizeof(object_syntax_semicolon_bin)); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_semicolon_bin, sizeof(object_syntax_semicolon_bin)); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test comma separators in text mode */ - ret = test_buffer_object(dxfile, object_syntax_comma_txt, sizeof(object_syntax_comma_txt) - 1); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_comma_txt, sizeof(object_syntax_comma_txt) - 1); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test comma separators in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_comma_bin, sizeof(object_syntax_comma_bin)); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_comma_bin, sizeof(object_syntax_comma_bin)); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test multi-semicolons separators in text mode */ - ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_multi_semicolons_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test multi-semicolons separators in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_bin, sizeof(object_syntax_multi_semicolons_bin)); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_multi_semicolons_bin, sizeof(object_syntax_multi_semicolons_bin)); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test multi-commas separators in text mode */ - ret = test_buffer_object(dxfile, object_syntax_multi_commas_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_multi_commas_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); /* Test multi-commas separators in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_multi_commas_bin, sizeof(object_syntax_multi_semicolons_bin)); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_multi_commas_bin, sizeof(object_syntax_multi_semicolons_bin)); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); /* Test multi-semicolons + single comma separators in text mode */ - ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_txt, sizeof(object_syntax_multi_semicolons_and_comma_txt) - 1); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_txt, sizeof(object_syntax_multi_semicolons_and_comma_txt) - 1); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test multi-semicolons + single comma separators in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_bin, sizeof(object_syntax_multi_semicolons_and_comma_bin)); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_bin, sizeof(object_syntax_multi_semicolons_and_comma_bin)); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test comma + semicolon separators in text mode */ - ret = test_buffer_object(dxfile, object_syntax_comma_and_semicolon_txt, sizeof(object_syntax_comma_and_semicolon_txt) - 1); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_comma_and_semicolon_txt, sizeof(object_syntax_comma_and_semicolon_txt) - 1); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); /* Test comma + semicolon separators in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_comma_and_semicolon_bin, sizeof(object_syntax_comma_and_semicolon_bin)); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_comma_and_semicolon_bin, sizeof(object_syntax_comma_and_semicolon_bin)); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); /* Test no ending separator in text mode */ - ret = test_buffer_object(dxfile, object_syntax_no_ending_separator_txt, sizeof(object_syntax_no_ending_separator_txt) - 1); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_no_ending_separator_txt, sizeof(object_syntax_no_ending_separator_txt) - 1); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); /* Test no ending separator in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_no_ending_separator_bin, sizeof(object_syntax_no_ending_separator_bin)); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_no_ending_separator_bin, sizeof(object_syntax_no_ending_separator_bin)); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); /* Test no array separator in text mode */ - ret = test_buffer_object(dxfile, object_syntax_array_no_separator_txt, sizeof(object_syntax_array_no_separator_txt) - 1); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_array_no_separator_txt, sizeof(object_syntax_array_no_separator_txt) - 1); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); /* Test no array separator in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_array_no_separator_bin, sizeof(object_syntax_array_no_separator_bin)); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_array_no_separator_bin, sizeof(object_syntax_array_no_separator_bin)); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); /* Test object with a single integer list in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_full_integer_list_bin, sizeof(object_syntax_full_integer_list_bin)); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_full_integer_list_bin, sizeof(object_syntax_full_integer_list_bin)); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test object with mixed integer list and integers + single comma separators in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_mixed_integer_list_bin, sizeof(object_syntax_mixed_integer_list_bin)); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + hr = test_buffer_object(dxfile, object_syntax_mixed_integer_list_bin, sizeof(object_syntax_mixed_integer_list_bin)); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); /* Test integer list followed by a semicolon in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_integer_list_semicolon_bin, sizeof(object_syntax_integer_list_semicolon_bin)); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_integer_list_semicolon_bin, sizeof(object_syntax_integer_list_semicolon_bin)); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); /* Test integer list followed by a comma in binary mode */ - ret = test_buffer_object(dxfile, object_syntax_integer_list_comma_bin, sizeof(object_syntax_integer_list_comma_bin)); - ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + hr = test_buffer_object(dxfile, object_syntax_integer_list_comma_bin, sizeof(object_syntax_integer_list_comma_bin)); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); IDirectXFile_Release(dxfile); } static void test_complex_object(void) { - HRESULT ret; IDirectXFile *dxfile = NULL; IDirectXFileEnumObject *enum_object; IDirectXFileData *file_data; DXFILELOADMEMORY load_info; + HRESULT hr; if (!pDirectXFileCreate) { @@ -1026,23 +1026,23 @@ static void test_complex_object(void) return; } - ret = pDirectXFileCreate(&dxfile); - ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + hr = pDirectXFileCreate(&dxfile); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!dxfile) { skip("Couldn't create DirectXFile interface\n"); return; } - ret = IDirectXFile_RegisterTemplates(dxfile, templates_complex_object, sizeof(templates_complex_object) - 1); - ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + hr = IDirectXFile_RegisterTemplates(dxfile, templates_complex_object, sizeof(templates_complex_object) - 1); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); load_info.lpMemory = object_complex; load_info.dSize = sizeof(object_complex) - 1; - ret = IDirectXFile_CreateEnumObject(dxfile, &load_info, DXFILELOAD_FROMMEMORY, &enum_object); - ok(ret == DXFILE_OK, "IDirectXFile_CreateEnumObject failed with %#x\n", ret); - ret = IDirectXFileEnumObject_GetNextDataObject(enum_object, &file_data); - ok(ret == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject failed with %#x\n", ret); + hr = IDirectXFile_CreateEnumObject(dxfile, &load_info, DXFILELOAD_FROMMEMORY, &enum_object); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &file_data); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); IDirectXFileData_Release(file_data); IDirectXFileEnumObject_Release(enum_object); @@ -1051,8 +1051,8 @@ static void test_complex_object(void) static void test_standard_templates(void) { - HRESULT ret; IDirectXFile *dxfile = NULL; + HRESULT hr; if (!pDirectXFileCreate) { @@ -1060,24 +1060,24 @@ static void test_standard_templates(void) return; } - ret = pDirectXFileCreate(&dxfile); - ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + hr = pDirectXFileCreate(&dxfile); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!dxfile) { skip("Couldn't create DirectXFile interface\n"); return; } - ret = IDirectXFile_RegisterTemplates(dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); - ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + hr = IDirectXFile_RegisterTemplates(dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); IDirectXFile_Release(dxfile); } static void test_type_index_color(void) { - HRESULT ret; IDirectXFile *dxfile = NULL; + HRESULT hr; if (!pDirectXFileCreate) { @@ -1085,8 +1085,8 @@ static void test_type_index_color(void) return; } - ret = pDirectXFileCreate(&dxfile); - ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + hr = pDirectXFileCreate(&dxfile); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if (!dxfile) { skip("Couldn't create DirectXFile interface\n"); @@ -1094,10 +1094,10 @@ static void test_type_index_color(void) } /* Test that 'indexColor' can be used (same as IndexedColor in standard templates) and is case sensitive */ - ret = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); - ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); - ret = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_upper, sizeof(template_using_index_color_upper) - 1); - ok(ret == DXFILEERR_PARSEERROR, "IDirectXFileImpl_RegisterTemplates returned %#x instead of %#x\n", ret, DXFILEERR_PARSEERROR); + hr = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); + hr = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_upper, sizeof(template_using_index_color_upper) - 1); + ok(hr == DXFILEERR_PARSEERROR, "Unexpected hr %#lx.\n", hr); IDirectXFile_Release(dxfile); } @@ -1120,16 +1120,16 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) DWORD k, size; hr = IDirectXFileData_GetId(lpDirectXFileData, &clsid); - ok(hr == DXFILE_OK, "IDirectXFileData_GetId: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetName(lpDirectXFileData, name, &len); - ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetType(lpDirectXFileData, &clsid_type); - ok(hr == DXFILE_OK, "IDirectXFileData_GetType: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileData_GetData(lpDirectXFileData, NULL, &size, (void**)&pData); - ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < level; i++) printf(" "); - printf("Found object '%s' - %s - %s - %d\n", + printf("Found object '%s' - %s - %s - %ld\n", len ? name : "", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(clsid_type), size); if (EXPAND_STRING && size == 4) @@ -1176,9 +1176,9 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) if (0) { hr = IDirectXFileDataReference_GetId(lpDirectXFileData, &clsid); - ok(hr == DXFILE_OK, "IDirectXFileData_GetId: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFileDataReference_GetName(lpDirectXFileData, name, &len); - ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); } IDirectXFileDataReference_Resolve(p2, &pfdo); process_data(pfdo, level); @@ -1196,7 +1196,7 @@ if (0) IDirectXFileObject_Release(pChildObj); } - ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr); + ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "Unexpected hr %#lx.\n", hr); } /* Dump an X file 'objects.x' and its related templates file 'templates.x' if they are both presents @@ -1236,10 +1236,10 @@ static void test_dump(void) goto exit; } - printf("Load templates file (%d bytes)\n", cbSize); + printf("Load templates file (%ld bytes)\n", cbSize); hr = pDirectXFileCreate(&lpDirectXFile); - ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); if(!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); @@ -1247,10 +1247,10 @@ static void test_dump(void) } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, pvData, cbSize); - ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXFile_CreateEnumObject(lpDirectXFile, (LPVOID)"objects.x", DXFILELOAD_FROMFILE, &lpDirectXFileEnumObject); - ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); while (SUCCEEDED(hr = IDirectXFileEnumObject_GetNextDataObject(lpDirectXFileEnumObject, &lpDirectXFileData))) { @@ -1258,13 +1258,13 @@ static void test_dump(void) process_data(lpDirectXFileData, 0); IDirectXFileData_Release(lpDirectXFileData); } - ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "Unexpected hr %#lx.\n", hr); ref = IDirectXFile_Release(lpDirectXFileEnumObject); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %lu.\n", ref); ref = IDirectXFile_Release(lpDirectXFile); - ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ok(!ref, "Unexpected refcount %lu.\n", ref); CloseHandle(hFile); -- 2.35.1

2 3

Jump to page:

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