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

Nikolay Sivov : dwrite/tests: Fix indentation warnings on GCC 6.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 36cce60f8dffefd4e0e0b47245a2cc8309efc4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=36cce60f8dffefd4e0e0b4724… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 15:59:46 2016 +0300 dwrite/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 4 +-- dlls/dwrite/tests/font.c | 59 ++++++++++++++++++++++---------------------- dlls/dwrite/tests/layout.c | 28 ++++++++++----------- 3 files changed, 46 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36cce60f8dffefd4e0e0b…

1 0

Nikolay Sivov : usp10: Better implementation for ScriptGetLogicalWidths().
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 0695368406b54c97e6f6d3b32601910042384424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0695368406b54c97e6f6d3b32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 16:59:33 2016 +0300 usp10: Better implementation for ScriptGetLogicalWidths(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 27 +++++++++++++++++++----- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index aed0620..e77f90e 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3610,6 +3610,58 @@ static void test_ScriptGetFontFunctions(HDC hdc) } } +struct logical_width_test +{ + int char_count; + int glyph_count; + int advances[3]; + WORD map[3]; + int widths[3]; + BOOL clusterstart[3]; + BOOL diacritic[3]; + BOOL zerowidth[3]; + BOOL todo; +}; + +static const struct logical_width_test logical_width_tests[] = +{ + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 9, 12 }, { 1, 1, 1 } }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 9, 12 }, { 1, 1, 1 }, { 1, 0, 0 } }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 9, 12 }, { 1, 1, 1 }, { 0 }, { 1, 1, 1 } }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 27, 21, 12 }, { 0, 0, 0 }, { 0 }, { 0 }, TRUE }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 21, 12 }, { 0, 1, 0 }, { 0 }, { 0 }, TRUE }, + { 3, 3, { 6, 9, 12 }, { 0, 1, 2 }, { 6, 21, 12 }, { 1, 1, 0 }, { 0 }, { 0 }, TRUE }, + { 3, 3, { 6, 9, 12 }, { 0, 2, 2 }, { 15, 6, 6 }, { 1, 0, 1 } }, +}; + +static void test_ScriptGetLogicalWidths(void) +{ + SCRIPT_ANALYSIS sa = { 0 }; + unsigned int i, j; + + for (i = 0; i < sizeof(logical_width_tests)/sizeof(logical_width_tests[0]); i++) + { + const struct logical_width_test *ptr = logical_width_tests + i; + SCRIPT_VISATTR attrs[3]; + int widths[3]; + HRESULT hr; + + memset(attrs, 0, sizeof(attrs)); + for (j = 0; j < ptr->glyph_count; j++) + { + attrs[j].fClusterStart = ptr->clusterstart[j]; + attrs[j].fDiacritic = ptr->diacritic[j]; + attrs[j].fZeroWidth = ptr->zerowidth[j]; + } + + hr = ScriptGetLogicalWidths(&sa, ptr->char_count, ptr->glyph_count, ptr->advances, ptr->map, attrs, widths); + ok(hr == S_OK, "got 0x%08x\n", hr); + + todo_wine_if(ptr->todo) + ok(!memcmp(ptr->widths, widths, sizeof(widths)), "test %u: got wrong widths\n", i); + } +} + START_TEST(usp10) { HWND hwnd; @@ -3663,6 +3715,7 @@ START_TEST(usp10) test_newlines(); test_ScriptGetFontFunctions(hdc); + test_ScriptGetLogicalWidths(); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f5eba8d..dc1cc06 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3890,16 +3890,33 @@ HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) * Failure: a non-zero HRESULT. */ HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *sa, int nbchars, int nbglyphs, - const int *glyph_width, const WORD *log_clust, + const int *advances, const WORD *log_clust, const SCRIPT_VISATTR *sva, int *widths) { - int i; + int i, next = 0, direction; TRACE("(%p, %d, %d, %p, %p, %p, %p)\n", - sa, nbchars, nbglyphs, glyph_width, log_clust, sva, widths); + sa, nbchars, nbglyphs, advances, log_clust, sva, widths); + + if (sa->fRTL && !sa->fLogicalOrder) + direction = -1; + else + direction = 1; + + for (i = 0; i < nbchars; i++) + { + int clust_size = get_cluster_size(log_clust, nbchars, i, direction, NULL, NULL); + int advance = get_glyph_cluster_advance(advances, sva, log_clust, nbglyphs, nbchars, log_clust[i], direction); + int j; + + for (j = 0; j < clust_size; j++) + { + widths[next] = advance / clust_size; + next++; + if (j) i++; + } + } - /* FIXME */ - for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; return S_OK; }

1 0

