February 2008 - Wine-Commits

Rob Shearman : cmd: Fix character count passed to GetShortPathName in WCMD_HandleTildaModifiers .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 1d6922b2e01fd08b618ace3c87e071dedf08cf6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6922b2e01fd08b618ace3c8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:14 2008 +0000 cmd: Fix character count passed to GetShortPathName in WCMD_HandleTildaModifiers. --- programs/cmd/batch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 12c19ed..21e806a 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -506,7 +506,8 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu if (memchrW(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcatW(finaloutput, space); /* Don't flag as doneModifier - %~s on its own is processed later */ - GetShortPathName(outputparam, outputparam, sizeof(outputparam)); + GetShortPathName(outputparam, outputparam, + sizeof(outputparam)/sizeof(outputparam[0])); } /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */

1 0

Rob Shearman : wineboot: Fix thread handle leak in runCmd.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 47c53cc72496aaf38b6ecc154fc9a7604773e13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c53cc72496aaf38b6ecc154… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:25 2008 +0000 wineboot: Fix thread handle leak in runCmd. --- programs/wineboot/wineboot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 3185963..54c3034 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -329,6 +329,7 @@ static DWORD runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized) GetExitCodeProcess(info.hProcess, &exit_code); } + CloseHandle( info.hThread ); CloseHandle( info.hProcess ); return exit_code;

1 0

Rob Shearman : mciavi32: Fix the buffer length passed into strncat in MCIAVI_mciSet.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 583818513307d8d750cc0232c5d604ef9905ec55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=583818513307d8d750cc0232c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:47 2008 +0000 mciavi32: Fix the buffer length passed into strncat in MCIAVI_mciSet. The number of remaining characters should be passed in, not the total buffer size. --- dlls/mciavi32/info.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 7787fb2..0b5752a 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -230,22 +230,22 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) strcpy(buffer, "MCI_SET_ON:"); if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)); + strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_ON:")); wma->dwSet |= 4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)); + strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_ON:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)); + strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_ON:")); wma->dwSet |= 3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)); + strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_ON:")); wma->dwSet |= 1; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)); + strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_ON:")); wma->dwSet |= 2; break; default: @@ -264,22 +264,22 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) strcpy(buffer, "MCI_SET_OFF:"); if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)); + strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_OFF:")); wma->dwSet &= ~4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)); + strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_OFF:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)); + strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_OFF:")); wma->dwSet &= ~3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)); + strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_OFF:")); wma->dwSet &= ~2; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)); + strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_OFF:")); wma->dwSet &= ~2; break; default: @@ -288,7 +288,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) } } if (dwFlags & MCI_DGV_SET_SEEK_EXACTLY) { - strncat(buffer, " seek_exactly", sizeof(buffer)); + strncat(buffer, " seek_exactly", sizeof(buffer)-strlen(buffer)-1); } FIXME("%s\n", buffer); }

1 0

Rob Shearman : rpcrt4: Include ws2tcpip. h instead of Unix headers when targeting a build for Windows.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 02872894753200f40414fd7db0223628b1c808aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=02872894753200f40414fd7db… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 23 13:21:21 2008 +0000 rpcrt4: Include ws2tcpip.h instead of Unix headers when targeting a build for Windows. --- dlls/rpcrt4/rpc_transport.c | 58 +++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e3fd8c1..0859537 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -29,32 +29,42 @@ #include <stdio.h> #include <string.h> #include <assert.h> -#include <errno.h> - -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <fcntl.h> #include <stdlib.h> #include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_NETINET_TCP_H -# include <netinet/tcp.h> -#endif -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif + +#if defined(__MINGW32__) || defined (_MSC_VER) +# include <ws2tcpip.h> +# ifndef EADDRINUSE +# define EADDRINUSE WSAEADDRINUSE +# endif +# ifndef EAGAIN +# define EAGAIN WSAEWOULDBLOCK +# endif +#else +# include <errno.h> +# ifdef HAVE_UNISTD_H +# include <unistd.h> +# endif +# include <fcntl.h> +# ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +# endif +# ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +# endif +# ifdef HAVE_NETINET_TCP_H +# include <netinet/tcp.h> +# endif +# ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +# endif +# ifdef HAVE_NETDB_H +# include <netdb.h> +# endif +# ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +# endif +#endif /* defined(__MINGW32__) || defined (_MSC_VER) */ #include "windef.h" #include "winbase.h"

1 0

