March 2010 - Wine-Commits - list.winehq.org

Jacek Caban : shdocvw: Fixed tests on some Windows.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 7723784596fb17ff32808e6c0c806b0c96c4a916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7723784596fb17ff32808e6c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 17 13:19:35 2010 +0100 shdocvw: Fixed tests on some Windows. --- dlls/shdocvw/tests/webbrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 7d98b9d..f396373 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -2285,7 +2285,7 @@ static void test_download(DWORD flags) todo_wine CHECK_CALLED(EnableModeless_FALSE); else CLEAR_CALLED(EnableModeless_FALSE); /* IE 8 */ - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); + CLEAR_CALLED(Invoke_COMMANDSTATECHANGE); todo_wine CHECK_CALLED(Invoke_STATUSTEXTCHANGE); todo_wine CHECK_CALLED(SetStatusText); if(is_first_load)

1 0

Sandijs Ribaks : wined3d: Add surface conversion function from WINED3DFMT_YUY2 to WINED3DFMT_B8G8R8X8_UNORM .
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: e385748258bea127d4883a540611f9ee80e65d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e385748258bea127d4883a540… Author: Sandijs Ribaks <spamdijs(a)inbox.lv> Date: Tue Mar 16 16:09:06 2010 +0200 wined3d: Add surface conversion function from WINED3DFMT_YUY2 to WINED3DFMT_B8G8R8X8_UNORM. --- dlls/wined3d/surface_base.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 33e3d3e..a372869 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -742,6 +742,55 @@ static void convert_a8r8g8b8_x8r8g8b8(const BYTE *src, BYTE *dst, } } +static inline BYTE cliptobyte(int x) +{ + return (BYTE) ((x < 0) ? 0 : ((x > 255) ? 255 : x)); +} + +static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst, + DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ + unsigned int x, y; + int c2, d, e, r2 = 0, g2 = 0, b2 = 0; + + TRACE("Converting %ux%u pixels, pitches %u %u\n", w, h, pitch_in, pitch_out); + + for (y = 0; y < h; ++y) + { + const BYTE *src_line = src + y * pitch_in; + DWORD *dst_line = (DWORD *)(dst + y * pitch_out); + for (x = 0; x < w; ++x) + { + /* YUV to RGB conversion formulas from http://en.wikipedia.org/wiki/YUV: + * C = Y - 16; D = U - 128; E = V - 128; + * R = cliptobyte((298 * C + 409 * E + 128) >> 8); + * G = cliptobyte((298 * C - 100 * D - 208 * E + 128) >> 8); + * B = cliptobyte((298 * C + 516 * D + 128) >> 8); + * Two adjacent YUY2 pixels are stored as four bytes: Y0 U Y1 V . + * U and V are shared between the pixels. + */ + if (!(x & 1)) /* for every even pixel, read new U and V */ + { + d = (int) src_line[1] - 128; + e = (int) src_line[3] - 128; + r2 = 409 * e + 128; + g2 = - 100 * d - 208 * e + 128; + b2 = 516 * d + 128; + } + c2 = 298 * ((int) src_line[0] - 16); + dst_line[x] = 0xff000000 + | cliptobyte((c2 + r2) >> 8) << 16 /* red */ + | cliptobyte((c2 + g2) >> 8) << 8 /* green */ + | cliptobyte((c2 + b2) >> 8); /* blue */ + /* Scale RGB values to 0..255 range, + * then clip them if still not in range (may be negative), + * then shift them within DWORD if necessary. + */ + src_line += 2; + } + } +} + struct d3dfmt_convertor_desc { WINED3DFORMAT from, to; void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); @@ -752,6 +801,7 @@ static const struct d3dfmt_convertor_desc convertors[] = {WINED3DFMT_R32_FLOAT, WINED3DFMT_R16_FLOAT, convert_r32_float_r16_float}, {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_r5g6b5_x8r8g8b8}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_a8r8g8b8_x8r8g8b8}, + {WINED3DFMT_YUY2, WINED3DFMT_B8G8R8X8_UNORM, convert_yuy2_x8r8g8b8}, }; static inline const struct d3dfmt_convertor_desc *find_convertor(WINED3DFORMAT from, WINED3DFORMAT to)

