November 2011 - Wine-commits

Nikolay Sivov : msxml3: Place nodeValue() test data in a table.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 852bde49cb71fb1d2cc239706c872d3755481d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=852bde49cb71fb1d2cc239706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 21:56:56 2011 +0300 msxml3: Place nodeValue() test data in a table. --- dlls/msxml3/docfrag.c | 10 +--- dlls/msxml3/entityref.c | 10 +--- dlls/msxml3/tests/domdoc.c | 112 ++++++++++++++++++++++++++++--------------- 3 files changed, 77 insertions(+), 55 deletions(-) diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 0821ba9..435712c 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -177,14 +177,8 @@ static HRESULT WINAPI domfrag_get_nodeValue( VARIANT* value) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - - FIXME("(%p)->(%p)\n", This, value); - - if(!value) - return E_INVALIDARG; - - V_VT(value) = VT_NULL; - return S_FALSE; + TRACE("(%p)->(%p)\n", This, value); + return return_null_var(value); } static HRESULT WINAPI domfrag_put_nodeValue( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index d9171ca..b6b0ae4 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -174,14 +174,8 @@ static HRESULT WINAPI entityref_get_nodeValue( VARIANT* value) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - - FIXME("(%p)->(%p)\n", This, value); - - if(!value) - return E_INVALIDARG; - - V_VT(value) = VT_NULL; - return S_FALSE; + TRACE("(%p)->(%p)\n", This, value); + return return_null_var(value); } static HRESULT WINAPI entityref_put_nodeValue( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7de1837..89eb1f6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2635,12 +2635,6 @@ if (0) ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect target string\n"); SysFreeString(str); - /* test get_nodeValue */ - r = IXMLDOMProcessingInstruction_get_nodeValue(nodePI, &var); - ok(r == S_OK, "ret %08x\n", r ); - ok( !lstrcmpW( V_BSTR(&var), _bstr_("version=\"1.0\"") ), "incorrect data string\n"); - VariantClear(&var); - /* test get_data */ r = IXMLDOMProcessingInstruction_get_data(nodePI, &str); ok(r == S_OK, "ret %08x\n", r ); @@ -2909,12 +2903,6 @@ static void test_domnode( void ) ok( lstrcmpW(str,szdl) == 0, "basename was wrong\n"); SysFreeString( str ); - r = IXMLDOMNode_get_nodeValue( node, &var ); - ok( r == S_OK, "returns %08x\n", r ); - ok( V_VT(&var) == VT_BSTR, "vt %x\n", V_VT(&var)); - ok( !lstrcmpW(V_BSTR(&var), szstr1), "nodeValue incorrect\n"); - VariantClear(&var); - r = IXMLDOMNode_get_childNodes( node, NULL ); ok( r == E_INVALIDARG, "get_childNodes returned wrong code\n"); @@ -3027,13 +3015,6 @@ static void test_domnode( void ) ok( r == S_OK, "getNamedItem returned wrong code\n"); ok( type == NODE_ELEMENT, "node not text\n"); - VariantInit(&var); - ok( V_VT(&var) == VT_EMPTY, "variant init failed\n"); - r = IXMLDOMNode_get_nodeValue( node, &var ); - ok( r == S_FALSE, "nextNode returned wrong code\n"); - ok( V_VT(&var) == VT_NULL, "variant wasn't empty\n"); - ok( V_BSTR(&var) == NULL, "variant value wasn't null\n"); - r = IXMLDOMNode_hasChildNodes( node, NULL ); ok( r == E_INVALIDARG, "hasChildNodes bad return\n"); @@ -5866,13 +5847,6 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect get_data string\n"); SysFreeString(str); - /* get data Tests */ - hr = IXMLDOMComment_get_nodeValue(pComment, &v); - ok(hr == S_OK, "ret %08x\n", hr ); - ok( V_VT(&v) == VT_BSTR, "incorrect dataType type\n"); - ok( !lstrcmpW( V_BSTR(&v), _bstr_("This &is a ; test <>\\") ), "incorrect get_nodeValue string\n"); - VariantClear(&v); - /* Confirm XML text is good */ hr = IXMLDOMComment_get_xml(pComment, &str); ok(hr == S_OK, "ret %08x\n", hr ); @@ -6322,13 +6296,6 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(len == 21, "expected 21 got %d\n", len); - /* test get nodeValue */ - hr = IXMLDOMCDATASection_get_nodeValue(pCDataSec, &var); - ok(hr == S_OK, "ret %08x\n", hr ); - ok(V_VT(&var) == VT_BSTR, "got vt %04x\n", V_VT(&var)); - ok( !lstrcmpW( V_BSTR(&var), _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); - VariantClear(&var); - /* test get data */ hr = IXMLDOMCDATASection_get_data(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); @@ -9711,14 +9678,14 @@ static void test_get_tagName(void) free_bstrs(); } -typedef struct _get_datatype_t { +typedef struct { DOMNodeType type; const char *name; VARTYPE vt; HRESULT hr; -} get_datatype_t; +} node_type_t; -static const get_datatype_t get_datatype[] = { +static const node_type_t get_datatype[] = { { NODE_ELEMENT, "element", VT_NULL, S_FALSE }, { NODE_ATTRIBUTE, "attr", VT_NULL, S_FALSE }, { NODE_TEXT, "text", VT_NULL, S_FALSE }, @@ -9732,8 +9699,8 @@ static const get_datatype_t get_datatype[] = { static void test_get_dataType(void) { + const node_type_t *entry = get_datatype; IXMLDOMDocument *doc; - const get_datatype_t *entry = get_datatype; doc = create_document(&IID_IXMLDOMDocument); @@ -10680,7 +10647,7 @@ static void test_domobj_dispex(IUnknown *obj) IDispatchEx_Release(dispex); } -static const DOMNodeType dispex_types_test[] = +static const DOMNodeType nodetypes_test[] = { NODE_ELEMENT, NODE_ATTRIBUTE, @@ -10695,7 +10662,7 @@ static const DOMNodeType dispex_types_test[] = static void test_dispex(void) { - const DOMNodeType *type = dispex_types_test; + const DOMNodeType *type = nodetypes_test; IXMLDOMImplementation *impl; IXMLDOMNodeList *node_list; IXMLDOMParseError *error; @@ -11077,6 +11044,72 @@ static void test_supporterrorinfo(void) free_bstrs(); } +typedef struct { + DOMNodeType type; + const char *name; + const char *put_content; + HRESULT put_hr; + VARTYPE get_vt; + HRESULT get_hr; +} node_value_t; + +static const node_value_t nodevalue_test[] = { + { NODE_ELEMENT, "element", "", E_FAIL, VT_NULL, S_FALSE }, + { NODE_ATTRIBUTE, "attr", "value", S_OK, VT_BSTR, S_OK }, + { NODE_TEXT, "text", "textdata", S_OK, VT_BSTR, S_OK }, + { NODE_CDATA_SECTION , "cdata", "cdata data", S_OK, VT_BSTR, S_OK }, + { NODE_ENTITY_REFERENCE, "entityref", "ref", E_FAIL, VT_NULL, S_FALSE }, + { NODE_PROCESSING_INSTRUCTION, "pi", "instr", S_OK, VT_BSTR, S_OK }, + { NODE_COMMENT, "comment", "comment data", S_OK, VT_BSTR, S_OK }, + { NODE_DOCUMENT_FRAGMENT, "docfrag", "", E_FAIL, VT_NULL, S_FALSE }, + { NODE_INVALID } +}; + +static void test_nodeValue(void) +{ + const node_value_t *ptr = nodevalue_test; + IXMLDOMDocument *doc; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + while (ptr->type != NODE_INVALID) + { + IXMLDOMNode *node; + VARIANT v; + + V_VT(&v) = VT_I2; + V_I2(&v) = ptr->type; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_(ptr->name), NULL, &node); + ok(hr == S_OK, "failed to create node type %d\n", ptr->type); + + hr = IXMLDOMNode_get_nodeValue(node, NULL); + ok(hr == E_INVALIDARG, "%d: got 0x%08x\n", ptr->type, hr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_(ptr->put_content); + hr = IXMLDOMNode_put_nodeValue(node, v); + ok(hr == ptr->put_hr, "%d: got 0x%08x\n", ptr->type, hr); + + V_VT(&v) = VT_EMPTY; + hr = IXMLDOMNode_get_nodeValue(node, &v); + ok(hr == ptr->get_hr, "%d: got 0x%08x, expected 0x%08x\n", ptr->type, hr, ptr->get_hr); + ok(V_VT(&v) == ptr->get_vt, "%d: got %d, expected %d\n", ptr->type, V_VT(&v), ptr->get_vt); + if (hr == S_OK) + ok(!lstrcmpW(V_BSTR(&v), _bstr_(ptr->put_content)), "%d: got %s\n", ptr->type, + wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + IXMLDOMNode_Release(node); + + ptr++; + } + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -11152,6 +11185,7 @@ START_TEST(domdoc) test_parseerror(); test_getAttributeNode(); test_supporterrorinfo(); + test_nodeValue(); test_xsltemplate();

