March 2007 - Wine-commits - list.winehq.org

Aric Stewart : ole32: Rework storage with blockfiles to properly use ILockBytes interfaces.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 838eb4037fe93cef9a063a37dac0e70578224ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=838eb4037fe93cef9a063a37d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 16 13:34:28 2007 -0500 ole32: Rework storage with blockfiles to properly use ILockBytes interfaces. Rework storage to make all its interactions with the underlying data go though ReadAt and WriteAt to allow for an ILockBytes underlying layer. Implement ReadAt and WriteAt in stg_bigblockfile.c for blockfiles. --- dlls/ole32/stg_bigblockfile.c | 373 +++++++++++++++++++++++------------------ dlls/ole32/storage32.c | 293 ++++++++++++++++----------------- dlls/ole32/storage32.h | 8 +- 3 files changed, 358 insertions(+), 316 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=838eb4037fe93cef9a063…

1 0

Damjan Jovanovic : ws2_32: In some cases send should block until the entire buffer is sent.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 665e8a5e6494b936ad41bf7e557fabf1211d831d URL: http://source.winehq.org/git/wine.git/?a=commit;h=665e8a5e6494b936ad41bf7e5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Mar 19 15:42:40 2007 +0200 ws2_32: In some cases send should block until the entire buffer is sent. --- dlls/ws2_32/socket.c | 74 ++++++++++++++++++++++++------ dlls/ws2_32/tests/sock.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 16222ca..e14eba8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2873,27 +2873,71 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return SOCKET_ERROR; } - if (_is_blocking(s)) + *lpNumberOfBytesSent = 0; + if ( _is_blocking(s) ) { - /* FIXME: exceptfds? */ - int timeout = GET_SNDTIMEO(fd); - if( !do_block(fd, POLLOUT, timeout)) { - err = WSAETIMEDOUT; - goto err_free; /* msdn says a timeout in send is fatal */ + /* On a blocking non-overlapped stream socket, + * sending blocks until the entire buffer is sent. */ + struct iovec *piovec = iovec; + int finish_time = GET_SNDTIMEO(fd); + if (finish_time >= 0) + finish_time += GetTickCount(); + while ( dwBufferCount > 0 ) + { + int timeout; + if ( finish_time >= 0 ) + { + timeout = finish_time - GetTickCount(); + if ( timeout < 0 ) + timeout = 0; + } + else + timeout = finish_time; + /* FIXME: exceptfds? */ + if( !do_block(fd, POLLOUT, timeout)) { + err = WSAETIMEDOUT; + goto err_free; /* msdn says a timeout in send is fatal */ + } + + n = WS2_send( fd, piovec, dwBufferCount, to, tolen, dwFlags ); + if ( n == -1 ) + { + err = wsaErrno(); + goto err_free; + } + *lpNumberOfBytesSent += n; + + while ( n > 0 ) + { + if ( piovec->iov_len > n ) + { + piovec->iov_base = (char*)piovec->iov_base + n; + piovec->iov_len -= n; + n = 0; + } + else + { + n -= piovec->iov_len; + --dwBufferCount; + ++piovec; + } + } } } - - n = WS2_send( fd, iovec, dwBufferCount, to, tolen, dwFlags ); - if ( n == -1 ) + else { - err = wsaErrno(); - if ( err == WSAEWOULDBLOCK ) - _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); - goto err_free; + n = WS2_send( fd, iovec, dwBufferCount, to, tolen, dwFlags ); + if ( n == -1 ) + { + err = wsaErrno(); + if ( err == WSAEWOULDBLOCK ) + _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); + goto err_free; + } + *lpNumberOfBytesSent = n; } - TRACE(" -> %i bytes\n", n); - *lpNumberOfBytesSent = n; + TRACE(" -> %i bytes\n", *lpNumberOfBytesSent); HeapFree( GetProcessHeap(), 0, iovec ); release_sock_fd( s, fd ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c5bf766..bd01bd3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1620,6 +1620,115 @@ static void test_inet_addr(void) ok(addr == INADDR_NONE, "inet_addr succeeded unexpectedly\n"); } +static DWORD WINAPI drain_socket_thread(LPVOID arg) +{ + char buffer[1024]; + SOCKET sock = *(SOCKET*)arg; + + while (recv(sock, buffer, sizeof(buffer), 0) > 0) + ; + return 0; +} + +static void test_send(void) +{ + SOCKET src = INVALID_SOCKET; + SOCKET server = INVALID_SOCKET; + SOCKET dst = INVALID_SOCKET; + HANDLE hThread = NULL; + struct sockaddr_in addr; + int len; + const int buflen = 1024*1024; + char *buffer = NULL; + int ret; + + src = socket(AF_INET, SOCK_STREAM, 0); + if (src == INVALID_SOCKET) + { + ok(0, "socket failed, error %d\n", WSAGetLastError()); + goto end; + } + + server = socket(AF_INET, SOCK_STREAM, 0); + if (server == INVALID_SOCKET) + { + ok(0, "socket failed, error %d\n", WSAGetLastError()); + goto end; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); + if (ret != 0) + { + ok(0, "bind failed, error %d\n", WSAGetLastError()); + goto end; + } + + len = sizeof(addr); + ret = getsockname(server, (struct sockaddr*)&addr, &len); + if (ret != 0) + { + ok(0, "getsockname failed, error %d\n", WSAGetLastError()); + goto end; + } + + ret = listen(server, 1); + if (ret != 0) + { + ok(0, "listen failed, error %d\n", WSAGetLastError()); + goto end; + } + + ret = connect(src, (struct sockaddr*)&addr, sizeof(addr)); + if (ret != 0) + { + ok(0, "connect failed, error %d\n", WSAGetLastError()); + goto end; + } + + len = sizeof(addr); + dst = accept(server, (struct sockaddr*)&addr, &len); + if (dst == INVALID_SOCKET) + { + ok(0, "accept failed, error %d\n", WSAGetLastError()); + goto end; + } + + hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, NULL); + if (hThread == NULL) + { + ok(0, "CreateThread failed, error %d\n", GetLastError()); + goto end; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, buflen); + if (buffer == NULL) + { + ok(0, "HeapAlloc failed, error %d\n", GetLastError()); + goto end; + } + + ret = send(src, buffer, buflen, 0); + if (ret >= 0) + ok(ret == buflen, "send should have sent %d bytes, but it only sent %d\n", buflen, ret); + else + ok(0, "send failed, error %d\n", WSAGetLastError()); + +end: + if (src != INVALID_SOCKET) + closesocket(src); + if (server != INVALID_SOCKET) + closesocket(server); + if (dst != INVALID_SOCKET) + closesocket(dst); + if (hThread != NULL) + CloseHandle(hThread); + if (buffer != NULL) + HeapFree(GetProcessHeap(), 0, buffer); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -1653,5 +1762,7 @@ START_TEST( sock ) test_getsockname(); test_inet_addr(); + test_send(); + Exit(); }

