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

Andrew Talbot : mciwave: Assign to struct instead of using memcpy.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 1a540fa4ced8189d7d588461f23a21278369ae25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a540fa4ced8189d7d588461f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 4 22:30:39 2008 +0000 mciwave: Assign to struct instead of using memcpy. --- dlls/mciwave/mciwave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 0b12ad2..7dfedca 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -323,7 +323,7 @@ static DWORD WAVE_mciCreateRIFFSkeleton(WINE_MCIWAVE* wmw) { wmw->lpWaveFormat = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wmw->lpWaveFormat)); if (!wmw->lpWaveFormat) return MMSYSERR_NOMEM; - memcpy(wmw->lpWaveFormat, &wmw->wfxRef, sizeof(wmw->wfxRef)); + *wmw->lpWaveFormat = wmw->wfxRef; } /* we can only record PCM files... there is no way in the MCI API to specify

1 0

Andrew Talbot : mciavi32: Assign to struct instead of using memcpy.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 4c656d88028c621b30951f873747f7a41d767dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c656d88028c621b30951f873… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 4 22:30:35 2008 +0000 mciavi32: Assign to struct instead of using memcpy. --- dlls/mciavi32/mciavi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 84f9077..35d8046 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -369,7 +369,7 @@ static DWORD MCIAVI_mciPlay_async(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PA data->wDevID = wma->wDevID; data->flags = dwFlags; - memcpy(&data->params, lpParams, sizeof(MCI_PLAY_PARMS)); + data->params = *lpParams; if (!(handle = CreateThread(NULL, 0, MCIAVI_mciPlay_thread, data, 0, NULL))) {

1 0

Andrew Talbot : mpr: Assign to struct instead of using memcpy.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: c604e075ecacee4b3e8e12e469502b9df5260129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c604e075ecacee4b3e8e12e46… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 4 22:30:43 2008 +0000 mpr: Assign to struct instead of using memcpy. --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 36fb93c..17e8195 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -355,7 +355,7 @@ static LPNETRESOURCEW _copyNetResourceForEnumW(LPNETRESOURCEW lpNet) { size_t len; - memcpy(ret, lpNet, sizeof(ret)); + *ret = *lpNet; ret->lpLocalName = ret->lpComment = ret->lpProvider = NULL; if (lpNet->lpRemoteName) {

1 0

Alistair Leslie-Hughes : msxml3: Remove Byte since it' s not a valid datatype.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 077e9d8945af1c743999dcf8328c9f8912278319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=077e9d8945af1c743999dcf83… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 4 21:15:17 2008 +1100 msxml3: Remove Byte since it's not a valid datatype. --- dlls/msxml3/node.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 72eb9c3..0bff8e9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -51,7 +51,6 @@ static const WCHAR szDate[] = {'D','a','t','e',0}; static const WCHAR szTime[] = {'T','i','m','e',0}; static const WCHAR szTimeTZ[] = {'T','i','m','e','.','t','z',0}; static const WCHAR szI1[] = {'i','1',0}; -static const WCHAR szByte[] = {'B','y','t','e',0}; static const WCHAR szI2[] = {'i','2',0}; static const WCHAR szI4[] = {'i','4',0}; static const WCHAR szIU1[] = {'u','i','1',0}; @@ -940,7 +939,6 @@ static HRESULT WINAPI xmlnode_put_dataType( lstrcmpiW(dataTypeName,szTime) == 0 || lstrcmpiW(dataTypeName,szTimeTZ) == 0 || lstrcmpiW(dataTypeName,szI1) == 0 || - lstrcmpiW(dataTypeName,szByte) == 0 || lstrcmpiW(dataTypeName,szI2) == 0 || lstrcmpiW(dataTypeName,szIU1) == 0 || lstrcmpiW(dataTypeName,szIU2) == 0 ||

1 0

Alistair Leslie-Hughes : ntdll: Added support for Windows 2008.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 24433c36c271263180244c95d6868822466b17ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=24433c36c271263180244c95d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 2 22:20:53 2008 +1100 ntdll: Added support for Windows 2008. --- dlls/ntdll/version.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index e519144..09b338f 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -52,6 +52,7 @@ typedef enum WINXP, /* Windows XP */ WIN2K3, /* Windows 2003 */ WINVISTA,/* Windows Vista */ + WIN2K8, /* Windows 2008 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -141,6 +142,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1770, VER_PLATFORM_WIN32_NT, {' ',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, + /* WIN2K8 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1771, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 } }; @@ -157,7 +164,8 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win2000,win2k,nt2k,nt2000", /* NT2K */ "winxp", /* WINXP */ "win2003,win2k3", /* WIN2K3 */ - "vista,winvista" /* WINVISTA*/ + "vista,winvista", /* WINVISTA*/ + "win2008,win2k8", /* WIN2K8 */ };

