wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Dmitry Timoshkov : taskschd: Implement ITaskFolder::get_Path.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 663444ccb70899887537697f08d9f024a6ee885f URL: http://source.winehq.org/git/wine.git/?a=commit;h=663444ccb70899887537697f0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 17 18:00:08 2014 +0900 taskschd: Implement ITaskFolder::get_Path. --- dlls/taskschd/folder.c | 51 ++++++++++++++++++++++++++++++++++++--- dlls/taskschd/tests/scheduler.c | 5 ---- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index ef69cfe..c19aa4e 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -35,6 +35,7 @@ typedef struct { ITaskFolder ITaskFolder_iface; LONG ref; + WCHAR *path; } TaskFolder; static inline TaskFolder *impl_from_ITaskFolder(ITaskFolder *iface) @@ -56,6 +57,7 @@ static ULONG WINAPI TaskFolder_Release(ITaskFolder *iface) if (!ref) { TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, folder->path); HeapFree(GetProcessHeap(), 0, folder); } @@ -116,8 +118,16 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) static HRESULT WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) { - FIXME("%p,%p: stub\n", iface, path); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%p\n", iface, path); + + if (!path) return E_POINTER; + + *path = SysAllocString(folder->path); + if (!*path) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **folder) @@ -218,13 +228,48 @@ static const ITaskFolderVtbl TaskFolder_vtbl = HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) { + static const WCHAR bslash[] = { '\\', 0 }; TaskFolder *folder; + WCHAR *folder_path; + int len = 0; + + if (path) + { + len = strlenW(path); + if (len && path[len - 1] == '\\') return ERROR_INVALID_NAME; + } + + if (parent) len += strlenW(parent); + + /* +1 if parent is not '\' terminated */ + folder_path = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); + if (!folder_path) return E_OUTOFMEMORY; + + folder_path[0] = 0; + + if (parent) + strcpyW(folder_path, parent); + + len = strlenW(folder_path); + if (!len || folder_path[len - 1] != '\\') + strcatW(folder_path, bslash); + + if (path) + { + while (*path == '\\') path++; + strcatW(folder_path, path); + } folder = HeapAlloc(GetProcessHeap(), 0, sizeof(*folder)); - if (!folder) return E_OUTOFMEMORY; + if (!folder) + { + HeapFree(GetProcessHeap(), 0, folder_path); + return E_OUTOFMEMORY; + } folder->ITaskFolder_iface.lpVtbl = &TaskFolder_vtbl; folder->ref = 1; + folder->path = folder_path; *obj = &folder->ITaskFolder_iface; TRACE("created %p\n", *obj); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 74ae95f..38d60a4 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -182,17 +182,12 @@ if (hr == S_OK) } hr = ITaskFolder_get_Path(folder, NULL); -todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); hr = ITaskFolder_get_Path(folder, &bstr); -todo_wine ok(hr == S_OK, "get_Path error %#x\n", hr); -if (hr == S_OK) -{ ok(!lstrcmpW(bstr, bslash), "expected '\\', got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); -} hr = ITaskFolder_CreateFolder(folder, NULL, v_null, &subfolder); todo_wine

1 0

Dmitry Timoshkov : taskschd: Add ITaskFolder stub implementation.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: fe55cb10312e984a58f927ac459f233c031e51e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe55cb10312e984a58f927ac4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 17 17:59:49 2014 +0900 taskschd: Add ITaskFolder stub implementation. --- dlls/taskschd/Makefile.in | 1 + dlls/taskschd/folder.c | 233 ++++++++++++++++++++++++++++++++++++++ dlls/taskschd/task.c | 7 +- dlls/taskschd/taskschd_private.h | 1 + dlls/taskschd/tests/scheduler.c | 39 ++++--- 5 files changed, 264 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe55cb10312e984a58f92…

1 0

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

17 Jan '14

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

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

17 Jan '14

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

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

17 Jan '14

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

