October 2011 - Wine-Commits

Nikolay Sivov : msxml3: Release IDispatchEx dynamic data properly.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: a35513bbd07d7630d4d3c2e889b780374886cbe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35513bbd07d7630d4d3c2e88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 30 01:27:50 2011 +0400 msxml3: Release IDispatchEx dynamic data properly. --- dlls/msxml3/dispex.c | 16 ++++++++++++++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 6 ++---- dlls/msxml3/selection.c | 9 +++++---- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 67570c0..274f604 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -653,6 +653,22 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) return TRUE; } +void release_dispex(DispatchEx *This) +{ + dynamic_prop_t *prop; + + if(!This->dynamic_data) + return; + + for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) { + VariantClear(&prop->var); + heap_free(prop->name); + } + + heap_free(This->dynamic_data->props); + heap_free(This->dynamic_data); +} + void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 2962a0e..8b84aca 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -156,6 +156,7 @@ typedef struct { extern HINSTANCE MSXML_hInstance DECLSPEC_HIDDEN; void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; +void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7219bd3..0e00b38 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1110,6 +1110,7 @@ void destroy_xmlnode(xmlnode *This) { if(This->node) xmldoc_release(This->node->doc); + release_dispex(&This->dispex); } void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispex_static_data_t *dispex_data) @@ -1121,10 +1122,7 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispe This->iface = node_iface; This->parent = NULL; - if(dispex_data) - init_dispex(&This->dispex, (IUnknown*)This->iface, dispex_data); - else - This->dispex.outer = NULL; + init_dispex(&This->dispex, dispex_data ? (IUnknown*)This->iface : NULL, dispex_data); } typedef struct { diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index c90c8c2..0e62a68 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -155,6 +155,7 @@ static ULONG WINAPI domselection_Release( xmlXPathFreeObject(This->result); xmldoc_release(This->node->doc); if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant); + release_dispex(&This->dispex); heap_free(This); } @@ -756,8 +757,9 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) *out = NULL; if (!This || !ctxt || !query) { - hr = E_OUTOFMEMORY; - goto cleanup; + xmlXPathFreeContext(ctxt); + heap_free(This); + return E_OUTOFMEMORY; } This->IXMLDOMSelection_iface.lpVtbl = &domselection_vtbl; @@ -765,6 +767,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) This->resultPos = 0; This->node = node; This->enumvariant = NULL; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSelection_iface, &domselection_dispex); xmldoc_add_ref(This->node->doc); ctxt->error = query_serror; @@ -804,8 +807,6 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) goto cleanup; } - init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSelection_iface, &domselection_dispex); - *out = (IXMLDOMNodeList*)&This->IXMLDOMSelection_iface; hr = S_OK; TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval));

1 0

Huw Davies : gdi32: Pass a NULL user-style array to ExtCreatePen if the user-style count is zero .
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 1c1fff557d725971c2af4cb49fa77ee0a210b5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1fff557d725971c2af4cb49… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 28 14:25:48 2011 +0100 gdi32: Pass a NULL user-style array to ExtCreatePen if the user-style count is zero. --- dlls/gdi32/enhmetafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 62faa89..ea0ce3b 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -945,7 +945,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( (handletable->objectHandle)[pPen->ihPen] = ExtCreatePen(pPen->elp.elpPenStyle, pPen->elp.elpWidth, &lb, - pPen->elp.elpNumEntries, pPen->elp.elpStyleEntry); + pPen->elp.elpNumEntries, pPen->elp.elpNumEntries ? pPen->elp.elpStyleEntry : NULL); break; } case EMR_CREATEBRUSHINDIRECT:

1 0

Jörg Höhle : mmdevapi/tests: Fix errors and crashes in various native configurations.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 8e62e823d6a41f40d1b50c5a77083290f525bb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e62e823d6a41f40d1b50c5a7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Oct 5 23:51:47 2011 +0200 mmdevapi/tests: Fix errors and crashes in various native configurations. --- dlls/mmdevapi/tests/capture.c | 4 +- dlls/mmdevapi/tests/render.c | 131 +++++++++++++++++++++++++++-------------- 2 files changed, 89 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e62e823d6a41f40d1b50…

1 0

