wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Piotr Caban : comctl32: Don' t invalidate item in LISTVIEW_SetItemT when its state has not changed.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: c47c62a802e28053cc3bf61f8114e49ab983d431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c47c62a802e28053cc3bf61f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 21 13:49:59 2011 +0200 comctl32: Don't invalidate item in LISTVIEW_SetItemT when its state has not changed. --- dlls/comctl32/listview.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8eec25b..eb94d1d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4401,14 +4401,15 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, LVITEMW *lpLVItem, BOOL is HWND hwndSelf = infoPtr->hwndSelf; LPWSTR pszText = NULL; BOOL bResult, bChanged = FALSE; + RECT oldItemArea; TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iItem >= infoPtr->nItemCount) return FALSE; - /* Invalidate old item area */ - LISTVIEW_InvalidateItem(infoPtr, lpLVItem->iItem); + /* Store old item area */ + LISTVIEW_GetItemBox(infoPtr, lpLVItem->iItem, &oldItemArea); /* For efficiency, we transform the lpLVItem->pszText to Unicode here */ if ((lpLVItem->mask & LVIF_TEXT) && is_text(lpLVItem->pszText)) @@ -4436,7 +4437,10 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, LVITEMW *lpLVItem, BOOL is lpLVItem->iSubItem > 0 && lpLVItem->iSubItem <= DPA_GetPtrCount(infoPtr->hdpaColumns) ) LISTVIEW_InvalidateSubItem(infoPtr, lpLVItem->iItem, lpLVItem->iSubItem); else + { + LISTVIEW_InvalidateRect(infoPtr, &oldItemArea); LISTVIEW_InvalidateItem(infoPtr, lpLVItem->iItem); + } } /* restore text */ if (pszText)

1 0

