December 2015 - Wine-commits

Sebastian Lackner : ntdll: ProcessDebugFlags should return debug_children flag instead of !debugger_present.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 1980834c7d7ee3eb32fa9ece20673d9c39a74b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1980834c7d7ee3eb32fa9ece2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 05:18:50 2015 +0100 ntdll: ProcessDebugFlags should return debug_children flag instead of !debugger_present. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 2 +- dlls/ntdll/tests/info.c | 12 ++---------- include/wine/server_protocol.h | 5 +++-- server/debugger.c | 2 +- server/process.c | 5 +++-- server/protocol.def | 3 ++- server/request.h | 1 + server/trace.c | 1 + 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index ca9462a..5a5c3ef 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -339,7 +339,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( req->handle = wine_server_obj_handle( ProcessHandle ); if ((ret = wine_server_call( req )) == STATUS_SUCCESS) { - *(DWORD *)ProcessInformation = !reply->debugger_present; + *(DWORD *)ProcessInformation = reply->debug_children; } } SERVER_END_REQ; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 88d0417..a521447 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1345,11 +1345,7 @@ static void test_query_process_debug_flags(int argc, char **argv) status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - if (!expected_flags) - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); - else - todo_wine - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); + ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); if (!(test_flags[i] & CREATE_SUSPENDED)) { @@ -1379,11 +1375,7 @@ static void test_query_process_debug_flags(int argc, char **argv) status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - if (expected_flags) - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); - else - todo_wine - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); + ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); ret = DebugActiveProcess(pi.dwProcessId); ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError()); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4e33260..f0dc65a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -857,7 +857,8 @@ struct get_process_info_reply int exit_code; int priority; cpu_type_t cpu; - int debugger_present; + short int debugger_present; + short int debug_children; }; @@ -6153,6 +6154,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 490 +#define SERVER_PROTOCOL_VERSION 491 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 374f2ad..810e8d3 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -443,6 +443,7 @@ static int debugger_attach( struct process *process, struct thread *debugger ) resume_process( process ); return 0; } + process->debug_children = 0; return 1; error: @@ -483,7 +484,6 @@ int debugger_detach( struct process *process, struct thread *debugger ) /* remove relationships between process and its debugger */ process->debugger = NULL; - process->debug_children = 0; if (!set_process_debug_flag( process, 0 )) clear_error(); /* ignore error */ /* from this function */ diff --git a/server/process.c b/server/process.c index e00b429..8433002 100644 --- a/server/process.c +++ b/server/process.c @@ -513,7 +513,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->priority = PROCESS_PRIOCLASS_NORMAL; process->suspend = 0; process->is_system = 0; - process->debug_children = 0; + process->debug_children = 1; process->is_terminating = 0; process->job = NULL; process->console = NULL; @@ -1228,7 +1228,7 @@ DECL_HANDLER(new_process) else if (parent->debugger && parent->debug_children) { set_process_debugger( process, parent->debugger ); - process->debug_children = 1; + /* debug_children is set to 1 by default */ } if (!(req->create_flags & CREATE_NEW_PROCESS_GROUP)) @@ -1359,6 +1359,7 @@ DECL_HANDLER(get_process_info) reply->end_time = process->end_time; reply->cpu = process->cpu; reply->debugger_present = !!process->debugger; + reply->debug_children = process->debug_children; release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 04814c9..bfb9089 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -818,7 +818,8 @@ struct rawinput_device int exit_code; /* process exit code */ int priority; /* priority class */ cpu_type_t cpu; /* CPU that this process is running on */ - int debugger_present; /* process is being debugged */ + short int debugger_present; /* process is being debugged */ + short int debug_children; /* inherit debugger to child processes */ @END diff --git a/server/request.h b/server/request.h index 48f4d46..9653f0c 100644 --- a/server/request.h +++ b/server/request.h @@ -760,6 +760,7 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, cpu) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, debugger_present) == 60 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, debug_children) == 62 ); C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, mask) == 16 ); diff --git a/server/trace.c b/server/trace.c index 4ec7aad..405a1c9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1279,6 +1279,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re fprintf( stderr, ", priority=%d", req->priority ); dump_cpu_type( ", cpu=", &req->cpu ); fprintf( stderr, ", debugger_present=%d", req->debugger_present ); + fprintf( stderr, ", debug_children=%d", req->debug_children ); } static void dump_set_process_info_request( const struct set_process_info_request *req )

