February 2016 - Wine-Commits

Hugh McMaster : reg: Do not allow /v and /ve to be used together in the ' add' function.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: c0b26a649e43ea4fce9303cfdec5ef8fd8173964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b26a649e43ea4fce9303cfd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 10 22:23:15 2016 +1100 reg: Do not allow /v and /ve to be used together in the 'add' function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 322fa90..8578959 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -326,6 +326,12 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; } + if (value_name && value_empty) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) { output_message(STRING_INVALID_KEY);

1 0

Nikolay Sivov : dwrite: Use enum members for class testing, simplify reseting to NI before applying Nx rules.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: e17e6e42d1b2e162892cd9e8966dfdd67d7e7163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17e6e42d1b2e162892cd9e89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:10:48 2016 +0300 dwrite: Use enum members for class testing, simplify reseting to NI before applying Nx rules. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index abf3604..16ca25f 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -759,16 +759,18 @@ static void bidi_resolve_neutrals(IsolatedRun *run) /* Translate isolates into NI */ for (i = 0; i < run->length; i++) { - if (bidi_is_isolate(*run->item[i].class)) - *run->item[i].class = NI; - switch (*run->item[i].class) { case B: case S: - case WS: *run->item[i].class = NI; + case WS: + case FSI: + case LRI: + case RLI: + case PDI: *run->item[i].class = NI; } - ASSERT(*run->item[i].class < 5 || *run->item[i].class == BN); /* "Only NI, L, R, AN, EN and BN are allowed" */ + /* "Only NI, L, R, AN, EN and BN are allowed" */ + ASSERT(*run->item[i].class <= EN || *run->item[i].class == BN); } /* N0: Skipping bracketed pairs for now */ @@ -900,8 +902,8 @@ static void bidi_resolve_implicit(const UINT8 *classes, UINT8 *levels, int sos, if (classes[i] == BN) continue; - ASSERT(classes[i] > 0); /* "No Neutrals allowed to survive here." */ - ASSERT(classes[i] < 5); /* "Out of range." */ + ASSERT(classes[i] != ON); /* "No Neutrals allowed to survive here." */ + ASSERT(classes[i] <= EN); /* "Out of range." */ if (odd(levels[i]) && (classes[i] == L || classes[i] == EN || classes[i] == AN)) levels[i]++;

1 0

Sebastian Lackner : kernel32/tests: Disable Windows version dependent test for pcPriClassBase.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 748103663c6ec160c302f220c16fd53532689020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748103663c6ec160c302f220c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 08:58:28 2016 +0100 kernel32/tests: Disable Windows version dependent test for pcPriClassBase. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0beb9bf..2708072 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1129,7 +1129,7 @@ static void test_Toolhelp(void) okChildInt("Toolhelp", "th32DefaultHeapID", 0); okChildInt("Toolhelp", "th32ModuleID", 0); okChildInt("Toolhelp", "th32ParentProcessID", GetCurrentProcessId()); - todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + /* pcPriClassBase differs between Windows versions (either 6 or 8) */ okChildInt("Toolhelp", "dwFlags", 0); release_memory(); @@ -1200,7 +1200,7 @@ static void test_Toolhelp(void) okChildInt("Toolhelp", "th32DefaultHeapID", 0); okChildInt("Toolhelp", "th32ModuleID", 0); okChildInt("Toolhelp", "th32ParentProcessID", info.dwProcessId); - todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + /* pcPriClassBase differs between Windows versions (either 6 or 8) */ okChildInt("Toolhelp", "dwFlags", 0); release_memory();

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in texture3d_sub_resource_upload_data().
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: a945266d259c0e57e181a6b8ff7ccb04452fc429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a945266d259c0e57e181a6b8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:29:59 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in texture3d_sub_resource_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 06abb38..8b414a6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1167,7 +1167,7 @@ static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_reso struct wined3d_const_bo_address addr; unsigned int row_pitch, slice_pitch; - wined3d_volume_get_pitch(volume, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, &row_pitch, &slice_pitch); if (row_pitch != data->row_pitch || slice_pitch != data->slice_pitch) FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch);

1 0

Henri Verbeet : wined3d: Use wined3d_format_calculate_pitch() in surface_download_data().
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: a95524b8f3abfaa28fc21055d95d4a087a9b6d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95524b8f3abfaa28fc21055d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:29:57 2016 +0100 wined3d: Use wined3d_format_calculate_pitch() in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1860258..0444148 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1329,19 +1329,17 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else { - void *mem; + unsigned int src_row_pitch, src_slice_pitch, dst_pitch = 0; GLenum gl_format = format->glFormat; GLenum gl_type = format->glType; - int src_pitch = 0; - int dst_pitch = 0; + void *mem; if (surface->flags & SFLAG_NONPOW2) { - unsigned char alignment = surface->resource.device->surface_alignment; - src_pitch = format->byte_count * surface->pow2Width; dst_pitch = wined3d_surface_get_pitch(surface); - src_pitch = (src_pitch + alignment - 1) & ~(alignment - 1); - mem = HeapAlloc(GetProcessHeap(), 0, src_pitch * surface->pow2Height); + wined3d_format_calculate_pitch(format, surface->resource.device->surface_alignment, + surface->pow2Width, surface->pow2Height, &src_row_pitch, &src_slice_pitch); + mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); } else { @@ -1426,11 +1424,11 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * won't be released, and doesn't have to be re-read. */ src_data = mem; dst_data = data.addr; - TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); + TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_pitch); for (y = 0; y < surface->resource.height; ++y) { memcpy(dst_data, src_data, dst_pitch); - src_data += src_pitch; + src_data += src_row_pitch; dst_data += dst_pitch; }

