August 2015 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Also invalidate STATE_SHADER_RESOURCE_BINDING in wined3d_texture_bind_and_dirtify ().
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 8f6f9096d71c09d6eaae422b333756997f6ef15e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6f9096d71c09d6eaae422b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:09 2015 +0200 wined3d: Also invalidate STATE_SHADER_RESOURCE_BINDING in wined3d_texture_bind_and_dirtify(). --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 82694bb..27e0ecd 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -273,6 +273,9 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, active_sampler = context->rev_tex_unit_map[context->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + /* FIXME: Ideally we'd only do this when touching a binding that's used by + * a shader. */ + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); wined3d_texture_bind(texture, context, srgb); }

1 0

Alexandre Julliard : server: Store modification time as a key comment to avoid losing precision.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 1baf01fc2475c508b6464bc735483a7e25c915f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1baf01fc2475c508b6464bc73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 18:11:32 2015 +0900 server: Store modification time as a key comment to avoid losing precision. --- server/registry.c | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/server/registry.c b/server/registry.c index 43527df..7f7a7b1 100644 --- a/server/registry.c +++ b/server/registry.c @@ -265,6 +265,7 @@ static void save_subkeys( const struct key *key, const struct key *base, FILE *f fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); fprintf( f, "] %u\n", (unsigned int)((key->modif - ticks_1601_to_1970) / TICKS_PER_SEC) ); + fprintf( f, "#time=%x%08x\n", (unsigned int)(key->modif >> 32), (unsigned int)key->modif ); if (key->class) { fprintf( f, "#class=\"" ); @@ -1341,14 +1342,13 @@ static int get_data_type( const char *buffer, int *type, int *parse_type ) } /* load and create a key from the input file */ -static struct key *load_key( struct key *base, const char *buffer, - int prefix_len, struct file_load_info *info ) +static struct key *load_key( struct key *base, const char *buffer, int prefix_len, + struct file_load_info *info, timeout_t *modif ) { WCHAR *p; struct unicode_str name; int res; unsigned int mod; - timeout_t modif = current_time; data_size_t len; if (!get_file_tmp_space( info, strlen(buffer) * sizeof(WCHAR) )) return NULL; @@ -1360,7 +1360,9 @@ static struct key *load_key( struct key *base, const char *buffer, return NULL; } if (sscanf( buffer + res, " %u", &mod ) == 1) - modif = (timeout_t)mod * TICKS_PER_SEC + ticks_1601_to_1970; + *modif = (timeout_t)mod * TICKS_PER_SEC + ticks_1601_to_1970; + else + *modif = current_time; p = info->tmp; while (prefix_len && *p) { if (*p++ == '\\') prefix_len--; } @@ -1377,7 +1379,17 @@ static struct key *load_key( struct key *base, const char *buffer, } name.str = p; name.len = len - (p - info->tmp + 1) * sizeof(WCHAR); - return create_key_recursive( base, &name, modif ); + return create_key_recursive( base, &name, 0 ); +} + +/* update the modification time of a key (and its parents) after it has been loaded from a file */ +static void update_key_time( struct key *key, timeout_t modif ) +{ + while (key && !key->modif) + { + key->modif = modif; + key = key->parent; + } } /* load a global option from the input file */ @@ -1415,6 +1427,18 @@ static int load_key_option( struct key *key, const char *buffer, struct file_loa const char *p; data_size_t len; + if (!strncmp( buffer, "#time=", 6 )) + { + timeout_t modif = 0; + for (p = buffer + 6; *p; p++) + { + if (*p >= '0' && *p <= '9') modif = (modif << 4) | (*p - '0'); + else if (*p >= 'A' && *p <= 'F') modif = (modif << 4) | (*p - 'A' + 10); + else if (*p >= 'a' && *p <= 'f') modif = (modif << 4) | (*p - 'a' + 10); + else break; + } + update_key_time( key, modif ); + } if (!strncmp( buffer, "#class=", 7 )) { p = buffer + 7; @@ -1589,6 +1613,7 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi { struct key *subkey = NULL; struct file_load_info info; + timeout_t modif = current_time; char *p; info.filename = filename; @@ -1617,9 +1642,13 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi switch(*p) { case '[': /* new key */ - if (subkey) release_object( subkey ); + if (subkey) + { + update_key_time( subkey, modif ); + release_object( subkey ); + } if (prefix_len == -1) prefix_len = get_prefix_len( key, p + 1, &info ); - if (!(subkey = load_key( key, p + 1, prefix_len, &info ))) + if (!(subkey = load_key( key, p + 1, prefix_len, &info, &modif ))) file_read_error( "Error creating key", &info ); break; case '@': /* default value */ @@ -1641,7 +1670,11 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi } done: - if (subkey) release_object( subkey ); + if (subkey) + { + update_key_time( subkey, modif ); + release_object( subkey ); + } free( info.buffer ); free( info.tmp ); }

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMDevice{2-3}:: GetDirect3DDevice2.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: a5d09b6bd79f7e11c1c1772b3e3ad330338293c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d09b6bd79f7e11c1c1772b3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 04:08:37 2015 +0530 d3drm: Implement IDirect3DRMDevice{2-3}::GetDirect3DDevice2. --- dlls/d3drm/device.c | 7 ++++- dlls/d3drm/tests/d3drm.c | 68 ++++++++++++++---------------------------------- 2 files changed, 26 insertions(+), 49 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 4d08e6e..4024ead 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1325,7 +1325,12 @@ static DWORD WINAPI d3drm_device3_GetRenderMode(IDirect3DRMDevice3 *iface) static HRESULT WINAPI d3drm_device3_GetDirect3DDevice2(IDirect3DRMDevice3 *iface, IDirect3DDevice2 **d3d_device) { - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); + + TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); + + if (device->device) + return IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7790f02..981590d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2185,9 +2185,7 @@ static void test_create_device_from_clipper2(void) /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2263,7 +2261,7 @@ static void test_create_device_from_clipper2(void) ref3 = get_refcount((IUnknown *)d3drm2); ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); /* Test if render target format follows the screen format */ hr = IDirectDraw_GetDisplayMode(ddraw, &desc); @@ -2279,9 +2277,7 @@ static void test_create_device_from_clipper2(void) ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2295,23 +2291,13 @@ static void test_create_device_from_clipper2(void) hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); -cleanup: - if (ds) - IDirectDrawSurface_Release(ds); - if (surface) - IDirectDrawSurface_Release(surface); - if (d3ddevice2) - IDirect3DDevice2_Release(d3ddevice2); - if (device2) - IDirect3DRMDevice2_Release(device2); - if (d3drm2) - IDirect3DRM2_Release(d3drm2); - if (d3drm1) - IDirect3DRM_Release(d3drm1); - if (clipper) - IDirectDrawClipper_Release(clipper); - if (ddraw) - IDirectDraw_Release(ddraw); + IDirectDrawSurface_Release(surface); + IDirect3DDevice2_Release(d3ddevice2); + IDirect3DRMDevice2_Release(device2); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); + IDirectDrawClipper_Release(clipper); + IDirectDraw_Release(ddraw); DestroyWindow(window); } @@ -2373,9 +2359,7 @@ static void test_create_device_from_clipper3(void) /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2451,7 +2435,7 @@ static void test_create_device_from_clipper3(void) ref3 = get_refcount((IUnknown *)d3drm3); ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); /* Test if render target format follows the screen format */ hr = IDirectDraw_GetDisplayMode(ddraw, &desc); @@ -2467,9 +2451,7 @@ static void test_create_device_from_clipper3(void) ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr); hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); @@ -2483,23 +2465,13 @@ static void test_create_device_from_clipper3(void) hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); -cleanup: - if (ds) - IDirectDrawSurface_Release(ds); - if (surface) - IDirectDrawSurface_Release(surface); - if (d3ddevice2) - IDirect3DDevice2_Release(d3ddevice2); - if (device3) - IDirect3DRMDevice3_Release(device3); - if (d3drm3) - IDirect3DRM3_Release(d3drm3); - if (d3drm1) - IDirect3DRM_Release(d3drm1); - if (clipper) - IDirectDrawClipper_Release(clipper); - if (ddraw) - IDirectDraw_Release(ddraw); + IDirectDrawSurface_Release(surface); + IDirect3DDevice2_Release(d3ddevice2); + IDirect3DRMDevice3_Release(device3); + IDirect3DRM3_Release(d3drm3); + IDirect3DRM_Release(d3drm1); + IDirectDrawClipper_Release(clipper); + IDirectDraw_Release(ddraw); DestroyWindow(window); }

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM::CreateDeviceFromSurface.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 35b17f50f1c9602c13168974d4bc2367fc403e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b17f50f1c9602c13168974d… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:57 2015 +0530 d3drm: Implement IDirect3DRM::CreateDeviceFromSurface. --- dlls/d3drm/d3drm.c | 23 ++++++++++++++----- dlls/d3drm/d3drm_private.h | 3 ++- dlls/d3drm/device.c | 46 ++++++++++++++++++++++++------------- dlls/d3drm/tests/d3drm.c | 56 ++++++++++++++++++++-------------------------- 4 files changed, 75 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35b17f50f1c9602c13168…

