wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Piotr Caban : msvcrt: Support "China" country name in setlocale function.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 8905bd92aa61ed5493844cbe65db4eedca6839c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8905bd92aa61ed5493844cbe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 23:13:51 2018 +0200 msvcrt: Support "China" country name in setlocale function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 3 +++ dlls/msvcrt/tests/locale.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 088e1b7..6314840 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -249,6 +249,9 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage) if(!search.search_country[0] && !search.search_codepage[0]) remap_synonym(search.search_language); + if(!strcasecmp(search.search_country, "China")) + strcpy(search.search_country, "People's Republic of China"); + EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, (LONG_PTR)&search); diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index ea42385..5e6d172 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -144,12 +144,10 @@ static void test_setlocale(void) || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "Chinese_China.936"); -todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) { trace("Chinese_China.936=%s\n", ret); -todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") /* Vista - Win7 */ || !strcmp(ret, "Chinese (Simplified)_China.936") /* Win8 - Win10 */ || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret);

1 0

Piotr Caban : msvcr110: Add __crtCapturePreviousContext implementation.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 19bb93ec100785c6466f211165d2353e96f58d20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19bb93ec100785c6466f2111… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 21:02:47 2018 +0200 msvcr110: Add __crtCapturePreviousContext implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/except_x86_64.c | 38 +++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1a04161..3572664 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -905,7 +905,7 @@ @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl __create_locale(long str) MSVCRT__create_locale @ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) ntdll.RtlCaptureContext -@ stub -arch=win64 __crtCapturePreviousContext +@ cdecl -arch=x86_64 -norelay __crtCapturePreviousContext(ptr) @ cdecl __crtCompareStringA(long long str long str long) @ stub -arch=i386,win64 __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f65669c..9e0c395 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -890,7 +890,7 @@ @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl __create_locale(long str) MSVCRT__create_locale @ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) ntdll.RtlCaptureContext -@ stub -arch=win64 __crtCapturePreviousContext +@ cdecl -arch=x86_64 -norelay __crtCapturePreviousContext(ptr) @ cdecl __crtCompareStringA(long long str long str long) @ stub -arch=i386,win64 __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0ba1780..a732118 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -884,7 +884,7 @@ @ cdecl -arch=i386 __control87_2(long long ptr ptr) msvcr120.__control87_2 @ cdecl __create_locale(long str) msvcr120.__create_locale @ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) msvcr120.__crtCaptureCurrentContext -@ stub -arch=win64 __crtCapturePreviousContext +@ cdecl -arch=x86_64 -norelay __crtCapturePreviousContext(ptr) msvcr120.__crtCapturePreviousContext @ stub __crtCloseWinRTThreadHandle @ cdecl __crtCompareStringA(long long str long str long) msvcr120.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcr120.__crtCompareStringW diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 77c519d..9cd1939 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -798,4 +798,42 @@ int __cdecl _fpieee_flt(ULONG exception_code, EXCEPTION_POINTERS *ep, return EXCEPTION_CONTINUE_SEARCH; } +#if _MSVCR_VER>=110 && _MSVCR_VER<=120 +/********************************************************************* + * __crtCapturePreviousContext (MSVCR110.@) + */ +void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) +{ + ULONG64 frame, image_base; + RUNTIME_FUNCTION *rf; + void *data; + + TRACE("(%p)\n", ctx); + + ctx->Rip = rip; + ctx->Rsp += 3*8; /* Rip, Rcx, return address */ + + rf = RtlLookupFunctionEntry(ctx->Rip, &image_base, NULL); + if(!rf) { + FIXME("RtlLookupFunctionEntry failed\n"); + return; + } + + RtlVirtualUnwind(UNW_FLAG_NHANDLER, image_base, ctx->Rip, + rf, ctx, &data, &frame, NULL); +} + +__ASM_GLOBAL_FUNC( __crtCapturePreviousContext, + "pushq (%rsp)\n\t" /* save Rip */ + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + "pushq %rcx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + "call " __ASM_NAME("RtlCaptureContext") "\n\t" + "popq %rcx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + "popq %rdx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + "jmp " __ASM_NAME("get_prev_context") ); +#endif + #endif /* __x86_64__ */

1 0

