January 2009 - Wine-Commits

Juan Lang : crypt32: Only open the read-only root store for the local machine location.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 56634dce7b0dddde8b4a3681c1bf7db3d3f123c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56634dce7b0dddde8b4a3681c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 16 07:40:55 2009 -0800 crypt32: Only open the read-only root store for the local machine location. --- dlls/crypt32/store.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 3b42893..602bd40 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -348,7 +348,14 @@ static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv, SetLastError(E_INVALIDARG); return NULL; } - if (!lstrcmpiW(storeName, rootW)) + /* FIXME: In Windows, the root store (even the current user location) is + * protected: adding to it or removing from it present a user interface, + * and the keys are owned by the system process, not the current user. + * Wine's registry doesn't implement access controls, so a similar + * mechanism isn't possible yet. + */ + if ((dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) == + CERT_SYSTEM_STORE_LOCAL_MACHINE && !lstrcmpiW(storeName, rootW)) return CRYPT_RootOpenStore(hCryptProv, dwFlags); switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK)

1 0

Alexandre Julliard : user32/tests: Fix some more msg test failures and improve message sequence tracing.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 7d585678be14df62a777fb15a4077878702f0cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d585678be14df62a777fb15a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 12:36:11 2009 +0100 user32/tests: Fix some more msg test failures and improve message sequence tracing. --- dlls/user32/tests/msg.c | 59 +++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 91a470b..38cfeef 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -750,6 +750,7 @@ static const struct message WmCreatePopupSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -834,6 +835,7 @@ static const struct message WmShowVisiblePopupSeq_3[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; /* CreateWindow (for child window, not initially visible) */ @@ -1884,8 +1886,15 @@ static void dump_sequence(const struct message *expected, const char *context, c while (expected->message && ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook))) { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); expected++; + count++; } + + if (expected->message) + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + else if (actual->message && actual->output[0]) + trace_(file, line)( " %u: expected: nothing - actual: %s\n", count, actual->output ); } #define ok_sequence( exp, contx, todo) \ @@ -1950,6 +1959,14 @@ static void ok_sequence_(const struct message *expected_list, const char *contex if ((expected->lParam ^ actual->lParam) & ~expected->lp_mask) dump++; } } + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && + (expected->flags & optional)) + { + /* don't match messages if their defwinproc status differs */ + expected++; + count++; + continue; + } if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && todo) { todo_wine { @@ -2387,12 +2404,12 @@ static const struct message WmCreateMDIchildVisibleMaxSeq1[] = { /* Win9x: message sequence terminates here. */ { WM_NCACTIVATE, sent|wparam|defwinproc|optional, 1 }, - { HCBT_SETFOCUS, hook }, /* in MDI client */ + { HCBT_SETFOCUS, hook|optional }, /* in MDI client */ { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, /* in MDI client */ { WM_IME_NOTIFY, sent|wparam|optional, 2 }, /* in MDI client */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional }, /* in MDI client */ - { HCBT_SETFOCUS, hook }, + { HCBT_SETFOCUS, hook|optional }, { WM_KILLFOCUS, sent|optional }, /* in MDI client */ { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */ { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, @@ -3116,6 +3133,7 @@ static LRESULT WINAPI mdi_client_hook_proc(HWND hwnd, UINT message, WPARAM wPara message != WM_GETTEXT && message != WM_MDIGETACTIVE && message != WM_GETICON && + message != WM_GETOBJECT && message != WM_DEVICECHANGE) { msg.hwnd = hwnd; @@ -3144,6 +3162,7 @@ static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && + message != WM_GETOBJECT && message != WM_DEVICECHANGE) { switch (message) @@ -3193,6 +3212,7 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && + message != WM_GETOBJECT && message != WM_DEVICECHANGE) { msg.hwnd = hwnd; @@ -3812,6 +3832,7 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam { /* ignore */ case WM_GETICON: + case WM_GETOBJECT: case WM_MOUSEMOVE: case WM_SETCURSOR: case WM_DEVICECHANGE: @@ -5061,9 +5082,9 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, switch (message) { - /* explicitly ignore WM_GETICON message */ case WM_GETICON: - return 0; + case WM_GETOBJECT: + return 0; /* ignore them */ case WM_SYNCPAINT: break; case BM_SETSTATE: @@ -5169,6 +5190,7 @@ static void test_button_messages(void) 0, 0, 50, 14, 0, 0, 0, NULL); ok(hwnd != 0, "Failed to create button window\n"); + SetForegroundWindow(hwnd); SetFocus(0); flush_events(); flush_sequence(); @@ -5206,8 +5228,7 @@ static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; + if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ msg.hwnd = hwnd; msg.message = message; @@ -5310,6 +5331,7 @@ static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wPara message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && + message != WM_GETOBJECT && message != WM_DEVICECHANGE) { msg.hwnd = hwnd; @@ -6542,6 +6564,7 @@ static void pump_msg_loop(HWND hwnd, HACCEL hAccel) /* ignore some unwanted messages */ if (msg.message == WM_MOUSEMOVE || msg.message == WM_GETICON || + msg.message == WM_GETOBJECT || msg.message == WM_TIMER || msg.message == WM_DEVICECHANGE) continue; @@ -6766,9 +6789,6 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; - /* ignore registered messages */ if (message >= 0xc000) return 0; @@ -6833,6 +6853,8 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, case WM_MOUSEACTIVATE: case WM_NCMOUSEMOVE: case WM_SETCURSOR: + case WM_GETICON: + case WM_GETOBJECT: case WM_DEVICECHANGE: return 0; } @@ -6905,8 +6927,8 @@ static LRESULT WINAPI PopupMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, switch (message) { case WM_GETICON: - /* explicitly ignore WM_GETICON message */ - return 0; + case WM_GETOBJECT: + return 0; /* ignore them */ case WM_QUERYENDSESSION: case WM_ENDSESSION: lParam &= ~0x01; /* Vista adds a 0x01 flag */ @@ -6942,8 +6964,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; + if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ /* ignore registered messages */ if (message >= 0xc000) return 0; @@ -7009,8 +7030,7 @@ static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARA LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; + if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ if (test_def_id) { @@ -8633,8 +8653,7 @@ static LRESULT CALLBACK edit_hook_proc(HWND hwnd, UINT message, WPARAM wParam, L LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; + if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ msg.hwnd = hwnd; msg.message = message; @@ -9782,6 +9801,7 @@ static const struct message WmShowNA_1[] = { static const struct message WmShowNA_2[] = { { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; static const struct message WmRestore_1[] = { @@ -10091,9 +10111,9 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR switch (message) { - /* explicitly ignore WM_GETICON message */ case WM_GETICON: - return 0; + case WM_GETOBJECT: + return 0; /* ignore them */ } msg.hwnd = hwnd; @@ -10851,6 +10871,7 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && + message != WM_GETOBJECT && message != WM_GETICON && message != WM_DEVICECHANGE) {

