February 2016 - Wine-Commits

Henri Verbeet : ddraw: Use wined3d_texture_get_sub_resource() in ddraw_surface7_Flip().
by Alexandre Julliard Feb. 5, 2016

Feb. 5, 2016

Module: wine Branch: master Commit: b1709522307a160a7c151f5293095a3c26ab998f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1709522307a160a7c151f529… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 21:56:33 2016 +0100 ddraw: Use wined3d_texture_get_sub_resource() in ddraw_surface7_Flip(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 +++--- dlls/wined3d/surface.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a6fbceb..f1ba858 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1268,7 +1268,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; - wined3d_resource_set_parent(wined3d_surface_get_resource(src_impl->wined3d_surface), dst_impl); + wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); @@ -1300,7 +1300,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; - wined3d_resource_set_parent(wined3d_surface_get_resource(src_impl->wined3d_surface), dst_impl); + wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); @@ -1318,7 +1318,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, tmp_rtv, FALSE); wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); src_impl->wined3d_rtv = tmp_rtv; - wined3d_resource_set_parent(wined3d_surface_get_resource(tmp), src_impl); + wined3d_resource_set_parent(wined3d_texture_get_sub_resource(texture, 0), src_impl); src_impl->wined3d_surface = tmp; wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e6c6258..2a36619 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1890,13 +1890,6 @@ void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) return surface->resource.parent; } -struct wined3d_resource * CDECL wined3d_surface_get_resource(struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - return &surface->resource; -} - DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) { unsigned int alignment; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ba25f9d..8df2d37 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -224,7 +224,6 @@ @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) -@ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1e91397..9d7ecb7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2476,7 +2476,6 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); -struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx);

1 0

Alexandre Julliard : server: Use the link_name operation to create named objects.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: b21a3240705fdaf9f70a0eb1d2ff4736efcd35c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21a3240705fdaf9f70a0eb1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 21:08:02 2016 +0900 server: Use the link_name operation to create named objects. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 1 - server/completion.c | 4 +-- server/device.c | 4 +-- server/directory.c | 32 ++++++++++++-------- server/event.c | 8 ++--- server/mailslot.c | 36 +++++++++++++--------- server/mapping.c | 4 +-- server/mutex.c | 4 +-- server/named_pipe.c | 33 ++++++++++++-------- server/object.c | 84 +++++++++++++++++++++++++-------------------------- server/object.h | 18 +++++++++-- server/process.c | 4 +-- server/semaphore.c | 4 +-- server/symlink.c | 4 +-- server/timer.c | 4 +-- server/winstation.c | 36 ++++++++++++++-------- 16 files changed, 161 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b21a3240705fdaf9f70a0…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: f6e740cc6a944e835361648685701b280e7cd3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e740cc6a944e83536164868… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 4 12:51:21 2016 +0100 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 | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/po/fr.po b/po/fr.po index f51556d..3223881 100644 --- a/po/fr.po +++ b/po/fr.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-12-26 15:07+0100\n" +"PO-Revision-Date: 2016-04-02 12:50+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -1045,7 +1045,7 @@ msgstr "Sélectionnez un dossier" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "La taille de police doit être un nombre." #: comdlg32.rc:83 oleview.rc:98 msgid "Ready" @@ -13196,10 +13196,8 @@ msgstr "" "onglets." #: winecfg.rc:159 -#, fuzzy -#| msgid "&Add application..." msgid "Add appli&cation..." -msgstr "&Ajouter une application..." +msgstr "Ajouter une appli&cation..." #: winecfg.rc:160 msgid "&Remove application" @@ -13262,7 +13260,7 @@ msgstr "&Nouveau remplacement pour :" #: winecfg.rc:196 msgid "A&dd" -msgstr "" +msgstr "Ajou&ter" #: winecfg.rc:197 msgid "Existing &overrides:" @@ -13289,8 +13287,6 @@ msgid "&Native (Windows)" msgstr "&native (Windows)" #: winecfg.rc:211 -#, fuzzy -#| msgid "Bui&ltin then Native" msgid "Buil&tin then Native" msgstr "i&ntégrée puis native" @@ -13315,30 +13311,24 @@ msgstr "" "n'a pu être éditée." #: winecfg.rc:236 -#, fuzzy -#| msgid "&Add..." msgid "A&dd..." -msgstr "&Ajouter..." +msgstr "Ajo&uter..." #: winecfg.rc:238 -#, fuzzy -#| msgid "Autodetect" msgid "Aut&odetect" -msgstr "Auto-détection" +msgstr "Aut&o-détection" #: winecfg.rc:241 msgid "&Path:" msgstr "&Chemin :" #: winecfg.rc:248 winecfg.rc:38 -#, fuzzy -#| msgid "Show &Advanced" msgid "Show Advan&ced" -msgstr "Afficher les dé&tails" +msgstr "Afficher les &détails" #: winecfg.rc:249 msgid "De&vice:" -msgstr "&Périphérique :" +msgstr "Périp&hérique :" #: winecfg.rc:251 msgid "Bro&wse..." @@ -13346,17 +13336,15 @@ msgstr "&Parcourir..." #: winecfg.rc:253 msgid "&Label:" -msgstr "É&tiquette :" +msgstr "Ét&iquette :" #: winecfg.rc:255 msgid "S&erial:" -msgstr "N° de &série :" +msgstr "N° de sé&rie :" #: winecfg.rc:258 -#, fuzzy -#| msgid "Show &dot files" msgid "&Show dot files" -msgstr "Montrer les fichiers cachés" +msgstr "&Montrer les fichiers cachés" #: winecfg.rc:265 msgid "Driver diagnostics" @@ -13435,10 +13423,8 @@ msgid "Select the Unix target directory, please." msgstr "Veuillez sélectionner le répertoire Unix cible." #: winecfg.rc:37 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" -msgstr "Cacher les dé&tails" +msgstr "Cacher les &détails" #: winecfg.rc:39 msgid "(No Theme)"

