winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2006
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
792 discussions
Start a n
N
ew thread
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
Dmitry Timoshkov : comdlg32: Make some data const.
by Alexandre Julliard
29 Nov '06
29 Nov '06
Module: wine Branch: master Commit: d0db296db0bd0b4911783e425dbfabb422cb9822 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d0db296db0bd0b4911783e425…
Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:04:52 2006 +0800 comdlg32: Make some data const. --- dlls/comdlg32/cdlg32.c | 2 +- dlls/comdlg32/filedlg.c | 4 ++-- dlls/comdlg32/fontdlg.c | 2 +- dlls/comdlg32/printdlg.c | 10 +++++----- dlls/comdlg32/printdlg.h | 2 +- dlls/comdlg32/printdlg16.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index c8a7e76..91144a8 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -63,7 +63,7 @@ BOOL (WINAPI *COMDLG32_SHGetFolderPathW) * FALSE if sibling could not be loaded or instantiated twice, TRUE * otherwise. */ -static const char * GPA_string = "Failed to get entry point %s for hinst = 0x%08x\n"; +static const char GPA_string[] = "Failed to get entry point %s for hinst = %p\n"; #define GPA(dest, hinst, name) \ if(!(dest = (void*)GetProcAddress(hinst,name)))\ { \ diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5410bf9..68887d2 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -175,8 +175,8 @@ typedef struct tagFD32_PRIVATE #define CBSetExtendedUI(hwnd,flag) \ SendMessageA(hwnd,CB_SETEXTENDEDUI,(WPARAM)(flag),0) -const char *FileOpenDlgInfosStr = "FileOpenDlgInfos"; /* windows property description string */ -const char *LookInInfosStr = "LookInInfos"; /* LOOKIN combo box property */ +const char FileOpenDlgInfosStr[] = "FileOpenDlgInfos"; /* windows property description string */ +static const char LookInInfosStr[] = "LookInInfos"; /* LOOKIN combo box property */ /*********************************************************************** * Prototypes diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 9bfbfa2..510d4de 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -88,7 +88,7 @@ static const WCHAR stIso88594[]={'A','a' static const WCHAR stIso885910[]={'A','a','B','b',0}; /* ISO-8859-10 */ static const WCHAR stCeltic[]={'A','a','B','b',0};/* Celtic */ -static const WCHAR *sample_lang_text[]={ +static const WCHAR * const sample_lang_text[]={ stWestern,stSymbol,stShiftJis,stHangul,stGB2312, stBIG5,stGreek,stTurkish,stHebrew,stArabic, stBaltic,stVietname,stCyrillic,stEastEur,stThai, diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 3977b5f..6b6a725 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define MAX_COPIES 9999 /* Debugging info */ -static struct pd_flags psd_flags[] = { +static const struct pd_flags psd_flags[] = { {PSD_MINMARGINS,"PSD_MINMARGINS"}, {PSD_MARGINS,"PSD_MARGINS"}, {PSD_INTHOUSANDTHSOFINCHES,"PSD_INTHOUSANDTHSOFINCHES"}, @@ -1999,7 +1999,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; - struct pd_flags *pflag = pd_flags; + const struct pd_flags *pflag = pd_flags; for( ; pflag->name; pflag++) { if(lppd->Flags & pflag->flag) strcat(flagstr, pflag->name); @@ -2141,7 +2141,7 @@ BOOL WINAPI PrintDlgW( if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; - struct pd_flags *pflag = pd_flags; + const struct pd_flags *pflag = pd_flags; for( ; pflag->name; pflag++) { if(lppd->Flags & pflag->flag) strcat(flagstr, pflag->name); @@ -3335,7 +3335,7 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLG /* TRACE */ if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; - struct pd_flags *pflag = psd_flags; + const struct pd_flags *pflag = psd_flags; for( ; pflag->name; pflag++) { if(setupdlg->Flags & pflag->flag) { strcat(flagstr, pflag->name); @@ -3437,7 +3437,7 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLG FIXME("Unicode implementation is not done yet\n"); if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; - struct pd_flags *pflag = psd_flags; + const struct pd_flags *pflag = psd_flags; for( ; pflag->name; pflag++) { if(setupdlg->Flags & pflag->flag) { strcat(flagstr, pflag->name); diff --git a/dlls/comdlg32/printdlg.h b/dlls/comdlg32/printdlg.h index 4977297..77a39f9 100644 --- a/dlls/comdlg32/printdlg.h +++ b/dlls/comdlg32/printdlg.h @@ -59,7 +59,7 @@ typedef struct } PRINT_PTRW; /* Debugging info */ -static struct pd_flags { +static const struct pd_flags { DWORD flag; LPCSTR name; } pd_flags[] = { diff --git a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c index 86b16cf..a84ee6a 100644 --- a/dlls/comdlg32/printdlg16.c +++ b/dlls/comdlg32/printdlg16.c @@ -349,7 +349,7 @@ BOOL16 WINAPI PrintDlg16( if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; - struct pd_flags *pflag = pd_flags; + const struct pd_flags *pflag = pd_flags; for( ; pflag->name; pflag++) { if(lppd->Flags & pflag->flag) strcat(flagstr, pflag->name);
1
0
0
0
Dmitry Timoshkov : advapi32: Make some data const.
by Alexandre Julliard
29 Nov '06
29 Nov '06
Module: wine Branch: master Commit: e5b4b47c16dc57cdae8c82d0eab0198cb0c01395 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e5b4b47c16dc57cdae8c82d0e…
Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:04:27 2006 +0800 advapi32: Make some data const. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 20f6a7c..54b0bfb 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -73,7 +73,7 @@ static const WCHAR name_CURRENT_CONFIG[] static const WCHAR name_DYN_DATA[] = {'D','y','n','D','a','t','a',0}; -static const WCHAR *root_key_names[NB_SPECIAL_ROOT_KEYS] = +static const WCHAR * const root_key_names[NB_SPECIAL_ROOT_KEYS] = { name_CLASSES_ROOT, NULL, /* HKEY_CURRENT_USER is determined dynamically */
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
...
80
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
Results per page:
10
25
50
100
200