February 2016 - Wine-Commits

Alexandre Julliard : makefiles: The tools no longer depend on libwine.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

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

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

Feb. 25, 2016

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 Feb. 25, 2016

Feb. 25, 2016

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 Feb. 25, 2016

Feb. 25, 2016

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::system_category() implementation.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

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(a)_WU?$char_traits(a)_W@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_sync @ cdecl ?sync_with_stdio(a)ios_base@std@@SA_N_N(a)Z(long) ios_base_sync_with_stdio -@ stub -arch=win32 ?system_category(a)std@@YAABVerror_category(a)1@XZ -@ stub -arch=win64 ?system_category(a)std@@YAAEBVerror_category(a)1@XZ +@ cdecl -arch=win32 ?system_category(a)std@@YAABVerror_category(a)1@XZ() std_system_category +@ cdecl -arch=win64 ?system_category(a)std@@YAAEBVerror_category(a)1@XZ() std_system_category @ stub -arch=win32 ?table@?$ctype(a)D@std@@QBEPBFXZ @ stub -arch=win64 ?table@?$ctype(a)D@std@@QEBAPEBFXZ @ extern -arch=win32 ?table_size@?$ctype(a)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(a)std@@YAABVerror_category(a)1@XZ */ /* ?iostream_category(a)std@@YAAEBVerror_category(a)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(a)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(a)std@@YAABVerror_category(a)1@XZ */ +/* ?system_category(a)std@@YAAEBVerror_category(a)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

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

Feb. 25, 2016

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 Feb. 25, 2016

Feb. 25, 2016

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

Jacek Caban : mshtml: Added IHTMLXMLHttpRequest:: getResponseHeader implementation.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: 206bebfd8fca43b5c8aacbfc5e10c936dfd014ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=206bebfd8fca43b5c8aacbfc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 18:53:10 2016 +0100 mshtml: Added IHTMLXMLHttpRequest::getResponseHeader implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 17 +++++++++++++++++ dlls/mshtml/xmlhttprequest.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 5d11ec0..a16dad1 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -524,6 +524,19 @@ static void test_illegal_xml(IXMLDOMDocument *xmldom) ok(last == NULL, "last != NULL\n"); } +#define set_request_header(a,b,c) _set_request_header(__LINE__,a,b,c) +static void _set_request_header(unsigned line, IHTMLXMLHttpRequest *xhr, const char *header_a, const char *value_a) +{ + BSTR header = a2bstr(header_a), value = a2bstr(value_a); + HRESULT hres; + + hres = IHTMLXMLHttpRequest_setRequestHeader(xhr, header, value); + ok_(__FILE__,line)(hres == S_OK, "setRequestHeader failed: %08x\n", hres); + + SysFreeString(header); + SysFreeString(value); +} + static void test_responseXML(const char *expect_text) { IDispatch *disp; @@ -673,6 +686,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 1, "Expect OPENED, got %d\n", val); + set_request_header(xhr, "x-wine-test", "sync-test"); + SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); SET_EXPECT(xmlhttprequest_onreadystatechange_loading); @@ -835,6 +850,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 1, "Expect OPENED, got %d\n", val); + set_request_header(xhr, "x-wine-test", "async-test"); + SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); SET_EXPECT(xmlhttprequest_onreadystatechange_loading); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index ba6dc05..d55570c 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -613,8 +613,35 @@ static HRESULT WINAPI HTMLXMLHttpRequest_getResponseHeader(IHTMLXMLHttpRequest * static HRESULT WINAPI HTMLXMLHttpRequest_setRequestHeader(IHTMLXMLHttpRequest *iface, BSTR bstrHeader, BSTR bstrValue) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrHeader), debugstr_w(bstrValue)); - return E_NOTIMPL; + char *header_u, *value_u; + nsACString header, value; + nsresult nsres; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrHeader), debugstr_w(bstrValue)); + + header_u = heap_strdupWtoU(bstrHeader); + if(bstrHeader && !header_u) + return E_OUTOFMEMORY; + + value_u = heap_strdupWtoU(bstrValue); + if(bstrValue && !value_u) { + heap_free(header_u); + return E_OUTOFMEMORY; + } + + nsACString_InitDepend(&header, header_u); + nsACString_InitDepend(&value, value_u); + nsres = nsIXMLHttpRequest_SetRequestHeader(This->nsxhr, &header, &value); + nsACString_Finish(&header); + nsACString_Finish(&value); + heap_free(header_u); + heap_free(value_u); + if(NS_FAILED(nsres)) { + ERR("SetRequestHeader failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static const IHTMLXMLHttpRequestVtbl HTMLXMLHttpRequestVtbl = {

1 0

André Hentschel : winmm/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: 4361a1f0902a574daf1dcb0c8b1bacf5b875dd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4361a1f0902a574daf1dcb0c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:21 2016 +0100 winmm/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 12 ++++-------- dlls/winmm/tests/midi.c | 8 +++----- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 7470ed1..14500a5 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -721,10 +721,8 @@ static void test_recordWAVE(HWND hwnd) /* A few ME machines pass all tests except set format tag pcm! */ err = mciSendStringA("record x to 2000 wait", NULL, 0, hwnd); ok(err || !ok_pcm,"can record yet set wave format pcm returned %s\n", dbg_mcierr(ok_pcm)); - if(!ndevs) todo_wine /* with sound disabled */ - ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); - else - ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); + todo_wine_if (!ndevs) /* with sound disabled */ + ok(ndevs > 0 ? !err : err == MCIERR_WAVE_INPUTSUNSUITABLE, "mci record to 2000 returned %s\n", dbg_mcierr(err)); if(err) { if (err==MCIERR_WAVE_INPUTSUNSUITABLE) skip("Please install audio driver. Everything is skipped.\n"); @@ -1165,10 +1163,8 @@ static void test_AutoOpenWAVE(HWND hwnd) test_notification(hwnd, "-prior to auto-open-", 0); err = mciSendStringA("play tempfile.wav notify", buf, sizeof(buf), hwnd); - if(ok_saved==MCIERR_FILE_NOT_FOUND) todo_wine /* same as above */ - ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); - else - ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); + todo_wine_if (ok_saved == MCIERR_FILE_NOT_FOUND) /* same as above */ + ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); if(err) /* FIXME: don't open twice yet, it confuses Wine. */ err = mciSendStringA("play tempfile.wav", buf, sizeof(buf), hwnd); diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 6438dba..b80d5d2 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -800,11 +800,9 @@ static void test_midi_outfns(HWND hwnd) ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*nt,w2k*/), "midiOutGetDevCaps MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); rc = midiOutOpen(&hm, MIDIMAPPER, 0, 0, CALLBACK_NULL); - if (rc==MIDIERR_INVALIDSETUP) todo_wine /* Wine without snd-seq */ - ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k*/), "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); - else - ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k sound disabled*/), - "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); + todo_wine_if (rc == MIDIERR_INVALIDSETUP) /* Wine without snd-seq */ + ok(rc == MMSYSERR_BADDEVICEID || broken(rc == MMSYSERR_NODRIVER /*w2k sound disabled*/), + "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); if (!rc) { rc = midiOutClose(hm); ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc));

