February 2011 - Wine-commits

Piotr Caban : mshtml: Abort more request in abort_document_bindings.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 5541b7d13b3395adc45789034c1bef7befeef7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5541b7d13b3395adc45789034… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 31 20:28:10 2011 +0100 mshtml: Abort more request in abort_document_bindings. --- dlls/mshtml/navigate.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e5493e5..bb71c79 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -300,6 +300,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) if(This->binding) IBinding_Release(This->binding); list_remove(&This->entry); + list_init(&This->entry); heap_free(This->headers); This->vtbl->destroy(This); @@ -367,6 +368,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac } list_remove(&This->entry); + list_init(&This->entry); This->doc = NULL; return hres; @@ -1088,6 +1090,8 @@ static void stop_request_proc(task_t *_task) TRACE("(%p)\n", task->bsc); + list_remove(&task->bsc->bsc.entry); + list_init(&task->bsc->bsc.entry); on_stop_nsrequest(task->bsc, S_OK); IBindStatusCallback_Release(&task->bsc->bsc.IBindStatusCallback_iface); } @@ -1326,13 +1330,21 @@ HRESULT async_start_doc_binding(HTMLWindow *window, nsChannelBSC *bscallback) void abort_document_bindings(HTMLDocumentNode *doc) { - BSCallback *iter; + BSCallback *iter, *next; + + LIST_FOR_EACH_ENTRY_SAFE(iter, next, &doc->bindings, BSCallback, entry) { + if(iter->doc) + remove_target_tasks(iter->doc->basedoc.task_magic); - LIST_FOR_EACH_ENTRY(iter, &doc->bindings, BSCallback, entry) { if(iter->binding) IBinding_Abort(iter->binding); + else { + list_remove(&iter->entry); + list_init(&iter->entry); + iter->vtbl->stop_binding(iter, S_OK); + } + iter->doc = NULL; - list_remove(&iter->entry); } } @@ -1349,6 +1361,7 @@ HRESULT channelbsc_load_stream(nsChannelBSC *bscallback, IStream *stream) if(!bscallback->nschannel->content_type) return E_OUTOFMEMORY; + list_add_head(&bscallback->bsc.doc->bindings, &bscallback->bsc.entry); if(stream) hres = read_stream_data(bscallback, stream); if(SUCCEEDED(hres))

1 0

Piotr Caban : mshtml: Make sure previous request is stopped before starting new request in IPersistMoniker and IPersistStreamInit .
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: fe5ce7120eb59812b5808964aea8d5d74e523f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe5ce7120eb59812b5808964a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 31 20:28:23 2011 +0100 mshtml: Make sure previous request is stopped before starting new request in IPersistMoniker and IPersistStreamInit. --- dlls/mshtml/persist.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index cb2eeee..d10b353 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -257,6 +257,9 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel if(SUCCEEDED(hres)) { + remove_target_tasks(This->task_magic); + abort_document_bindings(This->doc_node); + hres = load_nsuri(This->window, nsuri, bscallback, LOAD_INITIAL_DOCUMENT_URI); nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres))

1 0

