September 2020 - Wine-devel

[PATCH 1/4 v3] msvcrt: Fix count parameter type in printf functions family.
by Piotr Caban 16 Sep '20

16 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 4 ++-- dlls/msvcrt/wcs.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[PATCH] combase: Manage per-thread call cancellation counter.
by Nikolay Sivov 16 Sep '20

16 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Helps NVDA application from https://bugs.winehq.org/show_bug.cgi?id=48952 to get past initial failure. dlls/combase/combase.c | 27 +++++++++++++--- dlls/combase/combase_private.h | 1 + dlls/ole32/compobj_private.h | 1 + dlls/ole32/tests/compobj.c | 59 ++++++++++++++++++++++++++++++++++ include/winerror.h | 1 + 5 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index c66f0bbf8e2..7a85b95a19b 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -3104,9 +3104,20 @@ HRESULT WINAPI CoRegisterChannelHook(REFGUID guidExtension, IChannelHook *channe */ HRESULT WINAPI CoDisableCallCancellation(void *reserved) { - FIXME("%p stub\n", reserved); + struct tlsdata *tlsdata; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p\n", reserved); + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (!tlsdata->cancelcount) + return CO_E_CANCEL_DISABLED; + + tlsdata->cancelcount--; + + return S_OK; } /*********************************************************************** @@ -3114,9 +3125,17 @@ HRESULT WINAPI CoDisableCallCancellation(void *reserved) */ HRESULT WINAPI CoEnableCallCancellation(void *reserved) { - FIXME("%p stub\n", reserved); + struct tlsdata *tlsdata; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p\n", reserved); + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + tlsdata->cancelcount++; + + return S_OK; } /*********************************************************************** diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 2c938e6ff49..55ce02d06f0 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -84,6 +84,7 @@ struct tlsdata IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; + DWORD cancelcount; }; extern HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f10b41907a1..4ec22d51f45 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -62,6 +62,7 @@ struct oletls IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; + DWORD cancelcount; }; /* Global Interface Table Functions */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e627521fa59..5ed3f9638b1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -4186,6 +4186,64 @@ todo_wine CoUninitialize(); } +static void test_call_cancellation(void) +{ + HRESULT hr; + + /* Cancellation is disabled initially. */ + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Counter is not affected by initialization. */ + hr = CoInitialize(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + CoUninitialize(); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + /* It's cumulative. */ + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); +} + START_TEST(compobj) { init_funcs(); @@ -4236,6 +4294,7 @@ START_TEST(compobj) test_CoGetCurrentProcess(); test_mta_usage(); test_CoCreateInstanceFromApp(); + test_call_cancellation(); DeleteFileA( testlib ); } diff --git a/include/winerror.h b/include/winerror.h index 4ebb48c1249..86f7aace68e 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2679,6 +2679,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define RPC_E_NO_CONTEXT _HRESULT_TYPEDEF_(0x8001011E) #define RPC_E_TIMEOUT _HRESULT_TYPEDEF_(0x8001011F) #define RPC_E_NO_SYNC _HRESULT_TYPEDEF_(0x80010120) +#define CO_E_CANCEL_DISABLED _HRESULT_TYPEDEF_(0x80010140) #define RPC_E_UNEXPECTED _HRESULT_TYPEDEF_(0x8001FFFF) #define DISP_E_UNKNOWNINTERFACE _HRESULT_TYPEDEF_(0x80020001) -- 2.28.0

3 2

[PATCH] vbscript: Support non-Latin 1 characters in Asc.
by Akihiro Sagawa 16 Sep '20

16 Sep '20

Wine-Bugs: https://bugs.winehq.org/show_bug.cgi?id=49309 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/vbscript/global.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)

2 2

[PATCH] xactengine3_7: Return a valid HRESULT in IXACT3SoundBank Play
by Alistair Leslie-Hughes 16 Sep '20

