wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Francois Gouget : po: Fix some typography issues in the Croatian translation.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: edd7c82cb0aee4f06618c9f7f7e84e750348dced URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd7c82cb0aee4f06618c9f7f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 15:51:30 2013 +0200 po: Fix some typography issues in the Croatian translation. --- po/hr.po | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/po/hr.po b/po/hr.po index 86cdb3b..04009d1 100644 --- a/po/hr.po +++ b/po/hr.po @@ -716,11 +716,11 @@ msgstr "Sele&kcija" #: comdlg32.rc:383 msgid "&from:" -msgstr "&od" +msgstr "&od:" #: comdlg32.rc:384 msgid "&to:" -msgstr "&do" +msgstr "&do:" #: comdlg32.rc:410 winecfg.rc:286 msgid "Si&ze:" @@ -1358,7 +1358,7 @@ msgstr "Netscape CA URL za opoziv" #: crypt32.rc:64 msgid "Netscape Cert Renewal URL" -msgstr "Netscape URL za obnavljanje cert." +msgstr "Netscape URL za obnavljanje cert" #: crypt32.rc:65 msgid "Netscape CA Policy URL" @@ -4366,7 +4366,7 @@ msgstr "Primljena neispravna poruka za oportunističko zaključavanje.\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" -msgstr "Poruka 0x%1 nije pronađena u datoteci %2\n" +msgstr "Poruka 0x%1 nije pronađena u datoteci %2.\n" #: winerror.mc:971 msgid "Invalid address.\n" @@ -4898,7 +4898,7 @@ msgstr "Unos u dnevniku je izbrisan.\n" #: winerror.mc:1631 msgid "Invalid device name.\n" -msgstr "Neispravno ime uređaja\n" +msgstr "Neispravno ime uređaja.\n" #: winerror.mc:1636 msgid "Connection unavailable.\n" @@ -6697,7 +6697,7 @@ msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." msgstr "" -"Instalacijski paket se nije mogao otvoriti. Provjerite putanju datoteke i " +"Instalacijski paket se nije mogao otvoriti. Provjerite putanju datoteke i " "pokušajte ponovo." #: msi.rc:28 @@ -8899,7 +8899,7 @@ msgstr "&Naziv odredišne datoteke:" #: winspool.rc:28 msgid "The output file already exists. Click OK to overwrite." msgstr "" -"Odredišna datoteka već postoji. Kliknite na gumb 'U redu' kako bi je " +"Odredišna datoteka već postoji. Kliknite na gumb 'U redu' kako bi je " "zamjenili." #: winspool.rc:29 @@ -10777,7 +10777,7 @@ msgstr "Atributi grupe programa" #: progman.rc:153 msgid "&Group file:" -msgstr "Datoteka g&rupe" +msgstr "Datoteka g&rupe:" #: progman.rc:165 msgid "Program Attributes" @@ -10789,7 +10789,7 @@ msgstr "&Naredbena linija:" #: progman.rc:171 msgid "&Working directory:" -msgstr "Trenutni direktori&j" +msgstr "Trenutni direktori&j:" #: progman.rc:173 msgid "&Key combination:" @@ -12218,8 +12218,8 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine može imitirati različite verzije Windowsa za pojedini program. Ovaj " -"tab je povezan sa tabovima Biblioteke i Grafika kako bi dozvolio sistemske " +"Wine može imitirati različite verzije Windowsa za pojedini program. Ovaj tab " +"je povezan sa tabovima Biblioteke i Grafika kako bi dozvolio sistemske " "promjene ili za podešavanje aplikacija u tim istim tabovima." #: winecfg.rc:150 @@ -12381,19 +12381,19 @@ msgstr "Podrazumijevano" #: winecfg.rc:259 msgid "Output device:" -msgstr "Izlazni uređaj" +msgstr "Izlazni uređaj:" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "Izlazni uređaj za glas" +msgstr "Izlazni uređaj za glas:" #: winecfg.rc:261 msgid "Input device:" -msgstr "Ulazni uređaj" +msgstr "Ulazni uređaj:" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "Ulazni uređdaj za glas" +msgstr "Ulazni uređdaj za glas:" #: winecfg.rc:267 msgid "&Test Sound" @@ -12413,7 +12413,7 @@ msgstr "&Instaliraj temu..." #: winecfg.rc:282 msgid "It&em:" -msgstr "Stavka" +msgstr "Stavka:" #: winecfg.rc:284 msgid "C&olor:" @@ -12787,7 +12787,7 @@ msgstr "Povijest naredbi" #: wineconsole.rc:73 msgid "&Number of recalled commands:" -msgstr "Broj povučen&ih naredbi" +msgstr "Broj povučen&ih naredbi:" #: wineconsole.rc:76 msgid "&Remove doubles" @@ -12811,7 +12811,7 @@ msgstr "Tampon zona" #: wineconsole.rc:101 msgid "&Width:" -msgstr "&Širina" +msgstr "&Širina:" #: wineconsole.rc:104 msgid "&Height:" @@ -12823,7 +12823,7 @@ msgstr "Veličina rozora" #: wineconsole.rc:109 msgid "W&idth:" -msgstr "Š&irina" +msgstr "Š&irina:" #: wineconsole.rc:112 msgid "H&eight:" @@ -13022,7 +13022,7 @@ msgstr "&Otvori\tUnesi" #: winefile.rc:30 msgid "Re&name..." -msgstr "&Preimenuj" +msgstr "&Preimenuj..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" @@ -13183,7 +13183,7 @@ msgstr "Primjenjujem postavke fonta" #: winefile.rc:88 msgid "Error while selecting new font." -msgstr "Pogreška prilikom odabira novog fonta" +msgstr "Pogreška prilikom odabira novog fonta." #: winefile.rc:93 msgid "Wine File Manager" @@ -13437,11 +13437,11 @@ msgstr "" #: wmic.rc:26 msgid "Error: Alias not found\n" -msgstr "Greška: zamjensko ime nije pronađen.\n" +msgstr "Greška: Zamjensko ime nije pronađen\n" #: wmic.rc:27 msgid "Error: Invalid query\n" -msgstr "Error: Neispravan upit.\n" +msgstr "Error: Neispravan upit\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N" @@ -13924,5 +13924,5 @@ msgstr "" "[/D | /D:m-d-y] Kopiraj nove ili izmjenjene datoteke nakon određenog " "datuma.\n" "\t\tAko datum nije unesen, kopiraj samo ako je odredište starije\n" -"\t\tod izvora\n" +"\t\tod izvora.\n" "\n"