Frédéric Delanoy : wine/test.h: Fix a typo in comment.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: e46796e7a4e6d5edf359d8f8e3ffd63ec7d3c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46796e7a4e6d5edf359d8f8e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 02:05:36 2014 +0100 wine/test.h: Fix a typo in comment. --- include/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 373fe76..ab10399 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -259,7 +259,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 ) { tls_data *data = get_tls_data();

1 0

Michael Stefaniuc : dmcompos: COM cleanup for IDirectMusicComposer.
by Alexandre Julliard 17 Jan '14

17 Jan '14

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

Michael Stefaniuc : dmstyle/tests: Fix a crash on old dmusic versions.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 29fe708970653ffdc4f5da874cb8b96f49de8818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fe708970653ffdc4f5da874… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 17 01:13:58 2014 +0100 dmstyle/tests: Fix a crash on old dmusic versions. --- dlls/dmstyle/tests/dmstyle.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a1565c0..58c15eb 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -64,6 +64,10 @@ static void test_COM(void) /* Same refcount for all DirectMusicStyle8 interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicStyle8, (void**)&dms8); + if (hr == E_NOINTERFACE) { + win_skip("Old version without IDirectMusicStyle8\n"); + return; + } ok(hr == S_OK, "DirectMusicStyle8 create failed: %08x, expected S_OK\n", hr); refcount = IDirectMusicStyle8_AddRef(dms8); ok(refcount == 2, "refcount == %u, expected 2\n", refcount);

1 0

Henri Verbeet : ddraw/tests: Verify dwBackBufferCount on back buffer surfaces in test_flip().
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 1318d5786f15cb491610eb4c08abf27d13852830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1318d5786f15cb491610eb4c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 16 23:44:49 2014 +0100 ddraw/tests: Verify dwBackBufferCount on back buffer surfaces in test_flip(). --- dlls/ddraw/tests/ddraw1.c | 3 +++ dlls/ddraw/tests/ddraw2.c | 3 +++ dlls/ddraw/tests/ddraw4.c | 3 +++ dlls/ddraw/tests/ddraw7.c | 3 +++ dlls/ddraw/tests/dsurface.c | 23 +---------------------- 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c7c227b..7ab339f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3879,6 +3879,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -3888,6 +3889,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -3897,6 +3899,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2a7b64f..e4e8ff3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4560,6 +4560,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -4569,6 +4570,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -4578,6 +4580,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 589ff55..a639834 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5163,6 +5163,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5172,6 +5173,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5181,6 +5183,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index bcec1fd..9520842 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5041,6 +5041,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5050,6 +5051,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5059,6 +5061,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ffc9358..b07eddb 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1125,10 +1125,10 @@ static void AttachmentTest7(void) IDirectDraw7 *dd7; IDirectDrawSurface7 *surface1, *surface2, *surface3, *surface4; IDirectDrawSurface *surface1v1, *surface2v1; + DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}; DDSURFACEDESC2 ddsd, ddsd2; DWORD ref; UINT num; - DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}, caps2 = {DDSCAPS_BACKBUFFER,0,0,0}; HWND window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); @@ -1218,27 +1218,6 @@ static void AttachmentTest7(void) hr = IDirectDraw7_SetCooperativeLevel(dd7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_BACKBUFFERCOUNT | DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - ddsd.dwBackBufferCount = 2; - hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - - /* backbuffer surfaces must not have dwBackBufferCount set */ - ddsd2.dwSize = sizeof(ddsd2); - hr = IDirectDrawSurface7_GetAttachedSurface(surface1, &caps2, &surface2); - ok(hr==DD_OK,"GetAttachedSurface returned: %x\n", hr); - hr = IDirectDrawSurface7_GetSurfaceDesc(surface2, &ddsd2); - ok(hr==DD_OK,"GetSurfaceDesc returned: %x\n", hr); - ok(ddsd2.dwBackBufferCount==0,"backbuffer surface has dwBackBufferCount==%u\n", ddsd2.dwBackBufferCount); - - num = 0; - IDirectDrawSurface7_EnumAttachedSurfaces(surface1, &num, SurfaceCounter); - ok(num == 1, "Primary surface has %d surfaces attached, expected 1\n", num); - IDirectDrawSurface7_Release(surface1); - /* Those are some invalid descriptions, no need to test attachments with them */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd);

1 0

Vincent Povirk : gdiplus: Implement SetPageTransform playback.
by Alexandre Julliard 17 Jan '14

17 Jan '14

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

← Newer
1
...
21
22
23
24
25
26
27
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014