wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Aric Stewart : winedevice: Use IoCreateDriver and IoDeleteDriver.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 3b37db88e93ee8aeb42bd4256fb1a4d2bbeb8bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b37db88e93ee8aeb42bd4256… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 4 18:59:50 2016 +0200 winedevice: Use IoCreateDriver and IoDeleteDriver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 176 ++++++++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b37db88e93ee8aeb42bd…

1 0

Aric Stewart : ntoskrnl.exe: Implement ObReferenceObjectByName but only for loaded drivers.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 6a686d63ad92c80cdca08e1a67856a431031b600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a686d63ad92c80cdca08e1a6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 4 11:53:57 2016 -0500 ntoskrnl.exe: Implement ObReferenceObjectByName but only for loaded drivers. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 25187d3..d812692 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2107,8 +2107,36 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, void *ParseContext, void **Object) { - FIXME("stub\n"); - return STATUS_NOT_IMPLEMENTED; + struct wine_driver *driver; + struct wine_rb_entry *entry; + + TRACE("mostly-stub:%s %i %p %i %p %i %p %p\n", debugstr_us(ObjectName), + Attributes, AccessState, DesiredAccess, ObjectType, AccessMode, + ParseContext, Object); + + if (AccessState) FIXME("Unhandled AccessState\n"); + if (DesiredAccess) FIXME("Unhandled DesiredAccess\n"); + if (ParseContext) FIXME("Unhandled ParseContext\n"); + if (ObjectType) FIXME("Unhandled ObjectType\n"); + + if (AccessMode != KernelMode) + { + FIXME("UserMode access not implemented\n"); + return STATUS_NOT_IMPLEMENTED; + } + + EnterCriticalSection(&drivers_cs); + entry = wine_rb_get(&wine_drivers, ObjectName); + LeaveCriticalSection(&drivers_cs); + if (!entry) + { + FIXME("Object (%s) not found, may not be tracked.\n", debugstr_us(ObjectName)); + return STATUS_NOT_IMPLEMENTED; + } + + driver = WINE_RB_ENTRY_VALUE(entry, struct wine_driver, entry); + *Object = &driver->driver_obj; + return STATUS_SUCCESS; }

1 0

Michael Stefaniuc : cryptui: Avoid using the LPJUNK style for COM interface types.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: edba9a5ef5666c8bafbd3313d4136eb2c7347f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=edba9a5ef5666c8bafbd3313d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 18:53:56 2016 +0200 cryptui: Avoid using the LPJUNK style for COM interface types. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 616ccf7..a652239 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1792,16 +1792,16 @@ static void add_cert_string_to_control(HWND hwnd, PCCERT_CONTEXT pCertContext, static void add_icon_to_control(HWND hwnd, int id) { HRESULT hr; - LPRICHEDITOLE richEditOle = NULL; - LPOLEOBJECT object = NULL; + IRichEditOle *richEditOle = NULL; + IOleObject *object = NULL; CLSID clsid; LPOLECACHE oleCache = NULL; FORMATETC formatEtc; DWORD conn; - LPDATAOBJECT dataObject = NULL; + IDataObject *dataObject = NULL; HBITMAP bitmap = NULL; STGMEDIUM stgm; - LPOLECLIENTSITE clientSite = NULL; + IOleClientSite *clientSite = NULL; REOBJECT reObject; TRACE("(%p, %d)\n", hwnd, id);

1 0

Bernhard Übelacker : wininet/tests: Fix pathLen given to InternetCrackUrlA.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 0fcecad8d84a6fbe0c16b786a9b639c3530cf272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fcecad8d84a6fbe0c16b786a… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Aug 2 23:29:20 2016 +0200 wininet/tests: Fix pathLen given to InternetCrackUrlA. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 7b1fd72..0af5835 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -534,26 +534,26 @@ static void InternetCrackUrl_test(void) * The last two (path and extrainfo) are the same for all versions * of the wininet.dll. */ - copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 1024, 1024); SetLastError(0xdeadbeef); firstret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); firstGLE = GetLastError(); - copy_compsA(&urlSrc, &urlComponents, 32, 0, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 0, 1024, 1024, 1024, 1024); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", ret, GLE, firstret); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 0, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 0, 1024, 1024, 1024); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", ret, GLE, firstret); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 0, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 0, 1024, 1024); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); @@ -569,7 +569,7 @@ static void InternetCrackUrl_test(void) "InternetCrackUrl returned %d with GLE=%d (expected to return 0 and ERROR_INVALID_HANDLE or ERROR_INSUFFICIENT_BUFFER)\n", ret, GLE); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 0); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 0); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); @@ -586,7 +586,7 @@ static void InternetCrackUrl_test(void) "InternetCrackUrl returned %d with GLE=%d (expected to return 0 and ERROR_INVALID_PARAMETER)\n", ret, GLE); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); ret = InternetCrackUrlA("about://host/blank", 0,0,&urlComponents); ok(ret, "InternetCrackUrl failed with %d\n", GetLastError()); ok(!strcmp(urlComponents.lpszScheme, "about"), "lpszScheme was \"%s\" instead of \"about\"\n", urlComponents.lpszScheme); @@ -595,7 +595,7 @@ static void InternetCrackUrl_test(void) /* try a NULL lpszUrl */ SetLastError(0xdeadbeef); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); ret = InternetCrackUrlA(NULL, 0, 0, &urlComponents); GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); @@ -605,7 +605,7 @@ static void InternetCrackUrl_test(void) * we just need to fail and not return success */ SetLastError(0xdeadbeef); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); ret = InternetCrackUrlA("", 0, 0, &urlComponents); GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); @@ -613,7 +613,7 @@ static void InternetCrackUrl_test(void) /* Invalid Call: must set size of components structure (Windows only * enforces this on the InternetCrackUrlA version of the call) */ - copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 1024, 1024); SetLastError(0xdeadbeef); urlComponents.dwStructSize = 0; ret = InternetCrackUrlA(TEST_URL, 0, 0, &urlComponents); @@ -624,7 +624,7 @@ static void InternetCrackUrl_test(void) /* Invalid Call: size of dwStructSize must be one of the "standard" sizes * of the URL_COMPONENTS structure (Windows only enforces this on the * InternetCrackUrlA version of the call) */ - copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 1024, 1024); SetLastError(0xdeadbeef); urlComponents.dwStructSize = sizeof(urlComponents) + 1; ret = InternetCrackUrlA(TEST_URL, 0, 0, &urlComponents);

