September 2011 - Wine-Commits

Andrew Eikum : dsound: Validate buffer pointers in Unlock methods.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 7fae5f4f9feb456739654a3c0a1df5f4e0a28ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fae5f4f9feb456739654a3c0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Sat Sep 24 09:03:06 2011 -0500 dsound: Validate buffer pointers in Unlock methods. --- dlls/dsound/buffer.c | 6 ++++++ dlls/dsound/primary.c | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index aa870f4..50fe7c9 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -651,6 +651,12 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (!p2) x2 = 0; + if((p1 && ((BYTE*)p1 < This->buffer->memory || + (BYTE*)p1 >= This->buffer->memory + This->buflen)) || + (p2 && ((BYTE*)p2 < This->buffer->memory || + (BYTE*)p2 >= This->buffer->memory + This->buflen))) + return DSERR_INVALIDPARAM; + if (x1 || x2) { RtlAcquireResourceShared(&This->device->buffer_list_lock, TRUE); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 9eb74b7..df35abd 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -850,6 +850,12 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock( return DSERR_PRIOLEVELNEEDED; } + if((p1 && ((BYTE*)p1 < device->buffer || + (BYTE*)p1 >= device->buffer + device->buflen)) || + (p2 && ((BYTE*)p2 < device->buffer || + (BYTE*)p2 >= device->buffer + device->buflen))) + return DSERR_INVALIDPARAM; + return DS_OK; }

1 0