Piotr Caban : msvcr110: Add __crtCaptureCurrentContext implementation.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: a2a258f4be957285c257e7d9c22131702af9949c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2a258f4be957285c257e7d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 21:02:31 2018 +0200 msvcr110: Add __crtCaptureCurrentContext implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 27b3508..1a04161 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -904,7 +904,7 @@ @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl __create_locale(long str) MSVCRT__create_locale -@ stub -arch=win64 __crtCaptureCurrentContext +@ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) ntdll.RtlCaptureContext @ stub -arch=win64 __crtCapturePreviousContext @ cdecl __crtCompareStringA(long long str long str long) @ stub -arch=i386,win64 __crtCompareStringEx diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 254040a..f65669c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -889,7 +889,7 @@ @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl __create_locale(long str) MSVCRT__create_locale -@ stub -arch=win64 __crtCaptureCurrentContext +@ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) ntdll.RtlCaptureContext @ stub -arch=win64 __crtCapturePreviousContext @ cdecl __crtCompareStringA(long long str long str long) @ stub -arch=i386,win64 __crtCompareStringEx diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 4739055..0ba1780 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -883,7 +883,7 @@ @ cdecl __clean_type_info_names_internal(ptr) msvcr120.__clean_type_info_names_internal @ cdecl -arch=i386 __control87_2(long long ptr ptr) msvcr120.__control87_2 @ cdecl __create_locale(long str) msvcr120.__create_locale -@ stub -arch=win64 __crtCaptureCurrentContext +@ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) msvcr120.__crtCaptureCurrentContext @ stub -arch=win64 __crtCapturePreviousContext @ stub __crtCloseWinRTThreadHandle @ cdecl __crtCompareStringA(long long str long str long) msvcr120.__crtCompareStringA

1 0