1 0

Piotr Caban : ucrtbase: Add initial __std_type_info tests.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: f45db432ce1bc9e26f386278a73ed98760e6de25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45db432ce1bc9e26f386278a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 16:29:06 2016 +0200 ucrtbase: Add initial __std_type_info tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/cpp.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 12b0422..168cd21 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -33,8 +33,25 @@ typedef struct { MSVCRT_bool dofree; } __std_exception_data; +typedef struct +{ + char *name; + char mangled[32]; +} type_info140; + +typedef struct _type_info_list +{ + SLIST_ENTRY entry; + char name[1]; +} type_info_list; + +static void* (CDECL *p_malloc)(size_t); static void (CDECL *p___std_exception_copy)(const __std_exception_data*, __std_exception_data*); static void (CDECL *p___std_exception_destroy)(__std_exception_data*); +static int (CDECL *p___std_type_info_compare)(const type_info140*, const type_info140*); +static const char* (CDECL *p___std_type_info_name)(type_info140*, SLIST_HEADER*); +static void (CDECL *p___std_type_info_destroy_list)(SLIST_HEADER*); + static BOOL init(void) { @@ -47,8 +64,12 @@ static BOOL init(void) return FALSE; } + p_malloc = (void*)GetProcAddress(module, "malloc"); p___std_exception_copy = (void*)GetProcAddress(module, "__std_exception_copy"); p___std_exception_destroy = (void*)GetProcAddress(module, "__std_exception_destroy"); + p___std_type_info_compare = (void*)GetProcAddress(module, "__std_type_info_compare"); + p___std_type_info_name = (void*)GetProcAddress(module, "__std_type_info_name"); + p___std_type_info_destroy_list = (void*)GetProcAddress(module, "__std_type_info_destroy_list"); return TRUE; } @@ -96,8 +117,48 @@ static void test___std_exception(void) ok(!dst.dofree, "dst.dofree != FALSE\n"); } +static void test___std_type_info(void) +{ + type_info140 ti1 = { NULL, ".?AVa@@" }; + type_info140 ti2 = { NULL, ".?AVb@@" }; + type_info140 ti3 = ti1; + SLIST_HEADER header; + type_info_list *elem; + const char *ret; + int eq; + + + InitializeSListHead(&header); + p___std_type_info_destroy_list(&header); + + elem = p_malloc(sizeof(*elem)); + memset(elem, 0, sizeof(*elem)); + InterlockedPushEntrySList(&header, &elem->entry); + p___std_type_info_destroy_list(&header); + ok(!InterlockedPopEntrySList(&header), "list is not empty\n"); + + ret = p___std_type_info_name(&ti1, &header); + ok(!strcmp(ret, "class a"), "__std_type_info_name(&ti1) = %s\n", ret); + ok(ti1.name == ret, "ti1.name = %p, ret = %p\n", ti1.name, ret); + + p___std_type_info_destroy_list(&header); + ok(!InterlockedPopEntrySList(&header), "list is not empty\n"); + ok(ti1.name == ret, "ti1.name = %p, ret = %p\n", ti1.name, ret); + ti1.name = NULL; + + eq = p___std_type_info_compare(&ti1, &ti1); + ok(eq == 0, "__std_type_info_compare(&ti1, &ti1) = %d\n", eq); + + eq = p___std_type_info_compare(&ti1, &ti2); + ok(eq == -1, "__std_type_info_compare(&ti1, &ti2) = %d\n", eq); + + eq = p___std_type_info_compare(&ti1, &ti3); + ok(eq == 0, "__std_type_info_compare(&ti1, &ti3) = %d\n", eq); +} + START_TEST(cpp) { if (!init()) return; test___std_exception(); + test___std_type_info(); }

