April 2007 - Wine-Commits - list.winehq.org

Rob Shearman : ole32: Check for COM not being initialised and an invalid window handle being input to RegisterDragDrop .
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: 2d8ae2cf8320df853070c31b6737db3789a4a411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8ae2cf8320df853070c31b6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 5 11:32:32 2007 +0100 ole32: Check for COM not being initialised and an invalid window handle being input to RegisterDragDrop. --- dlls/ole32/ole2.c | 11 ++++++++++- dlls/ole32/tests/dragdrop.c | 7 ------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 8b61ac6..c300f68 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -289,9 +289,18 @@ HRESULT WINAPI RegisterDragDrop( TRACE("(%p,%p)\n", hwnd, pDropTarget); + if (!COM_CurrentApt()) + { + ERR("COM not initialized\n"); + return CO_E_NOTINITIALIZED; + } + if (!pDropTarget) return E_INVALIDARG; - + + if (!IsWindow(hwnd)) + return DRAGDROP_E_INVALIDHWND; + /* * First, check if the window is already registered. */ diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 2193f0f..05d80d0 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -113,7 +113,6 @@ START_TEST(dragdrop) HRESULT hr; hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); - todo_wine ok(hr == CO_E_NOTINITIALIZED, "RegisterDragDrop without OLE initialized should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); OleInitialize(NULL); @@ -122,19 +121,14 @@ START_TEST(dragdrop) ok(hr == E_INVALIDARG, "RegisterDragDrop with NULL IDropTarget * should return E_INVALIDARG instead of 0x%08x\n", hr); hr = RegisterDragDrop(NULL, &DropTarget); - todo_wine ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); hr = RegisterDragDrop((HWND)0xdeadbeef, &DropTarget); - todo_wine ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with garbage hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); - todo_wine ok(droptarget_addref_called == 0, "DropTarget_AddRef shouldn't have been called\n"); hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); - todo_wine ok_ole_success(hr, "RegisterDragDrop"); - todo_wine ok(droptarget_addref_called == 1, "DropTarget_AddRef should have been called once, not %d times\n", droptarget_addref_called); hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); @@ -148,7 +142,6 @@ START_TEST(dragdrop) hr = RevokeDragDrop(GetDesktopWindow()); todo_wine ok_ole_success(hr, "RevokeDragDrop"); - todo_wine ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); hr = RevokeDragDrop(NULL);

1 0

Rob Shearman : ole32: Add tests for drag and drop functions.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: db4972f1fb2af57baaf435a701d627257dd07ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4972f1fb2af57baaf435a70… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 5 11:31:51 2007 +0100 ole32: Add tests for drag and drop functions. --- dlls/ole32/tests/Makefile.in | 1 + dlls/ole32/tests/dragdrop.c | 157 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in index ef01690..a0e811d 100644 --- a/dlls/ole32/tests/Makefile.in +++ b/dlls/ole32/tests/Makefile.in @@ -9,6 +9,7 @@ EXTRALIBS = -luuid CTESTS = \ clipboard.c \ compobj.c \ + dragdrop.c \ errorinfo.c \ hglobalstream.c \ marshal.c \ diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c new file mode 100644 index 0000000..2193f0f --- /dev/null +++ b/dlls/ole32/tests/dragdrop.c @@ -0,0 +1,157 @@ +/* + * Drag and Drop Tests + * + * Copyright 2007 Robert Shearman + * + * 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 + */ + +#define _WIN32_DCOM +#define COBJMACROS +#define CONST_VTABLE + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "wine/test.h" + +/* functions that are not present on all versions of Windows */ +HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); + +static int droptarget_addref_called; +static int droptarget_release_called; + +/* helper macros to make tests a bit leaner */ +#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) + +static HRESULT WINAPI DropTarget_QueryInterface(IDropTarget* iface, REFIID riid, + void** ppvObject) +{ + trace("DropTarget_QueryInterface\n"); + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDropTarget)) + { + IUnknown_AddRef(iface); + *ppvObject = iface; + return S_OK; + } + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI DropTarget_AddRef(IDropTarget* iface) +{ + droptarget_addref_called++; + return 2; +} + +static ULONG WINAPI DropTarget_Release(IDropTarget* iface) +{ + droptarget_release_called++; + return 1; +} + +static HRESULT WINAPI DropTarget_DragEnter(IDropTarget* iface, + IDataObject* pDataObj, + DWORD grfKeyState, POINTL pt, + DWORD* pdwEffect) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DropTarget_DragOver(IDropTarget* iface, + DWORD grfKeyState, + POINTL pt, + DWORD* pdwEffect) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DropTarget_DragLeave(IDropTarget* iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI DropTarget_Drop(IDropTarget* iface, + IDataObject* pDataObj, DWORD grfKeyState, + POINTL pt, DWORD* pdwEffect) +{ + return E_NOTIMPL; +} + +static const IDropTargetVtbl DropTarget_VTbl = +{ + DropTarget_QueryInterface, + DropTarget_AddRef, + DropTarget_Release, + DropTarget_DragEnter, + DropTarget_DragOver, + DropTarget_DragLeave, + DropTarget_Drop +}; + +static IDropTarget DropTarget = { &DropTarget_VTbl }; + +START_TEST(dragdrop) +{ + HRESULT hr; + + hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, "RegisterDragDrop without OLE initialized should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + + OleInitialize(NULL); + + hr = RegisterDragDrop(GetDesktopWindow(), NULL); + ok(hr == E_INVALIDARG, "RegisterDragDrop with NULL IDropTarget * should return E_INVALIDARG instead of 0x%08x\n", hr); + + hr = RegisterDragDrop(NULL, &DropTarget); + todo_wine + ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); + + hr = RegisterDragDrop((HWND)0xdeadbeef, &DropTarget); + todo_wine + ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with garbage hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); + + todo_wine + ok(droptarget_addref_called == 0, "DropTarget_AddRef shouldn't have been called\n"); + hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); + todo_wine + ok_ole_success(hr, "RegisterDragDrop"); + todo_wine + ok(droptarget_addref_called == 1, "DropTarget_AddRef should have been called once, not %d times\n", droptarget_addref_called); + + hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); + ok(hr == DRAGDROP_E_ALREADYREGISTERED, "RegisterDragDrop with already registered hwnd should return DRAGDROP_E_ALREADYREGISTERED instead of 0x%08x\n", hr); + + ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + OleUninitialize(); + todo_wine + ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + + hr = RevokeDragDrop(GetDesktopWindow()); + todo_wine + ok_ole_success(hr, "RevokeDragDrop"); + todo_wine + ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); + + hr = RevokeDragDrop(NULL); + todo_wine + ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); +}

1 0

Paul Vriens : user32/tests: Don't run unicode tests if not supported.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: 9707a2de5876352843c6bd8238d415e65222ec59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9707a2de5876352843c6bd823… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 5 11:21:53 2007 +0200 user32/tests: Don't run unicode tests if not supported. --- dlls/user32/tests/menu.c | 43 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 601228a..0fb2ced 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -526,6 +526,7 @@ static void test_menu_add_string( void ) HMENU hmenu; MENUITEMINFO info; BOOL rc; + int ret; char string[0x80]; char string2[0x80]; @@ -571,8 +572,15 @@ static void test_menu_add_string( void ) ok (GetMenuString( hmenu, 0, strback, 99, MF_BYPOSITION), "GetMenuString on ownerdraw entry failed\n"); ok (!strcmp( strback, "Dummy string" ), "Menu text from Ansi version incorrect\n"); - ok (GetMenuStringW( hmenu, 0, (WCHAR *)strbackW, 99, MF_BYPOSITION), "GetMenuStringW on ownerdraw entry failed\n"); - ok (!lstrcmpW( strbackW, expectedString ), "Menu text from Unicode version incorrect\n"); + SetLastError(0xdeadbeef); + ret = GetMenuStringW( hmenu, 0, (WCHAR *)strbackW, 99, MF_BYPOSITION); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + skip("GetMenuStringW is not implemented\n"); + else + { + ok (ret, "GetMenuStringW on ownerdraw entry failed\n"); + ok (!lstrcmpW( strbackW, expectedString ), "Menu text from Unicode version incorrect\n"); + } /* Just change ftype to string and see what text is stored */ memset(&info, 0x00, sizeof(info)); @@ -627,9 +635,12 @@ static void test_menu_add_string( void ) ok (rc, "InsertMenuItem failed\n"); ok (!GetMenuString( hmenu, 0, NULL, 0, MF_BYPOSITION), "GetMenuString on ownerdraw entry succeeded.\n"); - ok (!GetMenuStringW( hmenu, 0, NULL, 0, MF_BYPOSITION), - "GetMenuStringW on ownerdraw entry succeeded.\n"); - + SetLastError(0xdeadbeef); + ret = GetMenuStringW( hmenu, 0, NULL, 0, MF_BYPOSITION); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + skip("GetMenuStringW is not implemented\n"); + else + ok (!ret, "GetMenuStringW on ownerdraw entry succeeded.\n"); DestroyMenu( hmenu ); } @@ -681,6 +692,11 @@ static WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) else strcpyW( (WCHAR*)string, (WCHAR*)init);\ if( ansi) ret = InsertMenuItemA(hmenu, 0, TRUE, &info1 );\ else ret = InsertMenuItemW(hmenu, 0, TRUE, (MENUITEMINFOW*)&info1 );\ + if( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)\ + {\ + skip("InsertMenuItem%s not implemented\n", ansi ? "A" : "W");\ + break;\ + }\ if( !(eret1)) { ok( (eret1)==ret,"InsertMenuItem should have failed.\n");\ stop = TRUE;\ } else ok( (eret1)==ret,"InsertMenuItem failed, err %d\n",GetLastError());\ @@ -697,8 +713,14 @@ static WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) MENUITEMINFOA *einfo = &einfoA;\ MENUITEMINFOW *info2W = (MENUITEMINFOW *)&info2A;\ if( !stop) {\ + SetLastError( 0xdeadbeef);\ ret = ansi ? GetMenuItemInfoA( hmenu, 0, TRUE, info2 ) :\ GetMenuItemInfoW( hmenu, 0, TRUE, info2W );\ + if( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)\ + {\ + skip("GetMenuItemInfo%s not implemented\n", ansi ? "A" : "W");\ + break;\ + }\ if( !(eret2)) ok( (eret2)==ret,"GetMenuItemInfo should have failed.\n");\ else { \ ok( (eret2)==ret,"GetMenuItemInfo failed, err %d\n",GetLastError());\ @@ -730,8 +752,14 @@ submenu = CreateMenu();\ /* modify menu */ #define TMII_MODM( flags, id, data, eret )\ if( !stop) {\ + SetLastError( 0xdeadbeef);\ if(ansi)ret = ModifyMenuA( hmenu, 0, flags, (UINT_PTR)id, (char*)data);\ else ret = ModifyMenuW( hmenu, 0, flags, (UINT_PTR)id, (WCHAR*)data);\ + if( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)\ + {\ + skip("ModifyMenu%s not implemented\n", ansi ? "A" : "W");\ + break;\ + }\ if( !(eret)) ok( (eret)==ret,"ModifyMenuA should have failed.\n");\ else ok( (eret)==ret,"ModifyMenuA failed, err %d\n",GetLastError());\ } @@ -746,6 +774,11 @@ if( !stop) {\ else strcpyW( (WCHAR*)string, (WCHAR*)init);\ if( ansi) ret = SetMenuItemInfoA(hmenu, 0, TRUE, &info1 );\ else ret = SetMenuItemInfoW(hmenu, 0, TRUE, (MENUITEMINFOW*)&info1 );\ + if( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)\ + {\ + skip("SetMenuItemInfo%s not implemented\n", ansi ? "A" : "W");\ + break;\ + }\ if( !(eret1)) { ok( (eret1)==ret,"InsertMenuItem should have failed.\n");\ stop = TRUE;\ } else ok( (eret1)==ret,"InsertMenuItem failed, err %d\n",GetLastError());\

1 0

Fabian Bieler : wined3d: Fix GLSL cnd instruction.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: 0ce39d5869963b25ab47def349e4aa697bc6e827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce39d5869963b25ab47def34… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Apr 5 00:26:35 2007 +0200 wined3d: Fix GLSL cnd instruction. According to MSDN the cnd instruction should translate: dst = src0 > 0.5 ? src1 : src2; --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3ceb935..5700902 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1148,7 +1148,7 @@ void shader_glsl_cmp(SHADER_OPCODE_ARG* arg) { } } -/** Process the CND opcode in GLSL (dst = (src0 < 0.5) ? src1 : src2) */ +/** Process the CND opcode in GLSL (dst = (src0 > 0.5) ? src1 : src2) */ /* For ps 1.1-1.3, only a single component of src0 is used. For ps 1.4 * the compare is done per component of src0. */ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) { @@ -1164,7 +1164,7 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) { shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); - shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", + shader_addline(arg->buffer, "%s > 0.5 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); return; } @@ -1185,7 +1185,7 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) { shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); - shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", + shader_addline(arg->buffer, "%s > 0.5 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); } }

