August 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Cleanup device_resource_released().
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 6e09d7bd60acd951842c67e290ad8ba75a0618e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e09d7bd60acd951842c67e29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 17 19:03:28 2010 +0200 wined3d: Cleanup device_resource_released(). In particular, releasing a resource that's in use by the device or the stateblock is always an internal error in either wined3d or the relevant wined3d client library. --- dlls/wined3d/device.c | 132 +++++++++++++++++++++++++------------------------ 1 files changed, 67 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9651b51..8790046 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6538,100 +6538,102 @@ static void device_resource_remove(IWineD3DDeviceImpl *This, IWineD3DResource *r list_remove(&((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } -void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) +void device_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *resource) { WINED3DRESOURCETYPE type = IWineD3DResource_GetType(resource); - int counter; + unsigned int i; - TRACE("(%p) : resource %p\n", This, resource); + TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - context_resource_released(This, resource, type); + context_resource_released(device, resource, type); - switch (type) { - /* TODO: check front and back buffers, rendertargets etc.. possibly swapchains? */ - case WINED3DRTYPE_SURFACE: { - unsigned int i; + switch (type) + { + case WINED3DRTYPE_SURFACE: + if (!device->d3d_initialized) break; - if (This->d3d_initialized) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - for (i = 0; i < This->adapter->gl_info.limits.buffers; ++i) + if (device->render_targets[i] == (IWineD3DSurfaceImpl *)resource) { - if (This->render_targets[i] == (IWineD3DSurfaceImpl *)resource) - This->render_targets[i] = NULL; + ERR("Surface %p is still in use as render target %u.\n", resource, i); + device->render_targets[i] = NULL; } - if (This->depth_stencil == (IWineD3DSurfaceImpl *)resource) - This->depth_stencil = NULL; } + if (device->depth_stencil == (IWineD3DSurfaceImpl *)resource) + { + ERR("Surface %p is still in use as depth/stencil buffer.\n", resource); + device->depth_stencil = NULL; + } break; - } + case WINED3DRTYPE_TEXTURE: case WINED3DRTYPE_CUBETEXTURE: case WINED3DRTYPE_VOLUMETEXTURE: - for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { - if (This->stateBlock != NULL && This->stateBlock->textures[counter] == (IWineD3DBaseTexture *)resource) { - WARN("Texture being released is still by a stateblock, Stage = %u Texture = %p\n", counter, resource); - This->stateBlock->textures[counter] = NULL; - } - if (This->updateStateBlock != This->stateBlock ){ - if (This->updateStateBlock->textures[counter] == (IWineD3DBaseTexture *)resource) { - WARN("Texture being released is still by a stateblock, Stage = %u Texture = %p\n", counter, resource); - This->updateStateBlock->textures[counter] = NULL; - } - } + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (device->stateBlock && device->stateBlock->textures[i] == (IWineD3DBaseTexture *)resource) + { + ERR("Texture %p is still in use by stateblock %p, stage %u.\n", + resource, device->stateBlock, i); + device->stateBlock->textures[i] = NULL; } - break; - case WINED3DRTYPE_VOLUME: - /* TODO: nothing really? */ - break; + + if (device->updateStateBlock != device->stateBlock + && device->updateStateBlock->textures[i] == (IWineD3DBaseTexture *)resource) + { + ERR("Texture %p is still in use by stateblock %p, stage %u.\n", + resource, device->updateStateBlock, i); + device->updateStateBlock->textures[i] = NULL; + } + } + break; + case WINED3DRTYPE_BUFFER: - { - int streamNumber; - TRACE("Cleaning up stream pointers\n"); - - for(streamNumber = 0; streamNumber < MAX_STREAMS; streamNumber ++){ - /* FINDOUT: should a warn be generated if were recording and updateStateBlock->streamSource is lost? - FINDOUT: should changes.streamSource[StreamNumber] be set ? - */ - if (This->updateStateBlock != NULL ) { /* ==NULL when device is being destroyed */ - if ((IWineD3DResource *)This->updateStateBlock->streamSource[streamNumber] == resource) { - FIXME("Vertex buffer released while bound to a state block, stream %d\n", streamNumber); - This->updateStateBlock->streamSource[streamNumber] = 0; - /* Set changed flag? */ - } + for (i = 0; i < MAX_STREAMS; ++i) + { + if (device->stateBlock && device->stateBlock->streamSource[i] == (IWineD3DBuffer *)resource) + { + ERR("Buffer %p is still in use by stateblock %p, stream %u.\n", + resource, device->stateBlock, i); + device->stateBlock->streamSource[i] = NULL; } - if (This->stateBlock != NULL ) { /* only happens if there is an error in the application, or on reset/release (because we don't manage internal tracking properly) */ - if ((IWineD3DResource *)This->stateBlock->streamSource[streamNumber] == resource) { - TRACE("Vertex buffer released while bound to a state block, stream %d\n", streamNumber); - This->stateBlock->streamSource[streamNumber] = 0; - } + + if (device->updateStateBlock != device->stateBlock + && device->updateStateBlock->streamSource[i] == (IWineD3DBuffer *)resource) + { + ERR("Buffer %p is still in use by stateblock %p, stream %u.\n", + resource, device->updateStateBlock, i); + device->updateStateBlock->streamSource[i] = NULL; } + } - if (This->updateStateBlock != NULL ) { /* ==NULL when device is being destroyed */ - if (This->updateStateBlock->pIndexData == (IWineD3DBuffer *)resource) { - This->updateStateBlock->pIndexData = NULL; - } + if (device->stateBlock && device->stateBlock->pIndexData == (IWineD3DBuffer *)resource) + { + ERR("Buffer %p is still in use by stateblock %p as index buffer.\n", + resource, device->stateBlock); + device->stateBlock->pIndexData = NULL; } - if (This->stateBlock != NULL ) { /* ==NULL when device is being destroyed */ - if (This->stateBlock->pIndexData == (IWineD3DBuffer *)resource) { - This->stateBlock->pIndexData = NULL; - } + + if (device->updateStateBlock != device->stateBlock + && device->updateStateBlock->pIndexData == (IWineD3DBuffer *)resource) + { + ERR("Buffer %p is still in use by stateblock %p as index buffer.\n", + resource, device->updateStateBlock); + device->updateStateBlock->pIndexData = NULL; } - } - break; + break; default: - FIXME("(%p) unknown resource type %p %u\n", This, resource, IWineD3DResource_GetType(resource)); - break; + break; } - /* Remove the resource from the resourceStore */ - device_resource_remove(This, resource); - - TRACE("Resource released\n"); + device_resource_remove(device, resource); + TRACE("Resource released.\n"); } static HRESULT WINAPI IWineD3DDeviceImpl_EnumResources(IWineD3DDevice *iface, D3DCB_ENUMRESOURCES pCallback, void *pData) {

1 0

Juan Lang : iphlpapi: Don' t overwrite last IPv4 address with first IPv6 address.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: acda9f6ba94fa1da422632b12153ff682ad254f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acda9f6ba94fa1da422632b12… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 17 11:01:03 2010 -0700 iphlpapi: Don't overwrite last IPv4 address with first IPv6 address. --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index af97390..493fe3f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -721,6 +721,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) ; ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; } else ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr;