1 0

Piotr Caban : ucrtbase: Add __std_type_info_destroy_list implementation.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 4ba09e11a891ee120d6a6602f3a4ecb5aaaaa86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba09e11a891ee120d6a6602f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 16:28:55 2016 +0200 ucrtbase: Add __std_type_info_destroy_list implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/cpp.c | 16 ++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index d8f4c52..a007823 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -45,7 +45,7 @@ @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare -@ stub __std_type_info_destroy_list +@ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ stub __std_type_info_hash @ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index ee27fc7..3621f12 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1572,4 +1572,20 @@ const char* CDECL MSVCRT_type_info_name_list(type_info140 *ti, SLIST_HEADER *hea TRACE("(%p) returning %s\n", ti, ti->name); return ti->name; } + +/****************************************************************** + * __std_type_info_destroy_list (UCRTBASE.@) + */ +void CDECL MSVCRT_type_info_destroy_list(SLIST_HEADER *header) +{ + SLIST_ENTRY *cur, *next; + + TRACE("(%p)\n", header); + + for(cur = InterlockedFlushSList(header); cur; cur = next) + { + next = cur->Next; + MSVCRT_free(cur); + } +} #endif diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d1c1553..bb549d1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -143,7 +143,7 @@ @ cdecl __std_exception_copy(ptr ptr) MSVCRT___std_exception_copy @ cdecl __std_exception_destroy(ptr) MSVCRT___std_exception_destroy @ cdecl __std_type_info_compare(ptr ptr) MSVCRT_type_info_compare -@ stub __std_type_info_destroy_list +@ cdecl __std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list @ stub __std_type_info_hash @ cdecl __std_type_info_name(ptr ptr) MSVCRT_type_info_name_list @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 525a998..8d6c060 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -40,7 +40,7 @@ @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy @ stub __std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare -@ stub __std_type_info_destroy_list +@ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ stub __std_type_info_hash @ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __telemetry_main_invoke_trigger(ptr)

1 0