1 0

Paul Vriens : ntdll/tests: Use GetModuleHandle and skip.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: f5678a4d3824143acf6b6ecf1438dbb9a20530fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5678a4d3824143acf6b6ecf1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 5 10:29:46 2007 +0200 ntdll/tests: Use GetModuleHandle and skip. --- dlls/ntdll/tests/info.c | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index d460f33..4837211 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -24,34 +24,33 @@ static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, P static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); -static HMODULE hntdll = 0; - /* one_before_last_pid is used to be able to compare values of a still running process with the output of the test_query_process_times and test_query_process_handlecount tests. */ static DWORD one_before_last_pid = 0; -#define NTDLL_GET_PROC(func) \ +#define NTDLL_GET_PROC(func) do { \ p ## func = (void*)GetProcAddress(hntdll, #func); \ if(!p ## func) { \ trace("GetProcAddress(%s) failed\n", #func); \ - FreeLibrary(hntdll); \ return FALSE; \ - } + } \ + } while(0) static BOOL InitFunctionPtrs(void) { - hntdll = LoadLibraryA("ntdll.dll"); - if(!hntdll) { - trace("Could not load ntdll.dll\n"); - return FALSE; - } - if (hntdll) + /* All needed functions are NT based, so using GetModuleHandle is a good check */ + HMODULE hntdll = GetModuleHandle("ntdll"); + if (!hntdll) { - NTDLL_GET_PROC(NtQuerySystemInformation) - NTDLL_GET_PROC(NtQueryInformationProcess) - NTDLL_GET_PROC(NtReadVirtualMemory) + skip("Not running on NT\n"); + return FALSE; } + + NTDLL_GET_PROC(NtQuerySystemInformation); + NTDLL_GET_PROC(NtQueryInformationProcess); + NTDLL_GET_PROC(NtReadVirtualMemory); + return TRUE; } @@ -277,7 +276,7 @@ static void test_query_process(void) is_nt = ( spi->dwOffset - (sbi.NumberOfProcessors * sizeof(SYSTEM_THREAD_INFORMATION)) == 136); - if (is_nt) trace("Windows version is NT, we will skip thread tests\n"); + if (is_nt) skip("Windows version is NT, we will skip thread tests\n"); /* Check if we have some return values * @@ -629,7 +628,7 @@ static void test_query_process_io(void) status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessIoCounters, &pii, sizeof(pii), &ReturnLength); if (status == STATUS_NOT_SUPPORTED) { - trace("ProcessIoCounters information class not supported, skipping tests\n"); + skip("ProcessIoCounters information class is not supported\n"); return; } @@ -892,6 +891,4 @@ START_TEST(info) /* belongs into it's own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory(); - - FreeLibrary(hntdll); }