1 0

Nikolay Sivov : msxml3: Fix get_namespaceURI() for document nodes.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 2508025bcd658688177471210af9ae8d4eac1a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2508025bcd658688177471210… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 22:36:32 2011 +0300 msxml3: Fix get_namespaceURI() for document nodes. --- dlls/msxml3/domdoc.c | 4 +--- dlls/msxml3/tests/domdoc.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 4640e62..68f47a7 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1369,17 +1369,15 @@ static HRESULT WINAPI domdoc_get_parsed( return S_OK; } - static HRESULT WINAPI domdoc_get_namespaceURI( IXMLDOMDocument3 *iface, BSTR* namespaceURI ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); TRACE("(%p)->(%p)\n", This, namespaceURI); - return node_get_namespaceURI(&This->node, namespaceURI); + return return_null_bstr( namespaceURI ); } - static HRESULT WINAPI domdoc_get_prefix( IXMLDOMDocument3 *iface, BSTR* prefix ) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 89eb1f6..b2a229b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7137,6 +7137,11 @@ static void test_namespaces(void) EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); + str = (BSTR)0xdeadbeef; + hr = IXMLDOMDocument_get_namespaceURI(doc, &str); + EXPECT_HR(hr, S_FALSE); + ok(str == NULL, "got %p\n", str); + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &node ); EXPECT_HR(hr, S_OK); if(hr == S_OK) @@ -8757,11 +8762,11 @@ static void test_get_prefix(void) /* 1. document */ str = (void*)0xdeadbeef; hr = IXMLDOMDocument_get_prefix(doc, &str); - ok( hr == S_FALSE, "got 0x%08x\n", hr); - ok( str == 0, "got %p\n", str); + EXPECT_HR(hr, S_FALSE); + ok(str == NULL, "got %p\n", str); hr = IXMLDOMDocument_get_prefix(doc, NULL); - ok( hr == E_INVALIDARG, "got 0x%08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); /* 2. cdata */ hr = IXMLDOMDocument_createCDATASection(doc, NULL, &cdata);

1 0

Gerald Pfeifer : winex11.drv: Move a conditionally used label into the condition in X11DRV_XRender_Init.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: ef6f8a58c5c8b02e4dc3ed3680770d5f3d4fdf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6f8a58c5c8b02e4dc3ed368… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 26 23:34:52 2011 +0100 winex11.drv: Move a conditionally used label into the condition in X11DRV_XRender_Init. --- dlls/winex11.drv/xrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index f6b19ba..ebbf9fc 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -427,9 +427,10 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) fontconfig_installed = pFcInit(); } else TRACE( "cannot find the fontconfig library " SONAME_LIBFONTCONFIG "\n" ); -#endif sym_not_found: +#endif + glyphsetCache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*glyphsetCache) * INIT_CACHE_SIZE);