1 0

Nikolay Sivov : kernel32/tests: Some tests for ZombifyActCtx().
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: fe2f86e93480698e0acce4c8ce67f8eb2b501518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2f86e93480698e0acce4c8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:10:04 2015 +0300 kernel32/tests: Some tests for ZombifyActCtx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index fcce93b..64176cb 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -40,6 +40,7 @@ static BOOL (WINAPI *pIsDebuggerPresent)(void); static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pFindActCtxSectionGuid)(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA); +static BOOL (WINAPI *pZombifyActCtx)(HANDLE); static NTSTATUS(NTAPI *pRtlFindActivationContextSectionString)(DWORD,const GUID *,ULONG,PUNICODE_STRING,PACTCTX_SECTION_KEYED_DATA); static BOOLEAN (NTAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, PCSZ); @@ -2425,6 +2426,7 @@ static BOOL init_funcs(void) X(QueryActCtxW); X(ReleaseActCtx); X(FindActCtxSectionGuid); + X(ZombifyActCtx); hLibrary = GetModuleHandleA("ntdll.dll"); X(RtlFindActivationContextSectionString); @@ -2435,6 +2437,77 @@ static BOOL init_funcs(void) return TRUE; } +static void test_ZombifyActCtx(void) +{ + ACTIVATION_CONTEXT_BASIC_INFORMATION basicinfo; + ULONG_PTR cookie; + HANDLE handle, current; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = pZombifyActCtx(NULL); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + handle = create_manifest("test.manifest", testdep_manifest3, __LINE__); + + ret = pGetCurrentActCtx(&current); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(current == NULL, "got %p\n", current); + + ret = pActivateActCtx(handle, &cookie); + ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + + ret = pGetCurrentActCtx(&current); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(handle == current, "got %p, %p\n", current, handle); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(0, handle, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + ret = pZombifyActCtx(handle); +todo_wine + ok(ret, "got %d\n", ret); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(0, handle, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + ret = pGetCurrentActCtx(&current); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(current == handle, "got %p\n", current); + + /* one more time */ + ret = pZombifyActCtx(handle); +todo_wine + ok(ret, "got %d\n", ret); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); + pReleaseActCtx(handle); +} + START_TEST(actctx) { int argc; @@ -2457,5 +2530,6 @@ START_TEST(actctx) test_actctx(); test_CreateActCtx(); test_findsectionstring(); + test_ZombifyActCtx(); run_child_process(); }

1 0

Sebastian Lackner : server: Fix assignment of primary_group in token_duplicate.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 25b0a4981b137dcbf52dc18e85690fba11e2488b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b0a4981b137dcbf52dc18e8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 05:32:35 2015 +0100 server: Fix assignment of primary_group in token_duplicate. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/token.c b/server/token.c index 42cfb3d..6c2871f 100644 --- a/server/token.c +++ b/server/token.c @@ -559,6 +559,7 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, if (!token) return token; /* copy groups */ + token->primary_group = NULL; LIST_FOR_EACH_ENTRY( group, &src_token->groups, struct group, entry ) { size_t size = FIELD_OFFSET( struct group, sid.SubAuthority[group->sid.SubAuthorityCount] ); @@ -570,8 +571,9 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, } memcpy( newgroup, group, size ); list_add_tail( &token->groups, &newgroup->entry ); + if (src_token->primary_group == &group->sid) + token->primary_group = &newgroup->sid; } - token->primary_group = src_token->primary_group; assert( token->primary_group ); /* copy privileges */

1 0