1 0

Alexandre Julliard : ntdll: Avoid setting status in IO_STATUS_BLOCK until the I/O operation is done.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: e57749d5a83f93b92e05072b93710ca7a8697521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57749d5a83f93b92e05072b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 5 10:55:40 2007 +0200 ntdll: Avoid setting status in IO_STATUS_BLOCK until the I/O operation is done. --- dlls/ntdll/file.c | 258 ++++++++++++++++++++++++++--------------------------- 1 files changed, 125 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e57749d5a83f93b92e050…

1 0

Dmitry Timoshkov : winspool: Add a test for DeviceCapabilities, fix some bugs found.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: dddf3487160b63d5788d18bb648ea9b071e28d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddf3487160b63d5788d18bb6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Apr 7 17:28:10 2007 +0900 winspool: Add a test for DeviceCapabilities, fix some bugs found. --- dlls/wineps.drv/driver.c | 19 +++---- dlls/winspool.drv/tests/info.c | 122 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 128 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 9c3136b..0bc1537 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -447,15 +447,15 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP DWORD ret; pi = PSDRV_FindPrinterInfo(lpszDevice); - TRACE("Cap=%d. Got PrinterInfo = %p\n", fwCapability, pi); - + TRACE("%s %s %s, %u, %p, %p\n", debugstr_a(lpszDriver), debugstr_a(lpszDevice), + debugstr_a(lpszPort), fwCapability, lpszOutput, lpDevMode); if (!pi) { - ERR("no printerinfo for %s, return 0!\n",lpszDevice); - return 0; + ERR("no printer info for %s %s, return 0!\n", + debugstr_a(lpszDriver), debugstr_a(lpszDevice)); + return 0; } - lpdm = lpDevMode ? lpDevMode : (DEVMODEA *)pi->Devmode; switch(fwCapability) { @@ -468,6 +468,7 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { + TRACE("DC_PAPERS: %u\n", ps->WinPage); i++; if(lpszOutput != NULL) *wp++ = ps->WinPage; @@ -483,6 +484,7 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { + TRACE("DC_PAPERSIZE: %f x %f\n", ps->PaperDimension->x, ps->PaperDimension->y); i++; if(lpszOutput != NULL) { pt->x = ps->PaperDimension->x * 254.0 / 72.0; @@ -501,6 +503,7 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { + TRACE("DC_PAPERNAMES: %s\n", debugstr_a(ps->FullName)); i++; if(lpszOutput != NULL) { lstrcpynA(cp, ps->FullName, 64); @@ -593,9 +596,6 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP POINT ptMax; ptMax.x = ptMax.y = 0; - if(lpszOutput == NULL) - return -1; - LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { if(ps->PaperDimension->x > ptMax.x) @@ -612,9 +612,6 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP POINT ptMin; ptMin.x = ptMin.y = -1; - if(lpszOutput == NULL) - return -1; - LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { if(ptMin.x == -1 || ps->PaperDimension->x < ptMin.x) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index ebfed4b..2862031 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -19,16 +19,21 @@ */ #include <stdarg.h> +#include <assert.h> + +#define NONAMELESSSTRUCT +#define NONAMELESSUNION -#include "wine/test.h" #include "windef.h" #include "winbase.h" #include "winerror.h" #include "wingdi.h" -#include <winnls.h> +#include "winnls.h" #include "winuser.h" #include "winreg.h" #include "winspool.h" +#include "commdlg.h" +#include "wine/test.h" #define MAGIC_DEAD 0xdeadbeef #define DEFAULT_PRINTER_SIZE 1000 @@ -1990,6 +1995,118 @@ static void test_EnumPrinters(void) ok(neededA == neededW, "neededA %d neededW %d\n", neededA, neededW); } +static void test_DeviceCapabilities(void) +{ + HANDLE hComdlg32; + BOOL (WINAPI *pPrintDlgA)(PRINTDLGA *); + PRINTDLGA prn_dlg; + DEVMODE *dm; + DEVNAMES *dn; + const char *driver, *device, *port; + WORD *papers; + POINT *paper_size; + POINTS ext; + struct + { + char name[64]; + } *paper_name; + INT n_papers, n_paper_size, n_paper_names, n_copies, ret; + DWORD fields; + + hComdlg32 = LoadLibrary("comdlg32.dll"); + assert(hComdlg32); + pPrintDlgA = GetProcAddress(hComdlg32, "PrintDlgA"); + assert(pPrintDlgA); + + memset(&prn_dlg, 0, sizeof(prn_dlg)); + prn_dlg.lStructSize = sizeof(prn_dlg); + prn_dlg.Flags = PD_RETURNDEFAULT; + ret = pPrintDlgA(&prn_dlg); + FreeLibrary(hComdlg32); + if (!ret) + { + skip("PrintDlg returned no default printer\n"); + return; + } + ok(prn_dlg.hDevMode != 0, "PrintDlg returned hDevMode == NULL\n"); + ok(prn_dlg.hDevNames != 0, "PrintDlg returned hDevNames == NULL\n"); + + dm = GlobalLock(prn_dlg.hDevMode); + ok(dm != NULL, "GlobalLock(prn_dlg.hDevMode) failed\n"); + trace("dmDeviceName \"%s\"\n", dm->dmDeviceName); + + dn = GlobalLock(prn_dlg.hDevNames); + ok(dn != NULL, "GlobalLock(prn_dlg.hDevNames) failed\n"); + ok(dn->wDriverOffset, "expected not 0 wDriverOffset\n"); + ok(dn->wDeviceOffset, "expected not 0 wDeviceOffset\n"); + ok(dn->wOutputOffset, "expected not 0 wOutputOffset\n"); + ok(dn->wDefault == DN_DEFAULTPRN, "expected DN_DEFAULTPRN got %x\n", dn->wDefault); + driver = (const char *)dn + dn->wDriverOffset; + device = (const char *)dn + dn->wDeviceOffset; + port = (const char *)dn + dn->wOutputOffset; + trace("driver \"%s\" device \"%s\" port \"%s\"\n", driver, device, port); + + test_DEVMODE(dm, dm->dmSize + dm->dmDriverExtra, device); + + n_papers = DeviceCapabilities(device, port, DC_PAPERS, NULL, NULL); + ok(n_papers > 0, "DeviceCapabilities DC_PAPERS failed\n"); + papers = HeapAlloc(GetProcessHeap(), 0, sizeof(*papers) * n_papers); + ret = DeviceCapabilities(device, port, DC_PAPERS, (LPSTR)papers, NULL); + ok(ret == n_papers, "expected %d, got %d\n", n_papers, ret); +#if VERBOSE + for (ret = 0; ret < n_papers; ret++) + trace("papers[%d] = %d\n", ret, papers[ret]); +#endif + HeapFree(GetProcessHeap(), 0, papers); + + n_paper_size = DeviceCapabilities(device, port, DC_PAPERSIZE, NULL, NULL); + ok(n_paper_size > 0, "DeviceCapabilities DC_PAPERSIZE failed\n"); + ok(n_paper_size == n_papers, "n_paper_size %d != n_papers %d\n", n_paper_size, n_papers); + paper_size = HeapAlloc(GetProcessHeap(), 0, sizeof(*paper_size) * n_paper_size); + ret = DeviceCapabilities(device, port, DC_PAPERSIZE, (LPSTR)paper_size, NULL); + ok(ret == n_paper_size, "expected %d, got %d\n", n_paper_size, ret); +#if VERBOSE + for (ret = 0; ret < n_paper_size; ret++) + trace("paper_size[%d] = %d x %d\n", ret, paper_size[ret].x, paper_size[ret].y); +#endif + HeapFree(GetProcessHeap(), 0, paper_size); + + n_paper_names = DeviceCapabilities(device, port, DC_PAPERNAMES, NULL, NULL); + ok(n_paper_names > 0, "DeviceCapabilities DC_PAPERNAMES failed\n"); + ok(n_paper_names == n_papers, "n_paper_names %d != n_papers %d\n", n_paper_names, n_papers); + paper_name = HeapAlloc(GetProcessHeap(), 0, sizeof(*paper_name) * n_paper_names); + ret = DeviceCapabilities(device, port, DC_PAPERNAMES, (LPSTR)paper_name, NULL); + ok(ret == n_paper_names, "expected %d, got %d\n", n_paper_names, ret); +#if VERBOSE + for (ret = 0; ret < n_paper_names; ret++) + trace("paper_name[%u] = %s\n", ret, paper_name[ret].name); +#endif + HeapFree(GetProcessHeap(), 0, paper_name); + + n_copies = DeviceCapabilities(device, port, DC_COPIES, NULL, dm); + ok(n_copies > 0, "DeviceCapabilities DC_COPIES failed\n"); + trace("n_copies = %d\n", n_copies); + + ret = DeviceCapabilities(device, port, DC_MAXEXTENT, NULL, NULL); + ok(ret != -1, "DeviceCapabilities DC_MAXEXTENT failed\n"); + ext = MAKEPOINTS(ret); + trace("max ext = %d x %d\n", ext.x, ext.y); + + ret = DeviceCapabilities(device, port, DC_MINEXTENT, NULL, NULL); + ok(ret != -1, "DeviceCapabilities DC_MINEXTENT failed\n"); + ext = MAKEPOINTS(ret); + trace("min ext = %d x %d\n", ext.x, ext.y); + + fields = DeviceCapabilities(device, port, DC_FIELDS, NULL, NULL); + ok(fields != (DWORD)-1, "DeviceCapabilities DC_FIELDS failed\n"); + ok(fields == dm->dmFields, "fields %x != dm->dmFields %x\n", fields, dm->dmFields); + + GlobalUnlock(prn_dlg.hDevMode); + GlobalFree(prn_dlg.hDevMode); + GlobalUnlock(prn_dlg.hDevNames); + GlobalFree(prn_dlg.hDevNames); +} + START_TEST(info) { hwinspool = GetModuleHandleA("winspool.drv"); @@ -2006,6 +2123,7 @@ START_TEST(info) test_ConfigurePort(); test_DeleteMonitor(); test_DeletePort(); + test_DeviceCapabilities(); test_DocumentProperties(); test_EnumForms(NULL); if (default_printer) test_EnumForms(default_printer);

1 0

Alexandre Julliard : ws2_32: Don't access the IO_STATUS_BLOCK until the I/ O operation is finished.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: 2a9dfe242b8d2b26c3498f27002c7190f1d7e77f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9dfe242b8d2b26c3498f270… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 5 11:29:30 2007 +0200 ws2_32: Don't access the IO_STATUS_BLOCK until the I/O operation is finished. --- dlls/ws2_32/socket.c | 79 +++++++++++++++++++++----------------------------- 1 files changed, 33 insertions(+), 46 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ce57f7d..87d4afd 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1045,13 +1045,15 @@ static inline void ws_sockaddr_free(const struct sockaddr* uaddr, const struct W * Functions for handling overlapped I/O **************************************************************************/ -static void CALLBACK ws2_async_terminate(ws2_async* as, IO_STATUS_BLOCK* iosb) +static void ws2_async_terminate(ws2_async* as, IO_STATUS_BLOCK* iosb, NTSTATUS status, ULONG count) { TRACE( "as: %p uovl %p ovl %p\n", as, as->user_overlapped, iosb ); + iosb->u.Status = status; + iosb->Information = count; if (as->completion_func) - as->completion_func( NtStatusToWSAError (iosb->u.Status), - iosb->Information, as->user_overlapped, as->flags ); + as->completion_func( NtStatusToWSAError(status), + count, as->user_overlapped, as->flags ); if ( !as->user_overlapped ) { #if 0 @@ -1121,8 +1123,6 @@ WS2_make_async(SOCKET s, enum ws2_mode mode, struct iovec *iovec, DWORD dwBuffer else if (!(*piosb = HeapAlloc( GetProcessHeap(), 0, sizeof(IO_STATUS_BLOCK)))) goto error; - (*piosb)->Information = 0; - (*piosb)->u.Status = STATUS_PENDING; TRACE( "wsa %p, h %p, ev %p, iosb %p, uov %p, cfunc %p\n", wsa, wsa->hSocket, wsa->event, *piosb, wsa->user_overlapped, wsa->completion_func ); @@ -1150,7 +1150,6 @@ static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) default: FIXME("Unknown internal mode (%d)\n", wsa->mode); return STATUS_INVALID_PARAMETER; } - iosb->u.Status = STATUS_PENDING; SERVER_START_REQ( register_async ) { req->handle = wsa->hSocket; @@ -1159,17 +1158,14 @@ static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) req->async.arg = wsa; req->async.event = wsa->event; req->type = type; - req->count = iosb->Information; status = wine_server_call( req ); } SERVER_END_REQ; if (status != STATUS_PENDING) - { - iosb->u.Status = status; - ws2_async_terminate(wsa, iosb); - } - else NtCurrentTeb()->num_async_io++; + ws2_async_terminate(wsa, iosb, status, 0); + else + NtCurrentTeb()->num_async_io++; return status; } @@ -1253,9 +1249,9 @@ static void WINAPI WS2_async_recv( void* ovp, IO_STATUS_BLOCK* iosb, ULONG statu switch (status) { case STATUS_ALERTED: - if ((iosb->u.Status = wine_server_handle_to_fd( wsa->hSocket, FILE_READ_DATA, &fd, NULL ) )) + if ((status = wine_server_handle_to_fd( wsa->hSocket, FILE_READ_DATA, &fd, NULL ) )) { - ws2_async_terminate(wsa, iosb); + ws2_async_terminate(wsa, iosb, status, 0); break; } result = WS2_recv( fd, wsa->iovec, wsa->n_iovecs, @@ -1263,8 +1259,7 @@ static void WINAPI WS2_async_recv( void* ovp, IO_STATUS_BLOCK* iosb, ULONG statu wine_server_release_fd( wsa->hSocket, fd ); if (result >= 0) { - iosb->u.Status = STATUS_SUCCESS; - iosb->Information = result; + status = STATUS_SUCCESS; TRACE( "received %d bytes\n", result ); _enable_event( wsa->hSocket, FD_READ, 0, 0 ); } @@ -1273,26 +1268,25 @@ static void WINAPI WS2_async_recv( void* ovp, IO_STATUS_BLOCK* iosb, ULONG statu err = wsaErrno(); if ( err == WSAEINTR || err == WSAEWOULDBLOCK ) /* errno: EINTR / EAGAIN */ { - iosb->u.Status = STATUS_PENDING; + status = STATUS_PENDING; _enable_event( wsa->hSocket, FD_READ, 0, 0 ); TRACE( "still pending\n" ); } else { - iosb->u.Status = err; /* FIXME: is this correct ???? */ + result = 0; + status = err; /* FIXME: is this correct ???? */ TRACE( "Error: %x\n", err ); } } - if (iosb->u.Status == STATUS_PENDING) + if (status == STATUS_PENDING) ws2_queue_async(wsa, iosb); else - ws2_async_terminate(wsa, iosb); + ws2_async_terminate(wsa, iosb, status, result); break; default: - FIXME( "status: %d\n", status ); - iosb->u.Status = status; - ws2_async_terminate(wsa, iosb); - return; + ws2_async_terminate(wsa, iosb, status, 0); + break; } } @@ -1380,10 +1374,9 @@ static void WINAPI WS2_async_send(void* as, IO_STATUS_BLOCK* iosb, ULONG status) switch (status) { case STATUS_ALERTED: - if (iosb->u.Status != STATUS_PENDING) FIXME("wrong %08x\n", iosb->u.Status); - if ((iosb->u.Status = wine_server_handle_to_fd( wsa->hSocket, FILE_WRITE_DATA, &fd, NULL ) )) + if ((status = wine_server_handle_to_fd( wsa->hSocket, FILE_WRITE_DATA, &fd, NULL ) )) { - ws2_async_terminate(wsa, iosb); + ws2_async_terminate(wsa, iosb, status, 0); break; } /* check to see if the data is ready (non-blocking) */ @@ -1392,8 +1385,7 @@ static void WINAPI WS2_async_send(void* as, IO_STATUS_BLOCK* iosb, ULONG status) if (result >= 0) { - iosb->u.Status = STATUS_SUCCESS; - iosb->Information = result; + status = STATUS_SUCCESS; TRACE( "sent %d bytes\n", result ); _enable_event( wsa->hSocket, FD_WRITE, 0, 0 ); } @@ -1402,7 +1394,7 @@ static void WINAPI WS2_async_send(void* as, IO_STATUS_BLOCK* iosb, ULONG status) int err = wsaErrno(); if ( err == WSAEINTR ) { - iosb->u.Status = STATUS_PENDING; + status = STATUS_PENDING; _enable_event( wsa->hSocket, FD_WRITE, 0, 0 ); TRACE( "still pending\n" ); } @@ -1410,20 +1402,19 @@ static void WINAPI WS2_async_send(void* as, IO_STATUS_BLOCK* iosb, ULONG status) { /* We set the status to a winsock error code and check for that later in NtStatusToWSAError () */ - iosb->u.Status = err; + status = err; + result = 0; TRACE( "Error: %x\n", err ); } } - if (iosb->u.Status == STATUS_PENDING) + if (status == STATUS_PENDING) ws2_queue_async(wsa, iosb); else - ws2_async_terminate(wsa, iosb); + ws2_async_terminate(wsa, iosb, status, result); break; default: - FIXME( "status: %d\n", status ); - iosb->u.Status = status; - ws2_async_terminate(wsa, iosb); - return; + ws2_async_terminate(wsa, iosb, status, 0); + break; } } @@ -1442,9 +1433,9 @@ static void WINAPI WS2_async_shutdown( void* as, PIO_STATUS_BLOCK iosb, ULONG st switch (status) { case STATUS_ALERTED: - if ((iosb->u.Status = wine_server_handle_to_fd( wsa->hSocket, 0, &fd, NULL ) )) + if ((status = wine_server_handle_to_fd( wsa->hSocket, 0, &fd, NULL ) )) { - ws2_async_terminate(wsa, iosb); + ws2_async_terminate(wsa, iosb, status, 0); break; } switch ( wsa->mode ) @@ -1454,15 +1445,11 @@ static void WINAPI WS2_async_shutdown( void* as, PIO_STATUS_BLOCK iosb, ULONG st default: ERR("invalid mode: %d\n", wsa->mode ); } wine_server_release_fd( wsa->hSocket, fd ); - iosb->u.Status = err ? wsaErrno() : STATUS_SUCCESS; - if (iosb->u.Status == STATUS_PENDING) - ws2_queue_async(wsa, iosb); - else - ws2_async_terminate(wsa, iosb); + status = err ? wsaErrno() : STATUS_SUCCESS; + ws2_async_terminate(wsa, iosb, status, 0); break; default: - iosb->u.Status = status; - ws2_async_terminate(wsa, iosb); + ws2_async_terminate(wsa, iosb, status, 0); break; }

1 0

Alexandre Julliard : ntdll: Avoid relying on the IO_STATUS_BLOCK for storing the current transfer count .
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: 7165e19a245243604c6bf51fb3aaf77631e8f008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7165e19a245243604c6bf51fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 5 11:03:38 2007 +0200 ntdll: Avoid relying on the IO_STATUS_BLOCK for storing the current transfer count. --- dlls/ntdll/file.c | 46 ++++++++++++++++++---------------------------- 1 files changed, 18 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d64206d..bde675b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -244,6 +244,7 @@ typedef struct async_fileio PIO_APC_ROUTINE apc; void* apc_user; char* buffer; + unsigned int already; unsigned int count; int queue_apc_on_error; BOOL avail_mode; @@ -255,6 +256,8 @@ static void fileio_terminate(async_fileio *fileio, IO_STATUS_BLOCK* iosb, NTSTAT TRACE("data: %p\n", fileio); iosb->u.Status = status; + iosb->Information = fileio->already; + if (fileio->apc && (status == STATUS_SUCCESS || fileio->queue_apc_on_error)) fileio->apc( fileio->apc_user, iosb, 0 ); @@ -276,8 +279,7 @@ static ULONG fileio_queue_async(async_fileio* fileio, IO_STATUS_BLOCK* iosb, req->async.arg = fileio; req->async.event = fileio->event; req->type = do_read ? ASYNC_TYPE_READ : ASYNC_TYPE_WRITE; - req->count = (fileio->count < iosb->Information) ? - 0 : fileio->count - iosb->Information; + req->count = (fileio->count < fileio->already) ? 0 : fileio->count - fileio->already; status = wine_server_call( req ); } SERVER_END_REQ; @@ -342,7 +344,6 @@ static void WINAPI FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, ULON { async_fileio *fileio = (async_fileio*)user; int fd, needs_close, result; - int already = iosb->Information; TRACE("%p %p 0x%x\n", iosb, fileio->buffer, status); @@ -356,7 +357,7 @@ static void WINAPI FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, ULON fileio_terminate(fileio, iosb, status); break; } - result = read(fd, &fileio->buffer[already], fileio->count - already); + result = read(fd, &fileio->buffer[fileio->already], fileio->count - fileio->already); if (needs_close) close( fd ); if (result < 0) @@ -371,12 +372,12 @@ static void WINAPI FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, ULON } else if (result == 0) { - status = iosb->Information ? STATUS_SUCCESS : STATUS_END_OF_FILE; + status = fileio->already ? STATUS_SUCCESS : STATUS_END_OF_FILE; } else { - iosb->Information += result; - if (iosb->Information >= fileio->count || fileio->avail_mode) + fileio->already += result; + if (fileio->already >= fileio->count || fileio->avail_mode) status = STATUS_SUCCESS; else { @@ -387,8 +388,8 @@ static void WINAPI FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, ULON status = (fileio->avail_mode) ? STATUS_SUCCESS : STATUS_PENDING; } - TRACE("read %d more bytes %ld/%d so far (%s)\n", - result, iosb->Information, fileio->count, + TRACE("read %d more bytes %u/%u so far (%s)\n", + result, fileio->already, fileio->count, (status == STATUS_SUCCESS) ? "success" : "pending"); } /* queue another async operation ? */ @@ -440,14 +441,9 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (!io_status) return STATUS_ACCESS_VIOLATION; - io_status->Information = 0; status = server_get_unix_fd( hFile, FILE_READ_DATA, &unix_handle, &needs_close, &type, &flags ); - if (status) - { - io_status->u.Status = status; - return status; - } + if (status) return status; if (type == FD_TYPE_FILE && offset) { @@ -514,6 +510,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } fileio->handle = hFile; + fileio->already = 0; fileio->count = length; fileio->apc = apc; fileio->apc_user = apc_user; @@ -587,7 +584,6 @@ static void WINAPI FILE_AsyncWriteService(void *ovp, IO_STATUS_BLOCK *iosb, ULON { async_fileio *fileio = (async_fileio *) ovp; int result, fd, needs_close; - int already = iosb->Information; TRACE("(%p %p 0x%x)\n",iosb, fileio->buffer, status); @@ -601,7 +597,7 @@ static void WINAPI FILE_AsyncWriteService(void *ovp, IO_STATUS_BLOCK *iosb, ULON fileio_terminate(fileio, iosb, status); break; } - result = write(fd, &fileio->buffer[already], fileio->count - already); + result = write(fd, &fileio->buffer[fileio->already], fileio->count - fileio->already); if (needs_close) close( fd ); if (result < 0) @@ -611,10 +607,9 @@ static void WINAPI FILE_AsyncWriteService(void *ovp, IO_STATUS_BLOCK *iosb, ULON } else { - iosb->Information += result; - status = (iosb->Information < fileio->count) ? STATUS_PENDING : STATUS_SUCCESS; - TRACE("wrote %d more bytes %ld/%d so far\n", - result, iosb->Information, fileio->count); + fileio->already += result; + status = (fileio->already < fileio->count) ? STATUS_PENDING : STATUS_SUCCESS; + TRACE("wrote %d more bytes %u/%u so far\n", result, fileio->already, fileio->count); } if (status == STATUS_PENDING) fileio_queue_async(fileio, iosb, FALSE); @@ -664,14 +659,9 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (!io_status) return STATUS_ACCESS_VIOLATION; - io_status->Information = 0; status = server_get_unix_fd( hFile, FILE_WRITE_DATA, &unix_handle, &needs_close, &type, &flags ); - if (status) - { - io_status->u.Status = status; - return status; - } + if (status) return status; if (type == FD_TYPE_FILE && offset) { @@ -739,6 +729,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } fileio->handle = hFile; + fileio->already = 0; fileio->count = length; fileio->apc = apc; fileio->apc_user = apc_user; @@ -747,7 +738,6 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); fileio->event = hEvent; - io_status->Information = 0; io_status->u.Status = STATUS_PENDING; status = fileio_queue_async(fileio, io_status, FALSE); if (status != STATUS_PENDING)

1 0

Stefan Leichter : advapi32: Add some tests for RegDeleteTreeA.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: 0dcf196001f94aa8a864fd5ac46f4adde7076c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dcf196001f94aa8a864fd5ac… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 4 23:03:00 2007 +0200 advapi32: Add some tests for RegDeleteTreeA. --- dlls/advapi32/tests/registry.c | 60 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index a3491c3..1d9fab6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -35,6 +35,7 @@ static const char * sTestpath2 = "%FOO%\\subdir1"; static HMODULE hadvapi32; static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); +static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); #define ADVAPI32_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hadvapi32, #func); \ @@ -47,6 +48,7 @@ static void InitFunctionPtrs(void) /* This function was introduced with Windows 2003 SP1 */ ADVAPI32_GET_PROC(RegGetValueA) + ADVAPI32_GET_PROC(RegDeleteTreeA) } /* delete key and all its subkeys */ @@ -892,6 +894,62 @@ cleanup: RegCloseKey(subkey); } +static void test_reg_delete_tree(void) +{ + CHAR buffer[MAX_PATH]; + HKEY subkey, subkey2; + LONG size, ret; + + if(!pRegDeleteTreeA) { + skip("Skipping RegDeleteTreeA tests, function not present\n"); + return; + } + + ret = RegCreateKeyA(hkey_main, "subkey", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCreateKeyA(subkey, "subkey2", &subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueA(subkey, NULL, REG_SZ, "data", 4); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueA(subkey2, NULL, REG_SZ, "data2", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = pRegDeleteTreeA(subkey, "subkey2"); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(RegOpenKeyA(subkey, "subkey2", &subkey2), + "subkey2 was not deleted\n"); + size = MAX_PATH; + ok(!RegQueryValueA(subkey, NULL, buffer, &size), + "Default value of subkey not longer present\n"); + + ret = RegCreateKeyA(subkey, "subkey2", &subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = pRegDeleteTreeA(hkey_main, "subkey\\subkey2"); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(RegOpenKeyA(subkey, "subkey2", &subkey2), + "subkey2 was not deleted\n"); + ok(!RegQueryValueA(subkey, NULL, buffer, &size), + "Default value of subkey not longer present\n"); + + ret = pRegDeleteTreeA(subkey, NULL); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!RegOpenKeyA(hkey_main, "subkey", &subkey), + "subkey was deleted\n"); + ret = RegQueryValueA(subkey, NULL, buffer, &size); + ok(ret == ERROR_SUCCESS, + "Default value of subkey is not present\n"); + ok(!lstrlenA(buffer), + "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); + + ret = pRegDeleteTreeA(hkey_main, "not-here"); + ok(ret == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -921,6 +979,8 @@ START_TEST(registry) set_privileges(SE_RESTORE_NAME, FALSE); } + test_reg_delete_tree(); + /* cleanup */ delete_key( hkey_main );

1 0