1 0

Aric Stewart : usp10: Directional control codes force complex itemization.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 6c470a8bd338942a334b634b94ce7487c71f5107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c470a8bd338942a334b634b9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 3 12:55:12 2016 -0600 usp10: Directional control codes force complex itemization. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8e7bb18..a3ca3c2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1307,9 +1307,15 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, else if (is_indic(scripts[i])) last_indic = base_indic(scripts[i]); - /* Some unicode points (Zero Width Space U+200B - - Right-to-Left Mark U+200F) will force us into bidi mode */ - if (!forceLevels && pwcInChars[i] >= 0x200B && pwcInChars[i] <= 0x200F) + /* Some unicode points : + (Zero Width Space U+200B - Right-to-Left Mark U+200F) + (Left Right Embed U+202A - Left Right Override U+202D) + (Left Right Isolate U+2066 - Pop Directional Isolate U+2069) + will force us into bidi mode */ + if (!forceLevels && ((pwcInChars[i] >= 0x200B && pwcInChars[i] <= 0x200F) || + (pwcInChars[i] >= 0x202A && pwcInChars[i] <= 0x202E) || + (pwcInChars[i] >= 0x2066 && pwcInChars[i] <= 0x2069))) + forceLevels = TRUE; /* Diacritical marks merge with other scripts */

1 0

Alexandre Julliard : server: Add link_name and unlink_name object operations.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

1 0

