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

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

20 Aug '10

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

David Hedberg : shell32: Add IExplorerBrowser interface stub.
by Alexandre Julliard 20 Aug '10

20 Aug '10

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

David Hedberg : shell32/tests: Add initial tests for the IExplorerBrowser control.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 19979df9650bb56bc2b3003a0cc5c86a932adda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19979df9650bb56bc2b3003a0… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:45:57 2010 +0200 shell32/tests: Add initial tests for the IExplorerBrowser control. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/ebrowser.c | 108 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index f02b546..1d15fc0 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ appbar.c \ autocomplete.c \ brsfolder.c \ + ebrowser.c \ generated.c \ progman_dde.c \ shelllink.c \ diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c new file mode 100644 index 0000000..35c87bd --- /dev/null +++ b/dlls/shell32/tests/ebrowser.c @@ -0,0 +1,108 @@ +/* + * Unit tests for the Explorer Browser control + * + * Copyright 2010 David Hedberg + * + * 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 + */ + +#include <stdio.h> + +#define COBJMACROS + +#include "shlobj.h" + +#include "wine/test.h" + +/********************************************************************* + * Some simple helpers + */ +static HRESULT ebrowser_instantiate(IExplorerBrowser **peb) +{ + return CoCreateInstance(&CLSID_ExplorerBrowser, NULL, CLSCTX_INPROC_SERVER, + &IID_IExplorerBrowser, (void**)peb); +} + +static void test_QueryInterface(void) +{ + IExplorerBrowser *peb; + IUnknown *punk; + HRESULT hr; + LONG lres; + + hr = ebrowser_instantiate(&peb); + ok(hr == S_OK, "Got 0x%08x\n", hr); + +#define test_qinterface(iid, exp) \ + do { \ + hr = IExplorerBrowser_QueryInterface(peb, &iid, (void**)&punk); \ + ok(hr == exp, "(%s:)Expected (0x%08x), got (0x%08x)\n", \ + #iid, exp, hr); \ + if(SUCCEEDED(hr)) IUnknown_Release(punk); \ + } while(0) + + test_qinterface(IID_IUnknown, S_OK); + test_qinterface(IID_IExplorerBrowser, S_OK); + todo_wine test_qinterface(IID_IShellBrowser, S_OK); + todo_wine test_qinterface(IID_IOleWindow, S_OK); + todo_wine test_qinterface(IID_ICommDlgBrowser, S_OK); + todo_wine test_qinterface(IID_ICommDlgBrowser2, S_OK); + todo_wine test_qinterface(IID_ICommDlgBrowser3, S_OK); + todo_wine test_qinterface(IID_IServiceProvider, S_OK); + todo_wine test_qinterface(IID_IObjectWithSite, S_OK); + todo_wine test_qinterface(IID_IConnectionPointContainer, S_OK); + test_qinterface(IID_IOleObject, E_NOINTERFACE); + test_qinterface(IID_IViewObject, E_NOINTERFACE); + test_qinterface(IID_IViewObject2, E_NOINTERFACE); + test_qinterface(IID_IViewObjectEx, E_NOINTERFACE); + test_qinterface(IID_IConnectionPoint, E_NOINTERFACE); + test_qinterface(IID_IShellView, E_NOINTERFACE); + test_qinterface(IID_INameSpaceTreeControlEvents, E_NOINTERFACE); + +#undef test_qinterface + + lres = IExplorerBrowser_Release(peb); + ok(lres == 0, "Got %d\n", lres); +} + +static BOOL test_instantiate_control(void) +{ + IExplorerBrowser *peb; + HRESULT hr; + + hr = ebrowser_instantiate(&peb); + ok(hr == S_OK || hr == REGDB_E_CLASSNOTREG, "Got (0x%08x)\n", hr); + if(FAILED(hr)) + return FALSE; + + IExplorerBrowser_Release(peb); + return TRUE; +} + +START_TEST(ebrowser) +{ + OleInitialize(NULL); + + if(!test_instantiate_control()) + { + win_skip("No ExplorerBrowser control..\n"); + OleUninitialize(); + return; + } + + test_QueryInterface(); + + OleUninitialize(); +}

