February 2016 - Wine-commits

Hugh McMaster : reg: Do not allow combinations of /v, /ve or /va in the ' delete' function.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: c59e3eae3b0e3440a0b9d1774b11040899fc5db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59e3eae3b0e3440a0b9d1774… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 10 22:23:14 2016 +1100 reg: Do not allow combinations of /v, /ve or /va in the 'delete' function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 04256bc..322fa90 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -395,13 +395,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; } - if (value_name && value_empty) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - - if (value_empty && value_all) + if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) { output_message(STRING_INVALID_CMDLINE); return 1;

1 0

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

10 Feb '16

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

Hugh McMaster : reg/tests: Add tests for /v* flags.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: a2bdfbae396a5b7385558ffcdc4a00c9b64ea88e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2bdfbae396a5b7385558ffcd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 10 22:23:16 2016 +1100 reg/tests: Add tests for /v* flags. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4981bdd..d815d89 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -411,6 +411,23 @@ static void test_query(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } +static void test_v_flags(void) +{ + DWORD r; + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -422,4 +439,5 @@ START_TEST(reg) test_add(); test_delete(); test_query(); + test_v_flags(); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 10 Feb '16

10 Feb '16

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 10 Feb '16

10 Feb '16

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

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

10 Feb '16

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

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

10 Feb '16

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 10 Feb '16

10 Feb '16

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

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

10 Feb '16

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

Stefan Dösinger : wined3d: Introduce wined3d_texture_get_pitch().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 65c04ce0409d870bc42ef466027120388abdb83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c04ce0409d870bc42ef4660… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 9 21:29:58 2016 +0100 wined3d: Introduce wined3d_texture_get_pitch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 17 ++--------------- dlls/wined3d/texture.c | 25 ++++++++++++++++++++++++- dlls/wined3d/volume.c | 3 +-- dlls/wined3d/wined3d_private.h | 3 +++ 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0444148..bd8cf45 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1887,11 +1887,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (surface->container->row_pitch) - return surface->container->row_pitch; - - wined3d_format_calculate_pitch(surface->resource.format, surface->resource.device->surface_alignment, - surface->resource.width, surface->resource.height, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); TRACE("Returning %u.\n", row_pitch); @@ -1950,16 +1946,7 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struc surface->resource.format = texture_resource->format; surface->resource.multisample_type = texture_resource->multisample_type; surface->resource.multisample_quality = texture_resource->multisample_quality; - if (surface->container->row_pitch) - { - surface->resource.size = height * surface->container->row_pitch; - } - else - { - /* User memory surfaces don't have the regular surface alignment. */ - wined3d_format_calculate_pitch(texture_resource->format, 1, width, height, - &surface->container->row_pitch, &surface->resource.size); - } + surface->resource.size = surface->container->slice_pitch; /* The format might be changed to a format that needs conversion. * If the surface didn't use PBOs previously but could now, don't diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0a084de..06abb38 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -499,6 +499,24 @@ void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture) return texture->resource.parent; } +void wined3d_texture_get_pitch(const struct wined3d_texture *texture, + unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) +{ + const struct wined3d_resource *resource = &texture->resource; + unsigned int width = max(1, texture->resource.width >> level); + unsigned int height = max(1, texture->resource.height >> level); + + if (texture->row_pitch) + { + *row_pitch = texture->row_pitch; + *slice_pitch = texture->slice_pitch; + return; + } + + wined3d_format_calculate_pitch(resource->format, resource->device->surface_alignment, + width, height, row_pitch, slice_pitch); +} + DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) { DWORD old = texture->lod; @@ -645,7 +663,12 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.height = height; texture->user_memory = mem; - texture->row_pitch = pitch; + if ((texture->row_pitch = pitch)) + texture->slice_pitch = height * pitch; + else + /* User memory surfaces don't have the regular surface alignment. */ + wined3d_format_calculate_pitch(format, 1, width, height, + &texture->row_pitch, &texture->slice_pitch); return wined3d_surface_update_desc(surface, gl_info); } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 733b468..9931057 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -42,8 +42,7 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) { - wined3d_format_calculate_pitch(volume->resource.format, volume->resource.device->surface_alignment, - volume->resource.width, volume->resource.height, row_pitch, slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, row_pitch, slice_pitch); } /* This call just uploads data, the caller is responsible for binding the diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 443f763..470db1f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2366,6 +2366,7 @@ struct wined3d_texture void *user_memory; unsigned int row_pitch; + unsigned int slice_pitch; /* May only be accessed from the command stream worker thread. */ struct wined3d_texture_async @@ -2400,6 +2401,8 @@ void wined3d_texture_bind(struct wined3d_texture *texture, void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void wined3d_texture_get_pitch(const struct wined3d_texture *texture, + unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture,

1 0