February 2008 - Wine-commits

Rob Shearman : cmd: Fix loop termination check in WCMD_batch.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 271eaf5c9d88586662bf7bee1cf358545c9fbaca URL: http://source.winehq.org/git/wine.git/?a=commit;h=271eaf5c9d88586662bf7bee1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:07 2008 +0000 cmd: Fix loop termination check in WCMD_batch. --- programs/cmd/batch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index c9f6e76..12c19ed 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -58,7 +58,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN BATCH_CONTEXT *prev_context; if (startLabel == NULL) { - for(i=0; (i<((sizeof(extension_batch) * sizeof(WCHAR))/WCMD_BATCH_EXT_SIZE)) && + for(i=0; (i<sizeof(extension_batch)/(WCMD_BATCH_EXT_SIZE * sizeof(WCHAR))) && (h == INVALID_HANDLE_VALUE); i++) { strcpyW (string, file); CharLower (string);

1 0

Rob Shearman : wineboot: Fix the character count passed to RegEnumKeyW in start_services.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: c2838c951274f2f5163b35aacc71482b4327b0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2838c951274f2f5163b35aac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:36 2008 +0000 wineboot: Fix the character count passed to RegEnumKeyW in start_services. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 54c3034..024eef3 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -562,7 +562,7 @@ static void start_services(void) return; } - while (!RegEnumKeyW( hkey, index++, name, sizeof(name) )) + while (!RegEnumKeyW( hkey, index++, name, sizeof(name)/sizeof(name[0]) )) { if (RegOpenKeyW( hkey, name, &skey )) continue; size = sizeof(start);

1 0

Rob Shearman : explorer: Clean up after CreateProcess in WinMain.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 45322bb4485664d322c112fc8008043d78ae3727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45322bb4485664d322c112fc8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:19 2008 +0000 explorer: Clean up after CreateProcess in WinMain. --- programs/explorer/explorer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 0f7c257..f261e11 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -196,6 +196,8 @@ int WINAPI WinMain(HINSTANCE hinstance, if (!rc) return 0; + CloseHandle(info.hThread); WaitForSingleObject(info.hProcess,INFINITE); + CloseHandle(info.hProcess); return 0; }

1 0

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

25 Feb '08

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

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

25 Feb '08

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

Stefan Leichter : user32: Added stub for GetMouseMovePointsEx.
by Alexandre Julliard 25 Feb '08

25 Feb '08

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 : rpcrt4: Include ws2tcpip. h instead of Unix headers when targeting a build for Windows.
by Alexandre Julliard 25 Feb '08

25 Feb '08

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

Andrew Talbot : dmloader: Assign to structs instead of using memcpy.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 4cd6ef739d4699f4ccfa53c3256af5c46f06193b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd6ef739d4699f4ccfa53c32… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 23 16:58:32 2008 +0000 dmloader: Assign to structs instead of using memcpy. --- dlls/dmloader/container.c | 18 +++++++++--------- dlls/dmloader/loader.c | 32 ++++++++++++++++---------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index d4fc4d9..98fbf51 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -120,7 +120,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_EnumObject result = DMUS_S_STRING_TRUNCATED; } if (pDesc) - memcpy (pDesc, &pContainedObject->Desc, sizeof(DMUS_OBJECTDESC)); + *pDesc = pContainedObject->Desc; return result; } dwCount++; @@ -171,10 +171,10 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_GetDescriptor ERR(": pDesc bad write pointer\n"); return E_POINTER; } - + DM_STRUCT_INIT(pDesc); - memcpy (pDesc, &This->Desc, sizeof(DMUS_OBJECTDESC)); - + *pDesc = This->Desc; + return S_OK; } @@ -199,7 +199,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_SetDescriptor } if (pDesc->dwValidData & DMUS_OBJ_OBJECT) { - memcpy (&This->Desc.guidObject, &pDesc->guidObject, sizeof(GUID)); + This->Desc.guidObject = pDesc->guidObject; dwNewFlags |= DMUS_OBJ_OBJECT; } if (pDesc->dwValidData & DMUS_OBJ_NAME) { @@ -276,7 +276,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescript TRACE_(dmfile)(": container form\n"); /* set guidClass */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicContainer, sizeof(CLSID)); + pDesc->guidClass = CLSID_DirectMusicContainer; do { IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; @@ -490,7 +490,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST switch (Chunk.fccID) { case DMUS_FOURCC_CONTAINER_FORM: { TRACE_(dmfile)(": container form\n"); - memcpy (&This->Desc.guidClass, &CLSID_DirectMusicContainer, sizeof(CLSID)); + This->Desc.guidClass = CLSID_DirectMusicContainer; This->Desc.dwValidData |= DMUS_OBJ_CLASS; do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); @@ -618,7 +618,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST TRACE_(dmdump)(": contained object header: \n%s\n", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader)); /* copy guidClass */ pNewEntry->Desc.dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pNewEntry->Desc.guidClass, &tmpObjectHeader.guidClassID, sizeof(GUID)); + pNewEntry->Desc.guidClass = tmpObjectHeader.guidClassID; /* store flags */ pNewEntry->dwFlags = tmpObjectHeader.dwFlags; break; @@ -648,7 +648,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST if (!IsEqualCLSID (&pNewEntry->Desc.guidClass, &tmpReferenceHeader.guidClassID)) ERR(": object header declares different CLSID than reference header?\n"); /* it shouldn't be necessary to copy guidClass, since it was set in contained object header already... yet if they happen to be different, I'd rather stick to this one */ - memcpy (&pNewEntry->Desc.guidClass, &tmpReferenceHeader.guidClassID, sizeof(GUID)); + pNewEntry->Desc.guidClass = tmpReferenceHeader.guidClassID; pNewEntry->Desc.dwValidData |= tmpReferenceHeader.dwValidData; break; } diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index b920d9c..8f1f2c2 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -492,7 +492,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ScanDirectory (L DMUS_OBJECTDESC Desc; DM_STRUCT_INIT(&Desc); Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_DATE; - memcpy (&Desc.guidClass, rguidClass, sizeof(GUID)); + Desc.guidClass = *rguidClass; strcpyW (Desc.wszFileName, FileData.cFileName); FileTimeToLocalFileTime (&FileData.ftCreationTime, &Desc.ftDate); IDirectMusicLoader8_SetObject (iface, &Desc); @@ -690,15 +690,15 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnumObject (LPDI LPWINE_LOADER_ENTRY pObjectEntry; ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc); - + DM_STRUCT_INIT(pDesc); - + LIST_FOR_EACH (pEntry, This->pObjects) { pObjectEntry = LIST_ENTRY (pEntry, WINE_LOADER_ENTRY, entry); - + if (IsEqualGUID (rguidClass, &GUID_DirectMusicAllTypes) || IsEqualGUID (rguidClass, &pObjectEntry->Desc.guidClass)) { if (dwCount == dwIndex) { - memcpy (pDesc, &pObjectEntry->Desc, sizeof(DMUS_OBJECTDESC)); + *pDesc = pObjectEntry->Desc; /* we aren't supposed to reveal this info */ pDesc->dwValidData &= ~(DMUS_OBJ_MEMORY | DMUS_OBJ_STREAM); pDesc->pbMemData = NULL; @@ -744,12 +744,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_LoadObjectFromFi ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); DMUS_OBJECTDESC ObjDesc; WCHAR wszLoaderSearchPath[MAX_PATH]; - + TRACE("(%p, %s, %s, %s, %p): wrapping to IDirectMusicLoaderImpl_GetObject\n", This, debugstr_dmguid(rguidClassID), debugstr_dmguid(iidInterfaceID), debugstr_w(pwzFilePath), ppObject); - + DM_STRUCT_INIT(&ObjDesc); ObjDesc.dwValidData = DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_CLASS; /* I believe I've read somewhere in MSDN that this function requires either full path or relative path */ - memcpy (&ObjDesc.guidClass, rguidClassID, sizeof(CLSID)); + ObjDesc.guidClass = *rguidClassID; /* OK, MSDN says that search order is the following: - current directory (DONE) - windows search path (FIXME: how do I get that?) @@ -817,8 +817,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob /* set default DLS collection (via SetObject... so that loading via DMUS_OBJ_OBJECT is possible) */ DM_STRUCT_INIT(&Desc); Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_OBJECT; - memcpy (&Desc.guidClass, &CLSID_DirectMusicCollection, sizeof(CLSID)); - memcpy (&Desc.guidObject, &GUID_DefaultGMCollection, sizeof(GUID)); + Desc.guidClass = CLSID_DirectMusicCollection; + Desc.guidObject = GUID_DefaultGMCollection; DMUSIC_GetDefaultGMPath (Desc.wszFileName); IDirectMusicLoader_SetObject ((LPDIRECTMUSICLOADER8)obj, &Desc); /* and now the workaroundTM for "invalid" default DLS; basically, @@ -939,10 +939,10 @@ HRESULT WINAPI DMUSIC_InitLoaderSettings (LPDIRECTMUSICLOADER8 iface) { TRACE(": (%p)\n", This); GetCurrentDirectoryW (MAX_PATH, wszCurrent); - + for (i = 0; i < sizeof(classes)/sizeof(REFCLSID); i++) { LPWINE_LOADER_OPTION pNewSetting = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_OPTION)); - memcpy (&pNewSetting->guidClass, classes[i], sizeof(CLSID)); + pNewSetting->guidClass = *classes[i]; strcpyW (pNewSetting->wszSearchPath, wszCurrent); pNewSetting->bCache = TRUE; list_add_tail (This->pClassSettings, &pNewSetting->entry); @@ -954,10 +954,10 @@ HRESULT WINAPI DMUSIC_InitLoaderSettings (LPDIRECTMUSICLOADER8 iface) { HRESULT WINAPI DMUSIC_CopyDescriptor (LPDMUS_OBJECTDESC pDst, LPDMUS_OBJECTDESC pSrc) { TRACE(": copy \n%s", debugstr_DMUS_OBJECTDESC(pSrc)); /* copy field by field */ - if (pSrc->dwValidData & DMUS_OBJ_CLASS) memcpy (&pDst->guidClass, &pSrc->guidClass, sizeof(CLSID)); - if (pSrc->dwValidData & DMUS_OBJ_OBJECT) memcpy (&pDst->guidObject, &pSrc->guidObject, sizeof(GUID)); - if (pSrc->dwValidData & DMUS_OBJ_DATE) memcpy (&pDst->ftDate, &pSrc->ftDate, sizeof(FILETIME)); - if (pSrc->dwValidData & DMUS_OBJ_VERSION) memcpy (&pDst->vVersion, &pSrc->vVersion, sizeof(DMUS_VERSION)); + if (pSrc->dwValidData & DMUS_OBJ_CLASS) pDst->guidClass = pSrc->guidClass; + if (pSrc->dwValidData & DMUS_OBJ_OBJECT) pDst->guidObject = pSrc->guidObject; + if (pSrc->dwValidData & DMUS_OBJ_DATE) pDst->ftDate = pSrc->ftDate; + if (pSrc->dwValidData & DMUS_OBJ_VERSION) pDst->vVersion = pSrc->vVersion; if (pSrc->dwValidData & DMUS_OBJ_NAME) strcpyW (pDst->wszName, pSrc->wszName); if (pSrc->dwValidData & DMUS_OBJ_CATEGORY) strcpyW (pDst->wszCategory, pSrc->wszCategory); if (pSrc->dwValidData & DMUS_OBJ_FILENAME) strcpyW (pDst->wszFileName, pSrc->wszFileName);

1 0

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

25 Feb '08

Module: wine Branch: master Commit: be2f48cdd4ec24fd69ebf3125d334f1948dee80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2f48cdd4ec24fd69ebf3125… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 23 15:19:10 2008 +0000 dmime: Assign to structs instead of using memcpy. --- dlls/dmime/segment.c | 22 +++++++++++----------- dlls/dmime/segtriggertrack.c | 4 ++-- dlls/dmime/seqtrack.c | 4 ++-- dlls/dmime/sysextrack.c | 4 ++-- dlls/dmime/tempotrack.c | 6 +++--- dlls/dmime/timesigtrack.c | 4 ++-- dlls/dmime/wavetrack.c | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index badc334..64ffb51 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -541,12 +541,12 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_GetDescriptor static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, 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) @@ -554,9 +554,9 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_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)); @@ -579,11 +579,11 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_ParseDescripto 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_DirectMusicSegment, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicSegment; + 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) { @@ -771,7 +771,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_IPersistStream_Release (LPPERSISTST static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicSegment, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicSegment; return S_OK; } @@ -1302,9 +1302,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppo 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_DirectMusicSegment, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicSegment; obj->ref = 0; /* will be inited by QueryInterface */ list_init (&obj->Tracks); - + return IDirectMusicSegment8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 06237e0..0e341ae 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -237,7 +237,7 @@ static ULONG WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Release (LPPERSIS static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicSegTriggerTrack, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicSegTriggerTrack; return S_OK; } @@ -527,7 +527,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegTriggerTrack (LPCGUID lpcGUID, LPVOID 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_DirectMusicSegTriggerTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicSegTriggerTrack; track->ref = 0; /* will be inited by QueryInterface */ list_init (&track->Items); diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index e2eaecf..6e8823d 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -279,8 +279,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSeqTrack (LPCGUID lpcGUID, LPVOID *ppobj, 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_DirectMusicSeqTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicSeqTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicSeqTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 3ec8c6c..d69d9ff 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -279,8 +279,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSysExTrack (LPCGUID lpcGUID, LPVOID *ppob 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_DirectMusicSysExTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicSysExTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicSysExTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index ea46632..5573a5a 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -310,7 +310,7 @@ static ULONG WINAPI IDirectMusicTempoTrack_IPersistStream_Release (LPPERSISTSTRE static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicTempoTrack, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicTempoTrack; return S_OK; } @@ -352,7 +352,7 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA ERR(": no more memory\n"); return E_OUTOFMEMORY; } - memcpy(&pNewItem->item, &item, sizeof(DMUS_IO_TEMPO_ITEM)); + pNewItem->item = item; list_add_tail (&This->Items, &pNewItem->entry); pNewItem = NULL; StreamCount += sizeof(item); @@ -414,7 +414,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicTempoTrack (LPCGUID lpcGUID, LPVOID *ppob 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_DirectMusicTempoTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicTempoTrack; track->ref = 0; /* will be inited by QueryInterface */ track->enabled = TRUE; list_init (&track->Items); diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index f64e9e1..2ef1cb2 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -284,8 +284,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicTimeSigTrack (LPCGUID lpcGUID, LPVOID *pp 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_DirectMusicTimeSigTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicTimeSigTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicTimeSigTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index fadfafa..f257d12 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -285,8 +285,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicWaveTrack (LPCGUID lpcGUID, LPVOID *ppobj 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_DirectMusicWaveTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicWaveTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicWaveTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); }

1 0

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

25 Feb '08

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