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

David Hedberg : shell32: Add IShellBrowser stub.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 1efc54088b9dcb924ecce63c4b6760f224391ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1efc54088b9dcb924ecce63c4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:45:58 2010 +0200 shell32: Add IShellBrowser stub. --- dlls/shell32/ebrowser.c | 204 +++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/ebrowser.c | 55 +++++++++++- 2 files changed, 258 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1efc54088b9dcb924ecce…

1 0

Jacek Caban : wscript.exe: Improved argument parsing.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: bfdfae1c7fadb61b5249984955ceb5d498f43aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfdfae1c7fadb61b524998495… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 14:57:37 2010 +0200 wscript.exe: Improved argument parsing. --- programs/wscript/Makefile.in | 2 +- programs/wscript/main.c | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index a45dddf..efb59ce 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wscript.exe APPMODE = -mwindows -municode -IMPORTS = uuid oleaut32 ole32 advapi32 +IMPORTS = uuid shell32 oleaut32 ole32 advapi32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS RC_SRCS = \ diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 612bb54..0ea7011 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -320,21 +320,38 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { + const WCHAR *ext, *filename = NULL; IActiveScriptParse *parser; IActiveScript *script; - const WCHAR *ext; + WCHAR **argv; CLSID clsid; + int argc, i; WINE_TRACE("(%p %p %s %x)\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); - if(!*cmdline) + argv = CommandLineToArgvW(cmdline, &argc); + if(!argv) return 1; - ext = strchrW(cmdline, '.'); + for(i=0; i<argc; i++) { + if(*argv[i] == '/' || *argv[i] == '-') { + WINE_FIXME("Unsupported argument %s\n", wine_dbgstr_w(argv[i])); + }else { + filename = argv[i]; + break; + } + } + + if(!filename) { + WINE_FIXME("No file name specified\n"); + return 1; + } + + ext = strchrW(filename, '.'); if(!ext) - ext = cmdline; + ext = filename; if(!get_engine_clsid(ext, &clsid)) { - WINE_FIXME("Could not fine engine for %s\n", wine_dbgstr_w(ext)); + WINE_FIXME("Could not find engine for %s\n", wine_dbgstr_w(ext)); return 1; } @@ -347,7 +364,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm } if(init_engine(script, parser)) { - run_script(cmdline, script, parser); + run_script(filename, script, parser); IActiveScript_Close(script); ITypeInfo_Release(host_ti); }else {

1 0

Nikolay Sivov : comctl32/imagelist: Fail to create imagelist with zero or negative image dimensions.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: d84cad6a0664b756dc346ab2afc82142563d155e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84cad6a0664b756dc346ab2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 10:20:11 2010 +0400 comctl32/imagelist: Fail to create imagelist with zero or negative image dimensions. --- dlls/comctl32/imagelist.c | 2 ++ dlls/comctl32/tests/imagelist.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 6fee577..2218d99 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -694,6 +694,8 @@ ImageList_Create (INT cx, INT cy, UINT flags, TRACE("(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow); + if (cx <= 0 || cy <= 0) return NULL; + /* Create the IImageList interface for the image list */ if (FAILED(ImageListImpl_CreateInstance(NULL, &IID_IImageList, (void **)&himl))) return NULL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index d4699bc..26c7e12 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1754,7 +1754,6 @@ static void test_create(void) { HIMAGELIST himl; -todo_wine { /* list with zero or negative image dimensions */ himl = ImageList_Create(0, 0, ILC_COLOR16, 0, 3); ok(himl == NULL, "got %p\n", himl); @@ -1772,8 +1771,6 @@ todo_wine { ok(himl == NULL, "got %p\n", himl); } -} - START_TEST(imagelist) { ULONG_PTR ctx_cookie;

1 0

Henri Verbeet : wined3d: Do not release a reference we do not have in IWineD3DSurfaceImpl_Flip().
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 910d3022c3b1881d6b1355b446598d29bdf2bef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910d3022c3b1881d6b1355b44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 20 13:56:23 2010 +0200 wined3d: Do not release a reference we do not have in IWineD3DSurfaceImpl_Flip(). This fixes a regression introduced by 368e5eb87ae983e4ea2f66b3ca2f4154b36bbcda. --- dlls/wined3d/surface.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ea66033..dfa124d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2739,7 +2739,7 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) { static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD Flags) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DSwapChainImpl *swapchain = NULL; - HRESULT hr; + TRACE("(%p)->(%p,%x)\n", This, override, Flags); /* Flipping is only supported on RenderTargets and overlays*/ @@ -2791,10 +2791,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS } /* Flipping a OpenGL surface -> Use WineD3DDevice::Present */ - hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *)swapchain, + return IWineD3DSwapChain_Present((IWineD3DSwapChain *)swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); - IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - return hr; } /* Does a direct frame buffer -> texture copy. Stretching is done

1 0

Detlef Riekenberg : gdi32/enhmfdrv: Remove unneded if() before HeapFree.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 3bae9b725cc119ed40c68877b5e0c86ade2ac902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bae9b725cc119ed40c68877b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 20 14:33:37 2010 +0200 gdi32/enhmfdrv: Remove unneded if() before HeapFree. --- dlls/gdi32/enhmfdrv/init.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 7e1c9b8..279300d 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -285,10 +285,8 @@ HDC WINAPI CreateEnhMetaFileA( hReturnDC = CreateEnhMetaFileW(hdc, filenameW, rect, descriptionW); - if(filenameW) - HeapFree( GetProcessHeap(), 0, filenameW ); - if(descriptionW) - HeapFree( GetProcessHeap(), 0, descriptionW ); + HeapFree( GetProcessHeap(), 0, filenameW ); + HeapFree( GetProcessHeap(), 0, descriptionW ); return hReturnDC; }

1 0

David Hedberg : shell32: Add IExplorerBrowser interface stub.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: d66269696fa9311f460a8ec4d711037dae996834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66269696fa9311f460a8ec4d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:45:56 2010 +0200 shell32: Add IExplorerBrowser interface stub. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/ebrowser.c | 279 +++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/regsvr.c | 7 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + 5 files changed, 289 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d66269696fa9311f460a8…

1 0

Alexandre Julliard : winhttp: Make WinHttpQueryHeaders behave the same way for all query types.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 93208196c8e3609f16b7d4d0a8e1ae0afa700197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93208196c8e3609f16b7d4d0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 16:06:04 2010 +0200 winhttp: Make WinHttpQueryHeaders behave the same way for all query types. Based on a patch by Mikko Rasa. --- dlls/winhttp/request.c | 65 +++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7c1205c..f6fc577 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -602,12 +602,12 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID if (!(p = headers)) return FALSE; for (len = 0; *p; p++) if (*p != '\r') len++; - if ((len + 1) * sizeof(WCHAR) > *buflen || !buffer) + if (!buffer || (len + 1) * sizeof(WCHAR) > *buflen) { len++; set_last_error( ERROR_INSUFFICIENT_BUFFER ); } - else if (buffer) + else { for (p = headers, q = buffer; *p; p++, q++) { @@ -637,12 +637,12 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID if (!headers) return FALSE; len = strlenW( headers ) * sizeof(WCHAR); - if (len + sizeof(WCHAR) > *buflen || !buffer) + if (!buffer || len + sizeof(WCHAR) > *buflen) { len += sizeof(WCHAR); set_last_error( ERROR_INSUFFICIENT_BUFFER ); } - else if (buffer) + else { memcpy( buffer, headers, len + sizeof(WCHAR) ); TRACE("returning data: %s\n", debugstr_wn(buffer, len / sizeof(WCHAR))); @@ -653,43 +653,38 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID return ret; } case WINHTTP_QUERY_VERSION: - { - DWORD len = (strlenW( request->version ) + 1) * sizeof(WCHAR); - if (len > *buflen) + len = strlenW( request->version ) * sizeof(WCHAR); + if (!buffer || len + sizeof(WCHAR) > *buflen) { + len += sizeof(WCHAR); set_last_error( ERROR_INSUFFICIENT_BUFFER ); - *buflen = len; - return FALSE; } - else if (buffer) + else { strcpyW( buffer, request->version ); TRACE("returning string: %s\n", debugstr_w(buffer)); ret = TRUE; } - *buflen = len - sizeof(WCHAR); + *buflen = len; return ret; - } + case WINHTTP_QUERY_STATUS_TEXT: - { - DWORD len = (strlenW( request->status_text ) + 1) * sizeof(WCHAR); - if (len > *buflen) + len = strlenW( request->status_text ) * sizeof(WCHAR); + if (!buffer || len + sizeof(WCHAR) > *buflen) { + len += sizeof(WCHAR); set_last_error( ERROR_INSUFFICIENT_BUFFER ); - *buflen = len; - return FALSE; } - else if (buffer) + else { strcpyW( buffer, request->status_text ); TRACE("returning string: %s\n", debugstr_w(buffer)); ret = TRUE; } - *buflen = len - sizeof(WCHAR); + *buflen = len; return ret; - } + default: - { if (attr >= sizeof(attribute_table)/sizeof(attribute_table[0]) || !attribute_table[attr]) { FIXME("attribute %u not implemented\n", attr); @@ -697,7 +692,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID } TRACE("attribute %s\n", debugstr_w(attribute_table[attr])); header_index = get_header_index( request, attribute_table[attr], requested_index, request_only ); - } + break; } if (header_index >= 0) @@ -712,13 +707,13 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID if (index) *index += 1; if (level & WINHTTP_QUERY_FLAG_NUMBER) { - int *number = buffer; - if (sizeof(int) > *buflen) + if (!buffer || sizeof(int) > *buflen) { set_last_error( ERROR_INSUFFICIENT_BUFFER ); } - else if (number) + else { + int *number = buffer; *number = atoiW( header->value ); TRACE("returning number: %d\n", *number); ret = TRUE; @@ -728,11 +723,11 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID else if (level & WINHTTP_QUERY_FLAG_SYSTEMTIME) { SYSTEMTIME *st = buffer; - if (sizeof(SYSTEMTIME) > *buflen) + if (!buffer || sizeof(SYSTEMTIME) > *buflen) { set_last_error( ERROR_INSUFFICIENT_BUFFER ); } - else if (st && (ret = WinHttpTimeToSystemTime( header->value, st ))) + else if ((ret = WinHttpTimeToSystemTime( header->value, st ))) { TRACE("returning time: %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n", st->wYear, st->wMonth, st->wDay, st->wDayOfWeek, @@ -742,21 +737,19 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID } else if (header->value) { - WCHAR *string = buffer; - DWORD len = (strlenW( header->value ) + 1) * sizeof(WCHAR); - if (len > *buflen) + len = strlenW( header->value ) * sizeof(WCHAR); + if (!buffer || len + sizeof(WCHAR) > *buflen) { + len += sizeof(WCHAR); set_last_error( ERROR_INSUFFICIENT_BUFFER ); - *buflen = len; - return FALSE; } - else if (string) + else { - strcpyW( string, header->value ); - TRACE("returning string: %s\n", debugstr_w(string)); + strcpyW( buffer, header->value ); + TRACE("returning string: %s\n", debugstr_w(buffer)); ret = TRUE; } - *buflen = len - sizeof(WCHAR); + *buflen = len; } return ret; }

1 0

Nikolay Sivov : comctl32/imagelist: Fail in ImageList_GetIconSize on null parameters.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 66c9a73db55103fd83718838c99c866121c7c6a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c9a73db55103fd83718838c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 10:18:16 2010 +0400 comctl32/imagelist: Fail in ImageList_GetIconSize on null parameters. --- dlls/comctl32/imagelist.c | 8 +++----- dlls/comctl32/tab.c | 8 +++++--- dlls/comctl32/tests/imagelist.c | 8 +++----- dlls/comdlg32/fontdlg.c | 4 ++-- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index f0652e5..6fee577 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1726,15 +1726,13 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle) BOOL WINAPI ImageList_GetIconSize (HIMAGELIST himl, INT *cx, INT *cy) { - if (!is_valid(himl)) + if (!is_valid(himl) || !cx || !cy) return FALSE; if ((himl->cx <= 0) || (himl->cy <= 0)) return FALSE; - if (cx) - *cx = himl->cx; - if (cy) - *cy = himl->cy; + *cx = himl->cx; + *cy = himl->cy; return TRUE; } diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 7057531..8807a11 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1163,14 +1163,14 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) if (!(infoPtr->fHeightSet)) { int item_height; - int icon_height = 0; + INT icon_height = 0, cx; /* Use the current font to determine the height of a tab. */ GetTextMetricsW(hdc, &fontMetrics); /* Get the icon height */ if (infoPtr->himl) - ImageList_GetIconSize(infoPtr->himl, 0, &icon_height); + ImageList_GetIconSize(infoPtr->himl, &cx, &icon_height); /* Take the highest between font or icon */ if (fontMetrics.tmHeight > icon_height) @@ -1195,7 +1195,9 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) /* Get the icon width */ if (infoPtr->himl) { - ImageList_GetIconSize(infoPtr->himl, &icon_width, 0); + INT cy; + + ImageList_GetIconSize(infoPtr->himl, &icon_width, &cy); if (infoPtr->dwStyle & TCS_FIXEDWIDTH) icon_width += 4; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b6b509c..d4699bc 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1734,21 +1734,19 @@ static void test_iconsize(void) himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); /* null pointers, not zero imagelist dimensions */ ret = ImageList_GetIconSize(himl, NULL, NULL); - todo_wine ok(!ret, "got %d\n", ret); + ok(!ret, "got %d\n", ret); /* doesn't touch return pointers */ cx = 0xdeadbeef; ret = ImageList_GetIconSize(himl, &cx, NULL); -todo_wine { ok(!ret, "got %d\n", ret); ok(cx == 0xdeadbeef, "got %d\n", cx); -} + cy = 0xdeadbeef; ret = ImageList_GetIconSize(himl, NULL, &cy); -todo_wine { ok(!ret, "got %d\n", ret); ok(cy == 0xdeadbeef, "got %d\n", cy); -} + ImageList_Destroy(himl); } diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 6d3ee73..83400fc 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -772,12 +772,12 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) HFONT hfontprev; TEXTMETRICW tm; LPMEASUREITEMSTRUCT lpmi=(LPMEASUREITEMSTRUCT)lParam; - INT height = 0; + INT height = 0, cx; if (!himlTT) himlTT = ImageList_LoadImageW( COMDLG32_hInstance, MAKEINTRESOURCEW(38), TTBITMAP_XSIZE, 0, CLR_DEFAULT, IMAGE_BITMAP, 0); - ImageList_GetIconSize( himlTT, 0, &height); + ImageList_GetIconSize( himlTT, &cx, &height); lpmi->itemHeight = height + 2; /* use MAX of bitmap height and tm.tmHeight .*/ hdc=GetDC(hDlg);

