- Wine-Devel - list.winehq.org

[PATCH 1/6] wined3d: Compare requested memory types in wined3d_bo_slab_vk_compare().
by Henri Verbeet Dec. 14, 2020

Dec. 14, 2020

Instead of comparing the requested memory type against what we actually got. For example, we may have gotten coherent memory without having explicitly requested it, in which case wined3d_context_vk_create_slab_bo() would fail to find an existing slab to allocate from. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This fixes a rather atrocious VRAM leak with some allocation patterns on some configurations. I don't think we have any explicit bug reports about this, but it affects for example the menu in Batman: Arkham Origins. dlls/wined3d/context_vk.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f1258842152..66f5109dc87 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -371,6 +371,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context return false; } + slab->requested_memory_type = memory_type; if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) { ERR("Failed to create slab bo.\n"); @@ -625,7 +626,7 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, if (!slab->map) { - key.memory_type = slab->bo.memory_type; + key.memory_type = slab->requested_memory_type; key.usage = slab->bo.usage; key.size = slab->bo.size; @@ -1677,8 +1678,8 @@ static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entr const struct wined3d_bo_slab_vk *slab = WINE_RB_ENTRY_VALUE(entry, const struct wined3d_bo_slab_vk, entry); const struct wined3d_bo_slab_vk_key *k = key; - if (k->memory_type != slab->bo.memory_type) - return k->memory_type - slab->bo.memory_type; + if (k->memory_type != slab->requested_memory_type) + return k->memory_type - slab->requested_memory_type; if (k->usage != slab->bo.usage) return k->usage - slab->bo.usage; return k->size - slab->bo.size; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cf1a0bb0668..30b21a8225f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1626,6 +1626,7 @@ struct wined3d_bo_slab_vk { struct wine_rb_entry entry; struct wined3d_bo_slab_vk *next; + VkMemoryPropertyFlags requested_memory_type; struct wined3d_bo_vk bo; unsigned int map_count; void *map_ptr; -- 2.20.1

1 0

[PATCH] ntdll: Remove unwind registers save space from struct stack_layout on x64.
by Paul Gofman Dec. 14, 2020

Dec. 14, 2020

The unwind space used right below the context's Rsp and can currently potentially overlap with xstate. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 359f2d7c361..7181b48728c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -240,10 +240,6 @@ struct stack_layout CONTEXT context; CONTEXT_EX context_ex; EXCEPTION_RECORD rec; - ULONG64 rsi; - ULONG64 rdi; - ULONG64 rbp; - ULONG64 rip; ULONG64 align; char xstate[0]; /* If xstate is present it is allocated * dynamically to provide 64 byte alignment. */ @@ -252,7 +248,7 @@ struct stack_layout C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))); C_ASSERT( sizeof(XSTATE) == 0x140 ); -C_ASSERT( sizeof(struct stack_layout) == 0x5b0 ); /* Should match the size in call_user_exception_dispatcher(). */ +C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in call_user_exception_dispatcher(). */ struct syscall_frame { @@ -1964,10 +1960,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; - stack_size = sizeof(*stack); + stack_size = sizeof(*stack) + 0x20; if ((src_xs = xstate_from_context( context ))) { - stack_size += (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr + stack_size += (ULONG_PTR)stack_ptr - 0x20 - (((ULONG_PTR)stack_ptr - 0x20 - sizeof(XSTATE)) & ~(ULONG_PTR)63); } @@ -2120,12 +2116,13 @@ struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RE __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "movq 0x98(%rdx),%r9\n\t" /* context->Rsp */ + "subq $0x20,%r9\n\t" /* Unwind registers save space */ "andq $~0xf,%r9\n\t" "btl $6,0x30(%rdx)\n\t" /* context->ContextFlags, CONTEXT_XSTATE bit. */ "jnc 1f\n\t" "subq $0x140,%r9\n\t" /* sizeof(XSTATE) */ "andq $~63,%r9\n" - "1:\tsubq $0x5b0,%r9\n\t" /* sizeof(struct stack_layout) */ + "1:\tsubq $0x590,%r9\n\t" /* sizeof(struct stack_layout) */ "cmpq %rsp,%r9\n\t" "cmovbq %r9,%rsp\n\t" "pushq %r8\n\t" -- 2.29.2

1 0