André Hentschel : ntdll/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 55542281f5dcd0c538d0c5740f7ce13b1f92b04c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55542281f5dcd0c538d0c5740… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:40 2011 +0200 ntdll/tests: Don't test function directly when reporting GetLastError(). --- dlls/ntdll/tests/pipe.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 8f7bd8f..6909882 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -238,8 +238,10 @@ static DWORD WINAPI thread(PVOID main_thread) Sleep(400); if (main_thread) { + DWORD ret; userapc_called = FALSE; - ok(pQueueUserAPC(&userapc, main_thread, 0), "can't queue user apc, GetLastError: %x\n", GetLastError()); + ret = pQueueUserAPC(&userapc, main_thread, 0); + ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); CloseHandle(main_thread); } @@ -264,6 +266,7 @@ static void test_alertable(void) HANDLE hPipe; NTSTATUS res; HANDLE hThread; + DWORD ret; memset(&iosb, 0x55, sizeof(iosb)); @@ -275,7 +278,8 @@ static void test_alertable(void) /* queue an user apc before calling listen */ userapc_called = FALSE; - ok(pQueueUserAPC(&userapc, GetCurrentThread(), 0), "can't queue user apc, GetLastError: %x\n", GetLastError()); + ret = pQueueUserAPC(&userapc, GetCurrentThread(), 0); + ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res); @@ -332,6 +336,7 @@ static void test_nonalertable(void) HANDLE hPipe; NTSTATUS res; HANDLE hThread; + DWORD ret; memset(&iosb, 0x55, sizeof(iosb)); @@ -345,7 +350,8 @@ static void test_nonalertable(void) ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %x\n", GetLastError()); userapc_called = FALSE; - ok(pQueueUserAPC(&userapc, GetCurrentThread(), 0), "can't queue user apc, GetLastError: %x\n", GetLastError()); + ret = pQueueUserAPC(&userapc, GetCurrentThread(), 0); + ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); todo_wine ok(!res, "NtFsControlFile returned %x\n", res);

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 0ba0f505aff37eab3dbb581720879393216040a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba0f505aff37eab3dbb58172… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:38 2011 +0200 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/comm.c | 5 ++--- dlls/kernel32/tests/file.c | 3 ++- dlls/kernel32/tests/pipe.c | 3 ++- dlls/kernel32/tests/profile.c | 12 ++++++------ dlls/kernel32/tests/virtual.c | 8 ++++++-- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index b08174f..895a9ab 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1115,9 +1115,8 @@ static void test_WaitRx(HANDLE hcom) ZeroMemory( &overlapped, sizeof(overlapped)); overlapped.hEvent = hComPortEvent; - ok((hComWriteEvent = CreateEvent( NULL, TRUE, FALSE, NULL )) !=0, - "CreateEvent res %d\n", - GetLastError()); + hComWriteEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + ok(hComWriteEvent != NULL, "CreateEvent res %d\n", GetLastError()); ZeroMemory( &overlapped_w, sizeof(overlapped_w)); overlapped_w.hEvent = hComWriteEvent; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index df2ab37..3ed3f66 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2393,7 +2393,8 @@ static void test_read_write(void) user_apc_ran = FALSE; if (pQueueUserAPC) { trace("Queueing an user APC\n"); /* verify the file is non alerable */ - ok(pQueueUserAPC(&user_apc, GetCurrentThread(), 0), "QueueUserAPC failed: %d\n", GetLastError()); + ret = pQueueUserAPC(&user_apc, GetCurrentThread(), 0); + ok(ret, "QueueUserAPC failed: %d\n", GetLastError()); } SetLastError(12345678); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 4b3566a..4fc6739 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -480,7 +480,8 @@ static DWORD CALLBACK serverThreadMain2(LPVOID arg) user_apc_ran = FALSE; if (i == 0 && pQueueUserAPC) { trace("Queueing an user APC\n"); /* verify the pipe is non alerable */ - ok(pQueueUserAPC(&user_apc, GetCurrentThread(), 0), "QueueUserAPC failed: %d\n", GetLastError()); + success = pQueueUserAPC(&user_apc, GetCurrentThread(), 0); + ok(success, "QueueUserAPC failed: %d\n", GetLastError()); } /* Wait for client to connect */ diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 07b351c..44a7927 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -448,8 +448,8 @@ static void test_profile_delete_on_close(void) h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); - ok( WriteFile( h, contents, sizeof contents - 1, &size, NULL ), - "Cannot write test file: %x\n", GetLastError() ); + res = WriteFile( h, contents, sizeof contents - 1, &size, NULL ); + ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); @@ -472,8 +472,8 @@ static void test_profile_refresh(void) h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); - ok( WriteFile( h, contents1, sizeof contents1 - 1, &size, NULL ), - "Cannot write test file: %x\n", GetLastError() ); + res = WriteFile( h, contents1, sizeof contents1 - 1, &size, NULL ); + ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents1 - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); @@ -488,8 +488,8 @@ static void test_profile_refresh(void) h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); - ok( WriteFile( h, contents2, sizeof contents2 - 1, &size, NULL ), - "Cannot write test file: %x\n", GetLastError() ); + res = WriteFile( h, contents2, sizeof contents2 - 1, &size, NULL ); + ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents2 - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index cd5417c..a2a881f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -598,12 +598,14 @@ static void test_MapViewOfFile(void) ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); if (!ptr) { + SIZE_T size; ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); SetLastError(0xdeadbeef); - ok( VirtualQuery( ptr, &info, sizeof(info) ) == sizeof(info), + size = VirtualQuery( ptr, &info, sizeof(info) ); + ok( size == sizeof(info), "VirtualQuery error %u\n", GetLastError() ); ok( info.BaseAddress == ptr, "%p != %p\n", info.BaseAddress, ptr ); ok( info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr ); @@ -623,12 +625,14 @@ static void test_MapViewOfFile(void) ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); if (!ptr) { + SIZE_T size; ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); - ok( VirtualQuery( ptr, &info, sizeof(info) ) == sizeof(info), + size = VirtualQuery( ptr, &info, sizeof(info) ); + ok( size == sizeof(info), "VirtualQuery error %u\n", GetLastError() ); ok( info.BaseAddress == ptr, "%p != %p\n", info.BaseAddress, ptr ); ok( info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr );

1 0

André Hentschel : user32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: fd71f876421461dc6a9b864ad54f89ea1f627acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd71f876421461dc6a9b864ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:44 2011 +0200 user32/tests: Don't test function directly when reporting GetLastError(). --- dlls/user32/tests/msg.c | 4 ++-- dlls/user32/tests/resource.c | 18 +++++++++--------- dlls/user32/tests/win.c | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9aaf149..90b518d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9516,8 +9516,8 @@ static DWORD CALLBACK send_msg_thread_2(void *param) case WAIT_OBJECT_0 + EV_SENDMSG: trace("thread: sending message\n"); - ok( SendNotifyMessageA(info->hwnd, WM_USER, 0, 0), - "SendNotifyMessageA failed error %u\n", GetLastError()); + ret = SendNotifyMessageA(info->hwnd, WM_USER, 0, 0); + ok(ret, "SendNotifyMessageA failed error %u\n", GetLastError()); SetEvent(info->hevent[EV_ACK]); break; diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 5bc2d7a..dd4342d 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -90,7 +90,7 @@ static void test_LoadStringA (void) {sizeof str, sizeof str - 1}, {sizeof str - 1, sizeof str - 2}}; unsigned int i; - int ret; + int ret, ret2; assert (sizeof str < sizeof buf); for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { @@ -110,17 +110,17 @@ static void test_LoadStringA (void) ret = LoadStringA(hInst, 1, buf, sizeof(buf) ); ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); - ok( LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)) == ret, - "LoadString failed: ret %d err %d\n", ret, GetLastError()); - ok( LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)) == ret, - "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ret2 = LoadStringA( hInst, MAKELONG( 1, 0x8000 ), buf, sizeof(buf)); + ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ret2 = LoadStringA( hInst, MAKELONG( 1, 0xffff ), buf, sizeof(buf)); + ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); ret = LoadStringA(hInst, 65534, buf, sizeof(buf) ); ok( ret > 0, "LoadString failed: ret %d err %d\n", ret, GetLastError()); - ok( LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)) == ret, - "LoadString failed: ret %d err %d\n", ret, GetLastError()); - ok( LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)) == ret, - "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ret2 = LoadStringA( hInst, MAKELONG( 65534, 0x8000 ), buf, sizeof(buf)); + ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + ret2 = LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)); + ok( ret2 == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); ret = LoadStringA(hInst, 0, buf, 0); ok( ret == -1 || broken(ret == 0), diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d309f98..3fba84d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5094,20 +5094,20 @@ static void test_CreateWindow(void) ok( !pGetProcessDefaultLayout( NULL ), "GetProcessDefaultLayout succeeded\n" ); ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - ok( pGetProcessDefaultLayout( &layout ), - "GetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pGetProcessDefaultLayout( &layout ); + ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( layout == 0, "GetProcessDefaultLayout wrong layout %x\n", layout ); SetLastError( 0xdeadbeef ); - ok( pSetProcessDefaultLayout( 7 ), - "SetProcessDefaultLayout failed err %u\n", GetLastError ()); - ok( pGetProcessDefaultLayout( &layout ), - "GetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pSetProcessDefaultLayout( 7 ); + ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pGetProcessDefaultLayout( &layout ); + ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( layout == 7, "GetProcessDefaultLayout wrong layout %x\n", layout ); SetLastError( 0xdeadbeef ); - ok( pSetProcessDefaultLayout( LAYOUT_RTL ), - "SetProcessDefaultLayout failed err %u\n", GetLastError ()); - ok( pGetProcessDefaultLayout( &layout ), - "GetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pSetProcessDefaultLayout( LAYOUT_RTL ); + ok( res, "SetProcessDefaultLayout failed err %u\n", GetLastError ()); + res = pGetProcessDefaultLayout( &layout ); + ok( res, "GetProcessDefaultLayout failed err %u\n", GetLastError ()); ok( layout == LAYOUT_RTL, "GetProcessDefaultLayout wrong layout %x\n", layout ); hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL);

1 0

André Hentschel : shell32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 8b0a2c287215aee1b4138f64e01cbda960f17ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0a2c287215aee1b4138f64e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 25 20:30:42 2011 +0200 shell32/tests: Don't test function directly when reporting GetLastError(). --- dlls/shell32/tests/shlfolder.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index fb634b4..c61a972 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3784,12 +3784,15 @@ if (0) if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; if (is_wow64 && pGetSystemWow64DirectoryW) { + UINT len; *dirW = 0; - ok(GetSystemDirectoryW(dirW, MAX_PATH) > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); + len = GetSystemDirectoryW(dirW, MAX_PATH); + ok(len > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); *dirW = 0; - ok(pGetSystemWow64DirectoryW(dirW, MAX_PATH) > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); + len = pGetSystemWow64DirectoryW(dirW, MAX_PATH); + ok(len > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); hr = pSHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); ret = pILIsEqual(pidl1, pidl2);

1 0

Frédéric Delanoy : cmd: Output error messages to stderr where appropriate.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 9c616563078fe14ed89e565c2ac9e887c04eeba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c616563078fe14ed89e565c2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 24 12:50:56 2011 +0200 cmd: Output error messages to stderr where appropriate. --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index f988d95..800f05e 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -585,7 +585,7 @@ void WCMD_call (WCHAR *command) { SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_BEGIN); } else { - WCMD_output_asis( WCMD_LoadMessage(WCMD_CALLINSCRIPT)); + WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_CALLINSCRIPT)); } } } diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d8c69ba..33437d1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -524,7 +524,7 @@ void WCMD_create_dir (WCHAR *command) { WCHAR *argN = command; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } /* Loop through all args */ @@ -575,7 +575,7 @@ static void WCMD_delete_parse_attributes(DWORD *wantSet, DWORD *wantClear) { case 'S': mask = FILE_ATTRIBUTE_SYSTEM; break; case 'A': mask = FILE_ATTRIBUTE_ARCHIVE; break; default: - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); } if (negate) *wantClear |= mask; @@ -843,14 +843,14 @@ BOOL WCMD_delete (WCHAR *command) { found = WCMD_delete_one(thisArg); if (!found) { errorlevel = 1; - WCMD_output (WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); } foundAny |= found; } /* Handle no valid args */ if (!argsProcessed) - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return foundAny; } @@ -1380,7 +1380,7 @@ void WCMD_goto (CMD_LIST **cmdList) { static const WCHAR eofW[] = {':','e','o','f','\0'}; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1408,7 +1408,7 @@ void WCMD_goto (CMD_LIST **cmdList) { if (lstrcmpiW (current, paramStart) == 0) return; } } - WCMD_output (WCMD_LoadMessage(WCMD_NOTARGET)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOTARGET)); } return; } @@ -1568,7 +1568,7 @@ void WCMD_move (void) { WCHAR ext[MAX_PATH]; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1760,7 +1760,7 @@ void WCMD_remove_dir (WCHAR *command) { /* Handle no valid args */ if (argsProcessed == 0) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1789,7 +1789,7 @@ void WCMD_rename (void) { /* Must be at least two args */ if (param1[0] == 0x00 || param2[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); errorlevel = 1; return; } @@ -2256,7 +2256,7 @@ void WCMD_setshow_env (WCHAR *s) { /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = strchrW (s, '=')) == NULL )) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -2284,7 +2284,7 @@ void WCMD_setshow_env (WCHAR *s) { if (p == NULL) { env = GetEnvironmentStringsW(); if (WCMD_setshow_sortenv( env, s ) == 0) { - WCMD_output (WCMD_LoadMessage(WCMD_MISSINGENV), s); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_MISSINGENV), s); errorlevel = 1; } return; @@ -2321,7 +2321,7 @@ void WCMD_setshow_path (const WCHAR *command) { WCMD_output_asis ( newline); } else { - WCMD_output (WCMD_LoadMessage(WCMD_NOPATH)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOPATH)); } } else { @@ -2445,7 +2445,7 @@ void WCMD_type (WCHAR *command) { BOOL writeHeaders = FALSE; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -2467,7 +2467,7 @@ void WCMD_type (WCHAR *command) { FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), thisArg); + WCMD_output(WCMD_LoadMessage(WCMD_READFAIL), thisArg); /* should be _stderr */ errorlevel = 1; } else { if (writeHeaders) { @@ -2570,7 +2570,7 @@ void WCMD_more (WCHAR *command) { FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), thisArg); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg); errorlevel = 1; } else { ULONG64 curPos = 0; @@ -2626,7 +2626,7 @@ void WCMD_verify (const WCHAR *command) { verify_mode = FALSE; return; } - else WCMD_output (WCMD_LoadMessage(WCMD_VERIFYERR)); + else WCMD_output_stderr(WCMD_LoadMessage(WCMD_VERIFYERR)); } /**************************************************************************** @@ -2667,7 +2667,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) else { static const WCHAR fmt[] = {'%','s','\\','\0'}; if ((path[1] != ':') || (strlenW(path) != 2)) { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); return 0; } wsprintfW (curdir, fmt, path); @@ -2916,7 +2916,7 @@ void WCMD_color (void) { HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); if (param1[0] != 0x00 && strlenW(param1) > 2) { - WCMD_output (WCMD_LoadMessage(WCMD_ARGERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_ARGERR)); return; }

1 0

Frédéric Delanoy : cmd: Add WCMD_output_stderr function to output error messages to stderr.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: fbddecab774e8cc6c07b292b4b1034f55e4c95ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbddecab774e8cc6c07b292b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 24 12:50:55 2011 +0200 cmd: Add WCMD_output_stderr function to output error messages to stderr. --- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 940cb6e..d370764 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -73,6 +73,7 @@ void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); void WCMD_move (void); void WCMD_output (const WCHAR *format, ...); +void WCMD_output_stderr (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b254728..8e222a3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -174,7 +174,7 @@ void WCMD_output (const WCHAR *format, ...) { va_start(ap,format); ret = vsnprintfW(string, sizeof(string)/sizeof(WCHAR), format, ap); if( ret >= (sizeof(string)/sizeof(WCHAR))) { - WINE_ERR("Output truncated in WCMD_output\n" ); + WINE_ERR("Output truncated\n" ); ret = (sizeof(string)/sizeof(WCHAR)) - 1; string[ret] = '\0'; } @@ -182,6 +182,27 @@ void WCMD_output (const WCHAR *format, ...) { WCMD_output_asis_len(string, ret, GetStdHandle(STD_OUTPUT_HANDLE)); } +/******************************************************************* + * WCMD_output_stderr - send output to current standard error device. + * + */ + +void WCMD_output_stderr (const WCHAR *format, ...) { + + va_list ap; + WCHAR string[1024]; + int ret; + + va_start(ap,format); + ret = vsnprintfW(string, sizeof(string)/sizeof(WCHAR), format, ap); + if( ret >= (sizeof(string)/sizeof(WCHAR))) { + WINE_ERR("Output truncated\n" ); + ret = (sizeof(string)/sizeof(WCHAR)) - 1; + string[ret] = '\0'; + } + va_end(ap); + WCMD_output_asis_len(string, ret, GetStdHandle(STD_ERROR_HANDLE)); +} static int line_count; static int max_height;

