February 2014 - Wine-Commits

Jacek Caban : wmp: Added missing registry entries for WindowsMediaPlayer coclass registration.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 5a60ebf89a0a51af95e0a766ca4a526a0494ba6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a60ebf89a0a51af95e0a766c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 11:49:29 2014 +0100 wmp: Added missing registry entries for WindowsMediaPlayer coclass registration. --- dlls/wmp/Makefile.in | 1 + dlls/wmp/rsrc.rc | 24 ++++++++++++++++++++++++ dlls/wmp/wmp.rgs | 20 ++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 47e7ce6..6db31eb 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -4,4 +4,5 @@ C_SRCS = \ oleobj.c \ wmp_main.c +RC_SRCS = rsrc.rc IDL_SRCS = wmp_typelib.idl diff --git a/dlls/wmp/rsrc.rc b/dlls/wmp/rsrc.rc new file mode 100644 index 0000000..cc6c199 --- /dev/null +++ b/dlls/wmp/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2014 Jacek Caban + * + * 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 + */ + +#include <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: wmp.rgs */ +2 WINE_REGISTRY wmp.rgs diff --git a/dlls/wmp/wmp.rgs b/dlls/wmp/wmp.rgs new file mode 100644 index 0000000..fa40fa7 --- /dev/null +++ b/dlls/wmp/wmp.rgs @@ -0,0 +1,20 @@ +HKCR +{ + NoRemove CLSID + { + '{6BF52A52-394A-11D3-B153-00C04F79FAA6}' + { + Control + Insertable + MiscStatus = s '0' + { + 1 = s '131473' + } + Programmable + } + } + 'WMPlayer.OCX.7' = s 'Windows Media Player' + { + Insertable + } +}

1 0