Huw Davies : usp10: Free the final page.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 0dbd2e37f916d6b52eac8bad7fa529aa952a0b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbd2e37f916d6b52eac8bad7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 9 15:45:24 2016 +0100 usp10: Free the final page. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index dc1cc06..0471fc6 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1019,7 +1019,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) { heap_free(((ScriptCache *)*psc)->widths[i]); } - for (i = 0; i < 0x10; i++) + for (i = 0; i < NUM_PAGES; i++) { unsigned int j; if (((ScriptCache *)*psc)->page[i]) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index c1a5ccf..1c0d1c5 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -125,6 +125,8 @@ #define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) #define GLYPH_MAX 65536 +#define NUM_PAGES 17 + #define GSUB_E_NOFEATURE -2 #define GSUB_E_NOGLYPH -1 @@ -169,7 +171,7 @@ typedef struct { OUTLINETEXTMETRICW *otm; SCRIPT_FONTPROPERTIES sfp; BOOL sfnt; - CacheGlyphPage *page[0x11]; + CacheGlyphPage *page[NUM_PAGES]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; LPVOID GDEF_Table;

1 0

Andrew Eikum : mmdevapi: Fix some DEVPKEY definitions.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: ba858c28fd489a812ea0f55a11680a8edaf99ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba858c28fd489a812ea0f55a1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 9 10:17:04 2016 -0500 mmdevapi: Fix some DEVPKEY definitions. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 1 + dlls/mmdevapi/tests/propstore.c | 6 +++--- include/devpkey.h | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b8b714c..221fb39 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -356,6 +356,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.vt = VT_LPWSTR; pv.u.pwszVal = name; MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); + MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); pv.u.pwszVal = guidstr; diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 665136f..6447113 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -64,7 +64,7 @@ static void test_propertystore(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); - ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); @@ -118,8 +118,8 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name || broken(!found_name), "DEVPKEY_Device_FriendlyName not found\n"); - ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); + ok(found_name, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_desc, "DEVPKEY_Device_DeviceDesc not found\n"); } static void test_setvalue_on_wow64(IPropertyStore *store) diff --git a/include/devpkey.h b/include/devpkey.h index ebaabc1..648ef42 100644 --- a/include/devpkey.h +++ b/include/devpkey.h @@ -57,6 +57,6 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallState, 0xa45c254e,0xdf1c,0x4efd,0x80,0x2 DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationPaths, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 37); DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 38); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); -DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4);

1 0

Sebastian Lackner : vcomp: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: de1ba602eff0a83a2b51ade0deafded0c73d5e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1ba602eff0a83a2b51ade0d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:31:53 2016 +0200 vcomp: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 8612c9f..61f84be 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1427,9 +1427,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: { SYSTEM_INFO sysinfo;

1 0

Sebastian Lackner : vcomp120: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: a62bd2039043df1cd9fb15ea3f41c523f025c5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62bd2039043df1cd9fb15ea3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:32:11 2016 +0200 vcomp120: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp120/Makefile.in | 3 --- dlls/vcomp120/main.c | 47 ----------------------------------------------- 2 files changed, 50 deletions(-) diff --git a/dlls/vcomp120/Makefile.in b/dlls/vcomp120/Makefile.in index 833cd67..e3a2c8d 100644 --- a/dlls/vcomp120/Makefile.in +++ b/dlls/vcomp120/Makefile.in @@ -1,4 +1 @@ MODULE = vcomp120.dll - -C_SRCS = \ - main.c diff --git a/dlls/vcomp120/main.c b/dlls/vcomp120/main.c deleted file mode 100644 index f2f8b31..0000000 --- a/dlls/vcomp120/main.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * - * vcomp120 implementation - * - * Copyright 2012 André Hentschel - * Copyright 2015 Daniel Lehman - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vcomp120); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Sebastian Lackner : vcomp110: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 389ddf3bc1036df9f3ac2b32d82b348b517f0721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=389ddf3bc1036df9f3ac2b32d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:32:26 2016 +0200 vcomp110: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp110/Makefile.in | 3 --- dlls/vcomp110/main.c | 46 ---------------------------------------------- 2 files changed, 49 deletions(-) diff --git a/dlls/vcomp110/Makefile.in b/dlls/vcomp110/Makefile.in index b33bbaa..755de4f 100644 --- a/dlls/vcomp110/Makefile.in +++ b/dlls/vcomp110/Makefile.in @@ -1,4 +1 @@ MODULE = vcomp110.dll - -C_SRCS = \ - main.c diff --git a/dlls/vcomp110/main.c b/dlls/vcomp110/main.c deleted file mode 100644 index 6771c12..0000000 --- a/dlls/vcomp110/main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * vcomp110 implementation - * - * Copyright 2015 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vcomp110); - -BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) -{ - TRACE("(0x%p, %d, %p)\n", dll, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(dll); - break; - } - - return TRUE; -}

1 0

