February 2007 - Wine-Commits

Maarten Lankhorst : wined3d: Report D3D caps properly for ATI cards.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 89840c0517f669c8178261e48030d9af14fa96f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89840c0517f669c8178261e48… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Jan 27 12:12:44 2007 +0100 wined3d: Report D3D caps properly for ATI cards. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0e6f4bc..7bd04bb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2136,7 +2136,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDe D3DTEXOPCAPS_LERP | D3DTEXOPCAPS_SUBTRACT; } - if (GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) { + if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3) || + GL_SUPPORT(NV_TEXTURE_ENV_COMBINE4)) { *pCaps->TextureOpCaps |= D3DTEXOPCAPS_ADDSMOOTH | D3DTEXOPCAPS_MULTIPLYADD | D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR |

1 0

Marcus Meissner : devenum: Fix uninitialized clsidString (Coverity).
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 6239bf6fe377a936ddf2f884e540a93d3a88c7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6239bf6fe377a936ddf2f884e… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Feb 1 15:36:15 2007 +0100 devenum: Fix uninitialized clsidString (Coverity). --- dlls/devenum/devenum_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index bb4bbbe..66b0f0e 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -296,7 +296,7 @@ HRESULT WINAPI DllUnregisterServer(void) static HRESULT register_clsids(int count, const register_info * pRegInfo, LPCWSTR pszThreadingModel) { HRESULT res = S_OK; - LPOLESTR clsidString; + LPOLESTR clsidString = NULL; HKEY hkeyClsid; HKEY hkeySub; HKEY hkeyInproc32;

1 0

Dmitry Timoshkov : user32: Although Windows sends WM_GETMINMAXINFO at the window creation time, it doesn't use returned values to set window size.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 0fcc10fc3cea2b5d3491853e706d76b9bc24fdad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fcc10fc3cea2b5d3491853e7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Jan 27 20:50:09 2007 +0800 user32: Although Windows sends WM_GETMINMAXINFO at the window creation time, it doesn't use returned values to set window size. --- dlls/user32/tests/win.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 11 +++-------- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 951c6aa..735c8aa 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3712,6 +3712,8 @@ static void test_CreateWindow(void) { HWND hwnd, parent; HMENU hmenu; + RECT rc, rc_minmax; + MINMAXINFO minmax; #define expect_menu(window, menu) \ SetLastError(0xdeadbeef); \ @@ -3904,6 +3906,49 @@ static void test_CreateWindow(void) ok(!IsMenu(hmenu), "IsMenu should fail\n"); ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + /* test child window sizing */ + SetLastError(0xdeadbeef); + parent = CreateWindowEx(0, "static", NULL, WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, + 0, 0, 100, 100, 0, 0, 0, NULL); + ok(parent != 0, "CreateWindowEx error %d\n", GetLastError()); + expect_menu(parent, 0); + expect_style(parent, WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_CLIPSIBLINGS); + expect_ex_style(parent, WS_EX_WINDOWEDGE); + + memset(&minmax, 0, sizeof(minmax)); + SendMessage(parent, WM_GETMINMAXINFO, 0, (LPARAM)&minmax); + SetRect(&rc_minmax, 0, 0, minmax.ptMaxSize.x, minmax.ptMaxSize.y); + ok(IsRectEmpty(&rc_minmax), "rc_minmax is not empty\n"); + + GetClientRect(parent, &rc); + ok(rc_minmax.left >= rc.left && rc_minmax.top >= rc.top && + rc_minmax.right <= rc.right && rc_minmax.bottom <= rc.bottom, + "rc_minmax (%d,%d-%d,%d) is not within of parent client rect (%d,%d-%d,%d)\n", + rc_minmax.left, rc_minmax.top, rc_minmax.right, rc_minmax.bottom, + rc.left, rc.top, rc.right, rc.bottom); + InflateRect(&rc, 200, 200); + trace("creating child with rect (%d,%d-%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, + rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + parent, (HMENU)1, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError()); + expect_menu(hwnd, 1); + expect_style(hwnd, WS_CHILD | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME); + expect_ex_style(hwnd, WS_EX_WINDOWEDGE); + + OffsetRect(&rc, -rc.left, -rc.top); + + GetWindowRect(hwnd, &rc_minmax); + OffsetRect(&rc_minmax, -rc_minmax.left, -rc_minmax.top); + ok(EqualRect(&rc, &rc_minmax), "rects don't match: (%d,%d-%d,%d) and (%d,%d-%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom, + rc_minmax.left, rc_minmax.top, rc_minmax.right, rc_minmax.bottom); + + DestroyWindow(hwnd); + DestroyWindow(parent); + #undef expect_menu #undef expect_style #undef expect_ex_style diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e9fc4f0..3f67069 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1075,15 +1075,10 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CRE if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) { POINT maxSize, maxPos, minTrack, maxTrack; - + /* Although Windows sends WM_GETMINMAXINFO at the window creation time, + * it doesn't use returned values to set window size. + */ WINPOS_GetMinMaxInfo( hwnd, &maxSize, &maxPos, &minTrack, &maxTrack); - if (maxSize.x < cs->cx) cs->cx = maxSize.x; - if (maxSize.y < cs->cy) cs->cy = maxSize.y; - if (cs->cx < 0) cs->cx = 0; - if (cs->cy < 0) cs->cy = 0; - - SetRect( &rect, cs->x, cs->y, cs->x + cs->cx, cs->y + cs->cy ); - if (!X11DRV_SetWindowPos( hwnd, 0, &rect, &rect, SWP_NOZORDER, NULL )) return FALSE; } /* send WM_NCCREATE */

1 0

Mike McCormack : winnt.h: Add defines for SLIST_HEADER.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: a425bfc622fc1e77e2c96ae5bc669789a58fc79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a425bfc622fc1e77e2c96ae5b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 26 23:21:41 2007 +0900 winnt.h: Add defines for SLIST_HEADER. --- include/winnt.h | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 47653eb..58c76e2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -593,6 +593,35 @@ typedef struct _SINGLE_LIST_ENTRY { struct _SINGLE_LIST_ENTRY *Next; } SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY; +#ifdef _WIN64 + +typedef struct _SLIST_ENTRY *PSLIST_ENTRY; +typedef struct _SLIST_ENTRY { + PSLIST_ENTRY Next; +}; + +typedef struct _SLIST_HEADER { + ULONGLONG Alignment; + ULONGLONG Region; +} SLIST_HEADER, *PSLIST_HEADER; + +#else + +#define SLIST_ENTRY SINGLE_LIST_ENTRY +#define _SLIST_ENTRY _SINGLE_LIST_ENTRY +#define PSLIST_ENTRY PSINGLE_LIST_ENTRY + +typedef union _SLIST_HEADER { + ULONGLONG Alignment; + struct { + SLIST_ENTRY Next; + WORD Depth; + WORD Sequence; + }; +} SLIST_HEADER, *PSLIST_HEADER; + +#endif + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001

1 0

John Morris : ole32: Add CoWaitForMultipleHandles to spec file.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 00b29dfa790667ff88b06ef04d0cf7b81bfc5822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b29dfa790667ff88b06ef04… Author: John Morris <mailjohnmorris(a)gmail.com> Date: Fri Feb 2 13:28:29 2007 -0600 ole32: Add CoWaitForMultipleHandles to spec file. --- dlls/ole32/ole32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d775556..3ae0240 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -76,6 +76,7 @@ @ stub CoUnloadingWOW @ stdcall CoUnmarshalHresult(ptr ptr) @ stdcall CoUnmarshalInterface(ptr ptr ptr) +@ stdcall CoWaitForMultipleHandles(long long long ptr ptr) @ stdcall CreateAntiMoniker(ptr) @ stdcall CreateBindCtx(long ptr) @ stdcall CreateClassMoniker(ptr ptr)

1 0

Bang Jun-Young : advpack: Constify the 3rd argument of RebootCheckOnInstall [AW].
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 1ca4ddbd09f65d8a5284e8be3892360ca668097e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca4ddbd09f65d8a5284e8be3… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Sat Feb 3 10:13:24 2007 +0900 advpack: Constify the 3rd argument of RebootCheckOnInstall[AW]. --- dlls/advpack/advpack.c | 4 ++-- include/advpub.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 4f37fad..45db5b1 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -376,7 +376,7 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR ps * See RebootCheckOnInstallW. */ HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, - LPSTR pszSec, DWORD dwReserved) + LPCSTR pszSec, DWORD dwReserved) { UNICODE_STRING infW, secW; HRESULT res; @@ -422,7 +422,7 @@ HRESULT WINAPI RebootCheckOnInstallA(HWN * Unimplemented. */ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, - LPWSTR pszSec, DWORD dwReserved) + LPCWSTR pszSec, DWORD dwReserved) { FIXME("(%p, %s, %s, %d): stub\n", hWnd, debugstr_w(pszINF), debugstr_w(pszSec), dwReserved); diff --git a/include/advpub.h b/include/advpub.h index 8c9e2c0..70f5907 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -223,8 +223,8 @@ HRESULT WINAPI OpenINFEngineA(LPCSTR psz HRESULT WINAPI OpenINFEngineW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSection, DWORD dwFlags, HINF *phInf, PVOID pvReserved); #define OpenINFEngine WINELIB_NAME_AW(OpenINFEngine) -HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, LPSTR pszSec, DWORD dwReserved); -HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, LPWSTR pszSec, DWORD dwReserved); +HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, LPCSTR pszSec, DWORD dwReserved); +HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, LPCWSTR pszSec, DWORD dwReserved); #define RebootCheckOnInstall WINELIB_NAME_AW(RebootCheckOnInstall) HRESULT WINAPI RegInstallA(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstTable);

1 0

Detlef Riekenberg : mshtml: Add a missing space.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 143e4af5fbc7624163abadf973540ba35a50d4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=143e4af5fbc7624163abadf97… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 31 22:34:35 2007 +0100 mshtml: Add a missing space. --- dlls/mshtml/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 919e5d0..6cbeaf7 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -31,7 +31,7 @@ C_SRCS = \ navigate.c \ nsembed.c \ nsio.c \ - nsservice.c\ + nsservice.c \ olecmd.c \ oleobj.c \ olewnd.c \

1 0

Detlef Riekenberg : winspool/tests: Add test for XcvDataW, PortIsValid.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 3b453d5915f92e167e1b589a2cf22aec87c62823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b453d5915f92e167e1b589a2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 2 16:04:46 2007 +0100 winspool/tests: Add test for XcvDataW,PortIsValid. --- dlls/winspool.drv/tests/info.c | 168 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 166 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 74d17e5..af5e571 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winerror.h" #include "wingdi.h" +#include <winnls.h> #include "winuser.h" #include "winreg.h" #include "winspool.h" @@ -48,8 +49,14 @@ static CHAR winetest[] = "winet static CHAR xcv_localport[] = ",XcvMonitor Local Port"; static WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; +static WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; static WCHAR emptyW[] = {0}; +static WCHAR portname_com1W[] = {'C','O','M','1',':',0}; +static WCHAR portname_com2W[] = {'C','O','M','2',':',0}; +static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; +static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; +static WCHAR portname_lpt2W[] = {'L','P','T','2',':',0}; static HANDLE hwinspool; static FARPROC pGetDefaultPrinterA; @@ -64,9 +71,14 @@ struct monitor_entry { CHAR dllname[32]; }; -static LPSTR default_printer = NULL; -static LPSTR local_server = NULL; +static LPSTR default_printer = NULL; +static LPSTR local_server = NULL; +static LPSTR tempdirA = NULL; +static LPSTR tempfileA = NULL; +static LPWSTR tempdirW = NULL; +static LPWSTR tempfileW = NULL; +/* ################################ */ /* report common behavior only once */ static DWORD report_deactivated_spooler = 1; #define RETURN_ON_DEACTIVATED_SPOOLER(res) \ @@ -215,6 +227,47 @@ static void find_local_server(VOID) /* ########################### */ +static void find_tempfile(VOID) +{ + static CHAR buffer_dirA[MAX_PATH]; + static CHAR buffer_fileA[MAX_PATH]; + static WCHAR buffer_dirW[MAX_PATH]; + static WCHAR buffer_fileW[MAX_PATH]; + DWORD res; + int resint; + + memset(buffer_dirA, 0, MAX_PATH - 1); + buffer_dirA[MAX_PATH - 1] = '\0'; + SetLastError(0xdeadbeef); + res = GetTempPathA(MAX_PATH, buffer_dirA); + ok(res, "returned %u with %u and '%s' (expected '!= 0')\n", res, GetLastError(), buffer_dirA); + if (res == 0) return; + + memset(buffer_fileA, 0, MAX_PATH - 1); + buffer_fileA[MAX_PATH - 1] = '\0'; + SetLastError(0xdeadbeef); + res = GetTempFileNameA(buffer_dirA, winetest, 0, buffer_fileA); + ok(res, "returned %u with %u and '%s' (expected '!= 0')\n", res, GetLastError(), buffer_fileA); + if (res == 0) return; + + SetLastError(0xdeadbeef); + resint = MultiByteToWideChar(CP_ACP, 0, buffer_dirA, -1, buffer_dirW, MAX_PATH); + ok(res, "returned %u with %u (expected '!= 0')\n", resint, GetLastError()); + if (resint == 0) return; + + SetLastError(0xdeadbeef); + resint = MultiByteToWideChar(CP_ACP, 0, buffer_fileA, -1, buffer_fileW, MAX_PATH); + ok(res, "returned %u with %u (expected '!= 0')\n", resint, GetLastError()); + if (resint == 0) return; + + tempdirA = buffer_dirA; + tempfileA = buffer_fileA; + tempdirW = buffer_dirW; + tempfileW = buffer_fileW; + trace("tempfile: '%s'\n", tempfileA); +} + +/* ########################### */ static void test_AddMonitor(void) { @@ -1625,6 +1678,115 @@ static void test_XcvDataW_MonitorUI(void /* ########################### */ +static void test_XcvDataW_PortIsValid(void) +{ + DWORD res; + HANDLE hXcv; + DWORD needed; + DWORD status; + PRINTER_DEFAULTSA pd; + + /* api is not present before w2k */ + if (pXcvDataW == NULL) return; + + pd.pDatatype = NULL; + pd.pDevMode = NULL; + pd.DesiredAccess = SERVER_ACCESS_ADMINISTER; + + hXcv = (HANDLE) 0; + SetLastError(0xdeadbeef); + res = OpenPrinter(xcv_localport, &hXcv, &pd); + + RETURN_ON_DEACTIVATED_SPOOLER(res) + ok(res, "returned %d with %u and handle %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + + /* "PDWORD needed" is always required */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, NULL, &status); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError(), needed, status); + + /* an empty name is not allowed */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) emptyW, sizeof(emptyW), NULL, 0, &needed, &status); + ok( res && (status == ERROR_PATH_NOT_FOUND), + "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_PATH_NOT_FOUND)\n", + res, GetLastError(), needed, status); + + /* a directory is not allowed */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) tempdirW, (lstrlenW(tempdirW) + 1) * sizeof(WCHAR), NULL, 0, &needed, &status); + /* XP: ERROR_PATH_NOT_FOUND, w2k ERROR_ACCESS_DENIED */ + ok( res && ((status == ERROR_PATH_NOT_FOUND) || (status == ERROR_ACCESS_DENIED)), + "returned %d with %u and %u for status %u (expected '!= 0' for status: " + "ERROR_PATH_NOT_FOUND or ERROR_ACCESS_DENIED)\n", + res, GetLastError(), needed, status); + + /* more valid well known Ports */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed, &status); + ok( res && (status == ERROR_SUCCESS), + "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", + res, GetLastError(), needed, status); + + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt2W, sizeof(portname_lpt2W), NULL, 0, &needed, &status); + ok( res && (status == ERROR_SUCCESS), + "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", + res, GetLastError(), needed, status); + + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_com1W, sizeof(portname_com1W), NULL, 0, &needed, &status); + ok( res && (status == ERROR_SUCCESS), + "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", + res, GetLastError(), needed, status); + + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_com2W, sizeof(portname_com2W), NULL, 0, &needed, &status); + ok( res && (status == ERROR_SUCCESS), + "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", + res, GetLastError(), needed, status); + + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_fileW, sizeof(portname_fileW), NULL, 0, &needed, &status); + ok( res && (status == ERROR_SUCCESS), + "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_SUCCESS)\n", + res, GetLastError(), needed, status); + + + /* a normal, writeable file is allowed */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed, &status); + ok( res && (status == ERROR_SUCCESS), + "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_SUCCESS)\n", + res, GetLastError(), needed, status); + + ClosePrinter(hXcv); +} + +/* ########################### */ + static void test_GetPrinterDriver(void) { HANDLE hprn; @@ -1836,6 +1998,7 @@ START_TEST(info) find_default_printer(); find_local_server(); + find_tempfile(); test_AddMonitor(); test_AddPort(); @@ -1855,4 +2018,5 @@ START_TEST(info) test_GetPrinterDriver(); test_SetDefaultPrinter(); test_XcvDataW_MonitorUI(); + test_XcvDataW_PortIsValid(); }

1 0

Detlef Riekenberg : winspool/tests: Add test for XcvDataW,MonitorUI.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: db9d152e4219dc23fd52e0e650a7e7a4a602fe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9d152e4219dc23fd52e0e65… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 2 00:46:03 2007 +0100 winspool/tests: Add test for XcvDataW,MonitorUI. --- dlls/winspool.drv/tests/info.c | 138 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 134 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 888a7d6..74d17e5 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -44,11 +44,20 @@ static CHAR portname_file[] = "FILE: static CHAR portname_lpt1[] = "LPT1:"; static CHAR server_does_not_exist[] = "\\does_not_exist"; static CHAR version_dll[] = "version.dll"; -static CHAR winetest[] = "winetest"; +static CHAR winetest[] = "winetest"; +static CHAR xcv_localport[] = ",XcvMonitor Local Port"; + +static WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; +static WCHAR emptyW[] = {0}; + static HANDLE hwinspool; static FARPROC pGetDefaultPrinterA; static FARPROC pSetDefaultPrinterA; +static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); + + +/* ################################ */ struct monitor_entry { LPSTR env; @@ -1496,6 +1505,126 @@ static void test_SetDefaultPrinter(void) } +/* ########################### */ + +static void test_XcvDataW_MonitorUI(void) +{ + DWORD res; + HANDLE hXcv; + BYTE buffer[MAX_PATH + 4]; + DWORD needed; + DWORD status; + DWORD len; + PRINTER_DEFAULTSA pd; + + /* api is not present before w2k */ + if (pXcvDataW == NULL) return; + + pd.pDatatype = NULL; + pd.pDevMode = NULL; + pd.DesiredAccess = SERVER_ACCESS_ADMINISTER; + + hXcv = NULL; + SetLastError(0xdeadbeef); + res = OpenPrinter(xcv_localport, &hXcv, &pd); + RETURN_ON_DEACTIVATED_SPOOLER(res) + ok(res, "returned %d with %u and handle %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* ask for needed size */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, NULL, 0, &needed, &status); + ok( res && (status == ERROR_INSUFFICIENT_BUFFER) && (needed <= MAX_PATH), + "returned %d with %u and %u for status %u (expected '!= 0' and " + "'<= MAX_PATH' for status ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError(), needed, status); + + if (needed > MAX_PATH) { + ClosePrinter(hXcv); + skip("buffer overflow (%u)\n", needed); + return; + } + len = needed; /* Size is in bytes */ + + /* the command is required */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, emptyW, NULL, 0, NULL, 0, &needed, &status); + ok( res && (status == ERROR_INVALID_PARAMETER), + "returned %d with %u and %u for status %u (expected '!= 0' with " + "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); + + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, NULL, NULL, 0, buffer, MAX_PATH, &needed, &status); + ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), + "returned %d with %u and %u for status %u (expected '0' with " + "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); + + /* "PDWORD needed" is checked before RPC-Errors */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL, &status); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %d with %u and %u for status %u (expected '0' with " + "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); + + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed, &status); + ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), + "returned %d with %u and %u for status %u (expected '0' with " + "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); + + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, &needed, NULL); + ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), + "returned %d with %u and %u for status %u (expected '0' with " + "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); + + /* off by one: larger */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len+1, &needed, &status); + ok( res && (status == ERROR_SUCCESS), + "returned %d with %u and %u for status %u (expected '!= 0' for status " + "ERROR_SUCCESS)\n", res, GetLastError(), needed, status); + + /* off by one: smaller */ + /* the buffer is not modified for NT4, w2k, XP */ + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len-1, &needed, &status); + ok( res && (status == ERROR_INSUFFICIENT_BUFFER), + "returned %d with %u and %u for status %u (expected '!= 0' for status " + "ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError(), needed, status); + + + /* Normal use. The DLL-Name without a Path is returned */ + memset(buffer, 0, len); + needed = (DWORD) 0xdeadbeef; + status = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, &needed, &status); + ok( res && (status == ERROR_SUCCESS), + "returned %d with %u and %u for status %u (expected '!= 0' for status " + "ERROR_SUCCESS)\n", res, GetLastError(), needed, status); + + ClosePrinter(hXcv); +} + +/* ########################### */ + static void test_GetPrinterDriver(void) { HANDLE hprn; @@ -1703,6 +1832,7 @@ START_TEST(info) hwinspool = GetModuleHandleA("winspool.drv"); pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); + pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); find_default_printer(); find_local_server(); @@ -1715,14 +1845,14 @@ START_TEST(info) test_DocumentProperties(); test_EnumForms(NULL); if (default_printer) test_EnumForms(default_printer); - test_EnumMonitors(); + test_EnumMonitors(); test_EnumPorts(); + test_EnumPrinters(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory(); test_GetPrintProcessorDirectory(); test_OpenPrinter(); test_GetPrinterDriver(); test_SetDefaultPrinter(); - - test_EnumPrinters(); + test_XcvDataW_MonitorUI(); }

1 0

Andrew Talbot : wtsapi32: Declare a variable static.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 7e13c16cbcc2b0b96da8f9216bb7c809ee7358d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e13c16cbcc2b0b96da8f9216… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Feb 3 14:25:13 2007 +0000 wtsapi32: Declare a variable static. --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 91b1aa4..cec23ee 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); -HMODULE WTSAPI32_hModule = 0; +static HMODULE WTSAPI32_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0