1 0

Andrew Nguyen : kernel32: Ensure that WriteConsoleW succeeds with an empty input buffer.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 976d5cae8d58b29564cd802b4330ad211557f518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=976d5cae8d58b29564cd802b4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Jan 18 23:52:11 2009 -0600 kernel32: Ensure that WriteConsoleW succeeds with an empty input buffer. --- dlls/kernel32/console.c | 2 ++ dlls/kernel32/tests/console.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index a872b1f..d247e1b 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2057,6 +2057,8 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber !GetConsoleScreenBufferInfo(hConsoleOutput, &csbi)) return FALSE; + if (!nNumberOfCharsToWrite) return TRUE; + if (mode & ENABLE_PROCESSED_OUTPUT) { unsigned int i; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a90fe70..eb51f7a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -173,6 +173,45 @@ static void testCursorInfo(HANDLE hCon) ERROR_INVALID_ACCESS, GetLastError()); } +static void testEmptyWrite(HANDLE hCon) +{ + COORD c; + DWORD len; + const char* mytest = ""; + + c.X = c.Y = 0; + ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left\n"); + + len = -1; + ok(WriteConsole(hCon, NULL, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); + okCURSOR(hCon, c); + + /* Passing a NULL lpBuffer with sufficiently large non-zero length succeeds + * on native Windows and result in memory-like contents being written to + * the console. Calling WriteConsoleW like this will crash on Wine. */ + if (0) + { + len = -1; + ok(!WriteConsole(hCon, NULL, 16, &len, NULL) && len == -1, "WriteConsole\n"); + okCURSOR(hCon, c); + + /* Cursor advances for this call. */ + len = -1; + ok(WriteConsole(hCon, NULL, 128, &len, NULL) != 0 && len == 128, "WriteConsole\n"); + } + + len = -1; + ok(WriteConsole(hCon, mytest, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); + okCURSOR(hCon, c); + + /* WriteConsole does not halt on a null terminator and is happy to write + * memory contents beyond the actual size of the buffer. */ + len = -1; + ok(WriteConsole(hCon, mytest, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); + c.X += 16; + okCURSOR(hCon, c); +} + static void testWriteSimple(HANDLE hCon) { COORD c; @@ -407,6 +446,8 @@ static void testWrite(HANDLE hCon, COORD sbSize) /* FIXME: should in fact insure that the sb is at least 10 character wide */ ok(SetConsoleTextAttribute(hCon, TEST_ATTRIB), "Setting default text color\n"); resetContent(hCon, sbSize, FALSE); + testEmptyWrite(hCon); + resetContent(hCon, sbSize, FALSE); testWriteSimple(hCon); resetContent(hCon, sbSize, FALSE); testWriteNotWrappedNotProcessed(hCon, sbSize);

1 0

Andrew Nguyen : kernel32/tests: Simplify a test function's parameters.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 1571c05ad59041819de4cda4b186a527a48139f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1571c05ad59041819de4cda4b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Jan 18 23:51:14 2009 -0600 kernel32/tests: Simplify a test function's parameters. --- dlls/kernel32/tests/console.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6eed56b..a90fe70 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -173,7 +173,7 @@ static void testCursorInfo(HANDLE hCon) ERROR_INVALID_ACCESS, GetLastError()); } -static void testWriteSimple(HANDLE hCon, COORD sbSize) +static void testWriteSimple(HANDLE hCon) { COORD c; DWORD len; @@ -407,7 +407,7 @@ static void testWrite(HANDLE hCon, COORD sbSize) /* FIXME: should in fact insure that the sb is at least 10 character wide */ ok(SetConsoleTextAttribute(hCon, TEST_ATTRIB), "Setting default text color\n"); resetContent(hCon, sbSize, FALSE); - testWriteSimple(hCon, sbSize); + testWriteSimple(hCon); resetContent(hCon, sbSize, FALSE); testWriteNotWrappedNotProcessed(hCon, sbSize); resetContent(hCon, sbSize, FALSE);

1 0

Henri Verbeet : dxgi: Implement IDXGIDevice::CreateSurface().
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: c9f116a56f519fea0c171362d2e00dddfb908ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f116a56f519fea0c171362d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 10:39:06 2009 +0100 dxgi: Implement IDXGIDevice::CreateSurface(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 11 ++++ dlls/d3d10core/tests/device.c | 2 +- dlls/d3d10core/texture2d.c | 9 ++++ dlls/dxgi/device.c | 89 ++++++++++++++++++++++++++++++------ dlls/dxgi/tests/device.c | 2 +- include/wine/winedxgi.idl | 7 +++ 7 files changed, 105 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 1b28d5e..5453600 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -58,6 +58,7 @@ struct d3d10_texture2d const struct ID3D10Texture2DVtbl *vtbl; LONG refcount; + IUnknown *dxgi_surface; IWineD3DSurface *wined3d_surface; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 034c9b9..2e4c5c1 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -602,6 +602,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac return E_FAIL; } + hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, + (IUnknown *)object, (void **)&object->dxgi_surface); + if (FAILED(hr)) + { + ERR("Failed to create DXGI surface, returning %#x\n", hr); + HeapFree(GetProcessHeap(), 0, object); + IWineDXGIDevice_Release(wine_device); + return hr; + } + wined3d_device = IWineDXGIDevice_get_wined3d_device(wine_device); IWineDXGIDevice_Release(wine_device); @@ -614,6 +624,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac if (FAILED(hr)) { ERR("CreateSurface failed, returning %#x\n", hr); + IDXGISurface_Release(object->dxgi_surface); HeapFree(GetProcessHeap(), 0, object); return hr; } diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5493d23..1a3f331 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -116,7 +116,7 @@ static void test_create_texture(ID3D10Device *device) ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); - todo_wine ok(SUCCEEDED(hr), "Texture should implement IDXGISurface\n"); + ok(SUCCEEDED(hr), "Texture should implement IDXGISurface\n"); if (SUCCEEDED(hr)) IDXGISurface_Release(surface); ID3D10Texture2D_Release(texture); diff --git a/dlls/d3d10core/texture2d.c b/dlls/d3d10core/texture2d.c index d0fb0f5..afb6167 100644 --- a/dlls/d3d10core/texture2d.c +++ b/dlls/d3d10core/texture2d.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object) { + struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_ID3D10Texture2D) @@ -40,6 +42,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D return S_OK; } + if (This->dxgi_surface) + { + TRACE("Forwarding to dxgi surface\n"); + return IDXGISurface_QueryInterface(This->dxgi_surface, riid, object); + } + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); *object = NULL; @@ -65,6 +73,7 @@ static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface) if (!refcount) { + if (This->dxgi_surface) IDXGISurface_Release(This->dxgi_surface); if (This->wined3d_surface) IWineD3DSurface_Release(This->wined3d_surface); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 235e1f7..3c10f99 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -145,40 +145,65 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac const DXGI_SURFACE_DESC *desc, UINT surface_count, DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IDXGISurface **surface) { - struct dxgi_surface *object; + IWineD3DDeviceParent *device_parent; HRESULT hr; UINT i; + UINT j; - FIXME("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p partial stub!\n", + TRACE("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p\n", iface, desc, surface_count, usage, shared_resource, surface); + hr = IWineDXGIDevice_QueryInterface(iface, &IID_IWineD3DDeviceParent, (void **)&device_parent); + if (FAILED(hr)) + { + ERR("Device should implement IWineD3DDeviceParent\n"); + return E_FAIL; + } + + FIXME("Implement DXGI<->wined3d format and usage conversion\n"); + memset(surface, 0, surface_count * sizeof(*surface)); for (i = 0; i < surface_count; ++i) { - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + IWineD3DSurface *wined3d_surface; + IUnknown *parent; + + hr = IWineD3DDeviceParent_CreateSurface(device_parent, NULL, desc->Width, desc->Height, desc->Format, + usage, WINED3DPOOL_DEFAULT, 0, WINED3DCUBEMAP_FACE_POSITIVE_X, &wined3d_surface); + if (FAILED(hr)) { - ERR("Failed to allocate DXGI surface object memory\n"); - hr = E_OUTOFMEMORY; + ERR("CreateSurface failed, returning %#x\n", hr); goto fail; } - object->vtbl = &dxgi_surface_vtbl; - object->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; - object->refcount = 1; - object->outer_unknown = (IUnknown *)&object->inner_unknown_vtbl; - surface[i] = (IDXGISurface *)object; + hr = IWineD3DSurface_GetParent(wined3d_surface, &parent); + IWineD3DSurface_Release(wined3d_surface); + if (FAILED(hr)) + { + ERR("GetParent failed, returning %#x\n", hr); + goto fail; + } + + hr = IUnknown_QueryInterface(parent, &IID_IDXGISurface, (void **)&surface[i]); + IUnknown_Release(parent); + if (FAILED(hr)) + { + ERR("Surface should implement IDXGISurface\n"); + goto fail; + } - TRACE("Created IDXGISurface %p (%u/%u)\n", object, i + 1, surface_count); + TRACE("Created IDXGISurface %p (%u/%u)\n", surface[i], i + 1, surface_count); } + IWineD3DDeviceParent_Release(device_parent); return S_OK; fail: - for (i = 0; i < surface_count; ++i) + for (j = 0; j < i; ++j) { - HeapFree(GetProcessHeap(), 0, surface[i]); + IDXGISurface_Release(surface[i]); } + IWineD3DDeviceParent_Release(device_parent); return hr; } @@ -219,6 +244,41 @@ static IWineD3DDevice * STDMETHODCALLTYPE dxgi_device_get_wined3d_device(IWineDX return This->wined3d_device; } +static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, const DXGI_SURFACE_DESC *desc, + DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) +{ + struct dxgi_surface *object; + + FIXME("iface %p, desc %p, usage %#x, shared_resource %p, outer %p, surface %p partial stub!\n", + iface, desc, usage, shared_resource, outer, surface); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate DXGI surface object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &dxgi_surface_vtbl; + object->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; + object->refcount = 1; + + if (outer) + { + object->outer_unknown = outer; + *surface = &object->inner_unknown_vtbl; + } + else + { + object->outer_unknown = (IUnknown *)&object->inner_unknown_vtbl; + *surface = object; + } + + TRACE("Created IDXGISurface %p\n", object); + + return S_OK; +} + const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = { /* IUnknown methods */ @@ -238,4 +298,5 @@ const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_GetGPUThreadPriority, /* IWineDXGIAdapter methods */ dxgi_device_get_wined3d_device, + dxgi_device_create_surface, }; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 39d780a..12893b1 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -115,7 +115,7 @@ static void test_create_surface(IDXGIDevice *device) ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); - todo_wine ok(SUCCEEDED(hr), "Surface should implement ID3D10Texture2D\n"); + ok(SUCCEEDED(hr), "Surface should implement ID3D10Texture2D\n"); if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture); IDXGISurface_Release(surface); diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 860b695..3fc7883 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -46,4 +46,11 @@ interface IWineDXGIAdapter : IDXGIAdapter interface IWineDXGIDevice : IDXGIDevice { struct IWineD3DDevice *get_wined3d_device(); + HRESULT create_surface( + [in] const DXGI_SURFACE_DESC *desc, + [in] DXGI_USAGE usage, + [in] const DXGI_SHARED_RESOURCE *shared_resource, + [in] IUnknown *outer, + [out] void **surface + ); }