1 0

Alexandre Julliard : makefiles: Generate top-level rules for building mo files.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: d5ddc93b82e61a6ca6c3d125643e00b1a1dc7088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ddc93b82e61a6ca6c3d1256… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 17:46:56 2016 +0900 makefiles: Generate top-level rules for building mo files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 21 +++++---------------- configure.ac | 25 ++++++------------------- tools/makedep.c | 35 +++++++++++++++++++++++++---------- 3 files changed, 36 insertions(+), 45 deletions(-) diff --git a/configure b/configure index b11d5fb..6342d91 100755 --- a/configure +++ b/configure @@ -18308,23 +18308,12 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$@" fi -if test "$MSGFMT" != false -then - wine_fn_append_rule "__builddeps__: \$(LINGUAS:%=po/%.mo) -clean:: - \$(RM) \$(LINGUAS:%=po/%.mo)" +test "$MSGFMT" != false || LINGUAS= - posrc="po" - test "$srcdir" = . || posrc="$srcdir/po" - for i in $LINGUAS - do - wine_fn_ignore_file "po/$i.mo" - wine_fn_append_rule "po/$i.mo: $posrc/$i.po - \$(MSGFMT) -o \$@ $posrc/$i.po" - done -else - LINGUAS= -fi +for i in $LINGUAS +do + wine_fn_ignore_file "po/$i.mo" +done if test "x$enable_tools" != xno then diff --git a/configure.ac b/configure.ac index 288224c..9e0dcd9 100644 --- a/configure.ac +++ b/configure.ac @@ -3650,25 +3650,12 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$[@]]) fi -if test "$MSGFMT" != false -then - WINE_APPEND_RULE( -[__builddeps__: \$(LINGUAS:%=po/%.mo) -clean:: - \$(RM) \$(LINGUAS:%=po/%.mo)]) - - posrc="po" - test "$srcdir" = . || posrc="$srcdir/po" - for i in $LINGUAS - do - WINE_IGNORE_FILE("po/$i.mo") - WINE_APPEND_RULE( -[po/$i.mo: $posrc/$i.po - \$(MSGFMT) -o \$@ $posrc/$i.po]) - done -else - LINGUAS= -fi +test "$MSGFMT" != false || LINGUAS= + +for i in $LINGUAS +do + WINE_IGNORE_FILE("po/$i.mo") +done if test "x$enable_tools" != xno then diff --git a/tools/makedep.c b/tools/makedep.c index 70dd753..79ad71d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -146,6 +146,7 @@ static const char *convert; static const char *rsvg; static const char *icotool; static const char *dlltool; +static const char *msgfmt; struct makefile { @@ -2988,16 +2989,6 @@ static struct strarray output_sources( const struct makefile *make ) strarray_addall( &clean_files, all_targets ); strarray_addall( &clean_files, get_expanded_make_var_array( make, "EXTRA_TARGETS" )); - if (clean_files.count) - { - output( "%s::\n", obj_dir_path( make, "clean" )); - output( "\trm -f" ); - output_filenames_obj_dir( make, clean_files ); - output( "\n" ); - if (make->obj_dir) output( "__clean__: %s\n", obj_dir_path( make, "clean" )); - strarray_add( &phony_targets, obj_dir_path( make, "clean" )); - } - if (make->subdirs.count) { struct strarray makefile_deps = empty_strarray; @@ -3022,9 +3013,32 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); strarray_add( &phony_targets, "distclean" ); + if (msgfmt && strcmp( msgfmt, "false" )) + { + strarray_addall( &clean_files, mo_files ); + output( "__builddeps__:" ); + output_filenames( mo_files ); + output( "\n" ); + for (i = 0; i < linguas.count; i++) + { + output( "%s/%s.mo:", obj_dir_path( make, "po" ), linguas.str[i] ); + output( " %s/%s.po\n", src_dir_path( make, "po" ), linguas.str[i] ); + output( "\t%s -o $@ %s/%s.po\n", msgfmt, src_dir_path( make, "po" ), linguas.str[i] ); + } + } if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); } + if (clean_files.count) + { + output( "%s::\n", obj_dir_path( make, "clean" )); + output( "\trm -f" ); + output_filenames_obj_dir( make, clean_files ); + output( "\n" ); + if (make->obj_dir) output( "__clean__: %s\n", obj_dir_path( make, "clean" )); + strarray_add( &phony_targets, obj_dir_path( make, "clean" )); + } + if (phony_targets.count) { output( ".PHONY:" ); @@ -3472,6 +3486,7 @@ int main( int argc, char *argv[] ) rsvg = get_expanded_make_variable( top_makefile, "RSVG" ); icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" ); dlltool = get_expanded_make_variable( top_makefile, "DLLTOOL" ); + msgfmt = get_expanded_make_variable( top_makefile, "MSGFMT" ); if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL; if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL;

1 0