November 2013 - Wine-Commits

Alexandre Julliard : server: Check PE file architecture at mapping creation time.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: e8eb781327457b39c3578f8f65167149939503d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8eb781327457b39c3578f8f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 17:29:51 2013 +0100 server: Check PE file architecture at mapping creation time. --- dlls/kernel32/tests/loader.c | 22 +++++----- dlls/ntdll/loader.c | 2 +- dlls/ntdll/virtual.c | 63 -------------------------- server/mapping.c | 101 +++++++++++++++++++++++++++++------------- 4 files changed, 82 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8eb781327457b39c3578…

1 0

Alexandre Julliard : kernel32/tests: Add a helper function for creating a test dll.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 70d490aa3d2b079da704a936a5f13416b2e4c265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d490aa3d2b079da704a936a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 17:30:18 2013 +0100 kernel32/tests: Add a helper function for creating a test dll. --- dlls/kernel32/tests/loader.c | 187 ++++++++++++++++++++++-------------------- 1 files changed, 97 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70d490aa3d2b079da704a…

1 0

Alexandre Julliard : kernel32/tests: Make the page size a global variable.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 3dc1f20f03f73eac7ce774df0a42c0d1141288c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc1f20f03f73eac7ce774df0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 15:54:51 2013 +0100 kernel32/tests: Make the page size a global variable. --- dlls/kernel32/tests/loader.c | 86 +++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dc1f20f03f73eac7ce77…

1 0

Stefan Dösinger : wined3d: Don' t create a DIB section in gdi_surface_map.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 6bc69c271bf440b4ecad012dc57888fdffc075d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc69c271bf440b4ecad012dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 21 13:33:37 2013 +0100 wined3d: Don't create a DIB section in gdi_surface_map. --- dlls/wined3d/surface.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8f383a6..878b848 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1480,21 +1480,6 @@ static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, D { TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - - if (!(surface->flags & SFLAG_DIBSECTION)) - { - HRESULT hr; - - /* This happens on gdi surfaces if the application set a user pointer - * and resets it. Recreate the DIB section. */ - if (FAILED(hr = surface_create_dib_section(surface))) - { - ERR("Failed to create dib section, hr %#x.\n", hr); - return; - } - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } } static void gdi_surface_unmap(struct wined3d_surface *surface)

1 0

Stefan Dösinger : d3d8/tests: Add a test for AddDirtyRect.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: de60681b861ae9ca866d0f7818771a9e50972cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de60681b861ae9ca866d0f781… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 21 13:33:36 2013 +0100 d3d8/tests: Add a test for AddDirtyRect. --- dlls/d3d8/tests/visual.c | 357 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 357 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de60681b861ae9ca866d0…

1 0

Stefan Dösinger : d3d9/tests: Add a test for AddDirtyRect.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: cc138ba296aa2ca813357c97cd68e28f12e69cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc138ba296aa2ca813357c97c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 21 13:33:35 2013 +0100 d3d9/tests: Add a test for AddDirtyRect. --- dlls/d3d9/tests/visual.c | 358 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 344 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc138ba296aa2ca813357…

1 0

Ken Thomases : winemac: Take WS_EX_TOOLWINDOW into account when computing how much of a window is replaced by the Mac decorations .
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: f6a8c5b50e9562ffea41dfbfe6749b21d4acdb5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a8c5b50e9562ffea41dfbfe… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 16:52:07 2013 -0600 winemac: Take WS_EX_TOOLWINDOW into account when computing how much of a window is replaced by the Mac decorations. --- dlls/winemac.drv/window.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index eac333a..1ad8ac2 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -137,7 +137,11 @@ static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT struct macdrv_window_features wf; get_cocoa_window_features(data, style, ex_style, &wf); - if (wf.title_bar) style_mask |= WS_CAPTION; + if (wf.title_bar) + { + style_mask |= WS_CAPTION; + ex_style_mask |= WS_EX_TOOLWINDOW; + } if (wf.shadow) { style_mask |= WS_DLGFRAME | WS_THICKFRAME;

1 0

Huw Davies : riched20: Simplify the code by using an ME_Paragraph pointer.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 0d8800d4672ee5d2ccf8998861a01001f6278beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8800d4672ee5d2ccf899886… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 21 12:26:52 2013 +0000 riched20: Simplify the code by using an ME_Paragraph pointer. --- dlls/riched20/wrap.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 52722db..73edb98 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -168,13 +168,12 @@ static void ME_BeginRow(ME_WrapContext *wc) static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) { - ME_DisplayItem *p, *row, *para; + ME_DisplayItem *p, *row; + ME_Paragraph *para = &wc->pPara->member.para; BOOL bSkippingSpaces = TRUE; int ascent = 0, descent = 0, width=0, shift = 0, align = 0; - PARAFORMAT2 *pFmt; + /* wrap text */ - para = wc->pPara; - pFmt = para->member.para.pFmt; for (p = pEnd->prev; p!=wc->pRowStart->prev; p = p->prev) { @@ -208,10 +207,10 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) } } - para->member.para.nWidth = max(para->member.para.nWidth, width); + para->nWidth = max(para->nWidth, width); row = ME_MakeRow(ascent+descent, ascent, width); if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + (para->pFmt->dwMask & PFM_TABLE) && (para->pFmt->wEffects & PFE_TABLE)) { /* The text was shifted down in ME_BeginRow so move the wrap context * back to where it should be. */ @@ -222,8 +221,8 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) row->member.row.pt = wc->pt; row->member.row.nLMargin = (!wc->nRow ? wc->nFirstMargin : wc->nLeftMargin); row->member.row.nRMargin = wc->nRightMargin; - assert(para->member.para.pFmt->dwMask & PFM_ALIGNMENT); - align = para->member.para.pFmt->wAlignment; + assert(para->pFmt->dwMask & PFM_ALIGNMENT); + align = para->pFmt->wAlignment; if (align == PFA_CENTER) shift = max((wc->nAvailWidth-width)/2, 0); if (align == PFA_RIGHT)

