April 2016 - Wine-commits - list.winehq.org

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 23e945ffa9e85be44159d3f3a7c8cc6228adb8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e945ffa9e85be44159d3f3a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 20 20:41:38 2016 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 93 +++++++++++++++++----------------------------------------------- 1 file changed, 25 insertions(+), 68 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4201199..862c0dc 100644 --- a/po/uk.po +++ b/po/uk.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: 2015-11-20 13:01+0200\n" +"PO-Revision-Date: 2016-04-20 20:39+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -11656,111 +11656,82 @@ 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" #: reg.rc:48 regedit.rc:204 msgid "(Default)" -msgstr "(Стандартно)" +msgstr "(За замовчуванням)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Ви впевнені, що хочете видалити ці значення?" +msgstr "Ви впевнені, що хочете видалити значення реєстру '%1'?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Ви впевнені, що хочете видалити значення '%s'?" +msgstr "Ви впевнені, що хочете видалити всі значення реєстру в '%1'?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Ви впевнені, що хочете вилучити '%1'?" +msgstr "Ви впевнені, що хочете видалити ключ реєстру '%1'?" #: reg.rc:52 -#, 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 string\n" -msgstr "" -"uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n" +msgstr "reg: після параметра [/d] повинно бути вказано рядок\n" #: reg.rc:53 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: неможливо видалити всі значення реєстру в '%1'. Сталася неочікувана " +"помилка.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: неможливо завершити зазначену операцію. Сталася неочікувана помилка.\n" #: regedit.rc:34 msgid "&Registry" @@ -13268,7 +13239,7 @@ msgstr "&Нове заміщення для бібліотеки:" #: winecfg.rc:196 msgid "A&dd" -msgstr "" +msgstr "&Додати" #: winecfg.rc:197 msgid "Existing &overrides:" @@ -13295,8 +13266,6 @@ msgid "&Native (Windows)" msgstr "&Стороння (Windows)" #: winecfg.rc:211 -#, fuzzy -#| msgid "Bui&ltin then Native" msgid "Buil&tin then Native" msgstr "В&будована, потім стороння" @@ -13321,14 +13290,10 @@ msgstr "" "редагуватися." #: winecfg.rc:236 -#, fuzzy -#| msgid "&Add..." msgid "A&dd..." msgstr "&Додати..." #: winecfg.rc:238 -#, fuzzy -#| msgid "Autodetect" msgid "Aut&odetect" msgstr "Автовизначення" @@ -13337,10 +13302,8 @@ msgid "&Path:" msgstr "&Шлях:" #: winecfg.rc:248 winecfg.rc:38 -#, fuzzy -#| msgid "Show &Advanced" msgid "Show Advan&ced" -msgstr "Показати &Додаткове" +msgstr "Показати &додат. налаштування" #: winecfg.rc:249 msgid "De&vice:" @@ -13359,10 +13322,8 @@ msgid "S&erial:" msgstr "&Сер.ном:" #: winecfg.rc:258 -#, fuzzy -#| msgid "Show &dot files" msgid "&Show dot files" -msgstr "Показати &файли, що починаються з крапки" +msgstr "Показувати &файли, що починаються з крапки" #: winecfg.rc:265 msgid "Driver diagnostics" @@ -13441,10 +13402,8 @@ msgid "Select the Unix target directory, please." msgstr "Будь ласка, виберіть цільову теку Unix." #: winecfg.rc:37 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" -msgstr "Сховати &Додаткове" +msgstr "Сховати &додат. налаштування" #: winecfg.rc:39 msgid "(No Theme)" @@ -13905,12 +13864,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

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 076cb32d5304a5c8c3ac064481358e1b67241802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076cb32d5304a5c8c3ac06448… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Apr 21 00:54:16 2016 +0200 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index adbc019..0f42ced 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11768,7 +11768,8 @@ msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" #: reg.rc:52 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg : l'option [/d] doit être suivie d'un entier valide\n" +msgstr "" +"reg : l'option [/d] doit être suivie d'une chaîne de caractères valide\n" #: reg.rc:53 msgid ""

1 0