1 0

Jörg Höhle : msvfw32: MCI Step is like Seek.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: ce96eb790726c72bb70bbd2b274f27fc619502e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce96eb790726c72bb70bbd2b2… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 16 19:14:38 2010 +0100 msvfw32: MCI Step is like Seek. --- dlls/msvfw32/mciwnd.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index ff8a036..64a19ca 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -1298,30 +1298,23 @@ end_of_mci_open: } case MCI_SEEK: + case MCI_STEP: { - MCI_SEEK_PARMS mci_seek; - - switch (lParam) - { - case MCIWND_START: - lParam = SendMessageW(hWnd, MCIWNDM_GETSTART, 0, 0); - break; - - case MCIWND_END: - lParam = SendMessageW(hWnd, MCIWNDM_GETEND, 0, 0); - break; - } + MCI_SEEK_PARMS mci_seek; /* Layout is useable as MCI_XYZ_STEP_PARMS */ + DWORD flags = MCI_STEP == wMsg ? 0 : + MCIWND_START == lParam ? MCI_SEEK_TO_START : + MCIWND_END == lParam ? MCI_SEEK_TO_END : MCI_TO; mci_seek.dwTo = lParam; - mwi->lasterror = mciSendCommandW(mwi->mci, MCI_SEEK, - MCI_TO, (DWORD_PTR)&mci_seek); + mwi->lasterror = mciSendCommandW(mwi->mci, wMsg, + flags, (DWORD_PTR)&mci_seek); if (mwi->lasterror) { MCIWND_notify_error(mwi); return mwi->lasterror; } /* update window to reflect the state */ - InvalidateRect(hWnd, NULL, TRUE); + else InvalidateRect(hWnd, NULL, TRUE); return 0; } @@ -1364,15 +1357,9 @@ end_of_mci_open: } case MCI_PAUSE: - case MCI_STEP: case MCI_STOP: case MCI_RESUME: mci_generic_command(mwi, wMsg); - if (wMsg == MCI_STEP && !mwi->lasterror) - { - /* update window to reflect the state */ - InvalidateRect(hWnd, NULL, TRUE); - } return mwi->lasterror; case MCI_CONFIGURE:

1 0

Stefan Dösinger : wined3d: Make resources 16 byte aligned.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: d790530df34f9129b4e2bf80311f966ca39c752f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d790530df34f9129b4e2bf803… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 11 15:41:31 2010 +0100 wined3d: Make resources 16 byte aligned. --- dlls/d3d9/tests/buffer.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/buffer.c b/dlls/d3d9/tests/buffer.c index 57a6495..719ce7e 100644 --- a/dlls/d3d9/tests/buffer.c +++ b/dlls/d3d9/tests/buffer.c @@ -137,6 +137,7 @@ static void test_vertex_buffer_alignment(IDirect3DDevice9 *device) DWORD sizes[] = {1, 4, 16, 17, 32, 33, 64, 65, 1024, 1025, 1048576, 1048577}; unsigned int i, j; void *data; + unsigned int align = 16; for(i = 0; i < (sizeof(sizes) / sizeof(sizes[0])); i++) { @@ -156,8 +157,8 @@ static void test_vertex_buffer_alignment(IDirect3DDevice9 *device) hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, 0); ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock failed (0x%08x)\n", hr); - ok(((DWORD_PTR) data & 31) == 0, "Vertex buffer start address is not 32 byte aligned(size: %d, pool: %s, data: %p)\n", - sizes[i], debug_d3dpool(pools[j]), data); + ok(((DWORD_PTR) data & (align - 1)) == 0, "Vertex buffer start address is not %u byte aligned(size: %d, pool: %s, data: %p)\n", + align, sizes[i], debug_d3dpool(pools[j]), data); hr = IDirect3DVertexBuffer9_Unlock(buffer); ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Unlock failed (0x%08x)\n", hr); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2271d4e..5c2e42d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1798,7 +1798,7 @@ HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ -#define RESOURCE_ALIGNMENT 32 +#define RESOURCE_ALIGNMENT 16 /***************************************************************************** * IWineD3DBaseTexture D3D- > openGL state map lookups

