February 2010 - Wine-Commits

Paul Chitescu : qedit: In output pin' s IPin_Connect call ReceiveConnection on the receiver pin to properly negotiate media type .
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: c56dc3b71ea7d864e46e3861b8d5b0b45f6795f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56dc3b71ea7d864e46e3861b… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Feb 16 18:23:01 2010 +0200 qedit: In output pin's IPin_Connect call ReceiveConnection on the receiver pin to properly negotiate media type. --- dlls/qedit/samplegrabber.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index b6082f1..4538004 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -988,6 +988,7 @@ static HRESULT WINAPI SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE *type) { SG_Pin *This = (SG_Pin *)iface; + HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, receiver, type); if (!receiver) return E_POINTER; @@ -1011,6 +1012,11 @@ SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE !IsEqualGUID(&This->sg->mtype.formattype,&type->formattype)) return VFW_E_TYPE_NOT_ACCEPTED; } + else + type = &This->sg->mtype; + hr = IPin_ReceiveConnection(receiver,(IPin*)&This->lpVtbl,type); + if (FAILED(hr)) + return hr; This->pair = receiver; if (This->sg->memOutput) { IMemInputPin_Release(This->sg->memOutput);

1 0

Dan Kegel : cmd: Turn off echo, add visual separator between testcases.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 786429b3d7f9b9459e8676fa1c1ee05520bfdec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=786429b3d7f9b9459e8676fa1… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 11:42:18 2010 -0800 cmd: Turn off echo, add visual separator between testcases. --- programs/cmd/tests/test_builtins.cmd | 4 +++- programs/cmd/tests/test_builtins.cmd.out | 16 +++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 611853e..db15217 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1,5 +1,7 @@ -rem Tests for echo +echo Tests for cmd's builtin commands +(a)echo off +echo ------------ Testing 'echo' -------------- echo word echo 'singlequotedword' echo "doublequotedword" diff --git a/programs/cmd/tests/test_builtins.cmd.out b/programs/cmd/tests/test_builtins.cmd.out index cebfc33..3e7413b 100644 --- a/programs/cmd/tests/test_builtins.cmd.out +++ b/programs/cmd/tests/test_builtins.cmd.out @@ -1,21 +1,11 @@ -(a)pwd@>rem Tests for echo(a)todo_space@ - -(a)pwd@>echo word(a)todo_space@ +(a)pwd@>echo Tests for cmd's builtin commands(a)todo_space@ +Tests for cmd's builtin commands +------------ Testing 'echo' -------------- word - -(a)pwd@>echo 'singlequotedword'@todo_space@ 'singlequotedword' - -(a)pwd@>echo "doublequotedword"@todo_space@ "doublequotedword" at-echoed-word - -(a)pwd@>echo "/?"@todo_space@ "/?" -(a)pwd@>echo. - - -(a)pwd@>echo .(a)todo_space@ .

1 0