Aric Stewart : usp10: Correct math punctuation handling in itemization.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 144a7aa6efdae173557c9eb003304d9abbb465d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=144a7aa6efdae173557c9eb00… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 3 12:55:30 2016 -0600 usp10: Correct math punctuation handling in itemization. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 45 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 3d19b07..4a448db 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -456,6 +456,38 @@ static void test_ScriptItemize( void ) static const itemTest t471[2] = {{{0,0,0,0,0},0,0,0,0,math_tag,TRUE,{-1,-1,-1,-1,0x0}},{{0,0,0,0,0},26,0,0,0,-1,FALSE}}; static const itemTest t472[2] = {{{0,0,0,0,0},0,0,0,2,math_tag,TRUE,{-1,1,1,1,0x0}},{{0,0,0,0,0},26,0,0,0,-1,FALSE}}; + /* Mathematical and Numeric combinations */ + /* These have a leading hebrew character to force complicated itemization */ + static const WCHAR test48[] = {0x05e9,' ','1','2','3','.'}; + static const itemTest t481[4] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE}, + {{0,0,0,0,0},2,0,1,2,0,FALSE},{{0,0,0,0,0},5,0,0,0,0,FALSE}, + {{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const WCHAR test49[] = {0x05e9,' ','1','2','.','1','2'}; + static const itemTest t491[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE}, + {{0,0,0,0,0},2,0,1,2,0,FALSE},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + static const WCHAR test50[] = {0x05e9,' ','.','1','2','3'}; + static const itemTest t501[4] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE}, + {{0,0,0,0,0},2,1,1,1,0,FALSE},{{0,0,0,0,0},3,0,1,2,0,FALSE}, + {{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const WCHAR test51[] = {0x05e9,' ','a','b','.','1','2'}; + static const itemTest t511[5] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE}, + {{0,0,0,0,0},1,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},4,0,0,0,0,FALSE}, + {{0,0,0,0,0},5,0,0,2,0,FALSE},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + static const WCHAR test52[] = {0x05e9,' ','1','2','.','a','b'}; + static const itemTest t521[5] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE}, + {{0,0,0,0,0},2,0,1,2,0,FALSE},{{0,0,0,0,0},4,0,0,0,0,FALSE}, + {{0,0,0,0,0},5,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + static const WCHAR test53[] = {0x05e9,' ','1','2','.','.','1','2'}; + static const itemTest t531[5] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE}, + {{0,0,0,0,0},2,0,1,2,0,FALSE},{{0,0,0,0,0},4,1,1,1,0,FALSE}, + {{0,0,0,0,0},6,0,1,2,0,FALSE},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; + static const WCHAR test54[] = {0x05e9,' ','1','2','+','1','2'}; + static const itemTest t541[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE}, + {{0,0,0,0,0},2,0,1,2,0,FALSE},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + static const WCHAR test55[] = {0x05e9,' ','1','2','+','+','1','2'}; + static const itemTest t551[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE}, + {{0,0,0,0,0},2,0,1,2,0,FALSE},{{0,0,0,0,0},8,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -590,6 +622,14 @@ static void test_ScriptItemize( void ) test_items_ok(test45,24,&Control,&State,1,t451,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t461,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t471,FALSE,0); + test_items_ok(test48,6,&Control,&State,3,t481,FALSE,0); + test_items_ok(test49,7,&Control,&State,2,t491,FALSE,0); + test_items_ok(test50,6,&Control,&State,3,t501,FALSE,0); + test_items_ok(test51,7,&Control,&State,4,t511,FALSE,0); + test_items_ok(test52,7,&Control,&State,4,t521,FALSE,0); + test_items_ok(test53,8,&Control,&State,4,t531,FALSE,0); + test_items_ok(test54,7,&Control,&State,2,t541,FALSE,0); + test_items_ok(test55,8,&Control,&State,2,t551,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a3ca3c2..5420861 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1391,8 +1391,8 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, } else { - BOOL inNumber = FALSE; static const WCHAR math_punc[] = {'#','$','%','+',',','-','.','/',':',0x2212, 0x2044, 0x00a0,0}; + static const WCHAR repeatable_math_punc[] = {'#','$','%','+','-','/',0x2212, 0x2044,0}; strength = heap_alloc_zero(cInChars * sizeof(WORD)); if (!strength) @@ -1407,21 +1407,48 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, strength[i] = BIDI_STRONG; } + /* Math punctuation bordered on both sides by numbers can be + merged into the number */ for (i = 0; i < cInChars; i++) { - /* Script_Numeric and select puncuation at level 0 get bumped to level 2 */ - if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i])) + if (i > 0 && i < cInChars-1 && + scripts[i-1] == Script_Numeric && + strchrW(math_punc, pwcInChars[i])) { - scripts[i] = Script_Numeric; - levels[i] = 2; + if (scripts[i+1] == Script_Numeric) + { + scripts[i] = Script_Numeric; + levels[i] = levels[i-1]; + strength[i] = strength[i-1]; + i++; + } + else if (strchrW(repeatable_math_punc, pwcInChars[i])) + { + int j; + for (j = i+1; j < cInChars; j++) + { + if (scripts[j] == Script_Numeric) + { + for(;i<j; i++) + { + scripts[i] = Script_Numeric; + levels[i] = levels[i-1]; + strength[i] = strength[i-1]; + } + } + else if (pwcInChars[i] != pwcInChars[j]) break; + } + } } - else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric) + } + + for (i = 0; i < cInChars; i++) + { + /* Script_Numeric at level 0 get bumped to level 2 */ + if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric) { levels[i] = 2; - inNumber = TRUE; } - else - inNumber = FALSE; /* Joiners get merged preferencially right */ if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ))

