November 2006 - Wine-commits

Detlef Riekenberg : winspool/tests: Add initial tests for AddPort.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: 13892639b42214bc31436847544f2277d6cb5ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13892639b42214bc314368475… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 28 00:50:57 2006 +0100 winspool/tests: Add initial tests for AddPort. --- dlls/winspool.drv/tests/info.c | 41 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index e80eea3..b9c4807 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -327,6 +327,46 @@ static void test_AddMonitor(void) /* ########################### */ +static void test_AddPort(void) +{ + DWORD res; + + SetLastError(0xdeadbeef); + res = AddPortA(NULL, 0, NULL); + RETURN_ON_DEACTIVATED_SPOOLER(res) + /* NT: RPC_X_NULL_REF_POINTER, 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + + SetLastError(0xdeadbeef); + res = AddPortA(NULL, 0, empty); + /* Allowed only for (Printer-)Administrators */ + if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { + trace("skip tests (ACCESS_DENIED)\n"); + return; + } + /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + + SetLastError(0xdeadbeef); + res = AddPortA(NULL, 0, does_not_exist); + /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + +} + +/* ########################### */ + static void test_ConfigurePort(void) { DWORD res; @@ -1609,6 +1649,7 @@ START_TEST(info) default_printer = find_default_printer(); test_AddMonitor(); + test_AddPort(); test_ConfigurePort(); test_DeleteMonitor(); test_DeletePort();

1 0

Detlef Riekenberg : winspool: Implement AddPortA.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: 1f3c289a3098d99aeb3141ddc63d2421b0632bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3c289a3098d99aeb3141ddc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 28 00:49:54 2006 +0100 winspool: Implement AddPortA. --- dlls/winspool.drv/info.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index eb84e6f..bf7015c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5754,8 +5754,28 @@ BOOL WINAPI AbortPrinter( HANDLE hPrinte */ BOOL WINAPI AddPortA(LPSTR pName, HWND hWnd, LPSTR pMonitorName) { - FIXME("(%s, %p, %s), stub!\n",debugstr_a(pName),hWnd,debugstr_a(pMonitorName)); - return FALSE; + LPWSTR nameW = NULL; + LPWSTR monitorW = NULL; + DWORD len; + BOOL res; + + TRACE("(%s, %p, %s)\n",debugstr_a(pName), hWnd, debugstr_a(pMonitorName)); + + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + + if (pMonitorName) { + len = MultiByteToWideChar(CP_ACP, 0, pMonitorName, -1, NULL, 0); + monitorW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pMonitorName, -1, monitorW, len); + } + res = AddPortW(nameW, hWnd, monitorW); + HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, monitorW); + return res; } /******************************************************************************

1 0

Detlef Riekenberg : winspool: Implement AddPortW.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: 03daa6088c11641e4457b1870fa2ba80c2806cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=03daa6088c11641e4457b1870… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 28 00:49:06 2006 +0100 winspool: Implement AddPortW. --- dlls/winspool.drv/info.c | 43 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d945b0b..eb84e6f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5772,14 +5772,47 @@ BOOL WINAPI AddPortA(LPSTR pName, HWND h * Success: TRUE * Failure: FALSE * - * BUGS - * only a Stub - * */ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) { - FIXME("(%s, %p, %s), stub!\n",debugstr_w(pName),hWnd,debugstr_w(pMonitorName)); - return FALSE; + monitor_t * pm; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pMonitorName)); + + if (pName && pName[0]) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!pMonitorName) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + + /* an empty Monitorname is Invalid */ + if (!pMonitorName[0]) goto cleanup; + + pm = monitor_load(pMonitorName, NULL); + if (pm && pm->monitor) { + if (pm->monitor->pfnAddPort != NULL) { + res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); + TRACE("got %d with %d\n", res, GetLastError()); + } + else if (pm->monitor->pfnXcvOpenPort != NULL) + { + FIXME("XcvOpenPort not implemented (dwMonitorSize: %d)\n", pm->dwMonitorSize); + } + /* invalidate cached PORT_INFO_2W */ + if (res == ROUTER_SUCCESS) monitor_flush(pm); + } + monitor_unload(pm); + +cleanup: + /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ + if (res == ROUTER_UNKNOWN) SetLastError(ERROR_NOT_SUPPORTED); + TRACE("returning %d with %d\n", (res == ROUTER_SUCCESS), GetLastError()); + return (res == ROUTER_SUCCESS); } /******************************************************************************

1 0

Detlef Riekenberg : winspool/tests: Add initial test for DeletePort.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: df4d29312f8053ae8ce91fd1f94ac79fa7a53e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4d29312f8053ae8ce91fd1f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 28 00:48:04 2006 +0100 winspool/tests: Add initial test for DeletePort. --- dlls/winspool.drv/tests/info.c | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 89b4a30..e80eea3 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -472,7 +472,41 @@ static void test_DeleteMonitor(void) DeleteMonitorA(NULL, entry->env, winetest_monitor); } -/* ######## */ +/* ########################### */ + +static void test_DeletePort(void) +{ + DWORD res; + + SetLastError(0xdeadbeef); + res = DeletePortA(NULL, 0, NULL); + RETURN_ON_DEACTIVATED_SPOOLER(res) + + SetLastError(0xdeadbeef); + res = DeletePortA(NULL, 0, empty); + /* Allowed only for (Printer-)Administrators */ + if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { + trace("skip tests (ACCESS_DENIED)\n"); + return; + } + /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + + SetLastError(0xdeadbeef); + res = DeletePortA(NULL, 0, does_not_exist); + /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " \ + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + +} + +/* ########################### */ static void test_EnumForms(LPSTR pName) { @@ -1577,6 +1611,7 @@ START_TEST(info) test_AddMonitor(); test_ConfigurePort(); test_DeleteMonitor(); + test_DeletePort(); test_DocumentProperties(); test_EnumForms(NULL); if (default_printer) test_EnumForms(default_printer);

1 0

Detlef Riekenberg : winspool: Implement DeletePortW.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: c587d1ad0d821f5b698953637586e4c565458989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c587d1ad0d821f5b698953637… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 28 00:46:28 2006 +0100 winspool: Implement DeletePortW. --- dlls/winspool.drv/info.c | 71 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 62 insertions(+), 9 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e1d39ef..67303ef 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -887,6 +887,28 @@ static DWORD get_local_monitors(DWORD le } /****************************************************************** + * monitor_flush [internal] + * + * flush the cached PORT_INFO_2W - data + */ + +void monitor_flush(monitor_t * pm) +{ + if (!pm) return; + + EnterCriticalSection(&monitor_handles_cs); + + TRACE("%p (%s) cache: %p (%d, %d)\n", pm, debugstr_w(pm->name), pm->cache, pm->pi1_needed, pm->pi2_needed); + + HeapFree(GetProcessHeap(), 0, pm->cache); + pm->cache = NULL; + pm->pi1_needed = 0; + pm->pi2_needed = 0; + pm->returned = 0; + LeaveCriticalSection(&monitor_handles_cs); +} + +/****************************************************************** * monitor_unload [internal] * * release a printmonitor and unload it from memory, when needed @@ -2148,17 +2170,48 @@ DeletePortA (LPSTR pName, HWND hWnd, LPS * Success: TRUE * Failure: FALSE * - * BUGS - * only a Stub - * */ -BOOL WINAPI -DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName) +BOOL WINAPI DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName) { - FIXME("(%s,%p,%s):stub\n",debugstr_w(pName),hWnd, - debugstr_w(pPortName)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + monitor_t * pm; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + + if (pName && pName[0]) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!pPortName) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + + /* an empty Portname is Invalid */ + if (!pPortName[0]) goto cleanup; + + pm = monitor_load_by_port(pPortName); + if (pm && pm->monitor) { + if (pm->monitor->pfnDeletePort != NULL) { + TRACE("Using %s for %s:\n", debugstr_w(pm->name), debugstr_w(pPortName)); + res = pm->monitor->pfnDeletePort(pName, hWnd, pPortName); + TRACE("got %d with %d\n", res, GetLastError()); + } + else if (pm->monitor->pfnXcvOpenPort) + { + FIXME("XcvOpenPort not implemented (dwMonitorSize: %d)\n", pm->dwMonitorSize); + } + /* invalidate cached PORT_INFO_2W */ + if (res == ROUTER_SUCCESS) monitor_flush(pm); + } + monitor_unload(pm); + +cleanup: + /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ + if (res == ROUTER_UNKNOWN) SetLastError(ERROR_NOT_SUPPORTED); + TRACE("returning %d with %d\n", (res == ROUTER_SUCCESS), GetLastError()); + return (res == ROUTER_SUCCESS); } /******************************************************************************

1 0

Detlef Riekenberg : winspool: Implement DeletePortA.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: bcfa90e1827a0e204df62caf857240d3ed5811fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfa90e1827a0e204df62caf8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 28 00:47:08 2006 +0100 winspool: Implement DeletePortA. --- dlls/winspool.drv/info.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 67303ef..d945b0b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2147,13 +2147,33 @@ BOOL WINAPI DeleteMonitorW (LPWSTR pName * See DeletePortW. * */ -BOOL WINAPI -DeletePortA (LPSTR pName, HWND hWnd, LPSTR pPortName) +BOOL WINAPI DeletePortA (LPSTR pName, HWND hWnd, LPSTR pPortName) { - FIXME("(%s,%p,%s):stub\n",debugstr_a(pName),hWnd, - debugstr_a(pPortName)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPWSTR nameW = NULL; + LPWSTR portW = NULL; + INT len; + DWORD res; + + TRACE("(%s, %p, %s)\n", debugstr_a(pName), hWnd, debugstr_a(pPortName)); + + /* convert servername to unicode */ + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + + /* convert portname to unicode */ + if (pPortName) { + len = MultiByteToWideChar(CP_ACP, 0, pPortName, -1, NULL, 0); + portW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pPortName, -1, portW, len); + } + + res = DeletePortW(nameW, hWnd, portW); + HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, portW); + return res; } /******************************************************************

1 0

Christian Gmeiner : setupapi: Added AssertFail stub.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: 3d11b8650c4392043b0d84850011b1c19b75d589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d11b8650c4392043b0d84850… Author: Christian Gmeiner <christian.gmeiner(a)students.fhv.at> Date: Mon Nov 27 14:02:53 2006 +0100 setupapi: Added AssertFail stub. --- dlls/setupapi/misc.c | 16 ++++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 61b0fec..d7febe5 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -861,3 +861,19 @@ DWORD WINAPI CMP_WaitNoPendingInstallEve FIXME("%d\n", dwTimeout); return WAIT_OBJECT_0; } + +/*********************************************************************** + * AssertFail (SETUPAPI.@) + * + * Shows an assert fail error messagebox + * + * PARAMS + * lpFile [I] file where assert failed + * uLine [I] line number in file + * lpMessage [I] assert message + * + */ +void WINAPI AssertFail(LPCSTR lpFile, UINT uLine, LPCSTR lpMessage) +{ + FIXME("%s %u %s\n", lpFile, uLine, lpMessage); +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index f5e63fb..2c6672d 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -2,7 +2,7 @@ @ stub AddMiniIconToList @ stub AddTagToGroupOrderListEntry @ stub AppendStringToMultiSz -@ stub AssertFail +@ stdcall AssertFail(str long str) @ stub CMP_Init_Detection @ stub CMP_RegisterNotification @ stub CMP_Report_LogOn

1 0

Pierre d'Herbemont : user32: Factorize driver's SetWindowPos in user32.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: e5e58a6b136628cf46ff836aed19d611fbe9fd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e58a6b136628cf46ff836ae… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Sun Nov 26 23:21:02 2006 +0100 user32: Factorize driver's SetWindowPos in user32. --- dlls/user32/driver.c | 8 +- dlls/user32/message.c | 2 +- dlls/user32/user_private.h | 4 +- dlls/user32/winpos.c | 433 +++++++++++++++++++++++++++++++++++- dlls/winex11.drv/window.c | 8 +- dlls/winex11.drv/winex11.drv.spec | 2 +- dlls/winex11.drv/winpos.c | 452 +------------------------------------ dlls/winex11.drv/x11drv.h | 2 +- 8 files changed, 453 insertions(+), 458 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5e58a6b136628cf46ff8…

1 0

Dmitry Timoshkov : winedos: Make some data const.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: c9a57ee1969f1f80095204b9a23e4f13521e3865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a57ee1969f1f80095204b9a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:03:59 2006 +0800 winedos: Make some data const. --- dlls/winedos/devices.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index 30aba05..bf6e0ba 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -83,7 +83,7 @@ static void WINAPI con_strategy(CONTEXT8 static void WINAPI con_interrupt(CONTEXT86*ctx); /* devices */ -static WINEDEV devs[] = +static const WINEDEV devs[] = { { "NUL ", ATTR_CHAR|ATTR_NUL|ATTR_DEVICE,

1 0

Dmitry Timoshkov : dsound: Make some data const.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: 616b65532b3ac85c8d193ebd2e9d867796b35250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=616b65532b3ac85c8d193ebd2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:05:06 2006 +0800 dsound: Make some data const. --- dlls/dsound/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 83181c3..68b1f06 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -78,7 +78,7 @@ DirectSoundCaptureDevice * DSOUND_captur static HRESULT DirectSoundCaptureDevice_Create(DirectSoundCaptureDevice ** ppDevice); -static const char * captureStateString[] = { +static const char * const captureStateString[] = { "STATE_STOPPED", "STATE_STARTING", "STATE_CAPTURING",

1 0