February 2014 - Wine-commits

Alistair Leslie-Hughes : dpnet/tests: Add IDirectPlay8Peer_EnumHosts tests.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: d3b140798252c465fcbdc82f3a34943335cb181d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b140798252c465fcbdc82f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 11 15:29:53 2014 +1100 dpnet/tests: Add IDirectPlay8Peer_EnumHosts tests. --- dlls/dpnet/tests/peer.c | 59 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 8ae0afe..d2f0ccf 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -23,21 +23,12 @@ #include <dplay8.h> #include "wine/test.h" -static char *show_guid(const GUID *guid, char *buf) -{ - sprintf(buf, - "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); - - return buf; -} static IDirectPlay8Peer* peer = NULL; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) { + trace("DirectPlayMessageHandler: 0x%08x\n", message_id); return S_OK; } @@ -64,7 +55,6 @@ static void test_enum_service_providers(void) DWORD items, size; DWORD i; HRESULT hr; - char guid[39] ; size = 0; items = 0; @@ -84,7 +74,7 @@ static void test_enum_service_providers(void) for (i=0;i<items;i++) { trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); - trace("Found guid: %s\n", show_guid(&serv_prov_info->guid, guid)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); serv_prov_info++; } @@ -109,7 +99,7 @@ static void test_enum_service_providers(void) for (i=0;i<items;i++) { trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); - trace("Found adapter guid: %s\n", show_guid(&serv_prov_info->guid, guid)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); serv_prov_info++; } @@ -118,6 +108,48 @@ static void test_enum_service_providers(void) ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); } +static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; + +static void test_enum_hosts(void) +{ + HRESULT hr; + IDirectPlay8Address *host = NULL; + IDirectPlay8Address *local = NULL; + DPN_APPLICATION_DESC appdesc; + DPNHANDLE async = 0; + static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; + + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); + appdesc.guidApplication = appguid; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&local); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(local, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&host); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), + DPNA_DATATYPE_STRING); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumServiceProviders failed with 0x%08x\n", hr); + todo_wine ok(async, "No Handle returned\n"); + + hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08x\n", hr); + + IDirectPlay8Address_Release(local); + IDirectPlay8Address_Release(host); +} + static void test_get_sp_caps(void) { DPN_SP_CAPS caps; @@ -164,6 +196,7 @@ START_TEST(peer) { test_init_dp(); test_enum_service_providers(); + test_enum_hosts(); test_get_sp_caps(); test_cleanup_dp(); }

1 0

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

11 Feb '14

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

Austin English : riched20: Remove duplicate declaration.
by Alexandre Julliard 11 Feb '14

11 Feb '14

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

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

11 Feb '14

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

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

11 Feb '14

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

Jacek Caban : wmp: Added SetClientSite tests.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 9a1f13cf0d906bfedcc6625565964fe39d201f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1f13cf0d906bfedcc662556… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 11:50:58 2014 +0100 wmp: Added SetClientSite tests. --- dlls/wmp/tests/oleobj.c | 605 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 605 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a1f13cf0d906bfedcc66…

1 0

Jacek Caban : wmp: Added GetClientSite implementation.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 83c45eaa3ce8e9ac69c7b160445dab54267997cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c45eaa3ce8e9ac69c7b1604… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 11:51:12 2014 +0100 wmp: Added GetClientSite implementation. --- dlls/wmp/oleobj.c | 7 +++++-- dlls/wmp/tests/oleobj.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index d5c2f85..6506824 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -137,8 +137,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **ppClientSite) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, ppClientSite); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppClientSite); + + *ppClientSite = This->client_site; + return This->client_site ? S_OK : E_FAIL; } static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szContainerApp, LPCOLESTR szContainerObj) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 8578780..c8fb5a3 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -627,6 +627,7 @@ static void test_QI(IUnknown *unk) static void test_wmp(void) { IProvideClassInfo2 *class_info; + IOleClientSite *client_site; IPersistStreamInit *psi; IOleObject *oleobj; GUID guid; @@ -667,9 +668,19 @@ static void test_wmp(void) todo_wine CHECK_CALLED(GetWindow); todo_wine CHECK_CALLED(Invoke_USERMODE); + client_site = NULL; + hres = IOleObject_GetClientSite(oleobj, &client_site); + ok(hres == S_OK, "GetClientSite failed: %08x\n", hres); + ok(client_site == &ClientSite, "client_site != ClientSite\n"); + hres = IOleObject_SetClientSite(oleobj, NULL); ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + client_site = (void*)0xdeadbeef; + hres = IOleObject_GetClientSite(oleobj, &client_site); + ok(hres == E_FAIL, "GetClientSite failed: %08x\n", hres); + ok(!client_site, "client_site = %p\n", client_site); + ref = IOleObject_Release(oleobj); ok(!ref, "ref = %d\n", ref); }

1 0

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

10 Feb '14

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

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard 10 Feb '14

10 Feb '14

1 0

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

10 Feb '14

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