Stefan Dösinger : d3d9: Add an sRGB format test.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: af641eb4fdd9f75d65c9d7e1a910903159728c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af641eb4fdd9f75d65c9d7e1a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 31 22:43:37 2010 +0100 d3d9: Add an sRGB format test. --- dlls/d3d9/tests/visual.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6c93bb7..c0cdf7e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11399,6 +11399,129 @@ static void fp_special_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(ps); } +static void srgbwrite_format_test(IDirect3DDevice9 *device) +{ + IDirect3D9 *d3d; + IDirect3DSurface9 *rt, *backbuffer; + IDirect3DTexture9 *texture; + HRESULT hr; + int i; + DWORD color_rgb = 0x00808080, color_srgb = 0x00bcbcbc, color; + static const struct + { + D3DFORMAT fmt; + const char *name; + } + formats[] = + { + { D3DFMT_R5G6B5, "D3DFMT_R5G6B5" }, + { D3DFMT_X8R8G8B8, "D3DFMT_X8R8G8B8" }, + { D3DFMT_A8R8G8B8, "D3DFMT_A8R8G8B8" }, + { D3DFMT_A16B16G16R16F, "D3DFMT_A16B16G16R16F" }, + { D3DFMT_A32B32G32R32F, "D3DFMT_A32B32G32R32F" }, + }; + static const struct + { + float x, y, z; + float u, v; + } + quad[] = + { + {-1.0f, -1.0f, 0.1f, 0.0f, 0.0f}, + {-1.0f, 1.0f, 0.1f, 1.0f, 0.0f}, + { 1.0f, -1.0f, 0.1f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f} + }; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "GetBackBuffer failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x80808080); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + for(i = 0; i < (sizeof(formats) / sizeof(*formats)); i++) + { + hr = IDirect3DDevice9_CreateTexture(device, 8, 8, 1, D3DUSAGE_RENDERTARGET, formats[i].fmt, + D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr); + if(FAILED(hr)) + { + trace("Tex create failed\n"); + continue; + } + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &rt); + ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x000000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TFACTOR); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + } + + IDirect3DSurface9_Release(rt); + IDirect3DTexture9_Release(texture); + + color = getPixelColor(device, 360, 240); + if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_SRGBWRITE, + D3DRTYPE_TEXTURE, formats[i].fmt) == D3D_OK) + { + /* Big slop for R5G6B5 */ + ok(color_match(color, color_srgb, 5), "Format %s supports srgb, expected color 0x%08x, got 0x%08x\n", + formats[i].name, color_srgb, color); + } + else + { + /* Big slop for R5G6B5 */ + ok(color_match(color, color_rgb, 5), "Format %s does not support srgb, expected color 0x%08x, got 0x%08x\n", + formats[i].name, color_rgb, color); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); + + IDirect3D9_Release(d3d); + IDirect3DSurface9_Release(backbuffer); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -11566,6 +11689,7 @@ START_TEST(visual) shadow_test(device_ptr); fp_special_test(device_ptr); depth_bounds_test(device_ptr); + srgbwrite_format_test(device_ptr); cleanup: if(device_ptr) {

1 0

Ken Thomases : mountmgr: Balance volume references in add_volume().
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 8a38fbcacc5e4284038787296ea9ea57516a6004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a38fbcacc5e4284038787296… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 31 17:07:16 2011 -0600 mountmgr: Balance volume references in add_volume(). --- dlls/mountmgr.sys/device.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index e23d741..0550a26 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -666,7 +666,11 @@ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_poin EnterCriticalSection( &device_section ); LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) - if (volume->udi && !strcmp( udi, volume->udi )) goto found; + if (volume->udi && !strcmp( udi, volume->udi )) + { + grab_volume( volume ); + goto found; + } /* udi not found, search for a non-dynamic volume */ if ((volume = find_matching_volume( udi, device, mount_point, type ))) set_volume_udi( volume, udi );

1 0

Iain Arnell : gdiplus: C++ fixes for headers.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: aef85c72c8ac111f108ee7b2de23322ab98b755e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef85c72c8ac111f108ee7b2d… Author: Iain Arnell <iarnell(a)gmail.com> Date: Tue Feb 1 08:49:46 2011 +0100 gdiplus: C++ fixes for headers. --- include/gdiplusenums.h | 2 +- include/gdiplusgpstubs.h | 2 ++ include/gdiplustypes.h | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 82f20eb..dc03b29 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -734,7 +734,7 @@ typedef enum StringTrimming StringTrimming; typedef enum FontStyle FontStyle; typedef enum StringFormatFlags StringFormatFlags; typedef enum HotkeyPrefix HotkeyPrefix; -typedef enum PenAlignment GpPenAlignment; +typedef enum PenAlignment PenAlignment; typedef enum PaletteFlags PaletteFlags; typedef enum ImageCodecFlags ImageCodecFlags; typedef enum CombineMode CombineMode; diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 3edc1f4..5a65cd8 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -22,6 +22,7 @@ #ifdef __cplusplus class GpGraphics {}; +class GpPen {}; class GpBrush {}; class GpHatch : public GpBrush {}; class GpSolidFill : public GpBrush {}; @@ -92,6 +93,7 @@ typedef WrapMode GpWrapMode; typedef Color GpColor; typedef FlushIntention GpFlushIntention; typedef CoordinateSpace GpCoordinateSpace; +typedef PenAlignment GpPenAlignment; typedef PenType GpPenType; #endif diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 4f97432..816dba8 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -199,6 +199,31 @@ public: INT Height; }; +class CharacterRange +{ +public: + CharacterRange() + { + First = Length = 0; + } + + CharacterRange(INT first, INT length) + { + First = first; + Length = length; + } + + CharacterRange& operator=(const CharacterRange& rhs) + { + First = rhs.First; + Length = rhs.Length; + return *this; + } +public: + INT First; + INT Length; +}; + #else /* end of c++ typedefs */ typedef struct Point

1 0

