May 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Mouse drags don' t imply anything about z-order of target window because of implicit capture .
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 3eee56668ae20c3356ad296eb934f5faa3ebaf6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eee56668ae20c3356ad296eb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:52 2013 -0500 winemac: Mouse drags don't imply anything about z-order of target window because of implicit capture. --- dlls/winemac.drv/cocoa_app.m | 4 +++- dlls/winemac.drv/cocoa_event.m | 3 ++- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 16 ++++++++-------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b4e15d0..52b6f2d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1157,12 +1157,13 @@ int macdrv_err_on; - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; + BOOL drag = [anEvent type] != NSMouseMoved; /* Because of the way -[NSWindow setAcceptsMouseMovedEvents:] works, the event indicates its window is the main window, even if the cursor is over a different window. Find the actual WineWindow that is under the cursor and post the event as being for that window. */ - if ([anEvent type] == NSMouseMoved) + if (!drag) { CGPoint cgpoint = CGEventGetLocation([anEvent CGEvent]); NSPoint point = [self flippedMouseLocation:NSPointFromCGPoint(cgpoint)]; @@ -1276,6 +1277,7 @@ int macdrv_err_on; if (event->type == MOUSE_MOVED_ABSOLUTE || event->mouse_moved.x || event->mouse_moved.y) { event->mouse_moved.time_ms = [self ticksForEventTime:[anEvent timestamp]]; + event->mouse_moved.drag = drag; [targetWindow.queue postEvent:event]; } diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 7c41d26..8d997d0 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -162,7 +162,8 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea (lastEvent = [events lastObject]) && (lastEvent->event->type == MOUSE_MOVED || lastEvent->event->type == MOUSE_MOVED_ABSOLUTE) && - lastEvent->event->window == event->event->window) + lastEvent->event->window == event->event->window && + lastEvent->event->mouse_moved.drag == event->event->mouse_moved.drag) { if (event->event->type == MOUSE_MOVED) { diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 39f229d..eb3ed88 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -227,6 +227,7 @@ typedef struct macdrv_event { struct { int x; int y; + int drag; unsigned long time_ms; } mouse_moved; struct { diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index da3cc31..248684d 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -134,14 +134,14 @@ static const CFStringRef cocoa_cursor_names[] = * Update the various window states on a mouse event. */ static void send_mouse_input(HWND hwnd, UINT flags, int x, int y, - DWORD mouse_data, unsigned long time) + DWORD mouse_data, BOOL drag, unsigned long time) { INPUT input; HWND top_level_hwnd; top_level_hwnd = GetAncestor(hwnd, GA_ROOT); - if ((flags & MOUSEEVENTF_MOVE) && (flags & MOUSEEVENTF_ABSOLUTE)) + if ((flags & MOUSEEVENTF_MOVE) && (flags & MOUSEEVENTF_ABSOLUTE) && !drag) { RECT rect; @@ -854,7 +854,7 @@ void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) send_mouse_input(hwnd, flags | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, event->mouse_button.x, event->mouse_button.y, - data, event->mouse_button.time_ms); + data, FALSE, event->mouse_button.time_ms); } @@ -867,16 +867,16 @@ void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) { UINT flags = MOUSEEVENTF_MOVE; - TRACE("win %p/%p %s (%d,%d) time %lu (%lu ticks ago)\n", hwnd, event->window, + TRACE("win %p/%p %s (%d,%d) drag %d time %lu (%lu ticks ago)\n", hwnd, event->window, (event->type == MOUSE_MOVED) ? "relative" : "absolute", - event->mouse_moved.x, event->mouse_moved.y, + event->mouse_moved.x, event->mouse_moved.y, event->mouse_moved.drag, event->mouse_moved.time_ms, (GetTickCount() - event->mouse_moved.time_ms)); if (event->type == MOUSE_MOVED_ABSOLUTE) flags |= MOUSEEVENTF_ABSOLUTE; send_mouse_input(hwnd, flags, event->mouse_moved.x, event->mouse_moved.y, - 0, event->mouse_moved.time_ms); + 0, event->mouse_moved.drag, event->mouse_moved.time_ms); } @@ -894,8 +894,8 @@ void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) send_mouse_input(hwnd, MOUSEEVENTF_WHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, event->mouse_scroll.x, event->mouse_scroll.y, - event->mouse_scroll.y_scroll, event->mouse_scroll.time_ms); + event->mouse_scroll.y_scroll, FALSE, event->mouse_scroll.time_ms); send_mouse_input(hwnd, MOUSEEVENTF_HWHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, event->mouse_scroll.x, event->mouse_scroll.y, - event->mouse_scroll.x_scroll, event->mouse_scroll.time_ms); + event->mouse_scroll.x_scroll, FALSE, event->mouse_scroll.time_ms); }

1 0