Sebastian Lackner : vcomp100: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: f21b58318acbf86a1b2aeb7910b266abdddf2419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21b58318acbf86a1b2aeb791… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:32:41 2016 +0200 vcomp100: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp100/Makefile.in | 3 --- dlls/vcomp100/main.c | 46 ---------------------------------------------- 2 files changed, 49 deletions(-) diff --git a/dlls/vcomp100/Makefile.in b/dlls/vcomp100/Makefile.in index f7a7f96..57cefac 100644 --- a/dlls/vcomp100/Makefile.in +++ b/dlls/vcomp100/Makefile.in @@ -1,4 +1 @@ MODULE = vcomp100.dll - -C_SRCS = \ - main.c diff --git a/dlls/vcomp100/main.c b/dlls/vcomp100/main.c deleted file mode 100644 index 7ba18d1..0000000 --- a/dlls/vcomp100/main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * vcomp100 implementation - * - * Copyright 2012 André Hentschel - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vcomp100); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Sebastian Lackner : vcomp90: Prefer builtin version.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 0c824225ad19b1647959dafefc4515440d3cce04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c824225ad19b1647959dafef… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:32:56 2016 +0200 vcomp90: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp90/Makefile.in | 3 --- dlls/vcomp90/main.c | 46 ---------------------------------------------- 2 files changed, 49 deletions(-) diff --git a/dlls/vcomp90/Makefile.in b/dlls/vcomp90/Makefile.in index 457e452..b19e53d 100644 --- a/dlls/vcomp90/Makefile.in +++ b/dlls/vcomp90/Makefile.in @@ -1,4 +1 @@ MODULE = vcomp90.dll - -C_SRCS = \ - main.c diff --git a/dlls/vcomp90/main.c b/dlls/vcomp90/main.c deleted file mode 100644 index 55b5cf8..0000000 --- a/dlls/vcomp90/main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * vcomp90 implementation - * - * Copyright 2012 André Hentschel - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vcomp90); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Daniel Lehman : vcomp140: Add vcomp140 stub.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 71bb4a13c0ccf19430558c6934813bfbe150a747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bb4a13c0ccf19430558c693… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 8 19:56:29 2016 -0700 vcomp140: Add vcomp140 stub. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/vcomp140/Makefile.in | 1 + dlls/vcomp140/vcomp140.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 118 insertions(+) diff --git a/configure b/configure index 56f1bae..b8eedc5 100755 --- a/configure +++ b/configure @@ -1357,6 +1357,7 @@ enable_vcomp enable_vcomp100 enable_vcomp110 enable_vcomp120 +enable_vcomp140 enable_vcomp90 enable_vcruntime140 enable_vdmdbg @@ -18086,6 +18087,7 @@ wine_fn_config_test dlls/vcomp/tests vcomp_test wine_fn_config_dll vcomp100 enable_vcomp100 wine_fn_config_dll vcomp110 enable_vcomp110 wine_fn_config_dll vcomp120 enable_vcomp120 +wine_fn_config_dll vcomp140 enable_vcomp140 wine_fn_config_dll vcomp90 enable_vcomp90 wine_fn_config_dll vcruntime140 enable_vcruntime140 wine_fn_config_dll vdhcp.vxd enable_win16 diff --git a/configure.ac b/configure.ac index bfb479b..f5dde04 100644 --- a/configure.ac +++ b/configure.ac @@ -3318,6 +3318,7 @@ WINE_CONFIG_TEST(dlls/vcomp/tests) WINE_CONFIG_DLL(vcomp100) WINE_CONFIG_DLL(vcomp110) WINE_CONFIG_DLL(vcomp120) +WINE_CONFIG_DLL(vcomp140) WINE_CONFIG_DLL(vcomp90) WINE_CONFIG_DLL(vcruntime140) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) diff --git a/dlls/vcomp140/Makefile.in b/dlls/vcomp140/Makefile.in new file mode 100644 index 0000000..75e37c9 --- /dev/null +++ b/dlls/vcomp140/Makefile.in @@ -0,0 +1 @@ +MODULE = vcomp140.dll diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec new file mode 100644 index 0000000..bb8c007 --- /dev/null +++ b/dlls/vcomp140/vcomp140.spec @@ -0,0 +1,113 @@ +@ stub C2VectParallel +@ cdecl _vcomp_atomic_add_i1(ptr long) vcomp._vcomp_atomic_add_i1 +@ cdecl _vcomp_atomic_add_i2(ptr long) vcomp._vcomp_atomic_add_i2 +@ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 +@ cdecl _vcomp_atomic_add_i8(ptr int64) vcomp._vcomp_atomic_add_i8 +@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 +@ cdecl _vcomp_atomic_and_i1(ptr long) vcomp._vcomp_atomic_and_i1 +@ cdecl _vcomp_atomic_and_i2(ptr long) vcomp._vcomp_atomic_and_i2 +@ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 +@ cdecl _vcomp_atomic_and_i8(ptr int64) vcomp._vcomp_atomic_and_i8 +@ cdecl _vcomp_atomic_div_i1(ptr long) vcomp._vcomp_atomic_div_i1 +@ cdecl _vcomp_atomic_div_i2(ptr long) vcomp._vcomp_atomic_div_i2 +@ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 +@ cdecl _vcomp_atomic_div_i8(ptr int64) vcomp._vcomp_atomic_div_i8 +@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 +@ cdecl _vcomp_atomic_div_ui1(ptr long) vcomp._vcomp_atomic_div_ui1 +@ cdecl _vcomp_atomic_div_ui2(ptr long) vcomp._vcomp_atomic_div_ui2 +@ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 +@ cdecl _vcomp_atomic_div_ui8(ptr int64) vcomp._vcomp_atomic_div_ui8 +@ cdecl _vcomp_atomic_mul_i1(ptr long) vcomp._vcomp_atomic_mul_i1 +@ cdecl _vcomp_atomic_mul_i2(ptr long) vcomp._vcomp_atomic_mul_i2 +@ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 +@ cdecl _vcomp_atomic_mul_i8(ptr int64) vcomp._vcomp_atomic_mul_i8 +@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 +@ cdecl _vcomp_atomic_or_i1(ptr long) vcomp._vcomp_atomic_or_i1 +@ cdecl _vcomp_atomic_or_i2(ptr long) vcomp._vcomp_atomic_or_i2 +@ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 +@ cdecl _vcomp_atomic_or_i8(ptr int64) vcomp._vcomp_atomic_or_i8 +@ cdecl _vcomp_atomic_shl_i1(ptr long) vcomp._vcomp_atomic_shl_i1 +@ cdecl _vcomp_atomic_shl_i2(ptr long) vcomp._vcomp_atomic_shl_i2 +@ cdecl _vcomp_atomic_shl_i4(ptr long) vcomp._vcomp_atomic_shl_i4 +@ cdecl _vcomp_atomic_shl_i8(ptr long) vcomp._vcomp_atomic_shl_i8 +@ cdecl _vcomp_atomic_shr_i1(ptr long) vcomp._vcomp_atomic_shr_i1 +@ cdecl _vcomp_atomic_shr_i2(ptr long) vcomp._vcomp_atomic_shr_i2 +@ cdecl _vcomp_atomic_shr_i4(ptr long) vcomp._vcomp_atomic_shr_i4 +@ cdecl _vcomp_atomic_shr_i8(ptr long) vcomp._vcomp_atomic_shr_i8 +@ cdecl _vcomp_atomic_shr_ui1(ptr long) vcomp._vcomp_atomic_shr_ui1 +@ cdecl _vcomp_atomic_shr_ui2(ptr long) vcomp._vcomp_atomic_shr_ui2 +@ cdecl _vcomp_atomic_shr_ui4(ptr long) vcomp._vcomp_atomic_shr_ui4 +@ cdecl _vcomp_atomic_shr_ui8(ptr long) vcomp._vcomp_atomic_shr_ui8 +@ cdecl _vcomp_atomic_sub_i1(ptr long) vcomp._vcomp_atomic_sub_i1 +@ cdecl _vcomp_atomic_sub_i2(ptr long) vcomp._vcomp_atomic_sub_i2 +@ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 +@ cdecl _vcomp_atomic_sub_i8(ptr int64) vcomp._vcomp_atomic_sub_i8 +@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 +@ cdecl _vcomp_atomic_xor_i1(ptr long) vcomp._vcomp_atomic_xor_i1 +@ cdecl _vcomp_atomic_xor_i2(ptr long) vcomp._vcomp_atomic_xor_i2 +@ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 +@ cdecl _vcomp_atomic_xor_i8(ptr int64) vcomp._vcomp_atomic_xor_i8 +@ cdecl _vcomp_barrier() vcomp._vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect +@ cdecl _vcomp_flush() vcomp._vcomp_flush +@ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ cdecl _vcomp_for_dynamic_next(ptr ptr) vcomp._vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init +@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads +@ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin +@ cdecl _vcomp_single_end() vcomp._vcomp_single_end +@ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock +@ cdecl omp_destroy_nest_lock(ptr) vcomp.omp_destroy_nest_lock +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num +@ stub omp_get_wtick +@ cdecl omp_get_wtime() vcomp.omp_get_wtime +@ cdecl omp_in_parallel() vcomp.omp_in_parallel +@ cdecl omp_init_lock(ptr) vcomp.omp_init_lock +@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock +@ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock +@ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock +@ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/tools/make_specfiles b/tools/make_specfiles index 44090cd..a965210 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -100,6 +100,7 @@ my @dll_groups = ], [ "vcomp", + "vcomp140", "vcomp120", "vcomp110", "vcomp100",

1 0