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

Jacek Caban : mshtml: Event handler may be already free in release_event_target.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: a96606e6adcb43ce6953b7161419013f3783168a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96606e6adcb43ce6953b7161… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 13:36:46 2011 +0200 mshtml: Event handler may be already free in release_event_target. --- dlls/mshtml/htmlevent.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d1430cd..8dbf554 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1343,7 +1343,8 @@ void release_event_target(event_target_t *event_target) if(event_target->event_table[i]->handler_prop) IDispatch_Release(event_target->event_table[i]->handler_prop); for(j=0; j < event_target->event_table[i]->handler_cnt; j++) - IDispatch_Release(event_target->event_table[i]->handlers[j]); + if(event_target->event_table[i]->handlers[j]) + IDispatch_Release(event_target->event_table[i]->handlers[j]); } }

1 0

Piotr Caban : urlmon: Forward IWinInetHttpInfo calls to protocol implementations.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: e1c1b937ebbc4c91ea2415d60e985ea0cead0c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c1b937ebbc4c91ea2415d60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:38:07 2011 +0200 urlmon: Forward IWinInetHttpInfo calls to protocol implementations. --- dlls/urlmon/binding.c | 28 +++++++++++++++------------- dlls/urlmon/bindprot.c | 6 +++++- dlls/urlmon/urlmon_main.h | 1 + 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 0d6043c..be72ee1 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -762,19 +762,11 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void *ppv = &This->IWinInetHttpInfo_iface; }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { - IWinInetHttpInfo *http_info; - HRESULT hres; - TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); - if(!This->protocol->wininet_info) + if(!This->protocol->wininet_http_info) return E_NOINTERFACE; - hres = IWinInetInfo_QueryInterface(This->protocol->wininet_info, &IID_IWinInetHttpInfo, (void**)&http_info); - if(FAILED(hres)) - return E_NOINTERFACE; - - IWinInetHttpInfo_Release(http_info); *ppv = &This->IWinInetHttpInfo_iface; } @@ -1259,16 +1251,26 @@ static HRESULT WINAPI WinInetHttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD void *pBuffer, DWORD *pcbBuffer) { Binding *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + + if(!This->protocol->wininet_info) + return E_FAIL; + + return IWinInetInfo_QueryOption(This->protocol->wininet_info, + dwOption, pBuffer, pcbBuffer); } static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) { Binding *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + + if(!This->protocol->wininet_http_info) + return E_FAIL; + + return IWinInetHttpInfo_QueryInfo(This->protocol->wininet_http_info, + dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); } static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 01a1b90..45cf14c 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -329,6 +329,8 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) if(!ref) { if(This->wininet_info) IWinInetInfo_Release(This->wininet_info); + if(This->wininet_http_info) + IWinInetHttpInfo_Release(This->wininet_http_info); if(This->protocol) IInternetProtocol_Release(This->protocol); if(This->bind_info) @@ -523,8 +525,10 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr This->protocol = protocol; - if(urlmon_protocol) + if(urlmon_protocol) { IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); + IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&This->wininet_http_info); + } set_binding_sink(This, pOIProtSink, pOIBindInfo); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 00247c8..2691622 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -180,6 +180,7 @@ typedef struct { IInternetProtocolSink *protocol_sink; IServiceProvider *service_provider; IWinInetInfo *wininet_info; + IWinInetHttpInfo *wininet_http_info; struct { IInternetProtocol IInternetProtocol_iface;

1 0

Piotr Caban : urlmon/tests: Added IWinInetHttpInfo tests.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 319a748f7b361dd98b9e1a83aab5409412c6ccaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=319a748f7b361dd98b9e1a83a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:38:27 2011 +0200 urlmon/tests: Added IWinInetHttpInfo tests. --- dlls/urlmon/tests/url.c | 50 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 17a797b..b606b90 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1352,6 +1352,51 @@ static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; static IBindStatusCallbackEx objbsc; +static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) +{ + DWORD status, size; + HRESULT hres, expect; + + /* QueryInfo changes it's behavior during this request */ + if(progress == BINDSTATUS_SENDINGREQUEST) + return; + + if(test_protocol==FTP_TEST && download_state==BEFORE_DOWNLOAD + && progress!=BINDSTATUS_MIMETYPEAVAILABLE) + expect = E_FAIL; + else if(test_protocol == FTP_TEST) + expect = S_FALSE; + else + expect = S_OK; + + size = sizeof(DWORD); + hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, + &status, &size, NULL, NULL); + ok(hres == expect, "hres = %x, expected %x\n", hres, expect); + if(hres == S_OK) { + if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) + ok(status == 0, "status = %d\n", status); + else + ok(status == HTTP_STATUS_OK, "status = %d\n", status); + ok(size == sizeof(DWORD), "size = %d\n", size); + } + + size = sizeof(DWORD); + hres = IWinInetHttpInfo_QueryOption(http_info, INTERNET_OPTION_HANDLE_TYPE, &status, &size); + if(test_protocol == FTP_TEST) { + if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) + ok(hres == E_FAIL, "hres = %x\n", hres); + else + ok(hres == S_OK, "hres = %x\n", hres); + + if(hres == S_OK) + ok(status == INTERNET_HANDLE_TYPE_FTP_FILE, "status = %d\n", status); + } else { + ok(hres == S_OK, "hres = %x\n", hres); + ok(status == INTERNET_HANDLE_TYPE_HTTP_REQUEST, "status = %d\n", status); + } +} + static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); @@ -1658,9 +1703,10 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u HRESULT hres; hres = IBinding_QueryInterface(current_binding, &IID_IWinInetHttpInfo, (void**)&http_info); - if(!emulate_protocol && test_protocol != FILE_TEST && is_urlmon_protocol(test_protocol)) + if(!emulate_protocol && test_protocol != FILE_TEST && is_urlmon_protocol(test_protocol)) { ok(hres == S_OK, "Could not get IWinInetHttpInfo iface: %08x\n", hres); - else + test_WinInetHttpInfo(http_info, ulStatusCode); + } else ok(hres == E_NOINTERFACE, "QueryInterface(IID_IWinInetHttpInfo) returned: %08x, expected E_NOINTERFACE\n", hres); if(SUCCEEDED(hres))