Henri Verbeet : wined3d: Avoid wined3d_resource_get_desc() on a surface in surface_convert_format().
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: a077c1f6698a9d6eebba2a8a7b8fa4567fd0bf1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a077c1f6698a9d6eebba2a8a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:09 2016 +0200 wined3d: Avoid wined3d_resource_get_desc() on a surface in surface_convert_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c32a1f7..162c932 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1561,6 +1561,7 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo static struct wined3d_texture *surface_convert_format(struct wined3d_texture *src_texture, unsigned int sub_resource_idx, const struct wined3d_format *dst_format) { + unsigned int texture_level = sub_resource_idx % src_texture->level_count; const struct wined3d_format *src_format = src_texture->resource.format; struct wined3d_device *device = src_texture->resource.device; const struct d3dfmt_converter_desc *conv = NULL; @@ -1578,11 +1579,16 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr } /* FIXME: Multisampled conversion? */ - wined3d_resource_get_desc(src_texture->sub_resources[sub_resource_idx].resource, &desc); desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; desc.format = dst_format->id; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; desc.usage = 0; desc.pool = WINED3D_POOL_SCRATCH; + desc.width = wined3d_texture_get_level_width(src_texture, texture_level); + desc.height = wined3d_texture_get_level_height(src_texture, texture_level); + desc.depth = 1; + desc.size = 0; if (FAILED(wined3d_texture_create(device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_DISCARD, NULL, NULL, &wined3d_null_parent_ops, &dst_texture)))

1 0

Henri Verbeet : wined3d: Implement surface_modify_ds_location() on top of the regular resource location management.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 2066e1a96216efcbd53ef7de70a193317952ca5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2066e1a96216efcbd53ef7de7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:10 2016 +0200 wined3d: Implement surface_modify_ds_location() on top of the regular resource location management. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 162c932..7a71193 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2606,19 +2606,16 @@ static void surface_depth_blt(const struct wined3d_surface *surface, struct wine void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) { - struct wined3d_texture_sub_resource *sub_resource; + struct wined3d_texture *texture = surface->container; + unsigned int sub_resource_idx; TRACE("surface %p, new location %#x, w %u, h %u.\n", surface, location, w, h); - sub_resource = surface_get_sub_resource(surface); - if (((sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) && !(location & WINED3D_LOCATION_TEXTURE_RGB)) - || (!(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - && (location & WINED3D_LOCATION_TEXTURE_RGB))) - wined3d_texture_set_dirty(surface->container); - + sub_resource_idx = surface_get_sub_resource_idx(surface); surface->ds_current_size.cx = w; surface->ds_current_size.cy = h; - sub_resource->locations = location; + wined3d_texture_validate_location(texture, sub_resource_idx, location); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~location); } /* Context activation is done by the caller. */

1 0

Henri Verbeet : wined3d: Evict system memory for complete textures.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: e6780a5e0518fcf02a1b25e20dd2ea4df110a130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6780a5e0518fcf02a1b25e20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:11 2016 +0200 wined3d: Evict system memory for complete textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 25 ------------------ dlls/wined3d/texture.c | 60 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/volume.c | 25 ------------------ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 55 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6780a5e0518fcf02a1b2…

1 0

Henri Verbeet : wined3d: Allocate system memory for complete textures.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 3b96ac290db1bca225ecfff4581e0969202007ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b96ac290db1bca225ecfff45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:12 2016 +0200 wined3d: Allocate system memory for complete textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 4 +-- dlls/d3d9/tests/device.c | 4 +-- dlls/wined3d/surface.c | 21 ++++++--------- dlls/wined3d/swapchain.c | 6 ++--- dlls/wined3d/texture.c | 60 ++++++++++++++++++++++++++++++------------ dlls/wined3d/volume.c | 22 +++++++--------- dlls/wined3d/wined3d_private.h | 2 ++ 7 files changed, 69 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b96ac290db1bca225ecf…

1 0

Henri Verbeet : wined3d: Don' t enumerate sub-resources in wined3d_device_reset().
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 58a1796d83cf52c8cbabd4b01380f06074f8577f URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a1796d83cf52c8cbabd4b01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:13 2016 +0200 wined3d: Don't enumerate sub-resources in wined3d_device_reset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 54 +++++++++++++++++------------------------- dlls/d3d9/device.c | 54 +++++++++++++++++------------------------- dlls/wined3d/context.c | 8 +++---- dlls/wined3d/device.c | 19 ++++++++------- dlls/wined3d/resource.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 15 ++++++++---- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 1 + 11 files changed, 77 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58a1796d83cf52c8cbabd…

