wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Henri Verbeet : wined3d: Free the shader buffer in shader_glsl_free() ( Valgrind).
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: fa548414f90c2aed896043e522d62d2bcb129a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa548414f90c2aed896043e52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 21 10:34:00 2009 +0200 wined3d: Free the shader buffer in shader_glsl_free() (Valgrind). --- dlls/wined3d/glsl_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6bf4144..37e325d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4589,6 +4589,7 @@ static void shader_glsl_free(IWineD3DDevice *iface) { constant_heap_free(&priv->pconst_heap); constant_heap_free(&priv->vconst_heap); HeapFree(GetProcessHeap(), 0, priv->stack); + shader_buffer_free(&priv->shader_buffer); HeapFree(GetProcessHeap(), 0, This->shader_priv); This->shader_priv = NULL;

1 0

Henri Verbeet : wined3d: Free the adapter' s format info in IWineD3DImpl_Release() (Valgrind).
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 42eb516d965bd58677d4debe21c3249d229f4f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42eb516d965bd58677d4debe2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 21 10:33:59 2009 +0200 wined3d: Free the adapter's format info in IWineD3DImpl_Release() (Valgrind). --- dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/utils.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bd26408..bc9691f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -334,6 +334,12 @@ long WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *D3DDevice, long glram) return adapter->UsedTextureRam; } +static void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) +{ + HeapFree(GetProcessHeap(), 0, adapter->gl_info.gl_formats); + HeapFree(GetProcessHeap(), 0, adapter->cfgs); +} + /********************************************************** * IUnknown parts follows **********************************************************/ @@ -372,7 +378,7 @@ static ULONG WINAPI IWineD3DImpl_Release(IWineD3D *iface) { for (i = 0; i < This->adapter_count; ++i) { - HeapFree(GetProcessHeap(), 0, This->adapters[i].cfgs); + wined3d_adapter_cleanup(&This->adapters[i]); } HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 573be8f..3f736c7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1112,6 +1112,7 @@ BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) if (!init_format_compression_info(gl_info)) { HeapFree(GetProcessHeap(), 0, gl_info->gl_formats); + gl_info->gl_formats = NULL; return FALSE; } @@ -1135,6 +1136,7 @@ BOOL initPixelFormats(struct wined3d_gl_info *gl_info) fail: HeapFree(GetProcessHeap(), 0, gl_info->gl_formats); + gl_info->gl_formats = NULL; return FALSE; }

1 0

Henri Verbeet : wined3d: Rename WineD3DAdapter to wined3d_adapter.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: f2aaca2f6788857c48e1902e254d6653a9a278c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2aaca2f6788857c48e1902e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 21 10:33:58 2009 +0200 wined3d: Rename WineD3DAdapter to wined3d_adapter. --- dlls/wined3d/directx.c | 51 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 6 ++-- 2 files changed, 29 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2aaca2f6788857c48e19…

1 0

Henri Verbeet : dxgi: Free the adapters array in dxgi_factory_Release() ( Valgrind).
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: a3f22d07d1a43e2b52b6a1bdeb9fde6f8c5605af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f22d07d1a43e2b52b6a1bde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 21 10:33:57 2009 +0200 dxgi: Free the adapters array in dxgi_factory_Release() (Valgrind). --- dlls/dxgi/factory.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 667b2f7..33c1576 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -71,6 +71,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) { IDXGIAdapter_Release(This->adapters[i]); } + HeapFree(GetProcessHeap(), 0, This->adapters); EnterCriticalSection(&dxgi_cs); IWineD3D_Release(This->wined3d);

1 0

