January 2014 - Wine-Commits

Stefan Dösinger : wined3d: Only set SFLAG_DYNLOCK when map_binding = sysmem.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: d640018a3c1d5b6bc109891cc4acf894a6c4413a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d640018a3c1d5b6bc109891cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:18 2014 +0100 wined3d: Only set SFLAG_DYNLOCK when map_binding = sysmem. All other map bindings are never freed. Setting SFLAG_DYNLOCK if map_binding != sysmem might only keep a heap memory allocation around (e.g. after device_reset) that is never used. --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 87de9e1..628a4a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3068,7 +3068,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, * mapped regularly do not throw away the system memory copy. This avoids * the need to download the surface from OpenGL all the time. The surface * is still downloaded if the OpenGL texture is changed. */ - if (!(surface->flags & SFLAG_DYNLOCK)) + if (!(surface->flags & SFLAG_DYNLOCK) && surface->map_binding == WINED3D_LOCATION_SYSMEM) { if (++surface->lockCount > MAXLOCKCOUNT) {

1 0

Stefan Dösinger : wined3d: Add a missing break.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: f1ac04f2a6aea5056d9e5a3a3f429d63f1ec9c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ac04f2a6aea5056d9e5a3a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:13 2014 +0100 wined3d: Add a missing break. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 015478f..1b61cb5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -598,6 +598,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) case SFLAG_INDIB: if (!surface->dib.bitmap_data) ERR("Map binding is set to SFLAG_INDIB but surface->dib.bitmap_data is NULL.\n"); + break; case SFLAG_INSYSMEM: surface_prepare_system_memory(surface);

1 0

Ken Thomases : wineboot: Ignore 0 result from WM_QUERYENDSESSION if target window was destroyed.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: a05b53894a55b8de1ecfde3815dd10628b8b05f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05b53894a55b8de1ecfde381… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 16 21:11:10 2014 -0600 wineboot: Ignore 0 result from WM_QUERYENDSESSION if target window was destroyed. --- programs/wineboot/shutdown.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index a5f5f5a..52d37e7 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -100,6 +100,14 @@ static void CALLBACK end_session_message_callback( HWND hwnd, UINT msg, ULONG_PT msg == WM_QUERYENDSESSION ? "WM_QUERYENDSESSION" : (msg == WM_ENDSESSION ? "WM_ENDSESSION" : "Unknown"), hwnd, lresult ); + /* If the window was destroyed while the message was in its queue, SendMessageCallback() + calls us with a default 0 result. Ignore it. */ + if (!lresult && !IsWindow( hwnd )) + { + WINE_TRACE( "window was destroyed; ignoring FALSE lresult\n" ); + lresult = TRUE; + } + /* we only care if a WM_QUERYENDSESSION response is FALSE */ cb_data->result = cb_data->result && lresult;

1 0

Vincent Povirk : gdiplus: Implement SetPageTransform playback.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 7c12d889d4000fd2b90fc9504a3d71e20b1a845b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c12d889d4000fd2b90fc9504… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 16:15:50 2014 -0600 gdiplus: Implement SetPageTransform playback. --- dlls/gdiplus/metafile.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1218800..af7ec27 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -528,9 +528,15 @@ static GpStatus METAFILE_PlaybackUpdateWorldTransform(GpMetafile *metafile) if (stat == Ok) { - /* FIXME: Prepend page transform. */ + REAL scale = units_to_pixels(1.0, metafile->page_unit, 96.0); - stat = GdipMultiplyMatrix(real_transform, metafile->world_transform, MatrixOrderPrepend); + if (metafile->page_unit != UnitDisplay) + scale *= metafile->page_scale; + + stat = GdipScaleMatrix(real_transform, scale, scale, MatrixOrderPrepend); + + if (stat == Ok) + stat = GdipMultiplyMatrix(real_transform, metafile->world_transform, MatrixOrderPrepend); if (stat == Ok) stat = GdipSetWorldTransform(metafile->playback_graphics, real_transform); @@ -545,6 +551,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) { GpStatus stat; + GpMetafile *real_metafile = (GpMetafile*)metafile; TRACE("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); @@ -655,6 +662,19 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return stat; } + case EmfPlusRecordTypeSetPageTransform: + { + EmfPlusSetPageTransform *record = (EmfPlusSetPageTransform*)header; + GpUnit unit = (GpUnit)flags; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusSetPageTransform)) + return InvalidParameter; + + real_metafile->page_unit = unit; + real_metafile->page_scale = record->PageScale; + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented; @@ -774,7 +794,7 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, if (stat == Ok) { - real_metafile->page_unit = UnitPixel; /* FIXME: Use frame unit here? */ + real_metafile->page_unit = UnitDisplay; real_metafile->page_scale = 1.0; stat = METAFILE_PlaybackUpdateWorldTransform(real_metafile); }

1 0

Vincent Povirk : gdiplus: Implement writing SetPageTransform records.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 6518edfa5f67a0a7cdda5b31ee9ac52c3a6a2c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6518edfa5f67a0a7cdda5b31e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 15:43:45 2014 -0600 gdiplus: Implement writing SetPageTransform records. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 18 ++++++++++++++++++ dlls/gdiplus/metafile.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5e8f78a..e4e6b92 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -59,6 +59,7 @@ extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; extern MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7f892f6..21ee84d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5274,6 +5274,8 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) { + GpStatus stat; + TRACE("(%p, %.2f)\n", graphics, scale); if(!graphics || (scale <= 0.0)) @@ -5282,6 +5284,13 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, graphics->unit, scale); + if (stat != Ok) + return stat; + } + graphics->scale = scale; return Ok; @@ -5289,6 +5298,8 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) { + GpStatus stat; + TRACE("(%p, %d)\n", graphics, unit); if(!graphics) @@ -5300,6 +5311,13 @@ GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) if(unit == UnitWorld) return InvalidParameter; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, unit, graphics->scale); + if (stat != Ok) + return stat; + } + graphics->unit = unit; return Ok; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4df7f6f..1218800 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -64,6 +64,12 @@ typedef struct EmfPlusFillRects DWORD Count; } EmfPlusFillRects; +typedef struct EmfPlusSetPageTransform +{ + EmfPlusRecordHeader Header; + REAL PageScale; +} EmfPlusSetPageTransform; + typedef struct EmfPlusRect { SHORT X; @@ -416,6 +422,29 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, return Ok; } +GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusSetPageTransform *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusSetPageTransform), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeSetPageTransform; + record->Header.Flags = unit; + record->PageScale = scale; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) { if (hdc != metafile->record_dc)

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: dd5459cff45b3cec73fd5c617b73b20d694684d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5459cff45b3cec73fd5c617… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 16 23:01:42 2014 +0100 po: Update French translation. --- po/fr.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7412a66..9dc5d8c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-03 23:12+0100\n" +"PO-Revision-Date: 2014-01-16 23:01+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -10190,7 +10190,7 @@ msgstr "Invite de commande Wine" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10260,10 +10260,8 @@ msgid "Wine Explorer" msgstr "Explorateur de Wine" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Démarrage" +msgstr "Démarrer" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Ken Thomases : winemac: Ignore failure to send or 0 result from WM_QUERYENDSESSION if target window was destroyed.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: ed3ed035197347fd36f6c89fa94ab23aec22bf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3ed035197347fd36f6c89fa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 16 20:38:14 2014 -0600 winemac: Ignore failure to send or 0 result from WM_QUERYENDSESSION if target window was destroyed. --- dlls/winemac.drv/window.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 5a1d5a7..d63e83f 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2260,6 +2260,12 @@ static void CALLBACK quit_callback(HWND hwnd, UINT msg, ULONG_PTR data, LRESULT TRACE("got WM_QUERYENDSESSION result %ld from win %p (%u of %u done)\n", result, hwnd, qi->done, qi->count); + if (!result && !IsWindow(hwnd)) + { + TRACE("win %p no longer exists; ignoring apparent refusal\n", hwnd); + result = TRUE; + } + if (!result && qi->result) { qi->result = FALSE; @@ -2360,9 +2366,15 @@ void macdrv_app_quit_requested(const macdrv_event *event) if (!SendMessageCallbackW(qi->wins[i], WM_QUERYENDSESSION, 0, qi->flags, quit_callback, (ULONG_PTR)qi)) { - WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08x; assuming refusal\n", - qi->wins[i], GetLastError()); - quit_callback(qi->wins[i], WM_QUERYENDSESSION, (ULONG_PTR)qi, FALSE); + DWORD error = GetLastError(); + BOOL invalid = (error == ERROR_INVALID_WINDOW_HANDLE); + if (invalid) + TRACE("failed to send WM_QUERYENDSESSION to win %p because it's invalid; assuming success\n", + qi->wins[i]); + else + WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08x; assuming refusal\n", + qi->wins[i], error); + quit_callback(qi->wins[i], WM_QUERYENDSESSION, (ULONG_PTR)qi, invalid); } }

