February 2008 - Wine-Commits

James Hawkins : msi: Implement MsiSourceListEnumMediaDisks.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: 1bd49bcf7486ece38d8e804108cb28d04defe0f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd49bcf7486ece38d8e80410… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Feb 25 22:07:42 2008 -0600 msi: Implement MsiSourceListEnumMediaDisks. --- dlls/msi/msi.spec | 4 +- dlls/msi/source.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/msi.h | 6 ++ 3 files changed, 196 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index b510de7..598e2f3 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -264,8 +264,8 @@ 268 stdcall MsiSourceListSetInfoW(wstr wstr long long wstr wstr) 269 stub MsiEnumPatchesExA 270 stub MsiEnumPatchesExW -271 stub MsiSourceListEnumMediaDisksA -272 stub MsiSourceListEnumMediaDisksW +271 stdcall MsiSourceListEnumMediaDisksA(str str long long long ptr ptr ptr ptr ptr) +272 stdcall MsiSourceListEnumMediaDisksW(wstr wstr long long long ptr ptr ptr ptr ptr) 273 stdcall MsiSourceListAddMediaDiskA(str str long long long str str) 274 stdcall MsiSourceListAddMediaDiskW(wstr wstr long long long wstr wstr) 275 stub MsiSourceListClearMediaDiskA diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 716414f..b508569 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -141,6 +141,194 @@ static UINT OpenURLSubkey(HKEY rootkey, HKEY *key, BOOL create) } /****************************************************************** + * MsiSourceListEnumMediaDisksA (MSI.@) + */ +UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR szProductCodeOrPatchCode, + LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, + DWORD dwOptions, DWORD dwIndex, LPWORD pdwDiskId, + LPSTR szVolumeLabel, LPDWORD pcchVolumeLabel, + LPSTR szDiskPrompt, LPDWORD pcchDiskPrompt) +{ + LPWSTR product = NULL; + LPWSTR usersid = NULL; + LPWSTR volume = NULL; + LPWSTR prompt = NULL; + DWORD volumesz, promptsz; + UINT r = ERROR_INVALID_PARAMETER; + + TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n", debugstr_a(szProductCodeOrPatchCode), + debugstr_a(szUserSid), dwContext, dwOptions, dwIndex, pdwDiskId, + szVolumeLabel, pcchVolumeLabel, szDiskPrompt, pcchDiskPrompt); + + if (szDiskPrompt && !pcchDiskPrompt) + return ERROR_INVALID_PARAMETER; + + if (szProductCodeOrPatchCode) product = strdupAtoW(szProductCodeOrPatchCode); + if (szUserSid) usersid = strdupAtoW(szUserSid); + + /* FIXME: add tests for an invalid format */ + + if (pcchVolumeLabel) + volume = msi_alloc(*pcchVolumeLabel * sizeof(WCHAR)); + + if (pcchDiskPrompt) + prompt = msi_alloc(*pcchDiskPrompt * sizeof(WCHAR)); + + if (volume) *volume = '\0'; + if (prompt) *prompt = '\0'; + r = MsiSourceListEnumMediaDisksW(product, usersid, dwContext, dwOptions, + dwIndex, pdwDiskId, volume, pcchVolumeLabel, + prompt, pcchDiskPrompt); + if (r != ERROR_SUCCESS) + goto done; + + if (szVolumeLabel && pcchVolumeLabel) + volumesz = WideCharToMultiByte(CP_ACP, 0, volume, -1, szVolumeLabel, + *pcchVolumeLabel + 1, NULL, NULL); + + if (szDiskPrompt) + promptsz = WideCharToMultiByte(CP_ACP, 0, prompt, -1, szDiskPrompt, + *pcchDiskPrompt + 1, NULL, NULL); + +done: + msi_free(product); + msi_free(usersid); + msi_free(volume); + msi_free(prompt); + + return r; +} + +/****************************************************************** + * MsiSourceListEnumMediaDisksW (MSI.@) + */ +UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, + LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, + DWORD dwOptions, DWORD dwIndex, LPWORD pdwDiskId, + LPWSTR szVolumeLabel, LPDWORD pcchVolumeLabel, + LPWSTR szDiskPrompt, LPDWORD pcchDiskPrompt) +{ + WCHAR squished_pc[GUID_SIZE]; + LPWSTR value = NULL; + LPWSTR data = NULL; + LPWSTR ptr; + HKEY source, media; + DWORD valuesz, datasz = 0; + DWORD type; + DWORD numvals, size; + LONG res; + UINT r; + static int index = 0; + + TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p)\n", debugstr_w(szProductCodeOrPatchCode), + debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szVolumeLabel, + pcchVolumeLabel, szDiskPrompt, pcchDiskPrompt); + + if (!szProductCodeOrPatchCode || + !squash_guid(szProductCodeOrPatchCode, squished_pc)) + return ERROR_INVALID_PARAMETER; + + if (dwContext == MSIINSTALLCONTEXT_MACHINE && szUserSid) + return ERROR_INVALID_PARAMETER; + + if (dwOptions != MSICODE_PRODUCT && dwOptions != MSICODE_PATCH) + return ERROR_INVALID_PARAMETER; + + if (szDiskPrompt && !pcchDiskPrompt) + return ERROR_INVALID_PARAMETER; + + if (dwIndex == 0) + index = 0; + + if (dwIndex != index) + return ERROR_INVALID_PARAMETER; + + r = OpenSourceKey(szProductCodeOrPatchCode, &source, + dwOptions, dwContext, FALSE); + if (r != ERROR_SUCCESS) + return r; + + r = OpenMediaSubkey(source, &media, FALSE); + if (r != ERROR_SUCCESS) + { + RegCloseKey(source); + return ERROR_NO_MORE_ITEMS; + } + + if (!pcchVolumeLabel && !pcchDiskPrompt) + { + r = RegEnumValueW(media, dwIndex, NULL, NULL, NULL, + &type, NULL, NULL); + goto done; + } + + res = RegQueryInfoKeyW(media, NULL, NULL, NULL, NULL, NULL, + NULL, &numvals, &valuesz, &datasz, NULL, NULL); + if (res != ERROR_SUCCESS) + { + r = ERROR_BAD_CONFIGURATION; + goto done; + } + + value = msi_alloc(++valuesz * sizeof(WCHAR)); + data = msi_alloc(++datasz * sizeof(WCHAR)); + if (!value || !data) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + r = RegEnumValueW(media, dwIndex, value, &valuesz, + NULL, &type, (LPBYTE)data, &datasz); + if (r != ERROR_SUCCESS) + goto done; + + if (pdwDiskId) + *pdwDiskId = atolW(value); + + ptr = strchrW(data, ';'); + if (!ptr) + ptr = data; + else + *ptr = '\0'; + + if (pcchVolumeLabel) + { + size = lstrlenW(data); + if (size >= *pcchVolumeLabel) + r = ERROR_MORE_DATA; + else if (szVolumeLabel) + lstrcpyW(szVolumeLabel, data); + + *pcchVolumeLabel = size; + } + + if (pcchDiskPrompt) + { + data = ptr; + if (!*data) + data++; + + size = lstrlenW(data); + if (size >= *pcchDiskPrompt) + r = ERROR_MORE_DATA; + else if (szDiskPrompt) + lstrcpyW(szDiskPrompt, data); + + *pcchDiskPrompt = size; + } + + index++; + +done: + msi_free(value); + msi_free(data); + RegCloseKey(source); + + return r; +} + +/****************************************************************** * MsiSourceListEnumSourcesA (MSI.@) */ UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR szProductCodeOrPatch, LPCSTR szUserSid, diff --git a/include/msi.h b/include/msi.h index 26d07fb..93c4c28 100644 --- a/include/msi.h +++ b/include/msi.h @@ -537,6 +537,12 @@ UINT WINAPI MsiSourceListAddSourceA(LPCSTR, LPCSTR, DWORD, LPCSTR); UINT WINAPI MsiSourceListAddSourceW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR); #define MsiSourceListAddSource WINELIB_NAME_AW(MsiSourceListAddSource) +UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWORD, + LPSTR, LPDWORD, LPSTR, LPDWORD); +UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWORD, + LPWSTR, LPDWORD, LPWSTR, LPDWORD); +#define MsiSourceListEnumMediaDisks WINELIB_NAME_AW(MsiSourceListEnumMediaDisks) + UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD); UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWSTR, LPDWORD); #define MsiSourceListEnumSources WINELIB_NAME_AW(MsiSourceListEnumSources)