Dmitry Timoshkov : gdi32: Add ExtSelectClipRgn() tests for memory and window DCs.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 73ef76538cf91eee7041c916d6d5fa90f93d45fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=73ef76538cf91eee7041c916d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 1 18:04:28 2011 +0800 gdi32: Add ExtSelectClipRgn() tests for memory and window DCs. --- dlls/gdi32/tests/clipping.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 641beac..f6cf9b6 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -353,9 +353,110 @@ static void test_GetClipRgn(void) ReleaseDC(NULL, hdc); } +static void test_memory_dc_clipping(void) +{ + HDC hdc; + HRGN hrgn, hrgn_empty; + HBITMAP hbmp; + RECT rc; + int ret; + + hdc = CreateCompatibleDC(0); + hrgn_empty = CreateRectRgn(0, 0, 0, 0); + hrgn = CreateRectRgn(0, 0, 0, 0); + hbmp = CreateCompatibleBitmap(hdc, 100, 100); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 0, "expected 0, got %d\n", ret); + + ret = ExtSelectClipRgn(hdc, hrgn_empty, RGN_DIFF); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(rc.left == 0 && rc.top == 0 && rc.right == 1 && rc.bottom == 1, + "expected 0,0-1,1, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + + ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 0, "expected 0, got %d\n", ret); + + SelectObject(hdc, hbmp); + + ret = ExtSelectClipRgn(hdc, hrgn_empty, RGN_DIFF); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(rc.left == 0 && rc.top == 0 && rc.right == 100 && rc.bottom == 100, + "expected 0,0-100,100, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + + DeleteDC(hdc); + DeleteObject(hrgn); + DeleteObject(hrgn_empty); + DeleteObject(hbmp); +} + +static void test_window_dc_clipping(void) +{ + HDC hdc; + HRGN hrgn, hrgn_empty; + HWND hwnd; + RECT rc; + int ret, screen_width, screen_height; + + screen_width = GetSystemMetrics(SM_CXSCREEN); + screen_height = GetSystemMetrics(SM_CYSCREEN); + + trace("screen resolution %d x %d\n", screen_width, screen_height); + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, + -100, -100, screen_width * 2, screen_height * 2, 0, 0, 0, NULL); + hdc = GetWindowDC(0); + hrgn_empty = CreateRectRgn(0, 0, 0, 0); + hrgn = CreateRectRgn(0, 0, 0, 0); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 0, "expected 0, got %d\n", ret); + + ret = ExtSelectClipRgn(hdc, hrgn_empty, RGN_DIFF); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(rc.left == 0 && rc.top == 0 && rc.right == screen_width && rc.bottom == screen_height, + "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height, + rc.left, rc.top, rc.right, rc.bottom); + + ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 0, "expected 0, got %d\n", ret); + + DeleteDC(hdc); + DeleteObject(hrgn); + DeleteObject(hrgn_empty); + DestroyWindow(hwnd); +} + + START_TEST(clipping) { test_GetRandomRgn(); test_ExtCreateRegion(); test_GetClipRgn(); + test_memory_dc_clipping(); + test_window_dc_clipping(); }

1 0

Andrew Nguyen : shell32/tests: Release the IAutoComplete interface on a failure path.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 13b834561bb9c211648c0c31adc8bb2a92f5120a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b834561bb9c211648c0c31a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:16:02 2011 -0600 shell32/tests: Release the IAutoComplete interface on a failure path. --- dlls/shell32/tests/autocomplete.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index d4a84ae..01b97c1 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -55,6 +55,7 @@ static IAutoComplete *test_init(void) if (r == REGDB_E_CLASSNOTREG) { win_skip("CLSID_ACLMulti is not registered\n"); + IAutoComplete_Release(ac); return NULL; } ok(r == S_OK, "no IID_IACList (0x%08x)\n", r);

1 0

Andrew Nguyen : shell32: Improve initialization state and parameter handling in IAutoComplete::Init .
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 4dc304489f357c07a7cf269170cb61b888d7b49f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc304489f357c07a7cf26917… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:16:20 2011 -0600 shell32: Improve initialization state and parameter handling in IAutoComplete::Init. --- dlls/shell32/autocomplete.c | 32 ++++++++-- dlls/shell32/tests/autocomplete.c | 113 ++++++++++++++++++++++++++++++++++-- 2 files changed, 131 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index d1139e2..95db44c 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -67,7 +67,8 @@ typedef struct const IAutoComplete2Vtbl *lpVtbl; const IAutoCompleteDropDownVtbl *lpDropDownVtbl; LONG ref; - BOOL enabled; + BOOL initialized; + BOOL enabled; HWND hwndEdit; HWND hwndListBox; WNDPROC wpOrigEditProc; @@ -246,21 +247,31 @@ static HRESULT WINAPI IAutoComplete2_fnInit( { IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", - This, (long)hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); + TRACE("(%p)->(%p, %p, %s, %s)\n", + This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); if (This->options & ACO_SEARCH) FIXME(" ACO_SEARCH not supported\n"); if (This->options & ACO_FILTERPREFIXES) FIXME(" ACO_FILTERPREFIXES not supported\n"); if (This->options & ACO_USETAB) FIXME(" ACO_USETAB not supported\n"); if (This->options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n"); - This->hwndEdit = hwndEdit; + if (!hwndEdit || !punkACL) + return E_INVALIDARG; + + if (This->initialized) + { + WARN("Autocompletion object is already initialized\n"); + /* This->hwndEdit is set to NULL when the edit window is destroyed. */ + return This->hwndEdit ? E_FAIL : E_UNEXPECTED; + } if (FAILED (IUnknown_QueryInterface (punkACL, &IID_IEnumString, (LPVOID*)&This->enumstr))) { - TRACE("No IEnumString interface\n"); - return E_NOINTERFACE; + WARN("No IEnumString interface\n"); + return E_NOINTERFACE; } + This->initialized = TRUE; + This->hwndEdit = hwndEdit; This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); SetWindowLongPtrW( hwndEdit, GWLP_USERDATA, (LONG_PTR)This); @@ -613,7 +624,14 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } } - break; + break; + case WM_DESTROY: + { + WNDPROC proc = This->wpOrigEditProc; + + This->hwndEdit = NULL; + return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); + } default: return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 01b97c1..a96aa97 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -33,10 +33,113 @@ static HWND hMainWnd, hEdit; static HINSTANCE hinst; static int killfocus_count; +static void test_invalid_init(void) +{ + HRESULT hr; + IAutoComplete *ac; + IUnknown *acSource; + HWND edit_control; + + /* AutoComplete instance */ + hr = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, + &IID_IAutoComplete, (void **)&ac); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_AutoComplete is not registered\n"); + return; + } + ok(hr == S_OK, "no IID_IAutoComplete (0x%08x)\n", hr); + + /* AutoComplete source */ + hr = CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC_SERVER, + &IID_IACList, (void **)&acSource); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_ACLMulti is not registered\n"); + IAutoComplete_Release(ac); + return; + } + ok(hr == S_OK, "no IID_IACList (0x%08x)\n", hr); + + edit_control = CreateWindowExA(0, "EDIT", "Some text", 0, 10, 10, 300, 300, + hMainWnd, NULL, hinst, NULL); + ok(edit_control != NULL, "Can't create edit control\n"); + + /* The refcount of acSource would be incremented on older Windows. */ + hr = IAutoComplete_Init(ac, NULL, acSource, NULL, NULL); + ok(hr == E_INVALIDARG || + broken(hr == S_OK), /* Win2k/XP/Win2k3 */ + "Init returned 0x%08x\n", hr); + if (hr == E_INVALIDARG) + { + LONG ref; + + IUnknown_AddRef(acSource); + ref = IUnknown_Release(acSource); + ok(ref == 1, "Expected AutoComplete source refcount to be 1, got %d\n", ref); + } + +if (0) +{ + /* Older Windows versions never check the window handle, while newer + * versions only check for NULL. Subsequent attempts to initialize the + * object after this call succeeds would fail, because initialization + * state is determined by whether a non-NULL window handle is stored. */ + hr = IAutoComplete_Init(ac, (HWND)0xdeadbeef, acSource, NULL, NULL); + ok(hr == S_OK, "Init returned 0x%08x\n", hr); + + /* Tests crash on older Windows. */ + hr = IAutoComplete_Init(ac, NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Init returned 0x%08x\n", hr); + + hr = IAutoComplete_Init(ac, edit_control, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Init returned 0x%08x\n", hr); +} + + /* bind to edit control */ + hr = IAutoComplete_Init(ac, edit_control, acSource, NULL, NULL); + ok(hr == S_OK, "Init returned 0x%08x\n", hr); + + /* try invalid parameters after successful initialization .*/ + hr = IAutoComplete_Init(ac, NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG || + hr == E_FAIL, /* Win2k/XP/Win2k3 */ + "Init returned 0x%08x\n", hr); + + hr = IAutoComplete_Init(ac, NULL, acSource, NULL, NULL); + ok(hr == E_INVALIDARG || + hr == E_FAIL, /* Win2k/XP/Win2k3 */ + "Init returned 0x%08x\n", hr); + + hr = IAutoComplete_Init(ac, edit_control, NULL, NULL, NULL); + ok(hr == E_INVALIDARG || + hr == E_FAIL, /* Win2k/XP/Win2k3 */ + "Init returned 0x%08x\n", hr); + + /* try initializing twice on the same control */ + hr = IAutoComplete_Init(ac, edit_control, acSource, NULL, NULL); + ok(hr == E_FAIL, "Init returned 0x%08x\n", hr); + + /* try initializing with a different control */ + hr = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); + ok(hr == E_FAIL, "Init returned 0x%08x\n", hr); + + DestroyWindow(edit_control); + + /* try initializing with a different control after + * destroying the original initialization control */ + hr = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); + ok(hr == E_UNEXPECTED || + hr == E_FAIL, /* Win2k/XP/Win2k3 */ + "Init returned 0x%08x\n", hr); + + IUnknown_Release(acSource); + IAutoComplete_Release(ac); +} static IAutoComplete *test_init(void) { HRESULT r; - IAutoComplete* ac; + IAutoComplete *ac; IUnknown *acSource; /* AutoComplete instance */ @@ -60,14 +163,9 @@ static IAutoComplete *test_init(void) } ok(r == S_OK, "no IID_IACList (0x%08x)\n", r); -if (0) -{ - /* crashes on native */ - r = IAutoComplete_Init(ac, hEdit, NULL, NULL, NULL); -} /* bind to edit control */ r = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); - ok(r == S_OK, "Init failed (0x%08x)\n", r); + ok(r == S_OK, "Init returned 0x%08x\n", r); IUnknown_Release(acSource); @@ -135,6 +233,7 @@ START_TEST(autocomplete) ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n"); if (!hMainWnd) return; + test_invalid_init(); ac = test_init(); if (!ac) goto cleanup;