Stefan Leichter : user32: Added stub for GetMouseMovePointsEx.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 684a5b4bab24266160356376b668ddcb66ef356a URL: http://source.winehq.org/git/wine.git/?a=commit;h=684a5b4bab24266160356376b… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Feb 23 09:44:02 2008 +0100 user32: Added stub for GetMouseMovePointsEx. --- dlls/user32/input.c | 25 +++++++++++++++++++++++++ dlls/user32/user32.spec | 2 +- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 354272b..a24980b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1087,3 +1087,28 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) return TRUE; } + +/*********************************************************************** + * GetMouseMovePointsEx [USER32] + * + * RETURNS + * Success: count of point set in the buffer + * Failure: -1 + */ +int WINAPI GetMouseMovePointsEx(UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOINT ptout, int count, DWORD res) { + + if((size != sizeof(MOUSEMOVEPOINT)) || (count < 0) || (count > 64)) { + SetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + + if(!ptin || !ptout) { + SetLastError(ERROR_NOACCESS); + return -1; + } + + FIXME("(%d %p %p %d %d) stub\n", size, ptin, ptout, count, res); + + SetLastError(ERROR_POINT_NOT_FOUND); + return -1; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1c35ecc..7d252cc 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -328,7 +328,7 @@ @ stdcall GetMessageW(ptr long long long) @ stdcall GetMonitorInfoA(long ptr) @ stdcall GetMonitorInfoW(long ptr) -# @ stub GetMouseMovePointsEx +@ stdcall GetMouseMovePointsEx(long ptr ptr long long) @ stdcall GetNextDlgGroupItem(long long long) @ stdcall GetNextDlgTabItem(long long long) # @ stub GetNextQueueWindow

1 0