1 0

Maarten Lankhorst : wininet: Add stub for INTERNET_OPTION_PER_CONNECTION.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: 60401737c61520ccf57779be2cbeed49beea25b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60401737c61520ccf57779be2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Feb 25 11:01:08 2008 -0800 wininet: Add stub for INTERNET_OPTION_PER_CONNECTION. --- dlls/wininet/internet.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c5b6a9f..ba4501e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2400,6 +2400,47 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d } break; } + case INTERNET_OPTION_PER_CONNECTION_OPTION: + FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); + if (*lpdwBufferLength < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); + else + { + INTERNET_PER_CONN_OPTION_LISTW *con = lpBuffer; + int x; + bSuccess = TRUE; + for (x = 0; x < con->dwOptionCount; ++x) + { + INTERNET_PER_CONN_OPTIONW *option = con->pOptions + x; + switch (option->dwOption) + { + case INTERNET_PER_CONN_FLAGS: + option->Value.dwValue = PROXY_TYPE_DIRECT; + break; + + case INTERNET_PER_CONN_PROXY_SERVER: + case INTERNET_PER_CONN_PROXY_BYPASS: + case INTERNET_PER_CONN_AUTOCONFIG_URL: + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + FIXME("Unhandled dwOption %d\n", option->dwOption); + option->Value.dwValue = 0; + bSuccess = FALSE; + break; + + default: + FIXME("Unknown dwOption %d\n", option->dwOption); + bSuccess = FALSE; + break; + } + } + if (!bSuccess) + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + } + break; default: FIXME("Stub! %d\n", dwOption); break;