1 0

Alistair Leslie-Hughes : winecfg: Added support for Windows 2008.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 9790d172e91aa3665a1bc5b5bdecfdca51db616c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9790d172e91aa3665a1bc5b5b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 2 22:21:10 2008 +1100 winecfg: Added support for Windows 2008. --- programs/winecfg/appdefaults.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 1df045e..3fdd8f3 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,6 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1770,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"},

1 0

Andrew Talbot : mapi32: Assign to structs instead of using memcpy.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 18f78c721f6c049c143d6e7329c96f6f5dc14fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f78c721f6c049c143d6e732… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 4 22:30:32 2008 +0000 mapi32: Assign to structs instead of using memcpy. --- dlls/mapi32/prop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 18e8013..e30a83b 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -83,7 +83,7 @@ SCODE WINAPI PropCopyMore(LPSPropValue lpDest, LPSPropValue lpSrc, case PT_CLSID: scode = lpMore(sizeof(GUID), lpOrig, (LPVOID*)&lpDest->Value.lpguid); if (SUCCEEDED(scode)) - memcpy(lpDest->Value.lpguid, lpSrc->Value.lpguid, sizeof(GUID)); + *lpDest->Value.lpguid = *lpSrc->Value.lpguid; break; case PT_STRING8: ulLen = lstrlenA(lpSrc->Value.lpszA) + 1u; @@ -810,7 +810,7 @@ SCODE WINAPI ScCopyProps(int cValues, LPSPropValue lpProps, LPVOID lpDst, ULONG { case PT_CLSID: lpDest->Value.lpguid = (LPGUID)lpDataDest; - memcpy(lpDest->Value.lpguid, lpProps->Value.lpguid, sizeof(GUID)); + *lpDest->Value.lpguid = *lpProps->Value.lpguid; lpDataDest += sizeof(GUID); break; case PT_STRING8:

1 0

Eric Pouech : ntdll: Removed conflict for FAILED ( defined both in our winerror.h and in linux/scsi.h).
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 2bbb39d6017f0ea589e9b5eeabed039a1dd9777e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bbb39d6017f0ea589e9b5eea… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 4 21:36:54 2008 +0100 ntdll: Removed conflict for FAILED (defined both in our winerror.h and in linux/scsi.h). --- dlls/ntdll/cdrom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 9da442c..e53e41d 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -49,6 +49,7 @@ #ifdef HAVE_SCSI_SCSI_H # include <scsi/scsi.h> # undef REASSIGN_BLOCKS /* avoid conflict with winioctl.h */ +# undef FAILED /* avoid conflict with winerror.h */ #endif #ifdef HAVE_SCSI_SCSI_IOCTL_H # include <scsi/scsi_ioctl.h>

1 0

Alistair Leslie-Hughes : msxml3: Stopped seg faults during regression tests on windows.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 8ac57e940ba5c1608c244d73824effc2efbe0fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac57e940ba5c1608c244d738… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 4 21:09:06 2008 +1100 msxml3: Stopped seg faults during regression tests on windows. --- dlls/msxml3/tests/domdoc.c | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1426341..e34872e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2316,6 +2316,7 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, szElementXML3 ), "incorrect element xml\n"); + SysFreeString(str); IXMLDOMElement_Release(pElement); } @@ -2391,18 +2392,18 @@ static void test_xmlTypes(void) SysFreeString(str); /* test length property */ - hr = IXMLDOMCDATASection_get_length(pComment, &len); + hr = IXMLDOMCDATASection_get_length(pCDataSec, &len); ok(hr == S_OK, "ret %08x\n", hr ); ok(len == 21, "expected 21 got %ld\n", len); /* test get nodeValue */ - hr = IXMLDOMCDATASection_get_nodeValue(pComment, &var); + hr = IXMLDOMCDATASection_get_nodeValue(pCDataSec, &var); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); VariantClear(&var); /* test get data */ - hr = IXMLDOMCDATASection_get_data(pComment, &str); + hr = IXMLDOMCDATASection_get_data(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); SysFreeString(str); @@ -2470,7 +2471,7 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("documentfragment") ), "incorrect nodeTypeString string\n"); SysFreeString(str); - IXMLDOMDocumentFragment_Release(pCDataSec); + IXMLDOMDocumentFragment_Release(pDocFrag); } /* Entity References */ @@ -2696,19 +2697,6 @@ static void test_nodeTypeTests( void ) IXMLDOMElement_Release(pElement); } - /* Byte */ - hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_byte"), &pElement); - ok(hr == S_OK, "ret %08x\n", hr ); - if(hr == S_OK) - { - IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL); - - hr = IXMLDOMElement_put_dataType(pElement, _bstr_("byte") ); - ok(hr == S_OK, "ret %08x\n", hr ); - - IXMLDOMElement_Release(pElement); - } - /* I2 */ hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing_I2"), &pElement); ok(hr == S_OK, "ret %08x\n", hr );