Frédéric Delanoy : msvcrtd: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 5e52a29b53e3ab074dc2565750d666e65a7420ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e52a29b53e3ab074dc256575… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 10 23:33:09 2014 +0100 msvcrtd: Use BOOL type where appropriate. --- dlls/msvcrtd/tests/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index f73fef1..9055db1 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -36,7 +36,7 @@ static void * (__cdecl *pMSVCRTD_operator_new_dbg)(size_t, int, const char *, in #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) -static int init_functions(void) +static BOOL init_functions(void) { HMODULE hModule = LoadLibraryA("msvcrtd.dll");

1 0

Alexandre Julliard : user32: Use delayed imports to call the imm32 functions.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: ea9ed542becb4aaa55739d2d3efea005c95af521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9ed542becb4aaa55739d2d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 10 20:11:02 2014 +0100 user32: Use delayed imports to call the imm32 functions. --- dlls/user32/defwnd.c | 88 ++++---------------------------------------------- 1 file changed, 7 insertions(+), 81 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index eb64666..b359c06 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "wingdi.h" #include "winnls.h" +#include "imm.h" #include "win.h" #include "user_private.h" #include "controls.h" @@ -47,7 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); static short iF10Key = 0; static short iMenuSysKey = 0; -static const WCHAR imm32W[] = { 'i','m','m','3','2','\0' }; /*********************************************************************** * DEFWND_HandleWindowPosChanged @@ -223,70 +223,6 @@ static void DEFWND_Print( HWND hwnd, HDC hdc, ULONG uFlags) } -/* - * helpers for calling IMM32 - * - * WM_IME_* messages are generated only by IMM32, - * so I assume imm32 is already LoadLibrary-ed. - */ -static HWND DEFWND_ImmGetDefaultIMEWnd( HWND hwnd ) -{ - HINSTANCE hInstIMM = GetModuleHandleW( imm32W ); - HWND (WINAPI *pFunc)(HWND); - HWND hwndRet = 0; - - if (!hInstIMM) - { - ERR( "cannot get IMM32 handle\n" ); - return 0; - } - - pFunc = (void*)GetProcAddress(hInstIMM,"ImmGetDefaultIMEWnd"); - if ( pFunc != NULL ) - hwndRet = (*pFunc)( hwnd ); - - return hwndRet; -} - -static BOOL DEFWND_ImmIsUIMessageA( HWND hwndIME, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - HINSTANCE hInstIMM = GetModuleHandleW( imm32W ); - BOOL (WINAPI *pFunc)(HWND,UINT,WPARAM,LPARAM); - BOOL fRet = FALSE; - - if (!hInstIMM) - { - ERR( "cannot get IMM32 handle\n" ); - return FALSE; - } - - pFunc = (void*)GetProcAddress(hInstIMM,"ImmIsUIMessageA"); - if ( pFunc != NULL ) - fRet = (*pFunc)( hwndIME, msg, wParam, lParam ); - - return fRet; -} - -static BOOL DEFWND_ImmIsUIMessageW( HWND hwndIME, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - HINSTANCE hInstIMM = GetModuleHandleW( imm32W ); - BOOL (WINAPI *pFunc)(HWND,UINT,WPARAM,LPARAM); - BOOL fRet = FALSE; - - if (!hInstIMM) - { - ERR( "cannot get IMM32 handle\n" ); - return FALSE; - } - - pFunc = (void*)GetProcAddress(hInstIMM,"ImmIsUIMessageW"); - if ( pFunc != NULL ) - fRet = (*pFunc)( hwndIME, msg, wParam, lParam ); - - return fRet; -} - - /*********************************************************************** * DEFWND_DefWinProc @@ -896,20 +832,15 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case WM_IME_SELECT: case WM_IME_NOTIFY: { - HWND hwndIME; - - hwndIME = DEFWND_ImmGetDefaultIMEWnd( hwnd ); + HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); if (hwndIME) result = SendMessageA( hwndIME, msg, wParam, lParam ); } break; case WM_IME_SETCONTEXT: { - HWND hwndIME; - - hwndIME = DEFWND_ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) - result = DEFWND_ImmIsUIMessageA( hwndIME, msg, wParam, lParam ); + HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); + if (hwndIME) result = ImmIsUIMessageA( hwndIME, msg, wParam, lParam ); } break; @@ -1042,11 +973,8 @@ LRESULT WINAPI DefWindowProcW( case WM_IME_SETCONTEXT: { - HWND hwndIME; - - hwndIME = DEFWND_ImmGetDefaultIMEWnd( hwnd ); - if (hwndIME) - result = DEFWND_ImmIsUIMessageW( hwndIME, msg, wParam, lParam ); + HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); + if (hwndIME) result = ImmIsUIMessageW( hwndIME, msg, wParam, lParam ); } break; @@ -1056,9 +984,7 @@ LRESULT WINAPI DefWindowProcW( case WM_IME_SELECT: case WM_IME_NOTIFY: { - HWND hwndIME; - - hwndIME = DEFWND_ImmGetDefaultIMEWnd( hwnd ); + HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); if (hwndIME) result = SendMessageW( hwndIME, msg, wParam, lParam ); }

1 0

Frédéric Delanoy : propsys: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 7533040cfc985b3bdffa87a8cf188805834afbf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7533040cfc985b3bdffa87a8c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 10 21:17:08 2014 +0100 propsys: Use BOOL type where appropriate. --- dlls/propsys/propstore.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 6d4c99a..9c848fc 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -204,7 +204,7 @@ static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, } static HRESULT PropertyStore_LookupValue(PropertyStore *This, REFPROPERTYKEY key, - int insert, propstore_value **result) + BOOL insert, propstore_value **result) { propstore_format *format=NULL, *format_candidate; propstore_value *value=NULL, *value_candidate; @@ -282,7 +282,7 @@ static HRESULT WINAPI PropertyStore_GetValue(IPropertyStoreCache *iface, EnterCriticalSection(&This->lock); - hr = PropertyStore_LookupValue(This, key, 0, &value); + hr = PropertyStore_LookupValue(This, key, FALSE, &value); if (SUCCEEDED(hr)) hr = PropVariantCopy(pv, &value->propvar); @@ -309,7 +309,7 @@ static HRESULT WINAPI PropertyStore_SetValue(IPropertyStoreCache *iface, EnterCriticalSection(&This->lock); - hr = PropertyStore_LookupValue(This, key, 1, &value); + hr = PropertyStore_LookupValue(This, key, TRUE, &value); if (SUCCEEDED(hr)) hr = PropVariantCopy(&temp, propvar); @@ -342,7 +342,7 @@ static HRESULT WINAPI PropertyStore_GetState(IPropertyStoreCache *iface, EnterCriticalSection(&This->lock); - hr = PropertyStore_LookupValue(This, key, 0, &value); + hr = PropertyStore_LookupValue(This, key, FALSE, &value); if (SUCCEEDED(hr)) *pstate = value->state; @@ -366,7 +366,7 @@ static HRESULT WINAPI PropertyStore_GetValueAndState(IPropertyStoreCache *iface, EnterCriticalSection(&This->lock); - hr = PropertyStore_LookupValue(This, key, 0, &value); + hr = PropertyStore_LookupValue(This, key, FALSE, &value); if (SUCCEEDED(hr)) hr = PropVariantCopy(ppropvar, &value->propvar); @@ -396,7 +396,7 @@ static HRESULT WINAPI PropertyStore_SetState(IPropertyStoreCache *iface, EnterCriticalSection(&This->lock); - hr = PropertyStore_LookupValue(This, key, 0, &value); + hr = PropertyStore_LookupValue(This, key, FALSE, &value); if (SUCCEEDED(hr)) value->state = pstate; @@ -418,7 +418,7 @@ static HRESULT WINAPI PropertyStore_SetValueAndState(IPropertyStoreCache *iface, EnterCriticalSection(&This->lock); - hr = PropertyStore_LookupValue(This, key, 1, &value); + hr = PropertyStore_LookupValue(This, key, TRUE, &value); if (SUCCEEDED(hr)) hr = PropVariantCopy(&temp, ppropvar);

1 0

Austin English : riched20: Remove duplicate declaration.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 0776a76eef0921f801cc936ac0d15348db1fd48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0776a76eef0921f801cc936ac… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 10 11:29:31 2014 -0800 riched20: Remove duplicate declaration. --- dlls/riched20/reader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 02d4636..f7459ab 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -52,8 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -extern HANDLE me_heap; - static int _RTFGetChar(RTF_Info *); static void _RTFGetToken (RTF_Info *); static void _RTFGetToken2 (RTF_Info *);

1 0

Henri Verbeet : dxgi/tests: Cleanup test_output().
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: 19f204437529d42f579581d427655655369c46f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f204437529d42f579581d42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:53 2014 +0100 dxgi/tests: Cleanup test_output(). In particular, actually test the return codes for most calls. --- dlls/dxgi/tests/device.c | 54 +++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b8e7b33..ba1a29f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -255,44 +255,47 @@ static void test_output(IDXGIDevice *device) hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { - skip("Adapter has not outputs, skipping output tests.\n"); + skip("Adapter doesn't have any outputs, skipping tests.\n"); IDXGIAdapter_Release(adapter); return; } - ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); mode_count_comp = mode_count; - IDXGIOutput_GetDisplayModeList(output, 0, 0, &mode_count, NULL); + hr = IDXGIOutput_GetDisplayModeList(output, 0, 0, &mode_count, NULL); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(!mode_count, "Expected 0 got %d\n", mode_count); + ok(!mode_count, "Got unexpected mode_count %u.\n", mode_count); - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, NULL); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, NULL); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(mode_count >= mode_count_comp, "Flag implies trying to enumerate more modes\n"); + ok(mode_count >= mode_count_comp, "Got unexpected mode_count %u, expected >= %u.\n", mode_count, mode_count_comp); mode_count_comp = mode_count; - modes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DXGI_MODE_DESC) * mode_count+10); + modes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*modes) * (mode_count + 10)); - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, NULL, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(!modes[0].Height, "No output was expected\n"); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, NULL, modes); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(!modes[0].Height, "No output was expected.\n"); mode_count = 0; - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(!modes[0].Height, "No output was expected\n"); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, modes); + todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(!modes[0].Height, "No output was expected.\n"); mode_count = mode_count_comp; - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, modes); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(mode_count == mode_count_comp, "Expected %d, got %d\n", mode_count_comp, mode_count); + ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp); for (i = 0; i < mode_count; i++) { @@ -300,20 +303,23 @@ static void test_output(IDXGIDevice *device) } mode_count += 5; - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, modes); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(mode_count == mode_count_comp, "Expected %d, got %d\n", mode_count_comp, mode_count); + ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp); if (mode_count_comp) { mode_count = mode_count_comp - 1; - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(mode_count == mode_count_comp -1, "Expected %d, got %d\n", mode_count_comp, mode_count); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, modes); + todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(mode_count == mode_count_comp - 1, "Got unexpected mode_count %u, expected %u.\n", + mode_count, mode_count_comp - 1); } else { - skip("Not enough modes for test, skipping\n"); + skip("Not enough modes for test, skipping.\n"); } HeapFree(GetProcessHeap(), 0, modes);