16 Sep '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 742fe86cc9..16eadea7f2 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -273,7 +273,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); XACT3CueImpl *cue; FACTCue *fcue; - HRESULT hr; + UINT ret; TRACE("(%p)->(%u, 0x%x, %u, %p)\n", This, nCueIndex, dwFlags, timeOffset, ppCue); @@ -283,28 +283,31 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, * -flibit */ if (ppCue == NULL){ - hr = FACTSoundBank_Play(This->fact_soundbank, nCueIndex, dwFlags, + ret = FACTSoundBank_Play(This->fact_soundbank, nCueIndex, dwFlags, timeOffset, NULL); }else{ - hr = FACTSoundBank_Play(This->fact_soundbank, nCueIndex, dwFlags, + ret = FACTSoundBank_Play(This->fact_soundbank, nCueIndex, dwFlags, timeOffset, &fcue); - if(FAILED(hr)) - return hr; - - cue = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cue)); - if (!cue) + if(!ret) { - FACTCue_Destroy(fcue); - ERR("Failed to allocate XACT3CueImpl!"); - return E_OUTOFMEMORY; + cue = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cue)); + if (!cue) + { + FACTCue_Destroy(fcue); + ERR("Failed to allocate XACT3CueImpl!"); + return E_OUTOFMEMORY; + } + + cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; + cue->fact_cue = fcue; + *ppCue = (IXACT3Cue*)&cue->IXACT3Cue_iface; } - - cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; - cue->fact_cue = fcue; - *ppCue = (IXACT3Cue*)&cue->IXACT3Cue_iface; } - return hr; + if(ret != 0) + WARN("FACTSoundBank_Play returned %d\n", ret); + + return !ret ? S_OK : E_FAIL; } static HRESULT WINAPI IXACT3SoundBankImpl_Stop(IXACT3SoundBank *iface, -- 2.28.0

1 0

[PATCH] po: Brazilian Portuguese update
by Roberto Pungartnik 16 Sep '20

16 Sep '20

2 1

[PATCH v2] user32: Implement GetMouseMovePointsEx().
by Arkadiusz Hiler 16 Sep '20

16 Sep '20