1 0

Henri Verbeet : wined3d: Store sub-resource parents in struct wined3d_texture_sub_resource().
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 81b2ed4f0a111e4d0c9ee9d6d7772315d5cdda98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b2ed4f0a111e4d0c9ee9d6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:14 2016 +0200 wined3d: Store sub-resource parents in struct wined3d_texture_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 26 +++++++++++++------------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a5270c6..149b5e3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1423,17 +1423,19 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; + struct wined3d_texture_sub_resource *sub_resource; struct wined3d_surface *surface; unsigned int i; for (i = 0; i < sub_count; ++i) { - if ((surface = texture->sub_resources[i].u.surface)) + sub_resource = &texture->sub_resources[i]; + if ((surface = sub_resource->u.surface)) { TRACE("surface %p.\n", surface); wined3d_surface_cleanup(surface); - surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); + sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); } } HeapFree(GetProcessHeap(), 0, texture->sub_resources[0].u.surface); @@ -1937,7 +1939,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } if (FAILED(hr = device_parent->ops->surface_created(device_parent, - texture, idx, &parent, &parent_ops))) + texture, idx, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create surface parent, hr %#x.\n", hr); wined3d_surface_cleanup(surface); @@ -1945,10 +1947,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return hr; } - TRACE("parent %p, parent_ops %p.\n", parent, parent_ops); + TRACE("parent %p, parent_ops %p.\n", sub_resource->parent, sub_resource->parent_ops); - surface->resource.parent = parent; - surface->resource.parent_ops = parent_ops; TRACE("Created surface level %u, layer %u @ %p.\n", i, j, surface); if (((desc->usage & WINED3DUSAGE_OWNDC) || (device->wined3d->flags & WINED3D_NO3D)) @@ -2014,17 +2014,19 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; + struct wined3d_texture_sub_resource *sub_resource; struct wined3d_volume *volume; unsigned int i; for (i = 0; i < sub_count; ++i) { - if ((volume = texture->sub_resources[i].u.volume)) + sub_resource = &texture->sub_resources[i]; + if ((volume = sub_resource->u.volume)) { TRACE("volume %p.\n", volume); wined3d_volume_cleanup(volume); - volume->resource.parent_ops->wined3d_object_destroyed(volume->resource.parent); + sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); } } HeapFree(GetProcessHeap(), 0, texture->sub_resources[0].u.volume); @@ -2191,7 +2193,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct sub_resource->u.volume = volume; if (FAILED(hr = device_parent->ops->volume_created(device_parent, - texture, i, &parent, &parent_ops))) + texture, i, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); wined3d_volume_cleanup(volume); @@ -2201,8 +2203,6 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct TRACE("parent %p, parent_ops %p.\n", parent, parent_ops); - volume->resource.parent = parent; - volume->resource.parent_ops = parent_ops; TRACE("Created volume level %u @ %p.\n", i, volume); /* Calculate the next mipmap level. */ @@ -2377,7 +2377,7 @@ void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *tex return NULL; } - return texture->sub_resources[sub_resource_idx].resource->parent; + return texture->sub_resources[sub_resource_idx].parent; } void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, @@ -2393,7 +2393,7 @@ void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *textu return; } - texture->sub_resources[sub_resource_idx].resource->parent = parent; + texture->sub_resources[sub_resource_idx].parent = parent; } HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4417293..773dccf 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -69,7 +69,7 @@ void * CDECL wined3d_rendertarget_view_get_sub_resource_parent(const struct wine texture = texture_from_resource(view->resource); - return wined3d_resource_get_parent(texture->sub_resources[view->sub_resource_idx].resource); + return texture->sub_resources[view->sub_resource_idx].parent; } void CDECL wined3d_rendertarget_view_set_parent(struct wined3d_rendertarget_view *view, void *parent) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 351584e..7421368 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2500,6 +2500,10 @@ struct wined3d_texture struct wined3d_texture_sub_resource { struct wined3d_resource *resource; + + void *parent; + const struct wined3d_parent_ops *parent_ops; + union { struct wined3d_surface *surface;

