August 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : server: Fix assignment of primary_group in token_duplicate.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 7681b1f894e13d63fbbc0f2499f96e9f194c4df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7681b1f894e13d63fbbc0f249… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 05:32:35 2015 +0100 server: Fix assignment of primary_group in token_duplicate. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 25b0a4981b137dcbf52dc18e85690fba11e2488b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/token.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/token.c b/server/token.c index 42cfb3d..6c2871f 100644 --- a/server/token.c +++ b/server/token.c @@ -559,6 +559,7 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, if (!token) return token; /* copy groups */ + token->primary_group = NULL; LIST_FOR_EACH_ENTRY( group, &src_token->groups, struct group, entry ) { size_t size = FIELD_OFFSET( struct group, sid.SubAuthority[group->sid.SubAuthorityCount] ); @@ -570,8 +571,9 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, } memcpy( newgroup, group, size ); list_add_tail( &token->groups, &newgroup->entry ); + if (src_token->primary_group == &group->sid) + token->primary_group = &newgroup->sid; } - token->primary_group = src_token->primary_group; assert( token->primary_group ); /* copy privileges */

1 0

Michael Müller : amstream: Implement IDirectDrawMediaStream::GetMultiMediaStream.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 1530fcbaf4c82fbae2f0fb43b71f1fa660c1e654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1530fcbaf4c82fbae2f0fb43b… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Apr 30 03:57:50 2016 +0200 amstream: Implement IDirectDrawMediaStream::GetMultiMediaStream. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c88f4b85bc6f95f621c2185b766eb5997230329a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/mediastream.c | 12 +++++++++--- dlls/amstream/tests/amstream.c | 11 ++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 79f9822..51349ab 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -267,13 +267,19 @@ static ULONG WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Release(IDi /*** IMediaStream methods ***/ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetMultiMediaStream(IDirectDrawMediaStream *iface, - IMultiMediaStream** ppMultiMediaStream) + IMultiMediaStream **multi_media_stream) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); + TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); - return S_FALSE; + if (!multi_media_stream) + return E_POINTER; + + IMultiMediaStream_AddRef(This->parent); + *multi_media_stream = This->parent; + + return S_OK; } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 353ba01..eb9c5f9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -295,16 +295,13 @@ static void test_media_streams(void) ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, NULL); - todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); multi_media_stream = (void *)0xdeadbeef; hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, &multi_media_stream); - todo_wine ok(hr == S_OK, "IDirectDrawMediaStream_GetMultiMediaStream returned: %x\n", hr); - if (hr == S_OK) - { - ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); - IMultiMediaStream_Release(multi_media_stream); - } + ok(hr == S_OK, "IDirectDrawMediaStream_GetMultiMediaStream returned: %x\n", hr); + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); } if (ddraw_sample)

1 0