1 0

Nikolay Sivov : gdi32: Fix otmfsSelection to have bold style set in case of bold simulation.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: c98f40e2272ca8aa20453ea307dca70124fccc8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98f40e2272ca8aa20453ea30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 9 22:43:10 2016 +0300 gdi32: Fix otmfsSelection to have bold style set in case of bold simulation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 ++ dlls/gdi32/tests/font.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1a488df..9fa520f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7850,6 +7850,8 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmfsSelection = pOS2->fsSelection; if (font->fake_italic) font->potm->otmfsSelection |= 1; + if (font->fake_bold) + font->potm->otmfsSelection |= 1 << 5; font->potm->otmfsType = pOS2->fsType; font->potm->otmsCharSlopeRise = pHori->caret_Slope_Rise; font->potm->otmsCharSlopeRun = pHori->caret_Slope_Run; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c56eb81..d1896a3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2144,9 +2144,22 @@ static void test_GetOutlineTextMetrics(void) LPSTR unset_ptr; UINT fsSelection; - /* check fsSelection field with oblique simulation */ + /* check fsSelection field with bold simulation */ memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Wingdings"); + lf.lfCharSet = SYMBOL_CHARSET; + + /* regular face */ + fsSelection = get_font_fsselection(&lf); + ok((fsSelection & (1 << 5)) == 0, "got 0x%x\n", fsSelection); + /* face with bold simulation */ + lf.lfWeight = FW_BOLD; + fsSelection = get_font_fsselection(&lf); + ok((fsSelection & (1 << 5)) != 0, "got 0x%x\n", fsSelection); + + /* check fsSelection field with oblique simulation */ + memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = -13; lf.lfWeight = FW_NORMAL;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 90eb26015ee60443711320cbe716c17e05b03b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90eb26015ee60443711320cbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 9 23:20:58 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 50 ++++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/po/ru.po b/po/ru.po index f2dd095..d5cf6f9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-01-26 15:30+0300\n" +"PO-Revision-Date: 2016-02-09 23:19+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11573,70 +11573,46 @@ msgid "The operation completed successfully\n" msgstr "Операция успешно завершена\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Ошибка: неправильное имя раздела\n" +msgstr "reg: неверное имя раздела\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Ошибка: неправильные параметры командной строки\n" +msgstr "reg: неверные параметры командной строки\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Ошибка: не удалось получить доступ к удалённому компьютеру\n" +msgstr "reg: не удалось получить доступ к удалённому компьютеру\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" -msgstr "Ошибка: не удалось найти указанный раздел реестра или значение\n" +msgstr "reg: не удалось найти указанный раздел реестра или значение\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Ошибка: тип не поддерживается\n" +msgstr "reg: тип данных [%1] не поддерживается\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"uninstaller: за опцией «--remove» должен следовать GUID идентификатор " -"приложения\n" +msgstr "reg: за опцией [/d] должно следовать целое число\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -"uninstaller: за опцией «--remove» должен следовать GUID идентификатор " -"приложения\n" +"reg: за опцией [/d] должно следовать число в шестнадцатеричном формате\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: тип данных не поддерживается [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Указанный файл уже существует. Вы хотите заменить его?" +msgstr "Значение «%1» уже существует. Вы хотите заменить его?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "Операция с реестром была отменена\n" #: regedit.rc:34 msgid "&Registry" @@ -13773,12 +13749,10 @@ msgid "Configuration error" msgstr "Ошибка настройки" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "Размер буфера экрана должен быть не менее буфера окна" +msgstr "Размер буфера экрана должен быть не меньше размера окна." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: daaf421ab5796752f28b111972aff1f1b9a9c70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaf421ab5796752f28b11197… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Feb 9 21:10:09 2016 +0200 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 | 75 ++++++++++++++++------------------------------------------------ 1 file changed, 18 insertions(+), 57 deletions(-) diff --git a/po/lt.po b/po/lt.po index d7b61f3..b7053e1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-12-23 17:35+0300\n" +"PO-Revision-Date: 2016-02-09 21:07+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" @@ -11578,68 +11578,45 @@ msgid "The operation completed successfully\n" msgstr "Operacija sėkmingai įvykdyta\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Klaida: Netinkamas rakto vardas\n" +msgstr "reg: Netinkamas rakto vardas\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Klaida: Netinkami komandos eilutės parametrai\n" +msgstr "reg: Netinkami komandos eilutės parametrai\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Klaida: Nepavyko prieiti prie nuotolinio kompiuterio\n" +msgstr "reg: Nepavyko prieiti prie nuotolinio kompiuterio\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" -msgstr "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" +msgstr "reg: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Klaida: Nepalaikomas tipas\n" +msgstr "reg: Nepalaikomas registro duomenų tipas [%1]\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"šalinimo programa: Už parametro „--remove“ privalo būti programos GUID\n" +msgstr "reg: Už parametro [/d] privalo būti tinkamas sveikasis skaičius\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" -"šalinimo programa: Už parametro „--remove“ privalo būti programos GUID\n" +msgstr "reg: Už parametro [/d] privalo būti tinkama šešioliktainė reikšmė\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: Neapdorojamas registro duomenų tipas [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Nurodytas failas jau egzistuoja. Ar norite jį perrašyti?" +msgstr "Registro reikšmė „%1“ jau egzistuoja. Ar norite ją perrašyti?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "Registro operacija buvo nutraukta\n" #: regedit.rc:34 msgid "&Registry" @@ -13093,8 +13070,6 @@ msgstr "" "atskirai." #: winecfg.rc:159 -#, fuzzy -#| msgid "&Add application..." msgid "Add appli&cation..." msgstr "&Pridėti programą..." @@ -13157,7 +13132,7 @@ msgstr "&Naujas nustelbimas bibliotekai:" #: winecfg.rc:196 msgid "A&dd" -msgstr "" +msgstr "&Pridėti" #: winecfg.rc:197 msgid "Existing &overrides:" @@ -13184,8 +13159,6 @@ msgid "&Native (Windows)" msgstr "&Sava („Windows“)" #: winecfg.rc:211 -#, fuzzy -#| msgid "Bui&ltin then Native" msgid "Buil&tin then Native" msgstr "Į&taisyta, po to sava" @@ -13210,26 +13183,20 @@ msgstr "" "redaguojama." #: winecfg.rc:236 -#, fuzzy -#| msgid "&Add..." msgid "A&dd..." -msgstr "&Pridėti..." +msgstr "Pri&dėti..." #: winecfg.rc:238 -#, fuzzy -#| msgid "Autodetect" msgid "Aut&odetect" -msgstr "Automatiškai aptikti" +msgstr "&Automatiškai aptikti" #: winecfg.rc:241 msgid "&Path:" msgstr "&Kelias:" #: winecfg.rc:248 winecfg.rc:38 -#, fuzzy -#| msgid "Show &Advanced" msgid "Show Advan&ced" -msgstr "Rodyti papil&domas" +msgstr "Rodyti papild&omas" #: winecfg.rc:249 msgid "De&vice:" @@ -13248,8 +13215,6 @@ msgid "S&erial:" msgstr "N&umeris:" #: winecfg.rc:258 -#, fuzzy -#| msgid "Show &dot files" msgid "&Show dot files" msgstr "Rodyti &failus su tašku" @@ -13330,10 +13295,8 @@ msgid "Select the Unix target directory, please." msgstr "Išrinkite Unix paskirties aplanką." #: winecfg.rc:37 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" -msgstr "Slėpti papil&domas" +msgstr "Slėpti papild&omas" #: winecfg.rc:39 msgid "(No Theme)" @@ -13794,12 +13757,10 @@ msgid "Configuration error" msgstr "Konfigūracijos klaida" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "Ekrano buferio dydis turi būti didesnis arba lygus lango buferiui" +msgstr "Ekrano buferio dydis turi būti didesnis arba lygus lango dydžiui." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0

Henri Verbeet : ddraw: Use the correct height when calculating the linear size in ddraw_surface_init ().
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: 1b106fe830debcd9a3e7924aef469d924d2254b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b106fe830debcd9a3e7924ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:29:55 2016 +0100 ddraw: Use the correct height when calculating the linear size in ddraw_surface_init(). This fixes a regression introduced by commit 7d45318aeac41e2efabb9ddfbf95ecbea103e67d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3286b97..ff2c85b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6292,10 +6292,15 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, if (format_is_compressed(&desc->u4.ddpfPixelFormat)) { + unsigned int texture_level, row_pitch; + + texture_level = desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP ? sub_resource_idx % desc->u2.dwMipMapCount : 0; + row_pitch = wined3d_surface_get_pitch(wined3d_surface); + if (desc->dwFlags & DDSD_LPSURFACE) desc->u1.dwLinearSize = ~0u; else - desc->u1.dwLinearSize = wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4); + desc->u1.dwLinearSize = row_pitch * ((max(1, desc->dwHeight >> texture_level) + 3) / 4); desc->dwFlags |= DDSD_LINEARSIZE; desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH); }

1 0

Henri Verbeet : wined3d: Handle slice pitch and alignment as well in wined3d_format_calculate_pitch ().
by Alexandre Julliard Feb. 10, 2016

Feb. 10, 2016

Module: wine Branch: master Commit: a0beaa4006b0261587204fdecc08ba0bd941567d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0beaa4006b0261587204fdec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:29:56 2016 +0100 wined3d: Handle slice pitch and alignment as well in wined3d_format_calculate_pitch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 +++++- dlls/wined3d/surface.c | 41 ++++++++++++++++------------------- dlls/wined3d/utils.c | 49 +++++++++++++++++++++--------------------- dlls/wined3d/volume.c | 22 ++----------------- dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 53 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0beaa4006b0261587204…

1 0