1 0

Andrew Eikum : winecoreaudio.drv: Remove wave, mixer, and dsound driver code.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: a773b16d79b741f61056a65a7bd98d7ee6134e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a773b16d79b741f61056a65a7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 23 15:04:05 2011 -0500 winecoreaudio.drv: Remove wave, mixer, and dsound driver code. --- dlls/winecoreaudio.drv/Makefile.in | 2 - dlls/winecoreaudio.drv/audio.c | 2539 ------------------------- dlls/winecoreaudio.drv/audiounit.c | 208 -- dlls/winecoreaudio.drv/coreaudio.c | 6 +- dlls/winecoreaudio.drv/mixer.c | 1028 ---------- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 3 - 7 files changed, 2 insertions(+), 3786 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a773b16d79b741f61056a…

1 0

Andrew Eikum : winealsa.drv: Remove wave, mixer, and dsound driver code.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: 8258a5188cc36563809ac7495e49bc43ae4326e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8258a5188cc36563809ac7495… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 23 15:03:51 2011 -0500 winealsa.drv: Remove wave, mixer, and dsound driver code. --- dlls/winealsa.drv/Makefile.in | 11 +- dlls/winealsa.drv/alsa.c | 755 ---------------- dlls/winealsa.drv/alsa.h | 197 ----- dlls/winealsa.drv/dscapture.c | 1095 ------------------------ dlls/winealsa.drv/dsoutput.c | 962 --------------------- dlls/winealsa.drv/midi.c | 30 +- dlls/winealsa.drv/mixer.c | 1612 ----------------------------------- dlls/winealsa.drv/mmdevdrv.c | 46 +- dlls/winealsa.drv/wavein.c | 780 ----------------- dlls/winealsa.drv/waveinit.c | 1011 ---------------------- dlls/winealsa.drv/waveout.c | 1182 ------------------------- dlls/winealsa.drv/winealsa.drv.spec | 3 - 12 files changed, 74 insertions(+), 7610 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8258a5188cc36563809ac…