Nikolay Sivov : user32/tests: One more activation context test for interthread SendMessage.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 69ec6f226e48949f020afe55b862d5e98618b5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ec6f226e48949f020afe55b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:10:27 2015 +0300 user32/tests: One more activation context test for interthread SendMessage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b90f8d0..c2a0557 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -76,6 +76,7 @@ static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,void*,ULONG,void*,SIZE_T,SIZE_T*); static void (WINAPI *pReleaseActCtx)(HANDLE); /* encoded DRAWITEMSTRUCT into an LPARAM */ @@ -7742,6 +7743,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, case WM_USER+10: { + ACTIVATION_CONTEXT_BASIC_INFORMATION basicinfo; HANDLE handle, event = (HANDLE)lParam; BOOL ret; @@ -7749,6 +7751,14 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, ret = pGetCurrentActCtx(&handle); ok(ret, "failed to get current context, %u\n", GetLastError()); ok(handle == 0, "got active context %p\n", handle); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, handle, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == NULL, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + if (event) SetEvent(event); return 1; } @@ -14915,6 +14925,7 @@ static void init_funcs(void) X(CreateActCtxW); X(DeactivateActCtx); X(GetCurrentActCtx); + X(QueryActCtxW); X(ReleaseActCtx); #undef X }

1 0