[PATCH 2/2] po: Update Japanese translation style.
by Akihiro Sagawa Dec. 14, 2020

Dec. 14, 2020

Follow recent Microsoft Japanese Style Guide, especially Katakana prolonged sound mark. As of 2008, they followed the June 1991 Cabinet Notification on Loanword Orthography. It states prolonged the sound mark should be used for long vowels when English original terms have final -er, -or, -ar, in general. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 894 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 452 insertions(+), 442 deletions(-)

1 0

[PATCH 1/2] po: Update Japanese translation.
by Akihiro Sagawa Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 196 ++++++++++++++++--------------------------------------- 1 file changed, 57 insertions(+), 139 deletions(-)

1 0

[website] German translation for release 6.0-rc2
by Julian Rüger Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] msi/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 14, 2020

Dec. 14, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/tests/custom.c | 4 +--- dlls/msi/tests/record.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index caf24356948..d74d0a2d097 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -518,12 +518,10 @@ static void test_db(MSIHANDLE hinst) for (i = 0; i < 20; i++) { - WCHAR emptyW[1] = { 0 }; - r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, emptyW); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, L""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); } diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 8e4c2df4294..407d756caae 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -56,7 +56,6 @@ static void test_msirecord(void) char buf[10]; WCHAR bufW[10]; const char str[] = "hello"; - const WCHAR strW[] = { 'h','e','l','l','o',0}; char filename[MAX_PATH]; /* check behaviour with an invalid record */ @@ -210,7 +209,7 @@ static void test_msirecord(void) r = MsiRecordGetStringW(h,0,bufW,&sz); ok(r == ERROR_MORE_DATA, "wrong error\n"); ok(sz == 5, "MsiRecordGetStringA returned the wrong length\n"); - ok(0==memcmp(bufW,strW,8), "MsiRecordGetStringA returned the wrong string\n"); + ok(!memcmp(bufW, L"hello", 8), "MsiRecordGetStringA returned the wrong string\n"); sz = 0; bufW[0] = 'x'; -- 2.26.2

2 1

[PATCH resend] winex11.drv: Call XIconifyWindow() after XMapWindow() with a minimized window.
by Zhiyi Zhang Dec. 14, 2020

Dec. 14, 2020

Mutter always unminimizes a window when handling map requests. So a window could be in normal state as far as Mutter concerns while Wine mistakenly considers it still minimized. Fix Disgaea PC black screen after Alt+Tab in fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- See https://gitlab.gnome.org/GNOME/mutter/-/blob/master/src/x11/events.c#L1430 dlls/winex11.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f46cbfb088a..9ed5ef0b0b8 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1134,6 +1134,9 @@ static void map_window( HWND hwnd, DWORD new_style ) data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; + /* Mutter always unminimizes windows when handling map requests. Restore iconic state here */ + if (data->iconic) + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); } release_win_data( data ); } -- 2.27.0

1 0

[PATCH] po: Update Catalan translation
by Alex Henrie Dec. 13, 2020