1 0

Józef Kucia : d3d11: Rename WINE_D3D10_TO_STR to WINE_D3D_TO_STR.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: b1ee60f22fbd6b854c3810a89603458ec0585369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ee60f22fbd6b854c3810a89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 4 01:17:50 2016 +0100 d3d11: Rename WINE_D3D10_TO_STR to WINE_D3D_TO_STR. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 202 ++++++++++++++++++++++++++--------------------------- 1 file changed, 101 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1ee60f22fbd6b854c381…

1 0

Henri Verbeet : ddraw: Use wined3d_rendertarget_view_create_from_sub_resource() in ddraw_surface_get_rendertarget_view().
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 6037179f6b48a9becdc9e8328ee3b4cc45a8f8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6037179f6b48a9becdc9e8328… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 22:22:58 2016 +0100 ddraw: Use wined3d_rendertarget_view_create_from_sub_resource() in ddraw_surface_get_rendertarget_view(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/view.c | 15 --------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 71b424d..923a935 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6324,8 +6324,8 @@ struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddr if (surface->wined3d_rtv) return surface->wined3d_rtv; - if (FAILED(hr = wined3d_rendertarget_view_create_from_surface(surface->wined3d_surface, - surface, &ddraw_view_wined3d_parent_ops, &surface->wined3d_rtv))) + if (FAILED(hr = wined3d_rendertarget_view_create_from_sub_resource(surface->wined3d_texture, + surface->sub_resource_idx, surface, &ddraw_view_wined3d_parent_ops, &surface->wined3d_rtv))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); return NULL; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5f046fa..8d4f7fd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -145,21 +145,6 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget return WINED3D_OK; } -HRESULT CDECL wined3d_rendertarget_view_create_from_surface(struct wined3d_surface *surface, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view) -{ - struct wined3d_rendertarget_view_desc desc; - - TRACE("surface %p, parent %p, parent_ops %p, view %p.\n", surface, parent, parent_ops, view); - - desc.format_id = surface->resource.format->id; - desc.u.texture.level_idx = surface->texture_level; - desc.u.texture.layer_idx = surface->texture_layer; - desc.u.texture.layer_count = 1; - - return wined3d_rendertarget_view_create(&desc, &surface->container->resource, parent, parent_ops, view); -} - HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6f930ef..ba25f9d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -188,7 +188,6 @@ @ cdecl wined3d_resource_unmap(ptr long) @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr) -@ cdecl wined3d_rendertarget_view_create_from_surface(ptr ptr ptr ptr) @ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr) @ cdecl wined3d_rendertarget_view_decref(ptr) @ cdecl wined3d_rendertarget_view_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f29f4ff..1e91397 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2430,8 +2430,6 @@ HRESULT __cdecl wined3d_resource_unmap(struct wined3d_resource *resource, unsign HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view); -HRESULT __cdecl wined3d_rendertarget_view_create_from_surface(struct wined3d_surface *surface, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view); HRESULT __cdecl wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view);

1 0

