February 2016 - Wine-commits

Henri Verbeet : wined3d: Make the "icb" field in struct wined3d_shader_reg_maps const.
by Alexandre Julliard 05 Feb '16

05 Feb '16

Module: wine Branch: master Commit: fabd40013c441ca7498a12167deb6cb7e909a1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabd40013c441ca7498a12167… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 21:56:35 2016 +0100 wined3d: Make the "icb" field in struct wined3d_shader_reg_maps const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f4dc36..8c939f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -688,7 +688,7 @@ struct wined3d_shader_reg_maps WORD labels; /* MAX_LABELS, 16 */ DWORD temporary; /* MAX_REG_TEMP, 32 */ DWORD *constf; /* pixel, vertex */ - struct wined3d_shader_immediate_constant_buffer *icb; + const struct wined3d_shader_immediate_constant_buffer *icb; union { DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */

1 0

Aric Stewart : usp10: Directional control codes force complex itemization.
by Alexandre Julliard 04 Feb '16

04 Feb '16

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

Aric Stewart : usp10: Correct math punctuation handling in itemization.
by Alexandre Julliard 04 Feb '16

04 Feb '16

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

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

04 Feb '16

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

Alexandre Julliard : server: Add link_name and unlink_name object operations.
by Alexandre Julliard 04 Feb '16

04 Feb '16

1 0

Alexandre Julliard : server: Use the link_name operation to create named objects.
by Alexandre Julliard 04 Feb '16

04 Feb '16

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

Józef Kucia : d3d11: Rename WINE_D3D10_TO_STR to WINE_D3D_TO_STR.
by Alexandre Julliard 04 Feb '16

04 Feb '16

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

Paul Gofman : mscoree: Add FixupVTable_Assembly function which takes preloaded assembly headers.
by Alexandre Julliard 04 Feb '16

04 Feb '16

Module: wine Branch: master Commit: 5dea748c5b733ac6f8c6e2be609bf9838a86e5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dea748c5b733ac6f8c6e2be6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sat Jan 30 04:36:48 2016 +0300 mscoree: Add FixupVTable_Assembly function which takes preloaded assembly headers. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index c790c44..7998da9 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1135,23 +1135,28 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) list_add_tail(&dll_fixups, &fixup->entry); } +static void FixupVTable_Assembly(HMODULE hmodule, ASSEMBLY *assembly) +{ + VTableFixup *vtable_fixups; + ULONG vtable_fixup_count, i; + + assembly_get_vtable_fixups(assembly, &vtable_fixups, &vtable_fixup_count); + if (CAN_FIXUP_VTABLE) + for (i=0; i<vtable_fixup_count; i++) + FixupVTableEntry(hmodule, &vtable_fixups[i]); + else if (vtable_fixup_count) + FIXME("cannot fixup vtable; expect a crash\n"); +} + static void FixupVTable(HMODULE hmodule) { ASSEMBLY *assembly; HRESULT hr; - VTableFixup *vtable_fixups; - ULONG vtable_fixup_count, i; hr = assembly_from_hmodule(&assembly, hmodule); if (SUCCEEDED(hr)) { - hr = assembly_get_vtable_fixups(assembly, &vtable_fixups, &vtable_fixup_count); - if (CAN_FIXUP_VTABLE) - for (i=0; i<vtable_fixup_count; i++) - FixupVTableEntry(hmodule, &vtable_fixups[i]); - else if (vtable_fixup_count) - FIXME("cannot fixup vtable; expect a crash\n"); - + FixupVTable_Assembly(hmodule, assembly); assembly_release(assembly); } else

1 0

Paul Gofman : mscoree: Call native DllEntryPoint when it is defined in COR header.
by Alexandre Julliard 04 Feb '16

04 Feb '16

Module: wine Branch: master Commit: 98d5c4a90f1c0a91e45544cfad75e5c603e0e625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d5c4a90f1c0a91e45544cfa… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sat Jan 30 04:36:49 2016 +0300 mscoree: Call native DllEntryPoint when it is defined in COR header. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/assembly.c | 14 ++++++++++++++ dlls/mscoree/corruntimehost.c | 29 +++++++++++++++++++++-------- dlls/mscoree/mscoree_private.h | 3 +++ include/winnt.h | 1 + 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 7cfc359..4af6f28 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -314,3 +314,17 @@ HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWO return S_OK; } + +HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) +{ + if (assembly->corhdr->Flags & COMIMAGE_FLAGS_NATIVE_ENTRYPOINT) + { + *func = assembly_rva_to_va(assembly, assembly->corhdr->EntryPointRVA); + return S_OK; + } + else + { + *func = NULL; + return S_FALSE; + } +} diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 7998da9..8c03875 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1254,18 +1254,31 @@ __int32 WINAPI _CorExeMain(void) BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { + ASSEMBLY *assembly=NULL; + HRESULT hr; + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - switch (fdwReason) + hr = assembly_from_hmodule(&assembly, hinstDLL); + if (SUCCEEDED(hr)) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - FixupVTable(hinstDLL); - break; - case DLL_PROCESS_DETACH: - /* FIXME: clean up the vtables */ - break; + NativeEntryPointFunc NativeEntryPoint=NULL; + + assembly_get_native_entrypoint(assembly, &NativeEntryPoint); + if (fdwReason == DLL_PROCESS_ATTACH) + { + if (!NativeEntryPoint) + DisableThreadLibraryCalls(hinstDLL); + FixupVTable_Assembly(hinstDLL,assembly); + } + assembly_release(assembly); + /* FIXME: clean up the vtables on DLL_PROCESS_DETACH */ + if (NativeEntryPoint) + return NativeEntryPoint(hinstDLL, fdwReason, lpvReserved); } + else + ERR("failed to read CLR headers, hr=%x\n", hr); + return TRUE; } diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 7843407..8226463 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -36,11 +36,14 @@ typedef struct _VTableFixup { typedef struct tagASSEMBLY ASSEMBLY; +typedef BOOL (WINAPI *NativeEntryPointFunc)(HINSTANCE, DWORD, LPVOID); + extern HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; extern HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) DECLSPEC_HIDDEN; extern HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; +extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/include/winnt.h b/include/winnt.h index c7874dd..2309ae3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3549,6 +3549,7 @@ typedef enum ReplacesCorHdrNumericDefines COMIMAGE_FLAGS_32BITREQUIRED = 0x00000002, COMIMAGE_FLAGS_IL_LIBRARY = 0x00000004, COMIMAGE_FLAGS_STRONGNAMESIGNED = 0x00000008, + COMIMAGE_FLAGS_NATIVE_ENTRYPOINT= 0x00000010, COMIMAGE_FLAGS_TRACKDEBUGDATA = 0x00010000, COR_VERSION_MAJOR_V2 = 2,

1 0

Alistair Leslie-Hughes : gdiplus: Implement GdipGetPenTransform.
by Alexandre Julliard 04 Feb '16

04 Feb '16

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