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

Nikolay Sivov : ole32: Ignore GetMiscStatus() returned value in OleCreate( ).
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: dd958de4eb30a08c53728dc0c2b2dc98b9687b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd958de4eb30a08c53728dc0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:56 2015 +0300 ole32: Ignore GetMiscStatus() returned value in OleCreate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 73008a6c04e9284e617bd4007491c304b8efd2c3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/ole2.c | 56 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 40cb5b9..87a3822 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2592,7 +2592,7 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres)) { DWORD dwStatus; - hres = IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); + IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); } } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 08253a1..28370ca 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -111,7 +111,7 @@ static FORMATETC *g_expected_fetc = NULL; static BOOL g_showRunnable = TRUE; static BOOL g_isRunning = TRUE; -static BOOL g_failGetMiscStatus; +static HRESULT g_GetMiscStatusFailsWith = S_OK; static HRESULT g_QIFailsWith; static UINT cf_test_1, cf_test_2, cf_test_3; @@ -421,12 +421,15 @@ static HRESULT WINAPI OleObject_EnumAdvise static HRESULT WINAPI OleObject_GetMiscStatus ( IOleObject *iface, - DWORD dwAspect, + DWORD aspect, DWORD *pdwStatus ) { CHECK_EXPECTED_METHOD("OleObject_GetMiscStatus"); - if(!g_failGetMiscStatus) + + ok(aspect == DVASPECT_CONTENT, "got aspect %d\n", aspect); + + if (g_GetMiscStatusFailsWith == S_OK) { *pdwStatus = OLEMISC_RECOMPOSEONRESIZE; return S_OK; @@ -434,7 +437,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus else { *pdwStatus = 0x1234; - return E_FAIL; + return g_GetMiscStatusFailsWith; } } @@ -917,6 +920,30 @@ static void test_OleCreate(IStorage *pStorage) { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; + static const struct expected_method methods_olerender_draw_with_site[] = + { + { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", 0 }, + { "OleObject_GetMiscStatus", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectPersistStg_AddRef", 0 }, + { "OleObjectPersistStg_InitNew", 0 }, + { "OleObjectPersistStg_Release", 0 }, + { "OleObject_SetClientSite", 0 }, + { "OleObject_Release", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectRunnable_AddRef", 0 }, + { "OleObjectRunnable_Run", 0 }, + { "OleObjectRunnable_Release", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectCache_AddRef", 0 }, + { "OleObjectCache_Cache", 0 }, + { "OleObjectCache_Release", 0 }, + { "OleObject_Release", 0 }, + { NULL, 0 } + }; static const struct expected_method methods_olerender_format[] = { { "OleObject_QueryInterface", 0 }, @@ -1019,6 +1046,23 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + expected_method_list = methods_olerender_draw_with_site; + trace("OleCreate with OLERENDER_DRAW, with site:\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + + /* GetMiscStatus fails */ + g_GetMiscStatusFailsWith = 0x8fafefaf; + expected_method_list = methods_olerender_draw_with_site; + trace("OleCreate with OLERENDER_DRAW, with site:\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + g_GetMiscStatusFailsWith = S_OK; + formatetc.cfFormat = CF_TEXT; formatetc.ptd = NULL; formatetc.dwAspect = DVASPECT_CONTENT; @@ -1092,7 +1136,7 @@ static void test_OleLoad(IStorage *pStorage) /* Test once with IOleObject_GetMiscStatus failing */ expected_method_list = methods_oleload; - g_failGetMiscStatus = TRUE; + g_GetMiscStatusFailsWith = E_FAIL; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); ok(hr == S_OK || @@ -1108,9 +1152,9 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + g_GetMiscStatusFailsWith = S_OK; /* Test again, let IOleObject_GetMiscStatus succeed. */ - g_failGetMiscStatus = FALSE; expected_method_list = methods_oleload; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject);

1 0

Jacek Caban : kernel32: Don' t set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 0f72df72b94bf1a80a46f30e5896f1e916bb3380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f72df72b94bf1a80a46f30e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 11 15:43:42 2016 +0100 kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e625e86ee126b923703ad3ca728acff09f1e8812) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/tests/security.c | 32 ++++++++++++++++++++++++++++++-- dlls/kernel32/virtual.c | 1 - 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4bc3c02..4eb168a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5336,17 +5336,23 @@ static void test_filemap_security(void) char temp_path[MAX_PATH]; char file_name[MAX_PATH]; DWORD ret, i, access; - HANDLE file, mapping, dup; + HANDLE file, mapping, dup, created_mapping; static const struct { int generic, mapped; + BOOL open_only; } map[] = { { 0, 0 }, { GENERIC_READ, STANDARD_RIGHTS_READ | SECTION_QUERY | SECTION_MAP_READ }, { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE }, { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, - { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } + { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS }, + { SECTION_MAP_READ | SECTION_MAP_WRITE, SECTION_MAP_READ | SECTION_MAP_WRITE }, + { SECTION_MAP_WRITE, SECTION_MAP_WRITE }, + { SECTION_MAP_READ | SECTION_QUERY, SECTION_MAP_READ | SECTION_QUERY }, + { SECTION_QUERY, SECTION_MAP_READ, TRUE }, + { SECTION_QUERY | SECTION_MAP_READ, SECTION_QUERY | SECTION_MAP_READ } }; static const struct { @@ -5375,6 +5381,8 @@ static void test_filemap_security(void) for (i = 0; i < sizeof(prot_map)/sizeof(prot_map[0]); i++) { + if (map[i].open_only) continue; + SetLastError(0xdeadbeef); mapping = CreateFileMappingW(file, NULL, prot_map[i].prot, 0, 4096, NULL); if (prot_map[i].mapped) @@ -5421,6 +5429,8 @@ static void test_filemap_security(void) for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) { + if (map[i].open_only) continue; + SetLastError( 0xdeadbeef ); ret = DuplicateHandle(GetCurrentProcess(), mapping, GetCurrentProcess(), &dup, map[i].generic, FALSE, 0); @@ -5435,6 +5445,24 @@ static void test_filemap_security(void) CloseHandle(mapping); CloseHandle(file); DeleteFileA(file_name); + + created_mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 0x1000, + "Wine Test Open Mapping"); + ok(created_mapping != NULL, "CreateFileMapping failed with error %u\n", GetLastError()); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + if (!map[i].generic) continue; + + mapping = OpenFileMappingA(map[i].generic, FALSE, "Wine Test Open Mapping"); + ok(mapping != NULL, "OpenFileMapping failed with error %d\n", GetLastError()); + access = get_obj_access(mapping); + ok(access == map[i].mapped, "%d: unexpected access flags %#x, expected %#x\n", + i, access, map[i].mapped); + CloseHandle(mapping); + } + + CloseHandle(created_mapping); } static void test_thread_security(void) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index cce707b..32f2d65 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -472,7 +472,6 @@ HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name) RtlInitUnicodeString( &nameW, name ); if (access == FILE_MAP_COPY) access = SECTION_MAP_READ; - access |= SECTION_QUERY; if (GetVersion() & 0x80000000) {

1 0

Sebastian Lackner : cmd: Fix sharing permissions of piped output files.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 181452b5c924dfc366eeb84cb9727f3d7afc6655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181452b5c924dfc366eeb84cb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 7 08:01:38 2016 +0100 cmd: Fix sharing permissions of piped output files. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c634f34aae0d35d3fe9a687abd86e8c0832b7d17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 811ba9f..7543b53 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1207,7 +1207,7 @@ passed --- a batch file can delete itself file correctly deleted --- a batch file can alter itself -(a)todo_wine@bar +bar ---------- Testing copy Passed: Found expected dummy.file Passed: Found expected dir1\file1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index bf988f5..de92e0a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1364,7 +1364,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, if (cmdList && (*cmdList)->pipeFile[0] != 0x00) { WINE_TRACE("Input coming from %s\n", wine_dbgstr_w((*cmdList)->pipeFile)); h = CreateFileW((*cmdList)->pipeFile, GENERIC_READ, - FILE_SHARE_READ, &sa, OPEN_EXISTING, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); @@ -1425,8 +1425,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, } else { WCHAR *param = WCMD_parameter(p, 0, NULL, FALSE, FALSE); - h = CreateFileW(param, GENERIC_WRITE, 0, &sa, creationDisposition, - FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileW(param, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, + &sa, creationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); heap_free(cmd);

1 0

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

12 Apr '16

Module: wine Branch: stable Commit: cc21cc3042ad037beed948ed89bd23884dfbf122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc21cc3042ad037beed948ed8… 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> (cherry picked from commit d2d40b1da3b1b50be216a996af42abe24a27929e) Signed-off-by: Michael Stefaniuc <mstefani(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 ff2b0de..0343e13 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 5db37d4..524b5d0 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

Sebastian Lackner : vmm.vxd: Fix protection flags passed to VirtualAlloc.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 02ec0048a12bac132291fcd78aa38767aa66084b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ec0048a12bac132291fcd78… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 07:10:41 2016 +0100 vmm.vxd: Fix protection flags passed to VirtualAlloc. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7fb74ed9450d75bdb504ba81e1bc28e68ad36421) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vmm.vxd/vmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 7327f78..833a8d1 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -159,7 +159,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) if ( page == PR_PRIVATE || page == PR_SHARED ) page = 0; /* FIXME: Handle flags in some way */ address = (LPVOID )(page * page_size); - ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, 0 ); + ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, PAGE_EXECUTE_READWRITE ); TRACE("PageReserve: returning: %p\n", ret ); if ( ret == NULL ) return -1;

1 0

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

12 Apr '16

Module: wine Branch: stable Commit: e0752ba0fe3875a8329541e7a0bff59bd8d6e5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0752ba0fe3875a8329541e7a… 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> (cherry picked from commit f35c1b2dc123a834d365e0ddb441370b22b97cbc) Signed-off-by: Michael Stefaniuc <mstefani(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 1027b54..e03d860 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -891,6 +891,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

Dmitry Timoshkov : kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 46a2aea3d154e086bd0f8416856c7b847010c197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a2aea3d154e086bd0f84168… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 12 08:52:50 2016 +0100 kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dfbbd55af7e625968473d233671d9aa63ec33f83) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/wine/sortkey.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/libs/wine/sortkey.c b/libs/wine/sortkey.c index 17b5537..7280501 100644 --- a/libs/wine/sortkey.c +++ b/libs/wine/sortkey.c @@ -223,6 +223,16 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1 len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -272,6 +282,16 @@ static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int le len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -321,23 +341,24 @@ static inline int compare_case_weights(int flags, const WCHAR *str1, int len1, len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } -static inline int real_length(const WCHAR *str, int len) -{ - while (len && !str[len - 1]) len--; - return len; -} - int wine_compare_string(int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2) { int ret; - len1 = real_length(str1, len1); - len2 = real_length(str2, len2); - ret = compare_unicode_weights(flags, str1, len1, str2, len2); if (!ret) {

1 0

Sebastian Lackner : kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 5ef43d434c68d5da29c709f7e562d84080b38e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef43d434c68d5da29c709f7e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:24:06 2016 +0100 kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1bebee9c1b119d727991aee50451e36e0865f927) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/locale.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7b0212e..cf003d4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1782,6 +1782,36 @@ static void test_CompareStringA(void) "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); } +static void test_CompareStringW(void) +{ + WCHAR *str1, *str2; + SYSTEM_INFO si; + DWORD old_prot; + BOOL success; + char *buf; + int ret; + + GetSystemInfo(&si); + buf = VirtualAlloc(NULL, si.dwPageSize * 4, MEM_COMMIT, PAGE_READWRITE); + ok(buf != NULL, "VirtualAlloc failed with %u\n", GetLastError()); + success = VirtualProtect(buf + si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + success = VirtualProtect(buf + 3 * si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + + str1 = (WCHAR *)(buf + si.dwPageSize - sizeof(WCHAR)); + str2 = (WCHAR *)(buf + 3 * si.dwPageSize - sizeof(WCHAR)); + *str1 = 'A'; + *str2 = 'B'; + + /* CompareStringW should abort on the first non-matching character */ + ret = CompareStringW(CP_ACP, 0, str1, 100, str2, 100); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + + success = VirtualFree(buf, 0, MEM_RELEASE); + ok(success, "VirtualFree failed with %u\n", GetLastError()); +} + struct comparestringex_test { const char *locale; DWORD flags; @@ -4577,6 +4607,7 @@ START_TEST(locale) test_GetCurrencyFormatA(); /* Also tests the W version */ test_GetNumberFormatA(); /* Also tests the W version */ test_CompareStringA(); + test_CompareStringW(); test_CompareStringEx(); test_LCMapStringA(); test_LCMapStringW();

1 0

Kira Backes : user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: cfa2c8702677435798fc67638235f10359a69479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa2c8702677435798fc67638… Author: Kira Backes <kira.backes(a)nrwsoft.de> Date: Wed Feb 3 23:58:17 2016 -0700 user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support. Signed-off-by: Kira Backes <kira.backes(a)nrwsoft.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 94aee7a738751194969b5cf7f055c4f3727fbf1e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/message.c | 20 +++++++++++--------- include/winuser.h | 11 +++++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 96e7f2e..3e419ee 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2488,7 +2488,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H INT hittest; EVENTMSG event; GUITHREADINFO info; - MOUSEHOOKSTRUCT hook; + MOUSEHOOKSTRUCTEX hook; BOOL eatMsg; /* find the window to dispatch this mouse message to */ @@ -2584,17 +2584,19 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H /* message is accepted now (but may still get dropped) */ - hook.pt = msg->pt; - hook.hwnd = msg->hwnd; - hook.wHitTestCode = hittest; - hook.dwExtraInfo = extra_info; + hook.s.pt = msg->pt; + hook.s.hwnd = msg->hwnd; + hook.s.wHitTestCode = hittest; + hook.s.dwExtraInfo = extra_info; + hook.mouseData = msg->wParam; if (HOOK_CallHooks( WH_MOUSE, remove ? HC_ACTION : HC_NOREMOVE, message, (LPARAM)&hook, TRUE )) { - hook.pt = msg->pt; - hook.hwnd = msg->hwnd; - hook.wHitTestCode = hittest; - hook.dwExtraInfo = extra_info; + hook.s.pt = msg->pt; + hook.s.hwnd = msg->hwnd; + hook.s.wHitTestCode = hittest; + hook.s.dwExtraInfo = extra_info; + hook.mouseData = msg->wParam; HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE ); accept_hardware_message( hw_id, TRUE ); return FALSE; diff --git a/include/winuser.h b/include/winuser.h index 50821f4..cbd592c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -385,6 +385,17 @@ typedef struct ULONG_PTR dwExtraInfo; } MOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT, *LPMOUSEHOOKSTRUCT; +typedef struct +{ + struct { /* MOUSEHOOKSTRUCT */ + POINT pt; + HWND hwnd; + UINT wHitTestCode; + ULONG_PTR dwExtraInfo; + } DUMMYSTRUCTNAME; + DWORD mouseData; +} MOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX; + /* Hardware hook structure */

1 0

Andrew Eikum : xaudio2: Handle openal source allocation failure.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 094d3c7cfbb370ce2d48e5639d06b1960f5bde3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=094d3c7cfbb370ce2d48e5639… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 9 10:39:23 2016 -0600 xaudio2: Handle openal source allocation failure. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ecadabe25b11bbd2bb41facf40dfc592e12632ad) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 04f975c..73e6db1 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -34,6 +34,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); @@ -1399,11 +1400,21 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; return hr; } alGenSources(1, &src->al_src); + if(!src->al_src){ + static int once = 0; + if(!once++) + ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); + HeapFree(GetProcessHeap(), 0, src->fmt); + src->in_use = FALSE; + return E_OUTOFMEMORY; + } + alGenBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, src->al_bufs); alSourcePlay(src->al_src);

1 0