1 0

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

Feb. 26, 2008

Module: wine Branch: master Commit: 6b39f35cf5ed1fa0371beab5114a00c984f8fc9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b39f35cf5ed1fa0371beab51… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 19:48:31 2008 +0000 dmusic: Assign to structs instead of using memcpy. --- dlls/dmusic/collection.c | 20 ++++++++++---------- dlls/dmusic/port.c | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 06842c5..1fc7bd2 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -192,12 +192,12 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicCollectionImpl, 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) @@ -205,9 +205,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto 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)); @@ -230,11 +230,11 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip 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_DirectMusicCollection, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicCollection; + 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) { @@ -770,9 +770,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl (LPCGUID lpcGUID, LPVOID* 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_DirectMusicCollection, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicCollection; obj->ref = 0; /* will be inited by QueryInterface */ list_init (&obj->Instruments); - + return IDirectMusicCollectionImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index fd7bda4..83fda74 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -115,7 +115,7 @@ static HRESULT WINAPI IDirectMusicPortImpl_Compact (LPDIRECTMUSICPORT iface) { static HRESULT WINAPI IDirectMusicPortImpl_GetCaps (LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS pPortCaps) { IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface; TRACE("(%p, %p)\n", This, pPortCaps); - memcpy(pPortCaps, &This->caps, sizeof(DMUS_PORTCAPS)); + *pPortCaps = This->caps; return S_OK; } @@ -250,8 +250,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, obj->lpVtbl = &DirectMusicPort_Vtbl; obj->ref = 0; /* will be inited by QueryInterface */ obj->fActive = FALSE; - memcpy(&obj->params, pPortParams, sizeof(DMUS_PORTPARAMS)); - memcpy(&obj->caps, pPortCaps, sizeof(DMUS_PORTCAPS)); + obj->params = *pPortParams; + obj->caps = *pPortCaps; obj->pDirectSound = NULL; obj->pLatencyClock = NULL; hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL);

1 0

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

Feb. 26, 2008

Module: wine Branch: master Commit: e1062df14bd2cea5026aad904944093ea1d9b02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1062df14bd2cea5026aad904… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 19:48:22 2008 +0000 dmscript: Assign to structs instead of using memcpy. --- dlls/dmscript/script.c | 24 ++++++++++++------------ dlls/dmscript/scripttrack.c | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index a294249..3d9ae42 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -224,12 +224,12 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor (L static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, 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) @@ -237,9 +237,9 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (L 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)); @@ -260,13 +260,13 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; 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_DirectMusicScript, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicScript; + 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) { @@ -431,7 +431,7 @@ static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTRE static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicScript, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicScript; return S_OK; } @@ -704,8 +704,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppob 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_DirectMusicScript, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicScript; obj->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index f50ff10..d8a4697 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -284,8 +284,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (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_DirectMusicScriptTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicScriptTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); }