1 0

Jacek Caban : spoolss: Added RevertToPrinterSelf stub implementation.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: c88ccdc1ef9c63a416024461a92d6e5bb98db347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88ccdc1ef9c63a416024461a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 19 14:12:13 2007 +0100 spoolss: Added RevertToPrinterSelf stub implementation. --- dlls/spoolss/spoolss.spec | 2 +- dlls/spoolss/spoolss_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index e0b8513..ff6018e 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -101,7 +101,7 @@ @ stub ReplyOpenPrinter @ stub ReplyPrinterChangeNotification @ stub ResetPrinterW -@ stub RevertToPrinterSelf +@ stdcall RevertToPrinterSelf() @ stub RouterAllocPrinterNotifyInfo @ stub RouterFindFirstPrinterChangeNotification @ stub RouterFindNextPrinterChangeNotification diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index a4a08e6..d7237aa 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -142,3 +142,9 @@ BOOL WINAPI DllFreeSplStr(LPWSTR pwstr) TRACE("(%s) PTR: %p\n", debugstr_w(pwstr), pwstr); return HeapFree(GetProcessHeap(), 0, pwstr); } + +HANDLE WINAPI RevertToPrinterSelf(void) +{ + FIXME("() stub\n"); + return NULL; +}

1 0

Jacek Caban : advapi: Constify argument of StartServiceCtrlDispatcher[AW] functions.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 112257e59db7cc8c60a151b190f5cc4c074ed46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=112257e59db7cc8c60a151b19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 19 14:10:49 2007 +0100 advapi: Constify argument of StartServiceCtrlDispatcher[AW] functions. --- dlls/advapi32/service.c | 4 ++-- include/winsvc.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index e962455..6077dea 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -755,7 +755,7 @@ static BOOL service_run_threads(void) * * See StartServiceCtrlDispatcherW. */ -BOOL WINAPI StartServiceCtrlDispatcherA( LPSERVICE_TABLE_ENTRYA servent ) +BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) { service_data *info; DWORD sz, len; @@ -801,7 +801,7 @@ BOOL WINAPI StartServiceCtrlDispatcherA( LPSERVICE_TABLE_ENTRYA servent ) * Success: TRUE. * Failure: FALSE. */ -BOOL WINAPI StartServiceCtrlDispatcherW( LPSERVICE_TABLE_ENTRYW servent ) +BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) { service_data *info; DWORD sz, len; diff --git a/include/winsvc.h b/include/winsvc.h index d9b880e..93ccaf6 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -326,8 +326,8 @@ BOOL WINAPI SetServiceStatus(SERVICE_STATUS_HANDLE,LPSERVICE_STATUS); BOOL WINAPI StartServiceA(SC_HANDLE,DWORD,LPCSTR*); BOOL WINAPI StartServiceW(SC_HANDLE,DWORD,LPCWSTR*); #define StartService WINELIB_NAME_AW(StartService) -BOOL WINAPI StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA); -BOOL WINAPI StartServiceCtrlDispatcherW(LPSERVICE_TABLE_ENTRYW); +BOOL WINAPI StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA*); +BOOL WINAPI StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW*); #define StartServiceCtrlDispatcher WINELIB_NAME_AW(StartServiceCtrlDispatcher) BOOL WINAPI UnlockServiceDatabase(SC_LOCK);

1 0

lostwages/ news/2007031901.xml wwn/wn20070319_ ...
by WineHQ 20 Mar '07

20 Mar '07

ChangeSet ID: 30988 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/03/19 20:39:24 Added files: news : 2007031901.xml wwn : wn20070319_326.xml Log message: WWN #326 Patch: http://cvs.winehq.org/patch.py?id=30988 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007031901.xml Added 1.1 +0 -0 lostwages/wwn/wn20070319_326.xml

1 0

Detlef Riekenberg : localspl/tests: Open the default Xcv-channel only once.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: fd37d30a2687a9a371dea1f5857c43bf97791ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd37d30a2687a9a371dea1f58… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Mar 19 00:09:31 2007 +0100 localspl/tests: Open the default Xcv-channel only once. --- dlls/localspl/tests/localmon.c | 86 ++++++---------------------------------- 1 files changed, 13 insertions(+), 73 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index db43907..bcc8177 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -65,6 +65,7 @@ static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); +static HANDLE hXcv; static HANDLE hXcv_noaccess; /* ########################### */ @@ -382,15 +383,8 @@ static void test_XcvClosePort(void) static void test_XcvDataPort_AddPort(void) { DWORD res; - HANDLE hXcv; - hXcv = (HANDLE) 0xdeadbeef; - SetLastError(0xdeadbeef); - res = pXcvOpenPort(emptyW, SERVER_ALL_ACCESS, &hXcv); - ok(res, "hXcv: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); - if (!res) return; - /* * The following tests crash with native localspl.dll on w2k and xp, * but it works, when the native dll (w2k and xp) is used in wine. @@ -427,7 +421,6 @@ static void test_XcvDataPort_AddPort(void) res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); } - pXcvClosePort(hXcv); } /* ########################### */ @@ -437,28 +430,19 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) CHAR org_value[16]; CHAR buffer[16]; HKEY hroot = NULL; - HANDLE hXcv; DWORD res; DWORD needed; - 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; } @@ -476,7 +460,6 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) 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; } @@ -533,7 +516,6 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) } RegCloseKey(hroot); - pXcvClosePort(hXcv); } @@ -542,16 +524,9 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) static void test_XcvDataPort_DeletePort(void) { DWORD res; - HANDLE hXcv; DWORD needed; - hXcv = (HANDLE) 0xdeadbeef; - SetLastError(0xdeadbeef); - res = pXcvOpenPort(emptyW, SERVER_ALL_ACCESS, &hXcv); - ok(res, "hXcv: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); - if (!res) return; - /* cleanup: just to make sure */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); @@ -574,7 +549,6 @@ static void test_XcvDataPort_DeletePort(void) /* emptyW as Portname: ERROR_FILE_NOT_FOUND is returned */ /* NULL as Portname: Native localspl.dll crashed */ - pXcvClosePort(hXcv); } /* ########################### */ @@ -583,25 +557,17 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) { CHAR org_value[16]; HKEY hroot = NULL; - HANDLE hXcv; DWORD buffer[2]; DWORD res; DWORD needed; DWORD len; - 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; } @@ -614,14 +580,12 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) /* 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; } @@ -700,7 +664,6 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) } RegCloseKey(hroot); - pXcvClosePort(hXcv); } /* ########################### */ @@ -708,24 +671,16 @@ static void test_XcvDataPort_GetTransmissionRetryTimeout(void) static void test_XcvDataPort_MonitorUI(void) { DWORD res; - HANDLE hXcv; BYTE buffer[MAX_PATH + 2]; DWORD needed; DWORD len; - hXcv = (HANDLE) 0xdeadbeef; - SetLastError(0xdeadbeef); - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); - ok(res, "returned %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_MonitorUIW, NULL, 0, NULL, 0, &needed); if (res == ERROR_INVALID_PARAMETER) { - pXcvClosePort(hXcv); skip("'MonitorUI' nor supported\n"); return; } @@ -734,7 +689,6 @@ static void test_XcvDataPort_MonitorUI(void) " and '<= MAX_PATH')\n", res, GetLastError(), needed); if (needed > MAX_PATH) { - pXcvClosePort(hXcv); skip("buffer overflow (%u)\n", needed); return; } @@ -796,9 +750,6 @@ static void test_XcvDataPort_MonitorUI(void) "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); - pXcvClosePort(hXcv); - - /* small check without access-rights: */ if (!hXcv_noaccess) return; @@ -816,22 +767,13 @@ static void test_XcvDataPort_MonitorUI(void) static void test_XcvDataPort_PortIsValid(void) { DWORD res; - HANDLE hXcv; DWORD needed; - - 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; - /* normal use: "LPT1:" */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed); if (res == ERROR_INVALID_PARAMETER) { - pXcvClosePort(hXcv); skip("'PostIsValid' not supported\n"); return; } @@ -948,8 +890,6 @@ static void test_XcvDataPort_PortIsValid(void) "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", res, GetLastError(), needed); - pXcvClosePort(hXcv); - /* small check without access-rights: */ if (!hXcv_noaccess) return; @@ -1077,25 +1017,23 @@ START_TEST(localmon) if ((pXcvOpenPort) && (pXcvDataPort) && (pXcvClosePort)) { SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, 0, &hXcv); + ok(res, "hXcv: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + + SetLastError(0xdeadbeef); res = pXcvOpenPort(emptyW, 0, &hXcv_noaccess); ok(res, "hXcv_noaccess: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv_noaccess); } } - if ((!pInitializePrintMonitorUI) && (pXcvOpenPort) && (pXcvDataPort) && (pXcvClosePort)) { + if ((!pInitializePrintMonitorUI) && (hXcv)) { /* The user interface for "Local Ports" is in a separate dll since w2k */ BYTE buffer[MAX_PATH]; - DWORD res; DWORD len; - HANDLE hXcv; - - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); - if (res) { - res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, MAX_PATH, &len); - if (res == ERROR_SUCCESS) hlocalui = LoadLibraryW( (LPWSTR) buffer); - if (hlocalui) pInitializePrintMonitorUI = (void *) GetProcAddress(hlocalui, "InitializePrintMonitorUI"); - pXcvClosePort(hXcv); - } + + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, MAX_PATH, &len); + if (res == ERROR_SUCCESS) hlocalui = LoadLibraryW( (LPWSTR) buffer); + if (hlocalui) pInitializePrintMonitorUI = (void *) GetProcAddress(hlocalui, "InitializePrintMonitorUI"); } if (pInitializePrintMonitorUI) { @@ -1119,7 +1057,7 @@ START_TEST(localmon) test_ConfigurePort(); test_DeletePort(); test_EnumPorts(); - if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) { + if ( !hXcv ) { skip("Xcv not supported\n"); } else @@ -1132,6 +1070,8 @@ START_TEST(localmon) test_XcvDataPort_MonitorUI(); test_XcvDataPort_PortIsValid(); test_XcvOpenPort(); + + pXcvClosePort(hXcv); } if (hXcv_noaccess) pXcvClosePort(hXcv_noaccess);