Alexandre Julliard : gdi32: Add path entry points for functions that behave differently with an open path .
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 418424d36264e0508f123352d9769649c878c10d URL: http://source.winehq.org/git/wine.git/?a=commit;h=418424d36264e0508f123352d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 13:16:11 2011 +0200 gdi32: Add path entry points for functions that behave differently with an open path. --- dlls/gdi32/path.c | 54 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index afb5660..65b2544 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -804,6 +804,16 @@ BOOL WINAPI SelectClipPath(HDC hdc, INT iMode) /*********************************************************************** + * pathdrv_BeginPath + */ +static BOOL pathdrv_BeginPath( PHYSDEV dev ) +{ + /* path already open, nothing to do */ + return TRUE; +} + + +/*********************************************************************** * pathdrv_AbortPath */ static BOOL pathdrv_AbortPath( PHYSDEV dev ) @@ -1588,6 +1598,21 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC } +/************************************************************* + * pathdrv_CloseFigure + */ +static BOOL pathdrv_CloseFigure( PHYSDEV dev ) +{ + struct path_physdev *physdev = get_path_physdev( dev ); + + /* Set PT_CLOSEFIGURE on the last entry and start a new stroke */ + /* It is not necessary to draw a line, PT_CLOSEFIGURE is a virtual closing line itself */ + if (physdev->path->numEntriesUsed) + physdev->path->pFlags[physdev->path->numEntriesUsed - 1] |= PT_CLOSEFIGURE; + return TRUE; +} + + /******************************************************************* * FlattenPath [GDI32.@] * @@ -2113,14 +2138,10 @@ BOOL nulldrv_BeginPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); - /* If path is already open, do nothing */ - if (dc->path.state != PATH_Open) - { - if (!path_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) return FALSE; - PATH_EmptyPath(&dc->path); - dc->path.newStroke = TRUE; - dc->path.state = PATH_Open; - } + if (!path_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) return FALSE; + PATH_EmptyPath(&dc->path); + dc->path.newStroke = TRUE; + dc->path.state = PATH_Open; return TRUE; } @@ -2140,17 +2161,8 @@ BOOL nulldrv_AbortPath( PHYSDEV dev ) BOOL nulldrv_CloseFigure( PHYSDEV dev ) { - DC *dc = get_nulldrv_dc( dev ); - - if (dc->path.state != PATH_Open) - { - SetLastError( ERROR_CAN_NOT_COMPLETE ); - return FALSE; - } - /* Set PT_CLOSEFIGURE on the last entry and start a new stroke */ - /* It is not necessary to draw a line, PT_CLOSEFIGURE is a virtual closing line itself */ - if (dc->path.numEntriesUsed) dc->path.pFlags[dc->path.numEntriesUsed - 1] |= PT_CLOSEFIGURE; - return TRUE; + SetLastError( ERROR_CAN_NOT_COMPLETE ); + return FALSE; } BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) @@ -2248,11 +2260,11 @@ const struct gdi_dc_funcs path_driver = pathdrv_AngleArc, /* pAngleArc */ pathdrv_Arc, /* pArc */ pathdrv_ArcTo, /* pArcTo */ - NULL, /* pBeginPath */ + pathdrv_BeginPath, /* pBeginPath */ NULL, /* pBlendImage */ NULL, /* pChoosePixelFormat */ pathdrv_Chord, /* pChord */ - NULL, /* pCloseFigure */ + pathdrv_CloseFigure, /* pCloseFigure */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ pathdrv_CreateDC, /* pCreateDC */

1 0