Paul Vriens : shell32/tests: Fix a test failure on some Vista boxes.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 6d4a4fc4cdbeaf8b3e9039089cd17b2a049881a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4a4fc4cdbeaf8b3e9039089… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 21 11:25:09 2009 +0200 shell32/tests: Fix a test failure on some Vista boxes. --- dlls/shell32/tests/appbar.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 73dc0b2..5e5dfaf 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -205,6 +205,7 @@ static void test_setpos(void) RECT rc; int screen_width, screen_height; BOOL ret; + int org_bottom1; screen_width = GetSystemMetrics(SM_CXSCREEN); screen_height = GetSystemMetrics(SM_CYSCREEN); @@ -336,6 +337,9 @@ static void test_setpos(void) /* removing windows[0] will cause windows[1] to move down into its space */ expected_bottom = max(windows[0].allocated_rect.bottom, windows[1].allocated_rect.bottom); + org_bottom1 = windows[1].allocated_rect.bottom; + ok(windows[0].allocated_rect.bottom > windows[1].allocated_rect.bottom, + "Expected windows[0] to be lower than windows[1]\n"); abd.hWnd = windows[0].hwnd; windows[0].to_be_deleted = TRUE; @@ -346,7 +350,12 @@ static void test_setpos(void) do_events_until(got_expected_bottom); - ok(windows[1].allocated_rect.bottom == expected_bottom, "windows[1]'s bottom is %i, expected %i\n", windows[1].allocated_rect.bottom, expected_bottom); + if (windows[1].allocated_rect.bottom == org_bottom1) + win_skip("Some broken Vista boxes don't move the higher appbar down\n"); + else + ok(windows[1].allocated_rect.bottom == expected_bottom, + "windows[1]'s bottom is %i, expected %i\n", + windows[1].allocated_rect.bottom, expected_bottom); test_window_rects(1, 2);

1 0

Paul Vriens : ddraw/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: e1bf800ba56998bea90493e5ea37275913e4001e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1bf800ba56998bea90493e5e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 21 10:21:55 2009 +0200 ddraw/tests: Fix a test failure on Win9x/WinMe. --- dlls/ddraw/tests/d3d.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9104147..ee49dc8 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -960,8 +960,7 @@ static BOOL D3D1_createObjects(void) ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; ddsd.dwWidth = 256; ddsd.dwHeight = 256; - hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Surface1, NULL); - ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface returned %#x.\n", hr); + IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Surface1, NULL); if (!Surface1) { skip("DDSCAPS_3DDEVICE surface not available\n"); return FALSE;

1 0

