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

[PATCH 1/6] user.exe: Implement SetSystemTimer() using SetTimer().
by Zebediah Figura 15 Apr '22

15 Apr '22

Avoid passing a callback to SetSystemTimer(); it does not support one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user.exe16/message.c | 4 ++++ dlls/user.exe16/user_private.h | 2 ++ dlls/user.exe16/window.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 819d9d9b837..8d9e5404b09 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1292,6 +1292,10 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT lParam = MAKELPARAM( 0, convert_handle_32_to_16( lParam, GMEM_DDESHARE )); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_TIMER: + if (wParam & SYSTEM_TIMER_FLAG) + msg = WM_SYSTIMER; + break; case SBM_SETRANGE: ret = callback( HWND_16(hwnd), SBM_SETRANGE16, 0, MAKELPARAM(wParam, lParam), result, arg ); break; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 8a325cf9fb2..0805997246b 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -95,6 +95,8 @@ extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPAR #define WM_SYSTIMER 0x0118 +#define SYSTEM_TIMER_FLAG 0x10000 + /* Dialog info structure (must match the user32 one) */ typedef struct tagDIALOGINFO { diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 590b8ae9f7c..e54dd6a803e 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -111,7 +111,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 pr UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 proc ) { TIMERPROC proc32 = (TIMERPROC)WINPROC_AllocProc16( (WNDPROC16)proc ); - return SetSystemTimer( WIN_Handle32(hwnd), id, timeout, proc32 ); + return SetTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG, timeout, proc32 ); } @@ -1087,7 +1087,7 @@ void WINAPI SwitchToThisWindow16( HWND16 hwnd, BOOL16 restore ) */ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id ) { - return KillSystemTimer( WIN_Handle32(hwnd), id ); + return KillTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG ); } -- 2.35.1

3 7

[PATCH v2] supersede 232632
by Eric Pouech 15 Apr '22

15 Apr '22

dlls/kernel32/tests: correctly handle shell_no_window console in process.c should fix testbot daily failures for kernel32:process V1 -> V2: the FreeConsole() call under windows leads to children crashes in test_parent_process_attribute(), so I took the simple path of only calling FreeConsole() when testing under Wine Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8f18a0d37a7..ef2f1e45843 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1543,6 +1543,8 @@ static void test_Console(void) /* first, we need to be sure we're attached to a console */ if (!is_console(startup.hStdInput) || !is_console(startup.hStdOutput)) { + /* could be attached to a Wine shell_no_window console, so detach */ + if (!strcmp(winetest_platform, "wine")) FreeConsole(); /* we're not attached to a console, let's do it */ AllocConsole(); startup.hStdInput = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0);

2 1

[tools] testbot/cgi: Fix FormPage's OnAction() error handling.
by Francois Gouget 15 Apr '22

15 Apr '22

Form pages obviously don't have an enclosing page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Clearly a CollectionBlock copy/paste error. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c41924433..4f29efec7 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -681,7 +681,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - $self->{EnclosingPage}->SetError(undef, "No action defined for $Action"); + $self->SetError(undef, "No action defined for $Action"); return 0; } -- 2.30.2

1 0

[PATCH] po: Update Lithuanian translation.
by Aurimas Fišeras 15 Apr '22

15 Apr '22

1 0

[PATCH] dlls/kernel32/tests: correctly handle shell_no_window console in process.c
by Eric Pouech 15 Apr '22

15 Apr '22

should fix testbot daily failures for kernel32:process Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8f18a0d37a7..dfb72fae7b7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1543,6 +1543,8 @@ static void test_Console(void) /* first, we need to be sure we're attached to a console */ if (!is_console(startup.hStdInput) || !is_console(startup.hStdOutput)) { + /* could be attached to a shell_no_window console, so always detach */ + FreeConsole(); /* we're not attached to a console, let's do it */ AllocConsole(); startup.hStdInput = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0);

2 1

[PATCH 1/3] dlls/d3dx9_36: change read_dword() signature to hide int/long discrepancies
by Eric Pouech 15 Apr '22