1 0

Henri Verbeet : d3d10core: Implement device_parent_CreateRenderTarget().
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 57242b848f926fddb4323959b45be74f01ae39d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57242b848f926fddb4323959b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 10:39:06 2009 +0100 d3d10core: Implement device_parent_CreateRenderTarget(). --- dlls/d3d10core/device.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 965bd49..3c19c39 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1008,11 +1008,39 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice IUnknown *superior, UINT width, UINT height, WINED3DFORMAT format, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, IWineD3DSurface **surface) { + struct d3d10_device *This = device_from_device_parent(iface); + struct d3d10_texture2d *texture; + D3D10_TEXTURE2D_DESC desc; + HRESULT hr; + FIXME("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, lockable %u, surface %p stub!\n", iface, superior, width, height, format, multisample_type, multisample_quality, lockable, surface); - return E_NOTIMPL; + FIXME("Implement DXGI<->wined3d format and usage conversion\n"); + + desc.Width = width; + desc.Height = height; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = format; + desc.SampleDesc.Count = multisample_type; + desc.SampleDesc.Quality = multisample_quality; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = d3d10_device_CreateTexture2D((ID3D10Device *)This, &desc, NULL, (ID3D10Texture2D **)&texture); + if (FAILED(hr)) + { + ERR("CreateTexture2D failed, returning %#x\n", hr); + return hr; + } + + *surface = texture->wined3d_surface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3DDeviceParent *iface,

1 0

Henri Verbeet : d3d10core: Implement device_parent_CreateSurface().
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 43f469ec6a0518028c12c757895e2c483eafd4ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f469ec6a0518028c12c7578… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 19 10:39:05 2009 +0100 d3d10core: Implement device_parent_CreateSurface(). --- .gitignore | 2 +- dlls/d3d10core/d3d10core_private.h | 3 + dlls/d3d10core/device.c | 64 +++++++++++++++++++- dlls/d3d10core/texture2d.c | 6 ++ dlls/dxgi/Makefile.in | 2 - dlls/dxgi/device.c | 48 ++++++++++---- dlls/dxgi/dxgi_private.h | 6 +- include/Makefile.in | 3 +- .../wine/winedxgi.idl | 12 ++++- tools/make_makefiles | 1 + 10 files changed, 123 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43f469ec6a0518028c12c…

1 0

Henri Verbeet : dxgi: Allow dxgi_surface to be aggregated.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: 23094bfad83ac6109b681d7a9faad387d4a9e7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23094bfad83ac6109b681d7a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 10:39:06 2009 +0100 dxgi: Allow dxgi_surface to be aggregated. --- dlls/dxgi/device.c | 2 + dlls/dxgi/dxgi_private.h | 3 ++ dlls/dxgi/surface.c | 54 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 28bc9be..235e1f7 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -164,7 +164,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac } object->vtbl = &dxgi_surface_vtbl; + object->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; object->refcount = 1; + object->outer_unknown = (IUnknown *)&object->inner_unknown_vtbl; surface[i] = (IDXGISurface *)object; TRACE("Created IDXGISurface %p (%u/%u)\n", object, i + 1, surface_count); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index d19b9b1..4e6901c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -81,9 +81,12 @@ struct dxgi_swapchain /* IDXGISurface */ extern const struct IDXGISurfaceVtbl dxgi_surface_vtbl; +extern const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl; struct dxgi_surface { const struct IDXGISurfaceVtbl *vtbl; + const struct IUnknownVtbl *inner_unknown_vtbl; + IUnknown *outer_unknown; LONG refcount; }; diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 82db08b..bdbeaf3 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -24,10 +24,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); -/* IUnknown methods */ +/* Inner IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface *iface, REFIID riid, void **object) +static inline struct dxgi_surface *dxgi_surface_from_inner_unknown(IUnknown *iface) +{ + return (struct dxgi_surface *)((char*)iface - FIELD_OFFSET(struct dxgi_surface, inner_unknown_vtbl)); +} + +static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *iface, REFIID riid, void **object) { + struct dxgi_surface *This = dxgi_surface_from_inner_unknown(iface); + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IDXGISurface) @@ -35,8 +42,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface *iface || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); - *object = iface; + IUnknown_AddRef((IUnknown *)This); + *object = This; return S_OK; } @@ -46,9 +53,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface *iface return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface *iface) +static ULONG STDMETHODCALLTYPE dxgi_surface_inner_AddRef(IUnknown *iface) { - struct dxgi_surface *This = (struct dxgi_surface *)iface; + struct dxgi_surface *This = dxgi_surface_from_inner_unknown(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -56,9 +63,9 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface *iface) return refcount; } -static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface *iface) +static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) { - struct dxgi_surface *This = (struct dxgi_surface *)iface; + struct dxgi_surface *This = dxgi_surface_from_inner_unknown(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -71,6 +78,29 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface *iface) return refcount; } +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface *iface, REFIID riid, void **object) +{ + struct dxgi_surface *This = (struct dxgi_surface *)iface; + TRACE("Forwarding to outer IUnknown\n"); + return IUnknown_QueryInterface(This->outer_unknown, riid, object); +} + +static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface *iface) +{ + struct dxgi_surface *This = (struct dxgi_surface *)iface; + TRACE("Forwarding to outer IUnknown\n"); + return IUnknown_AddRef(This->outer_unknown); +} + +static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface *iface) +{ + struct dxgi_surface *This = (struct dxgi_surface *)iface; + TRACE("Forwarding to outer IUnknown\n"); + return IUnknown_Release(This->outer_unknown); +} + /* IDXGIObject methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_SetPrivateData(IDXGISurface *iface, @@ -153,3 +183,11 @@ const struct IDXGISurfaceVtbl dxgi_surface_vtbl = dxgi_surface_Map, dxgi_surface_Unmap, }; + +const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = +{ + /* IUnknown methods */ + dxgi_surface_inner_QueryInterface, + dxgi_surface_inner_AddRef, + dxgi_surface_inner_Release, +};