Sebastian Lackner : amstream/tests: Add tests for GetMultiMediaStream methods.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 2cdb15c7033d7fda6cab1f5ca77f48a8bfe7183b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cdb15c7033d7fda6cab1f5ca… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Apr 30 03:56:00 2016 +0200 amstream/tests: Add tests for GetMultiMediaStream methods. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 04c3a9bad2585c4b93d23e856dad3d8ab0557885) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/tests/amstream.c | 54 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1fcffea..353ba01 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -253,6 +253,7 @@ static void test_media_streams(void) if (video_stream) { IAMMediaStream* am_media_stream; + IMultiMediaStream *multi_media_stream; IAudioMediaStream* audio_media_stream; IDirectDrawMediaStream *ddraw_stream = NULL; IDirectDrawStreamSample *ddraw_sample = NULL; @@ -260,8 +261,20 @@ static void test_media_streams(void) hr = IMediaStream_QueryInterface(video_stream, &IID_IAMMediaStream, (LPVOID*)&am_media_stream); ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); ok((void*)am_media_stream == (void*)video_stream, "Not same interface, got %p expected %p\n", am_media_stream, video_stream); + + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, NULL); + todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, &multi_media_stream); + todo_wine ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); if (hr == S_OK) - IAMMediaStream_Release(am_media_stream); + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); + } + + IAMMediaStream_Release(am_media_stream); hr = IMediaStream_QueryInterface(video_stream, &IID_IAudioMediaStream, (LPVOID*)&audio_media_stream); ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); @@ -280,6 +293,18 @@ static void test_media_streams(void) hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &ddraw_sample); ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + + hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, NULL); + todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, &multi_media_stream); + todo_wine ok(hr == S_OK, "IDirectDrawMediaStream_GetMultiMediaStream returned: %x\n", hr); + if (hr == S_OK) + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); + } } if (ddraw_sample) @@ -344,6 +369,7 @@ static void test_media_streams(void) if (audio_stream) { IAMMediaStream* am_media_stream; + IMultiMediaStream *multi_media_stream; IDirectDrawMediaStream* ddraw_stream = NULL; IAudioMediaStream* audio_media_stream = NULL; IAudioStreamSample *audio_sample = NULL; @@ -351,8 +377,20 @@ static void test_media_streams(void) hr = IMediaStream_QueryInterface(audio_stream, &IID_IAMMediaStream, (LPVOID*)&am_media_stream); ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); ok((void*)am_media_stream == (void*)audio_stream, "Not same interface, got %p expected %p\n", am_media_stream, audio_stream); + + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, NULL); + todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IAMMediaStream_GetMultiMediaStream(am_media_stream, &multi_media_stream); + todo_wine ok(hr == S_OK, "IAMMediaStream_GetMultiMediaStream returned: %x\n", hr); if (hr == S_OK) - IAMMediaStream_Release(am_media_stream); + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); + } + + IAMMediaStream_Release(am_media_stream); hr = IMediaStream_QueryInterface(audio_stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); @@ -378,6 +416,18 @@ static void test_media_streams(void) hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); + hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, NULL); + todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + + multi_media_stream = (void *)0xdeadbeef; + hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, &multi_media_stream); + todo_wine ok(hr == S_OK, "IAudioMediaStream_GetMultiMediaStream returned: %x\n", hr); + if (hr == S_OK) + { + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); + } + if (audio_data) IAudioData_Release(audio_data); if (audio_sample)

1 0