1 0

Daniel Lehman : msxml3: Fix crash when merging Text nodes.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 1f7fb03ee9f45217e6fea452c203ba625401d8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f7fb03ee9f45217e6fea452c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 12 12:46:44 2015 -0700 msxml3: Fix crash when merging Text nodes. --- dlls/msxml3/node.c | 4 +-- dlls/msxml3/tests/domdoc.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 90b5bde..f8d7761 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -496,7 +496,7 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT refcount = xmlnode_get_inst_cnt(node_obj); if (refcount) xmldoc_add_refs(before_node_obj->node->doc, refcount); - xmlAddPrevSibling(before_node_obj->node, node_obj->node); + node_obj->node = xmlAddPrevSibling(before_node_obj->node, node_obj->node); if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->parent; } @@ -508,7 +508,7 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if (refcount) xmldoc_add_refs(This->node->doc, refcount); /* xmlAddChild doesn't unlink node from previous parent */ xmlUnlinkNode(node_obj->node); - xmlAddChild(This->node, node_obj->node); + node_obj->node = xmlAddChild(This->node, node_obj->node); if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df71b49..ff6783b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11935,6 +11935,71 @@ static void test_url(void) IXMLDOMDocument_Release(doc); } +static void test_merging_text(void) +{ + IXMLDOMText *nodetext; + IXMLDOMText *newtext; + IXMLDOMElement *root; + IXMLDOMDocument *doc; + IXMLDOMNode *first; + HRESULT hr; + VARIANT v; + BSTR str; + int i; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); + + /* test xmlAddChild */ + for (i = 0; i < 10; i++) + { + str = SysAllocString(szstr1); + hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); + SysFreeString(str); + EXPECT_HR(hr, S_OK); + + newtext = NULL; + hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode*)nodetext, (IXMLDOMNode**)&newtext); + EXPECT_HR(hr, S_OK); + ok(nodetext == newtext, "expected %p, got %p\n", nodetext, newtext); + + IXMLDOMText_Release(newtext); + IXMLDOMText_Release(nodetext); + } + + /* test xmlAddPrevSibling */ + hr = IXMLDOMElement_get_firstChild(root, &first); + EXPECT_HR(hr, S_OK); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)first; + for (i = 0; i < 10; i++) + { + str = SysAllocString(szstr2); + hr = IXMLDOMDocument_createTextNode(doc, str, &nodetext); + SysFreeString(str); + EXPECT_HR(hr, S_OK); + + newtext = NULL; + hr = IXMLDOMElement_insertBefore(root, (IXMLDOMNode*)nodetext, v, (IXMLDOMNode**)&newtext); + EXPECT_HR(hr, S_OK); + ok(nodetext == newtext, "expected %p, got %p\n", nodetext, newtext); + + IXMLDOMText_Release(newtext); + IXMLDOMText_Release(nodetext); + } + + IXMLDOMNode_Release(first); + IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc); + + free_bstrs(); +} + START_TEST(domdoc) { HRESULT hr; @@ -12014,6 +12079,7 @@ START_TEST(domdoc) test_namedmap_newenum(); test_xmlns_attribute(); test_url(); + test_merging_text(); test_xsltemplate(); test_xsltext();

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM{2-3}:: CreateDeviceFromClipper.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 27cc84d143ef320d6c651e457649bb5771f66d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27cc84d143ef320d6c651e457… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:55 2015 +0530 d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper. --- dlls/d3drm/d3drm.c | 54 +++++++++++++++++++++++++++++++++++++++++------- dlls/d3drm/tests/d3drm.c | 36 ++++++++++++++++---------------- 2 files changed, 64 insertions(+), 26 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index e4cc4fa..61d0a25 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -697,18 +697,24 @@ static HRESULT WINAPI d3drm2_CreateDeviceFromClipper(IDirect3DRM2 *iface, IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice2 **device) { - struct d3drm_device *object; + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + IDirect3DRMDevice3 *device3; HRESULT hr; - FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device %p.\n", + + TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device %p.\n", iface, clipper, debugstr_guid(guid), width, height, device); - hr = d3drm_device_create(&object); + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; + hr = IDirect3DRM3_CreateDeviceFromClipper(&d3drm->IDirect3DRM3_iface, clipper, guid, width, height, &device3); if (FAILED(hr)) return hr; - *device = IDirect3DRMDevice2_from_impl(object); + hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice2, (void**)device); + IDirect3DRMDevice3_Release(device3); - return D3DRM_OK; + return hr; } static HRESULT WINAPI d3drm2_CreateTextureFromSurface(IDirect3DRM2 *iface, @@ -1103,18 +1109,50 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromClipper(IDirect3DRM3 *iface, IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice3 **device) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm_device *object; + IDirectDraw *ddraw; + IDirectDrawSurface *render_target; HRESULT hr; - FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device %p.\n", + + TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device %p.\n", iface, clipper, debugstr_guid(guid), width, height, device); + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; + + if (!clipper || !width || !height) + return D3DRMERR_BADVALUE; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + if (FAILED(hr)) + return hr; + hr = d3drm_device_create(&object); if (FAILED(hr)) + { + IDirectDraw_Release(ddraw); return hr; + } - *device = IDirect3DRMDevice3_from_impl(object); + hr = d3drm_device_create_surfaces_from_clipper(object, ddraw, clipper, width, height, &render_target); + if (FAILED(hr)) + { + IDirectDraw_Release(ddraw); + d3drm_device_destroy(object); + return hr; + } - return D3DRM_OK; + hr = d3drm_device_init(object, 3, &d3drm->IDirect3DRM_iface, ddraw, render_target); + IDirectDraw_Release(ddraw); + IDirectDrawSurface_Release(render_target); + if (FAILED(hr)) + d3drm_device_destroy(object); + else + *device = IDirect3DRMDevice3_from_impl(object); + + return hr; } static HRESULT WINAPI d3drm3_CreateShadow(IDirect3DRM3 *iface, IUnknown *object, IDirect3DRMLight *light, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 93a8b73..7790f02 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2134,7 +2134,7 @@ static void test_create_device_from_clipper2(void) IDirect3DRM2 *d3drm2 = NULL; IDirectDraw *ddraw = NULL; IUnknown *unknown = NULL; - IDirect3DRMDevice2 *device2 = NULL; + IDirect3DRMDevice2 *device2 = (IDirect3DRMDevice2 *)0xdeadbeef; IDirect3DDevice2 *d3ddevice2 = NULL; IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; @@ -2164,24 +2164,24 @@ static void test_create_device_from_clipper2(void) ref2 = get_refcount((IUnknown *)d3drm2); hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DRMDevice2_Release(device2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2); /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300, 200, &device2); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DRMDevice2_Release(device2); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2); ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); ref3 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); ref3 = get_refcount((IUnknown *)d3drm2); ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); @@ -2322,7 +2322,7 @@ static void test_create_device_from_clipper3(void) IDirect3DRM3 *d3drm3 = NULL; IDirectDraw *ddraw = NULL; IUnknown *unknown = NULL; - IDirect3DRMDevice3 *device3 = NULL; + IDirect3DRMDevice3 *device3 = (IDirect3DRMDevice3 *)0xdeadbeef; IDirect3DDevice2 *d3ddevice2 = NULL; IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; @@ -2352,24 +2352,24 @@ static void test_create_device_from_clipper3(void) ref2 = get_refcount((IUnknown *)d3drm3); hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 0, 0, &device3); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DRMDevice3_Release(device3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3); /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300, 200, &device3); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DRMDevice3_Release(device3); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, &device3); ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr); ref3 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); ref3 = get_refcount((IUnknown *)d3drm3); ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); cref2 = get_refcount((IUnknown *)clipper); - todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); /* Fetch immediate mode device in order to access render target */ hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2);