1 0

Mikołaj Zalewski : shell32: Improve SHRegisterDragDrop and SHRevokeDragDrop.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: aa3ad44edfd729a720595e075bc7e77c23b75e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3ad44edfd729a720595e075… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Mar 4 20:26:34 2008 +0100 shell32: Improve SHRegisterDragDrop and SHRevokeDragDrop. --- dlls/shell32/shellord.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index ed326ea..5d1666b 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -446,9 +446,12 @@ int WINAPIV ShellMessageBoxA( /************************************************************************* * SHRegisterDragDrop [SHELL32.86] * - * Probably equivalent to RegisterDragDrop but under Windows 9x it could use the + * Probably equivalent to RegisterDragDrop but under Windows 95 it could use the * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE - * for details + * for details. Under Windows 98 this function initializes the true OLE when called + * the first time, on XP always returns E_OUTOFMEMORY and it got removed from Vista. + * + * We follow Windows 98 behaviour. * * NOTES * exported by ordinal @@ -460,16 +463,30 @@ HRESULT WINAPI SHRegisterDragDrop( HWND hWnd, LPDROPTARGET pDropTarget) { - FIXME("(%p,%p):stub.\n", hWnd, pDropTarget); + static BOOL ole_initialized = FALSE; + HRESULT hr; + + TRACE("(%p,%p)\n", hWnd, pDropTarget); + + if (!ole_initialized) + { + hr = OleInitialize(NULL); + if (FAILED(hr)) + return hr; + ole_initialized = TRUE; + } return RegisterDragDrop(hWnd, pDropTarget); } /************************************************************************* * SHRevokeDragDrop [SHELL32.87] * - * Probably equivalent to RevokeDragDrop but under Windows 9x it could use the + * Probably equivalent to RevokeDragDrop but under Windows 95 it could use the * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE - * for details + * for details. Function removed from Windows Vista. + * + * We call ole32 RevokeDragDrop which seems to work even if OleInitialize was + * not called. * * NOTES * exported by ordinal @@ -479,7 +496,7 @@ HRESULT WINAPI SHRegisterDragDrop( */ HRESULT WINAPI SHRevokeDragDrop(HWND hWnd) { - FIXME("(%p):stub.\n",hWnd); + TRACE("(%p)\n", hWnd); return RevokeDragDrop(hWnd); }

1 0