Alistair Leslie-Hughes : ntdsapi: Add stub for DsGetSpnA.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 315599c6506caf56c90a9312d1c619cdde5aca4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=315599c6506caf56c90a9312d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 12 22:49:52 2011 +1000 ntdsapi: Add stub for DsGetSpnA. --- dlls/ntdsapi/ntdsapi.c | 15 +++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 2 +- include/ntdsapi.h | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 01acda0..76565fb 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -150,3 +150,18 @@ DWORD WINAPI DsMakeSpnA(LPCSTR svc_class, LPCSTR svc_name, return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * DsMakeSpnA (NTDSAPI.@) + */ +DWORD WINAPI DsGetSpnA(DS_SPN_NAME_TYPE ServType, LPCSTR Servlass, LPCSTR ServName, + USHORT InstPort, USHORT nInstanceNames, + LPCSTR *pInstanceNames, const USHORT *pInstancePorts, + DWORD *pSpn, LPSTR **pszSpn) +{ + FIXME("(%d,%s,%s,%d,%d,%p,%p,%p,%p): stub!\n", ServType, + debugstr_a(Servlass), debugstr_a(ServName), InstPort, + nInstanceNames, pInstanceNames, pInstancePorts, pSpn, pszSpn); + + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index a9607ca..8a4758a 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -29,7 +29,7 @@ @ stub DsGetDomainControllerInfoA @ stub DsGetDomainControllerInfoW @ stub DsGetRdnW -@ stub DsGetSpnA +@ stdcall DsGetSpnA(long str str long long ptr ptr ptr ptr) @ stub DsGetSpnW @ stub DsInheritSecurityIdentityA @ stub DsInheritSecurityIdentityW diff --git a/include/ntdsapi.h b/include/ntdsapi.h index 23f1493..9fecdab 100644 --- a/include/ntdsapi.h +++ b/include/ntdsapi.h @@ -29,6 +29,16 @@ DWORD WINAPI DsMakeSpnA(LPCSTR, LPCSTR, LPCSTR, USHORT, LPCSTR, DWORD*, LPSTR); DWORD WINAPI DsMakeSpnW(LPCWSTR, LPCWSTR, LPCWSTR, USHORT, LPCWSTR, DWORD*, LPWSTR); #define DsMakeSpn WINELIB_NAME_AW(DsMakeSpn) +typedef enum +{ + DS_SPN_DNS_HOST = 0, + DS_SPN_DN_HOST = 1, + DS_SPN_NB_HOST = 2, + DS_SPN_DOMAIN = 3, + DS_SPN_NB_DOMAIN = 4, + DS_SPN_SERVICE = 5 +} DS_SPN_NAME_TYPE; + #ifdef __cplusplus } #endif

1 0

Jacek Caban : mshtml: Added IHTMLStyle::pageBreakBefore implementation.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 904f4ac8437f3c9cea93c69d560e0da9d0df4014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=904f4ac8437f3c9cea93c69d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 12:26:37 2011 +0200 mshtml: Added IHTMLStyle::pageBreakBefore implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2aab2c1..5c6157b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -145,6 +145,8 @@ static const WCHAR attrPaddingTop[] = {'p','a','d','d','i','n','g','-','t','o','p',0}; static const WCHAR attrPageBreakAfter[] = {'p','a','g','e','-','b','r','e','a','k','-','a','f','t','e','r',0}; +static const WCHAR attrPageBreakBefore[] = + {'p','a','g','e','-','b','r','e','a','k','-','b','e','f','o','r','e',0}; static const WCHAR attrPosition[] = {'p','o','s','i','t','i','o','n',0}; static const WCHAR attrRight[] = @@ -229,6 +231,7 @@ static const struct{ {attrPaddingRight, DISPID_IHTMLSTYLE_PADDINGRIGHT}, {attrPaddingTop, DISPID_IHTMLSTYLE_PADDINGTOP}, {attrPageBreakAfter, DISPID_IHTMLSTYLE_PAGEBREAKAFTER}, + {attrPageBreakBefore, DISPID_IHTMLSTYLE_PAGEBREAKBEFORE}, {attrPosition, DISPID_IHTMLSTYLE2_POSITION}, {attrRight, DISPID_IHTMLSTYLE2_RIGHT}, {attrTextAlign, DISPID_IHTMLSTYLE_TEXTALIGN}, @@ -2348,15 +2351,19 @@ static HRESULT WINAPI HTMLStyle_get_overflow(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_pageBreakBefore(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_PAGE_BREAK_BEFORE, v, 0); } static HRESULT WINAPI HTMLStyle_get_pageBreakBefore(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_PAGE_BREAK_BEFORE, p, 0); } static HRESULT WINAPI HTMLStyle_put_pageBreakAfter(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 6eae659..b4d9662 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -86,6 +86,7 @@ typedef enum { STYLEID_PADDING_RIGHT, STYLEID_PADDING_TOP, STYLEID_PAGE_BREAK_AFTER, + STYLEID_PAGE_BREAK_BEFORE, STYLEID_POSITION, STYLEID_RIGHT, STYLEID_TEXT_ALIGN, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index c15882a..e9061a2 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1653,6 +1653,21 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "always"), "pageBreakAfter = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + /* pageBreakBefore */ + hres = IHTMLStyle_get_pageBreakBefore(style, &str); + ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres); + ok(!str, "pageBreakBefore = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("always"); + hres = IHTMLStyle_put_pageBreakBefore(style, str); + ok(hres == S_OK, "put_pageBreakBefore failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_pageBreakBefore(style, &str); + ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres); + ok(!strcmp_wa(str, "always"), "pageBreakBefore = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Alexandre Julliard : gdi32: Get rid of the StretchDIBits-based fallback for StretchBlt.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: faa1f7371e250b330cdbd84ddf6e7549e0b637ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa1f7371e250b330cdbd84dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 17:59:31 2011 +0200 gdi32: Get rid of the StretchDIBits-based fallback for StretchBlt. --- dlls/gdi32/bitblt.c | 37 ------------------------------------- 1 files changed, 0 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a1dcc7a..550d9b4 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -168,44 +168,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; DWORD err; struct gdi_image_bits bits; - BITMAP bm; - HBITMAP hbm; LPVOID ptr; - INT lines; - - /* make sure we have a real implementation for StretchDIBits */ - if (GET_DC_PHYSDEV( dc_dst, pStretchDIBits ) == dst_dev) goto try_get_image; - - if (GetObjectType( src_dev->hdc ) != OBJ_MEMDC) return FALSE; - if (!GetObjectW( GetCurrentObject( src_dev->hdc, OBJ_BITMAP ), sizeof(bm), &bm )) return FALSE; - - src_info->bmiHeader.biSize = sizeof(src_info->bmiHeader); - src_info->bmiHeader.biWidth = bm.bmWidth; - src_info->bmiHeader.biHeight = bm.bmHeight; - src_info->bmiHeader.biPlanes = 1; - src_info->bmiHeader.biBitCount = 32; - src_info->bmiHeader.biCompression = BI_RGB; - src_info->bmiHeader.biSizeImage = 0; - src_info->bmiHeader.biXPelsPerMeter = 0; - src_info->bmiHeader.biYPelsPerMeter = 0; - src_info->bmiHeader.biClrUsed = 0; - src_info->bmiHeader.biClrImportant = 0; - - if (!(ptr = HeapAlloc(GetProcessHeap(), 0, bm.bmHeight * bm.bmWidth * 4))) - return FALSE; - - /* Select out the src bitmap before calling GetDIBits */ - hbm = SelectObject( src_dev->hdc, GetStockObject(DEFAULT_BITMAP) ); - lines = GetDIBits( src_dev->hdc, hbm, 0, bm.bmHeight, ptr, src_info, DIB_RGB_COLORS ); - SelectObject( src_dev->hdc, hbm ); - - if (lines) lines = StretchDIBits( dst_dev->hdc, dst->log_x, dst->log_y, dst->log_width, dst->log_height, - src->x, bm.bmHeight - src->height - src->y, src->width, src->height, - ptr, src_info, DIB_RGB_COLORS, rop ); - HeapFree( GetProcessHeap(), 0, ptr ); - return (lines == src->height); - -try_get_image: if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage );

1 0

Alexandre Julliard : wineps: Implement the PutImage entry point.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 209578aeab623e43e2791fc7d87b47929bc12a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=209578aeab623e43e2791fc7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 16:04:28 2011 +0200 wineps: Implement the PutImage entry point. --- dlls/wineps.drv/bitmap.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/psdrv.h | 2 + 3 files changed, 119 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index cb4ea30..cac4841 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -177,6 +177,11 @@ static inline DWORD max_ascii85_size(DWORD size) return (size + 3) / 4 * 5; } +static void free_heap_bits( struct gdi_image_bits *bits ) +{ + HeapFree( GetProcessHeap(), 0, bits->ptr ); +} + /*************************************************************************** * PSDRV_WriteImageBits */ @@ -205,6 +210,117 @@ static void PSDRV_WriteImageBits( PHYSDEV dev, const BITMAPINFO *info, INT xDst, HeapFree(GetProcessHeap(), 0, ascii85); } +/*********************************************************************** + * PSDRV_PutImage + */ +DWORD PSDRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) +{ + int src_stride, dst_stride, size, x, y, width, height, bit_offset; + int dst_x, dst_y, dst_width, dst_height; + unsigned char *src_ptr, *dst_ptr; + struct gdi_image_bits dst_bits; + + if (hbitmap) return ERROR_NOT_SUPPORTED; + + if (info->bmiHeader.biPlanes != 1) goto update_format; + if (info->bmiHeader.biCompression != BI_RGB) goto update_format; + if (info->bmiHeader.biBitCount == 16 || info->bmiHeader.biBitCount == 32) goto update_format; + if (!bits) return ERROR_SUCCESS; /* just querying the format */ + + TRACE( "bpp %u %s -> %s\n", info->bmiHeader.biBitCount, wine_dbgstr_rect(&src->visrect), + wine_dbgstr_rect(&dst->visrect) ); + + width = src->visrect.right - src->visrect.left; + height = src->visrect.bottom - src->visrect.top; + src_stride = get_dib_width_bytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); + dst_stride = (width * info->bmiHeader.biBitCount + 7) / 8; + + src_ptr = bits->ptr; + if (info->bmiHeader.biHeight > 0) + src_ptr += (info->bmiHeader.biHeight - src->visrect.bottom) * src_stride; + else + src_ptr += src->visrect.top * src_stride; + bit_offset = src->visrect.left * info->bmiHeader.biBitCount; + src_ptr += bit_offset / 8; + bit_offset &= 7; + if (bit_offset) FIXME( "pos %s not supported\n", wine_dbgstr_rect(&src->visrect) ); + size = height * dst_stride; + + if (src_stride != dst_stride || (info->bmiHeader.biBitCount == 24 && !bits->is_copy)) + { + if (!(dst_bits.ptr = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_OUTOFMEMORY; + dst_bits.is_copy = TRUE; + dst_bits.free = free_heap_bits; + } + else + { + dst_bits.ptr = src_ptr; + dst_bits.is_copy = bits->is_copy; + dst_bits.free = NULL; + } + dst_ptr = dst_bits.ptr; + + switch (info->bmiHeader.biBitCount) + { + case 1: + case 4: + case 8: + if (src_stride != dst_stride) + for (y = 0; y < height; y++, src_ptr += src_stride, dst_ptr += dst_stride) + memcpy( dst_ptr, src_ptr, dst_stride ); + break; + case 24: + if (dst_ptr != src_ptr) + for (y = 0; y < height; y++, src_ptr += src_stride, dst_ptr += dst_stride) + for (x = 0; x < width; x++) + { + dst_ptr[x * 3] = src_ptr[x * 3 + 2]; + dst_ptr[x * 3 + 1] = src_ptr[x * 3 + 1]; + dst_ptr[x * 3 + 2] = src_ptr[x * 3]; + } + else /* swap R and B in place */ + for (y = 0; y < height; y++, src_ptr += src_stride, dst_ptr += dst_stride) + for (x = 0; x < width; x++) + { + unsigned char tmp = dst_ptr[x * 3]; + dst_ptr[x * 3] = dst_ptr[x * 3 + 2]; + dst_ptr[x * 3 + 2] = tmp; + } + break; + } + + dst_x = dst->visrect.left; + dst_y = dst->visrect.top, + dst_width = dst->visrect.right - dst->visrect.left; + dst_height = dst->visrect.bottom - dst->visrect.top; + if (src->width * dst->width < 0) + { + dst_x += dst_width; + dst_width = -dst_width; + } + if (src->height * dst->height < 0) + { + dst_y += dst_height; + dst_height = -dst_height; + } + + PSDRV_SetClip(dev); + PSDRV_WriteGSave(dev); + PSDRV_WriteImageBits( dev, info, dst_x, dst_y, dst_width, dst_height, + width, height, dst_bits.ptr, size ); + PSDRV_WriteGRestore(dev); + PSDRV_ResetClip(dev); + if (dst_bits.free) dst_bits.free( &dst_bits ); + return ERROR_SUCCESS; + +update_format: + info->bmiHeader.biPlanes = 1; + if (info->bmiHeader.biBitCount > 8) info->bmiHeader.biBitCount = 24; + info->bmiHeader.biCompression = BI_RGB; + return ERROR_BAD_FORMAT; +} + /*************************************************************************** * * PSDRV_StretchDIBits diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index a45cf86..e9b0a04 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -868,7 +868,7 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_Polygon, /* pPolygon */ PSDRV_Polyline, /* pPolyline */ NULL, /* pPolylineTo */ - NULL, /* pPutImage */ + PSDRV_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ PSDRV_Rectangle, /* pRectangle */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index d228023..5be855d 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -443,6 +443,8 @@ extern BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, extern BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; extern BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; +extern DWORD PSDRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wineps: Add a couple of helper functions to simplify the StretchDIBits implementation .
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 632391dbf42e67d296a405afb3958a7c4b99e066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632391dbf42e67d296a405afb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 14:36:10 2011 +0200 wineps: Add a couple of helper functions to simplify the StretchDIBits implementation. --- dlls/wineps.drv/bitmap.c | 146 +++++++++++++++------------------------------- dlls/wineps.drv/ps.c | 33 ++++++++-- dlls/wineps.drv/psdrv.h | 3 +- 3 files changed, 76 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=632391dbf42e67d296a40…

1 0

Hans Leidekker : winhttp: Add tests for IWinHttpRequest.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 116160f4efeeb2f75da87853973ba47deb1a337d URL: http://source.winehq.org/git/wine.git/?a=commit;h=116160f4efeeb2f75da878539… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:52:44 2011 +0200 winhttp: Add tests for IWinHttpRequest. --- dlls/winhttp/tests/Makefile.in | 2 +- dlls/winhttp/tests/winhttp.c | 164 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in index 840c3cf..01f5779 100644 --- a/dlls/winhttp/tests/Makefile.in +++ b/dlls/winhttp/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = winhttp.dll -IMPORTS = winhttp crypt32 advapi32 ws2_32 +IMPORTS = winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 C_SRCS = \ notification.c \ diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index def1367..8f2af5a 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <stdarg.h> #include <stdlib.h> #include <windef.h> @@ -26,6 +27,8 @@ #include <wincrypt.h> #include <winreg.h> #include <winsock.h> +#include "initguid.h" +#include <httprequest.h> #include "wine/test.h" @@ -2095,6 +2098,166 @@ static void test_credentials(void) WinHttpCloseHandle(ses); } +static void test_IWinHttpRequest(void) +{ + static const WCHAR url1W[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR url2W[] = {'w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR method1W[] = {'G','E','T',0}; + static const WCHAR method2W[] = {'I','N','V','A','L','I','D',0}; + HRESULT hr; + IWinHttpRequest *req; + BSTR method, url, response = NULL, status_text = NULL; + VARIANT async, empty, timeout; + VARIANT_BOOL succeeded; + LONG status; + + CoInitialize( NULL ); + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + VariantInit( &empty ); + V_VT( &empty ) = VT_ERROR; + + hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + method = SysAllocString( method1W ); + hr = IWinHttpRequest_Open( req, method, NULL, empty ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + url = SysAllocString( url1W ); + hr = IWinHttpRequest_Open( req, NULL, url, empty ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Open( req, method, url, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Release( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + VariantInit( &async ); + V_VT( &async ) = VT_BOOL; + V_BOOL( &async ) = VARIANT_FALSE; + + SysFreeString( url ); + url = SysAllocString( url2W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); + + SysFreeString( method ); + method = SysAllocString( method2W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); + + SysFreeString( method ); + method = SysAllocString( method1W ); + SysFreeString( url ); + url = SysAllocString( url1W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Release( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_get_StatusText( req, &status_text ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); + ok( hr == S_OK, "got %08x\n", hr ); + + SysFreeString( method ); + method = SysAllocString( method1W ); + SysFreeString( url ); + url = SysAllocString( url1W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_get_StatusText( req, &status_text ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + status = 0; + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == S_OK, "got %08x\n", hr ); + trace("%d\n", status); + + hr = IWinHttpRequest_get_StatusText( req, &status_text ); + ok( hr == S_OK, "got %08x\n", hr ); + trace("%s\n", wine_dbgstr_w(status_text)); + SysFreeString( status_text ); + + VariantInit( &timeout ); + V_VT( &timeout ) = VT_I4; + V_I4( &timeout ) = 10; + hr = IWinHttpRequest_WaitForResponse( req, timeout, &succeeded ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_StatusText( req, &status_text ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( status_text ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( response ); + + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Abort( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_Release( req ); + ok( hr == S_OK, "got %08x\n", hr ); + + SysFreeString( method ); + SysFreeString( url ); + CoUninitialize(); +} + START_TEST (winhttp) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -2116,6 +2279,7 @@ START_TEST (winhttp) test_Timeouts(); test_resolve_timeout(); test_credentials(); + test_IWinHttpRequest(); si.event = CreateEvent(NULL, 0, 0, NULL); si.port = 7532;

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::Abort.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: f4c2317adc44626cefab8d97ba4cc955f29a42a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c2317adc44626cefab8d97b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:52:30 2011 +0200 winhttp: Implement IWinHttpRequest::Abort. --- dlls/winhttp/request.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index cec3344..5d10410 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2770,8 +2770,28 @@ static HRESULT WINAPI winhttp_request_WaitForResponse( static HRESULT WINAPI winhttp_request_Abort( IWinHttpRequest *iface ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + + TRACE("%p\n", request); + + SetEvent( request->cancel ); + WinHttpCloseHandle( request->hrequest ); + WinHttpCloseHandle( request->hconnect ); + WinHttpCloseHandle( request->hsession ); + CloseHandle( request->wait ); + CloseHandle( request->cancel ); + heap_free( request->buffer ); + request->state = REQUEST_STATE_INVALID; + request->hrequest = NULL; + request->hconnect = NULL; + request->hsession = NULL; + request->wait = NULL; + request->cancel = NULL; + request->buffer = NULL; + request->ptr = NULL; + request->bytes_available = 0; + request->bytes_read = 0; + return S_OK; } static HRESULT WINAPI winhttp_request_SetTimeouts(

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::get_ResponseText.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 52d134b36405e1995e359f1872ed3bdd47375795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d134b36405e1995e359f187… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:52:18 2011 +0200 winhttp: Implement IWinHttpRequest::get_ResponseText. --- dlls/winhttp/request.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 859bd9d..cec3344 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2156,6 +2156,10 @@ struct winhttp_request HINTERNET hrequest; HANDLE wait; HANDLE cancel; + char *buffer; + char *ptr; + DWORD bytes_available; + DWORD bytes_read; LONG resolve_timeout; LONG connect_timeout; LONG send_timeout; @@ -2187,6 +2191,7 @@ static ULONG WINAPI winhttp_request_Release( WinHttpCloseHandle( request->hsession ); CloseHandle( request->wait ); CloseHandle( request->cancel ); + heap_free( request->buffer ); heap_free( request ); } return refs; @@ -2475,6 +2480,17 @@ static DWORD wait_for_completion( struct winhttp_request *request, DWORD timeout static void CALLBACK wait_status_callback( HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID buffer, DWORD size ) { struct winhttp_request *request = (struct winhttp_request *)context; + + switch (status) + { + case WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE: + request->bytes_available = *(DWORD *)buffer; + break; + case WINHTTP_CALLBACK_STATUS_READ_COMPLETE: + request->bytes_read = size; + break; + default: break; + } SetEvent( request->wait ); } @@ -2599,12 +2615,109 @@ static HRESULT WINAPI winhttp_request_get_StatusText( return S_OK; } +static DWORD request_read_body( struct winhttp_request *request, DWORD timeout ) +{ + DWORD err, size, total_bytes_read, buflen = 4096; + + if (request->state >= REQUEST_STATE_BODY_RECEIVED) return ERROR_SUCCESS; + if ((err = request_wait_for_response( request, timeout, NULL ))) return err; + + if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; + size = total_bytes_read = 0; + request->ptr = request->buffer; + do + { + wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE ); + if (!WinHttpQueryDataAvailable( request->hrequest, &request->bytes_available )) + { + err = GetLastError(); + goto error; + } + wait_for_completion( request, timeout ); + if (!request->bytes_available) break; + size += request->bytes_available; + if (buflen < size) + { + char *tmp; + while (buflen < size) buflen *= 2; + if (!(tmp = heap_realloc( request->buffer, buflen ))) + { + err = ERROR_OUTOFMEMORY; + goto error; + } + request->buffer = tmp; + } + wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_READ_COMPLETE ); + if (!WinHttpReadData( request->hrequest, request->ptr, request->bytes_available, &request->bytes_read )) + { + err = GetLastError(); + goto error; + } + wait_for_completion( request, timeout ); + total_bytes_read += request->bytes_read; + request->ptr += request->bytes_read; + } while (request->bytes_read); + + request->state = REQUEST_STATE_BODY_RECEIVED; + return ERROR_SUCCESS; + +error: + heap_free( request->buffer ); + request->buffer = NULL; + TRACE("error %u\n", err); + return err; +} + +static DWORD request_get_codepage( struct winhttp_request *request, UINT *codepage ) +{ + static const WCHAR utf8W[] = {'u','t','f','-','8',0}; + static const WCHAR charsetW[] = {'c','h','a','r','s','e','t',0}; + WCHAR *buffer, *p; + DWORD size; + + *codepage = CP_ACP; + if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CONTENT_TYPE, NULL, NULL, &size, NULL ) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if (!(buffer = heap_alloc( size ))) return ERROR_OUTOFMEMORY; + if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CONTENT_TYPE, NULL, buffer, &size, NULL )) + { + return GetLastError(); + } + if ((p = strstrW( buffer, charsetW ))) + { + p += strlenW( charsetW ); + while (*p == ' ') p++; + if (*p++ == '=') + { + while (*p == ' ') p++; + if (!strcmpiW( p, utf8W )) *codepage = CP_UTF8; + } + } + heap_free( buffer ); + } + return ERROR_SUCCESS; +} + static HRESULT WINAPI winhttp_request_get_ResponseText( IWinHttpRequest *iface, BSTR *body ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + UINT codepage; + DWORD err; + int len; + + TRACE("%p, %p\n", request, body); + + if ((err = request_read_body( request, INFINITE ))) return HRESULT_FROM_WIN32( err ); + if ((err = request_get_codepage( request, &codepage ))) return HRESULT_FROM_WIN32( err ); + + len = MultiByteToWideChar( codepage, 0, request->buffer, request->ptr - request->buffer, NULL, 0 ); + if (!(*body = SysAllocStringLen( NULL, len ))) return E_OUTOFMEMORY; + MultiByteToWideChar( codepage, 0, request->buffer, request->ptr - request->buffer, *body, len ); + (*body)[len] = 0; + return S_OK; } static HRESULT WINAPI winhttp_request_get_ResponseBody(

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::get_StatusText.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 39468db2d6ca7832290349c8f9e0b7bc9d8ebc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39468db2d6ca7832290349c8f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:52:00 2011 +0200 winhttp: Implement IWinHttpRequest::get_StatusText. --- dlls/winhttp/request.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 97fe255..859bd9d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2575,8 +2575,28 @@ static HRESULT WINAPI winhttp_request_get_StatusText( IWinHttpRequest *iface, BSTR *status ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD err, len = 0, index = 0; + + TRACE("%p, %p\n", request, status); + + if (request->state < REQUEST_STATE_SENT) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ); + } + if ((err = request_wait_for_response( request, INFINITE, NULL ))) return HRESULT_FROM_WIN32( err ); + + WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_STATUS_TEXT, NULL, NULL, &len, &index ); + err = GetLastError(); + if (err != ERROR_INSUFFICIENT_BUFFER) return HRESULT_FROM_WIN32( err ); + if (!(*status = SysAllocStringLen( NULL, len / sizeof(WCHAR) ))) return E_OUTOFMEMORY; + index = 0; + if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_STATUS_TEXT, NULL, *status, &len, &index )) + { + SysFreeString( *status ); + return HRESULT_FROM_WIN32( GetLastError() ); + } + return S_OK; } static HRESULT WINAPI winhttp_request_get_ResponseText(

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
84
Older →

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 July 2011