1 0

Henri Verbeet : d3d8/tests: Test the window and backbuffer dimensions after display mode changes.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 5b88d145e444e5c4f7c32fe5a18bdf73c2f86e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b88d145e444e5c4f7c32fe5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 27 21:34:46 2011 +0100 d3d8/tests: Test the window and backbuffer dimensions after display mode changes. --- dlls/d3d8/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3771f33..6467858 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2914,6 +2914,96 @@ cleanup: DestroyWindow(hwnd); } +static void test_mode_change(void) +{ + RECT fullscreen_rect, focus_rect, r; + IDirect3DSurface8 *backbuffer; + IDirect3DDevice8 *device; + D3DSURFACE_DESC desc; + IDirect3D8 *d3d8; + DEVMODEW devmode; + UINT refcount; + HRESULT hr; + DWORD ret; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping mode change tests.\n"); + return; + } + + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + + SetRect(&fullscreen_rect, 0, 0, screen_width, screen_height); + GetWindowRect(focus_window, &focus_rect); + + device = create_device(d3d8, device_window, focus_window, FALSE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = 640; + devmode.dmPelsHeight = 480; + + ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", ret); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + ok(devmode.dmPelsWidth == 640, "Got unexpect width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == 480, "Got unexpect height %u.\n", devmode.dmPelsHeight); + + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &focus_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, + r.left, r.top, r.right, r.bottom); + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(backbuffer, &desc); + ok(SUCCEEDED(hr), "Failed to get backbuffer desc, hr %#x.\n", hr); + ok(desc.Width == screen_width, "Got unexpected backbuffer width %u.\n", desc.Width); + ok(desc.Height == screen_height, "Got unexpected backbuffer height %u.\n", desc.Height); + IDirect3DSurface8_Release(backbuffer); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + ok(devmode.dmPelsWidth == screen_width, "Got unexpect width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == screen_height, "Got unexpect height %u.\n", devmode.dmPelsHeight); + +done: + DestroyWindow(device_window); + DestroyWindow(focus_window); + if (d3d8) + IDirect3D8_Release(d3d8); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + ok(devmode.dmPelsWidth == screen_width, "Got unexpect width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == screen_height, "Got unexpect height %u.\n", devmode.dmPelsHeight); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -2966,6 +3056,7 @@ START_TEST(device) test_depth_stencil_size(); test_window_style(); test_wrong_shader(); + test_mode_change(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : ddraw/tests: Add tests for primary dimensions to test_coop_level_mode_set().
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: f41ea4fefec76d673abb025e16e50c4007a640c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41ea4fefec76d673abb025e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 27 21:34:47 2011 +0100 ddraw/tests: Add tests for primary dimensions to test_coop_level_mode_set(). --- dlls/ddraw/tests/d3d.c | 238 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 238 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f41ea4fefec76d673abb0…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DDEVICE_CREATION_PARAMETERS typedef.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: d1327bbefeceb0c53ba829ad8434805cf5ec4745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1327bbefeceb0c53ba829ad8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 27 21:34:48 2011 +0100 wined3d: Get rid of the WINED3DDEVICE_CREATION_PARAMETERS typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/dxgi/device.c | 4 ++-- dlls/wined3d/device.c | 16 ++++++++-------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 14 +++++++------- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c003993..a8c042d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -440,7 +440,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetCreationParameters(IDirect3DDevice wined3d_mutex_lock(); hr = wined3d_device_get_creation_parameters(This->wined3d_device, - (WINED3DDEVICE_CREATION_PARAMETERS *)pParameters); + (struct wined3d_device_creation_parameters *)pParameters); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 49a3215..f8044ff 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -389,7 +389,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(IDirect3DDevice wined3d_mutex_lock(); hr = wined3d_device_get_creation_parameters(This->wined3d_device, - (WINED3DDEVICE_CREATION_PARAMETERS *)pParameters); + (struct wined3d_device_creation_parameters *)pParameters); wined3d_mutex_unlock(); return hr; diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 6b20235..9cd45f9 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -140,7 +140,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, IDXGIAdapter **adapter) { struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - WINED3DDEVICE_CREATION_PARAMETERS create_parameters; + struct wined3d_device_creation_parameters create_parameters; HRESULT hr; TRACE("iface %p, adapter %p\n", iface, adapter); @@ -156,7 +156,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, LeaveCriticalSection(&dxgi_cs); - return IWineDXGIFactory_EnumAdapters(This->factory, create_parameters.AdapterOrdinal, adapter); + return IWineDXGIFactory_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); } static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e35c0a..018f57d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1582,7 +1582,7 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device) TRACE("device %p.\n", device); /* For now just store the flag (needed in case of ddraw). */ - device->createParms.BehaviorFlags |= WINED3DCREATE_MULTITHREADED; + device->create_parms.flags |= WINED3DCREATE_MULTITHREADED; } HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, @@ -5629,7 +5629,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { if (swapchain->presentParms.Windowed) { - HWND focus_window = device->createParms.hFocusWindow; + HWND focus_window = device->create_parms.focus_window; if (!focus_window) focus_window = present_parameters->hDeviceWindow; if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) @@ -5711,11 +5711,11 @@ HRESULT CDECL wined3d_device_set_dialog_box_mode(struct wined3d_device *device, HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device, - WINED3DDEVICE_CREATION_PARAMETERS *parameters) + struct wined3d_device_creation_parameters *parameters) { TRACE("device %p, parameters %p.\n", device, parameters); - *parameters = device->createParms; + *parameters = device->create_parms; return WINED3D_OK; } @@ -5933,10 +5933,10 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, adapter->screen_format = mode.format_id; /* Save the creation parameters. */ - device->createParms.AdapterOrdinal = adapter_idx; - device->createParms.DeviceType = device_type; - device->createParms.hFocusWindow = focus_window; - device->createParms.BehaviorFlags = flags; + device->create_parms.adapter_idx = adapter_idx; + device->create_parms.device_type = device_type; + device->create_parms.focus_window = focus_window; + device->create_parms.flags = flags; device->devType = device_type; for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fbf19d9..ae62b72 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -864,7 +864,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, WINED3DSURFTY return WINED3DERR_INVALIDCALL; } - window = present_parameters->hDeviceWindow ? present_parameters->hDeviceWindow : device->createParms.hFocusWindow; + window = present_parameters->hDeviceWindow ? present_parameters->hDeviceWindow : device->create_parms.focus_window; swapchain->device = device; swapchain->parent = parent; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8ddd092..b32c97d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1704,7 +1704,7 @@ struct wined3d_device struct wined3d_stateblock *updateStateBlock; /* Internal use fields */ - WINED3DDEVICE_CREATION_PARAMETERS createParms; + struct wined3d_device_creation_parameters create_parms; WINED3DDEVTYPE devType; HWND focus_window; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 420c2ca..3fc6d16 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1684,13 +1684,13 @@ struct wined3d_vertex_element BYTE usage_idx; }; -typedef struct _WINED3DDEVICE_CREATION_PARAMETERS +struct wined3d_device_creation_parameters { - UINT AdapterOrdinal; - WINED3DDEVTYPE DeviceType; - HWND hFocusWindow; - DWORD BehaviorFlags; -} WINED3DDEVICE_CREATION_PARAMETERS; + UINT adapter_idx; + WINED3DDEVTYPE device_type; + HWND focus_window; + DWORD flags; +}; typedef struct _WINED3DDEVINFO_BANDWIDTHTIMINGS { @@ -2203,7 +2203,7 @@ HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *devic HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, - WINED3DDEVICE_CREATION_PARAMETERS *creation_parameters); + struct wined3d_device_creation_parameters *creation_parameters); HRESULT __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device, struct wined3d_surface **depth_stencil); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps);

