March 2022 - Wine-Commits - list.winehq.org

Jan Sikorski : wined3d: Pass mask to wined3d_next_cs_packet().
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 670a1e81b465f67cb7e49fdb84c1fc96853fc9d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=670a1e81b465f67cb7e49fdb… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Mar 15 17:09:22 2022 +0100 wined3d: Pass mask to wined3d_next_cs_packet(). It's not just used on the CS queue, but also on packet lists in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d0ca29eaedf..9edb002ec9e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -622,9 +622,9 @@ static const char *debug_cs_op(enum wined3d_cs_op op) return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); } -static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset) +static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset, SIZE_T mask) { - struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[WINED3D_CS_QUEUE_MASK(*offset)]; + struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[*offset & mask]; *offset += offsetof(struct wined3d_cs_packet, data[packet->size]); @@ -2882,7 +2882,7 @@ static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const vo while (start < end) { - const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(cs_data, &start); + const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(cs_data, &start, WINED3D_CS_QUEUE_MASK); enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; if (opcode >= WINED3D_CS_OP_STOP) @@ -3139,7 +3139,7 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined struct wined3d_cs_packet *packet; size_t packet_size; - packet = (struct wined3d_cs_packet *)&queue->data[WINED3D_CS_QUEUE_MASK(queue->head)]; + packet = (struct wined3d_cs_packet *)&queue->data[queue->head & WINED3D_CS_QUEUE_MASK]; TRACE("Queuing op %s at %p.\n", debug_cs_op(*(const enum wined3d_cs_op *)packet->data), packet); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); InterlockedExchange((LONG *)&queue->head, queue->head + packet_size); @@ -3163,7 +3163,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size size_t queue_size = ARRAY_SIZE(queue->data); size_t header_size, packet_size, remaining; struct wined3d_cs_packet *packet; - ULONG head = WINED3D_CS_QUEUE_MASK(queue->head); + ULONG head = queue->head & WINED3D_CS_QUEUE_MASK; header_size = FIELD_OFFSET(struct wined3d_cs_packet, data[0]); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[size]); @@ -3190,19 +3190,19 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size nop->opcode = WINED3D_CS_OP_NOP; wined3d_cs_queue_submit(queue, cs); - head = WINED3D_CS_QUEUE_MASK(queue->head); + head = queue->head & WINED3D_CS_QUEUE_MASK; assert(!head); } for (;;) { - ULONG tail = WINED3D_CS_QUEUE_MASK(*(volatile ULONG *)&queue->tail); + ULONG tail = (*(volatile ULONG *)&queue->tail) & WINED3D_CS_QUEUE_MASK; ULONG new_pos; /* Empty. */ if (head == tail) break; - new_pos = WINED3D_CS_QUEUE_MASK(head + packet_size); + new_pos = (head + packet_size) & WINED3D_CS_QUEUE_MASK; /* Head ahead of tail. We checked the remaining size above, so we only * need to make sure we don't make head equal to tail. */ if (head > tail && (new_pos != tail)) @@ -3346,7 +3346,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) spin_count = 0; tail = queue->tail; - packet = wined3d_next_cs_packet(queue->data, &tail); + packet = wined3d_next_cs_packet(queue->data, &tail, WINED3D_CS_QUEUE_MASK); if (packet->size) { opcode = *(const enum wined3d_cs_op *)packet->data; @@ -3998,7 +3998,7 @@ static void wined3d_deferred_context_submit(struct wined3d_device_context *conte struct wined3d_cs_packet *packet; assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); - packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size); + packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size, ~(SIZE_T)0); wined3d_cs_packet_incref_objects(packet); } @@ -4241,7 +4241,7 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte while (offset < deferred->data_size) { - packet = wined3d_next_cs_packet(deferred->data, &offset); + packet = wined3d_next_cs_packet(deferred->data, &offset, ~(SIZE_T)0); wined3d_cs_packet_decref_objects(packet); } @@ -4372,7 +4372,7 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) offset = 0; while (offset < list->data_size) { - packet = wined3d_next_cs_packet(list->data, &offset); + packet = wined3d_next_cs_packet(list->data, &offset, ~(SIZE_T)0); wined3d_cs_packet_decref_objects(packet); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 577377f8dd4..5b3eb0136b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4894,7 +4894,7 @@ enum wined3d_push_constants #define WINED3D_CS_QUERY_POLL_INTERVAL 10u #define WINED3D_CS_QUEUE_SIZE 0x100000u #define WINED3D_CS_SPIN_COUNT 10000000u -#define WINED3D_CS_QUEUE_MASK(a) ((a) & (WINED3D_CS_QUEUE_SIZE - 1)) +#define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) struct wined3d_cs_queue {

1 0

Jinoh Kang : windowscodecs: Fix rounding in premultiplied alpha conversion.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: e0d820a4cdf42acbd7528691513fcef54b878b18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0d820a4cdf42acbd7528691… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 14 21:30:47 2022 +0900 windowscodecs: Fix rounding in premultiplied alpha conversion. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 12 ++++++------ dlls/windowscodecs/tests/converter.c | 38 +++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 8abba2dec52..e93606e938d 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -984,9 +984,9 @@ static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICR BYTE alpha = pbBuffer[cbStride*y+4*x+3]; if (alpha != 255) { - pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * alpha / 255; - pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * alpha / 255; - pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * alpha / 255; + pbBuffer[cbStride*y+4*x] = (pbBuffer[cbStride*y+4*x] * alpha + 127) / 255; + pbBuffer[cbStride*y+4*x+1] = (pbBuffer[cbStride*y+4*x+1] * alpha + 127) / 255; + pbBuffer[cbStride*y+4*x+2] = (pbBuffer[cbStride*y+4*x+2] * alpha + 127) / 255; } } } @@ -1017,9 +1017,9 @@ static HRESULT copypixels_to_32bppPRGBA(struct FormatConverter *This, const WICR BYTE alpha = pbBuffer[cbStride*y+4*x+3]; if (alpha != 255) { - pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * alpha / 255; - pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * alpha / 255; - pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * alpha / 255; + pbBuffer[cbStride*y+4*x] = (pbBuffer[cbStride*y+4*x] * alpha + 127) / 255; + pbBuffer[cbStride*y+4*x+1] = (pbBuffer[cbStride*y+4*x+1] * alpha + 127) / 255; + pbBuffer[cbStride*y+4*x+2] = (pbBuffer[cbStride*y+4*x+2] * alpha + 127) / 255; } } } diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 9159141d6e5..2e77db6b205 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -453,13 +453,21 @@ static const BYTE bits_32bppBGR[] = { 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, - 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80}; + 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, + 3,3,3,80, 6,6,6,80, 12,12,12,80, 15,15,15,80, 19,19,19,80, 22,22,22,80, 28,28,28,80, 31,31,31,80, + 35,35,35,80, 38,38,38,80, 41,41,41,80, 47,47,47,80, 47,47,47,80, 54,54,54,80, 57,57,57,80, 63,63,63,80, + 66,66,66,80, 70,70,70,80, 73,73,73,80, 79,79,79,80, 82,82,82,80, 86,86,86,80, 89,89,89,80, 95,95,95,80, + 98,98,98,80, 98,98,98,80, 105,105,105,80, 108,108,108,80, 114,114,114,80, 117,117,117,80, 121,121,121,80, 124,124,124,80, + 130,130,130,80, 133,133,133,80, 137,137,137,80, 140,140,140,80, 146,146,146,80, 149,149,149,80, 156,156,156,80, 156,156,156,80, + 159,159,159,80, 165,165,165,80, 168,168,168,80, 172,172,172,80, 175,175,175,80, 181,181,181,80, 184,184,184,80, 188,188,188,80, + 191,191,191,80, 197,197,197,80, 200,200,200,80, 207,207,207,80, 207,207,207,80, 213,213,213,80, 216,216,216,80, 219,219,219,80, + 223,223,223,80, 226,226,226,80, 232,232,232,80, 235,235,235,80, 239,239,239,80, 242,242,242,80, 248,248,248,80, 251,251,251,80}; static const struct bitmap_data testdata_32bppBGR = { &GUID_WICPixelFormat32bppBGR, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; static const struct bitmap_data testdata_32bppBGRA80 = { - &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGR, 32, 4, 96.0, 96.0}; static const struct bitmap_data testdata_32bppRGBA80 = { - &GUID_WICPixelFormat32bppRGBA, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppRGBA, 32, bits_32bppBGR, 32, 4, 96.0, 96.0}; static const BYTE bits_32bppBGRA[] = { 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, @@ -469,7 +477,15 @@ static const BYTE bits_32bppBGRA[] = { 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, - 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255}; + 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, + 3,3,3,255, 6,6,6,255, 12,12,12,255, 15,15,15,255, 19,19,19,255, 22,22,22,255, 28,28,28,255, 31,31,31,80, + 35,35,35,255, 38,38,38,255, 41,41,41,255, 47,47,47,255, 47,47,47,255, 54,54,54,255, 57,57,57,255, 63,63,63,80, + 66,66,66,255, 70,70,70,255, 73,73,73,255, 79,79,79,255, 82,82,82,255, 86,86,86,255, 89,89,89,255, 95,95,95,80, + 98,98,98,255, 98,98,98,255, 105,105,105,255, 108,108,108,255, 114,114,114,255, 117,117,117,255, 121,121,121,255, 124,124,124,80, + 130,130,130,255, 133,133,133,255, 137,137,137,255, 140,140,140,255, 146,146,146,255, 149,149,149,255, 156,156,156,255, 156,156,156,80, + 159,159,159,255, 165,165,165,255, 168,168,168,255, 172,172,172,255, 175,175,175,255, 181,181,181,255, 184,184,184,255, 188,188,188,80, + 191,191,191,255, 197,197,197,255, 200,200,200,255, 207,207,207,255, 207,207,207,255, 213,213,213,255, 216,216,216,255, 219,219,219,80, + 223,223,223,255, 226,226,226,255, 232,232,232,255, 235,235,235,255, 239,239,239,255, 242,242,242,255, 248,248,248,255, 251,251,251,80}; static const BYTE bits_32bppRGBA[] = { 0,0,255,255, 0,255,0,255, 255,0,0,255, 0,0,0,255, 0,0,255,255, 0,255,0,255, 255,0,0,255, 0,0,0,255, 0,0,255,255, 0,255,0,255, 255,0,0,255, 0,0,0,255, 0,0,255,255, 0,255,0,255, 255,0,0,255, 0,0,0,255, @@ -495,11 +511,19 @@ static const BYTE bits_32bppPBGRA[] = { 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, - 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80}; + 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, + 1,1,1,80, 2,2,2,80, 4,4,4,80, 5,5,5,80, 6,6,6,80, 7,7,7,80, 9,9,9,80, 10,10,10,80, + 11,11,11,80, 12,12,12,80, 13,13,13,80, 15,15,15,80, 15,15,15,80, 17,17,17,80, 18,18,18,80, 20,20,20,80, + 21,21,21,80, 22,22,22,80, 23,23,23,80, 25,25,25,80, 26,26,26,80, 27,27,27,80, 28,28,28,80, 30,30,30,80, + 31,31,31,80, 31,31,31,80, 33,33,33,80, 34,34,34,80, 36,36,36,80, 37,37,37,80, 38,38,38,80, 39,39,39,80, + 41,41,41,80, 42,42,42,80, 43,43,43,80, 44,44,44,80, 46,46,46,80, 47,47,47,80, 49,49,49,80, 49,49,49,80, + 50,50,50,80, 52,52,52,80, 53,53,53,80, 54,54,54,80, 55,55,55,80, 57,57,57,80, 58,58,58,80, 59,59,59,80, + 60,60,60,80, 62,62,62,80, 63,63,63,80, 65,65,65,80, 65,65,65,80, 67,67,67,80, 68,68,68,80, 69,69,69,80, + 70,70,70,80, 71,71,71,80, 73,73,73,80, 74,74,74,80, 75,75,75,80, 76,76,76,80, 78,78,78,80, 79,79,79,80}; static const struct bitmap_data testdata_32bppPBGRA = { - &GUID_WICPixelFormat32bppPBGRA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppPBGRA, 32, bits_32bppPBGRA, 32, 4, 96.0, 96.0}; static const struct bitmap_data testdata_32bppPRGBA = { - &GUID_WICPixelFormat32bppPRGBA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppPRGBA, 32, bits_32bppPBGRA, 32, 4, 96.0, 96.0}; static const BYTE bits_64bppRGBA[] = { 128,0,128,0,128,255,128,255, 128,0,128,255,128,0,128,255, 128,255,128,0,128,0,128,255, 128,0,128,0,128,0,128,255, 128,0,128,0,128,255,128,255, 128,0,128,255,128,0,128,255, 128,255,128,0,128,0,128,255, 128,0,128,0,128,0,128,255,

1 0

Francois Gouget : po: Fix an accelerator shortcut in the Norwegian Bokmål translation.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 3c0e25eb1ae8a516bdd4b4579e6bf8e939cf712c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c0e25eb1ae8a516bdd4b457… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 16:04:45 2022 +0100 po: Fix an accelerator shortcut in the Norwegian Bokmål translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 5c093e244f0..2b3a5bd5eed 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -9295,7 +9295,7 @@ msgstr "&Blankt passord" #: dlls/oledb32/version.rc:84 msgid "Allow &saving password" -msgstr "Tillat lagring av pa%ssord" +msgstr "Tillat lagring av pa&ssord" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:"

1 0

Francois Gouget : po: Remove spaces before linefeeds in the Dutch translation.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 226c7df3e660b6fef5f818b562a7fe9beb3de17f URL: https://source.winehq.org/git/wine.git/?a=commit;h=226c7df3e660b6fef5f818b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:57:28 2022 +0100 po: Remove spaces before linefeeds in the Dutch translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/nl.po b/po/nl.po index 088a3d52a25..842ac90027b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -16790,7 +16790,7 @@ msgstr "regedit: Kan de registersleutel '%1' niet openen.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: Register gegevenstype [0x%1!x!] aangetroffen in '%2' wordt niet \n" +"regedit: Register gegevenstype [0x%1!x!] aangetroffen in '%2' wordt niet\n" "ondersteund.\n" #: programs/regedit/regedit.rc:426 @@ -18577,7 +18577,7 @@ msgid "" msgstr "" "U heeft geen C-schijf. Dit kan tot problemen leiden.\n" "\n" -"Vergeet niet om m.b.v. de knop 'Toevoegen' in het 'Schijven'-tabblad een \n" +"Vergeet niet om m.b.v. de knop 'Toevoegen' in het 'Schijven'-tabblad een\n" "C-schijf aan te maken!\n" #: programs/winecfg/winecfg.rc:98

1 0

Piotr Caban : msvcp110: Use _Condition_variable in _Cnd_t implementation.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 3f97321c73320cd2cb05cd1b66e9134ff676e058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f97321c73320cd2cb05cd1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 14:36:56 2022 +0100 msvcp110: Use _Condition_variable in _Cnd_t implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 73 ++++++++++++----------------------------------- dlls/msvcp90/msvcp90.h | 18 ++++++++++++ dlls/msvcp90/msvcp_main.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f97321c73320cd2cb05…

1 0

Piotr Caban : msvcp140: Add SRWLock based _Mtx_t and _Cnd_t implementation.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: b8128f4162b5af7168ef7683543b96cd47d92748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8128f4162b5af7168ef7683… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 14:37:01 2022 +0100 msvcp140: Add SRWLock based _Mtx_t and _Cnd_t implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 13 +++--- dlls/msvcp90/msvcp90.h | 37 +++++++++++------ dlls/msvcp90/msvcp_main.c | 101 +++++++++++++++++++++++++++++++++++----------- 3 files changed, 107 insertions(+), 44 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c7047f72164..103eca6f4a3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -22,9 +22,6 @@ #include "msvcp90.h" -#include "windef.h" -#include "winbase.h" -#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); @@ -714,7 +711,7 @@ unsigned int __cdecl _Random_device(void) typedef struct { DWORD flags; - critical_section cs; + cs cs; DWORD thread_id; DWORD count; } *_Mtx_t; @@ -802,7 +799,7 @@ int __cdecl _Mtx_trylock(_Mtx_arg_t mtx) return 0; } -critical_section* __cdecl _Mtx_getconcrtcs(_Mtx_arg_t mtx) +void* __cdecl _Mtx_getconcrtcs(_Mtx_arg_t mtx) { return &MTX_T_FROM_ARG(mtx)->cs; } @@ -825,7 +822,7 @@ void __cdecl _Mtx_reset_owner(_Mtx_arg_t mtx) typedef struct { - _Condition_variable cv; + cv cv; } *_Cnd_t; #if _MSVCP_VER >= 140 @@ -852,7 +849,7 @@ int __cdecl _Cnd_init(_Cnd_t *cnd) int __cdecl _Cnd_wait(_Cnd_arg_t cnd, _Mtx_arg_t mtx) { - _Condition_variable *cv = &CND_T_FROM_ARG(cnd)->cv; + cv *cv = &CND_T_FROM_ARG(cnd)->cv; _Mtx_t m = MTX_T_FROM_ARG(mtx); _Mtx_clear_owner(mtx); @@ -863,7 +860,7 @@ int __cdecl _Cnd_wait(_Cnd_arg_t cnd, _Mtx_arg_t mtx) int __cdecl _Cnd_timedwait(_Cnd_arg_t cnd, _Mtx_arg_t mtx, const xtime *xt) { - _Condition_variable *cv = &CND_T_FROM_ARG(cnd)->cv; + cv *cv = &CND_T_FROM_ARG(cnd)->cv; _Mtx_t m = MTX_T_FROM_ARG(mtx); bool r; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 49840affcf6..b996ae84a46 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -19,6 +19,7 @@ #include "stdbool.h" #include "stdlib.h" #include "windef.h" +#include "winbase.h" #include "cxx.h" #define CXX_EXCEPTION 0xe06d7363 @@ -58,6 +59,12 @@ typedef struct void *tail; } critical_section; +typedef union +{ + critical_section conc; + SRWLOCK win; +} cs; + typedef struct cv_queue { struct cv_queue *next; LONG expired; @@ -69,18 +76,24 @@ typedef struct { critical_section lock; } _Condition_variable; -extern void cs_init(critical_section*); -extern void cs_destroy(critical_section*); -extern void cs_lock(critical_section*); -extern void cs_unlock(critical_section*); -extern bool cs_trylock(critical_section*); - -extern void cv_init(_Condition_variable*); -extern void cv_destroy(_Condition_variable*); -extern void cv_wait(_Condition_variable*, critical_section*); -extern bool cv_wait_for(_Condition_variable*, critical_section*, unsigned int); -extern void cv_notify_one(_Condition_variable*); -extern void cv_notify_all(_Condition_variable*); +typedef union +{ + _Condition_variable conc; + CONDITION_VARIABLE win; +} cv; + +extern void cs_init(cs*); +extern void cs_destroy(cs*); +extern void cs_lock(cs*); +extern void cs_unlock(cs*); +extern bool cs_trylock(cs*); + +extern void cv_init(cv*); +extern void cv_destroy(cv*); +extern void cv_wait(cv*, cs*); +extern bool cv_wait_for(cv*, cs*, unsigned int); +extern void cv_notify_one(cv*); +extern void cv_notify_all(cv*); #endif #if _MSVCP_VER >= 100 diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index afaa461312e..4c9faec9e26 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -56,7 +56,7 @@ DEFINE_VTBL_WRAPPER(56); void* (__cdecl *MSVCRT_set_new_handler)(void*); -#if _MSVCP_VER >= 110 +#if _MSVCP_VER >= 110 && _MSVCP_VER <= 120 #ifdef __ASM_USE_THISCALL_WRAPPER extern void *call_thiscall_func; @@ -93,59 +93,112 @@ bool (__thiscall *_Condition_variable_wait_for)(_Condition_variable*, void (__thiscall *_Condition_variable_notify_one)(_Condition_variable*); void (__thiscall *_Condition_variable_notify_all)(_Condition_variable*); -void cs_init(critical_section *cs) +void cs_init(cs *cs) { - call_func1(critical_section_ctor, cs); + call_func1(critical_section_ctor, &cs->conc); } -void cs_destroy(critical_section *cs) +void cs_destroy(cs *cs) { - call_func1(critical_section_dtor, cs); + call_func1(critical_section_dtor, &cs->conc); } -void cs_lock(critical_section *cs) +void cs_lock(cs *cs) { - call_func1(critical_section_lock, cs); + call_func1(critical_section_lock, &cs->conc); } -void cs_unlock(critical_section *cs) +void cs_unlock(cs *cs) { - call_func1(critical_section_unlock, cs); + call_func1(critical_section_unlock, &cs->conc); } -bool cs_trylock(critical_section *cs) +bool cs_trylock(cs *cs) { - return call_func1(critical_section_trylock, cs); + return call_func1(critical_section_trylock, &cs->conc); } -void cv_init(_Condition_variable *cv) +void cv_init(cv *cv) { - call_func1(_Condition_variable_ctor, cv); + call_func1(_Condition_variable_ctor, &cv->conc); } -void cv_destroy(_Condition_variable *cv) +void cv_destroy(cv *cv) { - call_func1(_Condition_variable_dtor, cv); + call_func1(_Condition_variable_dtor, &cv->conc); } -void cv_wait(_Condition_variable *cv, critical_section *cs) +void cv_wait(cv *cv, cs *cs) { - call_func2(_Condition_variable_wait, cv, cs); + call_func2(_Condition_variable_wait, &cv->conc, &cs->conc); } -bool cv_wait_for(_Condition_variable *cv, critical_section *cs, unsigned int timeout) +bool cv_wait_for(cv *cv, cs *cs, unsigned int timeout) { - return call_func3(_Condition_variable_wait_for, cv, cs, timeout); + return call_func3(_Condition_variable_wait_for, &cv->conc, &cs->conc, timeout); } -void cv_notify_one(_Condition_variable *cv) +void cv_notify_one(cv *cv) { - call_func1(_Condition_variable_notify_one, cv); + call_func1(_Condition_variable_notify_one, &cv->conc); } -void cv_notify_all(_Condition_variable *cv) +void cv_notify_all(cv *cv) { - call_func1(_Condition_variable_notify_all, cv); + call_func1(_Condition_variable_notify_all, &cv->conc); +} +#elif _MSVCP_VER >= 140 +void cs_init(cs *cs) +{ + InitializeSRWLock(&cs->win); +} + +void cs_destroy(cs *cs) +{ +} + +void cs_lock(cs *cs) +{ + AcquireSRWLockExclusive(&cs->win); +} + +void cs_unlock(cs *cs) +{ + ReleaseSRWLockExclusive(&cs->win); +} + +bool cs_trylock(cs *cs) +{ + return TryAcquireSRWLockExclusive(&cs->win); +} + +void cv_init(cv *cv) +{ + InitializeConditionVariable(&cv->win); +} + +void cv_destroy(cv *cv) +{ +} + +void cv_wait(cv *cv, cs *cs) +{ + SleepConditionVariableSRW(&cv->win, &cs->win, INFINITE, 0); +} + +bool cv_wait_for(cv *cv, cs *cs, unsigned int timeout) +{ + return SleepConditionVariableSRW(&cv->win, &cs->win, timeout, 0); +} + +void cv_notify_one(cv *cv) +{ + WakeConditionVariable(&cv->win); +} + +void cv_notify_all(cv *cv) +{ + WakeAllConditionVariable(&cv->win); } #endif @@ -240,7 +293,7 @@ static void init_cxx_funcs(void) } #endif -#if _MSVCP_VER >= 110 +#if _MSVCP_VER >= 110 && _MSVCP_VER <= 120 if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ { critical_section_ctor = (void*)GetProcAddress(hcon, "??0critical_section(a)Concurrency@@QEAA(a)XZ");

1 0

Piotr Caban : msvcp140: Add condition variable tests.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: e3d02807fc7be6351fc80aa814d21b86e4e0236d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d02807fc7be6351fc80aa8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 14:37:14 2022 +0100 msvcp140: Add condition variable tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 191 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index b24c5e0f53d..14ba4a767d0 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -142,6 +142,45 @@ typedef struct { void *arg; } _Threadpool_chore; +typedef struct +{ + HANDLE hnd; + DWORD id; +} _Thrd_t; + +typedef struct cs_queue +{ + struct cs_queue *next; + BOOL free; + int unknown; +} cs_queue; + +typedef struct +{ + ULONG_PTR unk_thread_id; + cs_queue unk_active; + void *unknown[2]; + cs_queue *head; + void *tail; +} critical_section; + +typedef struct +{ + DWORD flags; + critical_section cs; + DWORD thread_id; + DWORD count; +} *_Mtx_t; + +typedef void *_Cnd_t; + +typedef struct { + __time64_t sec; + int nsec; +} xtime; + +typedef int (__cdecl *_Thrd_start_t)(void*); + enum file_type { file_not_found = -1, none_file, @@ -172,6 +211,20 @@ static void (__thiscall *p__TaskEventLogger__LogWorkItemStarted)(_TaskEventLogge static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static int (__cdecl *p__Mtx_init)(_Mtx_t*, int); +static void (__cdecl *p__Mtx_destroy)(_Mtx_t); +static int (__cdecl *p__Mtx_lock)(_Mtx_t); +static int (__cdecl *p__Mtx_unlock)(_Mtx_t); +static int (__cdecl *p__Cnd_init)(_Cnd_t*); +static void (__cdecl *p__Cnd_destroy)(_Cnd_t); +static int (__cdecl *p__Cnd_wait)(_Cnd_t, _Mtx_t); +static int (__cdecl *p__Cnd_timedwait)(_Cnd_t, _Mtx_t, const xtime*); +static int (__cdecl *p__Cnd_broadcast)(_Cnd_t); +static int (__cdecl *p__Cnd_signal)(_Cnd_t); +static int (__cdecl *p__Thrd_create)(_Thrd_t*, _Thrd_start_t, void*); +static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); +static int (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); +static int (__cdecl *p_xtime_get)(xtime*, int); static void (__cdecl *p_Close_dir)(void*); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); @@ -269,6 +322,21 @@ static BOOL init(void) SET(p__Syserror_map, "?_Syserror_map(a)std@@YAPBDH(a)Z"); } + SET(p__Mtx_init, "_Mtx_init"); + SET(p__Mtx_destroy, "_Mtx_destroy"); + SET(p__Mtx_lock, "_Mtx_lock"); + SET(p__Mtx_unlock, "_Mtx_unlock"); + SET(p__Cnd_init, "_Cnd_init"); + SET(p__Cnd_destroy, "_Cnd_destroy"); + SET(p__Cnd_wait, "_Cnd_wait"); + SET(p__Cnd_timedwait, "_Cnd_timedwait"); + SET(p__Cnd_broadcast, "_Cnd_broadcast"); + SET(p__Cnd_signal, "_Cnd_signal"); + SET(p__Thrd_create, "_Thrd_create"); + SET(p__Thrd_join, "_Thrd_join"); + SET(p__Xtime_diff_to_millis2, "_Xtime_diff_to_millis2"); + SET(p_xtime_get, "xtime_get"); + SET(p_Close_dir, "_Close_dir"); SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); @@ -1385,6 +1453,128 @@ static void test_Equivalent(void) ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); } +#define NUM_THREADS 10 +#define TIMEDELTA 250 /* 250 ms uncertainty allowed */ +struct cndmtx +{ + HANDLE initialized; + LONG started; + int thread_no; + + _Cnd_t cnd; + _Mtx_t mtx; + BOOL timed_wait; +}; + +static int __cdecl cnd_wait_thread(void *arg) +{ + struct cndmtx *cm = arg; + int r; + + p__Mtx_lock(cm->mtx); + + if(InterlockedIncrement(&cm->started) == cm->thread_no) + SetEvent(cm->initialized); + + if(cm->timed_wait) { + xtime xt; + + p_xtime_get(&xt, 1); + xt.sec += 2; + r = p__Cnd_timedwait(cm->cnd, cm->mtx, &xt); + ok(!r, "timed wait failed\n"); + } else { + r = p__Cnd_wait(cm->cnd, cm->mtx); + ok(!r, "wait failed\n"); + } + + p__Mtx_unlock(cm->mtx); + return 0; +} + +static void test_cnd(void) +{ + _Thrd_t threads[NUM_THREADS]; + xtime xt, before, after; + struct cndmtx cm; + int r, i, diff; + _Cnd_t cnd; + _Mtx_t mtx; + + r = p__Cnd_init(&cnd); + ok(!r, "failed to init cnd\n"); + + r = p__Mtx_init(&mtx, 0); + ok(!r, "failed to init mtx\n"); + + p__Cnd_destroy(NULL); + + /* test _Cnd_signal/_Cnd_wait */ + cm.initialized = CreateEventW(NULL, FALSE, FALSE, NULL); + cm.started = 0; + cm.thread_no = 1; + cm.cnd = cnd; + cm.mtx = mtx; + cm.timed_wait = FALSE; + p__Thrd_create(&threads[0], cnd_wait_thread, (void*)&cm); + + WaitForSingleObject(cm.initialized, INFINITE); + p__Mtx_lock(mtx); + p__Mtx_unlock(mtx); + + r = p__Cnd_signal(cm.cnd); + ok(!r, "failed to signal\n"); + p__Thrd_join(threads[0], NULL); + + /* test _Cnd_timedwait time out */ + p__Mtx_lock(mtx); + p_xtime_get(&before, 1); + xt = before; + xt.sec += 1; + /* try to avoid failures on spurious wakeup */ + p__Cnd_timedwait(cnd, mtx, &xt); + r = p__Cnd_timedwait(cnd, mtx, &xt); + p_xtime_get(&after, 1); + p__Mtx_unlock(mtx); + + diff = p__Xtime_diff_to_millis2(&after, &before); + ok(r == 2, "should have timed out\n"); + ok(diff > 1000 - TIMEDELTA, "got %d\n", diff); + + /* test _Cnd_timedwait */ + cm.started = 0; + cm.timed_wait = TRUE; + p__Thrd_create(&threads[0], cnd_wait_thread, (void*)&cm); + + WaitForSingleObject(cm.initialized, INFINITE); + p__Mtx_lock(mtx); + p__Mtx_unlock(mtx); + + r = p__Cnd_signal(cm.cnd); + ok(!r, "failed to signal\n"); + p__Thrd_join(threads[0], NULL); + + /* test _Cnd_broadcast */ + cm.started = 0; + cm.thread_no = NUM_THREADS; + + for(i = 0; i < cm.thread_no; i++) + p__Thrd_create(&threads[i], cnd_wait_thread, (void*)&cm); + + WaitForSingleObject(cm.initialized, INFINITE); + p__Mtx_lock(mtx); + p__Mtx_unlock(mtx); + + r = p__Cnd_broadcast(cnd); + ok(!r, "failed to broadcast\n"); + for(i = 0; i < cm.thread_no; i++) + p__Thrd_join(threads[i], NULL); + + p__Cnd_destroy(cnd); + p__Mtx_destroy(mtx); + CloseHandle(cm.initialized); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1410,5 +1600,6 @@ START_TEST(msvcp140) test__Winerror_map(); test__Syserror_map(); test_Equivalent(); + test_cnd(); FreeLibrary(msvcp); }