Alex Henrie : riched20: Don' t call UpdateWindow after setting the background color.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: b364c0ea92ef4772b5086cd2edbe7cbe7d7b0d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b364c0ea92ef4772b5086cd2e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 9 08:57:12 2016 -0600 riched20: Don't call UpdateWindow after setting the background color. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e60b2766987c09dd3ea13adc57df11ee03c05f2a) Conflicts: dlls/riched20/tests/editor.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 1 - dlls/riched20/tests/editor.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 28c845c..49cfbb8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3664,7 +3664,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); } ITextHost_TxInvalidateRect(editor->texthost, NULL, TRUE); - ITextHost_TxViewChange(editor->texthost, TRUE); return lColor; } case EM_GETMODIFY: diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index efa0b29..7bddfe4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8153,6 +8153,18 @@ static void test_alignment_style(void) DestroyWindow(richedit); } +static void test_background(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + + /* set the background color to black */ + ValidateRect(hwndRichEdit, NULL); + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, RGB(0, 0, 0)); + ok(GetUpdateRect(hwndRichEdit, NULL, FALSE), "Update rectangle is empty!\n"); + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { BOOL ret; @@ -8220,6 +8232,7 @@ START_TEST( editor ) test_EM_SETREADONLY(); test_EM_SETFONTSIZE(); test_alignment_style(); + test_background(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Andrew Eikum : xaudio2: Always set current OpenAL context before making AL calls.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 8389f893b9961a839c3cfc287924441eccab11e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8389f893b9961a839c3cfc287… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 6 14:48:18 2016 -0500 xaudio2: Always set current OpenAL context before making AL calls. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 49078e00a51876df38d0c572193195be6700bad0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 70ed8d6..05decdd 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -38,6 +38,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); +static ALCboolean (ALC_APIENTRY *palcSetThreadContext)(ALCcontext*); static HINSTANCE instance; @@ -103,6 +104,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) return FALSE; } + if(!alcIsExtensionPresent(NULL, "ALC_EXT_thread_local_context") || + !(palcSetThreadContext = alcGetProcAddress(NULL, "alcSetThreadContext"))){ + ERR("XAudio2 requires the ALC_EXT_thread_local_context extension (OpenAL-Soft >= 1.12)\n"); + return FALSE; + } + break; } return TRUE; @@ -309,6 +316,8 @@ static HRESULT WINAPI XA2SRC_SetVolume(IXAudio2SourceVoice *iface, float Volume, al_gain = Volume; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_GAIN, al_gain); return S_OK; @@ -362,6 +371,8 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) TRACE("%p\n", This); + palcSetThreadContext(This->xa2->al_ctx); + EnterCriticalSection(&This->lock); if(!This->in_use){ @@ -722,6 +733,8 @@ static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface, else r = Ratio; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_PITCH, r); return S_OK; @@ -734,6 +747,8 @@ static void WINAPI XA2SRC_GetFrequencyRatio(IXAudio2SourceVoice *iface, float *p TRACE("%p, %p\n", This, pRatio); + palcSetThreadContext(This->xa2->al_ctx); + alGetSourcef(This->al_src, AL_PITCH, &ratio); *pRatio = ratio; @@ -1364,6 +1379,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, dump_fmt(pSourceFormat); + palcSetThreadContext(This->al_ctx); + EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ @@ -1721,12 +1738,6 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, goto exit; } - if(alcMakeContextCurrent(This->al_ctx) == ALC_FALSE){ - WARN("alcMakeContextCurrent failed\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - hr = IAudioClient_Start(This->aclient); if (FAILED(hr)) { @@ -2412,6 +2423,8 @@ static DWORD WINAPI engine_threadproc(void *arg) continue; } + palcSetThreadContext(This->al_ctx); + do_engine_tick(This); LeaveCriticalSection(&This->lock);

1 0

Austin English : ndis.sys: Add NdisAllocateMemoryWithTag stub.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: e0d795bca06934ddd4c45966e683d46e499c26f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d795bca06934ddd4c45966e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 23:56:01 2015 -0600 ndis.sys: Add NdisAllocateMemoryWithTag stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2bb17745dfc58b663323f9bba28a22465f3c29f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ndis.sys/main.c | 7 +++++++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/Makefile.in | 1 + include/ddk/ndis.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 820b4af..b2c1da4 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/ndis.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ndis); @@ -36,3 +37,9 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) return STATUS_SUCCESS; } + +NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **address, UINT length, ULONG tag) +{ + FIXME("(%p, %u, %u): stub\n", address, length, tag); + return NDIS_STATUS_FAILURE; +} diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index bd83b48..1017296 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -12,7 +12,7 @@ @ stub NdisAllocateBufferPool @ stub NdisAllocateFromBlockPool @ stub NdisAllocateMemory -@ stub NdisAllocateMemoryWithTag +@ stdcall NdisAllocateMemoryWithTag(ptr long long) @ stub NdisAllocatePacket @ stub NdisAllocatePacketPool @ stub NdisAllocatePacketPoolEx diff --git a/include/Makefile.in b/include/Makefile.in index 0151c12..85088fe 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -276,6 +276,7 @@ HEADER_SRCS = \ ddk/hidtypes.h \ ddk/imm.h \ ddk/mountmgr.h \ + ddk/ndis.h \ ddk/ntddcdvd.h \ ddk/ntddk.h \ ddk/ntddser.h \ diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h new file mode 100644 index 0000000..a57d9f8 --- /dev/null +++ b/include/ddk/ndis.h @@ -0,0 +1,30 @@ +/* + * ndis.h + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _NDIS_ +#define _NDIS_ + +typedef void *NDIS_HANDLE, *PNDIS_HANDLE; +typedef int NDIS_STATUS, *PNDIS_STATUS; + +#define NDIS_STATUS_FAILURE ((NDIS_STATUS) STATUS_UNSUCCESSFUL) + +NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); + +#endif /* _NDIS_ */

1 0