1 0

Francois Gouget : po: Remove an extraneous full stop in an error message.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: a81e58f38ee966bdcddeef89c92a06095c6ab63c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81e58f38ee966bdcddeef89c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 11:21:41 2013 +0100 po: Remove an extraneous full stop in an error message. --- po/uk.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/uk.po b/po/uk.po index ac6d271..faf49b9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -13880,7 +13880,7 @@ msgstr "Помилка: Командний рядок не підтримуєт #: wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "Помилка: Псевдонім не знайдено.\n" +msgstr "Помилка: Псевдонім не знайдено\n" #: wmic.rc:30 msgid "Error: Invalid query\n"

1 0

Henri Verbeet : wined3d: Merge texture2d_unload() and texture3d_unload().
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 0d7b12696de77531061446880d341d6edea3a055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7b12696de77531061446880… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:21 2013 +0100 wined3d: Merge texture2d_unload() and texture3d_unload(). --- dlls/wined3d/texture.c | 53 ++++++++++++++--------------------------------- 1 files changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 52a2bf9..08638a5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -94,7 +94,7 @@ static void gltexture_delete(const struct wined3d_gl_info *gl_info, struct gl_te tex->name = 0; } -static void wined3d_texture_unload(struct wined3d_texture *texture) +static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) { struct wined3d_device *device = texture->resource.device; struct wined3d_context *context = NULL; @@ -132,7 +132,7 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) texture->texture_ops->texture_sub_resource_cleanup(sub_resource); } - wined3d_texture_unload(texture); + wined3d_texture_unload_gl_texture(texture); HeapFree(GetProcessHeap(), 0, texture->sub_resources); resource_cleanup(&texture->resource); } @@ -696,7 +696,14 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource wined3d_surface_decref(surface); } -static void texture2d_unload(struct wined3d_resource *resource) +static const struct wined3d_texture_ops texture2d_ops = +{ + texture2d_preload, + texture2d_sub_resource_add_dirty_region, + texture2d_sub_resource_cleanup, +}; + +static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; @@ -711,19 +718,12 @@ static void texture2d_unload(struct wined3d_resource *resource) sub_resource->resource_ops->resource_unload(sub_resource); } - wined3d_texture_unload(texture); + wined3d_texture_unload_gl_texture(texture); } -static const struct wined3d_texture_ops texture2d_ops = -{ - texture2d_preload, - texture2d_sub_resource_add_dirty_region, - texture2d_sub_resource_cleanup, -}; - -static const struct wined3d_resource_ops texture2d_resource_ops = +static const struct wined3d_resource_ops texture_resource_ops = { - texture2d_unload, + wined3d_texture_unload, }; static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -794,7 +794,7 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi } if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, - desc, device, parent, parent_ops, &texture2d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -919,7 +919,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, - desc, device, parent, parent_ops, &texture2d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1047,22 +1047,6 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource wined3d_volume_decref(volume); } -static void texture3d_unload(struct wined3d_resource *resource) -{ - struct wined3d_texture *texture = wined3d_texture_from_resource(resource); - UINT i; - - TRACE("texture %p.\n", texture); - - for (i = 0; i < texture->level_count; ++i) - { - struct wined3d_resource *sub_resource = texture->sub_resources[i]; - sub_resource->resource_ops->resource_unload(sub_resource); - } - - wined3d_texture_unload(texture); -} - static const struct wined3d_texture_ops texture3d_ops = { texture3d_preload, @@ -1070,11 +1054,6 @@ static const struct wined3d_texture_ops texture3d_ops = texture3d_sub_resource_cleanup, }; -static const struct wined3d_resource_ops texture3d_resource_ops = -{ - texture3d_unload, -}; - static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, UINT levels, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -1149,7 +1128,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, - desc, device, parent, parent_ops, &texture3d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr;

1 0