With this patch we start storing history of last 64 mouse positions on the server side which can be retrieved by the newly introduced get_cursor_history request. The history is kept in reverse chronological order in an array that acts as circular buffer - this makes it easy to iterate over it in GetMouseMovePointsEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36873 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- I've re-tested this revision with Mount & Blade II: Bannerlord - the mouse works and feels right. v2: (as suggested by Rémi) * don't include autogenerated changes to server_protocol.h and trace.c * introduce get_cursor_history request instead of re-using set_cursor * C_ASSERT on structure sizes * check GetMouseMovePointsEx(count) against ARRAY_SIZE(history.points) * register points in reverse and iterate forward in GMMPEx * use wine_server_call_err dlls/user32/input.c | 57 +++++++++++++++++++++++++--- dlls/user32/tests/input.c | 79 ++++++++++++++++++++++++++++++++++++++- server/protocol.def | 22 +++++++++++ server/queue.c | 29 ++++++++++++++ server/trace.c | 28 ++++++++++++++ 5 files changed, 208 insertions(+), 7 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 1dd43a36a11..f7233015d22 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1271,22 +1271,67 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) * Success: count of point set in the buffer * Failure: -1 */ -int WINAPI GetMouseMovePointsEx(UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOINT ptout, int count, DWORD res) { +int WINAPI GetMouseMovePointsEx(UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOINT ptout, int count, DWORD res) +{ + cursor_history_t history; + cursor_pos_t *pos; + int copied; + unsigned int i; - if((size != sizeof(MOUSEMOVEPOINT)) || (count < 0) || (count > 64)) { + C_ASSERT(ARRAY_SIZE(history.positions) == 64); + + TRACE("(%d %p %p %d %d)\n", size, ptin, ptout, count, res); + + if ((size != sizeof(MOUSEMOVEPOINT)) || (count < 0) || (count > ARRAY_SIZE(history.positions))) + { SetLastError(ERROR_INVALID_PARAMETER); return -1; } - if(!ptin || (!ptout && count)) { + if (!ptin || (!ptout && count)) + { SetLastError(ERROR_NOACCESS); return -1; } - FIXME("(%d %p %p %d %d) stub\n", size, ptin, ptout, count, res); + if (res != GMMP_USE_DISPLAY_POINTS) + { + FIXME("only GMMP_USE_DISPLAY_POINTS is supported for now\n"); + SetLastError(ERROR_POINT_NOT_FOUND); + return -1; + } - SetLastError(ERROR_POINT_NOT_FOUND); - return -1; + SERVER_START_REQ( get_cursor_history ) + { + wine_server_set_reply( req, &history, sizeof(history) ); + if (wine_server_call_err( req )) + return -1; + } + SERVER_END_REQ; + + for (i = 0; i < ARRAY_SIZE(history.positions); i++) + { + pos = &history.positions[(i + history.newest) % ARRAY_SIZE(history.positions)]; + if (ptin->x == pos->x && ptin->y == pos->y && (!ptin->time || ptin->time == pos->time)) + break; + } + + if (i == ARRAY_SIZE(history.positions)) + { + SetLastError(ERROR_POINT_NOT_FOUND); + return -1; + } + + for (copied = 0; copied < count && i < ARRAY_SIZE(history.positions); copied++, i++) + { + pos = &history.positions[(i + history.newest) % ARRAY_SIZE(history.positions)]; + ptout[copied].x = pos->x; + ptout[copied].y = pos->y; + ptout[copied].time = pos->time; + ptout[copied].dwExtraInfo = pos->info; + } + + return copied; } /*********************************************************************** diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1809c147cbd..998e0d585fe 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1481,9 +1481,11 @@ static void test_GetMouseMovePointsEx(void) MOUSEMOVEPOINT in; MOUSEMOVEPOINT out[200]; POINT point; + TEST_INPUT input; /* Get a valid content for the input struct */ - if(!GetCursorPos(&point)) { + if (!GetCursorPos(&point)) + { win_skip("GetCursorPos() failed with error %u\n", GetLastError()); return; } @@ -1605,6 +1607,81 @@ static void test_GetMouseMovePointsEx(void) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + /* more than 64 to be sure we wrap around */ + for (int i = 0; i < 67; i++) + { + in.x = i; + in.y = i*2; + SetCursorPos(in.x, in.y); + } + + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == 64, "expected to get 64 mouse move points but got %d\n", retval); + + for (int i = 0; i < retval; i++) + { + ok(out[i].x == in.x && out[i].y == in.y, "wrong position %d, expected %dx%d got %dx%d\n", i, in.x, in.y, out[i].x, out[i].y); + in.x--; + in.y -= 2; + } + + /* make there's no deduplication */ + SetCursorPos(6, 6); + SetCursorPos(6, 6); + in.x = 6; + in.y = 6; + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == 64, "expected to get 64 mouse move points but got %d\n", retval); + ok(out[0].x == 6 && out[0].y == 6, "expected cursor position to be 6x6 but got %d %d\n", out[0].x, out[0].y); + ok(out[1].x == 6 && out[1].y == 6, "expected cursor position to be 6x6 but got %d %d\n", out[1].x, out[1].y); + + /* make sure 2 events are distinguishable by their timestamps */ + in.x = 150; + in.y = 75; + SetCursorPos(30, 30); + SetCursorPos(in.x, in.y); + SetCursorPos(150, 150); + Sleep(3); + SetCursorPos(in.x, in.y); + + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == 64, "expected to get 64 mouse move points but got %d\n", retval); + ok(out[0].x == 150 && out[0].y == 75, "expected cursor position to be 150x75 but got %d %d\n", out[0].x, out[0].y); + ok(out[1].x == 150 && out[1].y == 150, "expected cursor position to be 150x150 but got %d %d\n", out[1].x, out[1].y); + ok(out[2].x == 150 && out[2].y == 75, "expected cursor position to be 150x75 but got %d %d\n", out[2].x, out[2].y); + + in.time = out[2].time; + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == 62, "expected to get 62 mouse move points but got %d\n", retval); + ok(out[0].x == 150 && out[0].y == 75, "expected cursor position to be 150x75 but got %d %d\n", out[0].x, out[0].y); + ok(out[1].x == 30 && out[1].y == 30, "expected cursor position to be 30x30 but got %d %d\n", out[1].x, out[1].y); + + /* events created through other means should also be on the list with correct extra info */ + mouse_event(MOUSEEVENTF_MOVE, -13, 17, 0, 0xcafecafe); + ok(GetCursorPos(&point), "failed to get cursor positon\n"); + ok(in.x != point.x && in.y != point.y, "cursor didn't change position after moue_event()\n"); + in.time = 0; + in.x = point.x; + in.y = point.y; + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == 64, "expected to get 64 mouse move points but got %d\n", retval); + ok(out[0].dwExtraInfo == 0xcafecafe, "wrong extra info, got 0x%lx expected 0xcafecafe\n", out[0].dwExtraInfo); + + input.type = INPUT_MOUSE; + memset(&input, 0, sizeof(input)); + input.u.mi.dwFlags = MOUSEEVENTF_MOVE; + input.u.mi.dwExtraInfo = 0xdeadbeef; + input.u.mi.dx = -17; + input.u.mi.dy = 13; + SendInput(1, (INPUT*) &input, sizeof(INPUT)); + ok(GetCursorPos(&point), "failed to get cursor positon\n"); + ok(in.x != point.x && in.y != point.y, "cursor didn't change position after moue_event()\n"); + in.time = 0; + in.x = point.x; + in.y = point.y; + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == 64, "expected to get 64 mouse move points but got %d\n", retval); + ok(out[0].dwExtraInfo == 0xdeadbeef, "wrong extra info, got 0x%lx expected 0xdeadbeef\n", out[0].dwExtraInfo); #undef BUFLIM #undef MYERROR } diff --git a/server/protocol.def b/server/protocol.def index 92290af701c..80e2896a311 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -782,6 +782,22 @@ struct rawinput_device user_handle_t target; }; +typedef struct +{ + int x; + int y; + unsigned int time; + int __pad; + lparam_t info; +} cursor_pos_t; + +typedef struct +{ + unsigned int newest; + int __pad; + cursor_pos_t positions[64]; +} cursor_history_t; + /****************************************************************/ /* Request declarations */ @@ -3613,6 +3629,12 @@ struct handle_info #define SET_CURSOR_CLIP 0x08 #define SET_CURSOR_NOCLIP 0x10 +/* Get the history of the 64 last cursor positions */ +(a)REQ(get_cursor_history) +(a)REPLY + VARARG(history,cursor_history); +(a)END + /* Batch read rawinput message data */ @REQ(get_rawinput_buffer) diff --git a/server/queue.c b/server/queue.c index c1016016051..d05f06c8f45 100644 --- a/server/queue.c +++ b/server/queue.c @@ -225,6 +225,8 @@ static const struct object_ops thread_input_ops = /* pointer to input structure of foreground thread */ static unsigned int last_input_time; +static cursor_history_t cursor_history; + static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue ); static void free_message( struct message *msg ); @@ -1518,14 +1520,32 @@ static void update_rawinput_device(const struct rawinput_device *device) e->device.target = get_user_full_handle( e->device.target ); } +static void prepend_cursor_history( int x, int y, unsigned int time, lparam_t info ) +{ + const size_t positions_len = ARRAY_SIZE( cursor_history.positions ); + cursor_pos_t *pos; + cursor_history.newest = (cursor_history.newest + positions_len - 1) % positions_len; + pos = &cursor_history.positions[cursor_history.newest]; + + pos->x = x; + pos->y = y; + pos->time = time; + pos->info = info; +} + /* queue a hardware message into a given thread input */ static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue ) { user_handle_t win; struct thread *thread; struct thread_input *input; + struct hardware_msg_data *msg_data; unsigned int msg_code; + msg_data = msg->data; + if (msg->msg == WM_MOUSEMOVE) + prepend_cursor_history( msg->x, msg->y, msg->time, msg_data->info ); + update_input_key_state( desktop, desktop->keystate, msg->msg, msg->wparam ); last_input_time = get_tick_count(); if (msg->msg != WM_MOUSEMOVE) always_queue = 1; @@ -3220,6 +3240,15 @@ DECL_HANDLER(set_cursor) reply->last_change = input->desktop->cursor.last_change; } +/* Get the history of the 64 last cursor positions */ +DECL_HANDLER(get_cursor_history) +{ + if (sizeof(cursor_history) <= get_reply_max_size()) + set_reply_data( &cursor_history, min( sizeof(cursor_history), get_reply_max_size() ) ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); +} + DECL_HANDLER(get_rawinput_buffer) { struct thread_input *input = current->queue->input; diff --git a/server/trace.c b/server/trace.c index c93e4fe3b4e..3f040c138b7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -885,6 +885,34 @@ static void dump_varargs_rectangles( const char *prefix, data_size_t size ) remove_data( size ); } +static void dump_varargs_cursor_history( const char *prefix, data_size_t size ) +{ + const cursor_history_t *history = cur_data; + const cursor_pos_t *pos; + data_size_t len; + if (size != sizeof(*history)) + { + fprintf( stderr, "%s{}", prefix ); + return; + } + + fprintf( stderr, "%s{", prefix ); + fprintf( stderr, "newest=%u,", history->newest); + fprintf( stderr, "positions={" ); + len = ARRAY_SIZE( history->positions ); + pos = history->positions; + while (len > 0) + { + fprintf( stderr, "{x=%d,y=%d,time=%u", pos->x, pos->y, pos->time ); + dump_uint64( ",info=", &pos->info ); + fputc( '}', stderr ); + pos++; + if (--len) fputc( ',', stderr ); + } + fputc( '}', stderr ); + fputc( '}', stderr ); +} + static void dump_varargs_message_data( const char *prefix, data_size_t size ) { /* FIXME: dump the structured data */ -- 2.28.0