Ken Thomases : winemac: Don' t define kVK_RightCommand when building against the macOS 10.12 SDK.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: d78ed2219bfe7cbc93a9cae35d05df4cbc4932fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78ed2219bfe7cbc93a9cae35… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 23 16:53:04 2016 -0500 winemac: Don't define kVK_RightCommand when building against the macOS 10.12 SDK. Apple added the same enum declaration to their headers, causing a build failure. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cac226200d88b7454747b5ee1016f06b89ce4aa6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bcc1cf5..a28d530 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -43,10 +43,12 @@ enum { #endif +#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */ enum { kVK_RightCommand = 0x36, /* Invented for Wine; was unused */ }; +#endif static NSUInteger style_mask_for_features(const struct macdrv_window_features* wf)

1 0

Henri Verbeet : wined3d: Also update the swap interval when not recreating the context in wined3d_device_reset ().
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: f131e9f2c00cd2cd545b4ac4e408538442bdebe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f131e9f2c00cd2cd545b4ac4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 18:42:59 2016 +0200 wined3d: Also update the swap interval when not recreating the context in wined3d_device_reset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6b8fb1c22ea26f9fafda76133850af10ac3c7256) Conflicts: dlls/wined3d/swapchain.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/context.c | 31 ------------------------------ dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/swapchain.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 50 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1e357e7..a15aad2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1454,7 +1454,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, HGLRC ctx, share_ctx; int pixel_format; unsigned int s; - int swap_interval; DWORD state; HDC hdc; BOOL hdc_is_private = FALSE; @@ -1704,36 +1703,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } } - switch (swapchain->desc.swap_interval) - { - case WINED3DPRESENT_INTERVAL_IMMEDIATE: - swap_interval = 0; - break; - case WINED3DPRESENT_INTERVAL_DEFAULT: - case WINED3DPRESENT_INTERVAL_ONE: - swap_interval = 1; - break; - case WINED3DPRESENT_INTERVAL_TWO: - swap_interval = 2; - break; - case WINED3DPRESENT_INTERVAL_THREE: - swap_interval = 3; - break; - case WINED3DPRESENT_INTERVAL_FOUR: - swap_interval = 4; - break; - default: - FIXME("Unknown swap interval %#x.\n", swapchain->desc.swap_interval); - swap_interval = 1; - } - - if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) - { - if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) - ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", - swap_interval, ret, GetLastError()); - } - gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); TRACE("Setting up the screen\n"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7753e76..b9ab347 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4806,8 +4806,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } - if (reset_state && device->d3d_initialized) - hr = create_primary_opengl_context(device, swapchain); + if (device->d3d_initialized) + { + if (reset_state) + hr = create_primary_opengl_context(device, swapchain); + swapchain_update_swap_interval(swapchain); + } /* All done. There is no need to reload resources or shaders, this will happen automatically on the * first use diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 069b071..f7d48de 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -924,6 +924,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); } context_release(swapchain->context[0]); + swapchain_update_swap_interval(swapchain); } if (swapchain->desc.backbuffer_count > 0) @@ -1154,6 +1155,48 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) } } +void swapchain_update_swap_interval(struct wined3d_swapchain *swapchain) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + int swap_interval; + + context = context_acquire(swapchain->device, surface_from_resource(swapchain->front_buffer->sub_resources[0])); + gl_info = context->gl_info; + + switch (swapchain->desc.swap_interval) + { + case WINED3DPRESENT_INTERVAL_IMMEDIATE: + swap_interval = 0; + break; + case WINED3DPRESENT_INTERVAL_DEFAULT: + case WINED3DPRESENT_INTERVAL_ONE: + swap_interval = 1; + break; + case WINED3DPRESENT_INTERVAL_TWO: + swap_interval = 2; + break; + case WINED3DPRESENT_INTERVAL_THREE: + swap_interval = 3; + break; + case WINED3DPRESENT_INTERVAL_FOUR: + swap_interval = 4; + break; + default: + FIXME("Unhandled present interval %#x.\n", swapchain->desc.swap_interval); + swap_interval = 1; + } + + if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) + { + if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) + ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", + swap_interval, context, GetLastError()); + } + + context_release(context); +} + void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) { struct wined3d_device *device = swapchain->device; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6edd4c..d7d3796 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2876,6 +2876,7 @@ struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchai void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void swapchain_update_swap_interval(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; /***************************************************************************** * Utility function prototypes