Dec. 13, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 387 +++++++++++++++++-------------------------------------- 1 file changed, 121 insertions(+), 266 deletions(-) diff --git a/po/ca.po b/po/ca.po index 916856d1a5c..7ba8be78fe1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-31 11:39-0700\n" +"PO-Revision-Date: 2020-12-13 20:27-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.4.1\n" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3668,7 +3668,7 @@ msgstr "Opcions d'Internet" #: dlls/inetcpl.cpl/inetcpl.rc:32 msgid "Configure Wine Internet Browser and related settings" -msgstr "Configura el Wine Internet Browser i els ajusts relacionats" +msgstr "Configura el Wine Internet Browser i les opcions relacionades" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " @@ -3756,7 +3756,7 @@ msgstr "Controladors de joc" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Prova i configura controladors de joc." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3771,10 +3771,8 @@ msgid "Subscript out of range" msgstr "El subíndex és fora d'interval" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "No queda paper; " +msgstr "No queda espai de pila" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3862,17 +3860,15 @@ msgstr "S'esperava '@'" #: dlls/jscript/jscript.rc:78 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Error de compilació de Microsoft JScript" #: dlls/jscript/jscript.rc:79 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Error d'entorn d'execució de Microsoft JScript" #: dlls/jscript/jscript.rc:80 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Error desconegut" +msgstr "Error d'entorn d'execució desconegut" #: dlls/jscript/jscript.rc:55 msgid "Number expected" @@ -3915,16 +3911,12 @@ msgid "JScript object expected" msgstr "S'esperava un objecte JScript" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "S'esperava un objecte Array" +msgstr "S'esperava un objecte d'Enumerator" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "S'esperava un objecte booleà" +msgstr "S'esperava un objecte d'expressió regular" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3932,7 +3924,7 @@ msgstr "Error de sintaxi en l'expressió regular" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "S'ha llançat una excepció que no s'ha atrapat" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -6950,32 +6942,24 @@ msgid "Connection reset by peer.\n" msgstr "Un igual ha restablert la connexió.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "No implementat" +msgstr "No implementat.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "La trucada RPC ha fallat.\n" +msgstr "La trucada ha fallat.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "No s'ha trobat cap signatura en el fitxer.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "El nivell no és vàlid.\n" +msgstr "La trucada no és vàlida.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "El valor no està disponible.\n" +msgstr "El recurs actualment no està disponible.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7037,10 +7021,8 @@ msgid "Sink has not been finalized.\n" msgstr "No s'ha finalitzat el receptor.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "El receptor ja s'ha aturat.\n" +msgstr "El rellotge s'ha aturat\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7419,10 +7401,8 @@ msgid "Clock state was already set.\n" msgstr "Ja s'ha establert l'estat de rellotge.\n" #: dlls/mferror/mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "El rellotge no està disponible.\n" +msgstr "El rellotge no és simple\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -8527,150 +8507,117 @@ msgid "Select the data you want to connect to:" msgstr "Seleccioneu les dades a les qualles voleu connectar:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Connexions" +msgstr "Connexió" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the data you want to connect to:" msgid "Specify the following to connect to ODBC data:" -msgstr "Seleccioneu les dades a les qualles voleu connectar:" +msgstr "Especifiqueu ho següent per a connectar a les dades ODBC:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Especifiqueu la font de dades:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Si us plau, introduïu el vostre nom" +msgstr "Utilitza el nom de font de &dades" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Connexions restablertes" +msgstr "Utilitza una cadena de c&onnexió" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Connexions" +msgstr "Cadena de &connexió:" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "A&fegeix..." +msgstr "Constr&ueix..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Introduïu la informació per a entrar al servidor" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" msgstr "&Nom d'usuari:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "Pàgina en &blanc" +msgstr "Contrasenya en &blanc" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "La contrasenya està equivocada.\n" +msgstr "Permet &desar la contrasenya" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Introduïu el catàleg &inicial per a utilitzar:" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Connexions restablertes" +msgstr "&Prova la connexió" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Avançat" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Recurs compartit de xarxa" +msgstr "Opcions de xarxa" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "El nivell de suplantació és dolent.\n" +msgstr "Nivell de &suplantació:" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "Nivell de p&rotecció:" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Connectat" +msgstr "Connecta:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "segons" +msgstr "segons." #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Èxit" +msgstr "A&ccés:" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Tot" +msgstr "Tot" #: dlls/oledb32/version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Aquestes són les propietats d'inicialització per a aquest tipus de dades. " +"Per a editar un valor, seleccioneu una propietat, llavors trieu \"Edita el " +"valor\" a sota." #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "E&dita..." +msgstr "&Edita el valor..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Data Link Properties" msgid "Data Link Error" -msgstr "Propietats d'enllaç de dades" +msgstr "Error d'enllaç de dades" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Si us plau, seleccioneu un fitxer." +msgstr "Si us plau, seleccioneu un proveïdor." #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"El proveïdor ja no està disponible. Assegureu-vos que el proveïdor estigui " +"instal·lat correctament." #: dlls/oledb32/version.rc:36 msgid "Data Link Properties" @@ -8681,38 +8628,32 @@ msgid "OLE DB Provider(s)" msgstr "Proveïdors de base de dades OLE" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Llest" +msgstr "Lectura" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Llegiu-me:" +msgstr "Lectura i escriptura" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "No deneguis res de la compartició" #: dlls/oledb32/version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "Denega lectura de la compartició" #: dlls/oledb32/version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "Denega escriptura a la compartició" #: dlls/oledb32/version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "Compartició exclusiva" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "Escriptures d'E/S" +msgstr "Escriptura" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -9959,16 +9900,12 @@ msgid "Cape Verde Daylight Time" msgstr "Hora d'estiu de Cap Verd" #: dlls/tzres/tzres.rc:126 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "Hora estàndard de Hawaii" +msgstr "Hora estàndard de Haití" #: dlls/tzres/tzres.rc:127 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "Hora d'estiu de Hawaii" +msgstr "Hora d'estiu de Haití" #: dlls/tzres/tzres.rc:80 msgid "Central European Standard Time" @@ -10003,16 +9940,12 @@ msgid "Iran Daylight Time" msgstr "Hora d'estiu d'Iran" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Saint Pierre Standard Time" -msgstr "Hora estàndard de Hawaii" +msgstr "Hora estàndard de Sant Pere" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "Hora d'estiu de Hawaii" +msgstr "Hora d'estiu de Sant Pere" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -10055,16 +9988,12 @@ msgid "Central Asia Daylight Time" msgstr "Hora d'estiu de l'Àsia Central" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Hora estàndard de Corea" +msgstr "Hora estàndard de Lord Howe" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Hora d'estiu de Corea" +msgstr "Hora d'estiu de Lord Howe" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10115,16 +10044,12 @@ msgid "Azerbaijan Daylight Time" msgstr "Hora d'estiu de l'Azerbaidjan" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "Hora estàndard de Magadan" +msgstr "Hora estàndard de Magallanes" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "Hora d'estiu de Magadan" +msgstr "Hora d'estiu de Magallanes" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10175,16 +10100,12 @@ msgid "Line Islands Daylight Time" msgstr "Hora d'estiu de les Illes de la Línia" #: dlls/tzres/tzres.rc:92 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "Hora estàndard de la Xina" +msgstr "Hora estàndard de Cuba" #: dlls/tzres/tzres.rc:93 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "Hora d'estiu de la Xina" +msgstr "Hora d'estiu de Cuba" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" @@ -10227,16 +10148,12 @@ msgid "Argentina Daylight Time" msgstr "Hora d'estiu de l'Argentina" #: dlls/tzres/tzres.rc:152 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "Hora estàndard de Maurici" +msgstr "Hora estàndard de Marqueses" #: dlls/tzres/tzres.rc:153 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "Hora d'estiu de Maurici" +msgstr "Hora d'estiu de Marqueses" #: dlls/tzres/tzres.rc:166 msgid "Myanmar Standard Time" @@ -10387,16 +10304,12 @@ msgid "US Eastern Daylight Time" msgstr "Hora d'estiu oriental EUA" #: dlls/tzres/tzres.rc:182 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Hora estàndard de Corea" +msgstr "Hora estàndard de Corea del Nord" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Hora d'estiu de Corea" +msgstr "Hora d'estiu de Corea del Nord" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" @@ -10487,16 +10400,12 @@ msgid "Arabian Daylight Time" msgstr "Hora d'estiu de l'Àrabia" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Hora estàndard de les muntanyes" +msgstr "Hora estàndard de Tocantins" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Hora d'estiu de les muntanyes" +msgstr "Hora d'estiu de Tocantins" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10507,16 +10416,12 @@ msgid "Russian Daylight Time" msgstr "Hora d'estiu de Rússia" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "Hora estàndard central AUS" +msgstr "Hora estàndard central occident d'Austràlia" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "Hora d'estiu central AUS" +msgstr "Hora d'estiu central occident d'Austràlia" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" @@ -10647,16 +10552,12 @@ msgid "Venezuela Daylight Time" msgstr "Hora d'estiu de Veneçuela" #: dlls/tzres/tzres.rc:62 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "Hora estàndard de les muntanyes" +msgstr "Hora estàndard de Bougainville" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "Hora d'estiu de les muntanyes" +msgstr "Hora d'estiu de Bougainville" #: dlls/tzres/tzres.rc:128 msgid "Hawaiian Standard Time" @@ -10683,16 +10584,12 @@ msgid "New Zealand Daylight Time" msgstr "Hora d'estiu de Nova Zelanda" #: dlls/tzres/tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "Hora estàndard de l'Argentina" +msgstr "Hora estàndard aleutiana" #: dlls/tzres/tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "Hora d'estiu de l'Argentina" +msgstr "Hora d'estiu aleutiana" #: dlls/tzres/tzres.rc:76 msgid "Central Brazilian Standard Time" @@ -10743,16 +10640,12 @@ msgid "Egypt Daylight Time" msgstr "Hora d'estiu d'Egipte" #: dlls/tzres/tzres.rc:106 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Hora estàndard central (Mèxic)" +msgstr "Hora estàndard oriental (Mèxic)" #: dlls/tzres/tzres.rc:107 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Hora d'estiu central (Mèxic)" +msgstr "Hora d'estiu oriental (Mèxic)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time" @@ -10787,16 +10680,12 @@ msgid "Korea Daylight Time" msgstr "Hora d'estiu de Corea" #: dlls/tzres/tzres.rc:88 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "Hora estàndard de l'Illa de Pasqua" +msgstr "Hora estàndard de les Illes de Chatham" #: dlls/tzres/tzres.rc:89 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "Hora d'estiu de l'Illa de Pasqua" +msgstr "Hora d'estiu de les Illes de Chatham" #: dlls/tzres/tzres.rc:96 msgid "E. Africa Standard Time" @@ -10962,149 +10851,119 @@ msgstr "&Més finestres..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Desbordament" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "No queda memòria." +msgstr "No queda memòria" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "Aquest vector és fix o està bloquejat temporalment" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Els tipus de dades no es coincideixen.\n" +msgstr "Els tipus de dades no es coincideixen" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Hi ha hagut un error de dispositiu E/S.\n" +msgstr "Error de dispositiu E/S" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "El fitxer ja existeix.\n" +msgstr "El fitxer ja existeix" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "El disc està ple.\n" +msgstr "El disc està ple" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Hi ha massa fitxers oberts.\n" +msgstr "Hi ha massa fitxers" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "S'ha denegat l'accés.\n" +msgstr "S'ha denegat el permís" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Error d'accés al camí/fitxer" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "No s'ha trobat el camí.\n" +msgstr "No s'ha trobat el camí" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(valor no definit)" +msgstr "La variable d'objecte no està establerta" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "La memòria intermèdia d'usuari no és vàlida.\n" +msgstr "Ús no vàlid de Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "No es pot crear el fitxer temporal necessari" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "El servidor d'automatització no pot crear l'objecte" +msgstr "El component d'ActiveX no pot crear l'objecte" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "L'objecte no accepta aquesta acció" +msgstr "La classe no permet l'automatització" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" msgstr "" +"No s'ha trobat el nom de fitxer o nom de classe durant l'operació " +"d'automatització" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "L'objecte no accepta aquesta acció" +msgstr "L'objecte no accepta arguments nombrats" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "L'objecte no accepta aquesta acció" +msgstr "L'objecte no accepta la configuració de localització actual" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "No s'ha trobat l'element.\n" +msgstr "No s'ha trobat el argument anomenat" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" msgstr "" +"El nombre d'arguments és incorrecte o l'assignació de propietat no és vàlida" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Violació de classe d'objecte" +msgstr "L'objecte no és una colecció" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "No s'ha trobat el control especificat en el missatge" +msgstr "No s'ha trobat la funció especificada de la DLL" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" msgstr "" +"La variable utilitza un tipus d'automatització que no s'admet en VBScript" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "La maquinà de servidor remota no existeix o no està disponible" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "Referència no vàlida o no qualificada" #: dlls/vbscript/vbscript.rc:62 msgid "Microsoft VBScript compilation error" -msgstr "" +msgstr "Error de compilació de Microsoft VBScript" #: dlls/vbscript/vbscript.rc:63 msgid "Microsoft VBScript runtime error" -msgstr "" +msgstr "Error d'entorn d'execució de Microsoft VBScript" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -11202,33 +11061,27 @@ msgstr "" #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Data efectiva" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Seguretat" +msgstr "Protocol de seguretat" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Signatura" +msgstr "Tipus de signatura" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Sistema de fitxers xifrant" +msgstr "Tipus de xifratge" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "Força de privacitat" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bits" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n" @@ -13303,6 +13156,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Ordres admesos -\n" +"\n" +"hardlink gestió d'enllaços durs\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -13310,10 +13166,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Enllaços durs - Ordres admesos -\n" +"\n" +"create crea un enllaç dur\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Sintaxis: fsutil hardlink create <nou> <existent>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -17159,10 +17018,8 @@ msgid "&Beginner" msgstr "&Principiant" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Interfície" +msgstr "&Intermedi" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -17193,10 +17050,8 @@ msgid "Beginner" msgstr "Principiant" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Interfície" +msgstr "Intermedi" #: programs/winemine/winemine.rc:66 msgid "Expert" -- 2.29.2