1 0

Andrew Nguyen : shell32: Store the autocompletion object pointer in a window property rather than in the window user data .
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 4145fe0ec2943b1ad81cf812a5f8963911bf442e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4145fe0ec2943b1ad81cf812a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 1 04:16:30 2011 -0600 shell32: Store the autocompletion object pointer in a window property rather than in the window user data. --- dlls/shell32/autocomplete.c | 8 +++++--- dlls/shell32/tests/autocomplete.c | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 95db44c..b259f6f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -82,7 +82,9 @@ typedef struct static const IAutoComplete2Vtbl acvt; static const IAutoCompleteDropDownVtbl acdropdownvt; - +static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t','o', + 'c','o','m','p','l','e','t','e',' ', + 'c','o','n','t','r','o','l',0}; /* converts This to an interface pointer */ @@ -273,7 +275,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->initialized = TRUE; This->hwndEdit = hwndEdit; This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); - SetWindowLongPtrW( hwndEdit, GWLP_USERDATA, (LONG_PTR)This); + SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) create_listbox(This); @@ -464,7 +466,7 @@ static const IAutoCompleteDropDownVtbl acdropdownvt = */ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); LPOLESTR strs; HRESULT hr; WCHAR hwndText[255]; diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index a96aa97..5ff8847 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -141,6 +141,7 @@ static IAutoComplete *test_init(void) HRESULT r; IAutoComplete *ac; IUnknown *acSource; + LONG_PTR user_data; /* AutoComplete instance */ r = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, @@ -163,10 +164,16 @@ static IAutoComplete *test_init(void) } ok(r == S_OK, "no IID_IACList (0x%08x)\n", r); + user_data = GetWindowLongPtrA(hEdit, GWLP_USERDATA); + ok(user_data == 0, "Expected the edit control user data to be zero\n"); + /* bind to edit control */ r = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); ok(r == S_OK, "Init returned 0x%08x\n", r); + user_data = GetWindowLongPtrA(hEdit, GWLP_USERDATA); + ok(user_data == 0, "Expected the edit control user data to be zero\n"); + IUnknown_Release(acSource); return ac;

1 0

Henri Verbeet : d3d8/tests: Release doesn't return a HRESULT (LLVM/Clang).
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: ebf66c1061fe8f12604dc0842a2d609c7819637b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf66c1061fe8f12604dc0842… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 31 19:19:22 2011 +0100 d3d8/tests: Release doesn't return a HRESULT (LLVM/Clang). --- dlls/d3d8/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 33cc56d..fa7d268 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1820,7 +1820,7 @@ static void resource_test_cleanup(IDirect3DDevice8 *device, struct state_test *t for (i = 0; i < arg->tex_count; ++i) { - hr = IDirect3DBaseTexture8_Release(ctx->test_data_all.tex[i]); + IDirect3DBaseTexture8_Release(ctx->test_data_all.tex[i]); } HeapFree(GetProcessHeap(), 0, ctx->default_data.vb);

1 0