Nikolay Sivov : user.exe: Fix MapDialogRect() to actually convert passed rectangle (Coverity).
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: eee6332e95d2a39b79e4410ebdfc075250277d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee6332e95d2a39b79e4410eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:13:56 2015 +0300 user.exe: Fix MapDialogRect() to actually convert passed rectangle (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index a194a58..fead42d 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -658,7 +658,7 @@ LRESULT WINAPI SendDlgItemMessage16( HWND16 hwnd, INT16 id, UINT16 msg, */ void WINAPI MapDialogRect16( HWND16 hwnd, LPRECT16 rect ) { - RECT rect32; + RECT rect32 = { rect->left, rect->top, rect->right, rect->bottom }; MapDialogRect( WIN_Handle32(hwnd), &rect32 ); rect->left = rect32.left; rect->right = rect32.right;

1 0

Nikolay Sivov : ole2nls: Fix CompareString() prototype.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: e5d7d69f7225991ba6df6b1986cc04a3d2037940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7d69f7225991ba6df6b198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:15:59 2015 +0300 ole2nls: Fix CompareString() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2nls.dll16/ole2nls.c | 5 ++--- include/wine/winbase16.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ole2nls.dll16/ole2nls.c b/dlls/ole2nls.dll16/ole2nls.c index b21601b..68db449 100644 --- a/dlls/ole2nls.dll16/ole2nls.c +++ b/dlls/ole2nls.dll16/ole2nls.c @@ -104,10 +104,9 @@ INT16 WINAPI LCMapString16(LCID lcid, DWORD mapflags, LPCSTR srcstr, INT16 srcle /*********************************************************************** * CompareStringA (OLE2NLS.8) */ -UINT16 WINAPI CompareString16(DWORD lcid,DWORD fdwStyle, - LPCSTR s1,DWORD l1,LPCSTR s2,DWORD l2) +INT16 WINAPI CompareString16(LCID lcid, DWORD flags, LPCSTR str1, INT16 len1, LPCSTR str2, INT16 len2) { - return (UINT16)CompareStringA(lcid,fdwStyle,s1,l1,s2,l2); + return CompareStringA(lcid, flags, str1, len1, str2, len2); } /****************************************************************************** diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 310d5f6..f2f32a2 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -435,7 +435,7 @@ VOID WINAPI _LeaveWin16Lock(void); INT16 WINAPI AccessResource16(HINSTANCE16,HRSRC16); ATOM WINAPI AddAtom16(LPCSTR); -UINT16 WINAPI CompareString16(DWORD,DWORD,LPCSTR,DWORD,LPCSTR,DWORD); +INT16 WINAPI CompareString16(LCID,DWORD,LPCSTR,INT16,LPCSTR,INT16); BOOL16 WINAPI CreateDirectory16(LPCSTR,LPVOID); BOOL16 WINAPI DefineHandleTable16(WORD); ATOM WINAPI DeleteAtom16(ATOM);

1 0

Andrey Melnikov : gdi32: Handle NULL filename in GetICMProfileA().
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: d4d304f4365134a6aec0fad18989e3c5f1950fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d304f4365134a6aec0fad18… Author: Andrey Melnikov <temnota.am(a)gmail.com> Date: Mon Dec 21 12:22:41 2015 +0300 gdi32: Handle NULL filename in GetICMProfileA(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrey Melnikov <temnota.am(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/icm.c | 9 ++++++++- dlls/gdi32/tests/icm.c | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index d3a345d..9d0e2f6 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -116,11 +116,18 @@ BOOL WINAPI GetICMProfileA(HDC hdc, LPDWORD size, LPSTR filename) TRACE("%p, %p, %p\n", hdc, size, filename); - if (!hdc || !size || !filename) return FALSE; + if (!hdc || !size) return FALSE; if (GetICMProfileW(hdc, &buflen, filenameW)) { int len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + + if (!filename) + { + *size = len; + return FALSE; + } + if (*size >= len) { WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, *size, NULL, NULL); diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 764d0d2..6208090 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -55,7 +55,6 @@ static void test_GetICMProfileA( HDC dc ) size = 0; ret = GetICMProfileA( dc, &size, NULL ); ok( !ret, "GetICMProfileA succeeded\n" ); -todo_wine ok( size > 0, "got %u\n", size ); size = MAX_PATH;

1 0

Piotr Caban : winex11.drv: Ignore effect returned in IDropTarget:: DragEnter.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: a2f3d9740642ca6d4a7c63175f7e8db34120c2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f3d9740642ca6d4a7c63175… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:12 2015 +0100 winex11.drv: Ignore effect returned in IDropTarget::DragEnter. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 01af480..b066751 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -305,17 +305,13 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) XDNDLastDropTargetWnd = dropTargetWindow; if (dropTarget) { + DWORD effect_ignore = effect; hr = IDropTarget_DragEnter(dropTarget, &XDNDDataObject, MK_LBUTTON, pointl, &effect); - if (SUCCEEDED(hr)) + if (hr == S_OK) { - if (effect != DROPEFFECT_NONE) - { - XDNDAccepted = TRUE; - TRACE("the application accepted the drop\n"); - } - else - TRACE("the application refused the drop\n"); + XDNDAccepted = TRUE; + TRACE("the application accepted the drop (effect = %d)\n", effect_ignore); } else WARN("IDropTarget_DragEnter failed, error 0x%08X\n", hr); @@ -340,7 +336,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (X11DRV_XDND_XdndActionToDROPEFFECT(event->data.l[4]) & DROPEFFECT_COPY) && + (effect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { accept = 1;

1 0

Piotr Caban : winex11.drv: Call DragLeave instead of Drop if DROPEFFECT_NONE was set.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: fd4dbf0519c3b6126fdc906934d2eee5f825e32f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4dbf0519c3b6126fdc90693… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:18 2015 +0100 winex11.drv: Call DragLeave instead of Drop if DROPEFFECT_NONE was set. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b066751..d5881ad 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -386,7 +386,7 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) { dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); - if (dropTarget) + if (dropTarget && effect!=DROPEFFECT_NONE) { HRESULT hr; POINTL pointl; @@ -415,6 +415,13 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) } IDropTarget_Release(dropTarget); } + else if (dropTarget) + { + HRESULT hr = IDropTarget_DragLeave(dropTarget); + if (FAILED(hr)) + WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr); + IDropTarget_Release(dropTarget); + } } if (drop_file)

1 0

Piotr Caban : winex11.drv: Only update drop effect if IDropTarget:: DragOver returned S_OK.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: c96589421a5fdf216daed54f20752e63cb31e1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96589421a5fdf216daed54f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:22 2015 +0100 winex11.drv: Only update drop effect if IDropTarget::DragOver returned S_OK. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index d5881ad..841eaff 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -325,7 +325,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (dropTarget) { hr = IDropTarget_DragOver(dropTarget, MK_LBUTTON, pointl, &effect); - if (SUCCEEDED(hr)) + if (hr != S_OK) XDNDDropEffect = effect; else WARN("IDropTarget_DragOver failed, error 0x%08X\n", hr);

1 0