1 0

Francois Gouget : po: Fix the Esperanto hour abbreviation.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: 62dbee38764af61fffb3ab698b81a189d8288219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62dbee38764af61fffb3ab698… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 15:48:06 2013 +0200 po: Fix the Esperanto hour abbreviation. --- po/eo.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/eo.po b/po/eo.po index 4c95b5b..2693796 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8093,7 +8093,7 @@ msgstr "%d bajtoj" #: shlwapi.rc:28 msgctxt "time unit: hours" msgid " hr" -msgstr " hr" +msgstr " h" #: shlwapi.rc:29 msgctxt "time unit: minutes"

1 0

Francois Gouget : po: Translate some measurement units to Esperanto.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: d49fb7ec2f75cd7710ddd38457bbb160d38581f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49fb7ec2f75cd7710ddd3845… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 15:41:40 2013 +0200 po: Translate some measurement units to Esperanto. --- po/eo.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/eo.po b/po/eo.po index 4af4302..4c95b5b 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13073,17 +13073,17 @@ msgstr "" #: winefile.rc:115 msgctxt "unit kilobyte" msgid "kB" -msgstr "" +msgstr "kB" #: winefile.rc:116 msgctxt "unit megabyte" msgid "MB" -msgstr "" +msgstr "MB" #: winefile.rc:117 msgctxt "unit gigabyte" msgid "GB" -msgstr "" +msgstr "GB" #: winemine.rc:34 msgid "&Game" @@ -13571,7 +13571,7 @@ msgstr "Paĝoj" #: wordpad.rc:172 msgctxt "unit: centimeter" msgid "cm" -msgstr "" +msgstr "cm" #: wordpad.rc:173 msgctxt "unit: inch"

1 0

