October 2009 - Wine-commits

Henri Verbeet : d3d8/tests: Check some more return values (LLVM/Clang).
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: ec5c4170191be4915d279c134c8ff6cdb0835b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5c4170191be4915d279c134… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:41 2009 +0200 d3d8/tests: Check some more return values (LLVM/Clang). --- dlls/d3d8/tests/visual.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 07b8810..b74867a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -433,6 +433,7 @@ static void fog_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 2 /*PrimCount */, Indices, D3DFMT_INDEX16, transformed_2, sizeof(transformed_2[0])); + ok(SUCCEEDED(hr), "IDirect3DDevice8_DrawIndexedPrimitiveUP returned %#x.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "EndScene returned %#08x\n", hr); @@ -477,7 +478,9 @@ static void present_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 0.75, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %08x\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice8_Present returned %#x.\n", hr); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.4, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice8_Clear returned %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %08x\n", hr); @@ -726,10 +729,12 @@ static void offscreen_test(IDirect3DDevice8 *device) out: hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetTexture returned %#x.\n", hr); /* restore things */ if(backbuffer) { hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depthstencil); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget returned %#x.\n", hr); IDirect3DSurface8_Release(backbuffer); } if(offscreenTexture) {

1 0

Henri Verbeet : d3d9/tests: Check some more return values (LLVM/Clang).
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 023446f109e11c74cf49709145ac9f738c20b759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023446f109e11c74cf4970914… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:42 2009 +0200 d3d9/tests: Check some more return values (LLVM/Clang). --- dlls/d3d9/tests/surface.c | 1 + dlls/d3d9/tests/texture.c | 1 + dlls/d3d9/tests/visual.c | 85 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 79 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=023446f109e11c74cf497…

1 0

Henri Verbeet : wined3d: Printing a FIXME once only works if the relevant BOOL is static (LLVM/ Clang).
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 9dd78e13d5c06cd374f313e721e2fe8a47eea403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd78e13d5c06cd374f313e72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:43 2009 +0200 wined3d: Printing a FIXME once only works if the relevant BOOL is static (LLVM/Clang). --- dlls/wined3d/state.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e7723ee..194cb9e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1549,7 +1549,8 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, str static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - BOOL warned = FALSE; + static BOOL warned; + /* TODO: NV_POINT_SPRITE */ if (!warned && stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { /* A FIXME, not a WARN because point sprites should be software emulated if not supported by HW */ @@ -1561,7 +1562,8 @@ static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { - BOOL warned = FALSE; + static BOOL warned; + if(GL_LIMITS(point_sprite_units) < GL_LIMITS(textures) && !warned) { if(use_ps(stateblock) || stateblock->lowest_disabled_stage > GL_LIMITS(point_sprite_units)) { FIXME("The app uses point sprite texture coordinates on more units than supported by the driver\n");

1 0

Alexandre Julliard : ntdll: Assume leaf function when we can' t find exception information for an ELF module.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 905609b73bfdedf9b409a3ff86ac9767d9a00af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905609b73bfdedf9b409a3ff8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 16 13:39:15 2009 +0200 ntdll: Assume leaf function when we can't find exception information for an ELF module. --- dlls/ntdll/signal_x86_64.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b5ff237..94b3d3c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1849,9 +1849,10 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context.Rip - 1), &bases ); if (!fde) { - ERR( "no exception data found in %s for function %lx\n", - module ? debugstr_w(module->BaseDllName.Buffer) : "system library", context.Rip ); - break; + /* assume leaf function */ + context.Rip = *(ULONG64 *)context.Rsp; + context.Rsp += sizeof(ULONG64); + continue; } status = dwarf_virtual_unwind( context.Rip, &dispatch.EstablisherFrame, &new_context, fde, &bases, &dispatch.LanguageHandler, &dispatch.HandlerData ); @@ -2712,9 +2713,10 @@ void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context.Rip - 1), &bases ); if (!fde) { - ERR( "no exception data found in %s for function %lx\n", - module ? debugstr_w(module->BaseDllName.Buffer) : "system library", context.Rip ); - raise_status( STATUS_BAD_FUNCTION_TABLE, rec ); + /* assume leaf function */ + context.Rip = *(ULONG64 *)context.Rsp; + context.Rsp += sizeof(ULONG64); + continue; } dispatch.FunctionEntry = NULL; status = dwarf_virtual_unwind( context.Rip, &dispatch.EstablisherFrame, &new_context, fde,

1 0

Nikolay Sivov : include: Use unicode neutral SendMessage for DateTime and Monthcal macros.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: dd96319deee704d6d1922697d009000899cf5c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd96319deee704d6d1922697d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 20:58:16 2009 +0400 include: Use unicode neutral SendMessage for DateTime and Monthcal macros. --- include/commctrl.h | 64 ++++++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index f2ea3ae..b8ebe94 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4739,51 +4739,51 @@ typedef struct tagNMDAYSTATE /* macros */ #define MonthCal_GetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_SetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_GetMaxSelCount(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXSELCOUNT, 0, 0L) + (DWORD)SNDMSG(hmc, MCM_GETMAXSELCOUNT, 0, 0L) #define MonthCal_SetMaxSelCount(hmc, n) \ - (BOOL)SNDMSGA(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) + (BOOL)SNDMSG(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) #define MonthCal_GetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_SetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_GetMonthRange(hmc, gmr, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) #define MonthCal_SetDayState(hmc, cbds, rgds) \ - SNDMSGA(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) + SNDMSG(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) #define MonthCal_GetMinReqRect(hmc, prc) \ - SNDMSGA(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) + SNDMSG(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) #define MonthCal_SetColor(hmc, iColor, clr)\ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, clr) + SNDMSG(hmc, MCM_SETCOLOR, iColor, clr) #define MonthCal_GetColor(hmc, iColor) \ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, 0) + SNDMSG(hmc, MCM_SETCOLOR, iColor, 0) #define MonthCal_GetToday(hmc, pst)\ - (BOOL)SNDMSGA(hmc, MCM_GETTODAY, 0, (LPARAM)pst) + (BOOL)SNDMSG(hmc, MCM_GETTODAY, 0, (LPARAM)pst) #define MonthCal_SetToday(hmc, pst)\ - SNDMSGA(hmc, MCM_SETTODAY, 0, (LPARAM)pst) + SNDMSG(hmc, MCM_SETTODAY, 0, (LPARAM)pst) #define MonthCal_HitTest(hmc, pinfo) \ - SNDMSGA(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) + SNDMSG(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) #define MonthCal_SetFirstDayOfWeek(hmc, iDay) \ - SNDMSGA(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) + SNDMSG(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) #define MonthCal_GetFirstDayOfWeek(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) #define MonthCal_GetRange(hmc, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) #define MonthCal_SetRange(hmc, gd, rgst) \ - (BOOL)SNDMSGA(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define MonthCal_GetMonthDelta(hmc) \ - (int)SNDMSGA(hmc, MCM_GETMONTHDELTA, 0, 0) + (int)SNDMSG(hmc, MCM_GETMONTHDELTA, 0, 0) #define MonthCal_SetMonthDelta(hmc, n) \ - (int)SNDMSGA(hmc, MCM_SETMONTHDELTA, n, 0) + (int)SNDMSG(hmc, MCM_SETMONTHDELTA, n, 0) #define MonthCal_GetMaxTodayWidth(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) #define MonthCal_SetUnicodeFormat(hwnd, fUnicode) \ - (BOOL)SNDMSGA((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) + (BOOL)SNDMSG((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) #define MonthCal_GetUnicodeFormat(hwnd) \ - (BOOL)SNDMSGA((hwnd), MCM_GETUNICODEFORMAT, 0, 0) + (BOOL)SNDMSG((hwnd), MCM_GETUNICODEFORMAT, 0, 0) /************************************************************************** @@ -4943,28 +4943,28 @@ DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY) #define DateTime_GetSystemtime(hdp, pst) \ - (DWORD)SNDMSGA (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) + (DWORD)SNDMSG (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) #define DateTime_SetSystemtime(hdp, gd, pst) \ - (BOOL)SNDMSGA (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) + (BOOL)SNDMSG (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) #define DateTime_GetRange(hdp, rgst) \ - (DWORD)SNDMSGA (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) #define DateTime_SetRange(hdp, gd, rgst) \ - (BOOL)SNDMSGA (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define DateTime_SetFormatA(hdp, sz) \ (BOOL)SNDMSGA (hdp, DTM_SETFORMATA, 0, (LPARAM)(sz)) #define DateTime_SetFormatW(hdp, sz) \ (BOOL)SNDMSGW (hdp, DTM_SETFORMATW, 0, (LPARAM)(sz)) #define DateTime_SetFormat WINELIB_NAME_AW(DateTime_SetFormat) #define DateTime_GetMonthCalColor(hdp, iColor) \ - SNDMSGA (hdp, DTM_GETMCCOLOR, iColor, 0) + SNDMSG (hdp, DTM_GETMCCOLOR, iColor, 0) #define DateTime_SetMonthCalColor(hdp, iColor, clr) \ - SNDMSGA (hdp, DTM_SETMCCOLOR, iColor, clr) + SNDMSG (hdp, DTM_SETMCCOLOR, iColor, clr) #define DateTime_GetMonthCal(hdp) \ - (HWND) SNDMSGA (hdp, DTM_GETMONTHCAL, 0, 0) + (HWND) SNDMSG (hdp, DTM_GETMONTHCAL, 0, 0) #define DateTime_SetMonthCalFont(hdp, hfont, fRedraw) \ - SNDMSGA (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) + SNDMSG (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) #define DateTime_GetMonthCalFont(hdp) \ - SNDMSGA (hdp, DTM_GETMCFONT, 0, 0) + SNDMSG (hdp, DTM_GETMCFONT, 0, 0) #define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff)

1 0

Detlef Riekenberg : d3d8/tests: Mark a failure of GetLightEnable on Win9x as broken().
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 7189c58f2f9a988c970760a097b3001ddcebcece URL: http://source.winehq.org/git/wine.git/?a=commit;h=7189c58f2f9a988c970760a09… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 15 21:14:18 2009 +0200 d3d8/tests: Mark a failure of GetLightEnable on Win9x as broken(). --- dlls/d3d8/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a869e79..2a6a10e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1248,7 +1248,9 @@ static void test_lights(void) broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */ "Enabling one light more than supported returned %08x\n", hr); hr = IDirect3DDevice8_GetLightEnable(device, i + 1, &enabled); - ok(hr == D3D_OK, "GetLightEnable on light %u failed with %08x\n", i + 1, hr); + ok(hr == D3D_OK || + broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */ + "GetLightEnable on light %u failed with %08x\n", i + 1, hr); ok(enabled, "Light %d is %s\n", i + 1, enabled ? "enabled" : "disabled"); hr = IDirect3DDevice8_LightEnable(device, i + 1, FALSE); ok(hr == D3D_OK, "Disabling the additional returned %08x\n", hr);

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_protocol.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: c9adc4149c2dabfeac8b7068cf48d003d51905c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9adc4149c2dabfeac8b7068c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 15 16:17:17 2009 -0500 mshtml: Implement IHTMLLocation::get_protocol. --- dlls/mshtml/htmllocation.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index e86cee6..e991cf3 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -191,12 +191,31 @@ static HRESULT WINAPI HTMLLocation_put_protocol(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwSchemeLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwSchemeLength) { + FIXME("Unexpected blank protocol\n"); + return E_NOTIMPL; + }else { + WCHAR buf[url.dwSchemeLength + 1]; + memcpy(buf, url.lpszScheme, url.dwSchemeLength * sizeof(WCHAR)); + buf[url.dwSchemeLength] = ':'; + *p = SysAllocStringLen(buf, url.dwSchemeLength + 1); + } + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_host(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index e271f00..57b6bcf 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -57,7 +57,7 @@ static const struct location_test http_test = { "HTTP", http_url, "http://www.winehq.org/?search#hash", FALSE, - "http:", FALSE, + "http:", TRUE, "www.winehq.org:80", FALSE, "www.winehq.org", FALSE, "80", TRUE, @@ -71,7 +71,7 @@ static const struct location_test http_file_test = { "HTTP with file", http_file_url, "http://www.winehq.org/file?search#hash", TRUE, - "http:", FALSE, + "http:", TRUE, "www.winehq.org:80", FALSE, "www.winehq.org", FALSE, "80", TRUE, @@ -85,7 +85,7 @@ static const struct location_test ftp_test = { "FTP", ftp_url, "ftp://ftp.winehq.org/", TRUE, - "ftp:", FALSE, + "ftp:", TRUE, "ftp.winehq.org:21", FALSE, "ftp.winehq.org", FALSE, "21", TRUE, @@ -99,7 +99,7 @@ static const struct location_test ftp_file_test = { "FTP with file", ftp_file_url, "ftp://ftp.winehq.org/file", TRUE, - "ftp:", FALSE, + "ftp:", TRUE, "ftp.winehq.org:21", FALSE, "ftp.winehq.org", FALSE, "21", TRUE, @@ -113,7 +113,7 @@ static const struct location_test file_test = { "FILE", file_url, "file:///C:/windows/win.ini", FALSE, - "file:", FALSE, + "file:", TRUE, NULL, FALSE, NULL, FALSE, "", TRUE, @@ -171,7 +171,7 @@ static void test_protocol(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_protocol(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_protocol failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_protocol failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->protocol_ok) ok(str_eq_wa(str, test->protocol),

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_host.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 7cb9fe1064f68629cc41901d49a169629d532756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb9fe1064f68629cc41901d4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 15 16:17:28 2009 -0500 mshtml: Implement IHTMLLocation::get_host. --- dlls/mshtml/htmllocation.c | 32 ++++++++++++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index e991cf3..badf111 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -228,12 +228,40 @@ static HRESULT WINAPI HTMLLocation_put_host(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwHostNameLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwHostNameLength){ + *p = NULL; + return S_OK; + } + + if(url.nPort) { + /* <hostname>:<port> */ + const WCHAR format[] = {'%','d',0}; + DWORD len = url.dwHostNameLength + 1 + 5 + 1; + WCHAR buf[len]; + + memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); + buf[url.dwHostNameLength] = ':'; + snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); + *p = SysAllocString(buf); + }else + *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); + + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_hostname(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 57b6bcf..aaf8ecf 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -58,7 +58,7 @@ static const struct location_test http_test = { http_url, "http://www.winehq.org/?search#hash", FALSE, "http:", TRUE, - "www.winehq.org:80", FALSE, + "www.winehq.org:80", TRUE, "www.winehq.org", FALSE, "80", TRUE, "", FALSE, @@ -72,7 +72,7 @@ static const struct location_test http_file_test = { http_file_url, "http://www.winehq.org/file?search#hash", TRUE, "http:", TRUE, - "www.winehq.org:80", FALSE, + "www.winehq.org:80", TRUE, "www.winehq.org", FALSE, "80", TRUE, "file", FALSE, @@ -86,7 +86,7 @@ static const struct location_test ftp_test = { ftp_url, "ftp://ftp.winehq.org/", TRUE, "ftp:", TRUE, - "ftp.winehq.org:21", FALSE, + "ftp.winehq.org:21", TRUE, "ftp.winehq.org", FALSE, "21", TRUE, "", FALSE, @@ -100,7 +100,7 @@ static const struct location_test ftp_file_test = { ftp_file_url, "ftp://ftp.winehq.org/file", TRUE, "ftp:", TRUE, - "ftp.winehq.org:21", FALSE, + "ftp.winehq.org:21", TRUE, "ftp.winehq.org", FALSE, "21", TRUE, "file", FALSE, @@ -114,7 +114,7 @@ static const struct location_test file_test = { file_url, "file:///C:/windows/win.ini", FALSE, "file:", TRUE, - NULL, FALSE, + NULL, TRUE, NULL, FALSE, "", TRUE, "C:\\windows\\win.ini", TRUE, @@ -195,7 +195,7 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_host(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->host_ok) ok(str_eq_wa(str, test->host),

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_hostname.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: fc3808e55351229d56ee1acdda82f5e6fdcca148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3808e55351229d56ee1acdd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 15 16:17:39 2009 -0500 mshtml: Implement IHTMLLocation::get_hostname. --- dlls/mshtml/htmllocation.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index badf111..e21ec76 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -274,12 +274,28 @@ static HRESULT WINAPI HTMLLocation_put_hostname(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwHostNameLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwHostNameLength){ + *p = NULL; + return S_OK; + } + + *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_port(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index aaf8ecf..8cd7e1d 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -59,7 +59,7 @@ static const struct location_test http_test = { "http://www.winehq.org/?search#hash", FALSE, "http:", TRUE, "www.winehq.org:80", TRUE, - "www.winehq.org", FALSE, + "www.winehq.org", TRUE, "80", TRUE, "", FALSE, "?search", FALSE, @@ -73,7 +73,7 @@ static const struct location_test http_file_test = { "http://www.winehq.org/file?search#hash", TRUE, "http:", TRUE, "www.winehq.org:80", TRUE, - "www.winehq.org", FALSE, + "www.winehq.org", TRUE, "80", TRUE, "file", FALSE, "?search", FALSE, @@ -87,7 +87,7 @@ static const struct location_test ftp_test = { "ftp://ftp.winehq.org/", TRUE, "ftp:", TRUE, "ftp.winehq.org:21", TRUE, - "ftp.winehq.org", FALSE, + "ftp.winehq.org", TRUE, "21", TRUE, "", FALSE, NULL, FALSE, @@ -101,7 +101,7 @@ static const struct location_test ftp_file_test = { "ftp://ftp.winehq.org/file", TRUE, "ftp:", TRUE, "ftp.winehq.org:21", TRUE, - "ftp.winehq.org", FALSE, + "ftp.winehq.org", TRUE, "21", TRUE, "file", FALSE, NULL, FALSE, @@ -115,7 +115,7 @@ static const struct location_test file_test = { "file:///C:/windows/win.ini", FALSE, "file:", TRUE, NULL, TRUE, - NULL, FALSE, + NULL, TRUE, "", TRUE, "C:\\windows\\win.ini", TRUE, NULL, FALSE, @@ -219,7 +219,7 @@ static void test_hostname(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_hostname(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_hostname failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_hostname failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->hostname_ok) ok(str_eq_wa(str, test->hostname),

1 0

Alexandre Julliard : user32: Reimplement accelerator functions to use 32-bit user handles instead of 16-bit functions .
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: a7adbf784988c6eb60fdc9a82ed12db726af08e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7adbf784988c6eb60fdc9a82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 17:35:06 2009 +0200 user32: Reimplement accelerator functions to use 32-bit user handles instead of 16-bit functions. --- dlls/user32/menu.c | 83 ++++--------- dlls/user32/resource.c | 299 ++++++++++++++++++-------------------------- dlls/user32/user_private.h | 1 + 3 files changed, 149 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7adbf784988c6eb60fdc…

1 0