1 0

Jason Edmeades : cmd.exe: Add errorlevel support for DIR command.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: bf626f960b8a533725900b19916aab1c413c4600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf626f960b8a533725900b199… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 18 21:55:53 2007 +0000 cmd.exe: Add errorlevel support for DIR command. --- programs/cmd/directory.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 0f514e9..258ccdb 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -82,6 +82,8 @@ void WCMD_directory (void) { char *p; char string[MAXSTRING]; + errorlevel = 0; + /* Prefill Quals with (uppercased) DIRCMD env var */ if (GetEnvironmentVariable ("DIRCMD", string, sizeof(string))) { p = string; @@ -167,6 +169,7 @@ void WCMD_directory (void) { } else { SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); + errorlevel = 1; return; } break; @@ -186,6 +189,7 @@ void WCMD_directory (void) { default: SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); + errorlevel = 1; return; } p++; @@ -216,6 +220,7 @@ void WCMD_directory (void) { default: SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); + errorlevel = 1; return; } @@ -234,6 +239,7 @@ void WCMD_directory (void) { default: SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); + errorlevel = 1; return; } p = p + 1; @@ -260,6 +266,7 @@ void WCMD_directory (void) { if (!status) { WCMD_print_error(); if (paged_mode) WCMD_leave_paged_mode(); + errorlevel = 1; return; } lstrcpyn (drive, path, 3); @@ -268,6 +275,7 @@ void WCMD_directory (void) { status = WCMD_volume (0, drive); if (!status) { if (paged_mode) WCMD_leave_paged_mode(); + errorlevel = 1; return; } } @@ -352,6 +360,7 @@ void WCMD_list_directory (char *search_path, int level) { SetLastError (ERROR_FILE_NOT_FOUND); WCMD_print_error (); HeapFree(GetProcessHeap(),0,fd); + errorlevel = 1; return; } do { @@ -371,7 +380,8 @@ void WCMD_list_directory (char *search_path, int level) { if (fd == NULL) { FindClose (hff); WCMD_output ("Memory Allocation Error"); - return; + errorlevel = 1; + return; } } while (FindNextFile(hff, (fd+entry_count)) != 0); FindClose (hff); @@ -381,6 +391,7 @@ void WCMD_list_directory (char *search_path, int level) { SetLastError (ERROR_FILE_NOT_FOUND); WCMD_print_error (); HeapFree(GetProcessHeap(),0,fd); + errorlevel = 1; return; }

1 0

Jason Edmeades : cmd.exe: Only write 'bytes free' message if a file was displayed during dir.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 0739ad224655c3e9aeef98d965032497baa432d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0739ad224655c3e9aeef98d96… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 18 22:13:48 2007 +0000 cmd.exe: Only write 'bytes free' message if a file was displayed during dir. --- programs/cmd/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 258ccdb..076a6fe 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -284,7 +284,7 @@ void WCMD_directory (void) { lstrcpyn (drive, path, 4); GetDiskFreeSpaceEx (drive, &avail, &total, &free); - if (!bare) { + if (errorlevel==0 && !bare) { if (recurse) { WCMD_output ("\n\n Total files listed:\n%8d files%25s bytes\n", file_total, WCMD_filesize64 (byte_total));

1 0

Detlef Riekenberg : localspl/tests: Rename hXcv for special tests.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: c5da6019d3c51f01fc3d4f5e1990e3193f3c2fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5da6019d3c51f01fc3d4f5e1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Mar 19 00:09:26 2007 +0100 localspl/tests: Rename hXcv for special tests. --- dlls/localspl/tests/localmon.c | 79 +++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 41 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 7030b1f..db43907 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -65,6 +65,9 @@ static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); +static HANDLE hXcv_noaccess; + +/* ########################### */ static const WCHAR cmd_AddPortW[] = {'A','d','d','P','o','r','t',0}; static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', @@ -345,7 +348,7 @@ static void test_InitializePrintMonitor(void) static void test_XcvClosePort(void) { DWORD res; - HANDLE hXcv; + HANDLE hXcv2; if (0) @@ -357,19 +360,19 @@ static void test_XcvClosePort(void) SetLastError(0xdeadbeef); - hXcv = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); - ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + hXcv2 = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv2); + ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); if (res) { SetLastError(0xdeadbeef); - res = pXcvClosePort(hXcv); + res = pXcvClosePort(hXcv2); ok( res, "returned %d with %u (expected '!= 0')\n", res, GetLastError()); if (0) { /* test for "Double Free": crash with native localspl.dll (w2k+xp) */ - res = pXcvClosePort(hXcv); + res = pXcvClosePort(hXcv2); } } } @@ -797,22 +800,15 @@ static void test_XcvDataPort_MonitorUI(void) /* small check without access-rights: */ - hXcv = (HANDLE) 0xdeadbeef; - SetLastError(0xdeadbeef); - res = pXcvOpenPort(emptyW, 0, &hXcv); - ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); - if (!res) return; + if (!hXcv_noaccess) return; /* The ACCESS_MASK is ignored for "MonitorUI" */ memset(buffer, 0, len); needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, sizeof(buffer), &needed); + res = pXcvDataPort(hXcv_noaccess, cmd_MonitorUIW, NULL, 0, buffer, sizeof(buffer), &needed); ok( res == ERROR_SUCCESS, "returned %d with %u and 0x%x " "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); - - pXcvClosePort(hXcv); - } /* ########################### */ @@ -956,20 +952,14 @@ static void test_XcvDataPort_PortIsValid(void) /* small check without access-rights: */ - hXcv = (HANDLE) 0xdeadbeef; - SetLastError(0xdeadbeef); - res = pXcvOpenPort(emptyW, 0, &hXcv); - ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); - if (!res) return; + if (!hXcv_noaccess) return; /* The ACCESS_MASK from XcvOpenPort is ignored in "PortIsValid" */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed); + res = pXcvDataPort(hXcv_noaccess, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed); ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); - pXcvClosePort(hXcv); - } /* ########################### */ @@ -977,45 +967,45 @@ static void test_XcvDataPort_PortIsValid(void) static void test_XcvOpenPort(void) { DWORD res; - HANDLE hXcv; + HANDLE hXcv2; if (0) { /* crash with native localspl.dll (w2k+xp) */ - res = pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv); + res = pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv2); res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); } /* The returned handle is the result from a previous "spoolss.dll,DllAllocSplMem" */ SetLastError(0xdeadbeef); - hXcv = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); - ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); - if (res) pXcvClosePort(hXcv); + hXcv2 = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv2); + ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); + if (res) pXcvClosePort(hXcv2); /* The ACCESS_MASK is not checked in XcvOpenPort */ SetLastError(0xdeadbeef); - hXcv = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(emptyW, 0, &hXcv); - ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); - if (res) pXcvClosePort(hXcv); + hXcv2 = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(emptyW, 0, &hXcv2); + ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); + if (res) pXcvClosePort(hXcv2); /* A copy of pszObject is saved in the Memory-Block */ SetLastError(0xdeadbeef); - hXcv = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(portname_lpt1W, SERVER_ALL_ACCESS, &hXcv); - ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); - if (res) pXcvClosePort(hXcv); + hXcv2 = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(portname_lpt1W, SERVER_ALL_ACCESS, &hXcv2); + ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); + if (res) pXcvClosePort(hXcv2); SetLastError(0xdeadbeef); - hXcv = (HANDLE) 0xdeadbeef; - res = pXcvOpenPort(portname_fileW, SERVER_ALL_ACCESS, &hXcv); - ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); - if (res) pXcvClosePort(hXcv); + hXcv2 = (HANDLE) 0xdeadbeef; + res = pXcvOpenPort(portname_fileW, SERVER_ALL_ACCESS, &hXcv2); + ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv2); + if (res) pXcvClosePort(hXcv2); } @@ -1084,6 +1074,12 @@ START_TEST(localmon) GET_MONITOR_FUNC(XcvOpenPort); GET_MONITOR_FUNC(XcvDataPort); GET_MONITOR_FUNC(XcvClosePort); + + if ((pXcvOpenPort) && (pXcvDataPort) && (pXcvClosePort)) { + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, 0, &hXcv_noaccess); + ok(res, "hXcv_noaccess: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv_noaccess); + } } if ((!pInitializePrintMonitorUI) && (pXcvOpenPort) && (pXcvDataPort) && (pXcvClosePort)) { @@ -1137,6 +1133,7 @@ START_TEST(localmon) test_XcvDataPort_PortIsValid(); test_XcvOpenPort(); } + if (hXcv_noaccess) pXcvClosePort(hXcv_noaccess); /* Cleanup our temporary file */ DeleteFileW(tempfileW);

1 0

Jason Edmeades : cmd.exe: Add support for DIRCMD and sequential qualifier processing.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 7fba2c0a64e6523d6daecdad07523cccea6fe0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fba2c0a64e6523d6daecdad0… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 18 21:55:51 2007 +0000 cmd.exe: Add support for DIRCMD and sequential qualifier processing. --- programs/cmd/directory.c | 153 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 106 insertions(+), 47 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index c34072d..67a3276 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -63,7 +63,7 @@ static ULONGLONG byte_total; static DISPLAYTIME dirTime; static DISPLAYORDER dirOrder; static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; -static BOOL noseperator; +static BOOL seperator; /***************************************************************************** * WCMD_directory @@ -79,63 +79,122 @@ void WCMD_directory (void) { ULARGE_INTEGER avail, total, free; CONSOLE_SCREEN_BUFFER_INFO consoleInfo; char *p; + char string[MAXSTRING]; + + /* Prefill Quals with (uppercased) DIRCMD env var */ + if (GetEnvironmentVariable ("DIRCMD", string, sizeof(string))) { + p = string; + while ( (*p = toupper(*p)) ) ++p; + strcat(string,quals); + strcpy(quals, string); + } byte_total = 0; file_total = dir_total = 0; + + /* Initialize all flags to their defaults as if no DIRCMD or quals */ + paged_mode = FALSE; + recurse = FALSE; + wide = FALSE; + bare = FALSE; + lower = FALSE; + shortname = FALSE; + usernames = FALSE; + orderByCol = FALSE; + seperator = TRUE; dirTime = Written; dirOrder = Name; orderReverse = FALSE; orderGroupDirs = FALSE; orderGroupDirsReverse = FALSE; - /* Handle args */ - paged_mode = (strstr(quals, "/P") != NULL); - recurse = (strstr(quals, "/S") != NULL); - wide = (strstr(quals, "/W") != NULL); - bare = (strstr(quals, "/B") != NULL); - lower = (strstr(quals, "/L") != NULL); - shortname = (strstr(quals, "/X") != NULL); - usernames = (strstr(quals, "/Q") != NULL); - orderByCol = (strstr(quals, "/D") != NULL); - noseperator= (strstr(quals, "/-C") != NULL); - - if ((p = strstr(quals, "/T")) != NULL) { - p = p + 2; - if (*p==':') p++; /* Skip optional : */ - - if (*p == 'A') dirTime = Access; - else if (*p == 'C') dirTime = Creation; - else if (*p == 'W') dirTime = Written; - - /* Support /T and /T: with no parms, default to written */ - else if (*p == '/') dirTime = Written; - else { - SetLastError(ERROR_INVALID_PARAMETER); - WCMD_print_error(); - return; - } - } + /* Handle args - Loop through so right most is the effective one */ + /* Note: /- appears to be a negate rather than an off, eg. dir + /-W is wide, or dir /w /-w /-w is also wide */ + p = quals; + while (*p && (*p=='/' || *p==' ')) { + BOOL negate = FALSE; + if (*p++==' ') continue; /* Skip / and blanks introduced through DIRCMD */ - if ((p = strstr(quals, "/O")) != NULL) { - p = p + 2; - if (*p==':') p++; /* Skip optional : */ - while (*p && *p != '/') { - switch (*p) { - case 'N': dirOrder = Name; break; - case 'E': dirOrder = Extension; break; - case 'S': dirOrder = Size; break; - case 'D': dirOrder = Date; break; - case '-': if (*(p+1)=='G') orderGroupDirsReverse=TRUE; - else orderReverse = TRUE; - break; - case 'G': orderGroupDirs = TRUE; break; - default: - SetLastError(ERROR_INVALID_PARAMETER); - WCMD_print_error(); - return; - } + if (*p=='-') { + negate = TRUE; p++; } + + WINE_TRACE("Processing arg '%c' (in %s)\n", *p, quals); + switch (*p) { + case 'P': if (negate) paged_mode = !paged_mode; + else paged_mode = TRUE; + break; + case 'S': if (negate) recurse = !recurse; + else recurse = TRUE; + break; + case 'W': if (negate) wide = !wide; + else wide = TRUE; + break; + case 'B': if (negate) bare = !bare; + else bare = TRUE; + break; + case 'L': if (negate) lower = !lower; + else lower = TRUE; + break; + case 'X': if (negate) shortname = !shortname; + else shortname = TRUE; + break; + case 'Q': if (negate) usernames = !usernames; + else usernames = TRUE; + break; + case 'D': if (negate) orderByCol = !orderByCol; + else orderByCol = TRUE; + break; + case 'C': if (negate) seperator = !seperator; + else seperator = TRUE; + break; + case 'T': p = p + 1; + if (*p==':') p++; /* Skip optional : */ + + if (*p == 'A') dirTime = Access; + else if (*p == 'C') dirTime = Creation; + else if (*p == 'W') dirTime = Written; + + /* Support /T and /T: with no parms, default to written */ + else if (*p == 0x00 || *p == '/') { + dirTime = Written; + p = p - 1; /* So when step on, move to '/' */ + } else { + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + break; + case 'O': p = p + 1; + if (*p==':') p++; /* Skip optional : */ + while (*p && *p != '/') { + WINE_TRACE("Processing subparm '%c' (in %s)\n", *p, quals); + switch (*p) { + case 'N': dirOrder = Name; break; + case 'E': dirOrder = Extension; break; + case 'S': dirOrder = Size; break; + case 'D': dirOrder = Date; break; + case '-': if (*(p+1)=='G') orderGroupDirsReverse=TRUE; + else orderReverse = TRUE; + break; + case 'G': orderGroupDirs = TRUE; break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + p++; + } + p = p - 1; /* So when step on, move to '/' */ + break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + p = p + 1; } /* Handle conflicting args and initialization */ @@ -443,7 +502,7 @@ char * WCMD_filesize64 (ULONGLONG n) { p = buff; i = -3; do { - if (!noseperator && (++i)%3 == 1) *p++ = ','; + if (seperator && ((++i)%3 == 1)) *p++ = ','; q = n / 10; r = n - (q * 10); *p++ = r + '0';

1 0