3 2

[PATCH vkd3d 1/3] vkd3d-shader: Print dcl_cb registers with dump_register directly.
by Isabella Bosia 16 Sep '20

16 Sep '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9e2fb65..e4bad38 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1282,7 +1282,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_CONSTANT_BUFFER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_src_param(buffer, &ins->declaration.cb.src, shader_version); + shader_dump_register(buffer, &ins->declaration.cb.src.reg, shader_version); if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, "[%u]", ins->declaration.cb.size); shader_addline(buffer, ", %s", -- 2.25.1

2 5

[PATCH vkd3d 1/4] vkd3d-shader: Add shader_ver_ge version comparison function.
by Isabella Bosia 16 Sep '20

16 Sep '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index fa35bc7..3d29d71 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -300,6 +300,11 @@ shader_input_sysval_semantic_names[] = {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, "finalLineDensityTessFactor"}, }; +static int shader_ver_ge(const struct vkd3d_shader_version *v, int major, int minor) +{ + return v->major > major || (v->major == major && v->minor >= minor); +} + static int VKD3D_PRINTF_FUNC(2, 3) shader_addline(struct vkd3d_string_buffer *buffer, const char *format, ...) { va_list args; @@ -579,7 +584,7 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, else { /* Pixel shaders 3.0 don't have usage semantics. */ - if (shader_version->major < 3 && shader_version->type == VKD3D_SHADER_TYPE_PIXEL) + if (!shader_ver_ge(shader_version, 3, 0) && shader_version->type == VKD3D_SHADER_TYPE_PIXEL) return; else shader_addline(buffer, "_"); @@ -711,7 +716,7 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, case VKD3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0 use general purpose output registers * (VKD3DSPR_OUTPUT), which can include an address token. */ - if (shader_version->major >= 3) + if (shader_ver_ge(shader_version, 3, 0)) shader_addline(buffer, "o"); else shader_addline(buffer, "oT"); @@ -1239,7 +1244,7 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, break; case VKD3DSIH_TEX: - if (shader_version->major >= 2 && (ins->flags & VKD3DSI_TEXLD_PROJECT)) + if (shader_ver_ge(shader_version, 2, 0) && (ins->flags & VKD3DSI_TEXLD_PROJECT)) shader_addline(buffer, "p"); break; @@ -1252,7 +1257,7 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, static void shader_dump_register_space(struct vkd3d_string_buffer *buffer, unsigned int register_space, const struct vkd3d_shader_version *shader_version) { - if (shader_version->major >= 5 && shader_version->minor >= 1) + if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, ", space=%u", register_space); } @@ -1275,7 +1280,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_CONSTANT_BUFFER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); shader_dump_src_param(buffer, &ins->declaration.cb.src, shader_version); - if (shader_version->major >= 5 && shader_version->minor >= 1) + if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, "[%u]", ins->declaration.cb.size); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); -- 2.25.1