1 0

Hans Leidekker : kernel32: Improve the stub for GetThreadPreferredUILanguages.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 545c5d8063e2a4568cb585e4895869a69f48ee54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545c5d8063e2a4568cb585e48… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 29 10:14:35 2016 +0200 kernel32: Improve the stub for GetThreadPreferredUILanguages. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c90845cf9330e7b731508ee5e40616341bdb7ad0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale.c | 69 ++++++++++++++++++++++++++++++-------------- dlls/kernel32/tests/locale.c | 29 +++++++++++++++++++ dlls/kernel32/thread.c | 20 ------------- include/winnls.h | 1 + 4 files changed, 77 insertions(+), 42 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d5625ea..253032d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1048,35 +1048,17 @@ INT WINAPI GetSystemDefaultLocaleName(LPWSTR localename, INT len) return LCIDToLocaleName(lcid, localename, len, 0); } -/*********************************************************************** - * GetSystemPreferredUILanguages (KERNEL32.@) - */ -BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) +static BOOL get_dummy_preferred_ui_language( DWORD flags, ULONG *count, WCHAR *buffer, ULONG *size ) { LCTYPE type; int lsize; - if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if ((flags & MUI_LANGUAGE_NAME) && (flags & MUI_LANGUAGE_ID)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (*size && !buffer) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); if (flags & MUI_LANGUAGE_ID) - type = LOCALE_ILANGUAGE; - else - type = LOCALE_SNAME; + type = LOCALE_ILANGUAGE; + else + type = LOCALE_SNAME; lsize = GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, NULL, 0); if (!lsize) @@ -1109,6 +1091,49 @@ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buff *count = 1; TRACE("returned variable content: %d, \"%s\", %d\n", *count, debugstr_w(buffer), *size); return TRUE; + +} + +/*********************************************************************** + * GetSystemPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) +{ + if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if ((flags & MUI_LANGUAGE_NAME) && (flags & MUI_LANGUAGE_ID)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (*size && !buffer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return get_dummy_preferred_ui_language( flags, count, buffer, size ); +} + +/*********************************************************************** + * SetThreadPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI SetThreadPreferredUILanguages( DWORD flags, PCZZWSTR buffer, PULONG count ) +{ + FIXME( "%u, %p, %p\n", flags, buffer, count ); + return TRUE; +} + +/*********************************************************************** + * GetThreadPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, ULONG *count, WCHAR *buf, ULONG *size ) +{ + FIXME( "%08x, %p, %p %p\n", flags, count, buf, size ); + return get_dummy_preferred_ui_language( flags, count, buf, size ); } /*********************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c9dce5a..3054c50 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -98,6 +98,7 @@ static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); +static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static void InitFunctionPointers(void) { @@ -127,6 +128,7 @@ static void InitFunctionPointers(void) X(GetGeoInfoW); X(EnumSystemGeoID); X(GetSystemPreferredUILanguages); + X(GetThreadPreferredUILanguages); #undef X } @@ -4779,6 +4781,32 @@ static void test_GetSystemPreferredUILanguages(void) "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); } +static void test_GetThreadPreferredUILanguages(void) +{ + BOOL ret; + ULONG count, size; + WCHAR *buf; + + if (!pGetThreadPreferredUILanguages) + { + win_skip("GetThreadPreferredUILanguages is not available.\n"); + return; + } + + size = count = 0; + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID|MUI_UI_FALLBACK, &count, NULL, &size); + ok(ret, "got %u\n", GetLastError()); + ok(count, "expected count > 0\n"); + ok(size, "expected size > 0\n"); + + count = 0; + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(WCHAR)); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID|MUI_UI_FALLBACK, &count, buf, &size); + ok(ret, "got %u\n", GetLastError()); + ok(count, "expected count > 0\n"); + HeapFree(GetProcessHeap(), 0, buf); +} + START_TEST(locale) { InitFunctionPointers(); @@ -4822,6 +4850,7 @@ START_TEST(locale) test_EnumSystemGeoID(); test_invariant(); test_GetSystemPreferredUILanguages(); + test_GetThreadPreferredUILanguages(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); } diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 0e9de82..6630e7f 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -888,26 +888,6 @@ BOOL WINAPI GetThreadIOPendingFlag( HANDLE thread, PBOOL io_pending ) } /*********************************************************************** - * SetThreadPreferredUILanguages (KERNEL32.@) - */ -BOOL WINAPI SetThreadPreferredUILanguages( DWORD flags, PCZZWSTR buffer, PULONG count ) -{ - FIXME( "%u, %p, %p\n", flags, buffer, count ); - return TRUE; -} - -/*********************************************************************** - * GetThreadPreferredUILanguages (KERNEL32.@) - */ -BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, PULONG count, PCZZWSTR buffer, PULONG buffersize ) -{ - FIXME( "%u, %p, %p %p\n", flags, count, buffer, buffersize ); - *count = 0; - *buffersize = 0; - return TRUE; -} - -/*********************************************************************** * CallbackMayRunLong (KERNEL32.@) */ BOOL WINAPI CallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) diff --git a/include/winnls.h b/include/winnls.h index 603c408..f512e5b 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -908,6 +908,7 @@ WINBASEAPI LCID WINAPI GetSystemDefaultLCID(void); WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); WINBASEAPI LCID WINAPI GetThreadLocale(void); +WINBASEAPI BOOL WINAPI GetThreadPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT);