1 0

Frédéric Delanoy : cmd: Use helper function to return file io buffer.
by Alexandre Julliard Sept. 26, 2011

Sept. 26, 2011

Module: wine Branch: master Commit: e5565a6d64d7260eba21ce11175409e01c7605b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5565a6d64d7260eba21ce111… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 23 12:37:43 2011 +0200 cmd: Use helper function to return file io buffer. --- programs/cmd/wcmdmain.c | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 26f377a..b254728 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -102,6 +102,19 @@ static char *output_bufA = NULL; #define MAX_WRITECONSOLE_SIZE 65535 static BOOL unicodePipes = FALSE; +/* + * Returns a buffer for reading from/writing to file + * Never freed + */ +static char *get_file_buffer(void) +{ + if (!output_bufA) { + output_bufA = HeapAlloc(GetProcessHeap(), 0, MAX_WRITECONSOLE_SIZE); + if (!output_bufA) + WINE_FIXME("Out of memory - could not allocate ansi 64K buffer\n"); + } + return output_bufA; +} /******************************************************************* * WCMD_output_asis_len - send output to current standard output @@ -126,23 +139,18 @@ static void WCMD_output_asis_len(const WCHAR *message, int len, HANDLE device) { if (!res) { BOOL usedDefaultChar = FALSE; DWORD convertedChars; + char *buffer; if (!unicodePipes) { - /* - * Allocate buffer to use when writing to file. (Not freed, as one off) - */ - if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); - if (!output_bufA) { - WINE_FIXME("Out of memory - could not allocate ansi 64K buffer\n"); - return; - } + + if (!(buffer = get_file_buffer())) + return; /* Convert to OEM, then output */ convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, message, - len, output_bufA, MAX_WRITECONSOLE_SIZE, + len, buffer, MAX_WRITECONSOLE_SIZE, "?", &usedDefaultChar); - WriteFile(device, output_bufA, convertedChars, + WriteFile(device, buffer, convertedChars, &nOut, FALSE); } else { WriteFile(device, message, len*sizeof(WCHAR), @@ -223,21 +231,16 @@ BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, if (!res) { DWORD numRead; - /* - * Allocate buffer to use when reading from file. Not freed - */ - if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); - if (!output_bufA) { - WINE_FIXME("Out of memory - could not allocate ansi 64K buffer\n"); - return 0; - } + char *buffer; + + if (!(buffer = get_file_buffer())) + return FALSE; /* Read from file (assume OEM codepage) */ - res = ReadFile(hIn, output_bufA, maxChars, &numRead, unused); + res = ReadFile(hIn, buffer, maxChars, &numRead, unused); /* Convert from OEM */ - *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, output_bufA, numRead, + *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead, intoBuf, maxChars); }

1 0