1 0

Piotr Caban : msvcp110: Introduce wrapper around critical_section functions.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: bd0d5dea13d8478d5bb88185551aff744ed9621e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0d5dea13d8478d5bb88185… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 14:36:30 2022 +0100 msvcp110: Introduce wrapper around critical_section functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 30 ++++++--------------------- dlls/msvcp90/msvcp90.h | 10 ++++----- dlls/msvcp90/msvcp_main.c | 53 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 59 insertions(+), 34 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c7a56ad9e97..0ed75e233d8 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -706,24 +706,6 @@ unsigned int __cdecl _Random_device(void) #endif #if _MSVCP_VER >= 110 -#ifdef __ASM_USE_THISCALL_WRAPPER - -extern void *call_thiscall_func; -__ASM_GLOBAL_FUNC(call_thiscall_func, - "popl %eax\n\t" - "popl %edx\n\t" - "popl %ecx\n\t" - "pushl %eax\n\t" - "jmp *%edx\n\t") - -#define call_func1(func,this) ((void* (WINAPI*)(void*,void*))&call_thiscall_func)(func,this) - -#else /* __i386__ */ - -#define call_func1(func,this) func(this) - -#endif /* __i386__ */ - #define MTX_PLAIN 0x1 #define MTX_TRY 0x2 #define MTX_TIMED 0x4 @@ -753,7 +735,7 @@ void __cdecl _Mtx_init_in_situ(_Mtx_t mtx, int flags) FIXME("unknown flags ignored: %x\n", flags); mtx->flags = flags; - call_func1(critical_section_ctor, &mtx->cs); + cs_init(&mtx->cs); mtx->thread_id = -1; mtx->count = 0; } @@ -767,12 +749,12 @@ int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) void __cdecl _Mtx_destroy_in_situ(_Mtx_t mtx) { - call_func1(critical_section_dtor, &mtx->cs); + cs_destroy(&mtx->cs); } void __cdecl _Mtx_destroy(_Mtx_arg_t mtx) { - call_func1(critical_section_dtor, &MTX_T_FROM_ARG(mtx)->cs); + cs_destroy(&MTX_T_FROM_ARG(mtx)->cs); operator_delete(MTX_T_FROM_ARG(mtx)); } @@ -784,7 +766,7 @@ int __cdecl _Mtx_current_owns(_Mtx_arg_t mtx) int __cdecl _Mtx_lock(_Mtx_arg_t mtx) { if(MTX_T_FROM_ARG(mtx)->thread_id != GetCurrentThreadId()) { - call_func1(critical_section_lock, &MTX_T_FROM_ARG(mtx)->cs); + cs_lock(&MTX_T_FROM_ARG(mtx)->cs); MTX_T_FROM_ARG(mtx)->thread_id = GetCurrentThreadId(); }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_RECURSIVE) && MTX_T_FROM_ARG(mtx)->flags != MTX_PLAIN) { @@ -801,14 +783,14 @@ int __cdecl _Mtx_unlock(_Mtx_arg_t mtx) return 0; MTX_T_FROM_ARG(mtx)->thread_id = -1; - call_func1(critical_section_unlock, &MTX_T_FROM_ARG(mtx)->cs); + cs_unlock(&MTX_T_FROM_ARG(mtx)->cs); return 0; } int __cdecl _Mtx_trylock(_Mtx_arg_t mtx) { if(MTX_T_FROM_ARG(mtx)->thread_id != GetCurrentThreadId()) { - if(!call_func1(critical_section_trylock, &MTX_T_FROM_ARG(mtx)->cs)) + if(!cs_trylock(&MTX_T_FROM_ARG(mtx)->cs)) return MTX_LOCKED; MTX_T_FROM_ARG(mtx)->thread_id = GetCurrentThreadId(); }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_RECURSIVE) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 113350c9aaf..9cddab8fe02 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -58,11 +58,11 @@ typedef struct void *tail; } critical_section; -extern critical_section* (__thiscall *critical_section_ctor)(critical_section*); -extern void (__thiscall *critical_section_dtor)(critical_section*); -extern void (__thiscall *critical_section_lock)(critical_section*); -extern void (__thiscall *critical_section_unlock)(critical_section*); -extern bool (__thiscall *critical_section_trylock)(critical_section*); +extern void cs_init(critical_section*); +extern void cs_destroy(critical_section*); +extern void cs_lock(critical_section*); +extern void cs_unlock(critical_section*); +extern bool cs_trylock(critical_section*); #endif #if _MSVCP_VER >= 100 diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index cf37631da0e..43ec67c4b9e 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -57,11 +57,54 @@ DEFINE_VTBL_WRAPPER(56); void* (__cdecl *MSVCRT_set_new_handler)(void*); #if _MSVCP_VER >= 110 -critical_section* (__thiscall *critical_section_ctor)(critical_section*); -void (__thiscall *critical_section_dtor)(critical_section*); -void (__thiscall *critical_section_lock)(critical_section*); -void (__thiscall *critical_section_unlock)(critical_section*); -bool (__thiscall *critical_section_trylock)(critical_section*); +#ifdef __ASM_USE_THISCALL_WRAPPER + +extern void *call_thiscall_func; +__ASM_GLOBAL_FUNC(call_thiscall_func, + "popl %eax\n\t" + "popl %edx\n\t" + "popl %ecx\n\t" + "pushl %eax\n\t" + "jmp *%edx\n\t") + +#define call_func1(func,this) ((void* (WINAPI*)(void*,void*))&call_thiscall_func)(func,this) + +#else /* __i386__ */ + +#define call_func1(func,this) func(this) + +#endif /* __i386__ */ + +static critical_section* (__thiscall *critical_section_ctor)(critical_section*); +static void (__thiscall *critical_section_dtor)(critical_section*); +static void (__thiscall *critical_section_lock)(critical_section*); +static void (__thiscall *critical_section_unlock)(critical_section*); +static bool (__thiscall *critical_section_trylock)(critical_section*); + +void cs_init(critical_section *cs) +{ + call_func1(critical_section_ctor, cs); +} + +void cs_destroy(critical_section *cs) +{ + call_func1(critical_section_dtor, cs); +} + +void cs_lock(critical_section *cs) +{ + call_func1(critical_section_lock, cs); +} + +void cs_unlock(critical_section *cs) +{ + call_func1(critical_section_unlock, cs); +} + +bool cs_trylock(critical_section *cs) +{ + return call_func1(critical_section_trylock, cs); +} #endif #if _MSVCP_VER >= 100

