February 2007 - Wine-commits

Detlef Riekenberg : localspl/tests: Add tests for XcvDataPort_ConfigureLPTPortCommandOK.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: d364b0e7f887fc575c640c9cba9fa2381b5e7fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d364b0e7f887fc575c640c9cb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 20 00:00:56 2007 +0100 localspl/tests: Add tests for XcvDataPort_ConfigureLPTPortCommandOK. --- dlls/localspl/tests/localmon.c | 116 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 131e4e6..7dd808a 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -66,6 +66,9 @@ static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); +static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', + 'L','P','T','P','o','r','t', + 'C','o','m','m','a','n','d','O','K',0}; static WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', 'T','r','a','n','s','m','i','s','s','i','o','n', 'R','e','t','r','y','T','i','m','e','o','u','t',0}; @@ -85,9 +88,13 @@ static WCHAR Monitors_LocalPortW[] = { 'L','o','c','a','l',' ','P','o','r','t',0}; static CHAR num_0A[] = "0"; +static WCHAR num_0W[] = {'0',0}; static CHAR num_1A[] = "1"; +static WCHAR num_1W[] = {'1',0}; static CHAR num_999999A[] = "999999"; +static WCHAR num_999999W[] = {'9','9','9','9','9','9',0}; static CHAR num_1000000A[] = "1000000"; +static WCHAR num_1000000W[] = {'1','0','0','0','0','0','0',0}; static WCHAR portname_com1W[] = {'C','O','M','1',':',0}; static WCHAR portname_com2W[] = {'C','O','M','2',':',0}; @@ -368,6 +375,114 @@ static void test_XcvClosePort(void) /* ########################### */ +static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) +{ + CHAR org_value[16]; + CHAR buffer[16]; + HKEY hroot = NULL; + HANDLE hXcv; + DWORD res; + DWORD needed; + + if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; + + hXcv = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + ok(res, "hXcv: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* Read the original value from the registry */ + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, WinNT_CV_WindowsA, 0, KEY_ALL_ACCESS, &hroot); + if (res == ERROR_ACCESS_DENIED) { + pXcvClosePort(hXcv); + skip("ACCESS_DENIED\n"); + return; + } + + if (res != ERROR_SUCCESS) { + /* unable to open the registry: skip the test */ + pXcvClosePort(hXcv); + skip("got %d\n", res); + return; + } + org_value[0] = '\0'; + needed = sizeof(org_value)-1 ; + res = RegQueryValueExA(hroot, TransmissionRetryTimeoutA, NULL, NULL, (PBYTE) org_value, &needed); + ok( (res == ERROR_SUCCESS) || (res == ERROR_FILE_NOT_FOUND), + "returned %u and %u for \"%s\" (expected ERROR_SUCCESS or " + "ERROR_FILE_NOT_FOUND)\n", res, needed, org_value); + + RegDeleteValueA(hroot, TransmissionRetryTimeoutA); + + /* set to "0" */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_ConfigureLPTPortCommandOKW, (PBYTE) num_0W, sizeof(num_0W), NULL, 0, &needed); + if (res == ERROR_INVALID_PARAMETER) { + pXcvClosePort(hXcv); + skip("'ConfigureLPTPortCommandOK' not supported\n"); + return; + } + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); + needed = sizeof(buffer)-1 ; + res = RegQueryValueExA(hroot, TransmissionRetryTimeoutA, NULL, NULL, (PBYTE) buffer, &needed); + ok( (res == ERROR_SUCCESS) && (lstrcmpA(buffer, num_0A) == 0), + "returned %d and '%s' (expected ERROR_SUCCESS and '%s')\n", + res, buffer, num_0A); + + + /* set to "1" */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_ConfigureLPTPortCommandOKW, (PBYTE) num_1W, sizeof(num_1W), NULL, 0, &needed); + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); + needed = sizeof(buffer)-1 ; + res = RegQueryValueExA(hroot, TransmissionRetryTimeoutA, NULL, NULL, (PBYTE) buffer, &needed); + ok( (res == ERROR_SUCCESS) && (lstrcmpA(buffer, num_1A) == 0), + "returned %d and '%s' (expected ERROR_SUCCESS and '%s')\n", + res, buffer, num_1A); + + /* set to "999999" */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_ConfigureLPTPortCommandOKW, (PBYTE) num_999999W, sizeof(num_999999W), NULL, 0, &needed); + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); + needed = sizeof(buffer)-1 ; + res = RegQueryValueExA(hroot, TransmissionRetryTimeoutA, NULL, NULL, (PBYTE) buffer, &needed); + ok( (res == ERROR_SUCCESS) && (lstrcmpA(buffer, num_999999A) == 0), + "returned %d and '%s' (expected ERROR_SUCCESS and '%s')\n", + res, buffer, num_999999A); + + /* set to "1000000" */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_ConfigureLPTPortCommandOKW, (PBYTE) num_1000000W, sizeof(num_1000000W), NULL, 0, &needed); + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); + needed = sizeof(buffer)-1 ; + res = RegQueryValueExA(hroot, TransmissionRetryTimeoutA, NULL, NULL, (PBYTE) buffer, &needed); + ok( (res == ERROR_SUCCESS) && (lstrcmpA(buffer, num_1000000A) == 0), + "returned %d and '%s' (expected ERROR_SUCCESS and '%s')\n", + res, buffer, num_1000000A); + + /* using cmd_ConfigureLPTPortCommandOKW with does_not_existW: + the string "does_not_exist" is written to the registry */ + + + /* restore the original value */ + RegDeleteValueA(hroot, TransmissionRetryTimeoutA); + if (org_value[0]) { + res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)org_value, lstrlenA(org_value)+1); + ok(res == ERROR_SUCCESS, "unable to restore original value (got %u): %s\n", res, org_value); + } + + RegCloseKey(hroot); + pXcvClosePort(hXcv); + +} + +/* ########################### */ + static void test_XcvDataPort_GetTransmissionRetryTimeout(void) { CHAR org_value[16]; @@ -923,6 +1038,7 @@ START_TEST(localmon) test_DeletePort(); test_EnumPorts(); test_XcvClosePort(); + test_XcvDataPort_ConfigureLPTPortCommandOK(); test_XcvDataPort_GetTransmissionRetryTimeout(); test_XcvDataPort_MonitorUI(); test_XcvDataPort_PortIsValid();

1 0

Detlef Riekenberg : localspl: Implement ConfigureLPTPortCommandOK for XcvDataPort.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 00cee045c0290839a307fb8ea5cff23df3eb92a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00cee045c0290839a307fb8ea… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 20 00:00:40 2007 +0100 localspl: Implement ConfigureLPTPortCommandOK for XcvDataPort. --- dlls/localspl/localmon.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index e1c8fc9..fc57217 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -64,6 +64,10 @@ typedef struct { static struct list xcv_handles = LIST_INIT( xcv_handles ); /* ############################### */ + +static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', + 'L','P','T','P','o','r','t', + 'C','o','m','m','a','n','d','O','K',0}; static const WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', 'T','r','a','n','s','m','i','s','s','i','o','n', 'R','e','t','r','y','T','i','m','e','o','u','t',0}; @@ -445,6 +449,16 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInput TRACE("(%p, %s, %p, %d, %p, %d, %p)\n", hXcv, debugstr_w(pszDataName), pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + if (!lstrcmpW(pszDataName, cmd_ConfigureLPTPortCommandOKW)) { + TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData)); + res = RegCreateKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_WindowsW, &hroot); + if (res == ERROR_SUCCESS) { + res = RegSetValueExW(hroot, TransmissionRetryTimeoutW, 0, REG_SZ, pInputData, cbInputData); + RegCloseKey(hroot); + } + return res; + } + if (!lstrcmpW(pszDataName, cmd_GetTransmissionRetryTimeoutW)) { * pcbOutputNeeded = sizeof(DWORD); if (cbOutputData >= sizeof(DWORD)) {

1 0

Detlef Riekenberg : localspl/tests: Add tests for XcvDataPort_GetTransmissionRetryTimeout.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 27b34d84d8e23a6279ebf1fce6bb866873d16f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b34d84d8e23a6279ebf1fce… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 20 00:00:24 2007 +0100 localspl/tests: Add tests for XcvDataPort_GetTransmissionRetryTimeout. --- dlls/localspl/tests/Makefile.in | 2 +- dlls/localspl/tests/localmon.c | 149 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/tests/Makefile.in b/dlls/localspl/tests/Makefile.in index 2d70a62..49e849b 100644 --- a/dlls/localspl/tests/Makefile.in +++ b/dlls/localspl/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = localspl.dll -IMPORTS = kernel32 +IMPORTS = kernel32 advapi32 CTESTS = \ localmon.c diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 657eba8..131e4e6 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -65,10 +65,16 @@ static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); + +static WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', + 'T','r','a','n','s','m','i','s','s','i','o','n', + 'R','e','t','r','y','T','i','m','e','o','u','t',0}; + static WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; static WCHAR cmd_MonitorUI_lcaseW[] = {'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 does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; +static CHAR emptyA[] = ""; static WCHAR emptyW[] = {0}; static WCHAR Monitors_LocalPortW[] = { 'S','y','s','t','e','m','\\', @@ -78,12 +84,26 @@ static WCHAR Monitors_LocalPortW[] = { 'M','o','n','i','t','o','r','s','\\', 'L','o','c','a','l',' ','P','o','r','t',0}; +static CHAR num_0A[] = "0"; +static CHAR num_1A[] = "1"; +static CHAR num_999999A[] = "999999"; +static CHAR num_1000000A[] = "1000000"; + 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 WCHAR server_does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; + +static CHAR TransmissionRetryTimeoutA[] = {'T','r','a','n','s','m','i','s','s','i','o','n', + 'R','e','t','r','y','T','i','m','e','o','u','t',0}; + +static CHAR WinNT_CV_WindowsA[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'W','i','n','d','o','w','s',0}; static WCHAR wineW[] = {'W','i','n','e',0}; static WCHAR tempdirW[MAX_PATH]; @@ -348,6 +368,134 @@ static void test_XcvClosePort(void) /* ########################### */ +static void test_XcvDataPort_GetTransmissionRetryTimeout(void) +{ + CHAR org_value[16]; + HKEY hroot = NULL; + HANDLE hXcv; + DWORD buffer[2]; + DWORD res; + DWORD needed; + DWORD len; + + + if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; + + hXcv = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + ok(res, "hXcv: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* ask for needed size */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_GetTransmissionRetryTimeoutW, NULL, 0, NULL, 0, &needed); + if (res == ERROR_INVALID_PARAMETER) { + pXcvClosePort(hXcv); + skip("'GetTransmissionRetryTimeout' not supported\n"); + return; + } + len = sizeof(DWORD); + ok( (res == ERROR_INSUFFICIENT_BUFFER) && (needed == len), + "returned %d with %u and %u (expected ERROR_INSUFFICIENT_BUFFER " + "and '%u')\n", res, GetLastError(), needed, len); + len = needed; + + /* Read the original value from the registry */ + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, WinNT_CV_WindowsA, 0, KEY_ALL_ACCESS, &hroot); + if (res == ERROR_ACCESS_DENIED) { + pXcvClosePort(hXcv); + skip("ACCESS_DENIED\n"); + return; + } + + if (res != ERROR_SUCCESS) { + /* unable to open the registry: skip the test */ + pXcvClosePort(hXcv); + skip("got %d\n", res); + return; + } + + org_value[0] = '\0'; + needed = sizeof(org_value)-1 ; + res = RegQueryValueExA(hroot, TransmissionRetryTimeoutA, NULL, NULL, (PBYTE) org_value, &needed); + ok( (res == ERROR_SUCCESS) || (res == ERROR_FILE_NOT_FOUND), + "returned %u and %u for \"%s\" (expected ERROR_SUCCESS or " + "ERROR_FILE_NOT_FOUND)\n", res, needed, org_value); + + /* Get default value (documented as 90 in the w2k reskit, but that is wrong) */ + RegDeleteValueA(hroot, TransmissionRetryTimeoutA); + needed = (DWORD) 0xdeadbeef; + buffer[0] = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_GetTransmissionRetryTimeoutW, NULL, 0, (PBYTE) buffer, len, &needed); + ok( (res == ERROR_SUCCESS) && (buffer[0] == 45), + "returned %d with %u and %u for %d\n (expected ERROR_SUCCESS " + "for '45')\n", res, GetLastError(), needed, buffer[0]); + + /* the default timeout is returned, when the value is empty */ + res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)emptyA, 1); + needed = (DWORD) 0xdeadbeef; + buffer[0] = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_GetTransmissionRetryTimeoutW, NULL, 0, (PBYTE) buffer, len, &needed); + ok( (res == ERROR_SUCCESS) && (buffer[0] == 45), + "returned %d with %u and %u for %d\n (expected ERROR_SUCCESS " + "for '45')\n", res, GetLastError(), needed, buffer[0]); + + /* the dialog is limited (1 - 999999), but that is done somewhere else */ + res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_0A, lstrlenA(num_0A)+1); + needed = (DWORD) 0xdeadbeef; + buffer[0] = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_GetTransmissionRetryTimeoutW, NULL, 0, (PBYTE) buffer, len, &needed); + ok( (res == ERROR_SUCCESS) && (buffer[0] == 0), + "returned %d with %u and %u for %d\n (expected ERROR_SUCCESS " + "for '0')\n", res, GetLastError(), needed, buffer[0]); + + + res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_1A, lstrlenA(num_1A)+1); + needed = (DWORD) 0xdeadbeef; + buffer[0] = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_GetTransmissionRetryTimeoutW, NULL, 0, (PBYTE) buffer, len, &needed); + ok( (res == ERROR_SUCCESS) && (buffer[0] == 1), + "returned %d with %u and %u for %d\n (expected 'ERROR_SUCCESS' " + "for '1')\n", res, GetLastError(), needed, buffer[0]); + + res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_999999A, lstrlenA(num_999999A)+1); + needed = (DWORD) 0xdeadbeef; + buffer[0] = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_GetTransmissionRetryTimeoutW, NULL, 0, (PBYTE) buffer, len, &needed); + ok( (res == ERROR_SUCCESS) && (buffer[0] == 999999), + "returned %d with %u and %u for %d\n (expected ERROR_SUCCESS " + "for '999999')\n", res, GetLastError(), needed, buffer[0]); + + + res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_1000000A, lstrlenA(num_1000000A)+1); + needed = (DWORD) 0xdeadbeef; + buffer[0] = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_GetTransmissionRetryTimeoutW, NULL, 0, (PBYTE) buffer, len, &needed); + ok( (res == ERROR_SUCCESS) && (buffer[0] == 1000000), + "returned %d with %u and %u for %d\n (expected ERROR_SUCCESS " + "for '1000000')\n", res, GetLastError(), needed, buffer[0]); + + /* restore the original value */ + RegDeleteValueA(hroot, TransmissionRetryTimeoutA); + if (org_value[0]) { + res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)org_value, lstrlenA(org_value)+1); + ok(res == ERROR_SUCCESS, "unable to restore original value (got %u): %s\n", res, org_value); + } + + RegCloseKey(hroot); + pXcvClosePort(hXcv); +} + +/* ########################### */ + static void test_XcvDataPort_MonitorUI(void) { DWORD res; @@ -775,6 +923,7 @@ START_TEST(localmon) test_DeletePort(); test_EnumPorts(); test_XcvClosePort(); + test_XcvDataPort_GetTransmissionRetryTimeout(); test_XcvDataPort_MonitorUI(); test_XcvDataPort_PortIsValid(); test_XcvOpenPort();

1 0

Andrew Talbot : msvfw32: Constify a variable.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: b8e73ace1cb48bc7900f0a5a7469d6fc88c9f33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e73ace1cb48bc7900f0a5a7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 19 16:35:01 2007 +0000 msvfw32: Constify a variable. --- dlls/msvfw32/msvideo16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/msvideo16.c b/dlls/msvfw32/msvideo16.c index 0974ff7..00e0889 100644 --- a/dlls/msvfw32/msvideo16.c +++ b/dlls/msvfw32/msvideo16.c @@ -767,11 +767,11 @@ LRESULT VFWAPI ICSendMessage16(HIC16 hic, UINT16 msg, DWORD lParam1, DWORD lPara DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, LPSTR buf2, WORD buf2len) { + static const char version_info_spec[] = "\\StringFileInfo\\040904E4\\FileDescription"; DWORD verhandle; DWORD infosize; UINT subblocklen; char *s, buf[2048], fn[260]; - static char version_info_spec[] = "\\StringFileInfo\\040904E4\\FileDescription"; LPBYTE infobuf; LPVOID subblock; DWORD i, cnt = 0, lRet;

1 0

Detlef Riekenberg : localspl: Implement GetTransmissionRetryTimeout for XcvDataPort.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 339a556efc3102726ded740314a3fa0d6a614a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=339a556efc3102726ded74031… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 20 00:00:18 2007 +0100 localspl: Implement GetTransmissionRetryTimeout for XcvDataPort. --- dlls/localspl/localmon.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index f7dcb62..e1c8fc9 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -64,6 +64,9 @@ typedef struct { static struct list xcv_handles = LIST_INIT( xcv_handles ); /* ############################### */ +static const WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', + 'T','r','a','n','s','m','i','s','s','i','o','n', + 'R','e','t','r','y','T','i','m','e','o','u','t',0}; static const WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; @@ -75,12 +78,21 @@ static const WCHAR portname_FILE[] = {'F','I','L','E',':',0}; static const WCHAR portname_CUPS[] = {'C','U','P','S',':',0}; static const WCHAR portname_LPR[] = {'L','P','R',':',0}; +static const WCHAR TransmissionRetryTimeoutW[] = {'T','r','a','n','s','m','i','s','s','i','o','n', + 'R','e','t','r','y','T','i','m','e','o','u','t',0}; + static const WCHAR WinNT_CV_PortsW[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'P','o','r','t','s',0}; +static const WCHAR WinNT_CV_WindowsW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'W','i','n','d','o','w','s',0}; + /****************************************************************** * display the Dialog "Nothing to configure" * @@ -424,11 +436,35 @@ BOOL WINAPI localmon_XcvClosePort(HANDLE hXcv) DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) { + WCHAR buffer[16]; /* buffer for a decimal number */ DWORD res; + DWORD needed; + HKEY hroot; + TRACE("(%p, %s, %p, %d, %p, %d, %p)\n", hXcv, debugstr_w(pszDataName), pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + if (!lstrcmpW(pszDataName, cmd_GetTransmissionRetryTimeoutW)) { + * pcbOutputNeeded = sizeof(DWORD); + if (cbOutputData >= sizeof(DWORD)) { + /* the w2k resource kit documented a default of 90, but that's wrong */ + *((LPDWORD) pOutputData) = 45; + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_WindowsW, &hroot); + if (res == ERROR_SUCCESS) { + needed = sizeof(buffer) - sizeof(WCHAR); + res = RegQueryValueExW(hroot, TransmissionRetryTimeoutW, NULL, NULL, (LPBYTE) buffer, &needed); + if ((res == ERROR_SUCCESS) && (buffer[0])) { + *((LPDWORD) pOutputData) = strtoulW(buffer, NULL, 0); + } + RegCloseKey(hroot); + } + return ERROR_SUCCESS; + } + return ERROR_INSUFFICIENT_BUFFER; + } + if (!lstrcmpW(pszDataName, cmd_MonitorUIW)) { * pcbOutputNeeded = sizeof(dllnameuiW);

1 0

Stefan Dösinger : wined3d: With FVFs only one stream is used.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: a9d681c3ad26a4ee9a1d8536116044a3352f8f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d681c3ad26a4ee9a1d85361… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:26:31 2007 +0100 wined3d: With FVFs only one stream is used. --- dlls/wined3d/drawprim.c | 83 +++++++++++++--------------------------------- 1 files changed, 24 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 7cf6877..9162c01 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -365,74 +365,39 @@ void primitiveConvertFVFtoOffset(DWORD thisFVF, DWORD stride, BYTE *data, WineDi } void primitiveConvertToStridedData(IWineD3DDevice *iface, WineDirect3DVertexStridedData *strided, BOOL *fixup) { - - short LoopThroughTo = 0; - short nStream; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; GLint streamVBO = 0; - DWORD preLoadStreams[MAX_STREAMS], numPreloadStreams = 0; - - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - - /* OK, Now to setup the data locations - For the non-created vertex shaders, the VertexShader var holds the real - FVF and only stream 0 matters - For the created vertex shaders, there is an FVF per stream */ - if (!This->stateBlock->streamIsUP && !(This->stateBlock->vertexShader == NULL)) { - LoopThroughTo = MAX_STREAMS; + DWORD stride = This->stateBlock->streamStride[0]; + BYTE *data = NULL; + DWORD thisFVF = 0; + + /* Retrieve appropriate FVF */ + thisFVF = This->stateBlock->fvf; + /* Handle memory passed directly as well as vertex buffers */ + if (This->stateBlock->streamIsUP) { + streamVBO = 0; + data = (BYTE *)This->stateBlock->streamSource[0]; } else { - LoopThroughTo = 1; + /* The for loop should iterate through here only once per stream, so we don't need magic to prevent double loading + * buffers + */ + data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[0], 0, &streamVBO); + if(fixup) { + if(streamVBO != 0 ) *fixup = TRUE; + } } + VTRACE(("FVF for stream 0 is %lx\n", thisFVF)); - /* Work through stream by stream */ - for (nStream=0; nStream<LoopThroughTo; ++nStream) { - DWORD stride = This->stateBlock->streamStride[nStream]; - BYTE *data = NULL; - DWORD thisFVF = 0; - - /* Skip empty streams */ - if (This->stateBlock->streamSource[nStream] == NULL) continue; - - /* Retrieve appropriate FVF */ - if (LoopThroughTo == 1) { /* Use FVF, not vertex shader */ - thisFVF = This->stateBlock->fvf; - /* Handle memory passed directly as well as vertex buffers */ - if (This->stateBlock->streamIsUP) { - streamVBO = 0; - data = (BYTE *)This->stateBlock->streamSource[nStream]; - } else { - /* The for loop should iterate through here only once per stream, so we don't need magic to prevent double loading - * buffers - */ - preLoadStreams[numPreloadStreams] = nStream; - numPreloadStreams++; - /* GetMemory binds the VBO */ - data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0, &streamVBO); - if(fixup) { - if(streamVBO != 0 ) *fixup = TRUE; - } - } - } else { -#if 0 /* TODO: Vertex shader support */ - thisFVF = This->stateBlock->vertexShaderDecl->fvf[nStream]; - data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); -#endif - } - VTRACE(("FVF for stream %d is %lx\n", nStream, thisFVF)); - if (thisFVF == 0) continue; + /* Now convert the stream into pointers */ + primitiveConvertFVFtoOffset(thisFVF, stride, data, strided, streamVBO, 0); - /* Now convert the stream into pointers */ - primitiveConvertFVFtoOffset(thisFVF, stride, data, strided, streamVBO, nStream); - } - /* Now call PreLoad on all the vertex buffers. In the very rare case + /* Now call PreLoad on the vertex buffer. In the very rare case * that the buffers stopps converting PreLoad will dirtify the VDECL again. * The vertex buffer can now use the strided structure in the device instead of finding its * own again. - * - * NULL streams won't be recorded in the array, UP streams won't be either. A stream is only - * once in there. */ - for(nStream=0; nStream < numPreloadStreams; nStream++) { - IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[preLoadStreams[nStream]]); + if(!This->stateBlock->streamIsUP) { + IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[0]); } }

1 0

Andrew Talbot : netapi32: Constify a variable.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 01e338805c41745484821f7bb40ea084081125e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e338805c41745484821f7bb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 19 16:35:42 2007 +0000 netapi32: Constify a variable. --- dlls/netapi32/nbt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index b0a86d6..c09b8fa 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1028,7 +1028,7 @@ static UCHAR NetBTCall(void *adapt, PNCB ncb, void **sess) ret = NRC_CMDTMO; else { - static UCHAR fakedCalledName[] = "*SMBSERVER"; + static const UCHAR fakedCalledName[] = "*SMBSERVER"; const UCHAR *calledParty = cacheEntry->nbname[0] == '*' ? fakedCalledName : cacheEntry->nbname;

1 0

Stefan Dösinger : wined3d: Move the scissor rectangle to the state table.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: ecfd4cb0e49045f98cc6ba490ca7459255dbe511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfd4cb0e49045f98cc6ba490… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:25:16 2007 +0100 wined3d: Move the scissor rectangle to the state table. --- dlls/wined3d/device.c | 18 +++++------------- dlls/wined3d/state.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 ++++- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9bd248f..18f3e75 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2728,11 +2728,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetSamplerState(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_SetScissorRect(IWineD3DDevice *iface, CONST RECT* pRect) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - RECT windowRect; - UINT winHeight; This->updateStateBlock->set.scissorRect = TRUE; This->updateStateBlock->changed.scissorRect = TRUE; + if(memcmp(&This->updateStateBlock->scissorRect, pRect, sizeof(*pRect)) == 0) { + TRACE("App is setting the old scissor rectangle over, nothing to do\n"); + return WINED3D_OK; + } memcpy(&This->updateStateBlock->scissorRect, pRect, sizeof(*pRect)); if(This->isRecordingState) { @@ -2740,17 +2742,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetScissorRect(IWineD3DDevice *iface, C return WINED3D_OK; } - GetClientRect(((IWineD3DSwapChainImpl *)This->swapchains[0])->win_handle, &windowRect); - /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply - * Warning2: Even in windowed mode the coords are relative to the window, not the screen - */ - winHeight = windowRect.bottom - windowRect.top; - TRACE("(%p)Setting new Scissor Rect to %d:%d-%d:%d\n", This, pRect->left, pRect->bottom - winHeight, - pRect->right - pRect->left, pRect->bottom - pRect->top); - ENTER_GL(); - glScissor(pRect->left, winHeight - pRect->bottom, pRect->right - pRect->left, pRect->bottom - pRect->top); - checkGLcall("glScissor"); - LEAVE_GL(); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 257757f..0b96e54 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3045,6 +3045,23 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContex return; } +static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) stateblock->wineD3DDevice->swapchains[0]; + RECT *pRect = &stateblock->scissorRect; + RECT windowRect; + UINT winHeight; + + GetClientRect(swapchain->win_handle, &windowRect); + /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply + * Warning2: Even in windowed mode the coords are relative to the window, not the screen + */ + winHeight = windowRect.bottom - windowRect.top; + TRACE("(%p) Setting new Scissor Rect to %d:%d-%d:%d\n", stateblock->wineD3DDevice, pRect->left, pRect->bottom - winHeight, + pRect->right - pRect->left, pRect->bottom - pRect->top); + glScissor(pRect->left, winHeight - pRect->bottom, pRect->right - pRect->left, pRect->bottom - pRect->top); + checkGLcall("glScissor"); +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -4074,4 +4091,6 @@ const struct StateEntry StateTable[] = { /* , STATE_ACTIVELIGHT(5) */ STATE_ACTIVELIGHT(5), light }, { /* , STATE_ACTIVELIGHT(6) */ STATE_ACTIVELIGHT(6), light }, { /* , STATE_ACTIVELIGHT(7) */ STATE_ACTIVELIGHT(7), light }, + + { /* Scissor rect */ STATE_SCISSORRECT, scissorrect } }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7fea727..3bf0c8e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -444,7 +444,10 @@ typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, #define STATE_ACTIVELIGHT(a) (STATE_PIXELSHADERCONSTANT + (a) + 1) #define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_PIXELSHADERCONSTANT(MAX_ACTIVE_LIGHTS)) -#define STATE_HIGHEST (STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS - 1)) +#define STATE_SCISSORRECT (STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS - 1) + 1) +#define STATE_IS_SCISSORRECT(a) ((a) == STATE_SCISSORRECT) + +#define STATE_HIGHEST (STATE_SCISSORRECT) struct StateEntry {

1 0

Stefan Dösinger : wined3d: Use VBOs for index buffers.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 59ae2a56fb4643eb7e83eadea37bd9258725ff06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ae2a56fb4643eb7e83eadea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:25:32 2007 +0100 wined3d: Use VBOs for index buffers. --- dlls/wined3d/device.c | 68 ++++++++++++++++++++++++++++++++++++--- dlls/wined3d/drawprim.c | 14 ++++++-- dlls/wined3d/indexbuffer.c | 49 +++++++++++++++++++++++++++- dlls/wined3d/state.c | 12 +++++++ dlls/wined3d/wined3d_private.h | 8 ++++- 5 files changed, 139 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59ae2a56fb4643eb7e83e…

1 0

Stefan Dösinger : wined3d: No bounds checking is done on sampler / texture numbers.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: bbcf98209c9a9810c50d9d83dd53a967f9298b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbcf98209c9a9810c50d9d83d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:24:48 2007 +0100 wined3d: No bounds checking is done on sampler / texture numbers. --- dlls/d3d8/tests/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/d3d.c | 30 +++++++++++++++++++++ dlls/wined3d/device.c | 24 ----------------- 4 files changed, 153 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbcf98209c9a9810c50d9…

1 0