Piotr Caban : ucrtbase: Add __std_type_info_name implementation.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 2487168b758a8133b15dea5aab4801f2d1f381db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2487168b758a8133b15dea5aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 16:28:38 2016 +0200 ucrtbase: Add __std_type_info_name implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/cpp.c | 49 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 1e16e5f..d8f4c52 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -47,7 +47,7 @@ @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash -@ stub __std_type_info_name +@ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx @ cdecl __uncaught_exception() ucrtbase.__uncaught_exception diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 8e44969..ee27fc7 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1511,6 +1511,24 @@ typedef struct char mangled[1]; } type_info140; +typedef struct +{ + SLIST_ENTRY entry; + char name[1]; +} type_info_entry; + +static void* CDECL type_info_entry_malloc(MSVCRT_size_t size) +{ + type_info_entry *ret = MSVCRT_malloc(FIELD_OFFSET(type_info_entry, name) + size); + return ret->name; +} + +static void CDECL type_info_entry_free(void *ptr) +{ + ptr = (char*)ptr - FIELD_OFFSET(type_info_entry, name); + MSVCRT_free(ptr); +} + /****************************************************************** * __std_type_info_compare (UCRTBASE.@) */ @@ -1523,4 +1541,35 @@ int CDECL MSVCRT_type_info_compare(const type_info140 *l, const type_info140 *r) TRACE("(%p %p) returning %d\n", l, r, ret); return ret; } + +/****************************************************************** + * __std_type_info_name (UCRTBASE.@) + */ +const char* CDECL MSVCRT_type_info_name_list(type_info140 *ti, SLIST_HEADER *header) +{ + if (!ti->name) + { + char* name = __unDName(0, ti->mangled + 1, 0, + type_info_entry_malloc, type_info_entry_free, UNDNAME_NO_ARGUMENTS | UNDNAME_32_BIT_DECODE); + if (name) + { + unsigned int len = strlen(name); + + while (len && name[--len] == ' ') + name[len] = '\0'; + + if (InterlockedCompareExchangePointer((void**)&ti->name, name, NULL)) + { + type_info_entry_free(name); + } + else + { + type_info_entry *entry = (type_info_entry*)(name-FIELD_OFFSET(type_info_entry, name)); + InterlockedPushEntrySList(header, &entry->entry); + } + } + } + TRACE("(%p) returning %s\n", ti, ti->name); + return ti->name; +} #endif diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 95fcc05..d1c1553 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -145,7 +145,7 @@ @ cdecl __std_type_info_compare(ptr ptr) MSVCRT_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash -@ stub __std_type_info_name +@ cdecl __std_type_info_name(ptr ptr) MSVCRT_type_info_name_list @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index a8dc379..525a998 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -42,7 +42,7 @@ @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash -@ stub __std_type_info_name +@ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __telemetry_main_invoke_trigger(ptr) @ cdecl __telemetry_main_return_trigger(ptr) @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName

1 0

Piotr Caban : ucrtbase: Fix __std_type_info_compare implementation.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 0707164543ada140db13952c6af26c98a6d4946c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0707164543ada140db13952c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 16:28:18 2016 +0200 ucrtbase: Fix __std_type_info_compare implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b470478..8e44969 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -575,16 +575,6 @@ int __thiscall MSVCRT_type_info_before(type_info * _this, const type_info * rhs) } /****************************************************************** - * __std_type_info_compare (MSVCRT.@) - */ -int CDECL MSVCRT_type_info_compare(type_info * _this, const type_info * rhs) -{ - int ret = strcmp(_this->mangled + 1, rhs->mangled + 1); - TRACE("(%p %p) returning %d\n", _this, rhs, ret); - return ret; -} - -/****************************************************************** * ??1type_info@@UAE@XZ (MSVCRT.@) */ DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor,4) @@ -1513,3 +1503,24 @@ void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj); } + +#if _MSVCR_VER >= 140 +typedef struct +{ + char *name; + char mangled[1]; +} type_info140; + +/****************************************************************** + * __std_type_info_compare (UCRTBASE.@) + */ +int CDECL MSVCRT_type_info_compare(const type_info140 *l, const type_info140 *r) +{ + int ret; + + if (l == r) ret = 0; + else ret = strcmp(l->mangled + 1, r->mangled + 1); + TRACE("(%p %p) returning %d\n", l, r, ret); + return ret; +} +#endif

1 0