Nikolay Sivov : kernel32/tests: Some tests for activation context data structures.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: eaf2cce99fc7c4f27de6f1d5edd315b26196be53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf2cce99fc7c4f27de6f1d5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 10 23:32:03 2013 +0400 kernel32/tests: Some tests for activation context data structures. --- dlls/kernel32/tests/actctx.c | 82 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 74 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 3af6e63..b021a4d 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -693,10 +693,16 @@ static void test_create_fail(void) test_create_and_fail(manifest2, wrong_depmanifest1, 0 ); } +struct dllredirect_keyed_data +{ + ULONG size; + ULONG unk; + DWORD res[3]; +}; + static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid, int line) { ACTCTX_SECTION_KEYED_DATA data; - DWORD *p; BOOL ret; memset(&data, 0xfe, sizeof(data)); @@ -717,10 +723,19 @@ static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid ok_(__FILE__, line)(data.lpData != NULL, "data.lpData == NULL\n"); ok_(__FILE__, line)(data.ulLength == 20, "data.ulLength=%u\n", data.ulLength); - p = data.lpData; - if(ret && p) todo_wine { - ok_(__FILE__, line)(p[0] == 20 && p[1] == 2 && p[2] == 0 && p[3] == 0 && p[4] == 0, - "wrong data %u,%u,%u,%u,%u\n",p[0], p[1], p[2], p[3], p[4]); + if (data.lpData) + { + struct dllredirect_keyed_data *dlldata = (struct dllredirect_keyed_data*)data.lpData; +todo_wine + ok_(__FILE__, line)(dlldata->size == data.ulLength, "got wrong size %d\n", dlldata->size); + +if (dlldata->size == data.ulLength) +{ + ok_(__FILE__, line)(dlldata->unk == 2, "got wrong field value %d\n", dlldata->unk); + ok_(__FILE__, line)(dlldata->res[0] == 0, "got wrong res[0] value %d\n", dlldata->res[0]); + ok_(__FILE__, line)(dlldata->res[1] == 0, "got wrong res[1] value %d\n", dlldata->res[1]); + ok_(__FILE__, line)(dlldata->res[2] == 0, "got wrong res[2] value %d\n", dlldata->res[2]); +} } ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); @@ -763,8 +778,20 @@ static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid pReleaseActCtx(handle); } +struct wndclass_keyed_data +{ + DWORD size; + DWORD reserved; + DWORD classname_len; + DWORD classname_offset; + DWORD modulename_len; + DWORD modulename_offset; /* offset relative to section base */ + WCHAR strdata[1]; +}; + static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, int line) { + struct wndclass_keyed_data *wnddata; ACTCTX_SECTION_KEYED_DATA data; BOOL ret; @@ -781,16 +808,55 @@ static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, i return; } + wnddata = (struct wndclass_keyed_data*)data.lpData; + ok_(__FILE__, line)(data.cbSize == sizeof(data), "data.cbSize=%u\n", data.cbSize); ok_(__FILE__, line)(data.ulDataFormatVersion == 1, "data.ulDataFormatVersion=%u\n", data.ulDataFormatVersion); ok_(__FILE__, line)(data.lpData != NULL, "data.lpData == NULL\n"); - /* ok_(__FILE__, line)(data.ulLength == ??, "data.ulLength=%u\n", data.ulLength); */ +todo_wine + ok_(__FILE__, line)(wnddata->size == FIELD_OFFSET(struct wndclass_keyed_data, strdata), "got %d for header size\n", wnddata->size); + if (data.lpData && wnddata->size == FIELD_OFFSET(struct wndclass_keyed_data, strdata)) + { + static const WCHAR verW[] = {'6','.','5','.','4','.','3','!',0}; + WCHAR buff[50]; + WCHAR *ptr; + ULONG len; + + ok_(__FILE__, line)(wnddata->reserved == 0, "got reserved as %d\n", wnddata->reserved); + /* redirect class name (versioned or not) is stored just after header data */ + ok_(__FILE__, line)(wnddata->classname_offset == wnddata->size, "got name offset as %d\n", wnddata->classname_offset); + ok_(__FILE__, line)(wnddata->modulename_len > 0, "got module name length as %d\n", wnddata->modulename_len); + + /* expected versioned name */ + lstrcpyW(buff, verW); + lstrcatW(buff, clsname); + ptr = (WCHAR*)((BYTE*)wnddata + wnddata->size); + ok_(__FILE__, line)(!lstrcmpW(ptr, buff), "got wrong class name %s, expected %s\n", wine_dbgstr_w(ptr), wine_dbgstr_w(buff)); + ok_(__FILE__, line)(lstrlenW(ptr)*sizeof(WCHAR) == wnddata->classname_len, + "got wrong class name length %d, expected %d\n", wnddata->classname_len, lstrlenW(ptr)); + + /* data length is simply header length + string data length including nulls */ + len = wnddata->size + wnddata->classname_len + wnddata->modulename_len + 2*sizeof(WCHAR); + ok_(__FILE__, line)(data.ulLength == len, "got wrong data length %d, expected %d\n", data.ulLength, len); + + if (data.ulSectionTotalLength > wnddata->modulename_offset) + { + WCHAR *modulename, *sectionptr; + + /* just compare pointers */ + modulename = (WCHAR*)((BYTE*)wnddata + wnddata->size + wnddata->classname_len + sizeof(WCHAR)); + sectionptr = (WCHAR*)((BYTE*)data.lpSectionBase + wnddata->modulename_offset); + ok_(__FILE__, line)(modulename == sectionptr, "got wrong name offset %p, expected %p\n", sectionptr, modulename); + } + } + ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); ok_(__FILE__, line)(data.ulSectionGlobalDataLength == 0, "data.ulSectionGlobalDataLength=%u\n", data.ulSectionGlobalDataLength); ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); - /* ok_(__FILE__, line)(data.ulSectionTotalLength == 0, "data.ulSectionTotalLength=%u\n", - data.ulSectionTotalLength); FIXME */ +todo_wine + ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%u\n", + data.ulSectionTotalLength); ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", data.ulAssemblyRosterIndex, exid);