Rob Shearman : avicap32: Fix the type of retval in capGetDriverDescriptionA .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 03812357dbd16c6aadf8828d17bf973655452ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03812357dbd16c6aadf8828d1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 08:59:38 2008 +0000 avicap32: Fix the type of retval in capGetDriverDescriptionA. --- dlls/avicap32/avicap32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 4fc6727..349ee5d 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -179,7 +179,7 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi BOOL VFWAPI capGetDriverDescriptionA(WORD wDriverIndex, LPSTR lpszName, INT cbName, LPSTR lpszVer, INT cbVer) { - HRESULT retval; + BOOL retval; WCHAR devname[CAP_DESC_MAX], devver[CAP_DESC_MAX]; TRACE("--> capGetDriverDescriptionW\n"); retval = capGetDriverDescriptionW(wDriverIndex, devname, CAP_DESC_MAX, devver, CAP_DESC_MAX);

1 0

Rob Shearman : comdlg32: Fix checks for failure of COMDLG32_SHGetFolderPathW in FILEDLG95_InitControls .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 4e0100ff06ab27758947c17cd8480f81e42d1a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0100ff06ab27758947c17cd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 08:59:46 2008 +0000 comdlg32: Fix checks for failure of COMDLG32_SHGetFolderPathW in FILEDLG95_InitControls. COMDLG32_SHGetFolderPathW returns a BOOL, not an HRESULT. --- dlls/comdlg32/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 38f95ae..13b4c79 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1373,9 +1373,9 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if (handledPath == FALSE && (win2000plus || win98plus)) { fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR)); - if(FAILED(COMDLG32_SHGetFolderPathW(hwnd, CSIDL_PERSONAL, 0, 0, fodInfos->initdir))) + if(!COMDLG32_SHGetFolderPathW(hwnd, CSIDL_PERSONAL, 0, 0, fodInfos->initdir)) { - if(FAILED(COMDLG32_SHGetFolderPathW(hwnd, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, 0, 0, fodInfos->initdir))) + if(!COMDLG32_SHGetFolderPathW(hwnd, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, 0, 0, fodInfos->initdir)) { /* last fallback */ GetCurrentDirectoryW(MAX_PATH, fodInfos->initdir);

1 0

Stefan Leichter : user32: Fix a test of GetMouseMovePointsEx.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 0640dbb62013a1d21e54e7b7564aae481db05236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0640dbb62013a1d21e54e7b75… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Feb 23 09:43:44 2008 +0100 user32: Fix a test of GetMouseMovePointsEx. --- dlls/user32/tests/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index cf7602d..5d56f75 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -768,7 +768,7 @@ static void test_GetMouseMovePointsEx(void) count = BUFLIM; retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); todo_wine { - ok(retval <= count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + ok((0 <= retval) && (retval <= count), "expected GetMouseMovePointsEx to succeed, got %d\n", retval); ok(MYERROR == GetLastError(), "expected error %d, got %u\n", MYERROR, GetLastError()); }

1 0

Andrew Talbot : dmime: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 13afbc02b661495e125b868d5f93ad67fe9012ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=13afbc02b661495e125b868d5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 23 15:19:04 2008 +0000 dmime: Assign to structs instead of using memcpy. --- dlls/dmime/audiopath.c | 20 ++++++++++---------- dlls/dmime/dmutils.c | 4 ++-- dlls/dmime/graph.c | 20 ++++++++++---------- dlls/dmime/markertrack.c | 2 +- dlls/dmime/paramcontroltrack.c | 4 ++-- dlls/dmime/performance.c | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 448160f..23d837a 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -255,12 +255,12 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_GetDescriptor static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, ObjectVtbl, iface); TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc)); - + /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - memcpy (&This->pDesc->guidObject, &pDesc->guidObject, sizeof (pDesc->guidObject)); + This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - memcpy (&This->pDesc->guidClass, &pDesc->guidClass, sizeof (pDesc->guidClass)); + This->pDesc->guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -268,9 +268,9 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_SetDescriptor if (pDesc->dwValidData & DMUS_OBJ_FILENAME) lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - memcpy (&This->pDesc->vVersion, &pDesc->vVersion, sizeof (pDesc->vVersion)); + This->pDesc->vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - memcpy (&This->pDesc->ftDate, &pDesc->ftDate, sizeof (pDesc->ftDate)); + This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); @@ -293,11 +293,11 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescript LARGE_INTEGER liMove; /* used when skipping chunks */ TRACE("(%p, %p, %p)\n", This, pStream, pDesc); - + /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicAudioPath, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicAudioPath; + IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -649,8 +649,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicAudioPathImpl (LPCGUID lpcGUID, LPVOID* p obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&obj->pDesc->guidClass, &CLSID_DirectMusicAudioPath, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicAudioPath; obj->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicAudioPathImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index c882987..a3117f7 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -207,9 +207,9 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); - + ref_desc.dwValidData |= DMUS_OBJ_CLASS; - memcpy(&ref_desc.guidClass, &ref.guidClassID, sizeof(ref.guidClassID)); + ref_desc.guidClass = ref.guidClassID; TRACE_(dmfile)("** DM Reference Begin of Load ***\n"); TRACE_(dmfile)("With Desc:\n"); diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 0e6fef9..7d0363a 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -221,12 +221,12 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_GetDescriptor (LP static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicGraphImpl, ObjectVtbl, iface); TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc)); - + /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - memcpy (&This->pDesc->guidObject, &pDesc->guidObject, sizeof (pDesc->guidObject)); + This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - memcpy (&This->pDesc->guidClass, &pDesc->guidClass, sizeof (pDesc->guidClass)); + This->pDesc->guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -234,9 +234,9 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_SetDescriptor (LP if (pDesc->dwValidData & DMUS_OBJ_FILENAME) lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - memcpy (&This->pDesc->vVersion, &pDesc->vVersion, sizeof (pDesc->vVersion)); + This->pDesc->vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - memcpy (&This->pDesc->ftDate, &pDesc->ftDate, sizeof (pDesc->ftDate)); + This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); @@ -259,11 +259,11 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_ParseDescriptor ( LARGE_INTEGER liMove; /* used when skipping chunks */ TRACE("(%p, %p, %p)\n", This, pStream, pDesc); - + /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicGraph, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicGraph; + IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -614,9 +614,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicGraphImpl (LPCGUID lpcGUID, LPVOID* ppobj obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&obj->pDesc->guidClass, &CLSID_DirectMusicGraph, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicGraph; obj->ref = 0; /* will be inited by QueryInterface */ list_init (&obj->Tools); - + return IDirectMusicGraphImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 8230677..0bbcb83 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -279,7 +279,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicMarkerTrack (LPCGUID lpcGUID, LPVOID *ppo track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicMarkerTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicMarkerTrack; track->ref = 0; /* will be inited by QueryInterface */ return IDirectMusicMarkerTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 0000418..d2ddfea 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -279,8 +279,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicParamControlTrack (LPCGUID lpcGUID, LPVOI track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicParamControlTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicParamControlTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicParamControlTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 51a4b25..961af4d 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -770,7 +770,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio (LPDIRECTMUSICPERFO /* as seen in msdn we need params init before audio path creation */ if (NULL != pParams) { - memcpy(&This->pParams, pParams, sizeof(DMUS_AUDIOPARAMS)); + This->pParams = *pParams; } else { /** * TODO, how can i fill the struct

1 0

Andrew Talbot : dmband: Assign to struct instead of using memcpy.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: ea85c5b15b7c2eedcae389613f2b03f34fc803bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea85c5b15b7c2eedcae389613… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 23 08:40:25 2008 +0000 dmband: Assign to struct instead of using memcpy. --- dlls/dmband/bandtrack.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index f85d096..b328b1d 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -302,7 +302,7 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_LoadBand (LPPERSISTSTREAM if ERR(": no more memory\n"); return E_OUTOFMEMORY; } - memcpy(&pNewBand->BandHeader, pHeader, sizeof(DMUS_PRIVATE_BAND_ITEM_HEADER)); + pNewBand->BandHeader = *pHeader; pNewBand->pBand = (IDirectMusicBandImpl*)((char*)(*ppBand) - offsetof(IDirectMusicBandImpl,BandVtbl)); IDirectMusicBand_AddRef(*ppBand); list_add_tail (&This->Bands, &pNewBand->entry); @@ -322,6 +322,8 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTR IDirectMusicBand* pBand = NULL; DMUS_PRIVATE_BAND_ITEM_HEADER header; + memset(&header, 0, sizeof header); + if (pChunk->fccID != DMUS_FOURCC_BANDS_LIST) { ERR_(dmfile)(": %s chunk should be a BANDS list\n", debugstr_fourcc (pChunk->fccID)); return E_FAIL;

1 0