Ken Thomases : winemac: Implement SetCapture().
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 1a697e15b9c156a9e7586a8620dd4e2141f780e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a697e15b9c156a9e7586a862… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:55 2013 -0500 winemac: Implement SetCapture(). --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 145 ++++++++++++++++++++++++------------- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 31 +++++++-- dlls/winemac.drv/winemac.drv.spec | 3 +- 6 files changed, 125 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a697e15b9c156a9e7586…

1 0

Dmitry Timoshkov : server: Add a process flag indicating whether the process is terminating, use it to block thread creation in a being terminated process.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: af3d73b035752033e51bee09dd4a62df5b846069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3d73b035752033e51bee09d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 15:39:27 2013 +0900 server: Add a process flag indicating whether the process is terminating, use it to block thread creation in a being terminated process. --- dlls/kernel32/tests/loader.c | 1 - server/process.c | 3 +++ server/process.h | 1 + server/thread.c | 6 ++++++ 4 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index d119196..e4176b5 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1525,7 +1525,6 @@ static void child_process(const char *dll_name, DWORD target_offset) SetLastError(0xdeadbeef); thread = CreateThread(NULL, 0, noop_thread_proc, &dummy, 0, &ret); -todo_wine ok(!thread || broken(thread != 0) /* before win7 */, "CreateThread should fail\n"); if (!thread) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); diff --git a/server/process.c b/server/process.c index 74a289a..89c08dc 100644 --- a/server/process.c +++ b/server/process.c @@ -323,6 +323,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->suspend = 0; process->is_system = 0; process->debug_children = 0; + process->is_terminating = 0; process->console = NULL; process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; @@ -570,6 +571,8 @@ static void terminate_process( struct process *process, struct thread *skip, int struct thread *thread; grab_object( process ); /* make sure it doesn't get freed when threads die */ + process->is_terminating = 1; + restart: LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) { diff --git a/server/process.h b/server/process.h index f216ecd..a50b537 100644 --- a/server/process.h +++ b/server/process.h @@ -74,6 +74,7 @@ struct process int suspend; /* global process suspend count */ unsigned int is_system:1; /* is it a system process? */ unsigned int debug_children:1;/* also debug all child processes */ + unsigned int is_terminating:1;/* is process terminating? */ struct list locks; /* list of file locks owned by the process */ struct list classes; /* window classes owned by the process */ struct console_input*console; /* console input */ diff --git a/server/thread.c b/server/thread.c index 69d547c..b54b3b1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -214,6 +214,12 @@ struct thread *create_thread( int fd, struct process *process ) { struct thread *thread; + if (process->is_terminating) + { + set_error( STATUS_PROCESS_IS_TERMINATING ); + return NULL; + } + if (!(thread = alloc_object( &thread_ops ))) return NULL; init_thread_structure( thread );

1 0

Dmitry Timoshkov : server: Fail to set process affinity mask if the process is terminating.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: bac0387d297ea547e69784d5372acf0586b5cc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac0387d297ea547e69784d53… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 15:40:34 2013 +0900 server: Fail to set process affinity mask if the process is terminating. --- dlls/kernel32/tests/loader.c | 3 +-- server/process.c | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e4176b5..a45235f 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1958,7 +1958,7 @@ todo_wine /* Checking process state without waiting for process termination * leads to different results due to a race condition. */ - ret = WaitForSingleObject(pi.hProcess, 100); + ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); memset(&pbi, 0, sizeof(pbi)); @@ -1967,7 +1967,6 @@ todo_wine ok(pbi.ExitStatus == 198, "expected 198, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(pi.hProcess, ProcessAffinityMask, &affinity, sizeof(affinity)); -todo_wine ok(ret == STATUS_PROCESS_IS_TERMINATING, "expected STATUS_PROCESS_IS_TERMINATING, got %#x\n", ret); SetLastError(0xdeadbeef); diff --git a/server/process.c b/server/process.c index 89c08dc..61d9d17 100644 --- a/server/process.c +++ b/server/process.c @@ -1122,6 +1122,12 @@ static void set_process_affinity( struct process *process, affinity_t affinity ) { struct thread *thread; + if (!process->running_threads) + { + set_error( STATUS_PROCESS_IS_TERMINATING ); + return; + } + process->affinity = affinity; LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry )

1 0

Dmitry Timoshkov : kernel32: Hold PEB lock during process exit.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 77f222505cdb392f2880932671051b345bf64078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f222505cdb392f288093267… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 15:42:29 2013 +0900 kernel32: Hold PEB lock during process exit. --- dlls/kernel32/process.c | 2 ++ dlls/kernel32/tests/loader.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7abb732..683385f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2630,6 +2630,7 @@ __ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitPr void WINAPI process_ExitProcess( DWORD status ) { + RtlAcquirePebLock(); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); @@ -2639,6 +2640,7 @@ void WINAPI process_ExitProcess( DWORD status ) void WINAPI ExitProcess( DWORD status ) { + RtlAcquirePebLock(); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index a45235f..17e6cd8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1872,7 +1872,6 @@ static void test_ExitProcess(void) ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine ok(ret == WAIT_TIMEOUT, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -1882,7 +1881,6 @@ todo_wine ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); -todo_wine ok(ret == 199, "expected exit code 199, got %u\n", ret); if (*child_failures) {

1 0

André Hentschel : d3drm: Return a IDirect3DRMTexture in texture loading methods instead of error.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 7f5a3a4d802a138c191dfd62e3a0ad02998df04d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5a3a4d802a138c191dfd62e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 5 21:03:33 2013 +0200 d3drm: Return a IDirect3DRMTexture in texture loading methods instead of error. --- dlls/d3drm/d3drm.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 9c3c21f..5d33402 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -317,22 +317,24 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM* iface, D3DRM return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_LoadTexture(IDirect3DRM* iface, const char * filename, LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_LoadTexture(IDirect3DRM* iface, const char* filename, + LPDIRECT3DRMTEXTURE* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, ppTexture); + FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)Texture); } -static HRESULT WINAPI IDirect3DRMImpl_LoadTextureFromResource(IDirect3DRM* iface, HRSRC rs, LPDIRECT3DRMTEXTURE * ppTexture) +static HRESULT WINAPI IDirect3DRMImpl_LoadTextureFromResource(IDirect3DRM* iface, HRSRC rs, + LPDIRECT3DRMTEXTURE* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, rs, ppTexture); + FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, rs, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRMImpl_SetSearchPath(IDirect3DRM* iface, LPCSTR path) @@ -699,25 +701,25 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2* iface, const char * filename, - LPDIRECT3DRMTEXTURE2 * ppTexture) +static HRESULT WINAPI IDirect3DRM2Impl_LoadTexture(IDirect3DRM2* iface, const char* filename, + LPDIRECT3DRMTEXTURE2* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, ppTexture); + FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM2Impl_LoadTextureFromResource(IDirect3DRM2* iface, HMODULE hModule, LPCSTR strName, LPCSTR strType, - LPDIRECT3DRMTEXTURE2 * ppTexture) + LPDIRECT3DRMTEXTURE2* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, hModule, strName, strType, ppTexture); + FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, hModule, strName, strType, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture2, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM2Impl_SetSearchPath(IDirect3DRM2* iface, LPCSTR path) @@ -1116,18 +1118,18 @@ static HRESULT WINAPI IDirect3DRM3Impl_LoadTexture(IDirect3DRM3* iface, const ch FIXME("(%p/%p)->(%s,%p): stub\n", iface, This, filename, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM3Impl_LoadTextureFromResource(IDirect3DRM3* iface, HMODULE mod, LPCSTR strName, LPCSTR strType, - LPDIRECT3DRMTEXTURE3 * ppTexture) + LPDIRECT3DRMTEXTURE3* Texture) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, mod, strName, strType, ppTexture); + FIXME("(%p/%p)->(%p,%p,%p,%p): stub\n", iface, This, mod, strName, strType, Texture); - return E_NOTIMPL; + return Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (IUnknown **)Texture); } static HRESULT WINAPI IDirect3DRM3Impl_SetSearchPath(IDirect3DRM3* iface, LPCSTR path)

