wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Jacek Caban : ntdll: Moved RegisterTraceGuids[AW] implementation to ntdll.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: d2d40b1da3b1b50be216a996af42abe24a27929e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d40b1da3b1b50be216a996a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 19:35:01 2016 +0100 ntdll: Moved RegisterTraceGuids[AW] implementation to ntdll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 +-- dlls/advapi32/eventlog.c | 64 --------------------------------------------- dlls/ntdll/misc.c | 58 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ 4 files changed, 62 insertions(+), 66 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 36f176b..88f7fee 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -661,8 +661,8 @@ @ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) @ stdcall RegisterServiceCtrlHandlerW(wstr ptr) -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) ntdll.EtwRegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) ntdll.EtwRegisterTraceGuidsW # @ stub RemoveTraceCallback # @ stub RemoveUsersFromEncryptedFile @ stdcall ReportEventA(long long long long ptr long long ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 7839fc4..93c164d 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -742,70 +742,6 @@ BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dw } /****************************************************************************** - * RegisterTraceGuidsW [ADVAPI32.@] - * - * Register an event trace provider and the event trace classes that it uses - * to generate events. - * - * PARAMS - * RequestAddress [I] ControlCallback function - * RequestContext [I] Optional provider-defined context - * ControlGuid [I] GUID of the registering provider - * GuidCount [I] Number of elements in the TraceGuidReg array - * TraceGuidReg [I/O] Array of TRACE_GUID_REGISTRATION structures - * MofImagePath [I] not supported, set to NULL - * MofResourceName [I] not supported, set to NULL - * RegistrationHandle [O] Provider's registration handle - * - * RETURNS - * Success: ERROR_SUCCESS - * Failure: System error code - * - * FIXME - * Stub. - */ -ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, - PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath, - LPCWSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) -{ - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, - debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), - debugstr_w(MofResourceName), RegistrationHandle); - - if (TraceGuidReg) - { - ULONG i; - for (i = 0; i < GuidCount; i++) - { - FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); - TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; - } - } - *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * RegisterTraceGuidsA [ADVAPI32.@] - * - * See RegisterTraceGuidsW. - * - * FIXME - * Stub. - */ -ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, - PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath, - LPCSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) -{ - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, - debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), - debugstr_a(MofResourceName), RegistrationHandle); - return ERROR_SUCCESS; -} - -/****************************************************************************** * StartTraceW [ADVAPI32.@] * * Register and start an event trace session diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2cfa900..0f6c5df 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" +#include "wmistr.h" +#include "evntrace.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -335,3 +337,59 @@ BOOL WINAPI WinSqmIsOptedIn(void) FIXME("() stub\n"); return FALSE; } + +/****************************************************************************** + * EtwRegisterTraceGuidsW (NTDLL.@) + * + * Register an event trace provider and the event trace classes that it uses + * to generate events. + * + * PARAMS + * RequestAddress [I] ControlCallback function + * RequestContext [I] Optional provider-defined context + * ControlGuid [I] GUID of the registering provider + * GuidCount [I] Number of elements in the TraceGuidReg array + * TraceGuidReg [I/O] Array of TRACE_GUID_REGISTRATION structures + * MofImagePath [I] not supported, set to NULL + * MofResourceName [I] not supported, set to NULL + * RegistrationHandle [O] Provider's registration handle + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: System error code + */ +ULONG WINAPI EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress, + void *RequestContext, const GUID *ControlGuid, ULONG GuidCount, + TRACE_GUID_REGISTRATION *TraceGuidReg, const WCHAR *MofImagePath, + const WCHAR *MofResourceName, TRACEHANDLE *RegistrationHandle ) +{ + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), + debugstr_w(MofResourceName), RegistrationHandle); + + if (TraceGuidReg) + { + ULONG i; + for (i = 0; i < GuidCount; i++) + { + FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); + TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; + } + } + *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwRegisterTraceGuidsA (NTDLL.@) + */ +ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, + void *RequestContext, const GUID *ControlGuid, ULONG GuidCount, + TRACE_GUID_REGISTRATION *TraceGuidReg, const char *MofImagePath, + const char *MofResourceName, TRACEHANDLE *RegistrationHandle ) +{ + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), + debugstr_a(MofResourceName), RegistrationHandle); + return ERROR_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d3cd489..0ccd79f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -41,6 +41,8 @@ # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() +@ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) +@ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) # @ stub KiFastSystemCall # @ stub KiFastSystemCallRet # @ stub KiIntSystemCall