1 0

Henri Verbeet : d3d10core: Implement device_parent_CreateDepthStencilSurface().
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: bb0e940e16c59e563957e75d8a45a7ab49f8d4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb0e940e16c59e563957e75d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 10:39:06 2009 +0100 d3d10core: Implement device_parent_CreateDepthStencilSurface(). --- dlls/d3d10core/device.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3c19c39..034c9b9 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1047,11 +1047,39 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3 IUnknown *superior, UINT width, UINT height, WINED3DFORMAT format, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { + struct d3d10_device *This = device_from_device_parent(iface); + struct d3d10_texture2d *texture; + D3D10_TEXTURE2D_DESC desc; + HRESULT hr; + FIXME("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, discard %u, surface %p stub!\n", iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); - return E_NOTIMPL; + FIXME("Implement DXGI<->wined3d format and usage conversion\n"); + + desc.Width = width; + desc.Height = height; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = format; + desc.SampleDesc.Count = multisample_type; + desc.SampleDesc.Quality = multisample_quality; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = d3d10_device_CreateTexture2D((ID3D10Device *)This, &desc, NULL, (ID3D10Texture2D **)&texture); + if (FAILED(hr)) + { + ERR("CreateTexture2D failed, returning %#x\n", hr); + return hr; + } + + *surface = texture->wined3d_surface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent *iface,

1 0

Michael Stefaniuc : inetcomm: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 19, 2009

Jan. 19, 2009

Module: wine Branch: master Commit: f21b43685325a7c2c003a30b317699ad0fbbcae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21b43685325a7c2c003a30b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 10:24:14 2009 +0100 inetcomm: Remove superfluous pointer casts. --- dlls/inetcomm/mimeole.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index bcc08dc..871ffa5 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1125,7 +1125,7 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) body_offsets.cbBodyStart = body_offsets.cbBodyEnd = 0; MimeBody_set_offsets(This, &body_offsets); - *obj = (IMimeBody *)&This->lpVtbl; + *obj = &This->lpVtbl; return S_OK; } @@ -2563,7 +2563,7 @@ HRESULT MimeMessage_create(IUnknown *outer, void **obj) list_init(&This->body_tree); This->next_hbody = (HBODY)1; - *obj = (IMimeMessage *)&This->lpVtbl; + *obj = &This->lpVtbl; return S_OK; } @@ -2774,7 +2774,7 @@ HRESULT MimeSecurity_create(IUnknown *outer, void **obj) This->lpVtbl = &MimeSecurityVtbl; This->refs = 1; - *obj = (IMimeSecurity *)&This->lpVtbl; + *obj = &This->lpVtbl; return S_OK; }

1 0