1 0

Stefan Leichter : kernel32: Return a dummy value in GetSystemPreferredUILanguages.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 7d01dc440d7b93c51c6a1ecdcafc462ab8b04872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d01dc440d7b93c51c6a1ecdc… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Wed Feb 10 22:46:38 2016 +0100 kernel32: Return a dummy value in GetSystemPreferredUILanguages. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9cd67d2a5e7a7ad441287e803c166523814e2bcb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale.c | 43 ++++++++++++++++++++++++++++++++++++++++--- dlls/kernel32/tests/locale.c | 10 ---------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 07e3973..d5625ea 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1053,6 +1053,8 @@ INT WINAPI GetSystemDefaultLocaleName(LPWSTR localename, INT len) */ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) { + LCTYPE type; + int lsize; if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1069,9 +1071,44 @@ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buff return FALSE; } - FIXME("(0x%x %p %p %p) stub\n", flags, count, buffer, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); + + if (flags & MUI_LANGUAGE_ID) + type = LOCALE_ILANGUAGE; + else + type = LOCALE_SNAME; + + lsize = GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, NULL, 0); + if (!lsize) + { + /* keep last error from callee */ + return FALSE; + } + lsize++; + if (!*size) + { + *size = lsize; + *count = 1; + return TRUE; + } + + if (lsize > *size) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + if (!GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, buffer, *size)) + { + /* keep last error from callee */ + return FALSE; + } + + buffer[lsize-1] = 0; + *size = lsize; + *count = 1; + TRACE("returned variable content: %d, \"%s\", %d\n", *count, debugstr_w(buffer), *size); + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 13c1de6..c9dce5a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4609,10 +4609,8 @@ static void test_GetSystemPreferredUILanguages(void) size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(0, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); count = 0xdeadbeef; @@ -4643,20 +4641,16 @@ static void test_GetSystemPreferredUILanguages(void) size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); count = 0xdeadbeef; size = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); /* second parameter @@ -4682,20 +4676,16 @@ static void test_GetSystemPreferredUILanguages(void) size_id = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); count = 0xdeadbeef; size_name = 0; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); - todo_wine ok(ret, "Expected GetSystemPreferredUILanguages to succeed\n"); ok(count, "Expected count > 0\n"); - todo_wine ok(size_name % 6 == 1, "Expected size (%d) %% 6 == 1\n", size_name); size_buffer = max(size_id, size_name);

1 0