1 0

[PATCH] schedsvc/tests: Use wide-char string literals.
by Michael Stefaniuc Dec. 13, 2020

Dec. 13, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/schedsvc/tests/atsvcapi.c | 2 +- dlls/schedsvc/tests/rpcapi.c | 168 ++++++++++++++++----------------- 2 files changed, 80 insertions(+), 90 deletions(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index f10c9d07232..5f5ca06627a 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -52,7 +52,7 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) START_TEST(atsvcapi) { static unsigned char ncalrpc[] = "ncalrpc"; - static WCHAR task1W[] = { 'T','a','s','k','1','.','e','x','e',0 }; + static WCHAR task1W[] = L"Task1.exe"; HRESULT hr; unsigned char *binding_str; WCHAR server_name[MAX_COMPUTERNAME_LENGTH + 1]; diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index b791a047dce..b806b97539d 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -42,19 +42,6 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) START_TEST(rpcapi) { static unsigned char ncalrpc[] = "ncalrpc"; - static const WCHAR empty[] = { 0 }; - static const WCHAR Wine[] = { '\\','W','i','n','e',0 }; - static const WCHAR Wine_Folder1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1',0 }; - static const WCHAR Wine_Folder2[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','2',0 }; - static const WCHAR Folder1[] = { 'F','o','l','d','e','r','1',0 }; - static const WCHAR Folder2[] = { 'F','o','l','d','e','r','2',0 }; - static const WCHAR Wine_Task1[] = { '\\','W','i','n','e','\\','T','a','s','k','1',0 }; - static const WCHAR Wine_Task2[] = { '\\','W','i','n','e','\\','T','a','s','k','2',0 }; - static const WCHAR Wine_Task3[] = { '\\','W','i','n','e','\\','T','a','s','k','3',0 }; - static const WCHAR Wine_Folder1_Task1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\','T','a','s','k','1',0 }; - static const WCHAR Task1[] = { 'T','a','s','k','1',0 }; - static const WCHAR Task2[] = { 'T','a','s','k','2',0 }; - static const WCHAR Task3[] = { 'T','a','s','k','3',0 }; static const char xml1[] = "<?xml version=\"1.0\"?>\n" "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" @@ -121,49 +108,49 @@ START_TEST(rpcapi) SetUnhandledExceptionFilter(old_exception_filter); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 1); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 1); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 0); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder2+1, empty, 0); + hr = SchRpcCreateFolder(L"Wine\\Folder2", L"", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine+1, 0); + hr = SchRpcDelete(L"Wine", 0); ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder1+1, 1); + hr = SchRpcDelete(L"Wine\\Folder1", 1); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder2, 0); + hr = SchRpcDelete(L"\\Wine\\Folder2", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine, 0); + hr = SchRpcDelete(L"\\Wine", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine, 0); + hr = SchRpcDelete(L"\\Wine", 0); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || broken(hr == S_OK), /* Early versions of Win 10 */ "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); - hr = SchRpcDelete(empty, 0); + hr = SchRpcDelete(L"", 0); ok(hr == E_ACCESSDENIED /* win7 */ || hr == E_INVALIDARG /* vista */, "expected E_ACCESSDENIED, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine+1, xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine", xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); @@ -172,12 +159,13 @@ START_TEST(rpcapi) { path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task1, xmlW, create_new_task[i].flags, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task1", xmlW, create_new_task[i].flags, NULL, + TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == create_new_task[i].hr, "%u: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); if (hr == S_OK) { - hr = SchRpcDelete(Wine_Task1, 0); + hr = SchRpcDelete(L"\\Wine\\Task1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); @@ -186,7 +174,7 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task1, xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task1", xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); @@ -200,9 +188,9 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Folder1_Task1+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Folder1_Task1) /* win7 */ || !lstrcmpW(path, Wine_Folder1_Task1+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Folder1\\Task1") /* win7 */ || !lstrcmpW(path, L"Wine\\Folder1\\Task1") /* vista */, "expected \\Wine\\Folder1\\Task1, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); @@ -211,11 +199,13 @@ START_TEST(rpcapi) { path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Folder1_Task1+1, xmlW, open_existing_task[i].flags, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, open_existing_task[i].flags, NULL, + TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == open_existing_task[i].hr, "%u: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); if (hr == S_OK) { - ok(!lstrcmpW(path, Wine_Folder1_Task1) /* win7 */ || !lstrcmpW(path, Wine_Folder1_Task1+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Folder1\\Task1") /* win7 */ || + !lstrcmpW(path, L"Wine\\Folder1\\Task1") /* vista */, "expected \\Wine\\Folder1\\Task1, task actual path %s\n", wine_dbgstr_w(path)); MIDL_user_free(path); } @@ -226,55 +216,55 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Folder1_Task1+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); count = 0; xml = NULL; - hr = SchRpcRetrieveTask(Wine_Folder1_Task1, empty, &count, &xml); + hr = SchRpcRetrieveTask(L"\\Wine\\Folder1\\Task1", L"", &count, &xml); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (hr == S_OK) trace("%s\n", wine_dbgstr_w(xml)); MIDL_user_free(xml); - hr = SchRpcDelete(Wine_Folder1_Task1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1\\Task1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine+1, 0); + hr = SchRpcDelete(L"Wine", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(!start_index, "expected 0, got %u\n", start_index); ok(!names, "expected NULL, got %p\n", names); - hr = SchRpcCreateFolder(Wine, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(!start_index, "expected 0, got %u\n", start_index); ok(!names, "expected NULL, got %p\n", names); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder2, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder2", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -282,9 +272,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Folder1)) + if (!lstrcmpW(names[i], L"Folder1")) enumed += 1; - else if (!lstrcmpW(names[i], Folder2)) + else if (!lstrcmpW(names[i], L"Folder2")) enumed += 2; MIDL_user_free(names[i]); } @@ -294,19 +284,19 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 1, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 1, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 1, "expected 1, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); - ok(!lstrcmpW(names[0], Folder1) || !lstrcmpW(names[0], Folder2), "got %s\n", wine_dbgstr_w(names[0])); + ok(!lstrcmpW(names[0], L"Folder1") || !lstrcmpW(names[0], L"Folder2"), "got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 2, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 2, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -314,9 +304,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Folder1)) + if (!lstrcmpW(names[i], L"Folder1")) enumed += 1; - else if (!lstrcmpW(names[i], Folder2)) + else if (!lstrcmpW(names[i], L"Folder2")) enumed += 2; MIDL_user_free(names[i]); } @@ -326,7 +316,7 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 10, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 10, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -334,9 +324,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Folder1)) + if (!lstrcmpW(names[i], L"Folder1")) enumed += 1; - else if (!lstrcmpW(names[i], Folder2)) + else if (!lstrcmpW(names[i], L"Folder2")) enumed += 2; MIDL_user_free(names[i]); } @@ -346,21 +336,21 @@ START_TEST(rpcapi) start_index = 10; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(start_index == 10, "expected 10, got %u\n", start_index); ok(!names, "expected NULL, got %p\n", names); - hr = SchRpcDelete(Wine_Folder1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder2, 0); + hr = SchRpcDelete(L"\\Wine\\Folder2", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine_Folder1, TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine\\Folder1", TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(!start_index, "expected 0, got %u\n", start_index); @@ -368,25 +358,25 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task1+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Task1) /* win7 */ || !lstrcmpW(path, Wine_Task1+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Task1") /* win7 */ || !lstrcmpW(path, L"Wine\\Task1") /* vista */, "expected \\Wine\\Task1, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task2, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task2", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Task2), "expected \\Wine\\Task2, task actual path %s\n", wine_dbgstr_w(path)); + ok(!lstrcmpW(path, L"\\Wine\\Task2"), "expected \\Wine\\Task2, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -394,9 +384,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Task1)) + if (!lstrcmpW(names[i], L"Task1")) enumed += 1; - else if (!lstrcmpW(names[i], Task2)) + else if (!lstrcmpW(names[i], L"Task2")) enumed += 2; MIDL_user_free(names[i]); } @@ -406,13 +396,13 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 1, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 1, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 1, "expected 1, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); /* returned name depends whether directory randomization is on */ - ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2), + ok(!lstrcmpW(names[0], L"Task1") || !lstrcmpW(names[0], L"Task2"), "expected Task1, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -420,7 +410,7 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 2, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 2, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -428,9 +418,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Task1)) + if (!lstrcmpW(names[i], L"Task1")) enumed += 1; - else if (!lstrcmpW(names[i], Task2)) + else if (!lstrcmpW(names[i], L"Task2")) enumed += 2; MIDL_user_free(names[i]); } @@ -440,7 +430,7 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 10, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 10, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -448,9 +438,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Task1)) + if (!lstrcmpW(names[i], L"Task1")) enumed += 1; - else if (!lstrcmpW(names[i], Task2)) + else if (!lstrcmpW(names[i], L"Task2")) enumed += 2; MIDL_user_free(names[i]); } @@ -459,22 +449,22 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task3+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Task3", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Task3) /* win7 */ || !lstrcmpW(path, Wine_Task3+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Task3") /* win7 */ || !lstrcmpW(path, L"Wine\\Task3") /* vista */, "expected \\Wine\\Task3, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine+1, 0, &start_index, 10, &count, &names); + hr = SchRpcEnumTasks(L"Wine", 0, &start_index, 10, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 3, "expected 3, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); /* returned name depends whether directory randomization is on */ - ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2) || !lstrcmpW(names[0], Task3), + ok(!lstrcmpW(names[0], L"Task1") || !lstrcmpW(names[0], L"Task2") || !lstrcmpW(names[0], L"Task3"), "expected Task3, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -482,45 +472,45 @@ START_TEST(rpcapi) if (0) /* crashes under win7 */ { hr = SchRpcGetTaskInfo(NULL, 0, NULL, NULL); - hr = SchRpcGetTaskInfo(Task1, 0, NULL, NULL); - hr = SchRpcGetTaskInfo(Task1, 0, &enabled, NULL); - hr = SchRpcGetTaskInfo(Task1, 0, NULL, &state); + hr = SchRpcGetTaskInfo(L"Task1", 0, NULL, NULL); + hr = SchRpcGetTaskInfo(L"Task1", 0, &enabled, NULL); + hr = SchRpcGetTaskInfo(L"Task1", 0, NULL, &state); } - hr = SchRpcGetTaskInfo(Task1, 0, &enabled, &state); + hr = SchRpcGetTaskInfo(L"Task1", 0, &enabled, &state); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); enabled = state = 0xdeadbeef; - hr = SchRpcGetTaskInfo(Wine_Task1, 0, &enabled, &state); + hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", 0, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_UNKNOWN, "expected TASK_STATE_UNKNOWN, got %u\n", state); enabled = state = 0xdeadbeef; - hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); + hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", SCH_FLAG_STATE, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %u\n", state); - hr = SchRpcEnableTask(Wine_Task1, 0xdeadbeef); + hr = SchRpcEnableTask(L"\\Wine\\Task1", 0xdeadbeef); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); enabled = state = 0xdeadbeef; - hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); + hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", SCH_FLAG_STATE, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); todo_wine ok(enabled == 1, "expected 1, got %u\n", enabled); todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %u\n", state); - hr = SchRpcDelete(Wine_Task1+1, 0); + hr = SchRpcDelete(L"Wine\\Task1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Task2+1, 0); + hr = SchRpcDelete(L"Wine\\Task2", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Task3+1, 0); + hr = SchRpcDelete(L"Wine\\Task3", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine, 0); + hr = SchRpcDelete(L"\\Wine", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); path = NULL; -- 2.26.2

2 2

[PATCH] ntdll: Only build Linux-specific functions on Linux
by Gerald Pfeifer Dec. 13, 2020

Dec. 13, 2020

logical_proc_info_add_by_id, logical_proc_info_add_cache, logical_proc_info_add_group, and logical_proc_info_add_numa_node are only useful and invoked on Linux, so disable their build elsewhere. (Without this compilers will, rightfully, warn about unused functions. GCC definitely does.) Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/unix/system.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index a889b2e020c..5130b4c18ba 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -506,6 +506,8 @@ void init_cpu_info(void) cpu_info.Architecture, cpu_info.Level, cpu_info.Revision, cpu_info.FeatureSet ); } +#ifdef linux + static BOOL grow_logical_proc_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, DWORD *max_len ) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; @@ -752,6 +754,8 @@ static BOOL logical_proc_info_add_group( SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX return TRUE; } +#endif + #ifdef linux /* Helper function for counting bitmap values as commonly used by the Linux kernel -- 2.28.0

2 2