Jacek Caban : jscript: Replaced OP_ident with static binding when possible.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 983bbab5315b55d15dd3473e3ecd1db9d8dca8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=983bbab5315b55d15dd3473e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:40:44 2016 +0200 jscript: Replaced OP_ident with static binding when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 10 +++++++++- dlls/jscript/engine.c | 51 +++++++++++++++++++++++++++++++++++++------------- dlls/jscript/engine.h | 1 + 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index d894b98..a1b2207 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -434,6 +434,14 @@ static HRESULT emit_identifier_ref(compiler_ctx_t *ctx, const WCHAR *identifier, return push_instr_bstr_uint(ctx, OP_identid, identifier, flags); } +static HRESULT emit_identifier(compiler_ctx_t *ctx, const WCHAR *identifier) +{ + int local_ref; + if(bind_local(ctx, identifier, &local_ref)) + return push_instr_int(ctx, OP_local, local_ref); + return push_instr_bstr(ctx, OP_ident, identifier); +} + static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *expr, unsigned flags) { HRESULT hres = S_OK; @@ -994,7 +1002,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL hres = compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gteq); break; case EXPR_IDENT: - hres = push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); + hres = emit_identifier(ctx, ((identifier_expression_t*)expr)->identifier); break; case EXPR_IN: hres = compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2f74d8a..afa2b4b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1225,6 +1225,26 @@ static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigne return stack_push_exprval(ctx, &exprval); } +static HRESULT identifier_value(script_ctx_t *ctx, BSTR identifier) +{ + exprval_t exprval; + jsval_t v; + HRESULT hres; + + hres = identifier_eval(ctx, identifier, &exprval); + if(FAILED(hres)) + return hres; + + if(exprval.type == EXPRVAL_INVALID) + return throw_type_error(ctx, exprval.u.hres, identifier); + + hres = exprval_to_value(ctx, &exprval, &v); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, v); +} + static HRESULT interp_local_ref(script_ctx_t *ctx) { const int arg = get_op_int(ctx, 0); @@ -1242,28 +1262,33 @@ static HRESULT interp_local_ref(script_ctx_t *ctx) return stack_push_exprval(ctx, &ref); } -/* ECMA-262 3rd Edition 10.1.4 */ -static HRESULT interp_ident(script_ctx_t *ctx) +static HRESULT interp_local(script_ctx_t *ctx) { - const BSTR arg = get_op_bstr(ctx, 0); - exprval_t exprval; - jsval_t v; + const int arg = get_op_int(ctx, 0); + call_frame_t *frame = ctx->call_ctx; + jsval_t copy; HRESULT hres; - TRACE("%s\n", debugstr_w(arg)); + TRACE("%d\n", arg); - hres = identifier_eval(ctx, arg, &exprval); + if(!frame->base_scope || !frame->base_scope->frame) + return identifier_value(ctx, local_name(frame, arg)); + + hres = jsval_copy(ctx->stack[local_off(frame, arg)], &copy); if(FAILED(hres)) return hres; - if(exprval.type == EXPRVAL_INVALID) - return throw_type_error(ctx, exprval.u.hres, arg); + return stack_push(ctx, copy); +} - hres = exprval_to_value(ctx, &exprval, &v); - if(FAILED(hres)) - return hres; +/* ECMA-262 3rd Edition 10.1.4 */ +static HRESULT interp_ident(script_ctx_t *ctx) +{ + const BSTR arg = get_op_bstr(ctx, 0); - return stack_push(ctx, v); + TRACE("%s\n", debugstr_w(arg)); + + return identifier_value(ctx, arg); } /* ECMA-262 3rd Edition 10.1.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f515bef..3ac8169 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -48,6 +48,7 @@ X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ + X(local, 1, ARG_INT, 0) \ X(local_ref, 1, ARG_INT, ARG_UINT) \ X(lshift, 1, 0,0) \ X(lt, 1, 0,0) \

1 0

Jacek Caban : jscript: Replaced OP_identid with static binding when possible.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 04617ddf2182d863cda62bb5834675bf84ebf907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04617ddf2182d863cda62bb58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:40:37 2016 +0200 jscript: Replaced OP_identid with static binding when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 32 ++++++++++++++++-- dlls/jscript/engine.c | 88 +++++++++++++++++++++++++++++++++----------------- dlls/jscript/engine.h | 1 + 3 files changed, 88 insertions(+), 33 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0087459..d894b98 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -408,6 +408,32 @@ static inline BOOL is_memberid_expr(expression_type_t type) return type == EXPR_IDENT || type == EXPR_MEMBER || type == EXPR_ARRAY; } +static BOOL bind_local(compiler_ctx_t *ctx, const WCHAR *identifier, int *ret_ref) +{ + statement_ctx_t *iter; + local_ref_t *ref; + + for(iter = ctx->stat_ctx; iter; iter = iter->next) { + if(iter->using_scope) + return FALSE; + } + + ref = lookup_local(ctx->func, identifier); + if(!ref) + return FALSE; + + *ret_ref = ref->ref; + return TRUE; +} + +static HRESULT emit_identifier_ref(compiler_ctx_t *ctx, const WCHAR *identifier, unsigned flags) +{ + int local_ref; + if(bind_local(ctx, identifier, &local_ref)) + return push_instr_int(ctx, OP_local_ref, local_ref); + return push_instr_bstr_uint(ctx, OP_identid, identifier, flags); +} + static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *expr, unsigned flags) { HRESULT hres = S_OK; @@ -416,7 +442,7 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex case EXPR_IDENT: { identifier_expression_t *ident_expr = (identifier_expression_t*)expr; - hres = push_instr_bstr_uint(ctx, OP_identid, ident_expr->identifier, flags); + hres = emit_identifier_ref(ctx, ident_expr->identifier, flags); break; } case EXPR_ARRAY: { @@ -1095,7 +1121,7 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t if(!iter->expr) continue; - hres = push_instr_bstr_uint(ctx, OP_identid, iter->identifier, 0); + hres = emit_identifier_ref(ctx, iter->identifier, 0); if(FAILED(hres)) return hres; @@ -1304,7 +1330,7 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s return hres; if(stat->variable) { - hres = push_instr_bstr_uint(ctx, OP_identid, stat->variable->identifier, fdexNameEnsure); + hres = emit_identifier_ref(ctx, stat->variable->identifier, fdexNameEnsure); if(FAILED(hres)) return hres; }else if(is_memberid_expr(stat->expr->type)) { diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 642705a..2f74d8a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -175,6 +175,18 @@ static inline HRESULT stack_pop_uint(script_ctx_t *ctx, DWORD *r) return to_uint32(ctx, stack_pop(ctx), r); } +static inline unsigned local_off(call_frame_t *frame, int ref) +{ + return ref < 0 + ? frame->arguments_off - ref-1 + : frame->variables_off + ref; +} + +static inline BSTR local_name(call_frame_t *frame, int ref) +{ + return ref < 0 ? frame->function->params[-ref-1] : frame->function->variables[ref].name; +} + /* Steals input reference even on failure. */ static HRESULT stack_push_exprval(script_ctx_t *ctx, exprval_t *val) { @@ -546,13 +558,6 @@ static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) return S_OK; } -static inline unsigned local_off(call_frame_t *frame, int ref) -{ - return ref < 0 - ? frame->arguments_off - ref-1 - : frame->variables_off + ref; -} - /* * Transfers local variables from stack to variable object. * It's slow, so we want to avoid it as much as possible. @@ -1192,6 +1197,51 @@ static HRESULT interp_this(script_ctx_t *ctx) return stack_push(ctx, jsval_disp(frame->this_obj)); } +static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigned flags) +{ + exprval_t exprval; + HRESULT hres; + + hres = identifier_eval(ctx, identifier, &exprval); + if(FAILED(hres)) + return hres; + + if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { + DISPID id; + + hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); + if(FAILED(hres)) + return hres; + + exprval_set_disp_ref(&exprval, to_disp(ctx->global), id); + } + + if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) { + WARN("invalid ref\n"); + exprval_release(&exprval); + exprval_set_exception(&exprval, JS_E_OBJECT_EXPECTED); + } + + return stack_push_exprval(ctx, &exprval); +} + +static HRESULT interp_local_ref(script_ctx_t *ctx) +{ + const int arg = get_op_int(ctx, 0); + const unsigned flags = get_op_uint(ctx, 1); + call_frame_t *frame = ctx->call_ctx; + exprval_t ref; + + TRACE("%d\n", arg); + + if(!frame->base_scope || !frame->base_scope->frame) + return interp_identifier_ref(ctx, local_name(frame, arg), flags); + + ref.type = EXPRVAL_STACK_REF; + ref.u.off = local_off(frame, arg); + return stack_push_exprval(ctx, &ref); +} + /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT interp_ident(script_ctx_t *ctx) { @@ -1221,32 +1271,10 @@ static HRESULT interp_identid(script_ctx_t *ctx) { const BSTR arg = get_op_bstr(ctx, 0); const unsigned flags = get_op_uint(ctx, 1); - exprval_t exprval; - HRESULT hres; TRACE("%s %x\n", debugstr_w(arg), flags); - hres = identifier_eval(ctx, arg, &exprval); - if(FAILED(hres)) - return hres; - - if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { - DISPID id; - - hres = jsdisp_get_id(ctx->global, arg, fdexNameEnsure, &id); - if(FAILED(hres)) - return hres; - - exprval_set_disp_ref(&exprval, to_disp(ctx->global), id); - } - - if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) { - WARN("invalid ref\n"); - exprval_release(&exprval); - exprval_set_exception(&exprval, JS_E_OBJECT_EXPECTED); - } - - return stack_push_exprval(ctx, &exprval); + return interp_identifier_ref(ctx, arg, flags); } /* ECMA-262 3rd Edition 7.8.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b18b775..f515bef 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -48,6 +48,7 @@ X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ + X(local_ref, 1, ARG_INT, ARG_UINT) \ X(lshift, 1, 0,0) \ X(lt, 1, 0,0) \ X(lteq, 1, 0,0) \

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016