1 0

Henri Verbeet : wined3d: Store the device type only once.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: f5a267068995f3815bccf25df03d4c60f7b856b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a267068995f3815bccf25df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 27 21:34:49 2011 +0100 wined3d: Store the device type only once. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 018f57d..0c71232 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3882,7 +3882,8 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device { TRACE("device %p, caps %p.\n", device, caps); - return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal, device->devType, caps); + return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal, + device->create_parms.device_type, caps); } HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, @@ -5938,7 +5939,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->create_parms.focus_window = focus_window; device->create_parms.flags = flags; - device->devType = device_type; for (i = 0; i < PATCHMAP_SIZE; ++i) list_init(&device->patches[i]); select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b32c97d..e524c3d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1705,7 +1705,6 @@ struct wined3d_device /* Internal use fields */ struct wined3d_device_creation_parameters create_parms; - WINED3DDEVTYPE devType; HWND focus_window; struct wined3d_swapchain **swapchains;

1 0

Alexandre Julliard : winedbg: Use proper links in the crash dialog.
by Alexandre Julliard 28 Nov '11

28 Nov '11

1 0

Frédéric Delanoy : winebuild: Avoid dead code in BuildCallFrom16Core (Coverity).
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 355a0aef8b6a728784faa078b6c7beb1d6af024c URL: http://source.winehq.org/git/wine.git/?a=commit;h=355a0aef8b6a728784faa078b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 26 10:10:16 2011 +0100 winebuild: Avoid dead code in BuildCallFrom16Core (Coverity). --- tools/winebuild/relay.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 4fa256f..cc7dd37 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -224,6 +224,7 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\t.byte 0x66\n" ); output( "\tlret\n" ); + output_function_size( "__wine_call_from_16_thunk" ); return; } @@ -333,6 +334,8 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tpopl %%ds\n" ); output( "\tpopfl\n" ); output( "\tlret\n" ); + + output_function_size( "__wine_call_from_16_regs" ); } else { @@ -352,10 +355,9 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) /* Return to return stub which will return to caller */ output( "\tlret $12\n" ); + + output_function_size( "__wine_call_from_16" ); } - if (thunk) output_function_size( "__wine_call_from_16_thunk" ); - else if (reg_func) output_function_size( "__wine_call_from_16_regs" ); - else output_function_size( "__wine_call_from_16" ); }