1 0

Alex Henrie : ntdll: Finish serial reads of size 0 immediately.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: f35c1b2dc123a834d365e0ddb441370b22b97cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35c1b2dc123a834d365e0ddb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 24 22:55:35 2016 -0700 ntdll: Finish serial reads of size 0 immediately. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 4 ---- dlls/ntdll/file.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 97ec794..6b0c3ed 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -2151,13 +2151,9 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)i; status = pNtReadFile(hcom, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); - /* FIXME: Remove once Wine is fixed */ - if (status == STATUS_PENDING) WaitForSingleObject(hcom, TIMEOUT); if (i >= 0) { -todo_wine ok(status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, status); -todo_wine ok(U(iob).Status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, U(iob).Status); ok(iob.Information == 0, "%d: expected 0, got %lu\n", i, iob.Information); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3883e5a..46fea51 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -883,6 +883,11 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = length ? STATUS_END_OF_FILE : STATUS_SUCCESS; goto done; case FD_TYPE_SERIAL: + if (!length) + { + status = STATUS_SUCCESS; + goto done; + } break; default: status = STATUS_PIPE_BROKEN;

1 0

Piotr Caban : msvcrt: Fix 64-bit _CxxThrowException implementation.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 97b9ff81b8c0764ba1fed1fc884f77967f1bb38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b9ff81b8c0764ba1fed1fc8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 11:09:03 2016 +0100 msvcrt: Fix 64-bit _CxxThrowException implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 7cffa00..17292d5 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1152,6 +1152,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj) /********************************************************************* * _CxxThrowException (MSVCRT.@) */ +#ifndef __x86_64__ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) { ULONG_PTR args[3]; @@ -1161,6 +1162,18 @@ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *typ args[2] = (ULONG_PTR)type; RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); } +#else +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) +{ + ULONG_PTR args[4]; + + args[0] = CXX_FRAME_MAGIC_VC6; + args[1] = (ULONG_PTR)object; + args[2] = (ULONG_PTR)type; + RtlPcToFileHeader( (void*)type, (void**)&args[3]); + RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 4, args ); +} +#endif /********************************************************************* * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z

1 0

Piotr Caban : msvcp100: Add std::generic_category() implementation.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: ede38f4fdb457475708db0f2689f7ec5276c3f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede38f4fdb457475708db0f26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 10:47:47 2016 +0100 msvcp100: Add std::generic_category() implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp90/misc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 62403d5..663a8f6 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1742,8 +1742,8 @@ @ cdecl -arch=win64 ?gcount@?$basic_istream@GU?$char_traits@G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=win32 ?generic_category@std@@YAABVerror_category@1@XZ -@ stub -arch=win64 ?generic_category@std@@YAAEBVerror_category@1@XZ +@ cdecl -arch=win32 ?generic_category@std@@YAABVerror_category@1@XZ() std_generic_category +@ cdecl -arch=win64 ?generic_category@std@@YAAEBVerror_category@1@XZ() std_generic_category @ thiscall -arch=win32 ?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@AAD@Z(ptr ptr) basic_istream_char_get_ch @ cdecl -arch=win64 ?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@AEAD@Z(ptr ptr) basic_istream_char_get_ch @ thiscall -arch=win32 ?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@AAV?$basic_streambuf@DU?$char_traits@D@std@@@2@@Z(ptr ptr) basic_istream_char_get_streambuf diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7ec4f19..a4713d2 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -736,6 +736,25 @@ const error_category* __cdecl std_system_category(void) TRACE("()\n"); return &system_category.base; } + +static custom_category generic_category; +DEFINE_RTTI_DATA1(generic_category, 0, &error_category_rtti_base_descriptor, ".?AV_Generic_error_category@std@@") + +extern const vtable_ptr MSVCP_generic_category_vtable; + +static void generic_category_ctor(custom_category *this) +{ + this->base.vtable = &MSVCP_generic_category_vtable; + this->type = "generic"; +} + +/* ?generic_category@std@@YAABVerror_category@1@XZ */ +/* ?generic_category@std@@YAAEBVerror_category@1@XZ */ +const error_category* __cdecl std_generic_category(void) +{ + TRACE("()\n"); + return &generic_category.base; +} #endif #if _MSVCP_VER >= 110 @@ -1026,6 +1045,13 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) VTABLE_ADD_FUNC(custom_category_equivalent_code)); + __ASM_VTABLE(generic_category, + VTABLE_ADD_FUNC(custom_category_vector_dtor) + VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(custom_category_message) + VTABLE_ADD_FUNC(custom_category_default_error_condition) + VTABLE_ADD_FUNC(custom_category_equivalent) + VTABLE_ADD_FUNC(custom_category_equivalent_code)); #endif #if _MSVCP_VER >= 110 __ASM_VTABLE(_Pad, @@ -1042,6 +1068,7 @@ void init_misc(void *base) init_error_category_rtti(base); init_iostream_category_rtti(base); init_system_category_rtti(base); + init_generic_category_rtti(base); #endif #if _MSVCP_VER >= 110 init__Pad_rtti(base); @@ -1051,6 +1078,7 @@ void init_misc(void *base) #if _MSVCP_VER == 100 iostream_category_ctor(&iostream_category); system_category_ctor(&system_category); + generic_category_ctor(&generic_category); #endif }