1 0

Stefan Dösinger : wined3d: Merge two if conditions in buffer.c.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: b621fac215dc459c99d22461f349b414be051078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b621fac215dc459c99d22461f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 11 15:21:40 2010 +0100 wined3d: Merge two if conditions in buffer.c. --- dlls/wined3d/buffer.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6fefe87..3e1ac4c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -900,6 +900,19 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) goto end; } buffer_check_buffer_object_size(This); + + /* The declaration changed, reload the whole buffer */ + WARN("Reloading buffer because of decl change\n"); + buffer_clear_dirty_areas(This); + if(!buffer_add_dirty_area(This, 0, 0)) + { + ERR("buffer_add_dirty_area failed, this is not expected\n"); + return; + } + /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application + * cleared for unsynchronized updates + */ + flags = 0; } else { @@ -927,22 +940,6 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) } } - if (decl_changed) - { - /* The declaration changed, reload the whole buffer */ - WARN("Reloading buffer because of decl change\n"); - buffer_clear_dirty_areas(This); - if(!buffer_add_dirty_area(This, 0, 0)) - { - ERR("buffer_add_dirty_area failed, this is not expected\n"); - return; - } - /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application - * cleared for unsynchronized updates - */ - flags = 0; - } - if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) { IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_INDEXBUFFER);

1 0