1 0

Stefan Leichter : mmdevapi/tests: Fix a crash when function IMMDevice_Activate fails.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: 55972526067ea6d9452aa2d46b7bfffe64d89752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55972526067ea6d9452aa2d46… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Jul 10 22:34:25 2013 +0200 mmdevapi/tests: Fix a crash when function IMMDevice_Activate fails. --- dlls/mmdevapi/tests/capture.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index feedfde..1873735 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -915,6 +915,8 @@ static void test_volume_dependence(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; hr = IAudioClient_GetMixFormat(ac, &fmt); ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr);

1 0

Andrew Eikum : winecoreaudio.drv: Fix copy-paste typo.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: 0746767d91dc3904b3920d99be9eedd9792994b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0746767d91dc3904b3920d99b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 10 15:00:31 2013 -0500 winecoreaudio.drv: Fix copy-paste typo. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 7264147..d4250a7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -429,7 +429,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, } *guids = HeapAlloc(GetProcessHeap(), 0, ndevices * sizeof(GUID)); - if(!*ids){ + if(!*guids){ HeapFree(GetProcessHeap(), 0, *ids); HeapFree(GetProcessHeap(), 0, devices); return E_OUTOFMEMORY;

1 0

Alexandre Julliard : fonts: Update fonts with a more recent fontforge.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: 80a17baf20da4620394f8832f6221edf45b7a0f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a17baf20da4620394f8832f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 15:29:19 2013 +0200 fonts: Update fonts with a more recent fontforge. --- fonts/courier.sfd | 3 +-- fonts/courier.ttf | Bin 18004 -> 17884 bytes fonts/fixedsys.sfd | 1 - fonts/fixedsys.ttf | Bin 10848 -> 10696 bytes fonts/fixedsys_jp.sfd | 2 +- fonts/fixedsys_jp.ttf | Bin 8596 -> 8716 bytes fonts/ms_sans_serif.sfd | 7 +++---- fonts/ms_sans_serif.ttf | Bin 38864 -> 38360 bytes fonts/small_fonts.sfd | 3 +-- fonts/small_fonts.ttf | Bin 18796 -> 18796 bytes fonts/small_fonts_jp.sfd | 1 - fonts/small_fonts_jp.ttf | Bin 9908 -> 9820 bytes fonts/symbol.sfd | 24 ++++++++++++------------ fonts/symbol.ttf | Bin 26040 -> 26040 bytes fonts/system.sfd | 5 ++--- fonts/system.ttf | Bin 29072 -> 28712 bytes fonts/tahoma.sfd | 2 +- fonts/tahoma.ttf | Bin 143904 -> 143628 bytes fonts/tahomabd.sfd | 4 ++-- fonts/tahomabd.ttf | Bin 135872 -> 135636 bytes 20 files changed, 23 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80a17baf20da4620394f8…

1 0

Alexandre Julliard : fonts: Add some missing Cyrillic glyphs to the Small font.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: 7983df22cfd97399575652e72c90203597a818a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7983df22cfd97399575652e72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 12:05:45 2013 +0200 fonts: Add some missing Cyrillic glyphs to the Small font. --- fonts/small_fonts.sfd | 162 ++++++++++++++++++++++++++++++++++++++++++++++++- fonts/small_fonts.ttf | Bin 18324 -> 18796 bytes 2 files changed, 161 insertions(+), 1 deletions(-) diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 1a179c0..0535f98 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -3941,8 +3941,136 @@ Width: 11 Flags: W LayerCount: 2 EndChar + +StartChar: afii10051 +Encoding: 1026 1026 497 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10060 +Encoding: 1035 1035 498 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10058 +Encoding: 1033 1033 499 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10059 +Encoding: 1034 1034 500 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10052 +Encoding: 1027 1027 501 +Width: 11 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10061 +Encoding: 1036 1036 502 +Width: 7 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni040D +Encoding: 1037 1037 503 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10145 +Encoding: 1039 1039 504 +Width: 7 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10099 +Encoding: 1106 1106 505 +Width: 5 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10108 +Encoding: 1115 1115 506 +Width: 5 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10106 +Encoding: 1113 1113 507 +Width: 6 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10107 +Encoding: 1114 1114 508 +Width: 6 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10109 +Encoding: 1116 1116 509 +Width: 5 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni045D +Encoding: 1117 1117 510 +Width: 5 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10100 +Encoding: 1107 1107 511 +Width: 4 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10193 +Encoding: 1119 1119 512 +Width: 4 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar EndChars -BitmapFont: 11 498 9 2 1 +BitmapFont: 11 514 9 2 1 BDFChar: 0 65 7 1 6 0 6 0JH$gG_C_M BDFChar: 1 33 2 1 1 0 6 @@ -4937,5 +5065,37 @@ BDFChar: 495 63742 3 1 2 0 8 5X7S"5X7S"J,fQL BDFChar: 496 63741 3 1 2 -2 8 J:N0#5_+B8J:N.M +BDFChar: 497 1026 8 0 6 -1 6 +p`M+C+sJ36 +BDFChar: 498 1035 8 0 6 0 6 +p`M[C+sJ32 +BDFChar: 499 1033 8 0 6 0 6 +E)9A9;Gs"b +BDFChar: 500 1034 8 0 6 0 6 +OH>S%P*2=8 +BDFChar: 501 1027 11 1 5 0 8 +&0UauJ:N0#J,fQL +BDFChar: 502 1036 7 1 5 0 8 +&0QdjTYR4^L]@DT +BDFChar: 503 1037 8 1 6 0 8 +5Tl#EPa%u>_uKc; +BDFChar: 504 1039 7 1 5 -2 6 +LkpkCLktgK+92BA +BDFChar: 505 1106 5 0 4 -1 6 +5i>IP84Z8_ +BDFChar: 506 1115 5 0 4 0 6 +5i>IP84Z8O +BDFChar: 507 1113 6 0 5 0 4 +E)9Y9QiI*d +BDFChar: 508 1114 6 1 5 0 4 +TV1eQYQ+Y' +BDFChar: 509 1116 5 1 4 0 6 ++@)$]^n?bh +BDFChar: 510 1117 5 1 4 0 6 +5Tl/MYgAI3 +BDFChar: 511 1107 4 1 3 0 6 ++@+k8J:N.M +BDFChar: 512 1119 4 1 3 -2 4 +TV.sNi'9O- EndBitmapFont EndSplineFont diff --git a/fonts/small_fonts.ttf b/fonts/small_fonts.ttf index 81af9bb..4b0b5ce 100644 Binary files a/fonts/small_fonts.ttf and b/fonts/small_fonts.ttf differ

1 0

Alexandre Julliard : fonts: Add some missing Cyrillic glyphs to the Courier font.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: 994f74fb46285130cc63784449176c748cfdfaaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=994f74fb46285130cc6378444… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 11:54:28 2013 +0200 fonts: Add some missing Cyrillic glyphs to the Courier font. --- fonts/courier.sfd | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/courier.ttf | Bin 17300 -> 18004 bytes 2 files changed, 213 insertions(+), 3 deletions(-) diff --git a/fonts/courier.sfd b/fonts/courier.sfd index 1178a34..1dc5eb2 100644 --- a/fonts/courier.sfd +++ b/fonts/courier.sfd @@ -3415,8 +3415,176 @@ VWidth: 0 Flags: W LayerCount: 2 EndChar + +StartChar: afii10051 +Encoding: 1026 1026 477 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10060 +Encoding: 1035 1035 478 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10058 +Encoding: 1033 1033 479 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10059 +Encoding: 1034 1034 480 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10145 +Encoding: 1039 1039 481 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10052 +Encoding: 1027 1027 482 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10061 +Encoding: 1036 1036 483 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni040D +Encoding: 1037 1037 484 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10054 +Encoding: 1029 1029 485 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10057 +Encoding: 1032 1032 486 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10100 +Encoding: 1107 1107 487 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10099 +Encoding: 1106 1106 488 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10108 +Encoding: 1115 1115 489 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10106 +Encoding: 1113 1113 490 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10107 +Encoding: 1114 1114 491 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10109 +Encoding: 1116 1116 492 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: uni045D +Encoding: 1117 1117 493 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10193 +Encoding: 1119 1119 494 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10102 +Encoding: 1109 1109 495 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii10105 +Encoding: 1112 1112 496 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: afii57636 +Encoding: 8362 8362 497 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar EndChars -BitmapFont: 13 478 11 2 1 +BitmapFont: 13 499 11 2 1 BDFChar: 0 32 8 0 0 0 0 z BDFChar: 1 33 8 4 4 0 8 @@ -4101,8 +4269,8 @@ BDFChar: 340 8249 8 3 5 0 4 +@(HB+92BA BDFChar: 341 8250 8 2 4 0 4 J3Y5BJ,fQL -BDFChar: 342 8364 8 0 5 -1 7 -*#oq<*#oq<)uos= +BDFChar: 342 8364 8 0 6 0 8 +*[3lI5l<kk*WQ0? BDFChar: 343 8482 8 0 7 6 8 qc-Jn BDFChar: 344 8470 8 0 7 0 8 @@ -4371,5 +4539,47 @@ BDFChar: 475 8204 8 11 11 0 0 z BDFChar: 476 8205 8 3 3 0 0 z +BDFChar: 477 1026 8 0 6 -1 8 +r1kGd1*RndEWc@B +BDFChar: 478 1035 8 0 7 0 8 +r1kGt+sJ3TG5qUC +BDFChar: 479 1033 8 0 7 0 8 +GUOsg/h&6K:&k7o +BDFChar: 480 1034 8 0 7 0 8 +lpsZ<IS!+&mJm4e +BDFChar: 481 1039 8 1 7 -2 8 +mR0H26psF2rX]V@ +BDFChar: 482 1027 8 2 7 0 10 +&0Um=5X7S"5X=6- +BDFChar: 483 1036 8 1 7 0 10 +#S?Dl85N\j84;kG +BDFChar: 484 1037 8 1 7 0 10 ++:uOd9N4tjA7Wsc +BDFChar: 485 1029 8 1 7 0 8 +I"Hm!HiaA$HiO-H +BDFChar: 486 1032 8 0 7 0 8 +%fue6!WjPi)uos= +BDFChar: 487 1107 8 2 6 0 8 +&0LuJ83fF*huE`W +BDFChar: 488 1106 8 1 6 -1 8 +^d-gC=Caffj9P_c +BDFChar: 489 1115 8 1 7 0 8 +^d-gCGXOqfmJm4e +BDFChar: 490 1113 8 0 7 0 5 +GUP0nWD3En +BDFChar: 491 1114 8 0 7 0 5 +lpuRs8aZQY +BDFChar: 492 1116 8 1 7 0 7 +&0T1f:iK+j +BDFChar: 493 1117 8 1 7 0 7 ++;!s/9N5Qb +BDFChar: 494 1119 8 1 7 -2 5 +mR0H27/d`/ +BDFChar: 495 1109 8 0 7 0 5 +5!_.45s>8K +BDFChar: 496 1112 8 0 5 -2 8 +"98Ea"9\i1"9^[a +BDFChar: 497 8362 8 1 7 0 6 +nqsHIWhQ'b EndBitmapFont EndSplineFont diff --git a/fonts/courier.ttf b/fonts/courier.ttf index 96753c6..a09407d 100644 Binary files a/fonts/courier.ttf and b/fonts/courier.ttf differ

1 0

Alexandre Julliard : fonts: Add some missing glyphs to the System Fixed fonts.
by Alexandre Julliard 11 Jul '13

11 Jul '13

Module: wine Branch: master Commit: eb29e639e579535009a4626fede64e3cf34e7009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb29e639e579535009a4626fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 23:52:43 2013 +0200 fonts: Add some missing glyphs to the System Fixed fonts. --- fonts/fixedsys.sfd | 38 +++---- fonts/fixedsys.ttf | Bin 10852 -> 10848 bytes fonts/fixedsys_jp.sfd | 294 +++++++++++++++++++++++++++++++++++++++++++++++-- fonts/fixedsys_jp.ttf | Bin 7704 -> 8596 bytes 4 files changed, 304 insertions(+), 28 deletions(-) diff --git a/fonts/fixedsys.sfd b/fonts/fixedsys.sfd index 7b8ddfe..c3706d7 100644 --- a/fonts/fixedsys.sfd +++ b/fonts/fixedsys.sfd @@ -11,15 +11,13 @@ UnderlineWidth: 50 Ascent: 12 Descent: 3 LayerCount: 2 -Layer: 0 0 "Back" 1 -Layer: 1 0 "Fore" 0 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 NeedsXUIDChange: 1 FSType: 8 OS2Version: 1 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 -CreationTime: 1360066805 -ModificationTime: 1360586676 PfmFamily: 49 TTFWeight: 400 TTFWidth: 5 @@ -2266,8 +2264,8 @@ BDFChar: 224 8364 8 1 6 1 10 r;?Kjr;?Kjr;6Np BDFChar: 225 8218 8 1 6 1 10 r;?Kjr;?Kjr;6Np -BDFChar: 226 402 8 1 6 1 10 -r;?Kjr;?Kjr;6Np +BDFChar: 226 402 8 2 5 0 9 +0OS;X?smAM@))aB BDFChar: 227 8222 8 1 6 1 10 r;?Kjr;?Kjr;6Np BDFChar: 228 8230 8 1 6 1 10 @@ -2280,16 +2278,16 @@ BDFChar: 231 710 8 1 6 1 10 r;?Kjr;?Kjr;6Np BDFChar: 232 8240 8 1 6 1 10 r;?Kjr;?Kjr;6Np -BDFChar: 233 352 8 1 6 1 10 -r;?Kjr;?Kjr;6Np +BDFChar: 233 352 8 1 7 0 11 +CcDEB`l;s;#0+Z1 BDFChar: 234 8249 8 1 6 1 10 r;?Kjr;?Kjr;6Np BDFChar: 235 8250 8 1 6 1 10 r;?Kjr;?Kjr;6Np -BDFChar: 236 338 8 1 6 1 10 -r;?Kjr;?Kjr;6Np -BDFChar: 237 381 8 1 6 1 10 -r;?Kjr;?Kjr;6Np +BDFChar: 236 338 8 0 7 0 8 +J'?-\ccjVW56(Z` +BDFChar: 237 381 8 1 7 0 10 +CcDFo"q2>&@)2aA BDFChar: 238 8216 8 1 6 1 10 r;?Kjr;?Kjr;6Np BDFChar: 239 8217 8 1 6 1 10 @@ -2308,13 +2306,13 @@ BDFChar: 245 732 8 1 6 1 10 r;?Kjr;?Kjr;6Np BDFChar: 246 8482 8 1 6 1 10 r;?Kjr;?Kjr;6Np -BDFChar: 247 353 8 1 6 1 10 -r;?Kjr;?Kjr;6Np -BDFChar: 248 339 8 1 6 1 10 -r;?Kjr;?Kjr;6Np -BDFChar: 249 382 8 1 6 1 10 -r;?Kjr;?Kjr;6Np -BDFChar: 250 376 8 1 6 1 10 -r;?Kjr;?Kjr;6Np +BDFChar: 247 353 8 1 6 0 9 +CcDE>b[<+Ab]j*f +BDFChar: 248 339 8 0 7 0 6 +IbWW6f\:iT +BDFChar: 249 382 8 1 6 0 9 +CcDFm$lC[+_#+04 +BDFChar: 250 376 8 1 6 0 11 +bfg(2bfn:U0JG17 EndBitmapFont EndSplineFont diff --git a/fonts/fixedsys.ttf b/fonts/fixedsys.ttf index 2a3350b..83348f0 100644 Binary files a/fonts/fixedsys.ttf and b/fonts/fixedsys.ttf differ diff --git a/fonts/fixedsys_jp.sfd b/fonts/fixedsys_jp.sfd index 35bd3c3..7a06a1e 100644 --- a/fonts/fixedsys_jp.sfd +++ b/fonts/fixedsys_jp.sfd @@ -11,15 +11,13 @@ UnderlineWidth: 0 Ascent: 16 Descent: 2 LayerCount: 2 -Layer: 0 0 "Back" 1 -Layer: 1 0 "Fore" 0 +Layer: 0 0 "Back" 1 +Layer: 1 0 "Fore" 0 XUID: [1021 516 2032022868 7388451] FSType: 8 OS2Version: 1 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 -CreationTime: 1360244595 -ModificationTime: 1366561299 PfmFamily: 49 TTFWeight: 400 TTFWidth: 5 @@ -49,12 +47,12 @@ NameList: Adobe Glyph List DisplaySize: 18 AntiAlias: 0 FitToEm: 1 -WinInfo: 64 16 6 +WinInfo: 0 32 17 OnlyBitmaps: 1 BeginPrivate: 0 EndPrivate TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65536 224 +BeginChars: 65536 252 StartChar: space Encoding: 32 32 0 @@ -1084,7 +1082,7 @@ StartChar: uni00A0 Encoding: 160 160 128 Width: 8 VWidth: 0 -Flags: HW +Flags: W LayerCount: 2 EndChar @@ -1847,8 +1845,232 @@ VWidth: 0 Flags: W LayerCount: 2 EndChar + +StartChar: OE +Encoding: 338 338 224 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: oe +Encoding: 339 339 225 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Scaron +Encoding: 352 352 226 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: scaron +Encoding: 353 353 227 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Ydieresis +Encoding: 376 376 228 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: longs +Encoding: 383 383 229 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Zcaron +Encoding: 381 381 230 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: zcaron +Encoding: 382 382 231 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: florin +Encoding: 402 402 232 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: circumflex +Encoding: 710 710 233 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: tilde +Encoding: 732 732 234 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: dagger +Encoding: 8224 8224 235 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: daggerdbl +Encoding: 8225 8225 236 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: quotesinglbase +Encoding: 8218 8218 237 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: quotedblbase +Encoding: 8222 8222 238 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: quotedblleft +Encoding: 8220 8220 239 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: quotedblright +Encoding: 8221 8221 240 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: quoteleft +Encoding: 8216 8216 241 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: quoteright +Encoding: 8217 8217 242 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: endash +Encoding: 8211 8211 243 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: emdash +Encoding: 8212 8212 244 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: bullet +Encoding: 8226 8226 245 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: ellipsis +Encoding: 8230 8230 246 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: perthousand +Encoding: 8240 8240 247 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: guilsinglleft +Encoding: 8249 8249 248 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: guilsinglright +Encoding: 8250 8250 249 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: Euro +Encoding: 8364 8364 250 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar + +StartChar: trademark +Encoding: 8482 8482 251 +Width: 8 +VWidth: 0 +Flags: W +LayerCount: 2 +EndChar EndChars -BitmapFont: 18 225 16 2 1 +BitmapFont: 18 252 16 2 1 BDFChar: 0 32 8 2 2 0 0 z BDFChar: 1 33 8 3 4 0 13 @@ -2297,5 +2519,61 @@ BDFChar: 222 254 8 1 6 -1 12 r;?Kjr;?Kjr;?Kjr;6Np BDFChar: 223 255 8 1 6 -1 12 r;?Kjr;?Kjr;?Kjr;6Np +BDFChar: 224 338 8 0 6 0 12 +IZTYQOIVDoOH>QcIK0?J +BDFChar: 225 339 8 0 6 0 6 +I$0YaOHOtk +BDFChar: 226 352 8 1 7 0 15 +-kHA<7"U"U0F.d_Jq?BM +BDFChar: 227 353 8 1 5 0 9 +:`oaWLk'FMLi<=o +BDFChar: 228 376 8 1 7 0 14 +-iejN6prFO-kHq$&.fBQ +BDFChar: 229 383 8 3 5 0 9 +@"<cXJ:N0#J:IV" +BDFChar: 230 381 8 1 7 0 15 +-kHCX!X&W3#S8+$5X9l! +BDFChar: 231 382 8 1 5 0 9 +:`oc5#S8+DJG9*E +BDFChar: 232 402 8 0 5 0 9 +$kNt0&.fBa&7>J< +BDFChar: 233 710 8 1 5 12 14 ++Adjo +BDFChar: 234 732 8 1 6 13 14 +A=*>s +BDFChar: 235 8224 8 1 5 1 14 ++<VdL+<^G%+<VdL+<UXa +BDFChar: 236 8225 8 1 5 1 14 ++<VdLp`L\%p`L\%+<UXa +BDFChar: 237 8218 8 2 3 0 2 +5X9i" +BDFChar: 238 8222 8 1 5 0 2 +84\gB +BDFChar: 239 8220 8 1 5 12 14 +OH<!5 +BDFChar: 240 8221 8 1 5 12 14 +84\gB +BDFChar: 241 8216 8 3 4 12 14 +J:Klb +BDFChar: 242 8217 8 2 3 12 14 +5X9i" +BDFChar: 243 8211 8 2 5 6 6 +n,NFg +BDFChar: 244 8212 8 1 6 6 6 +qu?]s +BDFChar: 245 8226 8 2 5 4 7 +@.<Yn +BDFChar: 246 8230 8 1 7 0 0 +OoPI^ +BDFChar: 247 8240 8 0 7 0 11 +7&6c[:_4a!<E5<A +BDFChar: 248 8249 8 2 5 0 6 +&0O5g5TgU< +BDFChar: 249 8250 8 2 5 0 6 +J3Y4g+@(GW +BDFChar: 250 8364 8 1 6 0 8 +3(/;lJG=X_2uipY +BDFChar: 251 8482 8 0 6 9 13 +l:srD8cShk EndBitmapFont EndSplineFont diff --git a/fonts/fixedsys_jp.ttf b/fonts/fixedsys_jp.ttf index 39f3755..6ae382e 100644 Binary files a/fonts/fixedsys_jp.ttf and b/fonts/fixedsys_jp.ttf differ

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
45
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 July 2013