1 0

Piotr Caban : msvcp100: Add std::system_category() implementation.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 21a9a8c6847255adbbcfa4335e312cf08ad41dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a9a8c6847255adbbcfa4335… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 10:47:41 2016 +0100 msvcp100: Add std::system_category() implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp90/misc.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 357ca83..62403d5 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2731,8 +2731,8 @@ @ thiscall -arch=win32 ?sync@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_sync @ cdecl ?sync_with_stdio@ios_base@std@@SA_N_N@Z(long) ios_base_sync_with_stdio -@ stub -arch=win32 ?system_category@std@@YAABVerror_category@1@XZ -@ stub -arch=win64 ?system_category@std@@YAAEBVerror_category@1@XZ +@ cdecl -arch=win32 ?system_category@std@@YAABVerror_category@1@XZ() std_system_category +@ cdecl -arch=win64 ?system_category@std@@YAAEBVerror_category@1@XZ() std_system_category @ stub -arch=win32 ?table@?$ctype@D@std@@QBEPBFXZ @ stub -arch=win64 ?table@?$ctype@D@std@@QEBAPEBFXZ @ extern -arch=win32 ?table_size@?$ctype@D@std@@2IB ctype_char_table_size diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b1348d5..7ec4f19 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -675,7 +675,6 @@ DEFINE_THISCALL_WRAPPER(custom_category_message, 12) basic_string_char* __thiscall custom_category_message(const custom_category *this, basic_string_char *ret, int err) { - if(err == 1) return MSVCP_basic_string_char_ctor_cstr(ret, "iostream error"); return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); } @@ -703,6 +702,14 @@ MSVCP_bool __thiscall custom_category_equivalent_code(custom_category *this, return FALSE; } +DEFINE_THISCALL_WRAPPER(iostream_category_message, 12) +basic_string_char* __thiscall iostream_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ + if(err == 1) return MSVCP_basic_string_char_ctor_cstr(ret, "iostream error"); + return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); +} + /* ?iostream_category@std@@YAABVerror_category@1@XZ */ /* ?iostream_category@std@@YAAEBVerror_category@1@XZ */ const error_category* __cdecl std_iostream_category(void) @@ -710,6 +717,25 @@ const error_category* __cdecl std_iostream_category(void) TRACE("()\n"); return &iostream_category.base; } + +static custom_category system_category; +DEFINE_RTTI_DATA1(system_category, 0, &error_category_rtti_base_descriptor, ".?AV_System_error_category@std@@") + +extern const vtable_ptr MSVCP_system_category_vtable; + +static void system_category_ctor(custom_category *this) +{ + this->base.vtable = &MSVCP_system_category_vtable; + this->type = "system"; +} + +/* ?system_category@std@@YAABVerror_category@1@XZ */ +/* ?system_category@std@@YAAEBVerror_category@1@XZ */ +const error_category* __cdecl std_system_category(void) +{ + TRACE("()\n"); + return &system_category.base; +} #endif #if _MSVCP_VER >= 110 @@ -989,6 +1015,13 @@ void __asm_dummy_vtables(void) { __ASM_VTABLE(iostream_category, VTABLE_ADD_FUNC(custom_category_vector_dtor) VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(iostream_category_message) + VTABLE_ADD_FUNC(custom_category_default_error_condition) + VTABLE_ADD_FUNC(custom_category_equivalent) + VTABLE_ADD_FUNC(custom_category_equivalent_code)); + __ASM_VTABLE(system_category, + VTABLE_ADD_FUNC(custom_category_vector_dtor) + VTABLE_ADD_FUNC(custom_category_name) VTABLE_ADD_FUNC(custom_category_message) VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) @@ -1008,6 +1041,7 @@ void init_misc(void *base) #if _MSVCP_VER == 100 init_error_category_rtti(base); init_iostream_category_rtti(base); + init_system_category_rtti(base); #endif #if _MSVCP_VER >= 110 init__Pad_rtti(base); @@ -1016,6 +1050,7 @@ void init_misc(void *base) #if _MSVCP_VER == 100 iostream_category_ctor(&iostream_category); + system_category_ctor(&system_category); #endif }

