June 2021 - Wine-Devel - list.winehq.org

[PATCH] advapi32/tests: Avoid gcc 11 misleading-indentation warning.
by Andrew Eikum June 4, 2021

June 4, 2021

dlls/advapi32/tests/cred.c:809:5: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation] include/wine/test.h:116:32: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’ Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/advapi32/tests/cred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 01e2a5efa33..854f5a92b1f 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -809,7 +809,7 @@ START_TEST(cred) else test_generic(); - trace("domain password:\n"); + trace("domain password:\n"); if (persists[CRED_TYPE_DOMAIN_PASSWORD] == CRED_PERSIST_NONE) skip("CRED_TYPE_DOMAIN_PASSWORD credentials are not supported or are disabled. Skipping\n"); else -- 2.31.1

1 0

[PATCH v2] dsound: Notify DSBPN_OFFSETSTOP earlier.
by Hiroki Awata June 4, 2021

June 4, 2021

Some games may not receive the DSBPN_OFFSETSTOP event and get stuck if CloseHandle is called immediately after IDirectSoundBuffer::Stop. To solve this problem, IDirectSoundBuffer::Stop will immediately notify the DSBPN_OFFSETSTOP event. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41292 Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/dsound/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index fafa6fc6015..8cbcd8f9fc5 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -317,9 +317,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) AcquireSRWLockExclusive(&This->lock); - if (This->state == STATE_PLAYING) - This->state = STATE_STOPPING; - else if (This->state == STATE_STARTING) + if (This->state == STATE_PLAYING || This->state == STATE_STARTING) { This->state = STATE_STOPPED; DSOUND_CheckEvent(This, 0, 0); -- 2.27.0

3 2

[PATCH] po: Update Finnish translation.
by Lauri Kenttä June 4, 2021

June 4, 2021

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 296 ++++++++++++++----------------------------------------- 1 file changed, 76 insertions(+), 220 deletions(-) diff --git a/po/fi.po b/po/fi.po index ab6598e2848..da6cebf66a6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6961,24 +6961,16 @@ msgid "Resource is not currently available.\n" msgstr "Resurssi ei ole nyt saatavilla.\n" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "Kirjain" +msgstr "" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "Kirjain" +msgstr "" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "&Taulukko" +msgstr "" #: dlls/localspl/localspl.rc:40 msgid "Ledger" @@ -6989,51 +6981,36 @@ msgid "Legal" msgstr "" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "Tila" +msgstr "" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "Suo&rita..." +msgstr "" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "Pieni" +msgstr "" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" @@ -7052,10 +7029,8 @@ msgid "11x17" msgstr "" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "Muistio" +msgstr "" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" @@ -7095,51 +7070,47 @@ msgstr "" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "C5-kirjekuori" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "C3-kirjekuori" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "C4-kirjekuori" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "C6-kirjekuori" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "C65-kirjekuori" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "B4-kirjekuori" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "B5-kirjekuori" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "B6-kirjekuori" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "Monarch-kirjekuori" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" @@ -7155,13 +7126,11 @@ msgstr "" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "Japanilainen" +msgstr "Japanilainen postikortti" #: dlls/localspl/localspl.rc:80 msgid "9x11" @@ -7180,11 +7149,8 @@ msgid "Envelope Invite" msgstr "" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "Kirjain" +msgstr "" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" @@ -7195,24 +7161,16 @@ msgid "Tabloid Extra" msgstr "" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "&Ekstrat" +msgstr "" #: dlls/localspl/localspl.rc:88 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "Letter Transverse" -msgstr "läpikäyty" +msgstr "" #: dlls/localspl/localspl.rc:89 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A4 Transverse" -msgstr "läpikäyty" +msgstr "" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" @@ -7227,56 +7185,40 @@ msgid "Super B" msgstr "" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "Kirjain" +msgstr "" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" msgstr "" #: dlls/localspl/localspl.rc:95 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A5 Transverse" -msgstr "läpikäyty" +msgstr "" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" msgstr "" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "&Ekstrat" +msgstr "" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "&Ekstrat" +msgstr "" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" msgstr "" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A3 Transverse" -msgstr "läpikäyty" +msgstr "" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" @@ -7287,11 +7229,8 @@ msgid "Japanese Double Postcard" msgstr "" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" @@ -7363,7 +7302,7 @@ msgstr "" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" @@ -7394,64 +7333,44 @@ msgid "PRC 32K(Big)" msgstr "" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" @@ -7466,64 +7385,44 @@ msgid "PRC 32K(Big) Rotated" msgstr "" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -14789,17 +14688,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "Komento \"REG /?\" näyttää ohjeen.\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | EXPORT | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14815,7 +14703,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, EXPORT, IMPORT, QUERY\n" +" ADD, COPY, DELETE, EXPORT, IMPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -14917,35 +14805,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:202 -#, fuzzy -#| msgid "" -#| "REG EXPORT <key> <file> [/y]\n" -#| "\n" -#| " Exports a specified registry key (including all subkeys and values)\n" -#| " to a file.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to export.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " <file>\n" -#| " The name and path of the registry file that will be created.\n" -#| " This file must have a .reg extension.\n" -#| "\n" -#| " /y\n" -#| " Overwrite <file> without prompting for confirmation.\n" -#| "\n" msgid "" "REG COPY <key1> <key2> [/s] [/f]\n" "\n" @@ -14979,12 +14838,15 @@ msgid "" "<key2>.\n" "\n" msgstr "" -"REG EXPORT <avain> <tiedosto> [/y]\n" +"REG COPY <avain1> <avain2> [/s] [/f]\n" "\n" -" Vie rekisteriavaimen (mukaan lukien aliavaimet ja arvot) tiedostoon.\n" +" Kopioi rekisteriavaimen sisällön toiseen sijaintiin.\n" +" Yleensä tämä kopioi vain arvot. Parametrilla [/s] voi kopioida\n" +" rekursiivisesti myös aliavainten sisällön.\n" "\n" -" <avain>\n" -" Vietävä rekisteriavain.\n" +" <avain1>, <avain2>\n" +" Rekisteriavaimet, kopioinnin lähde (<avain1>) ja kohde (<avain2>).\n" +" Näistä <avain2> luodaan, jos sitä ei vielä ole rekisterissä.\n" "\n" " Muoto: JUURI\\Aliavain\n" "\n" @@ -14998,12 +14860,12 @@ msgstr "" "\n" " Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" "\n" -" <tiedosto>\n" -" Luotavan rekisteritiedoston nimi ja polku. Tiedostonimen tulee olla\n" -" .reg-päätteinen.\n" +" /s\n" +" Kopioi kaikki aliavaimet ja arvot <avain1>:stä to <avain2>:een.\n" "\n" -" /y\n" -" Ylikirjoita tiedosto kysymättä vahvistusta.\n" +" /f\n" +" Ylikirjoita tiedot <avain2>:ssa kysymättä vahvistusta.\n" +" Asetus ei muuta aliavaimia ja arvoja, jotka ovat vain <avain2>:ssa.\n" "\n" #: programs/reg/reg.rc:92 @@ -15253,18 +15115,16 @@ msgid "reg: Invalid option [%1]. " msgstr "reg: Valitsin [%1] ei kelpaa. " #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg: Valitsinta [/d] täytyy seurata kelpo heksadesimaaliarvo\n" +msgstr "reg: Valitsimen [/d] jälkeen täytyy tulla lukuarvo\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "reg: Valitsinta [/d] täytyy seurata kelpo heksadesimaaliarvo\n" +msgstr "reg: Valitsimen [/d] jälkeen täytyy tulla heksadesimaaliarvo\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg: Valitsinta [/d] täytyy seurata kelpo merkkijono\n" +msgstr "reg: Valitsimen [/d] jälkeen täytyy tulla merkkijono\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" @@ -15284,15 +15144,13 @@ msgstr "reg: Komentoriviparametrit eivät kelpaa\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: Lähde ja kohde eivät voi olla sama avain\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" +msgstr "Kohdeavaimessa on jo arvo '%1\\%2'. Haluatko korvata sen?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -15307,10 +15165,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1'?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: Rekisteriavainta '%1' ei voida poistaa.\n" +msgstr "reg: Kaikkia rekisteriarvoja kohteessa '%1' ei voida poistaa.\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" -- 2.31.1

1 0

[PATCH] vcomp: Implement omp_get_num_procs().
by Gijs Vermeulen June 4, 2021

June 4, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50041 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/vcomp/main.c | 6 ++++-- dlls/vcomp/tests/vcomp.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 90caac83750..30bc2c63501 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -43,6 +43,7 @@ static DWORD vcomp_context_tls = TLS_OUT_OF_INDEXES; static HMODULE vcomp_module; static int vcomp_max_threads; static int vcomp_num_threads; +static int vcomp_num_procs; static BOOL vcomp_nested_fork = FALSE; static RTL_CRITICAL_SECTION vcomp_section; @@ -1001,8 +1002,8 @@ int CDECL omp_get_nested(void) int CDECL omp_get_num_procs(void) { - TRACE("stub\n"); - return 1; + TRACE("\n"); + return vcomp_num_procs; } int CDECL omp_get_num_threads(void) @@ -1843,6 +1844,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) vcomp_module = instance; vcomp_max_threads = sysinfo.dwNumberOfProcessors; vcomp_num_threads = sysinfo.dwNumberOfProcessors; + vcomp_num_procs = sysinfo.dwNumberOfProcessors; break; } diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 478bb5d7cfe..16008d17728 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -117,6 +117,7 @@ static void (CDECL *pomp_destroy_lock)(omp_lock_t *lock); static void (CDECL *pomp_destroy_nest_lock)(omp_nest_lock_t *lock); static int (CDECL *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); +static int (CDECL *pomp_get_num_procs)(void); static int (CDECL *pomp_get_num_threads)(void); static int (CDECL *pomp_get_thread_num)(void); static int (CDECL *pomp_in_parallel)(void); @@ -352,6 +353,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(omp_destroy_nest_lock); VCOMP_GET_PROC(omp_get_max_threads); VCOMP_GET_PROC(omp_get_nested); + VCOMP_GET_PROC(omp_get_num_procs); VCOMP_GET_PROC(omp_get_num_threads); VCOMP_GET_PROC(omp_get_thread_num); VCOMP_GET_PROC(omp_in_parallel); @@ -2209,11 +2211,24 @@ static void test_reduction_float_double(void) } } +static void test_omp_get_num_procs(void) +{ + SYSTEM_INFO sysinfo; + int num_procs; + + num_procs = pomp_get_num_procs(); + ok(num_procs > 0, "expected non-zero num_procs\n"); + GetSystemInfo(&sysinfo); + ok(sysinfo.dwNumberOfProcessors > 0, "expected non-zero dwNumberOfProcessors\n"); + ok(num_procs == sysinfo.dwNumberOfProcessors, "got dwNumberOfProcessors %d num_procs %d\n", sysinfo.dwNumberOfProcessors, num_procs); +} + START_TEST(vcomp) { if (!init_vcomp()) return; + test_omp_get_num_procs(); test_omp_get_num_threads(FALSE); test_omp_get_num_threads(TRUE); test_vcomp_fork(); -- 2.31.1

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud June 4, 2021

June 4, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 75 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/po/nl.po b/po/nl.po index 03a6b7a1f3e..cd8fbce0f44 100644 --- a/po/nl.po +++ b/po/nl.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: 2021-05-20 14:10+0200\n" +"PO-Revision-Date: 2021-06-04 19:40+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -4515,7 +4515,7 @@ msgstr "Pad is ongeldig.\n" #: dlls/kernel32/winerror.mc:678 msgid "Signal pending.\n" -msgstr "Signaal wachtende.\n" +msgstr "Signaal in behandeling.\n" #: dlls/kernel32/winerror.mc:683 msgid "Max system-wide thread count reached.\n" @@ -4527,7 +4527,7 @@ msgstr "Vergrendelen mislukt.\n" #: dlls/kernel32/winerror.mc:693 msgid "Resource in use.\n" -msgstr "Resource in gebruik.\n" +msgstr "Bron in gebruik.\n" #: dlls/kernel32/winerror.mc:698 msgid "Cancel violation.\n" @@ -6088,11 +6088,11 @@ msgstr "Geen systeembronnen.\n" #: dlls/kernel32/winerror.mc:2653 msgid "No non-paged system resources.\n" -msgstr "Geen nonpaged systeembronnen.\n" +msgstr "Geen niet-wisselbare systeembronnen.\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "Geen paged systeembronnen.\n" +msgstr "Geen wisselbare systeembronnen.\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6112,7 +6112,7 @@ msgstr "Menu-item niet gevonden.\n" #: dlls/kernel32/winerror.mc:2683 msgid "Invalid keyboard handle.\n" -msgstr "Ongeldige toestenbordhandle.\n" +msgstr "Ongeldige toestenbordbeschrijving.\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" @@ -6124,15 +6124,15 @@ msgstr "Interactief windowstation vereist.\n" #: dlls/kernel32/winerror.mc:2698 msgid "Timeout.\n" -msgstr "Timeout.\n" +msgstr "Time-out.\n" #: dlls/kernel32/winerror.mc:2703 msgid "Invalid monitor handle.\n" -msgstr "Ongeldige monitorhandle.\n" +msgstr "Ongeldige monitorbeschrijving.\n" #: dlls/kernel32/winerror.mc:2708 msgid "Event log file corrupt.\n" -msgstr "Gebeurtenislogbestand corrupt.\n" +msgstr "Gebeurtenislogbestand beschadigd.\n" #: dlls/kernel32/winerror.mc:2713 msgid "Event log can't start.\n" @@ -6384,7 +6384,7 @@ msgstr "Onbekende interface.\n" #: dlls/kernel32/winerror.mc:3023 msgid "No bindings.\n" -msgstr "Geen bindings.\n" +msgstr "Geen bindingen.\n" #: dlls/kernel32/winerror.mc:3028 msgid "No protocol sequences.\n" @@ -6392,11 +6392,11 @@ msgstr "Geen protocol volgordes.\n" #: dlls/kernel32/winerror.mc:3033 msgid "Can't create endpoint.\n" -msgstr "Kan eindpunt niet creëren.\n" +msgstr "Kan eindpunt niet aanmaken.\n" #: dlls/kernel32/winerror.mc:3038 msgid "Out of resources.\n" -msgstr "Resources zijn op.\n" +msgstr "Onvoldoende bronnen.\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" @@ -6412,15 +6412,15 @@ msgstr "Ongeldige netwerkopties.\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "Geen RPC-call actief.\n" +msgstr "Geen RPC-oproep actief.\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" -msgstr "RPC-call mislukt.\n" +msgstr "RPC-oproep mislukt.\n" #: dlls/kernel32/winerror.mc:3068 msgid "RPC call failed and didn't execute.\n" -msgstr "RPC-call mislukt en niet uitgevoerd.\n" +msgstr "RPC-oproep mislukt en niet uitgevoerd.\n" #: dlls/kernel32/winerror.mc:3073 msgid "RPC protocol error.\n" @@ -6740,23 +6740,23 @@ msgstr "Server heeft open handles.\n" #: dlls/kernel32/winerror.mc:3473 msgid "Resource data not found.\n" -msgstr "Resourcedata niet gevonden.\n" +msgstr "Brongegevens niet gevonden.\n" #: dlls/kernel32/winerror.mc:3478 msgid "Resource type not found.\n" -msgstr "Resourcetype niet gevonden.\n" +msgstr "Brontype niet gevonden.\n" #: dlls/kernel32/winerror.mc:3483 msgid "Resource name not found.\n" -msgstr "Resourcenaam niet gevonden.\n" +msgstr "Bronnaam niet gevonden.\n" #: dlls/kernel32/winerror.mc:3488 msgid "Resource language not found.\n" -msgstr "Resourcetaal niet gevonden.\n" +msgstr "Brontaal niet gevonden.\n" #: dlls/kernel32/winerror.mc:3493 msgid "Not enough quota.\n" -msgstr "Niet genoeg quota.\n" +msgstr "Onvoldoende quota.\n" #: dlls/kernel32/winerror.mc:3498 msgid "No interfaces.\n" @@ -9573,55 +9573,55 @@ msgstr "Terugspoelen" #: dlls/shdoclc/shdoclc.rc:199 msgid "Trace Tags" -msgstr "Traceer Labels" +msgstr "Markeringen" #: dlls/shdoclc/shdoclc.rc:200 msgid "Resource Failures" -msgstr "Resource Fouten" +msgstr "Bronfouten" #: dlls/shdoclc/shdoclc.rc:201 msgid "Dump Tracking Info" -msgstr "Log Tracerings Informatie" +msgstr "Traceerinformatie Dumpen" #: dlls/shdoclc/shdoclc.rc:202 msgid "Debug Break" -msgstr "Debug Onderbreking" +msgstr "Foutopsporing Onderbreking" #: dlls/shdoclc/shdoclc.rc:203 msgid "Debug View" -msgstr "Debug Beeld" +msgstr "Foutopsporingsbeeld" #: dlls/shdoclc/shdoclc.rc:204 msgid "Dump Tree" -msgstr "Log Gehele Boom" +msgstr "Boom Dumpen" #: dlls/shdoclc/shdoclc.rc:205 msgid "Dump Lines" -msgstr "Log Regels" +msgstr "Regels Dumpen" #: dlls/shdoclc/shdoclc.rc:206 msgid "Dump DisplayTree" -msgstr "Log Beeld Boom" +msgstr "BeeldBoom Dumpen" #: dlls/shdoclc/shdoclc.rc:207 msgid "Dump FormatCaches" -msgstr "Log Formaat Caches" +msgstr "FormaatCaches Dumpen" #: dlls/shdoclc/shdoclc.rc:208 msgid "Dump LayoutRects" -msgstr "Log Layout Rects" +msgstr "LayoutRects Dumpen" #: dlls/shdoclc/shdoclc.rc:209 msgid "Memory Monitor" -msgstr "Geheugen Monitor" +msgstr "Geheugenmonitor" #: dlls/shdoclc/shdoclc.rc:210 msgid "Performance Meters" -msgstr "Performance Meters" +msgstr "Prestatiemeters" #: dlls/shdoclc/shdoclc.rc:211 msgid "Save HTML" -msgstr "Sla HTML op" +msgstr "HTML Opslaan" #: dlls/shdoclc/shdoclc.rc:213 msgid "&Browse View" @@ -13810,7 +13810,7 @@ msgstr "" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 Open resources: %4!u!\n" +msgstr "%1 %2 %3 Open bronnen: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -15263,15 +15263,14 @@ msgstr "reg: Foutieve opdrachtregel-parameters\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: De bron- en de doelsleutel kunnen niet hetzelfde zijn\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "Het bestand '%1' bestaat al. Wilt u het overschrijven?" +msgstr "" +"De waarde '%1\\%2' komt al voor in de doelsleutel. Wilt u het overschrijven?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" -- 2.32.0.rc2

1 0

[PATCH 1/5] ws2_32/tests: Add more tests for sockets that cannot be accepted into.
by Zebediah Figura June 4, 2021

June 4, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f165742fe45..592baa806c3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6402,6 +6402,7 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { + const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; @@ -6525,6 +6526,61 @@ todo_wine closesocket(connector); closesocket(acceptor); + /* A UDP socket cannot be accepted into. */ + + acceptor = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + closesocket(acceptor); + + /* A bound socket cannot be accepted into. */ + + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + iret = bind(acceptor, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!iret, "got error %u\n", WSAGetLastError()); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + closesocket(acceptor); + + /* A connected socket cannot be accepted into. */ + + tcp_socketpair(&acceptor, &acceptor2); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor2, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + closesocket(acceptor); + closesocket(acceptor2); + + /* Pass an insufficient local address size. */ + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError()); -- 2.30.2

3 10

[PATCH v12 1/2] mountmgr.sys: Introduce StorageDeviceSeekPenaltyProperty
by David Koolhoven June 4, 2021

June 4, 2021

Allows programs which demand support for StorageDeviceSeekPenaltyProperty to function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51065 Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- v12: Fixed whitespace. --- dlls/mountmgr.sys/device.c | 17 +++++++++++++++++ include/ntddstor.h | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 04e8fe3c0f5..3c412354429 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1894,6 +1894,23 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp ) break; } + case StorageDeviceSeekPenaltyProperty: + { + DEVICE_SEEK_PENALTY_DESCRIPTOR *descriptor; + FIXME( "Faking StorageDeviceSeekPenaltyProperty data with no penalty\n" ); + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR)) { + status = STATUS_INVALID_PARAMETER; + break; + } + memset( irp->AssociatedIrp.SystemBuffer, 0, sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR) ); + descriptor = irp->AssociatedIrp.SystemBuffer; + descriptor->Version = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + descriptor->Size = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + descriptor->IncursSeekPenalty = FALSE; + status = STATUS_SUCCESS; + irp->IoStatus.Information = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + break; + } default: FIXME( "Unsupported property %#x\n", query->PropertyId ); status = STATUS_NOT_SUPPORTED; diff --git a/include/ntddstor.h b/include/ntddstor.h index b8c4bb73b0d..836def413fe 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -214,7 +214,8 @@ typedef enum _STORAGE_QUERY_TYPE { typedef enum _STORAGE_PROPERTY_ID { StorageDeviceProperty = 0, - StorageAdapterProperty + StorageAdapterProperty = 1, + StorageDeviceSeekPenaltyProperty = 7, } STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID; typedef struct _STORAGE_PROPERTY_QUERY { @@ -272,6 +273,12 @@ typedef struct _STORAGE_ADAPTER_DESCRIPTOR { USHORT BusMinorVersion; } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR; +typedef struct _DEVICE_SEEK_PENALTY_DESCRIPTOR { + ULONG Version; + ULONG Size; + BOOLEAN IncursSeekPenalty; +} DEVICE_SEEK_PENALTY_DESCRIPTOR, *PDEVICE_SEEK_PENALTY_DESCRIPTOR; + #ifdef __cplusplus } #endif -- 2.19.1

1 1

[PATCH 10/10] msvcrt: Import lgammaf implementation from musl.
by Piotr Caban June 4, 2021

June 4, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 259 ++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/unixlib.c | 14 --- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 226 insertions(+), 49 deletions(-)

1 0

[PATCH 09/10] msvcrt: Import lgamma implementation from musl.
by Piotr Caban June 4, 2021

June 4, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 196 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 14 --- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 195 insertions(+), 17 deletions(-)

1 0

[PATCH 08/10] msvcrt: Import log2 implementation from musl.
by Piotr Caban June 4, 2021

June 4, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 247 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 --- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 244 insertions(+), 18 deletions(-)

1 0