Paul Vriens : winspool.drv/tests: Fix a test failure on Vista.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: ab9ee4a3fd85734d9dca1f2c90e9f03d860eacc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9ee4a3fd85734d9dca1f2c9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 21 10:16:41 2009 +0200 winspool.drv/tests: Fix a test failure on Vista. --- dlls/winspool.drv/tests/info.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index b249a00..c6c0066 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1712,11 +1712,11 @@ static void test_GetPrintProcessorDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(server_does_not_exist, NULL, 1, buffer, cbBuf*2, &pcbNeeded); - /* NT: RPC_S_SERVER_UNAVAILABLE, 9x: ERROR_INVALID_PARAMETER */ - ok( !res && - (GetLastError() == RPC_S_SERVER_UNAVAILABLE || GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %d (expected '0' with RPC_S_SERVER_UNAVAILABLE or " - "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + ok( !res, "expected failure\n"); + ok( GetLastError() == RPC_S_SERVER_UNAVAILABLE || /* NT */ + GetLastError() == ERROR_INVALID_PARAMETER || /* 9x */ + GetLastError() == RPC_S_INVALID_NET_ADDR, /* Some Vista */ + "unexpected last error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); }

1 0

Francois Gouget : hnetcfg: Make NetFwOpenPort_create() static.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: dc5bff6632df227cebcdbf997dd0877a49237074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5bff6632df227cebcdbf997… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 21 09:34:28 2009 +0200 hnetcfg: Make NetFwOpenPort_create() static. --- dlls/hnetcfg/port.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 627ae39..c80b5f7 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -319,7 +319,7 @@ static const struct INetFwOpenPortVtbl fw_port_vtbl = fw_port_get_BuiltIn }; -HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) { fw_port *fp;

1 0

Damjan Jovanovic : usb.h: Add USBD_STATUS codes and the USBD_VERSION_INFORMATION struct.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: 8a210f4e55cf29c7317cab43d5fcbbcb9fa3ad91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a210f4e55cf29c7317cab43d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Oct 21 07:53:24 2009 +0200 usb.h: Add USBD_STATUS codes and the USBD_VERSION_INFORMATION struct. --- include/ddk/usb.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/include/ddk/usb.h b/include/ddk/usb.h index b8f5f3f..af1c10d 100644 --- a/include/ddk/usb.h +++ b/include/ddk/usb.h @@ -82,6 +82,64 @@ typedef PVOID USBD_PIPE_HANDLE; typedef PVOID USBD_CONFIGURATION_HANDLE; typedef PVOID USBD_INTERFACE_HANDLE; +#define USBD_STATUS_SUCCESS ((USBD_STATUS)0x00000000) +#define USBD_STATUS_PENDING ((USBD_STATUS)0x40000000) +#define USBD_STATUS_CRC ((USBD_STATUS)0xC0000001) +#define USBD_STATUS_BTSTUFF ((USBD_STATUS)0xC0000002) +#define USBD_STATUS_DATA_TOGGLE_MISMATCH ((USBD_STATUS)0xC0000003) +#define USBD_STATUS_STALL_PID ((USBD_STATUS)0xC0000004) +#define USBD_STATUS_DEV_NOT_RESPONDING ((USBD_STATUS)0xC0000005) +#define USBD_STATUS_PID_CHECK_FAILURE ((USBD_STATUS)0xC0000006) +#define USBD_STATUS_UNEXPECTED_PID ((USBD_STATUS)0xC0000007) +#define USBD_STATUS_DATA_OVERRUN ((USBD_STATUS)0xC0000008) +#define USBD_STATUS_DATA_UNDERRUN ((USBD_STATUS)0xC0000009) +#define USBD_STATUS_RESERVED1 ((USBD_STATUS)0xC000000A) +#define USBD_STATUS_RESERVED2 ((USBD_STATUS)0xC000000B) +#define USBD_STATUS_BUFFER_OVERRUN ((USBD_STATUS)0xC000000C) +#define USBD_STATUS_BUFFER_UNDERRUN ((USBD_STATUS)0xC000000D) +#define USBD_STATUS_NOT_ACCESSED ((USBD_STATUS)0xC000000F) +#define USBD_STATUS_FIFO ((USBD_STATUS)0xC0000010) +#define USBD_STATUS_XACT_ERROR ((USBD_STATUS)0xC0000011) +#define USBD_STATUS_BABBLE_DETECTED ((USBD_STATUS)0xC0000012) +#define USBD_STATUS_DATA_BUFFER_ERROR ((USBD_STATUS)0xC0000013) +#define USBD_STATUS_ENDPOINT_HALTED ((USBD_STATUS)0xC0000030) +#define USBD_STATUS_INVALID_URB_FUNCTION ((USBD_STATUS)0x80000200) +#define USBD_STATUS_INVALID_PARAMETER ((USBD_STATUS)0x80000300) +#define USBD_STATUS_ERROR_BUSY ((USBD_STATUS)0x80000400) +#define USBD_STATUS_INVALID_PIPE_HANDLE ((USBD_STATUS)0x80000600) +#define USBD_STATUS_NO_BANDWIDTH ((USBD_STATUS)0x80000700) +#define USBD_STATUS_INTERNAL_HC_ERROR ((USBD_STATUS)0x80000800) +#define USBD_STATUS_ERROR_SHORT_TRANSFER ((USBD_STATUS)0x80000900) +#define USBD_STATUS_BAD_START_FRAME ((USBD_STATUS)0xC0000A00) +#define USBD_STATUS_ISOCH_REQUEST_FAILED ((USBD_STATUS)0xC0000B00) +#define USBD_STATUS_FRAME_CONTROL_OWNED ((USBD_STATUS)0xC0000C00) +#define USBD_STATUS_FRAME_CONTROL_NOT_OWNED ((USBD_STATUS)0xC0000D00) +#define USBD_STATUS_NOT_SUPPORTED ((USBD_STATUS)0xC0000E00) +#define USBD_STATUS_INVALID_CONFIGURATION_DESCRIPTOR ((USBD_STATUS)0xC0000F00) +#define USBD_STATUS_INSUFFICIENT_RESOURCES ((USBD_STATUS)0xC0001000) +#define USBD_STATUS_SET_CONFIG_FAILED ((USBD_STATUS)0xC0002000) +#define USBD_STATUS_BUFFER_TOO_SMALL ((USBD_STATUS)0xC0003000) +#define USBD_STATUS_INTERFACE_NOT_FOUND ((USBD_STATUS)0xC0004000) +#define USBD_STATUS_INVALID_PIPE_FLAGS ((USBD_STATUS)0xC0005000) +#define USBD_STATUS_TIMEOUT ((USBD_STATUS)0xC0006000) +#define USBD_STATUS_DEVICE_GONE ((USBD_STATUS)0xC0007000) +#define USBD_STATUS_STATUS_NOT_MAPPED ((USBD_STATUS)0xC0008000) +#define USBD_STATUS_CANCELED ((USBD_STATUS)0xC0010000) +#define USBD_STATUS_ISO_NOT_ACCESSED_BY_HW ((USBD_STATUS)0xC0020000) +#define USBD_STATUS_ISO_TD_ERROR ((USBD_STATUS)0xC0030000) +#define USBD_STATUS_ISO_NA_LATE_USBPORT ((USBD_STATUS)0xC0040000) +#define USBD_STATUS_ISO_NOT_ACCESSED_LATE ((USBD_STATUS)0xC0050000) + +#define USBD_SUCCESS(Status) ((USBD_STATUS)(Status) >= 0) +#define USBD_PENDING(Status) ((ULONG)(Status) >> 30 == 1) +#define USBD_ERROR(Status) ((USBD_STATUS)(Status) < 0) + +typedef struct _USBD_VERSION_INFORMATION { + ULONG USBDI_Version; + ULONG Supported_USB_Version; +} USBD_VERSION_INFORMATION; +typedef struct _USBD_VERSION_INFORMATION *PUSBD_VERSION_INFORMATION; + typedef enum _USBD_PIPE_TYPE { UsbdPipeTypeControl, UsbdPipeTypeIsochronous,

1 0

Andrew Eikum : hlink: Use HLINKSETF flags in Hlink::fnSetMonikerReference.
by Alexandre Julliard 21 Oct '09

21 Oct '09

Module: wine Branch: master Commit: a4b5ccfc29a12a6217645095c9c34231e983bb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b5ccfc29a12a6217645095c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 20 16:33:27 2009 -0500 hlink: Use HLINKSETF flags in Hlink::fnSetMonikerReference. --- dlls/hlink/hlink_main.c | 4 +- dlls/hlink/link.c | 37 +++++++++++------- dlls/hlink/tests/hlink.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/navigate.c | 2 +- 4 files changed, 124 insertions(+), 17 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 213506e..0e2ce90 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -84,7 +84,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, if (pihlsite) IHlink_SetHlinkSite(hl, pihlsite, dwSiteData); if (pimkTrgt) - IHlink_SetMonikerReference(hl, 0, pimkTrgt, pwzLocation); + IHlink_SetMonikerReference(hl, HLINKSETF_LOCATION | HLINKSETF_TARGET, pimkTrgt, pwzLocation); *ppvObj = hl; @@ -140,7 +140,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, return r; } - IHlink_SetMonikerReference(hl, 0, pTgtMk, pwzLocation); + IHlink_SetMonikerReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, pTgtMk, pwzLocation); IMoniker_Release(pTgtMk); IHlink_SetStringReference(hl, HLINKSETF_TARGET, pwzTarget, NULL); diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 689317d..30530ca 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -206,24 +206,33 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, { HlinkImpl *This = (HlinkImpl*)iface; - FIXME("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget, + TRACE("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget, debugstr_w(pwzLocation)); - if (This->Moniker) - IMoniker_Release(This->Moniker); + if(rfHLSETF == 0) + return E_INVALIDARG; + if(!(rfHLSETF & (HLINKSETF_TARGET | HLINKSETF_LOCATION))) + return rfHLSETF; - This->Moniker = pmkTarget; - if (This->Moniker) - { - LPOLESTR display_name; - IMoniker_AddRef(This->Moniker); - IMoniker_GetDisplayName(This->Moniker, NULL, NULL, &display_name); - This->absolute = display_name && strchrW(display_name, ':'); - CoTaskMemFree(display_name); + if(rfHLSETF & HLINKSETF_TARGET){ + if (This->Moniker) + IMoniker_Release(This->Moniker); + + This->Moniker = pmkTarget; + if (This->Moniker) + { + LPOLESTR display_name; + IMoniker_AddRef(This->Moniker); + IMoniker_GetDisplayName(This->Moniker, NULL, NULL, &display_name); + This->absolute = display_name && strchrW(display_name, ':'); + CoTaskMemFree(display_name); + } } - heap_free(This->Location); - This->Location = hlink_strdupW( pwzLocation ); + if(rfHLSETF & HLINKSETF_LOCATION){ + heap_free(This->Location); + This->Location = hlink_strdupW( pwzLocation ); + } return S_OK; } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 9e920d9..cea70b5 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1016,6 +1016,103 @@ static void test_HlinkResolveMonikerForData(void) IBindCtx_Release(bctx); } +static void test_HlinkGetSetMonikerReference(void) +{ + IMoniker *found_trgt, *dummy, *dummy2; + IHlink *hlink; + HRESULT hres; + const WCHAR one[] = {'1',0}; + const WCHAR two[] = {'2',0}; + const WCHAR name[] = {'a',0}; + WCHAR *found_loc; + + /* create two dummy monikers to use as targets */ + hres = CreateItemMoniker(one, one, &dummy); + ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); + + hres = CreateItemMoniker(two, two, &dummy2); + ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); + + /* create a new hlink: target => dummy, location => one */ + hres = HlinkCreateFromMoniker(dummy, one, name, NULL, 0, NULL, &IID_IHlink, (void**)&hlink); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); + + /* validate the target and location */ + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* set location => two */ + hres = IHlink_SetMonikerReference(hlink, HLINKSETF_LOCATION, dummy2, two); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, two) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* set target => dummy2 */ + hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET, dummy2, one); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy2, "Found target should've been %p, was: %p\n", dummy2, found_trgt); + ok(lstrcmpW(found_loc, two) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* set target => dummy, location => one */ + hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET | HLINKSETF_LOCATION, dummy, one); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* no HLINKSETF flags */ + hres = IHlink_SetMonikerReference(hlink, 0, dummy2, two); + ok(hres == E_INVALIDARG, "IHlink_SetMonikerReference should've failed with E_INVALIDARG (0x%08x), failed with 0x%08x\n", E_INVALIDARG, hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* invalid HLINKSETF flags */ + hres = IHlink_SetMonikerReference(hlink, 12, dummy2, two); + ok(hres == 12, "IHlink_SetMonikerReference should've failed with 0x%08x, failed with 0x%08x\n", 12, hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* valid & invalid HLINKSETF flags */ + hres = IHlink_SetMonikerReference(hlink, 12 | HLINKSETF_TARGET, dummy2, two); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == dummy2, "Found target should've been %p, was: %p\n", dummy2, found_trgt); + ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); + IMoniker_Release(found_trgt); + + /* NULL args */ + hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET | HLINKSETF_LOCATION, NULL, NULL); + ok(hres == S_OK, "IHlink_SetMonikerReference failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); + ok(found_trgt == NULL, "Found target should've been %p, was: %p\n", NULL, found_trgt); + ok(found_loc == NULL, "Found location should've been %s, was: %s\n", wine_dbgstr_w(NULL), wine_dbgstr_w(found_loc)); + if(found_trgt) + IMoniker_Release(found_trgt); + + IHlink_Release(hlink); + IMoniker_Release(dummy2); + IMoniker_Release(dummy); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -1027,6 +1124,7 @@ START_TEST(hlink) test_HlinkCreateExtensionServices(); test_HlinkParseDisplayName(); test_HlinkResolveMonikerForData(); + test_HlinkGetSetMonikerReference(); CoUninitialize(); } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 92d95fc..951b04d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1202,7 +1202,7 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, hres = CreateURLMoniker(NULL, url, &mon); if(SUCCEEDED(hres)) { - IHlink_SetMonikerReference(hlink, 0, mon, NULL); + IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET, mon, NULL); if(hlnf & HLNF_OPENINNEWWINDOW) { static const WCHAR wszBlank[] = {'_','b','l','a','n','k',0};

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009