1 0

Piotr Caban : msvcp110: Add _Thrd_detach implementation.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: b793e2e4220a3d1c7996d2000d444311230310d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b793e2e4220a3d1c7996d2000… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 10:47:34 2016 +0100 msvcp110: Add _Thrd_detach implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 15 +++++++++++++-- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 5 +++++ 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 09aaac9..87b2392 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3858,7 +3858,7 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ stub _Thrd_detach +@ cdecl _Thrd_detach(ptr) @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 737cfe3..8fdd4e7 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3805,7 +3805,7 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ stub _Thrd_detach +@ cdecl _Thrd_detach(ptr) @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 915f58a..8c7c093 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -203,6 +203,7 @@ static void (__cdecl *p__Thrd_sleep)(const xtime*); static _Thrd_t (__cdecl *p__Thrd_current)(void); static int (__cdecl *p__Thrd_create)(_Thrd_t*, _Thrd_start_t, void*); static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); +static int (__cdecl *p__Thrd_detach)(_Thrd_t); #ifdef __i386__ static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); @@ -486,6 +487,8 @@ static BOOL init(void) "_Thrd_create"); SET(p__Thrd_join, "_Thrd_join"); + SET(p__Thrd_detach, + "_Thrd_detach"); SET(p__Mtx_init, "_Mtx_init"); @@ -1677,7 +1680,8 @@ static int __cdecl thrd_thread(void *arg) { _Thrd_t *thr = arg; - *thr = p__Thrd_current(); + if(thr) + *thr = p__Thrd_current(); return 0x42; } @@ -1759,7 +1763,14 @@ static void test_thrd(void) ok(ta.id == tb.id, "expected %d, got %d\n", ta.id, tb.id); ok(ta.hnd != tb.hnd, "same handles, got %p\n", ta.hnd); ok(r == 0x42, "expected 0x42, got %d\n", r); - ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); + ret = p__Thrd_detach(ta); + ok(ret == 4, "_Thrd_detach should have failed with error 4, got %d\n", ret); + + ret = p__Thrd_create(&ta, thrd_thread, NULL); + ok(!ret, "failed to create thread, got %d\n", ret); + ret = p__Thrd_detach(ta); + ok(!ret, "_Thrd_detach failed, got %d\n", ret); + } #define NUM_THREADS 10 diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index af63a39..12a92fd 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3805,7 +3805,7 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current -@ stub _Thrd_detach +@ cdecl _Thrd_detach(ptr) msvcp120._Thrd_detach @ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fa4ff7b..b1348d5 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -874,6 +874,11 @@ int __cdecl _Thrd_create(_Thrd_t *thr, _Thrd_start_t proc, void *arg) return ret; } +int __cdecl _Thrd_detach(_Thrd_t thr) +{ + return CloseHandle(thr.hnd) ? 0 : _THRD_ERROR; +} + typedef struct { const vtable_ptr *vtable;