1 0

Alexandre Julliard : server: Use strerror instead of perror.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: ea919d9de483223777948422e5c134bd73791ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea919d9de483223777948422e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 12:19:22 2013 +0200 server: Use strerror instead of perror. --- server/registry.c | 8 +++--- server/request.c | 76 ++++++++++++++++++++-------------------------------- server/request.h | 5 --- server/thread.c | 2 +- 4 files changed, 34 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea919d9de483223777948…

1 0

Nikolay Sivov : msxml3: Explicitly use NULL_tid to terminate support error id arrays.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 6a7bf66b29752c15df342c21e6d5dfe698cfbe90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7bf66b29752c15df342c21e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:07:28 2013 +0400 msxml3: Explicitly use NULL_tid to terminate support error id arrays. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/node.c | 2 +- dlls/msxml3/pi.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 9ab3035..70dee2a 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -53,7 +53,7 @@ typedef struct _domattr static const tid_t domattr_se_tids[] = { IXMLDOMNode_tid, IXMLDOMAttribute_tid, - 0 + NULL_tid }; static inline domattr *impl_from_IXMLDOMAttribute( IXMLDOMAttribute *iface ) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 61c0ce2..2fcacff 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -52,7 +52,7 @@ typedef struct static const tid_t domcdata_se_tids[] = { IXMLDOMNode_tid, IXMLDOMCDATASection_tid, - 0 + NULL_tid }; static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface ) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 879ca48..12a584d 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -52,7 +52,7 @@ typedef struct _domcomment static const tid_t domcomment_se_tids[] = { IXMLDOMNode_tid, IXMLDOMComment_tid, - 0 + NULL_tid }; static inline domcomment *impl_from_IXMLDOMComment( IXMLDOMComment *iface ) diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index f066290..1b56885 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -52,7 +52,7 @@ typedef struct _domfrag static const tid_t domfrag_se_tids[] = { IXMLDOMNode_tid, IXMLDOMDocumentFragment_tid, - 0 + NULL_tid }; static inline domfrag *impl_from_IXMLDOMDocumentFragment( IXMLDOMDocumentFragment *iface ) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b607997..e98fa72 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -859,7 +859,7 @@ static const tid_t domdoc_se_tids[] = { IXMLDOMDocument_tid, IXMLDOMDocument2_tid, IXMLDOMDocument3_tid, - 0 + NULL_tid }; static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID riid, void** ppvObject ) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 20cd9b7..5e8822e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -58,7 +58,7 @@ static const struct nodemap_funcs domelem_attr_map; static const tid_t domelem_se_tids[] = { IXMLDOMNode_tid, IXMLDOMElement_tid, - 0 + NULL_tid }; static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index f2d46ab..1c0309a 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -52,7 +52,7 @@ typedef struct _entityref static const tid_t domentityref_se_tids[] = { IXMLDOMNode_tid, IXMLDOMEntityReference_tid, - 0 + NULL_tid }; static inline entityref *impl_from_IXMLDOMEntityReference( IXMLDOMEntityReference *iface ) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index be47a75..79de75c 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -150,7 +150,7 @@ static HRESULT WINAPI SupportErrorInfo_InterfaceSupportsErrorInfo(ISupportErrorI TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); tid = This->iids; - while (*tid) + while (*tid != NULL_tid) { if (IsEqualGUID(riid, get_riid_from_tid(*tid))) return S_OK; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4d1cab7..6b8fc12 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -54,7 +54,7 @@ static const struct nodemap_funcs dom_pi_attr_map; static const tid_t dompi_se_tids[] = { IXMLDOMNode_tid, IXMLDOMProcessingInstruction_tid, - 0 + NULL_tid }; static inline dom_pi *impl_from_IXMLDOMProcessingInstruction( IXMLDOMProcessingInstruction *iface )

1 0

Hans Leidekker : msi: Treat an empty install location as missing.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: b98ef8f087c0c4a75af6dcf6cb214f5e976594ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98ef8f087c0c4a75af6dcf6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 7 15:00:55 2013 +0200 msi: Treat an empty install location as missing. --- dlls/msi/action.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 827a0c8..cf03fa2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2305,9 +2305,12 @@ static WCHAR *get_install_location( MSIPACKAGE *package ) WCHAR *path; if (!package->ProductCode) return NULL; - if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE )) - return NULL; - path = msi_reg_get_val_str( hkey, szInstallLocation ); + if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE )) return NULL; + if ((path = msi_reg_get_val_str( hkey, szInstallLocation )) && !path[0]) + { + msi_free( path ); + path = NULL; + } RegCloseKey( hkey ); return path; }