2 7

[PATCH v2 3/3] sapi: Improve stub for ISpObjectToken::SetId.
by Myah Caron 16 Sep '20

16 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: no change. .token_key will be used when implementing CreateInstance (for querying CLSID). It's still used in order to check if the registry key exists though (otherwise it would fail more tests). If this is not acceptable (as it is semi-unused), the alternative (I believe) would be to have it be a local variable and introduce a temporary .initialized member instead. Keeping it felt like the cleanest option to me, but please advise if this is not correct. I set function as a semi-stub because it completely ignores the category, which appears to be an important part of the function, even if it is passed as NULL (which auto-detects the category). dlls/sapi/tests/token.c | 16 ++++++++-------- dlls/sapi/token.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 887539778a9..1ca49398ad1 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -202,23 +202,23 @@ static void test_object_token(void) ok( cat == (LPVOID)0xdeadbeef, "got %p\n", cat ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, L"bogus", NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE\\winetest bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); /* SetId succeeds even if the key is invalid, but exists */ hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE", FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); @@ -265,7 +265,7 @@ static void test_object_token(void) /* NULL appears to auto-detect the category */ hr = ISpObjectToken_SetId( token, NULL, token_id, FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index f7a00d73f02..b4a318b4ade 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -781,6 +781,8 @@ struct object_token { ISpObjectToken ISpObjectToken_iface; LONG ref; + + HKEY token_key; }; static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) @@ -827,6 +829,7 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { + if (This->token_key) RegCloseKey( This->token_key ); heap_free( This ); } @@ -923,8 +926,28 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, LPCWSTR category_id, LPCWSTR token_id, BOOL create ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + BOOL res; + HRESULT hr; + HKEY root, key; + const WCHAR *subkey; + + FIXME( "(%p)->(%s %s %d): semi-stub\n", This, debugstr_w( category_id ), + debugstr_w(token_id), create ); + + if (This->token_key) return SPERR_ALREADY_INITIALIZED; + + if (!token_id) return E_POINTER; + + hr = parse_cat_id( token_id, &root, &subkey ); + if (hr != S_OK) return SPERR_NOT_FOUND; + + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (res) return SPERR_NOT_FOUND; + + This->token_key = key; + + return S_OK; } static HRESULT WINAPI token_GetId( ISpObjectToken *iface, @@ -1047,6 +1070,8 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) This->ISpObjectToken_iface.lpVtbl = &token_vtbl; This->ref = 1; + This->token_key = NULL; + hr = ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj ); ISpObjectToken_Release( &This->ISpObjectToken_iface ); -- 2.28.0

2 1

[PATCH v2 2/2] kernel32: Use uppercase name in UpdateResourceW().
by Ziqing Hui 16 Sep '20

16 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Free allocated unicode string. Question: Do we need _TRY{}_EXCEPT{} here like in FindResourceExW() and FindResourceExA() ? dlls/kernel32/resource.c | 35 ++++++++++++++++++++++++++++++++-- dlls/kernel32/tests/resource.c | 1 - 2 files changed, 33 insertions(+), 3 deletions(-)

2 1