Bernhard Loos : ntoskrnl: Correctly implement PsGetCurrentThread/ProcessId.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 507d92905174ccef96a33a806bfc383874ff7dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=507d92905174ccef96a33a806… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Thu Oct 27 14:20:19 2011 +0200 ntoskrnl: Correctly implement PsGetCurrentThread/ProcessId. --- dlls/ntoskrnl.exe/ntoskrnl.c | 29 ++++++++++++++++++++++------- include/wine/server_protocol.h | 4 +++- server/device.c | 3 +++ server/protocol.def | 2 ++ server/request.h | 8 +++++--- server/trace.c | 2 ++ 6 files changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e5668fd..9c7916e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -68,6 +68,13 @@ struct IrpInstance IRP *irp; }; +/* tid of the thread running client request */ +static DWORD request_thread; + +/* pid/tid of the client thread */ +static DWORD client_tid; +static DWORD client_pid; + #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ __ASM_STDCALL_FUNC( name, 4, \ @@ -197,6 +204,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) ULONG in_size = 4096, out_size = 0; HANDLE handles[2]; + request_thread = GetCurrentThreadId(); + if (!(in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ))) { ERR( "failed to allocate buffer\n" ); @@ -217,11 +226,13 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) wine_server_set_reply( req, in_buff, in_size ); if (!(status = wine_server_call( req ))) { - code = reply->code; - ioctl = reply->next; - device = wine_server_get_ptr( reply->user_ptr ); - in_size = reply->in_size; - out_size = reply->out_size; + code = reply->code; + ioctl = reply->next; + device = wine_server_get_ptr( reply->user_ptr ); + client_tid = reply->client_pid; + client_pid = reply->client_tid; + in_size = reply->in_size; + out_size = reply->out_size; } else { @@ -1465,7 +1476,9 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, */ HANDLE WINAPI PsGetCurrentProcessId(void) { - return UlongToHandle(GetCurrentProcessId()); /* FIXME: not quite right... */ + if (GetCurrentThreadId() == request_thread) + return UlongToHandle(client_pid); + return UlongToHandle(GetCurrentProcessId()); } @@ -1474,7 +1487,9 @@ HANDLE WINAPI PsGetCurrentProcessId(void) */ HANDLE WINAPI PsGetCurrentThreadId(void) { - return UlongToHandle(GetCurrentThreadId()); /* FIXME: not quite right... */ + if (GetCurrentThreadId() == request_thread) + return UlongToHandle(client_tid); + return UlongToHandle(GetCurrentThreadId()); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e0b0ac8..ab239f3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4613,6 +4613,8 @@ struct get_next_device_request_reply obj_handle_t next; ioctl_code_t code; client_ptr_t user_ptr; + process_id_t client_pid; + thread_id_t client_tid; data_size_t in_size; data_size_t out_size; /* VARARG(next_data,bytes); */ @@ -5637,6 +5639,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 427 +#define SERVER_PROTOCOL_VERSION 428 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 4d134a3..49f90e3 100644 --- a/server/device.c +++ b/server/device.c @@ -32,6 +32,7 @@ #include "file.h" #include "handle.h" #include "request.h" +#include "process.h" struct ioctl_call { @@ -510,6 +511,8 @@ DECL_HANDLER(get_next_device_request) ioctl = LIST_ENTRY( ptr, struct ioctl_call, mgr_entry ); reply->code = ioctl->code; reply->user_ptr = ioctl->device->user_ptr; + reply->client_pid = get_process_id( ioctl->thread->process ); + reply->client_tid = get_thread_id( ioctl->thread ); reply->in_size = ioctl->in_size; reply->out_size = ioctl->out_size; if (ioctl->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); diff --git a/server/protocol.def b/server/protocol.def index bec2e3c..a59bb6e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3203,6 +3203,8 @@ enum coords_relative obj_handle_t next; /* handle to the next ioctl */ ioctl_code_t code; /* ioctl code */ client_ptr_t user_ptr; /* opaque ptr for the device */ + process_id_t client_pid; /* pid of process calling ioctl */ + thread_id_t client_tid; /* tid of thread calling ioctl */ data_size_t in_size; /* total needed input size */ data_size_t out_size; /* needed output size */ VARARG(next_data,bytes); /* input data of the next ioctl */ diff --git a/server/request.h b/server/request.h index b875e30..ac69461 100644 --- a/server/request.h +++ b/server/request.h @@ -2046,9 +2046,11 @@ C_ASSERT( sizeof(struct get_next_device_request_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, next) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, code) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, user_ptr) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 28 ); -C_ASSERT( sizeof(struct get_next_device_request_reply) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_pid) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_tid) == 28 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 36 ); +C_ASSERT( sizeof(struct get_next_device_request_reply) == 40 ); C_ASSERT( sizeof(struct make_process_system_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct make_process_system_reply, event) == 8 ); C_ASSERT( sizeof(struct make_process_system_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 188eee4..e463229 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3731,6 +3731,8 @@ static void dump_get_next_device_request_reply( const struct get_next_device_req fprintf( stderr, " next=%04x", req->next ); dump_ioctl_code( ", code=", &req->code ); dump_uint64( ", user_ptr=", &req->user_ptr ); + fprintf( stderr, ", client_pid=%04x", req->client_pid ); + fprintf( stderr, ", client_tid=%04x", req->client_tid ); fprintf( stderr, ", in_size=%u", req->in_size ); fprintf( stderr, ", out_size=%u", req->out_size ); dump_varargs_bytes( ", next_data=", cur_size );

1 0