1 0

Aric Stewart : user32: Implement IMR_QUERYCHARPOSITION handling in the edit control.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 652af4e294da3f99358d522c5f7320a7d63556fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=652af4e294da3f99358d522c5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 7 08:06:22 2013 -0500 user32: Implement IMR_QUERYCHARPOSITION handling in the edit control. --- dlls/user32/edit.c | 19 +++++++++++++++++++ include/imm.h | 9 +++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 74e0ea4..1ce79db 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5169,6 +5169,25 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_IME_CONTROL: break; + case WM_IME_REQUEST: + switch (wParam) + { + case IMR_QUERYCHARPOSITION: + { + LRESULT pos; + IMECHARPOSITION *chpos = (IMECHARPOSITION *)lParam; + + pos = EDIT_EM_PosFromChar(es, es->selection_start + chpos->dwCharPos, FALSE); + chpos->pt.x = LOWORD(pos); + chpos->pt.y = HIWORD(pos); + chpos->cLineHeight = es->line_height; + chpos->rcDocument = es->format_rect; + result = 1; + break; + } + } + break; + default: result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); break; diff --git a/include/imm.h b/include/imm.h index d035072..aa2fa1d 100644 --- a/include/imm.h +++ b/include/imm.h @@ -129,6 +129,15 @@ typedef struct _tagCOMPOSITIONFORM typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); +typedef struct _tagIMECHARPOSITION +{ + DWORD dwSize; + DWORD dwCharPos; + POINT pt; + UINT cLineHeight; + RECT rcDocument; +} IMECHARPOSITION, *LPIMECHARPOSITION; + /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 #define IMC_SETCANDIDATEPOS 0x0008

1 0