1 0

Jacek Caban : win32u: Make interface between DC and dce private.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: ffb152df64a754d2e98e74057cbddc036c9bdfe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffb152df64a754d2e98e7405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 14:32:08 2022 +0100 win32u: Make interface between DC and dce private. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dc.c | 56 +++++++--------------------- dlls/win32u/dce.c | 91 ++++++++++++++++++++++----------------------- dlls/win32u/ntgdi_private.h | 20 ++++++++-- dlls/win32u/sysparams.c | 2 +- include/wine/gdi_driver.h | 17 --------- 5 files changed, 76 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ffb152df64a754d2e98e…

1 0

Jacek Caban : win32u: Introduce NtUserEnableDC.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: e17ec9e8b7dad425e70c60588efd721321064760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e17ec9e8b7dad425e70c6058… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 14:28:35 2022 +0100 win32u: Introduce NtUserEnableDC. And use it instead of SetHookFlags in user.exe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user_private.h | 3 +-- dlls/user.exe16/window.c | 3 +-- dlls/win32u/gdiobj.c | 1 - dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u.spec | 1 - dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ include/ntuser.h | 1 + 8 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 336b89102d4..afd75f0b096 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -24,8 +24,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include "ntuser.h" #include "winreg.h" #include "winternl.h" #include "wine/windef16.h" diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 5a9448a2131..01d1b101c92 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -23,7 +23,6 @@ #include "user_private.h" #include "wine/list.h" #include "wine/server.h" -#include "wine/gdi_driver.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -676,7 +675,7 @@ HDC16 WINAPI GetWindowDC16( HWND16 hwnd ) INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc ) { INT16 ret = (INT16)ReleaseDC( WIN_Handle32(hwnd), HDC_32(hdc) ); - SetHookFlags( HDC_32(hdc), DCHF_ENABLEDC ); + NtUserCallOneParam( HandleToUlong( HDC_32(hdc) ), NtUserEnableDC ); return ret; } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 888313ad685..208ebb1da5e 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1216,7 +1216,6 @@ static struct unix_funcs unix_funcs = NtUserWindowFromPoint, SetDIBits, - SetHookFlags, __wine_get_brush_bitmap_info, __wine_get_file_outline_text_metric, __wine_get_icm_profile, diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 7908dc62716..cb16237d9f1 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4635,6 +4635,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return HandleToUlong( begin_defer_window_pos( arg )); case NtUserCreateCursorIcon: return HandleToUlong( alloc_cursoricon_handle( arg )); + case NtUserEnableDC: + return SetHookFlags( UlongToHandle(arg), DCHF_ENABLEDC ); case NtUserGetClipCursor: return get_clip_cursor( (RECT *)arg ); case NtUserGetCursorPos: diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index fc659c4ca9f..e37907e7399 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1321,7 +1321,6 @@ # Wine internal extensions # user32 -@ stdcall SetHookFlags(long long) @ cdecl __wine_set_visible_region(long long ptr ptr ptr) # Graphics drivers diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3f9183a2b1d..ac40daa5d35 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -273,7 +273,6 @@ struct unix_funcs INT (WINAPI *pSetDIBits)( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, const void *bits, const BITMAPINFO *info, UINT coloruse ); - WORD (WINAPI *pSetHookFlags)( HDC hdc, WORD flags ); BOOL (CDECL *get_brush_bitmap_info)( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ); BOOL (CDECL *get_file_outline_text_metric)( const WCHAR *path, OUTLINETEXTMETRICW *otm ); BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 471bfa449b1..9665c8106c4 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1112,12 +1112,6 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, return unix_funcs->pSetDIBits( hdc, hbitmap, startscan, lines, bits, info, coloruse ); } -WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pSetHookFlags( hdc, flags ); -} - BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ) { if (!unix_funcs) return FALSE; diff --git a/include/ntuser.h b/include/ntuser.h index a4e28764e0d..f68f5481f90 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -99,6 +99,7 @@ enum { NtUserBeginDeferWindowPos, NtUserCreateCursorIcon, + NtUserEnableDC, NtUserGetClipCursor, NtUserGetCursorPos, NtUserGetIconParam,

1 0