1 0

Vincent Povirk : gdiplus: Add test for GdipDrawDriverString.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 204253b6babd179759a494d17fcb8af857ee5f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=204253b6babd179759a494d17… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 28 16:40:19 2011 -0500 gdiplus: Add test for GdipDrawDriverString. --- dlls/gdiplus/tests/graphics.c | 32 ++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 9 +++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index bd14ab6..d42b37a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1954,6 +1954,8 @@ static void test_GdipDrawString(void) LOGFONTA logfont; HDC hdc = GetDC( hwnd ); static const WCHAR string[] = {'T','e','s','t',0}; + static const PointF positions[4] = {{0,0}, {1,1}, {2,2}, {3,3}}; + GpMatrix *matrix; memset(&logfont,0,sizeof(logfont)); strcpy(logfont.lfFaceName,"Arial"); @@ -1985,6 +1987,36 @@ static void test_GdipDrawString(void) status = GdipDrawString(graphics, string, 4, fnt, &rect, format, brush); expect(Ok, status); + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + +todo_wine { + status = GdipDrawDriverString(NULL, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, NULL, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, string, 4, NULL, brush, positions, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, NULL, positions, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, brush, NULL, DriverStringOptionsCmapLookup, matrix); + expect(InvalidParameter, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup|0x10, matrix); + expect(Ok, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, NULL); + expect(Ok, status); + + status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix); + expect(Ok, status); +} + + GdipDeleteMatrix(matrix); GdipDeleteGraphics(graphics); GdipDeleteBrush(brush); GdipDeleteFont(fnt); diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index dc03b29..69c8154 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -42,6 +42,14 @@ enum BrushType BrushTypeLinearGradient = 4 }; +enum DriverStringOptions +{ + DriverStringOptionsCmapLookup = 1, + DriverStringOptionsVertical = 2, + DriverStringOptionsRealizedAdvance = 4, + DriverStringOptionsLimitSubpixel = 4 +}; + enum FillMode { FillModeAlternate = 0, @@ -707,6 +715,7 @@ enum EmfPlusRecordType { typedef enum Unit Unit; typedef enum BrushType BrushType; +typedef enum DriverStringOptions DriverStringOptions; typedef enum FillMode FillMode; typedef enum LineCap LineCap; typedef enum PathPointType PathPointType;

1 0

Dmitry Timoshkov : user32: Add the SW_SHOWDEFAULT case to WINPOS_MinMaximize().
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 5fea02e8c2c83003f9b5278b8ba0dd48c9530449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fea02e8c2c83003f9b5278b8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 29 15:00:39 2011 +0900 user32: Add the SW_SHOWDEFAULT case to WINPOS_MinMaximize(). --- dlls/user32/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 03c16c9..a8324e8 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -955,6 +955,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) /* fall through */ case SW_SHOWNORMAL: case SW_RESTORE: + case SW_SHOWDEFAULT: /* FIXME: should have its own handler */ old_style = WIN_SetStyle( hwnd, 0, WS_MINIMIZE | WS_MAXIMIZE ); if (old_style & WS_MINIMIZE) {

1 0

Bart Van Assche : ntdll: Fix race condition in RtlCreateHeap().
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: c0913ed064f86d9cc2ddf6efc7f6f6a9db446934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0913ed064f86d9cc2ddf6efc… Author: Bart Van Assche <bvanassche(a)acm.org> Date: Mon Feb 28 11:39:57 2011 +0100 ntdll: Fix race condition in RtlCreateHeap(). --- dlls/ntdll/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index df94410..2e945e9 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1538,6 +1538,8 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c if (!(subheap = HEAP_CreateSubHeap( NULL, addr, flags, commitSize, totalSize ))) return 0; + heap_set_debug_flags( subheap->heap ); + /* link it into the per-process heap list */ if (processHeap) { @@ -1552,7 +1554,6 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c list_init( &processHeap->entry ); } - heap_set_debug_flags( subheap->heap ); return subheap->heap; }

1 0

Piotr Caban : urlmon: Added IWinInetHttpInfo_{QueryOption, QueryInfo} implementation.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 1041f61e68f34fc632ceeb2a2966b4e667a38db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1041f61e68f34fc632ceeb2a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:38:16 2011 +0200 urlmon: Added IWinInetHttpInfo_{QueryOption,QueryInfo} implementation. --- dlls/urlmon/ftp.c | 20 ++++++++++++++++---- dlls/urlmon/http.c | 23 +++++++++++++++++++---- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index c9d43b8..04cf49c 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -384,16 +384,28 @@ static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOpti void *pBuffer, DWORD *pcbBuffer) { FtpProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + + if(!This->base.request) + return E_FAIL; + + if(!InternetQueryOptionW(This->base.request, dwOption, pBuffer, pcbBuffer)) + return S_FALSE; + return S_OK; } static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) { FtpProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + + if(!This->base.request) + return E_FAIL; + + if(!HttpQueryInfoW(This->base.request, dwOption, pBuffer, pcbBuffer, pdwFlags)) + return S_FALSE; + return S_OK; } static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 23f6e69..846c790 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -836,16 +836,31 @@ static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOpti void *pBuffer, DWORD *pcbBuffer) { HttpProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + + if(!This->base.request) + return E_FAIL; + + if(!InternetQueryOptionW(This->base.request, dwOption, pBuffer, pcbBuffer)) + return S_FALSE; + return S_OK; } static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) { HttpProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); - return E_NOTIMPL; + TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + + if(!This->base.request) + return E_FAIL; + + if(!HttpQueryInfoW(This->base.request, dwOption, pBuffer, pcbBuffer, pdwFlags)) { + if(pBuffer) + memset(pBuffer, 0, *pcbBuffer); + return S_OK; + } + return S_OK; } static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = {

1 0

Vincent Povirk : gdiplus: Add test for GdipSetTextRenderingHint and make it pass.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: b3dfe973adaf1a9cbe92f53838fa468c45d6d0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3dfe973adaf1a9cbe92f5383… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 28 17:38:38 2011 -0500 gdiplus: Add test for GdipSetTextRenderingHint and make it pass. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 49 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index eb74021..163aaac 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5023,7 +5023,7 @@ GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics *graphics, { TRACE("(%p, %d)\n", graphics, hint); - if(!graphics) + if(!graphics || hint > TextRenderingHintClearTypeGridFit) return InvalidParameter; if(graphics->busy) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d42b37a..3adf6c6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3113,6 +3113,54 @@ static void test_get_set_interpolation(void) ReleaseDC(hwnd, hdc); } +static void test_get_set_textrenderinghint(void) +{ + GpGraphics *graphics; + HDC hdc = GetDC( hwnd ); + GpStatus status; + TextRenderingHint hint; + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipGetTextRenderingHint(NULL, &hint); + expect(InvalidParameter, status); + + status = GdipGetTextRenderingHint(graphics, NULL); + expect(InvalidParameter, status); + + status = GdipSetTextRenderingHint(NULL, TextRenderingHintAntiAlias); + expect(InvalidParameter, status); + + /* out of range */ + status = GdipSetTextRenderingHint(graphics, TextRenderingHintClearTypeGridFit+1); + expect(InvalidParameter, status); + + status = GdipGetTextRenderingHint(graphics, &hint); + expect(Ok, status); + expect(TextRenderingHintSystemDefault, hint); + + status = GdipSetTextRenderingHint(graphics, TextRenderingHintSystemDefault); + expect(Ok, status); + + status = GdipGetTextRenderingHint(graphics, &hint); + expect(Ok, status); + expect(TextRenderingHintSystemDefault, hint); + + status = GdipSetTextRenderingHint(graphics, TextRenderingHintAntiAliasGridFit); + expect(Ok, status); + + status = GdipGetTextRenderingHint(graphics, &hint); + expect(Ok, status); + expect(TextRenderingHintAntiAliasGridFit, hint); + + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3172,6 +3220,7 @@ START_TEST(graphics) test_fromMemoryBitmap(); test_string_functions(); test_get_set_interpolation(); + test_get_set_textrenderinghint(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Piotr Caban : mshtml/tests: Added IWinInetHttpInfo interface.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 9b4ee3176e0ece3527b8c3f6a8c6cf65cc1c97cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4ee3176e0ece3527b8c3f6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 28 23:36:03 2011 +0200 mshtml/tests: Added IWinInetHttpInfo interface. --- dlls/mshtml/tests/htmldoc.c | 71 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d45eefb..2da187f 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -167,6 +167,7 @@ static BOOL set_clientsite, container_locked; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE; static BOOL inplace_deactivated, open_call; +static DWORD status_code = HTTP_STATUS_OK; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -981,13 +982,73 @@ static const IStreamVtbl StreamVtbl = { static IStream Stream = { &StreamVtbl }; -static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WinInetHttpInfo_QueryInterface( + IWinInetHttpInfo* This, + REFIID riid, + void **ppvObject) { - if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) - return E_NOINTERFACE; /* TODO */ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} - if(IsEqualGUID(&IID_IWinInetInfo, riid)) - return E_NOINTERFACE; /* TODO */ +static ULONG WINAPI WinInetHttpInfo_AddRef( + IWinInetHttpInfo* This) +{ + return 2; +} + +static ULONG WINAPI WinInetHttpInfo_Release( + IWinInetHttpInfo* This) +{ + return 1; +} + +static HRESULT WINAPI WinInetHttpInfo_QueryOption( + IWinInetHttpInfo* This, + DWORD dwOption, + LPVOID pBuffer, + DWORD *pcbBuf) +{ + return E_NOTIMPL; /* TODO */ +} + +static HRESULT WINAPI WinInetHttpInfo_QueryInfo( + IWinInetHttpInfo* This, + DWORD dwOption, + LPVOID pBuffer, + DWORD *pcbBuf, + DWORD *pdwFlags, + DWORD *pdwReserved) +{ + ok(pdwReserved == NULL, "pdwReserved != NULL\n"); + + if(dwOption == (HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER)) { + ok(pBuffer != NULL, "pBuffer == NULL\n"); + ok(*pcbBuf == sizeof(DWORD), "*pcbBuf = %d\n", *pcbBuf); + ok(pdwFlags == NULL, "*pdwFlags != NULL\n"); + *((DWORD*)pBuffer) = status_code; + return S_OK; + } + + return E_NOTIMPL; /* TODO */ +} + +static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { + WinInetHttpInfo_QueryInterface, + WinInetHttpInfo_AddRef, + WinInetHttpInfo_Release, + WinInetHttpInfo_QueryOption, + WinInetHttpInfo_QueryInfo +}; + +static IWinInetHttpInfo WinInetHttpInfo = { &WinInetHttpInfoVtbl }; + +static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IWinInetInfo, riid) || IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + *ppv = &WinInetHttpInfo; + return S_OK; + } ok(0, "unexpected call\n"); return E_NOINTERFACE;

1 0

Thomas Mullaly : urlmon: Removed str_last_of in favor of memrchrW.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 1b625bb1f817799928475d3e7407864dede5296b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b625bb1f817799928475d3e7… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun Mar 20 16:28:59 2011 -0400 urlmon: Removed str_last_of in favor of memrchrW. --- dlls/urlmon/uri.c | 27 ++++++--------------------- 1 files changed, 6 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0a92dad..fb51cc2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -597,21 +597,6 @@ static inline void pct_encode_val(WCHAR val, WCHAR *dest) { dest[2] = hexDigits[val & 0xf]; } -/* Scans the range of characters [str, end] and returns the last occurrence - * of 'ch' or returns NULL. - */ -static const WCHAR *str_last_of(const WCHAR *str, const WCHAR *end, WCHAR ch) { - const WCHAR *ptr = end; - - while(ptr >= str) { - if(*ptr == ch) - return ptr; - --ptr; - } - - return NULL; -} - /* Attempts to parse the domain name from the host. * * This function also includes the Top-level Domain (TLD) name @@ -636,12 +621,12 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, if(host_len < 4) return; - last_tld = str_last_of(host, end, '.'); + last_tld = memrchrW(host, '.', host_len); if(!last_tld) /* http://hostname -> has no domain name. */ return; - sec_last_tld = str_last_of(host, last_tld-1, '.'); + sec_last_tld = memrchrW(host, '.', last_tld-host); if(!sec_last_tld) { /* If the '.' is at the beginning of the host there * has to be at least 3 characters in the TLD for it @@ -692,7 +677,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, if(last_tld - (sec_last_tld+1) == 3) { for(i = 0; i < sizeof(recognized_tlds)/sizeof(recognized_tlds[0]); ++i) { if(!StrCmpNIW(sec_last_tld+1, recognized_tlds[i].tld_name, 3)) { - const WCHAR *domain = str_last_of(host, sec_last_tld-1, '.'); + const WCHAR *domain = memrchrW(host, '.', sec_last_tld-host); if(!domain) *domain_start = 0; @@ -710,7 +695,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, * part of the TLD. * Ex: www.google.fo.uk -> google.fo.uk as the domain name. */ - const WCHAR *domain = str_last_of(host, sec_last_tld-1, '.'); + const WCHAR *domain = memrchrW(host, '.', sec_last_tld-host); if(!domain) *domain_start = 0; @@ -5801,10 +5786,10 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len, /* Find the characters the will be copied over from * the base path. */ - end = str_last_of(base, base+(base_len-1), '/'); + end = memrchrW(base, '/', base_len); if(!end && data->scheme_type == URL_SCHEME_FILE) /* Try looking for a '\\'. */ - end = str_last_of(base, base+(base_len-1), '\\'); + end = memrchrW(base, '\\', base_len); } if(end) {

1 0