1 0

Alexandre Julliard : makefiles: Add makefile variables for the winegcc parameters.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: 658057ae0b7ec0230c179616ac2d7228e5a7eeae URL: http://source.winehq.org/git/wine.git/?a=commit;h=658057ae0b7ec0230c179616a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 10 10:57:53 2014 +0100 makefiles: Add makefile variables for the winegcc parameters. --- Make.vars.in | 2 ++ tools/winegcc/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 684d673..ee8ee39 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -18,6 +18,8 @@ SHELL = /bin/sh RM = rm -f MV = mv CC = @CC@ +CXX = @CXX@ +CPPBIN = @CPPBIN@ CROSSCC = @CROSSCC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index bb7e4a2..3975ca5 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -14,8 +14,8 @@ winegcc_EXTRADEFS = \ -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ - -DCPP="\"@CPPBIN@\"" \ - -DCXX="\"@CXX@\"" \ + -DCPP="\"$(CPPBIN)\"" \ + -DCXX="\"$(CXX)\"" \ -DPRELINK="\"$(PRELINK)\"" winegcc$(EXEEXT): winegcc.o utils.o

1 0

Dmitry Timoshkov : kernel32: Fix page protection to access mapping performed by CreateFileMapping.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: fd9c9a6d03d682f241d139c8ad6158fc45e0da1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9c9a6d03d682f241d139c8a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 12:44:10 2014 +0900 kernel32: Fix page protection to access mapping performed by CreateFileMapping. --- dlls/advapi32/tests/security.c | 2 -- dlls/kernel32/virtual.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ac98b49..7ee785f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4965,7 +4965,6 @@ static void test_filemap_security(void) } access = get_obj_access(mapping); -todo_wine ok(access == prot_map[i].mapped, "%d: expected %#x, got %#x\n", i, prot_map[i].mapped, access); CloseHandle(mapping); @@ -4976,7 +4975,6 @@ todo_wine ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); access = get_obj_access(mapping); -todo_wine ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE), "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, got %#x\n", access); diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 0470073..2df19a7 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -353,17 +353,17 @@ HANDLE WINAPI CreateFileMappingW( HANDLE hFile, LPSECURITY_ATTRIBUTES sa, { case PAGE_READONLY: case PAGE_WRITECOPY: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ; break; case PAGE_READWRITE: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE; break; case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT; + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; break; case PAGE_EXECUTE_READWRITE: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT; + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; break; default: SetLastError( ERROR_INVALID_PARAMETER );

1 0

Erich E. Hoover : kernel32: Add support for security access parameters for named pipes.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: ee49a5a273e993684ae49c4664c1620d06da3ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee49a5a273e993684ae49c466… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Feb 5 08:35:30 2014 -0700 kernel32: Add support for security access parameters for named pipes. --- dlls/advapi32/tests/security.c | 29 +++++++++++++++++++++++++++++ dlls/kernel32/sync.c | 3 +++ 2 files changed, 32 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7ee785f..044c3f0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4713,6 +4713,35 @@ static void test_named_pipe_security(HANDLE token) { 1, GENERIC_EXECUTE, FILE_GENERIC_EXECUTE }, { 1, GENERIC_ALL, STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS } }; + static const struct + { + DWORD open_mode; + DWORD access; + } creation_access[] = + { + { PIPE_ACCESS_INBOUND, FILE_GENERIC_READ }, + { PIPE_ACCESS_OUTBOUND, FILE_GENERIC_WRITE }, + { PIPE_ACCESS_DUPLEX, FILE_GENERIC_READ|FILE_GENERIC_WRITE }, + { PIPE_ACCESS_INBOUND|WRITE_DAC, FILE_GENERIC_READ|WRITE_DAC }, + { PIPE_ACCESS_INBOUND|WRITE_OWNER, FILE_GENERIC_READ|WRITE_OWNER } + /* ACCESS_SYSTEM_SECURITY is also valid, but will fail with ERROR_PRIVILEGE_NOT_HELD */ + }; + + /* Test the different security access options for pipes */ + for (i = 0; i < sizeof(creation_access)/sizeof(creation_access[0]); i++) + { + SetLastError(0xdeadbeef); + pipe = CreateNamedPipeA(WINE_TEST_PIPE, creation_access[i].open_mode, + PIPE_TYPE_BYTE | PIPE_NOWAIT, PIPE_UNLIMITED_INSTANCES, 0, 0, + NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe(0x%x) error %d\n", + creation_access[i].open_mode, GetLastError()); + access = get_obj_access(pipe); + ok(access == creation_access[i].access, + "CreateNamedPipeA(0x%x) pipe expected access 0x%x (got 0x%x)\n", + creation_access[i].open_mode, creation_access[i].access, access); + CloseHandle(pipe); + } SetLastError(0xdeadbeef); pipe = CreateNamedPipeA(WINE_TEST_PIPE, PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index f77637c..0f44240 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1395,6 +1395,9 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, } access |= SYNCHRONIZE; options = 0; + if (dwOpenMode & WRITE_DAC) access |= WRITE_DAC; + if (dwOpenMode & WRITE_OWNER) access |= WRITE_OWNER; + if (dwOpenMode & ACCESS_SYSTEM_SECURITY) access |= ACCESS_SYSTEM_SECURITY; if (dwOpenMode & FILE_FLAG_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) != 0;

1 0

Jacek Caban : wmp: Added SetClientSite implementation.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: 54e3e0de4801639a7a39174b30147f18d6094cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e3e0de4801639a7a39174b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 11:50:34 2014 +0100 wmp: Added SetClientSite implementation. --- dlls/wmp/oleobj.c | 45 +++++++++++++++++++++++++++++++++++++++++---- dlls/wmp/wmp_private.h | 5 +++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 380ae1f..d5c2f85 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -28,8 +28,19 @@ struct WindowsMediaPlayer { IPersistStreamInit IPersistStreamInit_iface; LONG ref; + + IOleClientSite *client_site; }; +static void release_client_site(WindowsMediaPlayer *This) +{ + if(!This->client_site) + return; + + IOleClientSite_Release(This->client_site); + This->client_site = NULL; +} + static inline WindowsMediaPlayer *impl_from_IOleObject(IOleObject *iface) { return CONTAINING_RECORD(iface, WindowsMediaPlayer, IOleObject_iface); @@ -84,8 +95,10 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + release_client_site(This); heap_free(This); + } return ref; } @@ -93,8 +106,32 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, pClientSite); - return E_NOTIMPL; + IOleControlSite *control_site; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, pClientSite); + + release_client_site(This); + if(!pClientSite) + return S_OK; + + IOleClientSite_AddRef(pClientSite); + This->client_site = pClientSite; + + hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleControlSite, (void**)&control_site); + if(SUCCEEDED(hres)) { + IDispatch *disp; + + hres = IOleControlSite_GetExtendedControl(control_site, &disp); + if(SUCCEEDED(hres) && disp) { + FIXME("Use extended control\n"); + IDispatch_Release(disp); + } + + IOleControlSite_Release(control_site); + } + + return S_OK; } static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **ppClientSite) @@ -407,7 +444,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - wmp = heap_alloc(sizeof(*wmp)); + wmp = heap_alloc_zero(sizeof(*wmp)); if(!wmp) return E_OUTOFMEMORY; diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index f294519..68c3dd2 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -29,6 +29,11 @@ static inline void *heap_alloc(size_t len) return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem);

1 0