Andrew Eikum : hlink: Split target at hash in HlinkCreateFromString.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 3e041586a65db0b7bf6dfc0ab2338864cf99c1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e041586a65db0b7bf6dfc0ab… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 16 14:52:04 2010 -0500 hlink: Split target at hash in HlinkCreateFromString. --- dlls/hlink/hlink_main.c | 42 +++++++++++++++++++++++- dlls/hlink/tests/hlink.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index d07901a..e96f206 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -99,6 +99,8 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, { IHlink *hl = NULL; HRESULT r = S_OK; + WCHAR *hash, *tgt; + const WCHAR *loc; TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, @@ -108,8 +110,44 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, if (FAILED(r)) return r; - IHlink_SetStringReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, - pwzTarget, pwzLocation); + if (pwzTarget) + { + hash = strchrW(pwzTarget, '#'); + if (hash) + { + if (hash == pwzTarget) + tgt = NULL; + else + { + int tgt_len = hash - pwzTarget; + tgt = heap_alloc((tgt_len + 1) * sizeof(WCHAR)); + if (!tgt) + return E_OUTOFMEMORY; + memcpy(tgt, pwzTarget, tgt_len * sizeof(WCHAR)); + tgt[tgt_len] = 0; + } + if (!pwzLocation) + loc = hash + 1; + else + loc = pwzLocation; + } + else + { + tgt = hlink_strdupW(pwzTarget); + if (!tgt) + return E_OUTOFMEMORY; + loc = pwzLocation; + } + } + else + { + tgt = NULL; + loc = pwzLocation; + } + + IHlink_SetStringReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, tgt, loc); + + heap_free(tgt); if (pwzFriendlyName) IHlink_SetFriendlyName(hl, pwzFriendlyName); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 28c0c9a..d454819 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1363,6 +1363,83 @@ static void test_HlinkMoniker(void) IHlink_Release(hlink); } +static void test_HashLink(void) +{ + IHlink *hlink; + IMoniker *pmk; + const WCHAR hash_targetW[] = {'a','f','i','l','e','#','a','n','a','n','c','h','o','r',0}; + const WCHAR two_hash_targetW[] = {'a','f','i','l','e','#','a','n','a','n','c','h','o','r','#','a','n','o','t','h','e','r',0}; + const WCHAR hash_no_tgtW[] = {'#','a','n','a','n','c','h','o','r',0}; + const WCHAR tgt_partW[] = {'a','f','i','l','e',0}; + const WCHAR loc_partW[] = {'a','n','a','n','c','h','o','r',0}; + const WCHAR two_hash_loc_partW[] = {'a','n','a','n','c','h','o','r','#','a','n','o','t','h','e','r',0}; + const WCHAR test_locW[] = {'t','e','s','t','l','o','c',0}; + HRESULT hres; + + /* simple single hash test */ + hres = HlinkCreateFromString(hash_targetW, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void*)&hlink); + ok(hres == S_OK, "HlinkCreateFromString failed: 0x%08x\n", hres); + ok(hlink != NULL, "Didn't get an hlink\n"); + + if(hlink){ + getStringRef(hlink, tgt_partW, loc_partW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, loc_partW); + ok(pmk != NULL, "Found moniker should not be NULL\n"); + if(pmk) + IMoniker_Release(pmk); + + setStringRef(hlink, HLINKSETF_TARGET, hash_targetW, NULL); + getStringRef(hlink, hash_targetW, loc_partW); + + IHlink_Release(hlink); + } + + /* two hashes in the target */ + hres = HlinkCreateFromString(two_hash_targetW, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void*)&hlink); + ok(hres == S_OK, "HlinkCreateFromString failed: 0x%08x\n", hres); + ok(hlink != NULL, "Didn't get an hlink\n"); + + if(hlink){ + getStringRef(hlink, tgt_partW, two_hash_loc_partW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, two_hash_loc_partW); + ok(pmk != NULL, "Found moniker should not be NULL\n"); + if(pmk) + IMoniker_Release(pmk); + + IHlink_Release(hlink); + } + + /* target with hash plus a location string */ + hres = HlinkCreateFromString(hash_targetW, test_locW, NULL, NULL, 0, NULL, &IID_IHlink, (void*)&hlink); + ok(hres == S_OK, "HlinkCreateFromString failed: 0x%08x\n", hres); + ok(hlink != NULL, "Didn't get an hlink\n"); + + if(hlink){ + getStringRef(hlink, tgt_partW, test_locW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, test_locW); + ok(pmk != NULL, "Found moniker should not be NULL\n"); + if(pmk) + IMoniker_Release(pmk); + + IHlink_Release(hlink); + } + + /* target with hash containing no "target part" */ + hres = HlinkCreateFromString(hash_no_tgtW, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void*)&hlink); + ok(hres == S_OK, "HlinkCreateFromString failed: 0x%08x\n", hres); + ok(hlink != NULL, "Didn't get an hlink\n"); + + if(hlink){ + getStringRef(hlink, NULL, loc_partW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, loc_partW); + ok(pmk == NULL, "Found moniker should be NULL\n"); + if(pmk) + IMoniker_Release(pmk); + + IHlink_Release(hlink); + } +} + START_TEST(hlink) { CoInitialize(NULL); @@ -1377,6 +1454,7 @@ START_TEST(hlink) test_HlinkGetSetMonikerReference(); test_HlinkGetSetStringReference(); test_HlinkMoniker(); + test_HashLink(); CoUninitialize(); }

1 0

