wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Eric Pouech : dbghelp: Properly manage in dbghelp interfaces local variables and parameters that are constant .
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 083eca072d24a2b2b61632082de2e899f5af0f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=083eca072d24a2b2b61632082… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jun 7 21:50:46 2010 +0200 dbghelp: Properly manage in dbghelp interfaces local variables and parameters that are constant. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 1 + dlls/dbghelp/type.c | 32 +++++++++++++++++++++++++++++--- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index de764ae..f4c88a0 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -347,6 +347,7 @@ struct module_format struct module { + struct process* process; IMAGEHLP_MODULEW64 module; /* ANSI copy of module.ModuleName for efficiency */ char module_name[MAX_PATH]; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index e99bd7f..89422a9 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -142,6 +142,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, pool_init(&module->pool, 65536); + module->process = pcs; module->module.SizeOfStruct = sizeof(module->module); module->module.BaseOfImage = mod_addr; module->module.ImageSize = size; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 2ef4bb4..e933e19 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -803,9 +803,35 @@ BOOL symt_get_info(struct module* module, const struct symt* type, break; case TI_GET_VALUE: - if (type->tag != SymTagData || ((const struct symt_data*)type)->kind != DataIsConstant) - return FALSE; - X(VARIANT) = ((const struct symt_data*)type)->u.value; + if (type->tag != SymTagData) return FALSE; + switch (((const struct symt_data*)type)->kind) + { + case DataIsConstant: X(VARIANT) = ((const struct symt_data*)type)->u.value; break; + case DataIsLocal: + case DataIsParam: + { + struct location loc = ((const struct symt_data*)type)->u.var; + unsigned i; + struct module_format* modfmt; + + if (loc.kind < loc_user) return FALSE; + for (i = 0; i < DFI_LAST; i++) + { + modfmt = module->format_info[i]; + if (modfmt && modfmt->loc_compute) + { + modfmt->loc_compute(module->process, modfmt, + (const struct symt_function*)((const struct symt_data*)type)->container, &loc); + break; + } + } + if (loc.kind != loc_absolute) return FALSE; + X(VARIANT).n1.n2.vt = VT_UI4; /* FIXME */ + X(VARIANT).n1.n2.n3.uiVal = loc.offset; + } + break; + default: return FALSE; + } break; case TI_GET_CALLING_CONVENTION:

1 0

Eric Pouech : dbghelp: Ensure that local variables and parameter actually have a container.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 99a5488a18f5e334841103fdcfd5b49437409f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a5488a18f5e334841103fdc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jun 7 21:50:37 2010 +0200 dbghelp: Ensure that local variables and parameter actually have a container. --- dlls/dbghelp/symbol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0607278..b399b66 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -476,7 +476,7 @@ struct symt_data* symt_add_func_local(struct module* module, locsym->hash_elt.name = pool_strdup(&module->pool, name); locsym->hash_elt.next = NULL; locsym->kind = dt; - locsym->container = &block->symt; + locsym->container = block ? &block->symt : &func->symt; locsym->type = type; locsym->u.var = *loc; if (block)

1 0

Eric Pouech : dbghelp: In dwarf parser, properly handle array without size specified.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 8c7cc491abb7a7a31c7f87a02bd6550a1405c0ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7cc491abb7a7a31c7f87a02… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jun 7 21:48:36 2010 +0200 dbghelp: In dwarf parser, properly handle array without size specified. --- dlls/dbghelp/dwarf.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f3e2f12..6daf7d7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1122,14 +1122,17 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + ref_type = dwarf2_lookup_type(ctx, di); + if (!di->abbrev->have_child) { - FIXME("array without range information\n"); - return NULL; + /* fake an array with unknown size */ + /* FIXME: int4 even on 64bit machines??? */ + idx_type = ctx->symt_cache[sc_int4]; + min.u.uvalue = 0; + max.u.uvalue = -1; } - ref_type = dwarf2_lookup_type(ctx, di); - - for (i=0; i<vector_length(&di->children); i++) + else for (i = 0; i < vector_length(&di->children); i++) { child = *(dwarf2_debug_info_t**)vector_at(&di->children, i); switch (child->abbrev->tag)

1 0

Juan Lang : winhttp/tests: Skip tests when a connection fails.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: f3968fdf80fc15f12f8000640873b059adfd75ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3968fdf80fc15f12f8000640… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jun 7 13:41:40 2010 -0700 winhttp/tests: Skip tests when a connection fails. --- dlls/winhttp/tests/winhttp.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 26477ee..05c548c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -211,6 +211,11 @@ static void test_OpenRequest (void) ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("Connection failed, skipping.\n"); + goto done; + } ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); @@ -781,6 +786,11 @@ static void test_secure_connection(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("Connection failed, skipping.\n"); + goto cleanup; + } ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL);

1 0

Paul Vriens : resources: Fix some copy-paste mistakes in resource files.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 1edc58eae97ce56f83afeac109971af018b6c807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edc58eae97ce56f83afeac10… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 7 21:36:35 2010 +0200 resources: Fix some copy-paste mistakes in resource files. --- dlls/appwiz.cpl/It.rc | 2 +- dlls/appwiz.cpl/Pt.rc | 2 +- dlls/gphoto2.ds/gphoto2_Sv.rc | 2 +- dlls/hhctrl.ocx/Ko.rc | 2 +- dlls/localspl/spl_Sv.rc | 2 +- dlls/msrle32/msrle_Pl.rc | 2 +- dlls/oleacc/oleacc_Ko.rc | 2 +- dlls/shlwapi/shlwapi_Da.rc | 2 +- dlls/shlwapi/shlwapi_Pl.rc | 2 +- programs/cmd/It.rc | 2 +- programs/start/De.rc | 2 +- programs/uninstaller/Pl.rc | 2 +- programs/winecfg/Cs.rc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/appwiz.cpl/It.rc b/dlls/appwiz.cpl/It.rc index 7939f61..dd0299f 100644 --- a/dlls/appwiz.cpl/It.rc +++ b/dlls/appwiz.cpl/It.rc @@ -1,5 +1,5 @@ /* -* Add/Remove Programs English resources +* Add/Remove Programs Italian resources * * Copyright 2001-2002, 2008 Owen Rudge * Copyright 2009 Luca Bennati diff --git a/dlls/appwiz.cpl/Pt.rc b/dlls/appwiz.cpl/Pt.rc index 4abcb50..cf013cf 100644 --- a/dlls/appwiz.cpl/Pt.rc +++ b/dlls/appwiz.cpl/Pt.rc @@ -1,5 +1,5 @@ /* -* Add/Remove Programs English resources +* Add/Remove Programs Portuguese resources * * Copyright 2001-2002, 2008 Ricardo Filipe * diff --git a/dlls/gphoto2.ds/gphoto2_Sv.rc b/dlls/gphoto2.ds/gphoto2_Sv.rc index 1c3593b..d2e14a6 100644 --- a/dlls/gphoto2.ds/gphoto2_Sv.rc +++ b/dlls/gphoto2.ds/gphoto2_Sv.rc @@ -1,5 +1,5 @@ /* - * English resources for Twain + * Swedish resources for Twain * * Copyright 2007 Daniel Nylander * diff --git a/dlls/hhctrl.ocx/Ko.rc b/dlls/hhctrl.ocx/Ko.rc index 37831df..c641404 100644 --- a/dlls/hhctrl.ocx/Ko.rc +++ b/dlls/hhctrl.ocx/Ko.rc @@ -1,6 +1,6 @@ /* * HTML Help resources - * English Language Support + * Korean Language Support * * Copyright 2005 James Hawkins * Copyright 2005 YunSong Hwang diff --git a/dlls/localspl/spl_Sv.rc b/dlls/localspl/spl_Sv.rc index 2831da6..8839f34 100644 --- a/dlls/localspl/spl_Sv.rc +++ b/dlls/localspl/spl_Sv.rc @@ -1,5 +1,5 @@ /* - * English resources for localspl + * Swedish resources for localspl * * Copyright 2007 Daniel Nylander * diff --git a/dlls/msrle32/msrle_Pl.rc b/dlls/msrle32/msrle_Pl.rc index 9394da1..b5b233b 100644 --- a/dlls/msrle32/msrle_Pl.rc +++ b/dlls/msrle32/msrle_Pl.rc @@ -1,5 +1,5 @@ /* - * English resource file for MS-RLE + * Polish resource file for MS-RLE * * Copyright 2002 Michael Gnnewig * Copyright 2006 Mikolaj Zalewski diff --git a/dlls/oleacc/oleacc_Ko.rc b/dlls/oleacc/oleacc_Ko.rc index 919b8d4..7013875 100644 --- a/dlls/oleacc/oleacc_Ko.rc +++ b/dlls/oleacc/oleacc_Ko.rc @@ -1,5 +1,5 @@ /* - * English resources for oleacc + * Korean resources for oleacc * * Copyright 2008 Nikolay Sivov * Copyright 2008 YunSong Hwang diff --git a/dlls/shlwapi/shlwapi_Da.rc b/dlls/shlwapi/shlwapi_Da.rc index 3bb418d..d757692 100644 --- a/dlls/shlwapi/shlwapi_Da.rc +++ b/dlls/shlwapi/shlwapi_Da.rc @@ -1,5 +1,5 @@ /* - * English resources for shlwapi + * Danish resources for shlwapi * * Copyright 2008 Jens Albretsen * diff --git a/dlls/shlwapi/shlwapi_Pl.rc b/dlls/shlwapi/shlwapi_Pl.rc index 8a0032c..c5b6639 100644 --- a/dlls/shlwapi/shlwapi_Pl.rc +++ b/dlls/shlwapi/shlwapi_Pl.rc @@ -1,5 +1,5 @@ /* - * English resources for shlwapi + * Polish resources for shlwapi * * Copyright 2004 Jon Griffiths * Copyright 2006 Mikolaj Zalewski diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc index 8eb2a33..ecccebe 100644 --- a/programs/cmd/It.rc +++ b/programs/cmd/It.rc @@ -1,6 +1,6 @@ /* * Wine command prompt - * English Language Support + * Italian Language Support * * Copyright (C) 1999 D A Pickles * Copyright (C) 2009 Luca Bennati diff --git a/programs/start/De.rc b/programs/start/De.rc index af2058b..8b44b07 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -1,6 +1,6 @@ /* * Start - * English Language Support + * German Language Support * * Copyright 2003 Dan Kegel * Copyright 2004 Henning Gerhardt diff --git a/programs/uninstaller/Pl.rc b/programs/uninstaller/Pl.rc index 174759a..d719e49 100644 --- a/programs/uninstaller/Pl.rc +++ b/programs/uninstaller/Pl.rc @@ -1,5 +1,5 @@ /* - * Uninstaller (English Resources) + * Uninstaller (Polish Resources) * * Copyright 2005 Jonathan Ernst * Copyright 2006 Mikolaj Zalewski diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index f3116d7..196ba93 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -1,7 +1,7 @@ /* Hey, Emacs, open this file with -*- coding: cp1250 -*- * * WineCfg resources - * English Language Support + * Czech Language Support * * Copyright 2002 Jaco Greeff * Copyright 2003 Dimitrie O. Paun

1 0

Aurimas Fišeras : cmd: Update Lithuanian translation.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 3a119953fd714f138796457ea51098ce8a3bc5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a119953fd714f138796457ea… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jun 7 18:53:07 2010 +0300 cmd: Update Lithuanian translation. --- programs/cmd/Lt.rc | 61 ++++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/programs/cmd/Lt.rc b/programs/cmd/Lt.rc index 1a335fa..d3eccb9 100644 --- a/programs/cmd/Lt.rc +++ b/programs/cmd/Lt.rc @@ -2,7 +2,7 @@ * Wine command prompt * Lithuanian Language Support * - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2010 Aurimas Fišeras <aurimas(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,7 +28,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE { - WCMD_ATTRIB, "Informacija apie ATTRIB\n" + WCMD_ATTRIB, "ATTRIB parodo arba pakeičia DOS atributus.\n" WCMD_CALL, "CALL <komandųfailovardas> yra naudojama komandų failo viduje komandoms iš\n\ kito komandų failo vykdyti. Kai komandų failas egzistuoja, valdymas\n\ @@ -38,16 +38,17 @@ kviečiamai procedūrai.\n\ Numatytojo katalogo, aplinkos kintamųjų ir pan. pakeitimai atlikti\n\ iškviestoje procedūroje yra paveldimi kviečiančiosios procedūros.\n" - WCMD_CD, "Informacija apie CD\n" - WCMD_CHDIR, "Informacija apie CHDIR\n" + WCMD_CD, "CD <direktorija> yra trumpa CHDIR versija. Pakeičia dabartinį\n\ +numatytą katalogą.\n" + WCMD_CHDIR, "CHDIR <direktorija> pakeičia dabartinį numatytą katalogą.\n" - WCMD_CLS, "CLS išvalo pulto ekraną\n" + WCMD_CLS, "CLS išvalo pulto ekraną.\n" - WCMD_COPY, "Informacija apie COPY\n" - WCMD_CTTY, "Informacija apie CTTY\n" - WCMD_DATE, "Informacija apie DATE\n" - WCMD_DEL, "Informacija apie DEL\n" - WCMD_DIR, "Informacija apie DIR\n" + WCMD_COPY, "COPY <failas> kopijuoja failą.\n" + WCMD_CTTY, "CTTY pakeičia įvedimo/išvedimo įrenginį.\n" + WCMD_DATE, "DATE parodo arba pakeičia sistemos datą.\n" + WCMD_DEL, "DEL <failas> pašalina failą ar failų rinkinį.\n" + WCMD_DIR, "DIR parodo katalogo turinį.\n" WCMD_ECHO, "ECHO <eilutė> parodo <eilutę> dabartiniame terminale.\n\ @@ -59,7 +60,7 @@ ECHO OFF panaikina ankstesnės ECHO ON komandos veikimą (ECHO OFF yra\n\ numatyta). ECHO OFF komandos rodymo galima išvengti prieš ją pridedant\n\ simbolį @.\n" - WCMD_ERASE, "Informacija apie ERASE\n" + WCMD_ERASE, "ERASE <failas> pašalina failą ar failų rinkinį.\n" WCMD_FOR, "FOR komanda yra naudojama įvykdyti komandą kiekvienam failų aibės elementui.\n\ @@ -80,7 +81,8 @@ komandų failo vykdymą.\n\ \n\ GOTO neturi poveikio naudojant interaktyviai.\n" - WCMD_HELP, "Informacija apie HELP\n" + WCMD_HELP, "HELP <komanda> parodo trumpą informaciją apie komandą.\n\ +HELP be argumentų parodo visas įtaisytas CMD komandas.\n" WCMD_IF, "IF yra naudojama vykdyti komandą su sąlyga.\n\ @@ -98,8 +100,8 @@ Sintaksė: LABEL [diskas:]\n\ Komanda paklaus naujo tomo vardo duotam diskui.\n\ Parodyti disko tomo vardą galima su komanda VOL.\n" - WCMD_MD, "Informacija apie MD\n" - WCMD_MKDIR, "Informacija apie MKDIR\n" + WCMD_MD, "MD <vardas> yra trumpa MKDIR versija. Sukuria katalogą.\n" + WCMD_MKDIR, "MKDIR <vardas> sukuria katalogą.\n" WCMD_MOVE, "MOVE perkelia failą ar katalogą į naują failų sistemos vietą.\n\ \n\ @@ -144,16 +146,16 @@ dabartinio disko raidę) ir daugiau-už (>) simbolis.\n\ (Taip pat, kaip komanda PROMPT $p$g).\n\ \n\ Raginimas taip pat gali būti pakeistas keičiant PROMPT aplinkos kintamąjį,\n\ -taigi, komanda „SET PROMPT=tekstas“ turi tą patį efektą kaip „PROMPT tekstas“\n" +taigi, komanda „SET PROMPT=tekstas“ turi tą patį efektą kaip „PROMPT tekstas“.\n" WCMD_REM, "Komandos eilutė prasidedanti REM (ir tarpu) neatlieka jokio veiksmo\n\ ir todėl gali būti naudojama kaip komentaras komandų faile.\n" - WCMD_REN, "Informacija apie REN\n" - WCMD_RENAME, "Informacija apie RENAME\n" - WCMD_RD, "Informacija apie RD\n" - WCMD_RMDIR, "Informacija apie RMDIR\n" + WCMD_REN, "REN <failas> yra trumpa RENAME versija. Pervadina failą.\n" + WCMD_RENAME, "RENAME <failas> pervadina failą.\n" + WCMD_RD, "RD <katalogas> yra trumpa RMDIR versija. Pašalina katalogą.\n" + WCMD_RMDIR, "RMDIR <katalogas> pašalina katalogą.\n" WCMD_SET, "SET parodo ar pakeičia CMD aplinkos kintamuosius.\n\ @@ -174,12 +176,12 @@ aplinkos iš komandų interpretatoriaus.\n" WCMD_SHIFT, "SHIFT yra naudojamas komandų faile pašalinti vienam parametrui iš sąrašo\n\ -priekio, taip parametras 2 tampa parametru 1 ir t.t. Ši komanda neturi\n\ +priekio, taip parametras 2 tampa parametru 1 ir t. t. Ši komanda neturi\n\ jokio poveikio, kai kviečiama iš komandos eilutės.\n" - WCMD_TIME, "Informacija apie TIME\n" + WCMD_TIME, "TIME parodo arba nustato sistemos laiką.\n" - WCMD_TITLE, "Nustato CMD lango antraštę, sintaksė TITLE [tekstas]\n" + WCMD_TITLE, "Nustato CMD lango antraštę, sintaksė TITLE [tekstas].\n" WCMD_TYPE, "TYPE <failas> nukopijuoja <failą> į pulto įrenginį (arba kitur, jei\n\ @@ -189,16 +191,15 @@ nukreipta). Nėra tikrinama ar faile yra skaitomas tekstas.\n" "VERIFY yra naudojama nustatyti, išvalyti ar testuoti tikrinimo žymos bitą.\n\ Galimos formos yra:\n\ \n\ -VERIFY ON Nustatyti žymos bitą\n\ -VERIFY OFF Išvalyti žymos bitą\n\ -VERIFY Parodo ON arba OFF, kuris tinkamas.\n\ +VERIFY ON\tNustatyti žymos bitą\n\ +VERIFY OFF\tIšvalyti žymos bitą\n\ +VERIFY\t\tParodo ON arba OFF, kuris tinkamas.\n\ \n\ Tikrinimo žymos bitas neturi jokios funkcijos Wine.\n" - WCMD_VER, -"VER parodo dabar vykdomo CMD versiją\n" + WCMD_VER, "VER parodo dabar vykdomo CMD versiją.\n" - WCMD_VOL, "Informacija apie VOL\n" + WCMD_VOL, "VOL parodo disko įrenginio tomo vardą.\n" WCMD_PUSHD, "PUSHD <katalogas> išsaugo dabartinį katalogą į dėklą,\n\ o po to pakeičia dabartinį katalogą į nurodytą.\n" @@ -239,7 +240,7 @@ TYPE\t\tIšvesti tekstinio failo turinį\n\ VER\t\tParodyti dabartinę CMD versiją\n\ VOL\t\tParodyti tomo vardą\n\ EXIT\t\tUžveria CMD\n\n\ -Įveskite HELP <komanda> platesnei informacijai apie išvardintas komandas gauti\n" +Įveskite HELP <komanda> platesnei informacijai apie išvardintas komandas gauti.\n" WCMD_CONFIRM, "Ar tikrai" WCMD_YES, "T" @@ -263,7 +264,7 @@ EXIT\t\tUžveria CMD\n\n\ WCMD_READFAIL, "Nepavyko atverti „%s“\n" WCMD_CALLINSCRIPT, "Negalima iškviesti žymės esančios už komandos failo ribų\n" WCMD_ALL, "V" - WCMD_DELPROMPT, "%s, trinti" + WCMD_DELPROMPT, "%s, šalinti" WCMD_ECHOPROMPT, "ECHO yra %s\n" WCMD_VERIFYPROMPT, "VERIFY yra %s\n" WCMD_VERIFYERR, "VERIFY turi būti ON arba OFF\n";

1 0

André Hentschel : kernel32/tests: Add a test about unicode collation.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: b8ff44e627d96a5ecf718ca7261469b9646217e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ff44e627d96a5ecf718ca72… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 7 17:29:16 2010 +0200 kernel32/tests: Add a test about unicode collation. --- dlls/kernel32/tests/locale.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a462a14..f37d503 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1347,6 +1347,9 @@ static void test_CompareStringA(void) ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1); todo_wine ok(ret == CSTR_LESS_THAN, "\"#\" vs \".\" expected CSTR_LESS_THAN, got %d\n", ret); + ret = CompareStringA(lcid, NORM_IGNORECASE, "_", -1, ".", -1); + todo_wine ok(ret == CSTR_GREATER_THAN, "\"_\" vs \".\" expected CSTR_GREATER_THAN, got %d\n", ret); + ret = lstrcmpi("#", "."); todo_wine ok(ret == -1, "\"#\" vs \".\" expected -1, got %d\n", ret); }

1 0

Igor Paliychuk : oledlg: Add Ukrainian translations.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: cfff865a303736725a58ca580d71ae32834177b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfff865a303736725a58ca580… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Mon Jun 7 14:39:19 2010 +0300 oledlg: Add Ukrainian translations. --- dlls/oledlg/Makefile.in | 1 + dlls/oledlg/oledlg_Uk.rc | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 7b696bd..6f9a3bf 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -31,6 +31,7 @@ RC_SRCS = \ oledlg_Si.rc \ oledlg_Sv.rc \ oledlg_Tr.rc \ + oledlg_Uk.rc \ oledlg_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/oledlg/oledlg_Uk.rc b/dlls/oledlg/oledlg_Uk.rc new file mode 100644 index 0000000..2563ac2 --- /dev/null +++ b/dlls/oledlg/oledlg_Uk.rc @@ -0,0 +1,100 @@ +/* + * Copyright 2007 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Вставка об'єкта" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Тип об'єкта:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Скасувати",IDCANCEL,221,24,66,14 + GROUPBOX "Результат",IDC_RESULT,7,103,208,41 + CONTROL "Створити новий",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Створити елемент управління",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Створити з файла",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Додати елемент управління...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "У вигляді значка",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Огляд...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Файл:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Вставка в документ нового об'єкта типу %s" + IDS_RESULTFILEOBJDESC "Вставка в документ вмісту файла у вигляді об'єкта, що активізується за допомогою програми, що створила його." + IDS_BROWSE "Огляд" + IDS_NOTOLEMOD "Файл не є модулем управління OLE. Не вдається зареєструвати елемент управління OLE." + IDS_NOTOLEMODCAPTION "Додати елемент управління" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Спеціальна вставка" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Джерело:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "Вст&авити", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "&Зв'язати", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Як:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Скасувати", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Довідка", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&У вигляді значка", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "З&мінити значок...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Результат", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Вставка до документа вмісту буфера у форматі: %s." + IDS_PS_PASTE_OBJECT "Вставка до документа вмісту буфера, що дає змогу активувати об'єкт за допомогою %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Вставка до документа вмісту буфера, що дає змогу активувати об'єкт за допомогою %s. Об'єкт буде показано як значок." + IDS_PS_PASTE_LINK_DATA "Вставка до документа вмісту буфера у форматі: %s. Дані будуть зв'язані з вихідним файлом, що дасть змогу відображувати в документі внесені зміни." + IDS_PS_PASTE_LINK_OBJECT "Вставка до документа зображення вмісту буфера. Зображення буде зв'язане з вихідним файлом, що дасть змогу відображувати в документі внесені зміни." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Вставка до документа ярлика, який указує на джерело вмісту буфера. Ярлик буде зв'язаний із вихідним файлом, що дасть змогу відображувати в документі внесені зміни." + IDS_PS_NON_OLE "Вставка вмісту буфера до документа." + IDS_PS_UNKNOWN_TYPE "Невідомий тип" + IDS_PS_UNKNOWN_SRC "Невідоме джерело" + IDS_PS_UNKNOWN_APP "програми, яка його створила" +}

1 0

Igor Paliychuk : winhlp32: Add Ukrainian translations.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: bdd1ddd16bfaa7a5894490ef7113cb6c1a1c0618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd1ddd16bfaa7a5894490ef7… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Mon Jun 7 14:41:47 2010 +0300 winhlp32: Add Ukrainian translations. --- programs/winhlp32/Makefile.in | 1 + programs/winhlp32/Uk.rc | 202 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index 039c065..48e96bf 100644 --- a/programs/winhlp32/Makefile.in +++ b/programs/winhlp32/Makefile.in @@ -44,6 +44,7 @@ RC_SRCS = \ Sk.rc \ Sv.rc \ Tr.rc \ + Uk.rc \ Wa.rc \ Zh.rc \ rsrc.rc diff --git a/programs/winhlp32/Uk.rc b/programs/winhlp32/Uk.rc new file mode 100644 index 0000000..bf026b0 --- /dev/null +++ b/programs/winhlp32/Uk.rc @@ -0,0 +1,202 @@ +/* + * Help Viewer + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * + * Ukrainian language support + * + * Copyright (C) 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winhelp_res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +/* Menu */ + +MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +{ + POPUP "&Файл" { + MENUITEM "&Відкрити", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Друк", MNID_FILE_PRINT + MENUITEM "Налаштування &принтера...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "В&ихід", MNID_FILE_EXIT + } + POPUP "&Правка" { + MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE + } + POPUP "&Закладка" { + MENUITEM "&Define...", MNID_BKMK_DEFINE + } + POPUP "&Налаштування" { + POPUP "Help always visible" + BEGIN + MENUITEM "За замовчуванням", MNID_OPTS_HELP_DEFAULT + MENUITEM "Видимий", MNID_OPTS_HELP_VISIBLE + MENUITEM "Невидимий", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "Історія", MNID_OPTS_HISTORY + POPUP "Шрифти" + BEGIN + MENUITEM "Малий", MNID_OPTS_FONTS_SMALL + MENUITEM "Нормальний", MNID_OPTS_FONTS_NORMAL + MENUITEM "Великий", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Використати системні кольори", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Довідка" { + MENUITEM "Help &on help", MNID_HELP_HELPON + MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Інформація...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&Про Wine", MNID_HELP_WINE +#endif + } +} + +MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL +{ + POPUP "&Файл" { + MENUITEM "&Відкрити", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Друк", MNID_FILE_PRINT + MENUITEM "Налаштування &принтера...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "В&ихід", MNID_FILE_EXIT + } + POPUP "&Правка" { + MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE + } + POPUP "&Закладка" { + MENUITEM "&Define...", MNID_BKMK_DEFINE + } + POPUP "&Налаштування" { + POPUP "Help always visible" + BEGIN + MENUITEM "За замовчуванням", MNID_OPTS_HELP_DEFAULT + MENUITEM "Видимий", MNID_OPTS_HELP_VISIBLE + MENUITEM "Невидимий", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "Історія", MNID_OPTS_HISTORY + POPUP "Шрифти" + BEGIN + MENUITEM "Малий", MNID_OPTS_FONTS_SMALL + MENUITEM "Нормальний", MNID_OPTS_FONTS_NORMAL + MENUITEM "Великий", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Використати системні кольори", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Довідка" { + MENUITEM "Help &on help", MNID_HELP_HELPON + MENUITEM "Завжди &зверху", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Інформація...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&Про Wine", MNID_HELP_WINE +#endif + } +} + +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Search" +{ + LTEXT "Ще не впроваджено", -1, 10, 10, 180, 150 +} + +/* Strings */ +STRINGTABLE DISCARDABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "Довідка Wine" +STID_WHERROR, "ПОМИЛКА" +STID_WARNING, "УВАГА" +STID_INFO, "Інформація" +STID_NOT_IMPLEMENTED, "Не впроваджено" +STID_HLPFILE_ERROR_s, "Помилка читання файлу довідки `%s'" +STID_INDEX, "&Index" +STID_CONTENTS, "Summary" +STID_BACK, "&Назад" +STID_ALL_FILES, "Всі файли (*.*)" +STID_HELP_FILES_HLP, "Файли довідки (*.hlp)" +STID_FILE_NOT_FOUND_s "Не можу знайти '%s'. Хочете знайти цей файл самотужки?" +STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_PSH_INDEX, "Розділи Довідки: " +} + +CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +BEGIN + POPUP "" + BEGIN + MENUITEM "Annotation...", MNID_CTXT_ANNOTATE + MENUITEM "Копіювати", MNID_CTXT_COPY + MENUITEM "Друк...", MNID_CTXT_PRINT + POPUP "Шрифти" + BEGIN + MENUITEM "Малий", MNID_CTXT_FONTS_SMALL + MENUITEM "Нормальний", MNID_CTXT_FONTS_NORMAL + MENUITEM "Великий", MNID_CTXT_FONTS_LARGE + END + POPUP "Довідка завжди видима" + BEGIN + MENUITEM "За замовчуванням", MNID_CTXT_HELP_DEFAULT + MENUITEM "Видима", MNID_CTXT_HELP_VISIBLE + MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Використати системні кольори", MNID_CTXT_SYSTEM_COLORS + END +END + +CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Annotation...", MNID_CTXT_ANNOTATE + MENUITEM "Копіювати", MNID_CTXT_COPY + MENUITEM "Друк...", MNID_CTXT_PRINT + POPUP "Шрифти" + BEGIN + MENUITEM "Малий", MNID_CTXT_FONTS_SMALL + MENUITEM "Нормальний", MNID_CTXT_FONTS_NORMAL + MENUITEM "Великий", MNID_CTXT_FONTS_LARGE + END + POPUP "Довідка завжди видима" + BEGIN + MENUITEM "За замовчуванням", MNID_CTXT_HELP_DEFAULT + MENUITEM "Видима", MNID_CTXT_HELP_VISIBLE + MENUITEM "Невидима", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Використати ситемні кольори", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Alexandre Julliard : krnl386: Load gdi.exe and user. exe also when initializing universal thunks.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: a8c4edc8dc3a92d63b034ef7699927928f695e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c4edc8dc3a92d63b034ef76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 8 12:46:28 2010 +0200 krnl386: Load gdi.exe and user.exe also when initializing universal thunks. --- dlls/krnl386.exe16/utthunk.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/utthunk.c b/dlls/krnl386.exe16/utthunk.c index a1889fa..a21342e 100644 --- a/dlls/krnl386.exe16/utthunk.c +++ b/dlls/krnl386.exe16/utthunk.c @@ -241,6 +241,14 @@ BOOL WINAPI UTRegister( HMODULE hModule, LPSTR lpsz16BITDLL, UTINFO *ut; HMODULE16 hModule16; FARPROC16 target16, init16; + static int done; + + if (!done) + { + LoadLibrary16( "gdi.exe" ); + LoadLibrary16( "user.exe" ); + done = TRUE; + } /* Load 16-bit DLL and get UTProc16 entry point */

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
67
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 June 2010