Alexandre Julliard : gdi32: Pass a HDC instead of a DC pointer to internal path functions.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: fbafa45e84cc9451d7c46d0b1fcc65e1c2e7b4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbafa45e84cc9451d7c46d0b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 23:15:10 2011 +0200 gdi32: Pass a HDC instead of a DC pointer to internal path functions. --- dlls/gdi32/path.c | 114 ++++++++++++++++++++++++++-------------------------- 1 files changed, 57 insertions(+), 57 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 9689e67..6d1eb9d 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -683,7 +683,7 @@ HRGN WINAPI PathToRegion(HDC hdc) return hrgnRval; } -static BOOL PATH_FillPath(DC *dc, GdiPath *pPath) +static BOOL PATH_FillPath( HDC hdc, GdiPath *pPath ) { INT mapMode, graphicsMode; SIZE ptViewportExt, ptWindowExt; @@ -692,7 +692,7 @@ static BOOL PATH_FillPath(DC *dc, GdiPath *pPath) HRGN hrgn; /* Construct a region from the path and fill it */ - if(PATH_PathToRegion(pPath, dc->polyFillMode, &hrgn)) + if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgn)) { /* Since PaintRgn interprets the region as being in logical coordinates * but the points we store for the path are already in device @@ -703,11 +703,11 @@ static BOOL PATH_FillPath(DC *dc, GdiPath *pPath) */ /* Save the information about the old mapping mode */ - mapMode=GetMapMode(dc->hSelf); - GetViewportExtEx(dc->hSelf, &ptViewportExt); - GetViewportOrgEx(dc->hSelf, &ptViewportOrg); - GetWindowExtEx(dc->hSelf, &ptWindowExt); - GetWindowOrgEx(dc->hSelf, &ptWindowOrg); + mapMode=GetMapMode(hdc); + GetViewportExtEx(hdc, &ptViewportExt); + GetViewportOrgEx(hdc, &ptViewportOrg); + GetWindowExtEx(hdc, &ptWindowExt); + GetWindowOrgEx(hdc, &ptWindowOrg); /* Save world transform * NB: The Windows documentation on world transforms would lead one to @@ -715,32 +715,32 @@ static BOOL PATH_FillPath(DC *dc, GdiPath *pPath) * tests show that resetting the graphics mode to GM_COMPATIBLE does * not reset the world transform. */ - GetWorldTransform(dc->hSelf, &xform); + GetWorldTransform(hdc, &xform); /* Set MM_TEXT */ - SetMapMode(dc->hSelf, MM_TEXT); - SetViewportOrgEx(dc->hSelf, 0, 0, NULL); - SetWindowOrgEx(dc->hSelf, 0, 0, NULL); - graphicsMode=GetGraphicsMode(dc->hSelf); - SetGraphicsMode(dc->hSelf, GM_ADVANCED); - ModifyWorldTransform(dc->hSelf, &xform, MWT_IDENTITY); - SetGraphicsMode(dc->hSelf, graphicsMode); + SetMapMode(hdc, MM_TEXT); + SetViewportOrgEx(hdc, 0, 0, NULL); + SetWindowOrgEx(hdc, 0, 0, NULL); + graphicsMode=GetGraphicsMode(hdc); + SetGraphicsMode(hdc, GM_ADVANCED); + ModifyWorldTransform(hdc, &xform, MWT_IDENTITY); + SetGraphicsMode(hdc, graphicsMode); /* Paint the region */ - PaintRgn(dc->hSelf, hrgn); + PaintRgn(hdc, hrgn); DeleteObject(hrgn); /* Restore the old mapping mode */ - SetMapMode(dc->hSelf, mapMode); - SetViewportExtEx(dc->hSelf, ptViewportExt.cx, ptViewportExt.cy, NULL); - SetViewportOrgEx(dc->hSelf, ptViewportOrg.x, ptViewportOrg.y, NULL); - SetWindowExtEx(dc->hSelf, ptWindowExt.cx, ptWindowExt.cy, NULL); - SetWindowOrgEx(dc->hSelf, ptWindowOrg.x, ptWindowOrg.y, NULL); + SetMapMode(hdc, mapMode); + SetViewportExtEx(hdc, ptViewportExt.cx, ptViewportExt.cy, NULL); + SetViewportOrgEx(hdc, ptViewportOrg.x, ptViewportOrg.y, NULL); + SetWindowExtEx(hdc, ptWindowExt.cx, ptWindowExt.cy, NULL); + SetWindowOrgEx(hdc, ptWindowOrg.x, ptWindowOrg.y, NULL); /* Go to GM_ADVANCED temporarily to restore the world transform */ - graphicsMode=GetGraphicsMode(dc->hSelf); - SetGraphicsMode(dc->hSelf, GM_ADVANCED); - SetWorldTransform(dc->hSelf, &xform); - SetGraphicsMode(dc->hSelf, graphicsMode); + graphicsMode=GetGraphicsMode(hdc); + SetGraphicsMode(hdc, GM_ADVANCED); + SetWorldTransform(hdc, &xform); + SetGraphicsMode(hdc, graphicsMode); return TRUE; } return FALSE; @@ -1630,7 +1630,7 @@ BOOL WINAPI FlattenPath(HDC hdc) } -static BOOL PATH_StrokePath(DC *dc, GdiPath *pPath) +static BOOL PATH_StrokePath( HDC hdc, GdiPath *pPath ) { INT i, nLinePts, nAlloc; POINT *pLinePts; @@ -1641,21 +1641,21 @@ static BOOL PATH_StrokePath(DC *dc, GdiPath *pPath) BOOL ret = TRUE; /* Save the mapping mode info */ - mapMode=GetMapMode(dc->hSelf); - GetViewportExtEx(dc->hSelf, &szViewportExt); - GetViewportOrgEx(dc->hSelf, &ptViewportOrg); - GetWindowExtEx(dc->hSelf, &szWindowExt); - GetWindowOrgEx(dc->hSelf, &ptWindowOrg); - GetWorldTransform(dc->hSelf, &xform); + mapMode=GetMapMode(hdc); + GetViewportExtEx(hdc, &szViewportExt); + GetViewportOrgEx(hdc, &ptViewportOrg); + GetWindowExtEx(hdc, &szWindowExt); + GetWindowOrgEx(hdc, &ptWindowOrg); + GetWorldTransform(hdc, &xform); /* Set MM_TEXT */ - SetMapMode(dc->hSelf, MM_TEXT); - SetViewportOrgEx(dc->hSelf, 0, 0, NULL); - SetWindowOrgEx(dc->hSelf, 0, 0, NULL); - graphicsMode=GetGraphicsMode(dc->hSelf); - SetGraphicsMode(dc->hSelf, GM_ADVANCED); - ModifyWorldTransform(dc->hSelf, &xform, MWT_IDENTITY); - SetGraphicsMode(dc->hSelf, graphicsMode); + SetMapMode(hdc, MM_TEXT); + SetViewportOrgEx(hdc, 0, 0, NULL); + SetWindowOrgEx(hdc, 0, 0, NULL); + graphicsMode=GetGraphicsMode(hdc); + SetGraphicsMode(hdc, GM_ADVANCED); + ModifyWorldTransform(hdc, &xform, MWT_IDENTITY); + SetGraphicsMode(hdc, graphicsMode); /* Allocate enough memory for the worst case without beziers (one PT_MOVETO * and the rest PT_LINETO with PT_CLOSEFIGURE at the end) plus some buffer @@ -1678,7 +1678,7 @@ static BOOL PATH_StrokePath(DC *dc, GdiPath *pPath) TRACE("Got PT_MOVETO (%d, %d)\n", pPath->pPoints[i].x, pPath->pPoints[i].y); if(nLinePts >= 2) - Polyline(dc->hSelf, pLinePts, nLinePts); + Polyline(hdc, pLinePts, nLinePts); nLinePts = 0; pLinePts[nLinePts++] = pPath->pPoints[i]; break; @@ -1724,23 +1724,23 @@ static BOOL PATH_StrokePath(DC *dc, GdiPath *pPath) pLinePts[nLinePts++] = pLinePts[0]; } if(nLinePts >= 2) - Polyline(dc->hSelf, pLinePts, nLinePts); + Polyline(hdc, pLinePts, nLinePts); end: HeapFree(GetProcessHeap(), 0, pLinePts); /* Restore the old mapping mode */ - SetMapMode(dc->hSelf, mapMode); - SetWindowExtEx(dc->hSelf, szWindowExt.cx, szWindowExt.cy, NULL); - SetWindowOrgEx(dc->hSelf, ptWindowOrg.x, ptWindowOrg.y, NULL); - SetViewportExtEx(dc->hSelf, szViewportExt.cx, szViewportExt.cy, NULL); - SetViewportOrgEx(dc->hSelf, ptViewportOrg.x, ptViewportOrg.y, NULL); + SetMapMode(hdc, mapMode); + SetWindowExtEx(hdc, szWindowExt.cx, szWindowExt.cy, NULL); + SetWindowOrgEx(hdc, ptWindowOrg.x, ptWindowOrg.y, NULL); + SetViewportExtEx(hdc, szViewportExt.cx, szViewportExt.cy, NULL); + SetViewportOrgEx(hdc, ptViewportOrg.x, ptViewportOrg.y, NULL); /* Go to GM_ADVANCED temporarily to restore the world transform */ - graphicsMode=GetGraphicsMode(dc->hSelf); - SetGraphicsMode(dc->hSelf, GM_ADVANCED); - SetWorldTransform(dc->hSelf, &xform); - SetGraphicsMode(dc->hSelf, graphicsMode); + graphicsMode=GetGraphicsMode(hdc); + SetGraphicsMode(hdc, GM_ADVANCED); + SetWorldTransform(hdc, &xform); + SetGraphicsMode(hdc, graphicsMode); /* If we've moved the current point then get its new position which will be in device (MM_TEXT) co-ords, convert it to @@ -1750,9 +1750,9 @@ static BOOL PATH_StrokePath(DC *dc, GdiPath *pPath) */ if(i > 0) { POINT pt; - GetCurrentPositionEx(dc->hSelf, &pt); - DPtoLP(dc->hSelf, &pt, 1); - MoveToEx(dc->hSelf, pt.x, pt.y, NULL); + GetCurrentPositionEx(hdc, &pt); + DPtoLP(hdc, &pt, 1); + MoveToEx(hdc, pt.x, pt.y, NULL); } return ret; @@ -2207,7 +2207,7 @@ BOOL nulldrv_FillPath( PHYSDEV dev ) SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; } - if (!PATH_FillPath( dc, &dc->path )) return FALSE; + if (!PATH_FillPath( dev->hdc, &dc->path )) return FALSE; /* FIXME: Should the path be emptied even if conversion failed? */ PATH_EmptyPath( &dc->path ); return TRUE; @@ -2222,8 +2222,8 @@ BOOL nulldrv_StrokeAndFillPath( PHYSDEV dev ) SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; } - if (!PATH_FillPath( dc, &dc->path )) return FALSE; - if (!PATH_StrokePath( dc, &dc->path )) return FALSE; + if (!PATH_FillPath( dev->hdc, &dc->path )) return FALSE; + if (!PATH_StrokePath( dev->hdc, &dc->path )) return FALSE; PATH_EmptyPath( &dc->path ); return TRUE; } @@ -2237,7 +2237,7 @@ BOOL nulldrv_StrokePath( PHYSDEV dev ) SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; } - if (!PATH_StrokePath( dc, &dc->path )) return FALSE; + if (!PATH_StrokePath( dev->hdc, &dc->path )) return FALSE; PATH_EmptyPath( &dc->path ); return TRUE; }

