wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Jan Sikorski : wined3d: Pass mask to wined3d_next_cs_packet().
by Alexandre Julliard 15 Mar '22

15 Mar '22

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 15 Mar '22

15 Mar '22

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 15 Mar '22

15 Mar '22

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 15 Mar '22

15 Mar '22

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

Francois Gouget : po: Remove a space before a linefeed in the Chinese translation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 1f9a15688726adead1b2f5e8fa6b9045c629b21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f9a15688726adead1b2f5e8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:57:00 2022 +0100 po: Remove a space before a linefeed in the Chinese translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index fa9a8e469f0..f8927aa19e9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13940,7 +13940,7 @@ msgstr "" "\n" "语法: MKLINK [options] link_name target\n" "\n" -"选项: \n" +"选项:\n" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n"

1 0

Francois Gouget : po: Remove spaces before linefeeds in the Spanish translation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: c390852e3f46c567b3ac8f57ed80922a61d7c840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c390852e3f46c567b3ac8f57… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:56:31 2022 +0100 po: Remove spaces before linefeeds in the Spanish translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 246a27e23c4..e53677f3f75 100644 --- a/po/es.po +++ b/po/es.po @@ -17370,7 +17370,7 @@ msgid "" msgstr "" "Utilidad de registro de DLL de Wine\n" "\n" -"Proporciona servicios de registro de DLL. \n" +"Proporciona servicios de registro de DLL.\n" "\n" #: programs/regsvr32/regsvr32.rc:41 @@ -17392,7 +17392,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: cambio no válido o no reconocido [%1] \n" +"regsvr32: cambio no válido o no reconocido [%1]\n" "\n" #: programs/regsvr32/regsvr32.rc:43

1 0

Francois Gouget : po: Remove a space before a linefeed in the French translation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 8be5ec578a859df5e04eb957b3773a10ceda961d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be5ec578a859df5e04eb957… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:55:40 2022 +0100 po: Remove a space before a linefeed in the French translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 75d71722af3..2213354b320 100644 --- a/po/fr.po +++ b/po/fr.po @@ -16854,7 +16854,7 @@ msgstr "" "REG IMPORT <fichier>\n" "\n" " Importe des clés et leurs valeurs à partir d'un fichier vers le registre.\n" -" \n" +"\n" " <fichier>\n" " Le chemin d'accès et le nom du fichier à importer.\n" "\n"

1 0

Francois Gouget : po: Fix backslash duplication in a French translation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: a1a94dfd81418cefa28da6da0fc3b6c44c2a530a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1a94dfd81418cefa28da6da… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:55:01 2022 +0100 po: Fix backslash duplication in a French translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 8fd4c4d7383..75d71722af3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -17000,7 +17000,7 @@ msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" msgstr "" -"La valeur de registre « %1\\\\%2 » existe déjà. Voulez-vous la remplacer ?" +"La valeur de registre « %1\\%2 » existe déjà. Voulez-vous la remplacer ?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?"

1 0

Francois Gouget : po: Fix the French translation of 'code page'.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 80845f8f5f8272cdb62c4eb50988d5e1f9b34f13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80845f8f5f8272cdb62c4eb5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:54:39 2022 +0100 po: Fix the French translation of 'code page'. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index 113557f8c54..8fd4c4d7383 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14198,11 +14198,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "Code de pages actif : %1!u!\n" +msgstr "Page de code active : %1!u!\n" #: programs/chcp.com/chcp.rc:29 msgid "Invalid code page\n" -msgstr "Code de pages invalide.\n" +msgstr "Page de code invalide\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -14217,12 +14217,12 @@ msgid "" msgstr "" "CHCP [nombre]\n" "\n" -" Modifie ou affiche le code de pages de la console actif.\n" +" Modifie ou affiche la page de code de la console active.\n" "\n" -" nombre Le code de pages de la console à activer.\n" +" nombre La page de code de la console à activer.\n" "\n" -" Lancer CHCP sans nombre en paramètre pour afficher le code de pages actif " -"de la console.\n" +" Lancer CHCP sans nombre en paramètre pour afficher la page de code de la " +"console active.\n" "\n" #: programs/clock/clock.rc:32

1 0

Francois Gouget : kernelbase: Add a trailing linefeed to a couple of FIXME() messages.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 082c647e688b2baa34ed9e34c38231691c21ef26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=082c647e688b2baa34ed9e34… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:53:48 2022 +0100 kernelbase: Add a trailing linefeed to a couple of FIXME() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d59f20adb6e..410d87ce620 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2433,7 +2433,7 @@ HRESULT WINAPI PathMatchSpecExA(const char *path, const char *mask, DWORD flags) TRACE("%s, %s\n", wine_dbgstr_a(path), wine_dbgstr_a(mask)); if (flags) - FIXME("Ignoring flags %#lx.", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!lstrcmpA(mask, "*.*")) return S_OK; /* Matches every path */ @@ -2488,7 +2488,7 @@ HRESULT WINAPI PathMatchSpecExW(const WCHAR *path, const WCHAR *mask, DWORD flag TRACE("%s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(mask)); if (flags) - FIXME("Ignoring flags %#lx.", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!lstrcmpW(mask, L"*.*")) return S_OK; /* Matches every path */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022