Nikolay Sivov : dwrite/tests: Skip tests if no English family name was returned.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: 788e1dc7a0a69885c8e33a72c3a30bb38527c33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=788e1dc7a0a69885c8e33a72c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 20:57:25 2016 +0300 dwrite/tests: Skip tests if no English family name was returned. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 47 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index acc7a8f..aed5e02 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3207,7 +3207,7 @@ static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) return fontface; } -static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) +static BOOL get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) { UINT32 index; BOOL exists = FALSE; @@ -3217,8 +3217,14 @@ static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT3 ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists, "got %d\n", exists); - hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (exists) { + hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); + ok(hr == S_OK, "got 0x%08x\n", hr); + } + else + *buff = 0; + + return exists; } static void test_GetLineMetrics(void) @@ -3274,6 +3280,7 @@ static void test_GetLineMetrics(void) IDWriteLocalizedStrings *names; IDWriteFontFamily *family; IDWriteFont *font; + BOOL exists; format = NULL; layout = NULL; @@ -3291,11 +3298,43 @@ static void test_GetLineMetrics(void) hr = IDWriteFontFamily_GetFamilyNames(family, &names); ok(hr == S_OK, "got 0x%08x\n", hr); - get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + if (!(exists = get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])))) { + IDWriteLocalFontFileLoader *localloader; + IDWriteFontFileLoader *loader; + IDWriteFontFile *file; + const void *key; + UINT32 keysize; + UINT32 count; + + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_Release(loader); + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &keysize); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteLocalFontFileLoader_GetFilePathFromKey(localloader, key, keysize, nameW, sizeof(nameW)/sizeof(*nameW)); + ok(hr == S_OK, "got 0x%08x\n", hr); + + skip("Failed to get English family name, font file %s\n", wine_dbgstr_w(nameW)); + + IDWriteLocalFontFileLoader_Release(localloader); + IDWriteFontFile_Release(file); + } IDWriteLocalizedStrings_Release(names); IDWriteFont_Release(font); + if (!exists) + goto cleanup; + /* This will effectively skip on Vista/2008 only, newer systems work just fine with this font. */ if (!lstrcmpW(nameW, mvboliW)) { skip("Skipping line metrics test for %s, gives inconsistent results\n", wine_dbgstr_w(nameW));

1 0

Alistair Leslie-Hughes : gdiplus: Implement GdipGetPenTransform.
by Alexandre Julliard Feb. 4, 2016

Feb. 4, 2016

Module: wine Branch: master Commit: b8449062eb13ed27612ac3df8e05c67587bce12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8449062eb13ed27612ac3df8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 31 21:55:31 2016 +1100 gdiplus: Implement GdipGetPenTransform. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/pen.c | 8 +++----- dlls/gdiplus/tests/pen.c | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1af0bd0..0013d75 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -197,6 +197,7 @@ struct GpPen{ REAL offset; /* dash offset */ GpBrush *brush; GpPenAlignment align; + GpMatrix transform; }; struct GpGraphics{ diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index f7dacef..47e91ec 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -171,6 +171,7 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit, gp_pen->offset = 0.0; gp_pen->customstart = NULL; gp_pen->customend = NULL; + GdipSetMatrixElements(&gp_pen->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); if(!((gp_pen->unit == UnitWorld) || (gp_pen->unit == UnitPixel))) { FIXME("UnitWorld, UnitPixel only supported units\n"); @@ -448,17 +449,14 @@ GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) { - static int calls; - TRACE("(%p,%p)\n", pen, matrix); if(!pen || !matrix) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + *matrix = pen->transform; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMatrixOrder order) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 6eee2ea..1e63560 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -380,7 +380,7 @@ static void test_transform(void) expect(Ok, status); status = GdipGetPenTransform(pen, matrix); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status); @@ -398,7 +398,7 @@ static void test_transform(void) GdipDeleteMatrix(matrix2); status = GdipGetPenTransform(pen, matrix); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status); todo_wine { @@ -413,7 +413,7 @@ todo_wine { todo_wine expect(Ok, status); status = GdipGetPenTransform(pen, matrix); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipGetMatrixElements(matrix, values); expect(Ok, status);

1 0