1 0

Alexandre Julliard : gdi32: Add a helper function to add multiple points at once to a path.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: e5ff45992e266f6bb352d2302cb8d1219a3c1e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ff45992e266f6bb352d2302… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 23:47:34 2011 +0200 gdi32: Add a helper function to add multiple points at once to a path. --- dlls/gdi32/path.c | 125 ++++++++++++++++++++++------------------------------ 1 files changed, 53 insertions(+), 72 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 6d1eb9d..1d78bd2 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -235,6 +235,23 @@ static BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags) return TRUE; } +/* add a number of points, converting them to device coords */ +/* return a pointer to the first type byte so it can be fixed up if necessary */ +static BYTE *add_log_points( struct path_physdev *physdev, const POINT *points, DWORD count, BYTE type ) +{ + BYTE *ret; + GdiPath *path = physdev->path; + + if (!PATH_ReserveEntries( path, path->numEntriesUsed + count )) return NULL; + + ret = &path->pFlags[path->numEntriesUsed]; + memcpy( &path->pPoints[path->numEntriesUsed], points, count * sizeof(*points) ); + LPtoDP( physdev->dev.hdc, &path->pPoints[path->numEntriesUsed], count ); + memset( ret, type, count ); + path->numEntriesUsed += count; + return ret; +} + /* start a new path stroke if necessary */ static BOOL start_new_stroke( struct path_physdev *physdev ) { @@ -243,8 +260,7 @@ static BOOL start_new_stroke( struct path_physdev *physdev ) if (!physdev->path->newStroke) return TRUE; physdev->path->newStroke = FALSE; GetCurrentPositionEx( physdev->dev.hdc, &pos ); - LPtoDP( physdev->dev.hdc, &pos, 1 ); - return PATH_AddEntry( physdev->path, &pos, PT_MOVETO ); + return add_log_points( physdev, &pos, 1, PT_MOVETO ) != NULL; } /* PATH_AssignGdiPath @@ -918,14 +934,10 @@ static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) struct path_physdev *physdev = get_path_physdev( dev ); POINT point; - /* Convert point to device coordinates */ + if (!start_new_stroke( physdev )) return FALSE; point.x = x; point.y = y; - LPtoDP( dev->hdc, &point, 1 ); - - if (!start_new_stroke( physdev )) return FALSE; - - return PATH_AddEntry(physdev->path, &point, PT_LINETO); + return add_log_points( physdev, &point, 1, PT_LINETO ) != NULL; } @@ -1230,17 +1242,9 @@ static BOOL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) static BOOL pathdrv_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); - POINT pt; - UINT i; if (!start_new_stroke( physdev )) return FALSE; - - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - LPtoDP( dev->hdc, &pt, 1 ); - PATH_AddEntry(physdev->path, &pt, PT_BEZIERTO); - } - return TRUE; + return add_log_points( physdev, pts, cbPoints, PT_BEZIERTO ) != NULL; } @@ -1250,14 +1254,10 @@ static BOOL pathdrv_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD cbPoints static BOOL pathdrv_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); - POINT pt; - UINT i; + BYTE *type = add_log_points( physdev, pts, cbPoints, PT_BEZIERTO ); - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - LPtoDP( dev->hdc, &pt, 1 ); - PATH_AddEntry(physdev->path, &pt, (i == 0) ? PT_MOVETO : PT_BEZIERTO); - } + if (!type) return FALSE; + type[0] = PT_MOVETO; return TRUE; } @@ -1328,14 +1328,10 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); - POINT pt; - INT i; + BYTE *type = add_log_points( physdev, pts, cbPoints, PT_LINETO ); - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - LPtoDP( dev->hdc, &pt, 1 ); - PATH_AddEntry(physdev->path, &pt, (i == 0) ? PT_MOVETO : PT_LINETO); - } + if (!type) return FALSE; + if (cbPoints) type[0] = PT_MOVETO; return TRUE; } @@ -1346,18 +1342,9 @@ static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT cbPoints ) static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); - POINT pt; - INT i; if (!start_new_stroke( physdev )) return FALSE; - - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - LPtoDP( dev->hdc, &pt, 1 ); - PATH_AddEntry(physdev->path, &pt, PT_LINETO); - } - - return TRUE; + return add_log_points( physdev, pts, cbPoints, PT_LINETO ) != NULL; } @@ -1367,16 +1354,12 @@ static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT cbPoints ) static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); - POINT pt; - INT i; + BYTE *type = add_log_points( physdev, pts, cbPoints, PT_LINETO ); - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - LPtoDP( dev->hdc, &pt, 1 ); - PATH_AddEntry(physdev->path, &pt, (i == 0) ? PT_MOVETO : - ((i == cbPoints-1) ? PT_LINETO | PT_CLOSEFIGURE : - PT_LINETO)); - } + if (!type) return FALSE; + if (cbPoints) type[0] = PT_MOVETO; + if (cbPoints > 1) type[cbPoints - 1] = PT_LINETO | PT_CLOSEFIGURE; + physdev->path->newStroke = TRUE; return TRUE; } @@ -1387,20 +1370,18 @@ static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT cbPoints ) static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) { struct path_physdev *physdev = get_path_physdev( dev ); - POINT pt, startpt; - UINT poly, i; - INT point; - - for(i = 0, poly = 0; poly < polygons; poly++) { - for(point = 0; point < counts[poly]; point++, i++) { - pt = pts[i]; - LPtoDP( dev->hdc, &pt, 1 ); - if(point == 0) startpt = pt; - PATH_AddEntry(physdev->path, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); - } + UINT poly; + BYTE *type; + + for(poly = 0; poly < polygons; poly++) { + type = add_log_points( physdev, pts, counts[poly], PT_LINETO ); + if (!type) return FALSE; + type[0] = PT_MOVETO; /* win98 adds an extra line to close the figure for some reason */ - PATH_AddEntry(physdev->path, &startpt, PT_LINETO | PT_CLOSEFIGURE); + add_log_points( physdev, pts, 1, PT_LINETO | PT_CLOSEFIGURE ); + pts += counts[poly]; } + physdev->path->newStroke = TRUE; return TRUE; } @@ -1411,16 +1392,16 @@ static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* count static BOOL pathdrv_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) { struct path_physdev *physdev = get_path_physdev( dev ); - POINT pt; - UINT poly, point, i; + UINT poly, count; + BYTE *type; - for(i = 0, poly = 0; poly < polylines; poly++) { - for(point = 0; point < counts[poly]; point++, i++) { - pt = pts[i]; - LPtoDP( dev->hdc, &pt, 1 ); - PATH_AddEntry(physdev->path, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); - } - } + for (poly = count = 0; poly < polylines; poly++) count += counts[poly]; + + type = add_log_points( physdev, pts, count, PT_LINETO ); + if (!type) return FALSE; + + /* make the first point of each polyline a PT_MOVETO */ + for (poly = 0; poly < polylines; poly++, type += counts[poly]) *type = PT_MOVETO; return TRUE; }