15 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dx9_36/effect.c | 98 ++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index db95e6b592b3..32707e3a5ad0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -436,10 +436,12 @@ state_table[] = {SC_SETSAMPLER, 0, "Sampler"}, }; -static inline void read_dword(const char **ptr, DWORD *d) +static inline DWORD read_dword(const char **ptr) { - memcpy(d, *ptr, sizeof(*d)); - *ptr += sizeof(*d); + DWORD d; + memcpy(&d, *ptr, sizeof(d)); + *ptr += sizeof(d); + return d; } static void skip_dword_unknown(const char **ptr, unsigned int count) @@ -450,7 +452,7 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) { - read_dword(ptr, &d); + d = read_dword(ptr); WARN("\t0x%08x\n", d); } } @@ -5112,7 +5114,7 @@ static HRESULT d3dx_parse_sampler(struct d3dx_effect *effect, struct d3dx_sample HRESULT hr; UINT i; - read_dword(ptr, &sampler->state_count); + sampler->state_count = read_dword(ptr); TRACE("Count: %u\n", sampler->state_count); sampler->states = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sampler->states) * sampler->state_count); @@ -5212,7 +5214,7 @@ static HRESULT d3dx_parse_value(struct d3dx_effect *effect, struct d3dx_paramete case D3DXPT_TEXTURECUBE: case D3DXPT_PIXELSHADER: case D3DXPT_VERTEXSHADER: - read_dword(ptr, &param->object_id); + param->object_id = read_dword(ptr); TRACE("Id: %u\n", param->object_id); objects[param->object_id].param = param; param->data = value; @@ -5309,7 +5311,7 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) { DWORD size; - read_dword(&ptr, &size); + size = read_dword(&ptr); TRACE("Name size: %#x\n", size); if (!size) @@ -5345,7 +5347,7 @@ static HRESULT d3dx9_copy_data(struct d3dx_effect *effect, unsigned int object_i object->data = NULL; } - read_dword(ptr, &object->size); + object->size = read_dword(ptr); TRACE("Data size: %#x.\n", object->size); if (!object->size) @@ -5459,13 +5461,13 @@ static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx if (!parent) { - read_dword(ptr, (DWORD *)&param->type); + param->type = read_dword(ptr); TRACE("Type: %s\n", debug_d3dxparameter_type(param->type)); - read_dword(ptr, (DWORD *)&param->class); + param->class = read_dword(ptr); TRACE("Class: %s\n", debug_d3dxparameter_class(param->class)); - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Type name offset: %#x\n", offset); hr = d3dx9_parse_name(&param->name, data + offset); if (hr != D3D_OK) @@ -5474,7 +5476,7 @@ static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx goto err_out; } - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Type semantic offset: %#x\n", offset); hr = d3dx9_parse_name(&param->semantic, data + offset); if (hr != D3D_OK) @@ -5483,16 +5485,16 @@ static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx goto err_out; } - read_dword(ptr, &param->element_count); + param->element_count = read_dword(ptr); TRACE("Elements: %u\n", param->element_count); switch (param->class) { case D3DXPC_VECTOR: - read_dword(ptr, &param->columns); + param->columns = read_dword(ptr); TRACE("Columns: %u\n", param->columns); - read_dword(ptr, &param->rows); + param->rows = read_dword(ptr); TRACE("Rows: %u\n", param->rows); /* sizeof(DWORD) * rows * columns */ @@ -5502,10 +5504,10 @@ static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx case D3DXPC_SCALAR: case D3DXPC_MATRIX_ROWS: case D3DXPC_MATRIX_COLUMNS: - read_dword(ptr, &param->rows); + param->rows = read_dword(ptr); TRACE("Rows: %u\n", param->rows); - read_dword(ptr, &param->columns); + param->columns = read_dword(ptr); TRACE("Columns: %u\n", param->columns); /* sizeof(DWORD) * rows * columns */ @@ -5513,7 +5515,7 @@ static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx break; case D3DXPC_STRUCT: - read_dword(ptr, &param->member_count); + param->member_count = read_dword(ptr); TRACE("Members: %u\n", param->member_count); break; @@ -5651,7 +5653,7 @@ static HRESULT d3dx_parse_effect_annotation(struct d3dx_effect *effect, struct d anno->flags = D3DX_PARAMETER_ANNOTATION; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; hr = d3dx_parse_effect_typedef(effect, anno, data, &ptr2, NULL, D3DX_PARAMETER_ANNOTATION); @@ -5661,7 +5663,7 @@ static HRESULT d3dx_parse_effect_annotation(struct d3dx_effect *effect, struct d return hr; } - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Value offset: %#x\n", offset); hr = d3dx_parse_init_value(effect, anno, data, data + offset, objects); if (hr != D3D_OK) @@ -5685,7 +5687,7 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s state->type = ST_CONSTANT; - read_dword(ptr, &state->operation); + state->operation = read_dword(ptr); if (state->operation >= ARRAY_SIZE(state_table)) { WARN("Unknown state operation %u.\n", state->operation); @@ -5694,10 +5696,10 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s TRACE("Operation: %#x (%s)\n", state->operation, state_table[state->operation].name); - read_dword(ptr, &state->index); + state->index = read_dword(ptr); TRACE("Index: %#x\n", state->index); - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; hr = d3dx_parse_effect_typedef(effect, param, data, &ptr2, NULL, 0); @@ -5707,7 +5709,7 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s goto err_out; } - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Value offset: %#x\n", offset); hr = d3dx_parse_init_value(effect, param, data, data + offset, objects); if (hr != D3D_OK) @@ -5757,17 +5759,17 @@ static HRESULT d3dx_parse_effect_parameter(struct d3dx_effect *effect, struct d3 unsigned int i; const char *ptr2; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Typedef offset: %#x.\n", offset); ptr2 = data + offset; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Value offset: %#x.\n", offset); - read_dword(ptr, &param->param.flags); + param->param.flags = read_dword(ptr); TRACE("Flags: %#x.\n", param->param.flags); - read_dword(ptr, &param->annotation_count); + param->annotation_count = read_dword(ptr); TRACE("Annotation count: %u.\n", param->annotation_count); hr = d3dx_parse_effect_typedef(effect, &param->param, data, &ptr2, NULL, param->param.flags); @@ -5831,7 +5833,7 @@ static HRESULT d3dx_parse_effect_pass(struct d3dx_effect *effect, struct d3dx_pa struct d3dx_state *states = NULL; char *name = NULL; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Pass name offset: %#x\n", offset); hr = d3dx9_parse_name(&name, data + offset); if (hr != D3D_OK) @@ -5840,10 +5842,10 @@ static HRESULT d3dx_parse_effect_pass(struct d3dx_effect *effect, struct d3dx_pa goto err_out; } - read_dword(ptr, &pass->annotation_count); + pass->annotation_count = read_dword(ptr); TRACE("Annotation count: %u\n", pass->annotation_count); - read_dword(ptr, &pass->state_count); + pass->state_count = read_dword(ptr); TRACE("State count: %u\n", pass->state_count); if (pass->annotation_count) @@ -5927,7 +5929,7 @@ static HRESULT d3dx_parse_effect_technique(struct d3dx_effect *effect, struct d3 unsigned int i; char *name = NULL; - read_dword(ptr, &offset); + offset = read_dword(ptr); TRACE("Technique name offset: %#x\n", offset); hr = d3dx9_parse_name(&name, data + offset); if (hr != D3D_OK) @@ -5936,10 +5938,10 @@ static HRESULT d3dx_parse_effect_technique(struct d3dx_effect *effect, struct d3 goto err_out; } - read_dword(ptr, &technique->annotation_count); + technique->annotation_count = read_dword(ptr); TRACE("Annotation count: %u\n", technique->annotation_count); - read_dword(ptr, &technique->pass_count); + technique->pass_count = read_dword(ptr); TRACE("Pass count: %u\n", technique->pass_count); if (technique->annotation_count) @@ -6123,19 +6125,19 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, struct d3dx_object *object; HRESULT hr = E_FAIL; - read_dword(ptr, &technique_index); + technique_index = read_dword(ptr); TRACE("technique_index: %u\n", technique_index); - read_dword(ptr, &index); + index = read_dword(ptr); TRACE("index: %u\n", index); - read_dword(ptr, &element_index); + element_index = read_dword(ptr); TRACE("element_index: %u\n", element_index); - read_dword(ptr, &state_index); + state_index = read_dword(ptr); TRACE("state_index: %u\n", state_index); - read_dword(ptr, &usage); + usage = read_dword(ptr); TRACE("usage: %u\n", usage); if (technique_index == 0xffffffff) @@ -6308,15 +6310,15 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U HRESULT hr; UINT i; - read_dword(&ptr, &effect->parameter_count); + effect->parameter_count = read_dword(&ptr); TRACE("Parameter count: %u.\n", effect->parameter_count); - read_dword(&ptr, &effect->technique_count); + effect->technique_count = read_dword(&ptr); TRACE("Technique count: %u.\n", effect->technique_count); skip_dword_unknown(&ptr, 1); - read_dword(&ptr, &effect->object_count); + effect->object_count = read_dword(&ptr); TRACE("Object count: %u.\n", effect->object_count); effect->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -6375,17 +6377,17 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } } - read_dword(&ptr, &stringcount); + stringcount = read_dword(&ptr); TRACE("String count: %u.\n", stringcount); - read_dword(&ptr, &resourcecount); + resourcecount = read_dword(&ptr); TRACE("Resource count: %u.\n", resourcecount); for (i = 0; i < stringcount; ++i) { DWORD id; - read_dword(&ptr, &id); + id = read_dword(&ptr); TRACE("id: %u.\n", id); if (FAILED(hr = d3dx9_copy_data(effect, id, &ptr))) @@ -6526,7 +6528,7 @@ static HRESULT d3dx9_effect_init_from_dxbc(struct d3dx_effect *effect, list_init(&effect->parameter_block_list); - read_dword(&ptr, &tag); + tag = read_dword(&ptr); TRACE("Tag: %x\n", tag); if (!(flags & D3DXFX_NOT_CLONEABLE)) @@ -6570,7 +6572,7 @@ static HRESULT d3dx9_effect_init_from_dxbc(struct d3dx_effect *effect, goto fail; } } - read_dword(&ptr, &offset); + offset = read_dword(&ptr); TRACE("Offset: %x\n", offset); hr = d3dx_parse_effect(effect, ptr, data_size, offset, skip_constants, skip_constants_count); @@ -6669,7 +6671,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect, device, data, data_size, defines, include, flags, errors, pool, debugstr_a(skip_constants_string)); - read_dword(&ptr, &tag); + tag = read_dword(&ptr); if (tag == d3dx9_effect_version(9, 1)) return d3dx9_effect_init_from_dxbc(effect, device, data, data_size, flags, pool, skip_constants_string);

2 3

[PATCH] wininet/tests: Test adding empty HTTP header.
by Ziqing Hui 15 Apr '22

15 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/wininet/tests/http.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 80b3160820b..137f1fff362 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2063,6 +2063,32 @@ static void HttpHeaders_test(void) "header still present\n"); ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "got %lu\n", GetLastError()); + /* Header with empty value should cause a failure */ + todo_wine + { + SetLastError(0xdeadbeef); + ok(!HttpAddRequestHeadersA(hRequest, "EmptyTest1:", -1, HTTP_ADDREQ_FLAG_ADD), "Empty header should not be added.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error code %u.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(!HttpAddRequestHeadersA(hRequest, "EmptyTest2:\r\n", -1, HTTP_ADDREQ_FLAG_ADD), "Empty header should not be added.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error code %u.\n", GetLastError()); + + len = sizeof(buffer); + strcpy(buffer, "EmptyTest1"); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfoA(hRequest, HTTP_QUERY_CUSTOM | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, NULL), + "Header with empty value is present.\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Got unexpected error code %u.\n", GetLastError()); + + len = sizeof(buffer); + strcpy(buffer, "EmptyTest2"); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfoA(hRequest, HTTP_QUERY_CUSTOM | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, NULL), + "Header with empty value is present.\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Got unexpected error code %u.\n", GetLastError()); + } + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); -- 2.25.1

2 1

[PATCH 2/3] winepulse: Return offsets rather than ptrs to the strings.
by Huw Davies 14 Apr '22

14 Apr '22

This will make the Wow64 syscall rather simpler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 9 ++++++--- dlls/winepulse.drv/pulse.c | 17 ++++++++--------- dlls/winepulse.drv/unixlib.h | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 96b8b28d1b5..f1a1b36c9ef 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -457,13 +457,16 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **ke } for (i = 0; i < params.num; i++) { - unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); + WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + char *pulse_name = (char *)params.endpoints + params.endpoints[i].pulse_name; + unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); + if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, size))) { params.result = E_OUTOFMEMORY; break; } - memcpy(ids[i], params.endpoints[i].name, size); - get_device_guid(drv_key, flow, params.endpoints[i].pulse_name, &guids[i]); + memcpy(ids[i], name, size); + get_device_guid(drv_key, flow, pulse_name, &guids[i]); } if (drv_key) RegCloseKey(drv_key); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 5e3ddcc9b6e..34955a5ee8d 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -327,12 +327,11 @@ static NTSTATUS pulse_get_endpoint_ids(void *args) struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; struct endpoint *endpoint = params->endpoints; DWORD len, name_len, needed; + unsigned int offset; PhysDevice *dev; - char *ptr; params->num = list_count(list); - needed = params->num * sizeof(*params->endpoints); - ptr = (char*)(endpoint + params->num); + offset = needed = params->num * sizeof(*params->endpoints); LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { name_len = lstrlenW(dev->name) + 1; @@ -340,12 +339,12 @@ static NTSTATUS pulse_get_endpoint_ids(void *args) needed += name_len * sizeof(WCHAR) + ((len + 1) & ~1); if (needed <= params->size) { - endpoint->name = (WCHAR*)ptr; - memcpy(endpoint->name, dev->name, name_len * sizeof(WCHAR)); - ptr += name_len * sizeof(WCHAR); - endpoint->pulse_name = ptr; - memcpy(endpoint->pulse_name, dev->pulse_name, len); - ptr += (len + 1) & ~1; + endpoint->name = offset; + memcpy((char *)params->endpoints + offset, dev->name, name_len * sizeof(WCHAR)); + offset += name_len * sizeof(WCHAR); + endpoint->pulse_name = offset; + memcpy((char *)params->endpoints + offset, dev->pulse_name, len); + offset += (len + 1) & ~1; endpoint++; } } diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index e09362f0751..8d48af7dedc 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -39,8 +39,8 @@ struct pulse_config struct endpoint { - WCHAR *name; - char *pulse_name; + unsigned int name; + unsigned int pulse_name; }; struct main_loop_params -- 2.25.1