Dan Kegel : cmd: Rename reference file from .out to . exp to avoid clash with gnu make builtin rule.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: e4fd5196c2ebcf29849ba11cb1c838654bfb9ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fd5196c2ebcf29849ba11cb… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 12:51:03 2010 -0800 cmd: Rename reference file from .out to .exp to avoid clash with gnu make builtin rule. --- programs/cmd/tests/batch.c | 4 ++-- programs/cmd/tests/rsrc.rc | 4 ++-- ...test_builtins.cmd.out => test_builtins.cmd.exp} | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 1d822a1..0b4efda 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -190,7 +190,7 @@ static void run_from_file(char *file_name) return; } - sprintf(out_name, "%s.out", file_name); + sprintf(out_name, "%s.exp", file_name); out_size = map_file(out_name, &out_data); if(!out_size) { ok(0, "Could not map file %s: %u\n", out_name, GetLastError()); @@ -236,7 +236,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG if(!cmd_size) return TRUE; - sprintf(res_name, "%s.out", name); + sprintf(res_name, "%s.exp", name); out_size = load_resource(res_name, "TESTOUT", &out_data); if(!out_size) return TRUE; diff --git a/programs/cmd/tests/rsrc.rc b/programs/cmd/tests/rsrc.rc index da62c11..bcb738d 100644 --- a/programs/cmd/tests/rsrc.rc +++ b/programs/cmd/tests/rsrc.rc @@ -19,5 +19,5 @@ /* @makedep: test_builtins.cmd */ test_builtins.cmd TESTCMD "test_builtins.cmd" -/* @makedep: test_builtins.cmd.out */ -test_builtins.cmd.out TESTOUT "test_builtins.cmd.out" +/* @makedep: test_builtins.cmd.exp */ +test_builtins.cmd.exp TESTOUT "test_builtins.cmd.exp" diff --git a/programs/cmd/tests/test_builtins.cmd.out b/programs/cmd/tests/test_builtins.cmd.exp similarity index 100% rename from programs/cmd/tests/test_builtins.cmd.out rename to programs/cmd/tests/test_builtins.cmd.exp

1 0

Dan Kegel : cmd: Add test to show ~dp0 should be directory containing batch file.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 8bc6ff9d906dd99703a4c79a06299b1cba5104cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc6ff9d906dd99703a4c79a0… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 12:44:16 2010 -0800 cmd: Add test to show ~dp0 should be directory containing batch file. --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.out | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 04a75ba..2c30f6c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -14,3 +14,12 @@ echo ------------ Testing 'set' -------------- echo set "FOO=bar" should not include the quotes in the variable value set "FOO=bar" echo %FOO% + +echo ------------ Testing variable expansion -------------- +echo ~dp0 should be directory containing batch file +echo %~dp0 +mkdir dummydir +cd dummydir +echo %~dp0 +cd .. +rmdir dummydir diff --git a/programs/cmd/tests/test_builtins.cmd.out b/programs/cmd/tests/test_builtins.cmd.out index 8b5202e..a72e35d 100644 --- a/programs/cmd/tests/test_builtins.cmd.out +++ b/programs/cmd/tests/test_builtins.cmd.out @@ -12,3 +12,7 @@ at-echoed-word ------------ Testing 'set' -------------- set "FOO=bar" should not include the quotes in the variable value bar +------------ Testing variable expansion -------------- +~dp0 should be directory containing batch file +(a)pwd@\ +(a)pwd@\

1 0

Dan Kegel : cmd: Move all tests to test_builtins.cmd.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 5035f3cff306dd706d48ed7e4598ee8f2c9839cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5035f3cff306dd706d48ed7e4… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 10:31:34 2010 -0800 cmd: Move all tests to test_builtins.cmd. --- programs/cmd/tests/rsrc.rc | 8 ++++---- .../cmd/tests/{test_echo.cmd => test_builtins.cmd} | 0 .../{test_echo.cmd.out => test_builtins.cmd.out} | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/rsrc.rc b/programs/cmd/tests/rsrc.rc index 791edb3..da62c11 100644 --- a/programs/cmd/tests/rsrc.rc +++ b/programs/cmd/tests/rsrc.rc @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: test_echo.cmd */ -test_echo.cmd TESTCMD "test_echo.cmd" +/* @makedep: test_builtins.cmd */ +test_builtins.cmd TESTCMD "test_builtins.cmd" -/* @makedep: test_echo.cmd.out */ -test_echo.cmd.out TESTOUT "test_echo.cmd.out" +/* @makedep: test_builtins.cmd.out */ +test_builtins.cmd.out TESTOUT "test_builtins.cmd.out" diff --git a/programs/cmd/tests/test_echo.cmd b/programs/cmd/tests/test_builtins.cmd similarity index 100% rename from programs/cmd/tests/test_echo.cmd rename to programs/cmd/tests/test_builtins.cmd diff --git a/programs/cmd/tests/test_echo.cmd.out b/programs/cmd/tests/test_builtins.cmd.out similarity index 100% rename from programs/cmd/tests/test_echo.cmd.out rename to programs/cmd/tests/test_builtins.cmd.out

1 0

Marcus Meissner : winedbg: rex is not used for Grp15b (Coverity).
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 6beb48c4e1ab2a2540d862ef633e74daff6f0211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6beb48c4e1ab2a2540d862ef6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 17 08:31:12 2010 +0100 winedbg: rex is not used for Grp15b (Coverity). --- programs/winedbg/db_disasm64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 7cb3475..4d4e2eb 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -1406,8 +1406,8 @@ db_disasm(db_addr_t loc, boolean_t altfmt) break; } } - if (ip->i_extra == db_Grp15 && f_mod(rex, regmodrm) == 3) { - i_name = db_Grp15b[f_reg(rex, regmodrm)]; + if (ip->i_extra == db_Grp15 && f_mod(0, regmodrm) == 3) { + i_name = db_Grp15b[f_reg(0, regmodrm)]; i_size = NONE; i_mode = 0; }

1 0

Dan Kegel : cmd: Add test to show set "FOO=bar" should not include the quotes in the variable value.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 9d63b91405122c98a314bde38210c0b2d69263a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d63b91405122c98a314bde38… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 12:25:41 2010 -0800 cmd: Add test to show set "FOO=bar" should not include the quotes in the variable value. --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.out | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index db15217..04a75ba 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -9,3 +9,8 @@ echo "doublequotedword" echo "/?" echo. echo . + +echo ------------ Testing 'set' -------------- +echo set "FOO=bar" should not include the quotes in the variable value +set "FOO=bar" +echo %FOO% diff --git a/programs/cmd/tests/test_builtins.cmd.out b/programs/cmd/tests/test_builtins.cmd.out index 3e7413b..8b5202e 100644 --- a/programs/cmd/tests/test_builtins.cmd.out +++ b/programs/cmd/tests/test_builtins.cmd.out @@ -9,3 +9,6 @@ at-echoed-word "/?" . +------------ Testing 'set' -------------- +set "FOO=bar" should not include the quotes in the variable value +bar

1 0

Alexandre Julliard : dbghelp: Fix a pointer cast.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: ff55fc9beaf1aa2b109e114d002706f34f62f726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff55fc9beaf1aa2b109e114d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 15:50:43 2010 +0100 dbghelp: Fix a pointer cast. --- dlls/dbghelp/stack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 46272db..d53629e 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -65,7 +65,7 @@ static BOOL CALLBACK read_mem(HANDLE hProcess, DWORD addr, void* buffer, DWORD size, LPDWORD nread) { SIZE_T r; - if (!ReadProcessMemory(hProcess, (void*)addr, buffer, size, &r)) return FALSE; + if (!ReadProcessMemory(hProcess, (void*)(DWORD_PTR)addr, buffer, size, &r)) return FALSE; if (nread) *nread = r; return TRUE; }

1 0

Paul Vriens : winspool.drv/tests: Use FILE_SHARE_READ to fix some Win9x/ WinMe failures.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 716358c56859203568aa068695d579a7d2420825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=716358c56859203568aa06869… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Feb 16 16:05:17 2010 +0100 winspool.drv/tests: Use FILE_SHARE_READ to fix some Win9x/WinMe failures. --- dlls/winspool.drv/tests/info.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index bf3dda7..712b00b 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2410,19 +2410,19 @@ static void test_GetPrinterDriver(void) trace("pConfigFile %s\n", di_2->pConfigFile); calculated += strlen(di_2->pConfigFile) + 1; - hf = CreateFileA(di_2->pDriverPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hf = CreateFileA(di_2->pDriverPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); todo_wine ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pDriverPath); - hf = CreateFileA(di_2->pDataFile, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hf = CreateFileA(di_2->pDataFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); todo_wine ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pDataFile); - hf = CreateFileA(di_2->pConfigFile, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hf = CreateFileA(di_2->pConfigFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); todo_wine

1 0

Paul Vriens : winspool.drv/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 09dbbfc5e9e5302fed82d6d55059090e8e9b5012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dbbfc5e9e5302fed82d6d55… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Feb 16 15:59:38 2010 +0100 winspool.drv/tests: Fix a test failure on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 79f47da..bf3dda7 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2664,8 +2664,9 @@ static void test_DeviceCapabilities(void) fields = DeviceCapabilities(device, port, DC_FIELDS, NULL, NULL); ok(fields != (DWORD)-1, "DeviceCapabilities DC_FIELDS failed\n"); todo_wine - ok(fields == (dm->dmFields | DM_FORMNAME), - "fields %x != (dm->dmFields | DM_FORMNAME) %x\n", fields, dm->dmFields); + ok(fields == (dm->dmFields | DM_FORMNAME) || + broken(fields == dm->dmFields), /* Win9x/WinMe */ + "fields %x != (dm->dmFields | DM_FORMNAME) %lx\n", fields, (dm->dmFields | DM_FORMNAME)); GlobalUnlock(prn_dlg.hDevMode); GlobalFree(prn_dlg.hDevMode);

1 0