1 0

David Hedberg : shell32: Add IShellBrowser stub.
by Alexandre Julliard 20 Aug '10

20 Aug '10

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

David Hedberg : shell32: Implement IExplorerBrowser::Initialize.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: e4e62e707a8971576b5f3fdd388078c9dcf1471c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e62e707a8971576b5f3fdd3… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:45:59 2010 +0200 shell32: Implement IExplorerBrowser::Initialize. --- dlls/shell32/ebrowser.c | 77 ++++++++++++++++++++- dlls/shell32/tests/ebrowser.c | 155 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4e62e707a8971576b5f3…

1 0

David Hedberg : shell32: Implement IExplorerBrowser::SetRect.
by Alexandre Julliard 20 Aug '10

20 Aug '10

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

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

20 Aug '10

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

Jacek Caban : wscript.exe: Improved argument parsing.
by Alexandre Julliard 20 Aug '10

20 Aug '10

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

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

20 Aug '10

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

Detlef Riekenberg : ntdll/tests: Add tests for RtlIpv4AddressToString / RtlIpv4AddressToStringEx.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 0fa0d17d67aea5aaa3f0463f063305574667db77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa0d17d67aea5aaa3f0463f0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 20 05:50:19 2010 +0200 ntdll/tests: Add tests for RtlIpv4AddressToString / RtlIpv4AddressToStringEx. --- dlls/ntdll/tests/rtl.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 187 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 8a83feb..5059714 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include "ntdll_test.h" +#include "inaddr.h" #ifndef __WINE_WINTERNL_H @@ -45,6 +46,20 @@ typedef struct _RTL_HANDLE_TABLE #endif +/* avoid #include <winsock2.h> */ +#undef htons +#ifdef WORDS_BIGENDIAN +#define htons(s) ((USHORT)(s)) +#else /* WORDS_BIGENDIAN */ +static inline USHORT __my_ushort_swap(USHORT s) +{ + return (s >> 8) | (s << 8); +} +#define htons(s) __my_ushort_swap(s) +#endif /* WORDS_BIGENDIAN */ + + + /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; static SIZE_T (WINAPI *pRtlCompareMemory)(LPCVOID,LPCVOID,SIZE_T); @@ -70,9 +85,12 @@ static NTSTATUS (WINAPI *pRtlFreeSid)(PSID); static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); +static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,USHORT*,INT_PTR); +static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); +static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); + static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); -static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,USHORT*,INT_PTR); #define LEN 16 @@ -111,6 +129,8 @@ static void InitFunctionPtrs(void) pRtlGetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlGetThreadErrorMode"); pRtlSetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlSetThreadErrorMode"); pLdrProcessRelocationBlock = (void *)GetProcAddress(hntdll, "LdrProcessRelocationBlock"); + pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); + pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1129,6 +1149,170 @@ static void test_LdrProcessRelocationBlock(void) ok(addr16 == 0x565, "addr16 = %x, expected 0x565\n", addr16); } +static void test_RtlIpv4AddressToString(void) +{ + CHAR buffer[20]; + CHAR *res; + IN_ADDR ip; + DWORD len; + + if (!pRtlIpv4AddressToStringA) + { + win_skip("RtlIpv4AddressToStringA not available\n"); + return; + } + + ip.S_un.S_un_b.s_b1 = 1; + ip.S_un.S_un_b.s_b2 = 2; + ip.S_un.S_un_b.s_b3 = 3; + ip.S_un.S_un_b.s_b4 = 4; + + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringA(&ip, buffer); + len = strlen(buffer); + ok(res == (buffer + len), "got %p with '%s' (expected %p)\n", res, buffer, buffer + len); + + res = pRtlIpv4AddressToStringA(&ip, NULL); + ok( (res == (char *)~0) || + broken(res == (char *)0 + len), /* XP and w2003 */ + "got %p (expected ~0)\n", res); + + if (0) { + /* this crashes in windows */ + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringA(NULL, buffer); + trace("got %p with '%s'\n", res, buffer); + } + + if (0) { + /* this crashes in windows */ + res = pRtlIpv4AddressToStringA(NULL, NULL); + trace("got %p\n", res); + } +} + +static void test_RtlIpv4AddressToStringEx(void) +{ + CHAR ip_1234[] = "1.2.3.4"; + CHAR ip_1234_80[] = "1.2.3.4:80"; + LPSTR expect; + CHAR buffer[30]; + NTSTATUS res; + IN_ADDR ip; + ULONG size; + DWORD used; + USHORT port; + + if (!pRtlIpv4AddressToStringExA) + { + win_skip("RtlIpv4AddressToStringExA not available\n"); + return; + } + + ip.S_un.S_un_b.s_b1 = 1; + ip.S_un.S_un_b.s_b2 = 2; + ip.S_un.S_un_b.s_b3 = 3; + ip.S_un.S_un_b.s_b4 = 4; + + port = htons(80); + expect = ip_1234_80; + + size = sizeof(buffer); + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + used = strlen(buffer); + ok( (res == STATUS_SUCCESS) && + (size == strlen(expect) + 1) && !strcmp(buffer, expect), + "got 0x%x and size %d with '%s'\n", res, size, buffer); + + size = used + 1; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_SUCCESS) && + (size == strlen(expect) + 1) && !strcmp(buffer, expect), + "got 0x%x and size %d with '%s'\n", res, size, buffer); + + size = used; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), + "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + res, size, buffer, used + 1); + + size = used - 1; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), + "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + res, size, buffer, used + 1); + + + /* to get only the ip, use 0 as port */ + port = 0; + expect = ip_1234; + + size = sizeof(buffer); + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + used = strlen(buffer); + ok( (res == STATUS_SUCCESS) && + (size == strlen(expect) + 1) && !strcmp(buffer, expect), + "got 0x%x and size %d with '%s'\n", res, size, buffer); + + size = used + 1; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_SUCCESS) && + (size == strlen(expect) + 1) && !strcmp(buffer, expect), + "got 0x%x and size %d with '%s'\n", res, size, buffer); + + size = used; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), + "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + res, size, buffer, used + 1); + + size = used - 1; + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, port, buffer, &size); + ok( (res == STATUS_INVALID_PARAMETER) && (size == used + 1), + "got 0x%x and %d with '%s' (expected STATUS_INVALID_PARAMETER and %d)\n", + res, size, buffer, used + 1); + + + /* parameters are checked */ + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(&ip, 0, buffer, NULL); + ok(res == STATUS_INVALID_PARAMETER, + "got 0x%x with '%s' (expected STATUS_INVALID_PARAMETER)\n", res, buffer); + + size = sizeof(buffer); + res = pRtlIpv4AddressToStringExA(&ip, 0, NULL, &size); + ok( res == STATUS_INVALID_PARAMETER, + "got 0x%x and size %d (expected STATUS_INVALID_PARAMETER)\n", res, size); + + size = sizeof(buffer); + memset(buffer, '#', sizeof(buffer) - 1); + buffer[sizeof(buffer) -1] = 0; + res = pRtlIpv4AddressToStringExA(NULL, 0, buffer, &size); + ok( res == STATUS_INVALID_PARAMETER, + "got 0x%x and size %d with '%s' (expected STATUS_INVALID_PARAMETER)\n", + res, size, buffer); +} + + START_TEST(rtl) { InitFunctionPtrs(); @@ -1150,4 +1334,6 @@ START_TEST(rtl) test_RtlDeleteTimer(); test_RtlThreadErrorMode(); test_LdrProcessRelocationBlock(); + test_RtlIpv4AddressToString(); + test_RtlIpv4AddressToStringEx(); }

1 0