wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

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

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 : 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 -@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 : 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

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

Andrew Eikum : mciqtz: Implement MCI_RESUME.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 7d02fd778133370e6a1b1f8a225d0f62219c6ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d02fd778133370e6a1b1f8a2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:48:52 2016 -0600 mciqtz: Implement MCI_RESUME. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 924c97fe9070c62652c0b19d71469a07a6dd7a60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index d018a54..567792e 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -583,6 +583,29 @@ static DWORD MCIQTZ_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP } /*************************************************************************** + * MCIQTZ_mciResume [internal] + */ +static DWORD MCIQTZ_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + hr = IMediaControl_Run(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot run filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciGetDevCaps [internal] */ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) @@ -1078,6 +1101,9 @@ static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg) case MCI_PAUSE: task->res = MCIQTZ_mciPause(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); break; + case MCI_RESUME: + task->res = MCIQTZ_mciResume(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); + break; case MCI_GETDEVCAPS: task->res = MCIQTZ_mciGetDevCaps(task->devid, task->flags, (LPMCI_GETDEVCAPS_PARMS)task->parms); break; @@ -1158,6 +1184,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: case MCI_STOP: case MCI_PAUSE: + case MCI_RESUME: return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: @@ -1167,7 +1194,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); case MCI_PUT: case MCI_RECORD: - case MCI_RESUME: case MCI_INFO: case MCI_LOAD: case MCI_SAVE:

1 0

Michael Müller : user32: Preserve beginning of extra data for MDI windows.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 59055be4562a15df4f898b49285c2a31acc10123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59055be4562a15df4f898b492… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 26 07:24:51 2016 +0100 user32: Preserve beginning of extra data for MDI windows. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c888a74c5c5811c46f09fc9a598fad722e9727b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/mdi.c | 1 + dlls/user32/tests/msg.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b5a0473..b360528 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -127,6 +127,7 @@ typedef struct * states it must keep coherency with USER32 on its own. This is true for * Windows as well. */ + LONG reserved; UINT nActiveChildren; HWND hwndChildMaximized; HWND hwndActiveChild; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 969b1af..58e1437 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3377,6 +3377,7 @@ static void test_mdi_messages(void) BOOL zoomed; RECT rc; HMENU hMenu = CreateMenu(); + LONG val; if (!mdi_RegisterWindowClasses()) assert(0); @@ -3405,8 +3406,9 @@ static void test_mdi_messages(void) rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, mdi_frame, 0, GetModuleHandleA(0), &client_cs); assert(mdi_client); - ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); + SetWindowLongA(mdi_client, 0, 0xdeadbeef); + ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); ok(GetFocus() == mdi_frame, "input focus should be on MDI frame not on %p\n", GetFocus()); @@ -3864,6 +3866,8 @@ static void test_mdi_messages(void) SetFocus(0); flush_sequence(); + val = GetWindowLongA(mdi_client, 0); + ok(val == 0xdeadbeef || broken(val == 0) /* >= Win Vista */, "Expected 0xdeadbeef, got 0x%x\n", val); DestroyWindow(mdi_client); ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE);

1 0

Alistair Leslie-Hughes : olepro32: Add typelib resource.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 39f843e28f6929a0cadf2e3a26ef78ba1aaed0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f843e28f6929a0cadf2e3a2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 27 20:15:21 2016 +1100 olepro32: Add typelib resource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 25aa26e81537f904f0c2c3df7bbedc3d70128616) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/olepro32/Makefile.in | 2 + dlls/olepro32/olepro.idl | 270 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39f843e28f6929a0cadf2…

1 0

Christopher Thielen : user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture () is called twice.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: a73afbcb10b32fcdb9733b552c6cc1f334ba96ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73afbcb10b32fcdb9733b552… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:32:51 2016 -0800 user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture() is called twice. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9bb87cc71c95f45cd6111b28b687bd753380a4c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/input.c | 2 +- dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 40e35a9..63fae67 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -108,7 +108,7 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) { USER_Driver->pSetCapture( hwnd, gui_flags ); - if (previous && previous != hwnd) + if (previous) SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); if (prev_ret) *prev_ret = previous; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b90f8d0..969b1af 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14906,6 +14906,33 @@ else flush_sequence(); } +static const struct message DoubleSetCaptureSeq[] = +{ + { WM_CAPTURECHANGED, sent }, + { 0 } +}; + +static void test_DoubleSetCapture(void) +{ + HWND hwnd; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test DoubleSetCapture", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + + ShowWindow( hwnd, SW_SHOW ); + UpdateWindow( hwnd ); + flush_events(); + flush_sequence(); + + SetCapture( hwnd ); + SetCapture( hwnd ); + ok_sequence(DoubleSetCaptureSeq, "SetCapture( hwnd ) twice", FALSE); + + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -15045,6 +15072,7 @@ START_TEST(msg) test_layered_window(); test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); + test_DoubleSetCapture(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

Christopher Thielen : comctl32: Ensure that toolbar respond only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 9a80865b5fab0fe8c5aaafc3eba7833893f9d5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a80865b5fab0fe8c5aaafc3e… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:26:47 2016 -0800 comctl32: Ensure that toolbar respond only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ff063d9e250310d3cf8d27371040609b97c24f6c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/toolbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 890c18e..ae6f21e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6807,6 +6807,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_MouseLeave (infoPtr); case WM_CAPTURECHANGED: + if (hwnd == (HWND)lParam) return 0; return TOOLBAR_CaptureChanged(infoPtr); case WM_NCACTIVATE:

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
75
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 April 2016