3 3

[PATCH 1/9] jscript: Handle NULL return pointers in all constructors.
by Gabriel Ivăncescu 14 Apr '22

14 Apr '22

Instead of crashing. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/activex.c | 3 ++- dlls/jscript/array.c | 4 ++++ dlls/jscript/bool.c | 3 +++ dlls/jscript/date.c | 6 ++++-- dlls/jscript/enumerator.c | 3 ++- dlls/jscript/function.c | 3 ++- dlls/jscript/number.c | 11 ++++++----- dlls/jscript/set.c | 4 ++++ dlls/jscript/string.c | 9 ++++++--- dlls/jscript/tests/api.js | 15 +++++++++++++++ dlls/jscript/vbarray.c | 4 +++- 11 files changed, 51 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 5d79d2b..a74f6ac 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -181,7 +181,8 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, return E_NOTIMPL; } - *r = jsval_disp(disp); + if(r) *r = jsval_disp(disp); + else IDispatch_Release(disp); return S_OK; } diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index dcabc0d..ee72579 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1374,6 +1374,8 @@ static HRESULT ArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, u if(n < 0 || !is_int32(n)) return JS_E_INVALID_LENGTH; + if(!r) + return S_OK; hres = create_array(ctx, n, &obj); if(FAILED(hres)) @@ -1383,6 +1385,8 @@ static HRESULT ArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, u return S_OK; } + if(!r) + return S_OK; hres = create_array(ctx, argc, &obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index a230855..3a4aa9c 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -151,6 +151,9 @@ static HRESULT BoolConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, un case DISPATCH_CONSTRUCT: { jsdisp_t *bool; + if(!r) + return S_OK; + hres = create_bool(ctx, value, &bool); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index e482c4a..bc09f05 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2248,7 +2248,8 @@ static HRESULT DateConstr_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, un if(FAILED(hres)) return hres; - *r = jsval_number(n); + if(r) + *r = jsval_number(n); return S_OK; } @@ -2403,7 +2404,8 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, un } } - *r = jsval_obj(&date->dispex); + if(r) *r = jsval_obj(&date->dispex); + else jsdisp_release(&date->dispex); return S_OK; case INVOKE_FUNC: { diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index 94eb9f2..f82263e 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -300,7 +300,8 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD fla if(FAILED(hres)) return hres; - *r = jsval_obj(obj); + if(r) *r = jsval_obj(obj); + else jsdisp_release(obj); break; } default: diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 03c541c..12511bb 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -1008,7 +1008,8 @@ static HRESULT FunctionConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags if(FAILED(hres)) return hres; - *r = jsval_disp(ret); + if(r) *r = jsval_disp(ret); + else IDispatch_Release(ret); break; } default: diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 472acd0..be733fb 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -554,11 +554,12 @@ static HRESULT NumberConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, n = 0; } - hres = create_number(ctx, n, &obj); - if(FAILED(hres)) - return hres; - - *r = jsval_obj(obj); + if(r) { + hres = create_number(ctx, n, &obj); + if(FAILED(hres)) + return hres; + *r = jsval_obj(obj); + } break; } default: diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 7973d42..8098d76 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -114,6 +114,8 @@ static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns case DISPATCH_CONSTRUCT: TRACE("\n"); + if(!r) + return S_OK; if(!(set = heap_alloc_zero(sizeof(*set)))) return E_OUTOFMEMORY; @@ -461,6 +463,8 @@ static HRESULT Map_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns case DISPATCH_CONSTRUCT: TRACE("\n"); + if(!r) + return S_OK; if(!(map = heap_alloc_zero(sizeof(*map)))) return E_OUTOFMEMORY; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 0b2e695..e73b9e8 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1644,7 +1644,8 @@ static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, str = jsstr_empty(); } - *r = jsval_string(str); + if(r) *r = jsval_string(str); + else jsstr_release(str); break; } case DISPATCH_CONSTRUCT: { @@ -1659,8 +1660,10 @@ static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, str = jsstr_empty(); } - hres = create_string(ctx, str, &ret); - if (SUCCEEDED(hres)) *r = jsval_obj(ret); + if(r) { + hres = create_string(ctx, str, &ret); + if(SUCCEEDED(hres)) *r = jsval_obj(ret); + } jsstr_release(str); return hres; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index fe336d4..1efc023 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -287,6 +287,8 @@ ok(Object.prototype.hasOwnProperty('toString'), "Object.prototype.hasOwnProperty ok(Object.prototype.hasOwnProperty('isPrototypeOf'), "Object.prototype.hasOwnProperty('isPrototypeOf') is false"); ok(Function.prototype.hasOwnProperty('call'), "Function.prototype.hasOwnProperty('call') is false"); +Object(); +new Object(); obj = new Object(); ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); @@ -296,28 +298,37 @@ ok(!Object.hasOwnProperty('isPrototypeOf'), "Object.hasOwnProperty('isPrototypeO ok(!parseFloat.hasOwnProperty('call'), "parseFloat.hasOwnProperty('call') is true"); ok(!Function.hasOwnProperty('call'), "Function.hasOwnProperty('call') is true"); +Array(); +new Array(); obj = new Array(); ok(Array.prototype.hasOwnProperty('sort'), "Array.prototype.hasOwnProperty('sort') is false"); ok(Array.prototype.hasOwnProperty('length'), "Array.prototype.hasOwnProperty('length') is false"); ok(!obj.hasOwnProperty('sort'), "obj.hasOwnProperty('sort') is true"); ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is true"); +Boolean(); +new Boolean(); obj = new Boolean(false); ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); ok(!Boolean.hasOwnProperty('toString'), "Boolean.hasOwnProperty('toString') is true"); ok(Boolean.prototype.hasOwnProperty('toString'), "Boolean.prototype.hasOwnProperty('toString') is false"); +Date(); +new Date(); obj = new Date(); ok(!obj.hasOwnProperty('getTime'), "obj.hasOwnProperty('getTime') is true"); ok(!Date.hasOwnProperty('getTime'), "Date.hasOwnProperty('getTime') is true"); ok(Date.prototype.hasOwnProperty('getTime'), "Date.prototype.hasOwnProperty('getTime') is false"); ok(!("now" in Date), "now found in Date"); +Number(); +new Number(); obj = new Number(); ok(!obj.hasOwnProperty('toFixed'), "obj.hasOwnProperty('toFixed') is true"); ok(!Number.hasOwnProperty('toFixed'), "Number.hasOwnProperty('toFixed') is true"); ok(Number.prototype.hasOwnProperty('toFixed'), "Number.prototype.hasOwnProperty('toFixed') is false"); +/x/; obj = /x/; ok(!obj.hasOwnProperty('exec'), "obj.hasOwnProperty('exec') is true"); ok(obj.hasOwnProperty('source'), "obj.hasOwnProperty('source') is false"); @@ -325,6 +336,8 @@ ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); +String(); +new String(); obj = new String(); ok(!obj.hasOwnProperty('charAt'), "obj.hasOwnProperty('charAt') is true"); ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is false"); @@ -3127,6 +3140,8 @@ ok(String.length == 1, "String.length = " + String.length); var tmp = createArray(); ok(getVT(tmp) == "VT_ARRAY|VT_VARIANT", "getVT(createArray()) = " + getVT(tmp)); ok(getVT(VBArray(tmp)) == "VT_ARRAY|VT_VARIANT", "getVT(VBArray(tmp)) = " + getVT(VBArray(tmp))); +VBArray(tmp); +new VBArray(tmp); tmp = new VBArray(tmp); tmp = new VBArray(VBArray(createArray())); ok(tmp.dimensions() == 2, "tmp.dimensions() = " + tmp.dimensions()); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 987d714..d55e90d 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -291,11 +291,13 @@ static HRESULT VBArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, if(argc<1 || !is_variant(argv[0]) || V_VT(get_variant(argv[0])) != (VT_ARRAY|VT_VARIANT)) return JS_E_VBARRAY_EXPECTED; - return jsval_copy(argv[0], r); + return r ? jsval_copy(argv[0], r) : S_OK; case DISPATCH_CONSTRUCT: if(argc<1 || !is_variant(argv[0]) || V_VT(get_variant(argv[0])) != (VT_ARRAY|VT_VARIANT)) return JS_E_VBARRAY_EXPECTED; + if(!r) + return S_OK; hres = alloc_vbarray(ctx, NULL, &vbarray); if(FAILED(hres)) -- 2.34.1

3 21

[PATCH v3] ieframe: Enable visual styles.
by Zhiyi Zhang 14 Apr '22

14 Apr '22

ieframe.dll uses manifest at ID 123. However, IEWinMain() is not called from rundll32.exe or Control_RunDLL() so the manifest needs to be activated in IEWinMain(). This allows iexplore.exe to enable theming. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 232395. Activate context in IEWinMain() instead of DllMain(). Thanks, Jacek. dlls/ieframe/ieframe.manifest | 16 ++++++++++++++++ dlls/ieframe/ieframe.rc | 3 +++ dlls/ieframe/iexplore.c | 33 ++++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 dlls/ieframe/ieframe.manifest diff --git a/dlls/ieframe/ieframe.manifest b/dlls/ieframe/ieframe.manifest new file mode 100644 index 00000000000..c8fd3eb4dce --- /dev/null +++ b/dlls/ieframe/ieframe.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Ieframe" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc index aed8483e4ce..eb05a98dbc4 100644 --- a/dlls/ieframe/ieframe.rc +++ b/dlls/ieframe/ieframe.rc @@ -108,6 +108,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +/* @makedep: ieframe.manifest */ +123 RT_MANIFEST ieframe.manifest + /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 27b72a64fa7..1616d4d7f84 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -1125,10 +1125,13 @@ static void release_dde(void) */ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) { + BOOL embedding = FALSE, nohome = FALSE, manager = FALSE, activated = FALSE; MSG msg; HRESULT hres; - BOOL embedding = FALSE, nohome = FALSE, manager = FALSE; - DWORD reg_cookie; + HANDLE context = INVALID_HANDLE_VALUE; + DWORD reg_cookie, ret = 1; + ULONG_PTR context_cookie; + ACTCTXW actctx; static const WCHAR embeddingW[] = {'-','e','m','b','e','d','d','i','n','g',0}; static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; @@ -1138,6 +1141,15 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) CoInitialize(NULL); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.hModule = ieframe_instance; + actctx.lpResourceName = MAKEINTRESOURCEW(123); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + context = CreateActCtxW(&actctx); + if (context != INVALID_HANDLE_VALUE) + activated = ActivateActCtx(context, &context_cookie); + init_dde(); while (*cmdline) @@ -1173,17 +1185,13 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) if (FAILED(hres)) { ERR("failed to register CLSID_InternetExplorer%s: %08lx\n", manager ? "Manager" : "", hres); - CoUninitialize(); - ExitProcess(1); + goto done; } if (!embedding) { if(!create_ie_window(nohome, cmdline)) - { - CoUninitialize(); - ExitProcess(1); - } + goto done; } /* run the message loop for this thread */ @@ -1196,8 +1204,11 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) CoRevokeClassObject(reg_cookie); release_dde(); + ret = 0; +done: CoUninitialize(); - - ExitProcess(0); - return 0; + if (activated) + DeactivateActCtx(0, context_cookie); + ReleaseActCtx(context); + ExitProcess(ret); } -- 2.32.0

2 1