1 0

David Hedberg : shell32: Implement IExplorerBrowser::SetRect.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: bee7d4b7e34892131b95d2ca8ef6e22057ed28b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee7d4b7e34892131b95d2ca8… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:46:00 2010 +0200 shell32: Implement IExplorerBrowser::SetRect. --- dlls/shell32/ebrowser.c | 16 ++++++++- dlls/shell32/tests/ebrowser.c | 72 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 9f9308e..b2c4497 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -191,9 +191,21 @@ static HRESULT WINAPI IExplorerBrowser_fnSetRect(IExplorerBrowser *iface, HDWP *phdwp, RECT rcBrowser) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; - FIXME("stub, %p (%p, %s)\n", This, phdwp, wine_dbgstr_rect(&rcBrowser)); + TRACE("%p (%p, %s)\n", This, phdwp, wine_dbgstr_rect(&rcBrowser)); - return E_NOTIMPL; + if(phdwp) + { + *phdwp = DeferWindowPos(*phdwp, This->hwnd_main, NULL, rcBrowser.left, rcBrowser.top, + rcBrowser.right - rcBrowser.left, rcBrowser.bottom - rcBrowser.top, + SWP_NOZORDER | SWP_NOACTIVATE); + } + else + { + MoveWindow(This->hwnd_main, rcBrowser.left, rcBrowser.top, + rcBrowser.right - rcBrowser.left, rcBrowser.bottom - rcBrowser.top, TRUE); + } + + return S_OK; } static HRESULT WINAPI IExplorerBrowser_fnSetPropertyBag(IExplorerBrowser *iface, diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index e3f4e9c..be993dd 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -37,6 +37,13 @@ static HRESULT ebrowser_instantiate(IExplorerBrowser **peb) &IID_IExplorerBrowser, (void**)peb); } +static HRESULT ebrowser_initialize(IExplorerBrowser *peb) +{ + RECT rc; + rc.top = rc.left = 0; rc.bottom = rc.right = 500; + return IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); +} + static void test_QueryInterface(void) { IExplorerBrowser *peb; @@ -265,6 +272,70 @@ static void test_initialization(void) ok(lres == 0, "Got refcount %d\n", lres); } +static void test_basics(void) +{ + IExplorerBrowser *peb; + IShellBrowser *psb; + ULONG lres; + HDWP hdwp; + RECT rc; + HRESULT hr; + + ebrowser_instantiate(&peb); + ebrowser_initialize(peb); + + /* SetRect */ + rc.left = 0; rc.top = 0; rc.right = 0; rc.bottom = 0; + hr = IExplorerBrowser_SetRect(peb, NULL, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + rc.left = 100; rc.top = 100; rc.right = 10; rc.bottom = 10; + hr = IExplorerBrowser_SetRect(peb, NULL, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + /* SetRect with DeferWindowPos */ + rc.left = rc.top = 0; rc.right = rc.bottom = 10; + hdwp = BeginDeferWindowPos(1); + hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + lres = EndDeferWindowPos(hdwp); + ok(lres, "EndDeferWindowPos failed.\n"); + + hdwp = NULL; + hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(hdwp == NULL, "got %p\n", hdwp); + lres = EndDeferWindowPos(hdwp); + ok(!lres, "EndDeferWindowPos succeeded unexpectedly.\n"); + + /* Test positioning */ + rc.left = 10; rc.top = 20; rc.right = 50; rc.bottom = 50; + hr = IExplorerBrowser_SetRect(peb, NULL, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + hr = IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + HWND eb_hwnd; + RECT eb_rc; + static const RECT exp_rc = {11, 21, 49, 49}; + + hr = IShellBrowser_GetWindow(psb, &eb_hwnd); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + GetClientRect(eb_hwnd, &eb_rc); + MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); + ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", + eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + + IShellBrowser_Release(psb); + } + + IExplorerBrowser_Destroy(peb); + lres = IExplorerBrowser_Release(peb); + ok(lres == 0, "Got %d\n", lres); +} + static BOOL test_instantiate_control(void) { IExplorerBrowser *peb; @@ -310,6 +381,7 @@ START_TEST(ebrowser) test_QueryInterface(); test_SB_misc(); test_initialization(); + test_basics(); DestroyWindow(hwnd); OleUninitialize();

1 0

Rico Schüller : d3dcompiler: Add D3DCreateBlob() test.
by Alexandre Julliard Aug. 20, 2010

Aug. 20, 2010

Module: wine Branch: master Commit: 5ad7f7b9d3d31a11ba7acbd3be837027e674125e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad7f7b9d3d31a11ba7acbd3b… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 19 21:33:43 2010 +0200 d3dcompiler: Add D3DCreateBlob() test. --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_43/tests/Makefile.in | 11 ++++++ dlls/d3dcompiler_43/tests/blob.c | 58 +++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 1dbeee8..648a9d4 100755 --- a/configure +++ b/configure @@ -14464,6 +14464,7 @@ wine_fn_config_dll d3dcompiler_40 enable_d3dcompiler_40 wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 d3dcompiler +wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test wine_fn_config_dll d3dim enable_d3dim d3dim wine_fn_config_dll d3drm enable_d3drm d3drm wine_fn_config_test dlls/d3drm/tests d3drm_test diff --git a/configure.ac b/configure.ac index d888063..5b8a199 100644 --- a/configure.ac +++ b/configure.ac @@ -2303,6 +2303,7 @@ WINE_CONFIG_DLL(d3dcompiler_40) WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) +WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) WINE_CONFIG_DLL(d3dim,,[d3dim]) WINE_CONFIG_DLL(d3drm,,[d3drm]) WINE_CONFIG_TEST(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in new file mode 100644 index 0000000..11345c5 --- /dev/null +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -0,0 +1,11 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = d3dcompiler_43.dll +IMPORTS = d3dcompiler + +C_SRCS = \ + blob.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c new file mode 100644 index 0000000..a9eee7f --- /dev/null +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -0,0 +1,58 @@ +/* + * Copyright 2010 Rico Schüller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * Nearly all compiler functions need the shader blob and the size. The size + * is always located at DWORD #6 in the shader blob (blob[6]). + * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect + */ + +#define COBJMACROS +#include "d3dcompiler.h" +#include "wine/test.h" + +/* + * This doesn't belong here, but for some functions it is possible to return that value, + * see http://msdn.microsoft.com/en-us/library/bb205278%28v=VS.85%29.aspx + * The original definition is in D3DX10core.h. + */ +#define D3DERR_INVALIDCALL 0x8876086c + +static void test_create_blob(void) +{ + ID3D10Blob *blob; + HRESULT hr; + ULONG refcount; + + hr = D3DCreateBlob(1, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + + hr = D3DCreateBlob(0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DCreateBlob failed with %x\n", hr); + + hr = D3DCreateBlob(0, &blob); + ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + + refcount = blob->lpVtbl->Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); +} + +START_TEST(blob) +{ + test_create_blob(); +}

1 0