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

Michael Stefaniuc : dmusic: Use HIWORD / LOWORD instead of open coding them.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: f1760e00961a9663d95262f432eb39d5255b5fd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1760e00961a9663d95262f4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:49 2019 +0100 dmusic: Use HIWORD / LOWORD instead of open coding them. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 9eb5364..3956dc2 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -226,11 +226,13 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), - (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); +static const char *debugstr_dmversion(const DMUS_VERSION *version) +{ + if (!version) + return "'null'"; + return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", + HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), + HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } /* returns name of given GUID */

1 0

Michael Stefaniuc : dmusic: Use dump_DMUS_OBJECTDESC() instead of open coding it.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 25c41c4eeafc943e0e66a7e44957db1d0a3bc56b URL: https://source.winehq.org/git/wine.git/?a=commit;h=25c41c4eeafc943e0e66a7e4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:50 2019 +0100 dmusic: Use dump_DMUS_OBJECTDESC() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/collection.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 2820222..b7eb375 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -499,13 +499,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, struct list *listEntry; TRACE("*** IDirectMusicCollection (%p) ***\n", &This->IDirectMusicCollection_iface); - if (This->dmobj.desc.dwValidData & DMUS_OBJ_OBJECT) - TRACE(" - GUID = %s\n", debugstr_dmguid(&This->dmobj.desc.guidObject)); - if (This->dmobj.desc.dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->dmobj.desc.vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionMS & 0x0000FFFF, - (This->dmobj.desc.vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionLS & 0x0000FFFF); - if (This->dmobj.desc.dwValidData & DMUS_OBJ_NAME) - TRACE(" - Name = %s\n", debugstr_w(This->dmobj.desc.wszName)); + dump_DMUS_OBJECTDESC(&This->dmobj.desc); TRACE(" - Collection header:\n"); TRACE(" - cInstruments: %d\n", This->pHeader->cInstruments);

1 0

Michael Stefaniuc : dswave: Use HIWORD / LOWORD instead of open coding them.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: f43a0ef304f5b1053e2a51d18a1f342121776d9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f43a0ef304f5b1053e2a51d1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:51 2019 +0100 dswave: Use HIWORD / LOWORD instead of open coding them. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/dswave_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index f01e170..a136bb8 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -193,11 +193,13 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), - (int)((version->dwVersionLS & 0xFFFF0000) >> 8), (int)(version->dwVersionLS & 0x0000FFFF)); +static const char *debugstr_dmversion(const DMUS_VERSION *version) +{ + if (!version) + return "'null'"; + return wine_dbg_sprintf("'%hu,%hu,%hu,%hu'", + HIWORD(version->dwVersionMS), LOWORD(version->dwVersionMS), + HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); } /* returns name of given GUID */

1 0

Michael Stefaniuc : mstask: Avoid using the comma operator.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: b7f5e4ae5f635df05a1dc7ba426540e285d46648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f5e4ae5f635df05a1dc7ba… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:43 2019 +0100 mstask: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 9a39fc9..6ab9263 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -345,7 +345,7 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskT new_trigger->wStartHour = time.wHour; new_trigger->wStartMinute = time.wMinute; new_trigger->rgFlags = TASK_TRIGGER_FLAG_DISABLED; - new_trigger->TriggerType = TASK_TIME_TRIGGER_DAILY, + new_trigger->TriggerType = TASK_TIME_TRIGGER_DAILY; new_trigger->Type.Daily.DaysInterval = 1; *idx = This->trigger_count++;

1 0

Michael Stefaniuc : oleacc: Avoid using the comma operator.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 29503f24642be995af4885e9de92624cc8a74cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29503f24642be995af4885e9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:44 2019 +0100 oleacc: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 40e7fbd..0d313a2 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -353,7 +353,7 @@ static HRESULT WINAPI Client_accLocation(IAccessible *iface, LONG *pxLeft, if(!GetClientRect(This->hwnd, &rect)) return S_OK; - pt.x = rect.left, + pt.x = rect.left; pt.y = rect.top; MapWindowPoints(This->hwnd, NULL, &pt, 1); *pxLeft = pt.x;

1 0

Zhiyi Zhang : include: Avoid type redefinition.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: f76447bbab78008b556672aeac38995e101148c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f76447bbab78008b556672ae… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Mar 24 10:52:55 2019 +0800 include: Avoid type redefinition. UUID_DEFINED doesn't exist on Windows but it's needed by wine because of the usage of some wine private headers. And some older compilers can't handle the redefinition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46892 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ntddk.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index fb8cacc..719ba67 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -202,7 +202,11 @@ typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERF PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); typedef void (NTAPI EXPAND_STACK_CALLOUT)(void*); typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; + +#ifndef UUID_DEFINED +#define UUID_DEFINED typedef GUID UUID; +#endif NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG,

1 0

Zhiyi Zhang : kernel32: Add DECLSPEC_HOTPATCH to VirtualAllocEx().
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: df3dd6612c2098e347cad88c90853cf3892e4301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df3dd6612c2098e347cad88c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Mar 24 18:47:06 2019 +0800 kernel32: Add DECLSPEC_HOTPATCH to VirtualAllocEx(). Fix Tom Clancy's The Devision uplay version startup crash. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 7f0a562..42da7f0 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -86,7 +86,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc( void *addr, SIZE_T size, DWORD typ * Success: Base address of allocated region of pages. * Failure: NULL. */ -LPVOID WINAPI VirtualAllocEx( HANDLE hProcess, LPVOID addr, SIZE_T size, +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE hProcess, LPVOID addr, SIZE_T size, DWORD type, DWORD protect ) { LPVOID ret = addr;

1 0

Nikolay Sivov : mfplat: Create dummy descriptor using public API.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: fe66e0f766b6928aa4e44fbbe0797c355f3a2ead URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe66e0f766b6928aa4e44fbb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 10:42:58 2019 +0300 mfplat: Create dummy descriptor using public API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 357 ++--------------------------------------------------- 1 file changed, 13 insertions(+), 344 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe66e0f766b6928aa4e4…

1 0

Nikolay Sivov : mfplat: Add more attributes guids.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 1d6634b2b22558e00bc143c2e7ae1d534aa673ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d6634b2b22558e00bc143c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 10:42:59 2019 +0300 mfplat: Add more attributes guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 41 +++++++++++++++++++++++++++++++ include/mfapi.h | 71 ++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 97 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d6634b2b22558e00bc1…

1 0

Nikolay Sivov : mfplat: Add tracing for media formats guids.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 65e369444d07b7d7b2c72dc431567d1fa6c42ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e369444d07b7d7b2c72dc4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 10:43:00 2019 +0300 mfplat: Add tracing for media formats guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++- include/mfapi.h | 121 +++++++++++++++++++++++++++++++++++++++++++++++- include/mmreg.h | 19 ++++++++ include/mmsystem.h | 2 + 4 files changed, 272 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65e369444d07b7d7b2c7…

1 0