Andrew Eikum : hlink: Implement IHlinkBrowseContext::GetBrowseWindowInfo.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 94edcc1d880229a00713e83330bd4b70d77e4fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94edcc1d880229a00713e8333… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 16 16:49:23 2010 -0500 hlink: Implement IHlinkBrowseContext::GetBrowseWindowInfo. --- dlls/hlink/browse_ctx.c | 17 +++++++++++++- dlls/hlink/tests/browse_ctx.c | 47 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index a5b73c1..1e15c13 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -155,6 +155,9 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface, HlinkBCImpl *This = (HlinkBCImpl*)iface; TRACE("(%p)->(%p)\n", This, phlbwi); + if(!phlbwi) + return E_INVALIDARG; + heap_free(This->BrowseWindowInfo); This->BrowseWindowInfo = heap_alloc(phlbwi->cbSize); memcpy(This->BrowseWindowInfo, phlbwi, phlbwi->cbSize); @@ -165,8 +168,18 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface, static HRESULT WINAPI IHlinkBC_GetBrowseWindowInfo(IHlinkBrowseContext* iface, HLBWINFO *phlbwi) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = (HlinkBCImpl*)iface; + TRACE("(%p)->(%p)\n", This, phlbwi); + + if(!phlbwi) + return E_INVALIDARG; + + if(!This->BrowseWindowInfo) + phlbwi->cbSize = 0; + else + memcpy(phlbwi, This->BrowseWindowInfo, This->BrowseWindowInfo->cbSize); + + return S_OK; } static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface, diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index a9b26e7..30cd559 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -80,11 +80,58 @@ static void test_SetInitialHlink(void) IMoniker_Release(dummy); } +static void test_BrowseWindowInfo(void) +{ + IHlinkBrowseContext *bc; + HLBWINFO bwinfo_set, bwinfo_get; + HRESULT hres; + + hres = HlinkCreateBrowseContext(NULL, &IID_IHlinkBrowseContext, (void**)&bc); + ok(hres == S_OK, "HlinkCreateBrowseContext failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetBrowseWindowInfo(bc, NULL); + ok(hres == E_INVALIDARG, "GetBrowseWindow failed with wrong code: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_SetBrowseWindowInfo(bc, NULL); + ok(hres == E_INVALIDARG, "SetBrowseWindow failed with wrong code: 0x%08x\n", hres); + + memset(&bwinfo_get, -1, sizeof(HLBWINFO)); + + hres = IHlinkBrowseContext_GetBrowseWindowInfo(bc, &bwinfo_get); + ok(hres == S_OK, "GetBrowseWindowInfo failed: 0x%08x\n", hres); + ok(bwinfo_get.cbSize == 0, "Got wrong size: %x\n", bwinfo_get.cbSize); + + bwinfo_set.cbSize = sizeof(HLBWINFO); + bwinfo_set.grfHLBWIF = HLBWIF_WEBTOOLBARHIDDEN; + bwinfo_set.rcFramePos.left = 1; + bwinfo_set.rcFramePos.right = 2; + bwinfo_set.rcFramePos.top = 3; + bwinfo_set.rcFramePos.bottom = 4; + bwinfo_set.rcDocPos.left = 5; + bwinfo_set.rcDocPos.right = 6; + bwinfo_set.rcDocPos.top = 7; + bwinfo_set.rcDocPos.bottom = 8; + bwinfo_set.hltbinfo.uDockType = 4321; + bwinfo_set.hltbinfo.rcTbPos.left = 9; + bwinfo_set.hltbinfo.rcTbPos.right = 10; + bwinfo_set.hltbinfo.rcTbPos.top = 11; + bwinfo_set.hltbinfo.rcTbPos.bottom = 12; + hres = IHlinkBrowseContext_SetBrowseWindowInfo(bc, &bwinfo_set); + ok(hres == S_OK, "SetBrowseWindowInfo failed: 0x%08x\n", hres); + + memset(&bwinfo_get, 0, sizeof(HLBWINFO)); + + hres = IHlinkBrowseContext_GetBrowseWindowInfo(bc, &bwinfo_get); + ok(hres == S_OK, "GetBrowseWindowInfo failed: 0x%08x\n", hres); + ok(!memcmp(&bwinfo_set, &bwinfo_get, sizeof(HLBWINFO)), "Set and Get differ"); +} + START_TEST(browse_ctx) { CoInitialize(NULL); test_SetInitialHlink(); + test_BrowseWindowInfo(); CoUninitialize(); }

1 0

Maarten Lankhorst : midimap: Defer initialisation.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 8c88b5115adf28fe14a7a247aa5811900477b1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c88b5115adf28fe14a7a247a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 17 10:50:24 2010 +0100 midimap: Defer initialisation. --- dlls/midimap/midimap.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 5df8472..833c2f7 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -495,6 +495,9 @@ static DWORD modReset(MIDIMAPDATA* mom) return ret; } +static LRESULT MIDIMAP_drvOpen(void); +static LRESULT MIDIMAP_drvClose(void); + /************************************************************************** * modMessage (MIDIMAP.@) */ @@ -507,7 +510,9 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, switch (wMsg) { case DRVM_INIT: + return MIDIMAP_drvOpen(); case DRVM_EXIT: + return MIDIMAP_drvClose(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ @@ -539,7 +544,7 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, /************************************************************************** * MIDIMAP_drvOpen [internal] */ -static LRESULT MIDIMAP_drvOpen(LPSTR str) +static LRESULT MIDIMAP_drvOpen(void) { MIDIOUTCAPSW moc; unsigned dev, i; @@ -574,7 +579,7 @@ static LRESULT MIDIMAP_drvOpen(LPSTR str) /************************************************************************** * MIDIMAP_drvClose [internal] */ -static LRESULT MIDIMAP_drvClose(DWORD_PTR dwDevID) +static LRESULT MIDIMAP_drvClose(void) { if (midiOutPorts) { @@ -598,8 +603,8 @@ LRESULT CALLBACK MIDIMAP_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, { case DRV_LOAD: return 1; case DRV_FREE: return 1; - case DRV_OPEN: return MIDIMAP_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: return MIDIMAP_drvClose(dwDevID); + case DRV_OPEN: return 1; + case DRV_CLOSE: return 1; case DRV_ENABLE: return 1; case DRV_DISABLE: return 1; case DRV_QUERYCONFIGURE: return 1;

1 0

Paul Vriens : shlwapi/tests: Fix some test failures on Vista+.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 5f6962c7fc319e9d42c65bdbdc410c53ee91ef29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6962c7fc319e9d42c65bdbd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 17 13:20:15 2010 +0100 shlwapi/tests: Fix some test failures on Vista+. --- dlls/shlwapi/tests/ordinal.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 223aac4..17813c1 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1518,20 +1518,22 @@ if (0) ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); ok(buff[0] == 'a', "expected same string, got %s\n", buff); + /* flags needs to have FDTF_NOAUTOREADINGORDER for these tests to succeed on Vista+ */ + /* all combinations documented as invalid succeeded */ - flags = FDTF_SHORTTIME | FDTF_LONGTIME; + flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTTIME | FDTF_LONGTIME; SetLastError(0xdeadbeef); ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); - flags = FDTF_SHORTDATE | FDTF_LONGDATE; + flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_LONGDATE; SetLastError(0xdeadbeef); ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); - flags = FDTF_SHORTDATE | FDTF_LTRDATE | FDTF_RTLDATE; + flags = FDTF_SHORTDATE | FDTF_LTRDATE | FDTF_RTLDATE; SetLastError(0xdeadbeef); ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); @@ -1540,14 +1542,14 @@ if (0) "expected 0xdeadbeef, got %d\n", GetLastError()); /* now check returned strings */ - flags = FDTF_SHORTTIME; + flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); - flags = FDTF_LONGTIME; + flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, buff2, sizeof(buff2)); @@ -1555,21 +1557,21 @@ if (0) ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); /* both time flags */ - flags = FDTF_LONGTIME | FDTF_SHORTTIME; + flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGTIME | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); - flags = FDTF_SHORTDATE; + flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); - flags = FDTF_LONGDATE; + flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); @@ -1577,7 +1579,7 @@ if (0) ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); /* both date flags */ - flags = FDTF_LONGDATE | FDTF_SHORTDATE; + flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_SHORTDATE; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); @@ -1585,7 +1587,7 @@ if (0) ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); /* various combinations of date/time flags */ - flags = FDTF_LONGDATE | FDTF_SHORTTIME; + flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d, length %d\n", ret, lstrlenA(buff)+1); ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); @@ -1596,7 +1598,7 @@ if (0) strcat(buff2, buff3); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); - flags = FDTF_LONGDATE | FDTF_LONGTIME; + flags = FDTF_NOAUTOREADINGORDER | FDTF_LONGDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buff2, sizeof(buff2)); @@ -1607,7 +1609,7 @@ if (0) strcat(buff2, buff3); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); - flags = FDTF_SHORTDATE | FDTF_SHORTTIME; + flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, buff2, sizeof(buff2)); @@ -1618,7 +1620,7 @@ if (0) strcat(buff2, buff3); ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff2, buff); - flags = FDTF_SHORTDATE | FDTF_LONGTIME; + flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTDATE | FDTF_LONGTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); ok(ret == lstrlenA(buff)+1, "got %d\n", ret); ret = GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, buff2, sizeof(buff2));