1 0

Hugh McMaster : reg: Ignore the slash zero character sequence if a custom separator is specified.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: b57b998354a6ceaa1aae2c6e0864e96fd7f846fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57b998354a6ceaa1aae2c6e0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 25 19:54:09 2016 +1100 reg: Ignore the slash zero character sequence if a custom separator is specified. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0155912..e66ba5a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -290,7 +290,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r for (i = 0, destindex = 0; i < len; i++, destindex++) { - if (data[i] == '\\' && data[i + 1] == '0') + if (!separator && data[i] == '\\' && data[i + 1] == '0') { buffer[destindex] = 0; i++; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 151739c..efb2839 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -391,15 +391,15 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi19 /t REG_MULTI_SZ /s \"#\" /d \"two\\0#strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi19", REG_MULTI_SZ, "two\\0\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "multi19", REG_MULTI_SZ, "two\\0\0strings\0", 15, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi20 /t REG_MULTI_SZ /s \"#\" /d \"two#\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi20", REG_MULTI_SZ, "two\0\\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "multi20", REG_MULTI_SZ, "two\0\\0strings\0", 15, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi21 /t REG_MULTI_SZ /s \"#\" /d \"two\\0\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, 0); RegCloseKey(hkey);

1 0

Hugh McMaster : reg/tests: Test handling of null and user-specified separators.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 3cd90a43bb6e507abc9d29431b7fec08f81dbeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd90a43bb6e507abc9d29431… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 25 19:54:08 2016 +1100 reg/tests: Test handling of null and user-specified separators. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ac01631..151739c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -389,6 +389,18 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi19 /t REG_MULTI_SZ /s \"#\" /d \"two\\0#strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi19", REG_MULTI_SZ, "two\\0\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi20 /t REG_MULTI_SZ /s \"#\" /d \"two#\\0strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi20", REG_MULTI_SZ, "two\0\\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi21 /t REG_MULTI_SZ /s \"#\" /d \"two\\0\\0strings\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, TODO_REG_SIZE|TODO_REG_DATA); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Michael Stefaniuc : webservices: Print the debug string and not the pointer to it.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 1496777d5f536f71c740545e13a4b5e1bdd7c5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1496777d5f536f71c740545e1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 25 09:25:30 2016 +0100 webservices: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f224720..37c2045 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -716,7 +716,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT HRESULT WINAPI WsGetXmlAttribute( WS_XML_READER *handle, const WS_XML_STRING *attr, WS_HEAP *heap, WCHAR **str, ULONG *len, WS_ERROR *error ) { - FIXME( "%p %p %p %p %p %p: stub\n", handle, debugstr_xmlstr(attr), heap, str, len, error ); + FIXME( "%p %s %p %p %p %p: stub\n", handle, debugstr_xmlstr(attr), heap, str, len, error ); return E_NOTIMPL; }

1 0

Alexandre Julliard : makefiles: The tools no longer depend on libwine.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Module: wine Branch: master Commit: 0383509eebb89fb269f45194f82576d2a4ba58a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0383509eebb89fb269f45194f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 18:16:02 2016 +0900 makefiles: The tools no longer depend on libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 91b134f..8c2d856 100644 --- a/Makefile.in +++ b/Makefile.in @@ -137,8 +137,8 @@ install-manpages:: manpages # Dependencies between directories # dependencies needed to build any dll or program -__tooldeps__: libs/port libs/wine libs/wpp -__builddeps__: __tooldeps__ include +__tooldeps__: libs/port libs/wpp +__builddeps__: __tooldeps__ libs/wine include .PHONY: depend dummy check test testclean crosstest __tooldeps__ __builddeps__ dummy: @@ -147,8 +147,7 @@ server: libs/port libs/wine tools include fonts: tools/sfnt2fon include: tools tools/widl libs/wine tools: libs/port -tools/wmc tools/wrc: tools -tools/sfnt2fon tools/wmc tools/wrc: libs/wine +tools/sfnt2fon tools/wmc tools/wrc: tools tools/widl tools/wmc tools/wrc: libs/wpp libs/port libs/wine libs/wpp: include/config.h

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
76
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 February 2016