1 0

Alexandre Julliard : gdi32: Always start a new stroke when the path ends with a closed figure.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: e5db8969acd5260ad499c4d229f08cf3357fce48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5db8969acd5260ad499c4d22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 27 09:36:41 2011 +0200 gdi32: Always start a new stroke when the path ends with a closed figure. --- dlls/gdi32/path.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 1d78bd2..afb5660 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -225,11 +225,6 @@ static BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags) pPath->pPoints[pPath->numEntriesUsed]=*pPoint; pPath->pFlags[pPath->numEntriesUsed]=flags; - /* If this is PT_CLOSEFIGURE, we have to start a new stroke next time */ - if((flags & PT_CLOSEFIGURE) == PT_CLOSEFIGURE) - pPath->newStroke=TRUE; - - /* Increment entry count */ pPath->numEntriesUsed++; return TRUE; @@ -256,9 +251,13 @@ static BYTE *add_log_points( struct path_physdev *physdev, const POINT *points, static BOOL start_new_stroke( struct path_physdev *physdev ) { POINT pos; + GdiPath *path = physdev->path; - if (!physdev->path->newStroke) return TRUE; - physdev->path->newStroke = FALSE; + if (!path->newStroke && path->numEntriesUsed && + !(path->pFlags[path->numEntriesUsed - 1] & PT_CLOSEFIGURE)) + return TRUE; + + path->newStroke = FALSE; GetCurrentPositionEx( physdev->dev.hdc, &pos ); return add_log_points( physdev, &pos, 1, PT_MOVETO ) != NULL; } @@ -1359,7 +1358,6 @@ static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT cbPoints ) if (!type) return FALSE; if (cbPoints) type[0] = PT_MOVETO; if (cbPoints > 1) type[cbPoints - 1] = PT_LINETO | PT_CLOSEFIGURE; - physdev->path->newStroke = TRUE; return TRUE; } @@ -1381,7 +1379,6 @@ static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* count add_log_points( physdev, pts, 1, PT_LINETO | PT_CLOSEFIGURE ); pts += counts[poly]; } - physdev->path->newStroke = TRUE; return TRUE; } @@ -2152,11 +2149,7 @@ BOOL nulldrv_CloseFigure( PHYSDEV dev ) } /* Set PT_CLOSEFIGURE on the last entry and start a new stroke */ /* It is not necessary to draw a line, PT_CLOSEFIGURE is a virtual closing line itself */ - if (dc->path.numEntriesUsed) - { - dc->path.pFlags[dc->path.numEntriesUsed - 1] |= PT_CLOSEFIGURE; - dc->path.newStroke = TRUE; - } + if (dc->path.numEntriesUsed) dc->path.pFlags[dc->path.numEntriesUsed - 1] |= PT_CLOSEFIGURE; return TRUE; }

