wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Dan Kegel : cmd: Move all tests to test_builtins.cmd.
by Alexandre Julliard 17 Feb '10

17 Feb '10

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 17 Feb '10

17 Feb '10

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

Nikolay Sivov : msxml3: Use common format for TRACE() in DOM objects.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: abe86a1ef9a8b3490fa492de902e70d6920d5cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe86a1ef9a8b3490fa492de9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 17 09:40:40 2010 +0300 msxml3: Use common format for TRACE() in DOM objects. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 20 +++++---- dlls/msxml3/comment.c | 18 +++++---- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 93 +++++++++++++++++++++++++++------------------ dlls/msxml3/domimpl.c | 4 +- dlls/msxml3/element.c | 19 +++++---- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/node.c | 75 +++++++++++++++++++----------------- dlls/msxml3/nodelist.c | 11 +++-- dlls/msxml3/nodemap.c | 25 +++++++----- dlls/msxml3/parseerror.c | 17 +++++--- dlls/msxml3/pi.c | 4 +- dlls/msxml3/queryresult.c | 11 +++-- dlls/msxml3/schema.c | 2 +- dlls/msxml3/text.c | 19 +++++---- 17 files changed, 184 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abe86a1ef9a8b3490fa49…

1 0

Dan Kegel : advapi32: Fix leak in test_symlinks.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: fed6738bc40b30b6abe729afab9c1b26e077f35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed6738bc40b30b6abe729afa… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 20:51:42 2010 -0800 advapi32: Fix leak in test_symlinks. --- dlls/advapi32/tests/registry.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 4601134..2ad9f89 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -39,6 +39,7 @@ static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDW static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); +static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); /* Debugging functions from wine/libs/wine/debug.c */ @@ -125,6 +126,7 @@ static void InitFunctionPtrs(void) ADVAPI32_GET_PROC(RegDeleteTreeA); pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pNtDeleteKey = (void *)GetProcAddress( hntdll, "NtDeleteKey" ); } @@ -1633,6 +1635,7 @@ static void test_symlinks(void) RegCloseKey( link ); HeapFree( GetProcessHeap(), 0, target ); + pRtlFreeUnicodeString( &target_str ); } START_TEST(registry)

1 0

Vincent Povirk : comdlg32/tests: Rely on the Symbol font instead of Tahoma.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 3f3101138a3abd7c4e712624f0878fa8c76f4d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3101138a3abd7c4e712624f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 16 13:55:05 2010 -0600 comdlg32/tests: Rely on the Symbol font instead of Tahoma. --- dlls/comdlg32/tests/fontdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index 422bf8d..885fb44 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -53,7 +53,7 @@ static void test_ChooseFontA(void) memset(&lfa, 0, sizeof(LOGFONTA)); lfa.lfHeight = -16; lfa.lfWeight = FW_NORMAL; - strcpy(lfa.lfFaceName, "Tahoma"); + strcpy(lfa.lfFaceName, "Symbol"); memset(&cfa, 0, sizeof(CHOOSEFONTA)); cfa.lStructSize = sizeof(cfa); @@ -66,7 +66,7 @@ static void test_ChooseFontA(void) ok(ret == TRUE, "ChooseFontA returned FALSE\n"); ok(lfa.lfHeight == -16, "Expected -16, got %i\n", lfa.lfHeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); - ok(strcmp(lfa.lfFaceName, "Tahoma") == 0, "Expected Arial, got %s\n", lfa.lfFaceName); + ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName); } START_TEST(fontdlg)

1 0

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

17 Feb '10

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

Alexandre Julliard : version: Improve detection of builtin libraries.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 2b1ff0100668df2c1e65cdc6693149168c1b75c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1ff0100668df2c1e65cdc66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 09:41:20 2010 +0100 version: Improve detection of builtin libraries. --- dlls/version/info.c | 26 +++++++++----------------- dlls/version/resource.c | 4 ++++ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 8db40bc..e7f7077 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -238,7 +238,7 @@ typedef struct */ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) { - DWORD len, offset, magic = 0; + DWORD len, offset, magic = 1; HFILE lzfd; HMODULE hModule; OFSTRUCT ofs; @@ -263,7 +263,8 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) magic = find_version_resource( lzfd, &len, &offset ); LZClose( lzfd ); } - else if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) + + if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), MAKEINTRESOURCEW(VS_FILE_INFO) ); @@ -274,11 +275,6 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) } FreeLibrary( hModule ); } - else - { - SetLastError( ofs.nErrCode ); - return 0; - } switch (magic) { @@ -306,7 +302,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) return (len * 2) + 4; default: - SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); + SetLastError( lzfd == HFILE_ERROR ? ofs.nErrCode : ERROR_RESOURCE_DATA_NOT_FOUND ); return 0; } } @@ -340,7 +336,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { static const char signature[4] = "FE2X"; - DWORD len, offset, magic = 0; + DWORD len, offset, magic = 1; HFILE lzfd; OFSTRUCT ofs; HMODULE hModule; @@ -357,14 +353,15 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { - if ((magic = find_version_resource( lzfd, &len, &offset ))) + if ((magic = find_version_resource( lzfd, &len, &offset )) > 1) { LZSeek( lzfd, offset, 0 /* SEEK_SET */ ); len = LZRead( lzfd, data, min( len, datasize ) ); } LZClose( lzfd ); } - else if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) + + if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), MAKEINTRESOURCEW(VS_FILE_INFO) ); @@ -378,11 +375,6 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, } FreeLibrary( hModule ); } - else - { - SetLastError( ofs.nErrCode ); - return FALSE; - } switch (magic) { @@ -407,7 +399,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, return TRUE; default: - SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); + SetLastError( lzfd == HFILE_ERROR ? ofs.nErrCode : ERROR_RESOURCE_DATA_NOT_FOUND ); return FALSE; } } diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 9af07fe..68cda3f 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -101,7 +101,11 @@ static int read_xx_header( HFILE lzfd ) if ( sizeof(mzh) != LZRead( lzfd, (LPSTR)&mzh, sizeof(mzh) ) ) return 0; if ( mzh.e_magic != IMAGE_DOS_SIGNATURE ) + { + if (!memcmp( &mzh, "\177ELF", 4 )) return 1; /* ELF */ + if (*(UINT *)&mzh == 0xfeedface || *(UINT *)&mzh == 0xcefaedfe) return 1; /* Mach-O */ return 0; + } LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); if ( 2 != LZRead( lzfd, magic, 2 ) )

1 0

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

16 Feb '10

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 16 Feb '10

16 Feb '10

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

Alexandre Julliard : dbghelp: Fix a pointer cast.
by Alexandre Julliard 16 Feb '10

16 Feb '10

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

← Newer
1
...
21
22
23
24
25
26
27
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010