1 0

Hugh McMaster : uninstaller: Add WriteConsoleW support.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

1 0

Aaryaman Vasishta : d3drm: Add helper for destroying device.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: b6f197c7a8a76bf3004fabf2cb8fb200afccd1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f197c7a8a76bf3004fabf2c… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:52 2015 +0530 d3drm: Add helper for destroying device. --- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/device.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 9538de0..e1b37f8 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -42,6 +42,8 @@ HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HID HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; +void d3drm_device_destroy(struct d3drm_device *device) DECLSPEC_HIDDEN; + struct d3drm_file_header { WORD major; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 9b6407e..9f56c2e 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -75,6 +75,11 @@ IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) return &device->IDirect3DRMDevice3_iface; } +void d3drm_device_destroy(struct d3drm_device *device) +{ + HeapFree(GetProcessHeap(), 0, device); +} + static inline struct d3drm_device *impl_from_IDirect3DRMWinDevice(IDirect3DRMWinDevice *iface) { return CONTAINING_RECORD(iface, struct d3drm_device, IDirect3DRMWinDevice_iface); @@ -871,7 +876,7 @@ static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, device); + d3drm_device_destroy(device); return refcount; }

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM::CreateDeviceFromClipper.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 1075d711358132b32a61f2be3fa2ac5a670110f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1075d711358132b32a61f2be3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:53 2015 +0530 d3drm: Implement IDirect3DRM::CreateDeviceFromClipper. --- dlls/d3drm/Makefile.in | 2 +- dlls/d3drm/d3drm.c | 37 +++++++++++- dlls/d3drm/d3drm_private.h | 5 ++ dlls/d3drm/device.c | 140 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/tests/d3drm.c | 18 +++--- 5 files changed, 189 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1075d711358132b32a61f…

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM{2-3}:: CreateDeviceFromSurface.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 27f7174d71e906a883d8f2578ca686dcd2cf96d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f7174d71e906a883d8f2578… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Aug 7 03:35:58 2015 +0530 d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromSurface. --- dlls/d3drm/d3drm.c | 37 ++++++++++--- dlls/d3drm/tests/d3drm.c | 138 ++++++++++++++++++++--------------------------- 2 files changed, 86 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27f7174d71e906a883d8f…

1 0