1 0

Michael Stefaniuc : include: Fix numeric constants in mmsystem. h for LLP64 compilers.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: cb1dd010ef3d11c8cbea77e27a6563f2aad5114d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1dd010ef3d11c8cbea77e27… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 28 16:25:54 2011 +0200 include: Fix numeric constants in mmsystem.h for LLP64 compilers. Fixup for 5439aede62e40511703784eca5d01b16678b680a --- include/mmsystem.h | 516 ++++++++++++++++++++++++++-------------------------- 1 files changed, 258 insertions(+), 258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb1dd010ef3d11c8cbea7…

1 0

Andrew Eikum : winecfg: Don't reload winmm for each audio test.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 00629cb0b3c7c3b25d8ccbfc56755344dc9a1e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00629cb0b3c7c3b25d8ccbfc5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 28 09:24:28 2011 -0500 winecfg: Don't reload winmm for each audio test. --- programs/winecfg/Makefile.in | 2 +- programs/winecfg/audio.c | 22 +--------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 382eb94..4b1a001 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -1,6 +1,6 @@ MODULE = winecfg.exe APPMODE = -mwindows -IMPORTS = uuid comdlg32 comctl32 shell32 ole32 shlwapi uxtheme user32 gdi32 advapi32 +IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 C_SRCS = \ about.c \ diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index dc3e2bc..f2d4fe3 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -305,25 +305,7 @@ static void set_reg_device(HWND hDlg, int dlgitem, const WCHAR *key_name) static void test_sound(void) { - BOOL (WINAPI *pPlaySoundW)(const WCHAR *, HMODULE, DWORD); - HMODULE winmm; - - static const WCHAR winmmW[] = {'w','i','n','m','m','.','d','l','l',0}; - - winmm = LoadLibraryW(winmmW); - if(!winmm){ - WINE_ERR("LoadLibrary failed: %u\n", GetLastError()); - return; - } - - pPlaySoundW = (void*)GetProcAddress(winmm, "PlaySoundW"); - if(!pPlaySoundW){ - WINE_ERR("GetProcAddress failed: %u\n", GetLastError()); - FreeLibrary(winmm); - return; - } - - if(!pPlaySoundW(MAKEINTRESOURCEW(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_SYNC)){ + if(!PlaySoundW(MAKEINTRESOURCEW(IDW_TESTSOUND), NULL, SND_RESOURCE | SND_SYNC)){ WCHAR error_str[256], title_str[256]; LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_TEST_FAILED, @@ -333,8 +315,6 @@ static void test_sound(void) MessageBoxW(NULL, error_str, title_str, MB_OK | MB_ICONERROR); } - - FreeLibrary(winmm); } INT_PTR CALLBACK

1 0