1 0

Vincent Povirk : gdiplus: Add a fallback method for getting HDC' s from Graphics objects.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 9d0cd0959793eba4da32ebf5ce4dbbcb3c67270d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0cd0959793eba4da32ebf5c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 16 16:31:18 2010 -0500 gdiplus: Add a fallback method for getting HDC's from Graphics objects. Native does this in more cases (at least for all bitmap graphics objects), but using gdi32 objects when we can should perform better. --- dlls/gdiplus/gdiplus_private.h | 6 +++ dlls/gdiplus/graphics.c | 92 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f3393d4..b78e459 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -152,6 +152,12 @@ struct GpGraphics{ UINT textcontrast; /* not used yet. get/set only */ struct list containers; GraphicsContainer contid; /* last-issued container ID */ + /* For giving the caller an HDC when we technically can't: */ + HBITMAP temp_hbitmap; + int temp_hbitmap_width; + int temp_hbitmap_height; + BYTE *temp_bits; + HDC temp_hdc; }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8850110..8e203f3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4663,6 +4663,9 @@ GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics *graphics, GDIPCONST G return ret; } +/* Color used to fill bitmaps so we can tell which parts have been drawn over by gdi32. */ +static const COLORREF DC_BACKGROUND_KEY = 0x0c0b0d; + GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) { TRACE("(%p, %p)\n", graphics, hdc); @@ -4673,14 +4676,61 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) + if (!graphics->hdc || + (graphics->image && graphics->image->type == ImageTypeBitmap && ((GpBitmap*)graphics->image)->format & PixelFormatAlpha)) { - WARN("no HDC for this graphics\n"); - *hdc = NULL; - return GenericError; + /* Create a fake HDC and fill it with a constant color. */ + HDC temp_hdc; + HBITMAP hbitmap; + GpStatus stat; + GpRectF bounds; + BITMAPINFOHEADER bmih; + int i; + + stat = get_graphics_bounds(graphics, &bounds); + if (stat != Ok) + return stat; + + graphics->temp_hbitmap_width = bounds.Width; + graphics->temp_hbitmap_height = bounds.Height; + + bmih.biSize = sizeof(bmih); + bmih.biWidth = graphics->temp_hbitmap_width; + bmih.biHeight = -graphics->temp_hbitmap_height; + bmih.biPlanes = 1; + bmih.biBitCount = 32; + bmih.biCompression = BI_RGB; + bmih.biSizeImage = 0; + bmih.biXPelsPerMeter = 0; + bmih.biYPelsPerMeter = 0; + bmih.biClrUsed = 0; + bmih.biClrImportant = 0; + + hbitmap = CreateDIBSection(NULL, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, + (void**)&graphics->temp_bits, NULL, 0); + if (!hbitmap) + return GenericError; + + temp_hdc = CreateCompatibleDC(0); + if (!temp_hdc) + { + DeleteObject(hbitmap); + return GenericError; + } + + for (i=0; i<(graphics->temp_hbitmap_width * graphics->temp_hbitmap_height); i++) + ((DWORD*)graphics->temp_bits)[i] = DC_BACKGROUND_KEY; + + SelectObject(temp_hdc, hbitmap); + + graphics->temp_hbitmap = hbitmap; + *hdc = graphics->temp_hdc = temp_hdc; + } + else + { + *hdc = graphics->hdc; } - *hdc = graphics->hdc; graphics->busy = TRUE; return Ok; @@ -4690,12 +4740,40 @@ GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) { TRACE("(%p, %p)\n", graphics, hdc); - if(!graphics) + if(!graphics || !hdc) return InvalidParameter; - if(graphics->hdc != hdc || !(graphics->busy)) + if((graphics->hdc != hdc && graphics->temp_hdc != hdc) || !(graphics->busy)) return InvalidParameter; + if (graphics->temp_hdc == hdc) + { + DWORD* pos; + int i; + + /* Find the pixels that have changed, and mark them as opaque. */ + pos = (DWORD*)graphics->temp_bits; + for (i=0; i<(graphics->temp_hbitmap_width * graphics->temp_hbitmap_height); i++) + { + if (*pos != DC_BACKGROUND_KEY) + { + *pos |= 0xff000000; + } + pos++; + } + + /* Write the changed pixels to the real target. */ + alpha_blend_pixels(graphics, 0, 0, graphics->temp_bits, + graphics->temp_hbitmap_width, graphics->temp_hbitmap_height, + graphics->temp_hbitmap_width * 4); + + /* Clean up. */ + DeleteDC(graphics->temp_hdc); + DeleteObject(graphics->temp_hbitmap); + graphics->temp_hdc = NULL; + graphics->temp_hbitmap = NULL; + } + graphics->busy = FALSE; return Ok;

1 0

Thomas Mullaly : urlmon: Added stub for CreateUriWithFragment.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: c88048f08f9149ca03ccda8ab0f6bc6e34743541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88048f08f9149ca03ccda8ab… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 6 18:01:45 2010 -0400 urlmon: Added stub for CreateUriWithFragment. --- dlls/urlmon/uri.c | 10 ++++++++++ dlls/urlmon/urlmon.spec | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index f3d9f68..7a35f26 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3946,6 +3946,16 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU return S_OK; } +/*********************************************************************** + * CreateUriWithFragment (urlmon.@) + */ +HRESULT WINAPI CreateUriWithFragment(LPCWSTR pwzURI, LPCWSTR pwzFragment, DWORD dwFlags, + DWORD_PTR dwReserved, IUri **ppURI) +{ + FIXME("(%s %s %x %x %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI); + return E_NOTIMPL; +} + #define URIBUILDER_THIS(iface) DEFINE_THIS(UriBuilder, IUriBuilder, iface) static HRESULT WINAPI UriBuilder_QueryInterface(IUriBuilder *iface, REFIID riid, void **ppv) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index e79850c..6109385 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -29,6 +29,7 @@ @ stdcall CreateFormatEnumerator(long ptr ptr) @ stdcall CreateIUriBuilder(ptr long long ptr) @ stdcall CreateUri(wstr long long ptr) +@ stdcall CreateUriWithFragment(wstr wstr long long ptr) @ stdcall CreateURLMoniker(ptr wstr ptr) @ stdcall CreateURLMonikerEx(ptr wstr ptr long) @ stdcall -private DllCanUnloadNow()

1 0

Thomas Mullaly : urlmon/tests: Added testing suite for CreateUriWithFragment.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 39001c30d3c9409c1fd13feec02490589ee3bafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=39001c30d3c9409c1fd13feec… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Aug 7 01:42:54 2010 -0400 urlmon/tests: Added testing suite for CreateUriWithFragment. --- dlls/urlmon/tests/uri.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 140 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index aa30bc6..83aa433 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -43,9 +43,12 @@ #define URI_DWORD_PROPERTY_COUNT (Uri_PROPERTY_DWORD_LAST - Uri_PROPERTY_DWORD_START)+1 static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); +static HRESULT (WINAPI *pCreateUriWithFragment)(LPCWSTR, LPCWSTR, DWORD, DWORD_PTR, IUri**); static const WCHAR http_urlW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', '.','o','r','g','/',0}; +static const WCHAR http_url_fragW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', + '.','o','r','g','/','#','F','r','a','g',0}; typedef struct _uri_create_flag_test { DWORD flags; @@ -3699,6 +3702,37 @@ static const uri_equality equality_tests[] = { } }; +typedef struct _uri_with_fragment { + const char* uri; + const char* fragment; + DWORD create_flags; + HRESULT create_expected; + BOOL create_todo; + + const char* expected_uri; + BOOL expected_todo; +} uri_with_fragment; + +static const uri_with_fragment uri_fragment_tests[] = { + { + "http://google.com/","#fragment",0,S_OK,TRUE, + "http://google.com/#fragment",TRUE + }, + { + "http://google.com/","fragment",0,S_OK,TRUE, + "http://google.com/#fragment",TRUE + }, + { + "zip://test.com/","?test",0,S_OK,TRUE, + "zip://test.com/#?test",TRUE + }, + /* The fragment can be empty. */ + { + "ftp://ftp.google.com/","",0,S_OK,TRUE, + "ftp://ftp.google.com/#",TRUE + } +}; + static inline LPWSTR a2w(LPCSTR str) { LPWSTR ret = NULL; @@ -4762,11 +4796,108 @@ static void test_IUri_IsEqual(void) { } } +static void test_CreateUriWithFragment_InvalidArgs(void) { + HRESULT hr; + IUri *uri = (void*) 0xdeadbeef; + const WCHAR fragmentW[] = {'#','f','r','a','g','m','e','n','t',0}; + + hr = pCreateUriWithFragment(NULL, fragmentW, 0, 0, &uri); + todo_wine { + ok(hr == E_INVALIDARG, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + } + todo_wine { ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } + + hr = pCreateUriWithFragment(http_urlW, fragmentW, 0, 0, NULL); + todo_wine { + ok(hr == E_INVALIDARG, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + } + + /* Original URI can't already contain a fragment component. */ + uri = (void*) 0xdeadbeef; + hr = pCreateUriWithFragment(http_url_fragW, fragmentW, 0, 0, &uri); + todo_wine { + ok(hr == E_INVALIDARG, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + } + todo_wine { ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } +} + +/* CreateUriWithFragment has the same invalid flag combinations as CreateUri. */ +static void test_CreateUriWithFragment_InvalidFlags(void) { + DWORD i; + + for(i = 0; i < sizeof(invalid_flag_tests)/sizeof(invalid_flag_tests[0]); ++i) { + HRESULT hr; + IUri *uri = (void*) 0xdeadbeef; + + hr = pCreateUriWithFragment(http_urlW, NULL, invalid_flag_tests[i].flags, 0, &uri); + todo_wine { + ok(hr == invalid_flag_tests[i].expected, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x. flags=0x%08x.\n", + hr, invalid_flag_tests[i].expected, invalid_flag_tests[i].flags); + } + todo_wine { ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } + } +} + +static void test_CreateUriWithFragment(void) { + DWORD i; + + for(i = 0; i < sizeof(uri_fragment_tests)/sizeof(uri_fragment_tests[0]); ++i) { + HRESULT hr; + IUri *uri = NULL; + LPWSTR uriW, fragW; + uri_with_fragment test = uri_fragment_tests[i]; + + uriW = a2w(test.uri); + fragW = a2w(test.fragment); + + hr = pCreateUriWithFragment(uriW, fragW, test.create_flags, 0, &uri); + if(test.expected_todo) { + todo_wine { + ok(hr == test.create_expected, + "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x on uri_fragment_tests[%d].\n", + hr, test.create_expected, i); + } + } else + ok(hr == test.create_expected, + "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x on uri_fragment_tests[%d].\n", + hr, test.create_expected, i); + + if(SUCCEEDED(hr)) { + BSTR received = NULL; + + hr = IUri_GetAbsoluteUri(uri, &received); + if(test.expected_todo) { + todo_wine { + ok(hr == S_OK, + "Error: GetAbsoluteUri returned 0x%08x, expected 0x%08x on uri_fragment_tests[%d].\n", + hr, S_OK, i); + } + todo_wine { + ok(!strcmp_aw(test.expected_uri, received), + "Error: Expected %s but got %s on uri_fragment_tests[%d].\n", + test.expected_uri, wine_dbgstr_w(received), i); + } + } else { + ok(hr == S_OK, "Error: GetAbsoluteUri returned 0x%08x, expected 0x%08x on uri_fragment_tests[%d].\n", + hr, S_OK, i); + ok(!strcmp_aw(test.expected_uri, received), "Error: Expected %s but got %s on uri_fragment_tests[%d].\n", + test.expected_uri, wine_dbgstr_w(received), i); + } + + SysFreeString(received); + } + + if(uri) IUri_Release(uri); + heap_free(uriW); + } +} + START_TEST(uri) { HMODULE hurlmon; hurlmon = GetModuleHandle("urlmon.dll"); pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); + pCreateUriWithFragment = (void*) GetProcAddress(hurlmon, "CreateUriWithFragment"); if(!pCreateUri) { win_skip("CreateUri is not present, skipping tests.\n"); @@ -4805,4 +4936,13 @@ START_TEST(uri) { trace("test IUri_IsEqual...\n"); test_IUri_IsEqual(); + + trace("test CreateUriWithFragment invalid args...\n"); + test_CreateUriWithFragment_InvalidArgs(); + + trace("test CreateUriWithFragment invalid flags...\n"); + test_CreateUriWithFragment_InvalidFlags(); + + trace("test CreateUriWithFragment...\n"); + test_CreateUriWithFragment(); }

1 0

Thomas Mullaly : urlmon: Implemented CreateUriWithFragment.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 6e4ead77a73190b3c7285b04bc90a6955ee91af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ead77a73190b3c7285b04b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Aug 7 02:06:31 2010 -0400 urlmon: Implemented CreateUriWithFragment. --- dlls/urlmon/tests/uri.c | 40 ++++++++++++++--------------------- dlls/urlmon/uri.c | 52 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 83aa433..88f89db 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3715,21 +3715,21 @@ typedef struct _uri_with_fragment { static const uri_with_fragment uri_fragment_tests[] = { { - "http://google.com/","#fragment",0,S_OK,TRUE, - "http://google.com/#fragment",TRUE + "http://google.com/","#fragment",0,S_OK,FALSE, + "http://google.com/#fragment",FALSE }, { - "http://google.com/","fragment",0,S_OK,TRUE, - "http://google.com/#fragment",TRUE + "http://google.com/","fragment",0,S_OK,FALSE, + "http://google.com/#fragment",FALSE }, { - "zip://test.com/","?test",0,S_OK,TRUE, - "zip://test.com/#?test",TRUE + "zip://test.com/","?test",0,S_OK,FALSE, + "zip://test.com/#?test",FALSE }, /* The fragment can be empty. */ { - "ftp://ftp.google.com/","",0,S_OK,TRUE, - "ftp://ftp.google.com/#",TRUE + "ftp://ftp.google.com/","",0,S_OK,FALSE, + "ftp://ftp.google.com/#",FALSE } }; @@ -4802,23 +4802,17 @@ static void test_CreateUriWithFragment_InvalidArgs(void) { const WCHAR fragmentW[] = {'#','f','r','a','g','m','e','n','t',0}; hr = pCreateUriWithFragment(NULL, fragmentW, 0, 0, &uri); - todo_wine { - ok(hr == E_INVALIDARG, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); - } - todo_wine { ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } + ok(hr == E_INVALIDARG, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); hr = pCreateUriWithFragment(http_urlW, fragmentW, 0, 0, NULL); - todo_wine { - ok(hr == E_INVALIDARG, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); - } + ok(hr == E_INVALIDARG, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); /* Original URI can't already contain a fragment component. */ uri = (void*) 0xdeadbeef; hr = pCreateUriWithFragment(http_url_fragW, fragmentW, 0, 0, &uri); - todo_wine { - ok(hr == E_INVALIDARG, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); - } - todo_wine { ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } + ok(hr == E_INVALIDARG, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } /* CreateUriWithFragment has the same invalid flag combinations as CreateUri. */ @@ -4830,11 +4824,9 @@ static void test_CreateUriWithFragment_InvalidFlags(void) { IUri *uri = (void*) 0xdeadbeef; hr = pCreateUriWithFragment(http_urlW, NULL, invalid_flag_tests[i].flags, 0, &uri); - todo_wine { - ok(hr == invalid_flag_tests[i].expected, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x. flags=0x%08x.\n", - hr, invalid_flag_tests[i].expected, invalid_flag_tests[i].flags); - } - todo_wine { ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } + ok(hr == invalid_flag_tests[i].expected, "Error: CreateUriWithFragment returned 0x%08x, expected 0x%08x. flags=0x%08x.\n", + hr, invalid_flag_tests[i].expected, invalid_flag_tests[i].flags); + ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 7a35f26..c18efc1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3952,8 +3952,56 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU HRESULT WINAPI CreateUriWithFragment(LPCWSTR pwzURI, LPCWSTR pwzFragment, DWORD dwFlags, DWORD_PTR dwReserved, IUri **ppURI) { - FIXME("(%s %s %x %x %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI); - return E_NOTIMPL; + HRESULT hres; + TRACE("(%s %s %x %x %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI); + + if(!ppURI) + return E_INVALIDARG; + + if(!pwzURI) { + *ppURI = NULL; + return E_INVALIDARG; + } + + /* Check if a fragment should be appended to the URI string. */ + if(pwzFragment) { + WCHAR *uriW; + DWORD uri_len, frag_len; + BOOL add_pound; + + /* Check if the original URI already has a fragment component. */ + if(StrChrW(pwzURI, '#')) { + *ppURI = NULL; + return E_INVALIDARG; + } + + uri_len = lstrlenW(pwzURI); + frag_len = lstrlenW(pwzFragment); + + /* If the fragment doesn't start with a '#', one will be added. */ + add_pound = *pwzFragment != '#'; + + if(add_pound) + uriW = heap_alloc((uri_len+frag_len+2)*sizeof(WCHAR)); + else + uriW = heap_alloc((uri_len+frag_len+1)*sizeof(WCHAR)); + + if(!uriW) + return E_OUTOFMEMORY; + + memcpy(uriW, pwzURI, uri_len*sizeof(WCHAR)); + if(add_pound) + uriW[uri_len++] = '#'; + memcpy(uriW+uri_len, pwzFragment, (frag_len+1)*sizeof(WCHAR)); + + hres = CreateUri(uriW, dwFlags, 0, ppURI); + + heap_free(uriW); + } else + /* A fragment string wasn't specified, so just forward the call. */ + hres = CreateUri(pwzURI, dwFlags, 0, ppURI); + + return hres; } #define URIBUILDER_THIS(iface) DEFINE_THIS(UriBuilder, IUriBuilder, iface)

1 0

Thomas Mullaly : urlmon: Added documentation for CreateUri and CreateUriWithFragment.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 068450363eecf73bdd45234dd9e39a8ea5e5aa30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068450363eecf73bdd45234dd… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Aug 7 23:55:41 2010 -0400 urlmon: Added documentation for CreateUri and CreateUriWithFragment. --- dlls/urlmon/uri.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index c18efc1..e977426 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3867,6 +3867,27 @@ static const IUriVtbl UriVtbl = { /*********************************************************************** * CreateUri (urlmon.@) + * + * Creates a new IUri object using the URI represented by pwzURI. This function + * parses and validates the components of pwzURI and then canonicalizes the + * parsed components. + * + * PARAMS + * pwzURI [I] The URI to parse, validate, and canonicalize. + * dwFlags [I] Flags which can affect how the parsing/canonicalization is performed. + * dwReserved [I] Reserved (not used). + * ppURI [O] The resulting IUri after parsing/canonicalization occurs. + * + * RETURNS + * Success: Returns S_OK. ppURI contains the pointer to the newly allocated IUri. + * Failure: E_INVALIDARG if there's invalid flag combinations in dwFlags, or an + * invalid parameters, or pwzURI doesn't represnt a valid URI. + * E_OUTOFMEMORY if any memory allocation fails. + * + * NOTES + * Default flags: + * Uri_CREATE_CANONICALIZE, Uri_CREATE_DECODE_EXTRA_INFO, Uri_CREATE_CRACK_UNKNOWN_SCHEMES, + * Uri_CREATE_PRE_PROCESS_HTML_URI, Uri_CREATE_NO_IE_SETTINGS. */ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IUri **ppURI) { @@ -3948,6 +3969,22 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU /*********************************************************************** * CreateUriWithFragment (urlmon.@) + * + * Creates a new IUri object. This is almost the same as CreateUri, expect that + * it allows you to explicitly specify a fragment (pwzFragment) for pwzURI. + * + * PARAMS + * pwzURI [I] The URI to parse and perform canonicalization on. + * pwzFragment [I] The explict fragment string which should be added to pwzURI. + * dwFlags [I] The flags which will be passed to CreateUri. + * dwReserved [I] Reserved (not used). + * ppURI [O] The resulting IUri after parsing/canonicalization. + * + * RETURNS + * Success: S_OK. ppURI contains the pointer to the newly allocated IUri. + * Failure: E_INVALIDARG if pwzURI already contains a fragment and pwzFragment + * isn't NULL. Will also return E_INVALIDARG for the same reasons as + * CreateUri will. E_OUTOFMEMORY if any allocations fail. */ HRESULT WINAPI CreateUriWithFragment(LPCWSTR pwzURI, LPCWSTR pwzFragment, DWORD dwFlags, DWORD_PTR dwReserved, IUri **ppURI)

1 0

Austin Lund : advapi32: Add magic codes to HCRYPTKEY and HCRYPTHASH.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: c98e6c09ae0073a1d73f638d6ee631984c0f528f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98e6c09ae0073a1d73f638d6… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Aug 18 10:14:42 2010 +1000 advapi32: Add magic codes to HCRYPTKEY and HCRYPTHASH. --- dlls/advapi32/crypt.c | 74 ++++++++++++++++++++++++++++++++++-------------- dlls/advapi32/crypt.h | 4 ++ 2 files changed, 56 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c98e6c09ae0073a1d73f6…

1 0

Alexandre Julliard : explorer: Only run the systray timer when a systray icon is present.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: d8c022071aac960e4f1ba559f04911cfe435fba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c022071aac960e4f1ba559f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 18 09:31:26 2010 +0200 explorer: Only run the systray timer when a systray icon is present. --- programs/explorer/systray.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 9a4226a..615768f 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -340,6 +340,7 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) icon->owner = nid->hWnd; icon->display = -1; + if (list_empty( &icon_list )) SetTimer( tray_window, 1, 2000, NULL ); list_add_tail(&icon_list, &icon->entry); modify_icon( icon, nid ); @@ -355,6 +356,7 @@ static BOOL delete_icon(struct icon *icon) list_remove(&icon->entry); DestroyIcon(icon->image); HeapFree(GetProcessHeap(), 0, icon); + if (list_empty( &icon_list )) KillTimer( tray_window, 1 ); return TRUE; } @@ -596,6 +598,4 @@ void initialize_systray(void) } if (hide_systray) do_hide_systray(); - - SetTimer( tray_window, 1, 2000, NULL ); }

1 0

Henri Verbeet : wined3d: Add a TRACE to IWineD3DSurfaceImpl_LoadTexture().
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: f06b22a53765bcc0de288019139b360c9639c148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f06b22a53765bcc0de2880191… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 17 19:03:21 2010 +0200 wined3d: Add a TRACE to IWineD3DSurfaceImpl_LoadTexture(). --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 760eadf..ea66033 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2487,6 +2487,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; DWORD flag = srgb_mode ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; + TRACE("iface %p, srgb %#x.\n", iface, srgb_mode); + if (!(This->Flags & flag)) { TRACE("Reloading because surface is dirty\n"); } else if(/* Reload: gl texture has ck, now no ckey is set OR */

1 0