1 0

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

Feb. 26, 2008

Module: wine Branch: master Commit: a01bfc26fe8b8da3e37a409c1cd7ac95f52b8d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01bfc26fe8b8da3e37a409c1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 19:48:26 2008 +0000 dmstyle: Assign to structs instead of using memcpy. --- dlls/dmstyle/auditiontrack.c | 4 ++-- dlls/dmstyle/chordtrack.c | 6 +++--- dlls/dmstyle/commandtrack.c | 4 ++-- dlls/dmstyle/dmutils.c | 4 ++-- dlls/dmstyle/motiftrack.c | 4 ++-- dlls/dmstyle/mutetrack.c | 4 ++-- dlls/dmstyle/style.c | 20 ++++++++++---------- dlls/dmstyle/styletrack.c | 6 +++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 979c038..42cb96c 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -284,8 +284,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicAuditionTrack (LPCGUID lpcGUID, LPVOID *p 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_DirectMusicAuditionTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicAuditionTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicAuditionTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index d9dfbb5..563d813 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -246,7 +246,7 @@ static ULONG WINAPI IDirectMusicChordTrack_IPersistStream_Release (LPPERSISTSTRE static HRESULT WINAPI IDirectMusicChordTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicChordTrack, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicChordTrack, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicChordTrack; return S_OK; } @@ -413,8 +413,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicChordTrack (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_DirectMusicChordTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicChordTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicChordTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index a6d7dbd..a9ca871 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -347,9 +347,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCommandTrack (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_DirectMusicCommandTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicCommandTrack; track->ref = 0; /* will be inited by QueryInterface */ list_init (&track->Commands); - + return IDirectMusicCommandTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index f7d96bb..ae9638a 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/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/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 20fe747..6131f8a 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -290,8 +290,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicMotifTrack (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_DirectMusicMotifTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicMotifTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicMotifTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 363eeea..d5afa84 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -287,8 +287,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicMuteTrack (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_DirectMusicMuteTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicMuteTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicMuteTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 484aaa8..4c8472a 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -228,12 +228,12 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_GetDescriptor (L static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, 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) @@ -241,9 +241,9 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_SetDescriptor (L 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)); @@ -266,11 +266,11 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_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_DirectMusicStyle, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicStyle; + 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) { @@ -435,7 +435,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_IPersistStream_Release (LPPERSISTSTRE static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicStyle, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicStyle; return S_OK; } @@ -1097,7 +1097,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicStyleImpl (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_DirectMusicStyle, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicStyle; obj->ref = 0; /* will be inited by QueryInterface */ list_init (&obj->Bands); list_init (&obj->Motifs); diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 3528363..7d09e3a 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -248,7 +248,7 @@ static ULONG WINAPI IDirectMusicStyleTrack_IPersistStream_Release (LPPERSISTSTRE static HRESULT WINAPI IDirectMusicStyleTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicStyleTrack, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicStyleTrack, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicStyleTrack; return S_OK; } @@ -476,9 +476,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (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_DirectMusicStyleTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicStyleTrack; track->ref = 0; /* will be inited by QueryInterface */ list_init (&track->Items); - + return IDirectMusicStyleTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); }

1 0

Jeff Zaroyko : decode any stray html entities in outgoing mail
by Chris Morgan Feb. 26, 2008

Feb. 26, 2008

Module: appdb Branch: master Commit: bb0eca8af02b68c93451bbe2213f3a63f37ce863 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bb0eca8af02b68c93451bbe2… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Tue Feb 26 15:00:31 2008 +1100 decode any stray html entities in outgoing mail --- include/mail.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/mail.php b/include/mail.php index d1df774..1c8fb65 100644 --- a/include/mail.php +++ b/include/mail.php @@ -36,6 +36,7 @@ function mail_appdb($sEmailList,$sSubject,$sMsg) return; } + $sMsg = html_entity_decode($sMsg); $bResult = mail(APPDB_SENDER_EMAIL, "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_SENDER_EMAIL); if($bResult)

1 0

Jeff Zaroyko : decode html entities when using redirect function
by Chris Morgan Feb. 26, 2008

Feb. 26, 2008

Module: appdb Branch: master Commit: 4f27788072404a7bc2f59766617c3102af6102b3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4f27788072404a7bc2f59766… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Tue Feb 26 14:02:36 2008 +1100 decode html entities when using redirect function --- include/util.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/util.php b/include/util.php index 741435b..ba13386 100644 --- a/include/util.php +++ b/include/util.php @@ -20,7 +20,7 @@ function util_show_error_page_and_exit($text = null, $message = null) */ function util_redirect_and_exit($url) { - header("Location: ".$url); + header("Location: ".html_entity_decode($url)); exit; }

1 0

Jeff Zaroyko : remove redundant "Viewing App:" from title to make shorter
by Chris Morgan Feb. 26, 2008

Feb. 26, 2008

Module: appdb Branch: master Commit: bc07ac0e126fb08e90337b8e2cd6a4928720fc23 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bc07ac0e126fb08e90337b8e… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Tue Feb 26 13:17:35 2008 +1100 remove redundant "Viewing App:" from title to make shorter for bookmarks and browser history --- include/application.php | 2 +- include/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/application.php b/include/application.php index 3dd8c77..71c9ff9 100644 --- a/include/application.php +++ b/include/application.php @@ -719,7 +719,7 @@ class Application { switch($sAction) { case "view": - return "Viewing App: ".$this->sName; + return $this->sName; default: return null; diff --git a/include/version.php b/include/version.php index d4ff420..e8dcc34 100644 --- a/include/version.php +++ b/include/version.php @@ -746,7 +746,7 @@ class version { switch($sAction) { case "view": - return "Viewing App: ".version::fullName($this->iVersionId); + return version::fullName($this->iVersionId); default: return null;

1 0

Alexander Nicolaysen Sørnes : Sort apps by name in 'browse by rating' list
by Chris Morgan Feb. 26, 2008

Feb. 26, 2008

Module: appdb Branch: master Commit: fb0c66b5868522e8988056e7b81106f3a269d962 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fb0c66b5868522e8988056e7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Feb 25 20:25:49 2008 +0100 Sort apps by name in 'browse by rating' list --- include/application.php | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/application.php b/include/application.php index 24eccd5..3dd8c77 100644 --- a/include/application.php +++ b/include/application.php @@ -463,11 +463,14 @@ class Application { public static function getWithRating($sRating, $iOffset, $iItemsPerPage) { $aApps = array(); - $sQuery = "SELECT DISTINCT appId - FROM appVersion - WHERE rating = '?' - AND state = 'accepted' - ORDER BY appId ASC LIMIT ?, ?"; + $sQuery = "SELECT DISTINCT appVersion.appId, appName + FROM appVersion, appFamily WHERE + appVersion.appId = appFamily.appId + AND + rating = '?' + AND + appVersion.state = 'accepted' + ORDER BY appName ASC LIMIT ?, ?"; if($hResult = query_parameters($sQuery, $sRating, $iOffset, $iItemsPerPage)) {

1 0

Alexander Nicolaysen Sørnes : Shorten page title to 'Wine AppDB - '
by Chris Morgan Feb. 26, 2008

Feb. 26, 2008

Module: appdb Branch: master Commit: 0ea7d306d8c558c97c2fbe1bff3404b07a00a021 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0ea7d306d8c558c97c2fbe1b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Feb 25 21:36:47 2008 +0100 Shorten page title to 'Wine AppDB - ' --- include/header.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/header.php b/include/header.php index 086c1e3..ec3dbd8 100644 --- a/include/header.php +++ b/include/header.php @@ -6,7 +6,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>Wine Application DB <?php echo $title; ?></title> + <title>Wine AppDB <?php echo $title; ?></title> <meta http-equiv="Expires" content="Mon, 06 Jan 1990 00:00:01 GMT"> <meta http-equiv="Pragma" content="no-cache"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

1 0