September 2010 - Wine-commits

Thomas Mullaly : urlmon/tests: IUriBuilder's can create IUri' s even if they don't have a base IUri.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: d56e62a1cf56c3df7afc17a8ca3d6a454d78c482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56e62a1cf56c3df7afc17a8c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 8 17:24:19 2010 -0400 urlmon/tests: IUriBuilder's can create IUri's even if they don't have a base IUri. --- dlls/urlmon/tests/uri.c | 51 +++++++++++++++++++++++++++++++--------------- dlls/urlmon/uri.c | 23 ++------------------ 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 6723a47..2c18c87 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4888,6 +4888,40 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + /* IUriBuilder doesn't need a base IUri to build a IUri. */ + { NULL,0,S_OK,FALSE, + { + {TRUE,"http",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,FALSE}, + {TRUE,"google.com",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -6500,10 +6534,6 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { IUri *test = NULL, *uri = (void*) 0xdeadbeef; /* Test what happens if the IUriBuilder doesn't have a IUri set. */ - hr = IUriBuilder_CreateUri(builder, 0, 0, 0, &uri); - ok(hr == INET_E_INVALID_URL, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, INET_E_INVALID_URL); - ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); - hr = IUriBuilder_CreateUri(builder, 0, 0, 0, NULL); ok(hr == E_POINTER, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); @@ -6512,12 +6542,6 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { ok(hr == E_NOTIMPL, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, E_NOTIMPL); ok(uri == NULL, "Error: expected uri to be NULL, but was %p instead.\n", uri); - uri = (void*) 0xdeadbeef; - hr = IUriBuilder_CreateUriSimple(builder, 0, 0, &uri); - ok(hr == INET_E_INVALID_URL, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", - hr, INET_E_INVALID_URL); - ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); - hr = IUriBuilder_CreateUriSimple(builder, 0, 0, NULL); ok(hr == E_POINTER, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); @@ -6528,13 +6552,6 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { hr, E_NOTIMPL); ok(!uri, "Error: Expected uri to NULL, but was %p instead.\n", uri); - uri = (void*) 0xdeadbeef; - hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, 0, 0, &uri); - ok(hr == INET_E_INVALID_URL, - "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", - hr, INET_E_INVALID_URL); - ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); - hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, 0, 0, NULL); ok(hr == E_POINTER, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 50944bd..2d8a22f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4404,16 +4404,11 @@ static HRESULT WINAPI UriBuilder_CreateUriSimple(IUriBuilder *iface, return E_POINTER; /* Acts the same way as CreateUri. */ - if(dwAllowEncodingPropertyMask && !This->uri) { + if(dwAllowEncodingPropertyMask && (!This->uri || This->modified_props)) { *ppIUri = NULL; return E_NOTIMPL; } - if(!This->uri) { - *ppIUri = NULL; - return INET_E_INVALID_URL; - } - FIXME("(%p)->(%d %d %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return E_NOTIMPL; } @@ -4433,19 +4428,12 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, /* The only time it doesn't return E_NOTIMPL when the dwAllow parameter * has flags set, is when the IUriBuilder has a IUri set and it hasn't * been modified (a call to a "Set*" hasn't been performed). - * - * TODO: Check if the IUriBuilder's properties have been modified. */ - if(dwAllowEncodingPropertyMask && !This->uri) { + if(dwAllowEncodingPropertyMask && (!This->uri || This->modified_props)) { *ppIUri = NULL; return E_NOTIMPL; } - if(!This->uri) { - *ppIUri = NULL; - return INET_E_INVALID_URL; - } - FIXME("(%p)->(0x%08x %d %d %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return E_NOTIMPL; } @@ -4465,16 +4453,11 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface, return E_POINTER; /* Same as CreateUri. */ - if(dwAllowEncodingPropertyMask && !This->uri) { + if(dwAllowEncodingPropertyMask && (!This->uri || This->modified_props)) { *ppIUri = NULL; return E_NOTIMPL; } - if(!This->uri) { - *ppIUri = NULL; - return INET_E_INVALID_URL; - } - FIXME("(%p)->(0x%08x 0x%08x %d %d %p)\n", This, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return E_NOTIMPL;

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}IUri.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: d95d6b5d1bf3aad9c5c725e284a13dcd2327098c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95d6b5d1bf3aad9c5c725e28… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 8 19:29:56 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}IUri. --- dlls/urlmon/tests/uri.c | 156 ++++++++++++++++++++++++++++++----------------- dlls/urlmon/uri.c | 77 ++++++++++++++++++++++- 2 files changed, 173 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d95d6b5d1bf3aad9c5c72…

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_HasBeenModified.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 9d41c3d51ab8dd562541eb3be9dde05b298b7ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d41c3d51ab8dd562541eb3be… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 8 19:34:44 2010 -0400 urlmon: Implemented IUriBuilder_HasBeenModified. --- dlls/urlmon/tests/uri.c | 67 ++++++++++++++++++---------------------------- dlls/urlmon/uri.c | 4 +- 2 files changed, 28 insertions(+), 43 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index fb89e13..37b6cfd 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7652,18 +7652,13 @@ static void test_IUriBuilder(void) { } hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, - "Error IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", - hr, S_OK, i); - } - if(SUCCEEDED(hr)) { - todo_wine { - ok(received == modified, - "Error: Expected received to be %d but was %d instead on uri_builder_tests[%d].\n", - modified, received, i); - } - } + ok(hr == S_OK, + "Error IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, i); + if(SUCCEEDED(hr)) + ok(received == modified, + "Error: Expected received to be %d but was %d instead on uri_builder_tests[%d].\n", + modified, received, i); /* Test the "Get*" functions. */ test_IUriBuilder_GetFragment(builder, &test, i); @@ -7705,12 +7700,10 @@ static void test_IUriBuilder_HasBeenModified(void) { hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); hr = pCreateUri(http_urlW, 0, 0, &uri); ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); @@ -7723,24 +7716,20 @@ static void test_IUriBuilder_HasBeenModified(void) { hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == FALSE, "Error: Expected received to be FALSE.\n"); } + ok(received == FALSE, "Error: Expected received to be FALSE.\n"); /* Test what happens with you call SetIUri with the same IUri again. */ hr = IUriBuilder_SetHost(builder, hostW); ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); hr = IUriBuilder_SetIUri(builder, uri); ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); @@ -7749,11 +7738,10 @@ static void test_IUriBuilder_HasBeenModified(void) { * reset any of the changes that were made to the IUriBuilder. */ hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); + hr = IUriBuilder_GetHost(builder, &len, &prop); ok(hr == S_OK, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { @@ -7769,23 +7757,20 @@ static void test_IUriBuilder_HasBeenModified(void) { hr = IUriBuilder_SetHost(builder, hostW); ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); hr = IUriBuilder_SetIUri(builder, NULL); ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%09x.\n", hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); if(SUCCEEDED(hr)) - todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + ok(received == TRUE, "Error: Expected received to be TRUE.\n"); + hr = IUriBuilder_GetHost(builder, &len, &prop); ok(hr == S_OK, "Error: IUriBuilder_GetHost returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index f6616be..45acde9 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4756,8 +4756,8 @@ static HRESULT WINAPI UriBuilder_HasBeenModified(IUriBuilder *iface, BOOL *pfMod if(!pfModified) return E_POINTER; - FIXME("(%p)->(%p)\n", This, pfModified); - return E_NOTIMPL; + *pfModified = This->modified_props > 0; + return S_OK; } #undef URIBUILDER_THIS

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_RemoveProperties.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: bef85fbc980e44ae77a7d458995f870e97ed2843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef85fbc980e44ae77a7d4589… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 8 20:12:37 2010 -0400 urlmon: Implemented IUriBuilder_RemoveProperties. --- dlls/urlmon/tests/uri.c | 51 +++++++++++++++++++++++++++++++++++------------ dlls/urlmon/uri.c | 36 +++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 37b6cfd..3045b3d 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4943,16 +4943,38 @@ typedef struct _uri_builder_remove_test { static const uri_builder_remove_test uri_builder_remove_tests[] = { { "http://google.com/test?test=y#Frag",0,S_OK,FALSE, - Uri_HAS_FRAGMENT|Uri_HAS_PATH|Uri_HAS_QUERY,S_OK,TRUE, + Uri_HAS_FRAGMENT|Uri_HAS_PATH|Uri_HAS_QUERY,S_OK,FALSE, "http://google.com/",0,S_OK,TRUE }, { "http://user:pass(a)winehq.org/",0,S_OK,FALSE, - Uri_HAS_USER_NAME|Uri_HAS_PASSWORD,S_OK,TRUE, + Uri_HAS_USER_NAME|Uri_HAS_PASSWORD,S_OK,FALSE, "http://winehq.org/",0,S_OK,TRUE }, { "zip://google.com?Test=x",0,S_OK,FALSE, - Uri_HAS_HOST,S_OK,TRUE, + Uri_HAS_HOST,S_OK,FALSE, "zip:/?Test=x",0,S_OK,TRUE + }, + /* Doesn't remove the whole userinfo component. */ + { "http://username:pass(a)google.com/",0,S_OK,FALSE, + Uri_HAS_USER_INFO,S_OK,FALSE, + "http://username:pass(a)google.com/",0,S_OK,TRUE + }, + /* Doesn't remove the domain. */ + { "http://google.com/",0,S_OK,FALSE, + Uri_HAS_DOMAIN,S_OK,FALSE, + "http://google.com/",0,S_OK,TRUE + }, + { "http://google.com:120/",0,S_OK,FALSE, + Uri_HAS_AUTHORITY,S_OK,FALSE, + "http://google.com:120/",0,S_OK,TRUE + }, + { "http://google.com/test.com/",0,S_OK,FALSE, + Uri_HAS_EXTENSION,S_OK,FALSE, + "http://google.com/test.com/",0,S_OK,TRUE + }, + { "http://google.com/?test=x",0,S_OK,FALSE, + Uri_HAS_PATH_AND_QUERY,S_OK,FALSE, + "http://google.com/?test=x",0,S_OK,TRUE } }; @@ -7837,19 +7859,22 @@ static void test_IUriBuilder_RemoveProperties(void) { for(i = Uri_PROPERTY_STRING_START; i <= Uri_PROPERTY_DWORD_LAST; ++i) { hr = IUriBuilder_RemoveProperties(builder, i << 1); if((i << 1) & invalid) { - todo_wine { - ok(hr == E_INVALIDARG, - "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", - hr, E_INVALIDARG, i); - } + ok(hr == E_INVALIDARG, + "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", + hr, E_INVALIDARG, i); } else { - todo_wine { - ok(hr == S_OK, - "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", - hr, S_OK, i); - } + ok(hr == S_OK, + "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", + hr, S_OK, i); } } + + /* Also doesn't accept anything that's outside the range of the + * Uri_HAS flags. + */ + hr = IUriBuilder_RemoveProperties(builder, (Uri_PROPERTY_DWORD_LAST+1) << 1); + ok(hr == E_INVALIDARG, "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x.\n", + hr, E_INVALIDARG); } if(builder) IUriBuilder_Release(builder); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 45acde9..e69f090 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4743,9 +4743,41 @@ static HRESULT WINAPI UriBuilder_SetUserName(IUriBuilder *iface, LPCWSTR pwzNewV static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPropertyMask) { + const DWORD accepted_flags = Uri_HAS_AUTHORITY|Uri_HAS_DOMAIN|Uri_HAS_EXTENSION|Uri_HAS_FRAGMENT|Uri_HAS_HOST| + Uri_HAS_PASSWORD|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_QUERY| + Uri_HAS_SCHEME_NAME|Uri_HAS_USER_INFO|Uri_HAS_USER_NAME; + UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(0x%08x)\n", This, dwPropertyMask); - return E_NOTIMPL; + TRACE("(%p)->(0x%08x)\n", This, dwPropertyMask); + + if(dwPropertyMask & ~accepted_flags) + return E_INVALIDARG; + + if(dwPropertyMask & Uri_HAS_FRAGMENT) + UriBuilder_SetFragment(iface, NULL); + + if(dwPropertyMask & Uri_HAS_HOST) + UriBuilder_SetHost(iface, NULL); + + if(dwPropertyMask & Uri_HAS_PASSWORD) + UriBuilder_SetPassword(iface, NULL); + + if(dwPropertyMask & Uri_HAS_PATH) + UriBuilder_SetPath(iface, NULL); + + if(dwPropertyMask & Uri_HAS_PORT) + UriBuilder_SetPort(iface, FALSE, 0); + + if(dwPropertyMask & Uri_HAS_QUERY) + UriBuilder_SetQuery(iface, NULL); + + if(dwPropertyMask & Uri_HAS_SCHEME_NAME) + UriBuilder_SetSchemeName(iface, NULL); + + if(dwPropertyMask & Uri_HAS_USER_NAME) + UriBuilder_SetUserName(iface, NULL); + + return S_OK; } static HRESULT WINAPI UriBuilder_HasBeenModified(IUriBuilder *iface, BOOL *pfModified)

1 0

Roderick Colenbrander : wined3d: Add Nvidia NT6x driver information.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: ae5d8698f92cba37c903776cdb5d2f09116e5466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5d8698f92cba37c903776cd… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 9 04:26:20 2010 +0200 wined3d: Add Nvidia NT6x driver information. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f51f968..0b83ff6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1007,6 +1007,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_GEFORCE2MX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 10, 9371}, {DRIVER_NVIDIA_GEFORCEFX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 11, 7516}, {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 15, 11, 9745}, + {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 15, 11, 9745}, }; struct gpu_description

1 0

Roderick Colenbrander : wined3d: Add AMD NT6x drivers.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: d79bbdca514f335eae7a1533deb60f4466a812ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79bbdca514f335eae7a1533d… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 9 04:26:21 2010 +0200 wined3d: Add AMD NT6x drivers. --- dlls/wined3d/directx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0b83ff6..c127571 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -996,6 +996,8 @@ static const struct driver_version_information driver_version_table[] = * - Radeon 9500 (R300) - X1*00 (R5xx) supported upto Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) */ {DRIVER_ATI_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, {DRIVER_ATI_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 8681}, + {DRIVER_ATI_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, + {DRIVER_ATI_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, /* Nvidia * - Geforce6 and newer cards are supported by the current driver (197.x) on XP-Win7

1 0

Aric Stewart : usp10: Attempt to shape with non TMPF_TRUETYPE fonts.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: e8816357416a8d3c6bc3d539b869e2e5c29656b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8816357416a8d3c6bc3d539b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 8 13:30:46 2010 -0500 usp10: Attempt to shape with non TMPF_TRUETYPE fonts. Just do not do the parts that are known to require ttf tables. --- dlls/usp10/usp10.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 29ec1e8..ad3d728 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1254,7 +1254,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, pwLogClust[i] = idx; } - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) + if (!psa->fNoGlyphIndex) { WCHAR *rChars = heap_alloc(sizeof(WCHAR) * cChars); if (!rChars) return E_OUTOFMEMORY; @@ -1276,8 +1276,12 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, } rChars[i] = chInput; } - SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); - SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); + + if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) + { + SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); + SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); + } heap_free(rChars); } else

1 0

Owen Rudge : d3dx9: Implement D3DXCreateTextureFromResource*.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 78bd619c7cd6c819d19b33be456193b21d7630c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bd619c7cd6c819d19b33be4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 8 13:40:11 2010 -0500 d3dx9: Implement D3DXCreateTextureFromResource*. --- dlls/d3dx9_36/d3dx9_36.spec | 8 +- dlls/d3dx9_36/texture.c | 131 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 9c84dbf..e75011a 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -99,10 +99,10 @@ @ stdcall D3DXCreateTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromFileW(ptr wstr ptr) -@ stub D3DXCreateTextureFromResourceA -@ stub D3DXCreateTextureFromResourceExA -@ stub D3DXCreateTextureFromResourceExW -@ stub D3DXCreateTextureFromResourceW +@ stdcall D3DXCreateTextureFromResourceA(ptr ptr str ptr) +@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) @ stub D3DXCreateTextureGutterHelper @ stub D3DXCreateTextureShader @ stub D3DXCreateTorus diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 36843e4..2ebc85a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -533,3 +533,134 @@ HRESULT WINAPI D3DXCreateTextureFromFileW(LPDIRECT3DDEVICE9 device, return D3DXCreateTextureFromFileExW(device, srcfile, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); } + + +HRESULT WINAPI D3DXCreateTextureFromResourceA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR resource, + LPDIRECT3DTEXTURE9 *texture) +{ + TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(resource)); + + return D3DXCreateTextureFromResourceExA(device, srcmodule, resource, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); +} + +HRESULT WINAPI D3DXCreateTextureFromResourceW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR resource, + LPDIRECT3DTEXTURE9 *texture) +{ + TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(resource)); + + return D3DXCreateTextureFromResourceExW(device, srcmodule, resource, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); +} + +HRESULT WINAPI D3DXCreateTextureFromResourceExA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR resource, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO *srcinfo, + PALETTEENTRY *palette, + LPDIRECT3DTEXTURE9 *texture) +{ + HRSRC resinfo; + + TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(resource)); + + if (!device || !texture) + return D3DERR_INVALIDCALL; + + resinfo = FindResourceA(srcmodule, resource, (LPCSTR) RT_RCDATA); + + if (resinfo) + { + LPVOID buffer; + HRESULT hr; + DWORD size; + + hr = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; + + return D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, + height, miplevels, usage, format, + pool, filter, mipfilter, colorkey, + srcinfo, palette, texture); + } + + /* Try loading the resource as bitmap data */ + resinfo = FindResourceA(srcmodule, resource, (LPCSTR) RT_BITMAP); + + if (resinfo) + { + FIXME("Implement loading bitmaps from resource type RT_BITMAP\n"); + return E_NOTIMPL; + } + + return D3DXERR_INVALIDDATA; +} + +HRESULT WINAPI D3DXCreateTextureFromResourceExW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR resource, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO *srcinfo, + PALETTEENTRY *palette, + LPDIRECT3DTEXTURE9 *texture) +{ + HRSRC resinfo; + + TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(resource)); + + if (!device || !texture) + return D3DERR_INVALIDCALL; + + resinfo = FindResourceW(srcmodule, resource, (LPCWSTR) RT_RCDATA); + + if (resinfo) + { + LPVOID buffer; + HRESULT hr; + DWORD size; + + hr = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; + + return D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, + height, miplevels, usage, format, + pool, filter, mipfilter, colorkey, + srcinfo, palette, texture); + } + + /* Try loading the resource as bitmap data */ + resinfo = FindResourceW(srcmodule, resource, (LPCWSTR) RT_BITMAP); + + if (resinfo) + { + FIXME("Implement loading bitmaps from resource type RT_BITMAP\n"); + return E_NOTIMPL; + } + + return D3DXERR_INVALIDDATA; +}

1 0

Owen Rudge : d3dx9/tests: Add D3DXCreateTextureFromResource tests.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 0d6f4d2406f6fdd852f531de0e063bf070f2cb92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6f4d2406f6fdd852f531de0… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 8 13:40:14 2010 -0500 d3dx9/tests: Add D3DXCreateTextureFromResource tests. --- dlls/d3dx9_36/tests/texture.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 9a3b3bc..3764089 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "wine/test.h" #include "d3dx9tex.h" +#include "resources.h" static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) { @@ -313,6 +314,49 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } + + /* D3DXCreateTextureFromResource */ + todo_wine { + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + } + + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDS_STRING), &texture); + ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXCreateTextureFromResourceA(NULL, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateTextureFromResourceA(device, NULL, NULL, &texture); + ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + + /* D3DXCreateTextureFromResourceEx */ + todo_wine { + hr = D3DXCreateTextureFromResourceExA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + } + + hr = D3DXCreateTextureFromResourceExA(device, NULL, MAKEINTRESOURCEA(IDS_STRING), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXCreateTextureFromResourceExA(NULL, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateTextureFromResourceExA(device, NULL, NULL, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXCreateTextureFromResourceExA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); } static void test_D3DXFilterTexture(IDirect3DDevice9 *device)

1 0

Jacek Caban : shdocvw: Fixed tests on IE <6.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 92c7e1ae44c3e08a4568c99e9738a8dd2d99f4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c7e1ae44c3e08a4568c99e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 8 20:54:52 2010 +0200 shdocvw: Fixed tests on IE <6. --- dlls/shdocvw/tests/webbrowser.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 15fc1ec..85f71b7 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -67,12 +67,6 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); expect_ ## func = called_ ## func = FALSE; \ }while(0) -#define CHECK_CALLED_BROKEN(func) \ - do { \ - ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ - expect_ ## func = called_ ## func = FALSE; \ - }while(0) - #define CLEAR_CALLED(func) \ expect_ ## func = called_ ## func = FALSE @@ -1828,13 +1822,13 @@ static void test_ie_funcs(IUnknown *unk) SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_TRUE)); - ok(hres == S_OK || broken(hres == E_NOTIMPL), "put_Resizable failed: %08x\n", hres); - CHECK_CALLED_BROKEN(Invoke_WINDOWSETRESIZABLE); + ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); + CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_FALSE)); - ok(hres == S_OK || broken(hres == E_NOTIMPL), "put_Resizable failed: %08x\n", hres); - CHECK_CALLED_BROKEN(Invoke_WINDOWSETRESIZABLE); + ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); + CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_get_Resizable(wb, &b); ok(hres == E_NOTIMPL, "get_Resizable failed: %08x\n", hres); @@ -2213,12 +2207,12 @@ static void test_Navigate2(IUnknown *unk) CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CHECK_CALLED(Invoke_AMBIENT_PALETTE); CHECK_CALLED(GetOptionKeyPath); - CHECK_CALLED_BROKEN(GetOverridesKeyPath); + CHECK_CALLED(GetOverridesKeyPath); todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED_BROKEN(Invoke_SETSECURELOCKICON); - todo_wine CHECK_CALLED_BROKEN(Invoke_FILEDOWNLOAD); + todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); + todo_wine CHECK_CALLED(Invoke_FILEDOWNLOAD); todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); CHECK_CALLED(EnableModeless_TRUE); @@ -2482,9 +2476,10 @@ static void test_WebBrowser(BOOL do_download) hres = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoCreateInterface failed: %08x\n", hres); - if(FAILED(hres)) + if(FAILED(hres)) { + win_skip("Could not create WebBrowser, probably too old IE\n"); return; + } is_downloading = FALSE; is_first_load = TRUE; @@ -2492,6 +2487,14 @@ static void test_WebBrowser(BOOL do_download) hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 iface: %08x\n", hres); + hres = IWebBrowser2_put_Resizable(wb, VARIANT_TRUE); + if(hres == E_NOTIMPL) { + win_skip("put_Resizable returned E_NOTIMPL, assuming IE <6\n"); + IWebBrowser_Release(wb); + IUnknown_Release(unk); + return; + } + test_QueryInterface(unk); test_ready_state(READYSTATE_UNINITIALIZED); test_ClassInfo(unk);

1 0