1 0

Austin English : netapi32: Add a stub for NetUseGetInfo.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: bf8d9cb7074ab89e85e991669278fa9fad07aaf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8d9cb7074ab89e85e991669… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Nov 26 18:58:38 2011 -0600 netapi32: Add a stub for NetUseGetInfo. --- dlls/netapi32/netapi32.c | 7 +++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index a8ba41a..58cd014 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -246,3 +246,10 @@ NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD p *totalentries = 0; return NERR_Success; } + +NET_API_STATUS WINAPI NetUseGetInfo(LMSTR server, LMSTR name, DWORD level, LPBYTE *bufptr) +{ + FIXME("stub (%p, %p, %d, %p)\n", server, name, level, bufptr); + return ERROR_NOT_SUPPORTED; + +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index be62a6f..f577010 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -200,7 +200,7 @@ @ stdcall NetUseAdd(wstr long ptr ptr) @ stdcall NetUseDel(wstr wstr long) @ stdcall NetUseEnum(wstr long ptr long ptr ptr ptr) -@ stub NetUseGetInfo +@ stdcall NetUseGetInfo(ptr ptr long ptr) @ stdcall NetUserAdd(wstr long ptr ptr) @ stdcall NetUserChangePassword(wstr wstr wstr wstr) @ stdcall NetUserDel(wstr wstr)

1 0