1 0

Alexander Lakhin : user32: Send WM_CTLCOLOR* message only for visible buttons.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: bc3f40e21a4beaaabd2d865838bef99a3d12f908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3f40e21a4beaaabd2d86583… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Tue Apr 19 22:15:24 2016 +0200 user32: Send WM_CTLCOLOR* message only for visible buttons. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 53 ++++++++++++++++++++++++++----------------------- dlls/user32/tests/msg.c | 4 ++-- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index efd74f9..13fc746 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -385,31 +385,34 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_SETTEXT: { /* Clear an old text here as Windows does */ - HDC hdc = GetDC(hWnd); - HBRUSH hbrush; - RECT client, rc; - HWND parent = GetParent(hWnd); - UINT message = (btn_type == BS_PUSHBUTTON || - btn_type == BS_DEFPUSHBUTTON || - btn_type == BS_USERBUTTON || - btn_type == BS_OWNERDRAW) ? - WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; - - if (!parent) parent = hWnd; - hbrush = (HBRUSH)SendMessageW(parent, message, - (WPARAM)hdc, (LPARAM)hWnd); - if (!hbrush) /* did the app forget to call DefWindowProc ? */ - hbrush = (HBRUSH)DefWindowProcW(parent, message, - (WPARAM)hdc, (LPARAM)hWnd); - - GetClientRect(hWnd, &client); - rc = client; - BUTTON_CalcLabelRect(hWnd, hdc, &rc); - /* Clip by client rect bounds */ - if (rc.right > client.right) rc.right = client.right; - if (rc.bottom > client.bottom) rc.bottom = client.bottom; - FillRect(hdc, &rc, hbrush); - ReleaseDC(hWnd, hdc); + if (IsWindowVisible(hWnd)) + { + HDC hdc = GetDC(hWnd); + HBRUSH hbrush; + RECT client, rc; + HWND parent = GetParent(hWnd); + UINT message = (btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_USERBUTTON || + btn_type == BS_OWNERDRAW) ? + WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; + + if (!parent) parent = hWnd; + hbrush = (HBRUSH)SendMessageW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); + if (!hbrush) /* did the app forget to call DefWindowProc ? */ + hbrush = (HBRUSH)DefWindowProcW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); + + GetClientRect(hWnd, &client); + rc = client; + BUTTON_CalcLabelRect(hWnd, hdc, &rc); + /* Clip by client rect bounds */ + if (rc.right > client.right) rc.right = client.right; + if (rc.bottom > client.bottom) rc.bottom = client.bottom; + FillRect(hdc, &rc, hbrush); + ReleaseDC(hWnd, hdc); + } if (unicode) DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam ); else DefWindowProcA( hWnd, WM_SETTEXT, wParam, lParam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 046cfae..8ab6e15 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5938,7 +5938,7 @@ static void test_button_messages(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 2"); sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); - ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + ok_sequence(WmSetTextInvisibleSeq, desc, FALSE); ShowWindow(hwnd, SW_SHOW); ShowWindow(parent, SW_HIDE); @@ -5947,7 +5947,7 @@ static void test_button_messages(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 3"); sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); - ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + ok_sequence(WmSetTextInvisibleSeq, desc, FALSE); ShowWindow(parent, SW_SHOW); flush_events();

1 0

Hans Leidekker : jsproxy: Allow multiple calls to InternetInitializeAutoProxyDll.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: d4c9440f71434a0816dbdd5c7daa93f1fd10759b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c9440f71434a0816dbdd5c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 20 10:14:47 2016 +0200 jsproxy: Allow multiple calls to InternetInitializeAutoProxyDll. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 0399173..e277a0b 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -186,14 +186,16 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile EnterCriticalSection( &cs_jsproxy ); - if (global_script->text) + if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer) { - LeaveCriticalSection( &cs_jsproxy ); - return FALSE; + heap_free( global_script->text ); + if( (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; + } + else + { + heap_free( global_script->text ); + if ((global_script->text = load_script( tmpfile ))) ret = TRUE; } - if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer && - (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; - else if ((global_script->text = load_script( tmpfile ))) ret = TRUE; LeaveCriticalSection( &cs_jsproxy ); return ret;

1 0