Dmitry Timoshkov : winspool.drv: Add A0, A1 and A2 paper sizes to generic.ppd.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: ba5fe9a31772c563a5cf2f1c9e36a6f0f6a35eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba5fe9a31772c563a5cf2f1c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 9 11:41:26 2018 +0800 winspool.drv: Add A0, A1 and A2 paper sizes to generic.ppd. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/generic.ppd | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/winspool.drv/generic.ppd b/dlls/winspool.drv/generic.ppd index b6e4628..9d63e2e 100644 --- a/dlls/winspool.drv/generic.ppd +++ b/dlls/winspool.drv/generic.ppd @@ -22,6 +22,9 @@ *UIConstraints: *PageSize Executive *InputSlot Envelope *UIConstraints: *PageSize Letter *InputSlot Envelope *UIConstraints: *PageSize Legal *InputSlot Envelope +*UIConstraints: *PageSize A0 *InputSlot Envelope +*UIConstraints: *PageSize A1 *InputSlot Envelope +*UIConstraints: *PageSize A2 *InputSlot Envelope *UIConstraints: *PageSize A3 *InputSlot Envelope *UIConstraints: *PageSize A4 *InputSlot Envelope *UIConstraints: *PageSize A5 *InputSlot Envelope @@ -33,6 +36,9 @@ *PageSize Letter/Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice" *PageSize Legal/Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice" *PageSize Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice" +*PageSize A0/A0: "<</PageSize[2384 3370]/ImagingBBox null>>setpagedevice" +*PageSize A1/A1: "<</PageSize[1684 2384]/ImagingBBox null>>setpagedevice" +*PageSize A2/A2: "<</PageSize[1191 1684]/ImagingBBox null>>setpagedevice" *PageSize A3/A3: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice" *PageSize A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice" *PageSize A5/A5: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice" @@ -50,6 +56,9 @@ *PageRegion Letter/Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice" *PageRegion Legal/Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice" *PageRegion Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice" +*PageRegion A0/A0: "<</PageSize[2384 3370]/ImagingBBox null>>setpagedevice" +*PageRegion A1/A1: "<</PageSize[1684 2384]/ImagingBBox null>>setpagedevice" +*PageRegion A2/A2: "<</PageSize[1191 1684]/ImagingBBox null>>setpagedevice" *PageRegion A3/A3: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice" *PageRegion A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice" *PageRegion A5/A5: "<</PageSize[421 595]/ImagingBBox null>>setpagedevice" @@ -65,6 +74,9 @@ *ImageableArea Letter/US Letter: "18 18 594 774" *ImageableArea Legal/US Legal: "18 18 594 990" *ImageableArea Executive/Executive: "18 18 504 738" +*ImageableArea A0/A0: "12 12 2372 3358" +*ImageableArea A1/A1: "12 12 1672 2372" +*ImageableArea A2/A2: "12 12 1179 1672" *ImageableArea A3/A3: "12 12 830 1179" *ImageableArea A4/A4: "18 18 577 824" *ImageableArea A5/A5: "18 36 403 559" @@ -79,6 +91,9 @@ *PaperDimension Letter/Letter: "612 792" *PaperDimension Legal/Legal: "612 1008" *PaperDimension Executive/Executive: "522 756" +*PaperDimension A0/A0: "2384 3370" +*PaperDimension A1/A1: "1684 2384" +*PaperDimension A2/A2: "1191 1684" *PaperDimension A3/A3: "842 1191" *PaperDimension A4/A4: "595 842" *PaperDimension A5/A5: "421 595"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 41c5607ea78128531163a8953d9eb055a99f0d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=41c5607ea78128531163a895… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Apr 6 08:22:07 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/po/lt.po b/po/lt.po index e26d136..bb3ed3d 100644 --- a/po/lt.po +++ b/po/lt.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: 2018-02-26 22:09+0300\n" +"PO-Revision-Date: 2018-04-06 08:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9105,70 +9105,59 @@ msgid "" msgstr "Yra mažiausiai viena nenustatyta saugumo problema su šiuo liudijimu." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Baigėsi tarnybos užklausos laikas.\n" +msgstr "Baigėsi užklausos laikas.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Įvyko spausdintuvo klaida." +msgstr "Įvyko vidinė klaida.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Neteisingas kelias.\n" +msgstr "Neteisingas URL.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL schema neatpažinta arba nepalaikoma.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Naudotojo vardas nerastas.\n" +msgstr "Nepavyko nustatyti serverio vardo.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Naudotojo profilis netinkamas.\n" +msgstr "Užklausta operacija netinkama.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Operacija nutraukta, paprastai todėl, kad rodyklė su kuria dirbo užklausa " +"buvo uždaryta prieš pasibaigiant operacijai.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Profilis nepridėtas.\n" +msgstr "Užklaustas elementas nerastas.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Nepavyko prisijungti prie LDAP serverio" +msgstr "Bandymas prisijungti prie serverio nepavyko.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Susijungimas su serveriu buvo nutrauktas.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"SSL liudijimo data gauta iš serverio yra bloga. Liudijimas nebegalioja.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL liudijimo vardas (serverio vardo laukas) neteisingas.\n" #: winmm.rc:32 msgid "The specified command was carried out." @@ -12949,7 +12938,7 @@ msgstr "" #: taskkill.rc:38 msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "Procesas, kurio PID %1!u!, priverstinai nutrauktas.\n" +msgstr "Procesas su PID %1!u! priverstinai nutrauktas.\n" #: taskkill.rc:39 msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 63c959199dac49e2a52d2b0c756da8e73ec2bb56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63c959199dac49e2a52d2b0c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 5 20:40:06 2018 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 2962631..6de3f87 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9097,70 +9097,60 @@ msgstr "" "Tässä varmenteessa on ainakin yksi määrittelemätön turvallisuusongelma." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Palvelupyyntö aikakatkaistu.\n" +msgstr "Pyyntö on aikakatkaistu.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Tulostinvirhe." +msgstr "On tapahtunut sisäinen virhe.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Polku on viallinen.\n" +msgstr "URL on viallinen.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL-skeemaa ei tunnistettu, tai sitä ei tueta.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Käyttäjänimeä ei löytynyt.\n" +msgstr "Palvelimen nimeä ei voitu jäsentää.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Käyttäjäprofiili on viallinen.\n" +msgstr "Pyydetty toimenpide ei kelpaa.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Toimenpide keskeytettiin. Tämä johtuu yleensä siitä, että pyynnön " +"käsittelemä kahva suljettiin ennen toimenpiteen valmistumista.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Profiilia ei voitu lisätä.\n" +msgstr "Pyydettyä kohdetta ei löytynyt.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Ei voida yhdistää LDAP-palvelimeen" +msgstr "Yritys yhdistää palvelimeen epäonnistui.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Yhteys palvelimeen on katkaistu.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"Palvelimen lähettämän SSL-sertifikaatin päiväys ei kelpaa. Sertifikaatti on " +"vanhentunut.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL-sertifikaatin yleinen nimi (CN, palvelimen nimi) ei kelpaa.\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Ivan Kalvachev : kernel32: Add DECL_HOTPATCH to OutputDebugString functions.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 7f359ea93e89de099ac6be15ca07a6ee16efdce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f359ea93e89de099ac6be15… Author: Ivan Kalvachev <ikalvachev(a)gmail.com> Date: Sat Apr 7 14:02:16 2018 +0300 kernel32: Add DECL_HOTPATCH to OutputDebugString functions. Some Microsoft debuggers hotpatch this function to get the debug output directly from the code they are tracing. Having the wrong function prologue leads to a crash. Signed-off-by: Ivan Kalvachev <ikalvachev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index a277f93..8e5af30 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -253,7 +253,7 @@ static LONG WINAPI debug_exception_handler( EXCEPTION_POINTERS *eptr ) * * Nothing. */ -void WINAPI OutputDebugStringA( LPCSTR str ) +void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str ) { static HANDLE DBWinMutex = NULL; static BOOL mutex_inited = FALSE; @@ -364,7 +364,7 @@ void WINAPI OutputDebugStringA( LPCSTR str ) * * Nothing. */ -void WINAPI OutputDebugStringW( LPCWSTR str ) +void WINAPI DECLSPEC_HOTPATCH OutputDebugStringW( LPCWSTR str ) { UNICODE_STRING strW; STRING strA;

1 0

Jacek Caban : advapi32: Initialize svcctl_GetNotifyResults output parameter to NULL.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 269dbdcfbf7b18cd32c059128319bae3aae1188f URL: https://source.winehq.org/git/wine.git/?a=commit;h=269dbdcfbf7b18cd32c05912… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 6 16:01:31 2018 +0200 advapi32: Initialize svcctl_GetNotifyResults output parameter to NULL. Otherwise rpcrt4 treats its uninitialized value as output buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 70907e1..c78edb2 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2637,7 +2637,7 @@ static DWORD WINAPI notify_thread(void *user) { DWORD err; notify_data *data = user; - SC_RPC_NOTIFY_PARAMS_LIST *list; + SC_RPC_NOTIFY_PARAMS_LIST *list = NULL; SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; BOOL dummy;

1 0

Louis Lenders : iexplore/iexplore.inf: Add svcVersion reg key and update to win7.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: add31e1d7a320a5f5a64bc1db8d2c0f62774cacc URL: https://source.winehq.org/git/wine.git/?a=commit;h=add31e1d7a320a5f5a64bc1d… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Apr 6 11:29:11 2018 +0200 iexplore/iexplore.inf: Add svcVersion reg key and update to win7. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/iexplore.inf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index 68c17e3..d8c5352 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -36,9 +36,10 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, [IE.Reg] -HKLM,"Software\Microsoft\Internet Explorer","Build",,"98112" -HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.0.8112.16421" -HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.0.8112.16421" +HKLM,"Software\Microsoft\Internet Explorer","Build",,"99600" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.11.9600.18376" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.11.9600.18376" +HKLM,"Software\Microsoft\Internet Explorer","svcVersion",,"11.0.9600.18376" [Strings]

1 0

Stefan Dösinger : ddraw: Don' t read past the end of the executebuffer.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: 02f7b097b42553a1886610be6aa84959d25e00b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f7b097b42553a1886610be… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 5 12:59:14 2018 +0200 ddraw: Don't read past the end of the executebuffer. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 10 ++-- dlls/ddraw/tests/ddraw1.c | 127 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 89d9ed3..b20b9ed 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -607,6 +607,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * struct wined3d_map_desc map_desc; struct wined3d_box box = {0}; HRESULT hr; + DWORD buf_size = buffer->desc.dwBufferSize, copy_size; TRACE("iface %p, data %p.\n", iface, data); @@ -662,7 +663,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * buffer->src_vertex_pos = 0; } - if (data->dwVertexCount) + if (data->dwVertexCount && (!buf_size || data->dwVertexOffset < buf_size)) { box.left = buffer->src_vertex_pos * sizeof(D3DVERTEX); box.right = box.left + data->dwVertexCount * sizeof(D3DVERTEX); @@ -670,8 +671,11 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * 0, &map_desc, &box, WINED3D_MAP_WRITE))) return hr; - memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, - data->dwVertexCount * sizeof(D3DVERTEX)); + copy_size = data->dwVertexCount * sizeof(D3DVERTEX); + if (buf_size) + copy_size = min(copy_size, buf_size - data->dwVertexOffset); + + memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, copy_size); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0); } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 626b07b..c63ddee 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11247,6 +11247,132 @@ static void test_enum_surfaces(void) IDirectDraw_Release(ddraw); } +static void test_execute_data(void) +{ + IDirect3DExecuteBuffer *execute_buffer; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DDevice *device; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + D3DEXECUTEDATA exec_data; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + memset(&exec_data, 0, sizeof(exec_data)); + + /* Success case. */ + exec_data.dwSize = sizeof(exec_data); + exec_data.dwVertexCount = 3; + exec_data.dwInstructionOffset = 3 * sizeof(D3DVERTEX); + exec_data.dwInstructionLength = 10; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + + /* dwSize is checked against the expected struct size. */ + exec_data.dwSize = sizeof(exec_data) - 1; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + exec_data.dwSize = sizeof(exec_data) + 1; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + /* The rest of the data is not checked for plausibility. */ + exec_data.dwSize = sizeof(exec_data); + exec_data.dwVertexCount = 0; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwVertexCount = exec_desc.dwBufferSize / sizeof(D3DVERTEX) - 1; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwVertexCount = exec_desc.dwBufferSize / sizeof(D3DVERTEX); + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwVertexCount = exec_desc.dwBufferSize / sizeof(D3DVERTEX) + 1; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwVertexCount = 999999; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwInstructionOffset = 999999 * sizeof(D3DVERTEX); + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwInstructionLength = 10240; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + + /* The input structure is not modified. */ + ok(exec_data.dwSize == sizeof(exec_data), "Got unexpected struct size %u\n", + exec_data.dwSize); + ok(exec_data.dwVertexCount == 999999, "Got unexpected vertex count %u\n", + exec_data.dwVertexCount); + ok(exec_data.dwInstructionOffset == 999999 * sizeof(D3DVERTEX), "Got unexpected instruction offset %u\n", + exec_data.dwInstructionOffset); + ok(exec_data.dwInstructionLength == 10240, "Got unexpected instruction length %u\n", + exec_data.dwInstructionLength); + + /* No validation in GetExecuteData. */ + memset(&exec_data, 0, sizeof(exec_data)); + exec_desc.dwSize = sizeof(exec_desc); + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + + ok(exec_data.dwSize == sizeof(exec_data), "Got unexpected struct size %u\n", + exec_data.dwSize); + ok(exec_data.dwVertexCount == 999999, "Got unexpected vertex count %u\n", + exec_data.dwVertexCount); + ok(exec_data.dwInstructionOffset == 999999 * sizeof(D3DVERTEX), "Got unexpected instruction offset %u\n", + exec_data.dwInstructionOffset); + ok(exec_data.dwInstructionLength == 10240, "Got unexpected instruction length %u\n", + exec_data.dwInstructionLength); + + memset(&exec_data, 0xaa, sizeof(exec_data)); + exec_desc.dwSize = sizeof(exec_desc) - 1; + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + ok(exec_data.dwSize == sizeof(exec_data), "Got unexpected struct size %u\n", + exec_data.dwSize); + ok(exec_data.dwVertexCount == 999999, "Got unexpected vertex count %u\n", + exec_data.dwVertexCount); + ok(exec_data.dwInstructionOffset == 999999 * sizeof(D3DVERTEX), "Got unexpected instruction offset %u\n", + exec_data.dwInstructionOffset); + ok(exec_data.dwInstructionLength == 10240, "Got unexpected instruction length %u\n", + exec_data.dwInstructionLength); + + exec_desc.dwSize = 0; + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + exec_desc.dwSize = sizeof(exec_desc) + 1; + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + exec_desc.dwSize = ~0U; + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + + IDirect3DExecuteBuffer_Release(execute_buffer); + IDirect3DDevice_Release(device); + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11348,4 +11474,5 @@ START_TEST(ddraw1) test_depth_readback(); test_clear(); test_enum_surfaces(); + test_execute_data(); }

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
55
Older →

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 April 2018