1 0

Maciej Borsz : winhttp: Fix invalid behaviour of WinHttpCrackUrl.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 2ca477c83111a00740ecd587c623e8bdee3a34b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca477c83111a00740ecd587c… Author: Maciej Borsz <maciejborsz(a)gmail.com> Date: Tue Mar 16 19:58:25 2010 +0100 winhttp: Fix invalid behaviour of WinHttpCrackUrl. --- dlls/winhttp/tests/url.c | 19 +++++++++++++++++++ dlls/winhttp/url.c | 2 +- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index c1930be..e753351 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -65,6 +65,8 @@ static const WCHAR url10[] = static const WCHAR url11[] = {'h','t','t','p','s',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; +static const WCHAR url12[] = + {'h','t','t','p',':','/','/','e','x','a','m','p','l','e','.','n','e','t','/','p','a','t','h','?','v','a','r','1','=','e','x','a','m','p','l','e','@','e','x','a','m','p','l','e','.','c','o','m','&','v','a','r','2','=','x','&','v','a','r','3','=','y', 0}; @@ -565,6 +567,23 @@ static void WinHttpCrackUrl_test( void ) error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); + + reset_url_components( &uc ); + ret = WinHttpCrackUrl( url12, 0, 0, &uc); + + ok( ret, "WinHttpCrackUrl failed\n" ); + ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); + ok( uc.lpszScheme == url12,"unexpected scheme\n" ); + ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); + ok( uc.lpszUserName == NULL, "unexpected username\n" ); + ok( uc.lpszPassword == NULL, "unexpected password\n" ); + ok( uc.lpszHostName == url12 + 7, "unexpected hostname\n" ); + ok( uc.dwHostNameLength == 11, "unexpected hostname length\n" ); + ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); + ok( uc.lpszUrlPath == url12 + 18, "unexpected path\n" ); + ok( uc.dwUrlPathLength == 5, "unexpected path length\n" ); + ok( uc.lpszExtraInfo == url12 + 23, "unexpected extra info\n" ); + ok( uc.dwExtraInfoLength == 39, "unexpected extra info length\n" ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 49ffc4f..09835b4 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -133,7 +133,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN p += 2; if (!p[0]) goto exit; - if ((q = memchrW( p, '@', len - (p - url) ))) + if ((q = memchrW( p, '@', len - (p - url) )) && !(memchrW( p, '/', q - p ))) { if ((r = memchrW( p, ':', q - p ))) {

1 0