1 0

Vincent Povirk : gdiplus: Fix recording metafile bounds/dpi reporting.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 55ad8315987d167dd657138c2d7dedd221916c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ad8315987d167dd657138c2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 15:27:53 2014 -0600 gdiplus: Fix recording metafile bounds/dpi reporting. --- dlls/gdiplus/metafile.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index a79bfc3..4df7f6f 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -248,6 +248,8 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->image.picture = NULL; (*metafile)->image.flags = ImageFlagsNone; (*metafile)->image.palette = NULL; + (*metafile)->image.xres = 72.0; + (*metafile)->image.yres = 72.0; (*metafile)->bounds = *frameRect; (*metafile)->unit = frameUnit; (*metafile)->metafile_type = type; @@ -304,7 +306,11 @@ GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) stat = graphics_from_image((GpImage*)metafile, &metafile->record_graphics); if (stat == Ok) + { *result = metafile->record_graphics; + metafile->record_graphics->xres = 96.0; + metafile->record_graphics->yres = 96.0; + } return stat; }

1 0

Frédéric Delanoy : ntdll: Fix a typo in comment.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 841aabfd8271f6668a9b72eec248b98bf5f3563e URL: http://source.winehq.org/git/wine.git/?a=commit;h=841aabfd8271f6668a9b72eec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 02:05:37 2014 +0100 ntdll: Fix a typo in comment. --- dlls/ntdll/debugtools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index dfb44af..cbbf744 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -62,7 +62,7 @@ static char *get_temp_buffer( size_t n ) return res; } -/* release extra space that we requested in gimme1() */ +/* release extra space that we requested in get_temp_buffer() */ static void release_temp_buffer( char *ptr, size_t size ) { struct debug_info *info = get_info();

1 0

Michael Stefaniuc : dmcompos: COM cleanup for IDirectMusicComposer.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 604e395184c6584eb4d86ac11e49dd3672dfb2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604e395184c6584eb4d86ac11… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 17 01:14:48 2014 +0100 dmcompos: COM cleanup for IDirectMusicComposer. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmcompos/composer.c | 154 +++++++++++++++++++++++--------------- dlls/dmcompos/dmcompos_private.h | 12 --- 2 files changed, 95 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=604e395184c6584eb4d86…

1 0