winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2014
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
503 discussions
Start a n
N
ew thread
Dmitry Timoshkov : advapi32/tests: Correct the test failure message.
by Alexandre Julliard
11 Feb '14
11 Feb '14
Module: wine Branch: master Commit: 9c010d70b02153ac3d074c7f446ed3ee61e4026e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9c010d70b02153ac3d074c7f4…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 09:10:42 2014 +0900 advapi32/tests: Correct the test failure message. --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 044c3f0..907c73b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4988,7 +4988,7 @@ static void test_filemap_security(void) } else { - ok(!mapping, "CreateFileMapping(%04x) error %d\n", prot_map[i].prot, GetLastError()); + ok(!mapping, "CreateFileMapping(%04x) should fail\n", prot_map[i].prot); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); continue; }
1
0
0
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
0
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
0
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
0
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
0
0
Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard
10 Feb '14
10 Feb '14
Module: wine Branch: master Commit: 0f2bed51bdd73676406e908eb105dde1efa886fc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0f2bed51bdd73676406e908eb…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 7 22:42:49 2014 +0100 Assorted spelling fixes. --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/crypt.c | 2 +- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/dpa.c | 2 +- dlls/comctl32/toolbar.c | 2 +- dlls/dmime/performance.c | 8 ++++---- dlls/gameux/gameexplorer.c | 4 ++-- dlls/gameux/gamestatistics.c | 2 +- dlls/gameux/tests/gameexplorer.c | 2 +- dlls/gdi32/enhmetafile.c | 2 +- dlls/jscript/regexp.c | 2 +- dlls/kernel32/tests/alloc.c | 12 ++++++------ dlls/kernel32/tests/path.c | 2 +- dlls/ntdll/sync.c | 10 +++++----- dlls/ntdll/tests/info.c | 2 +- dlls/ole32/compositemoniker.c | 2 +- dlls/ole32/ole2.c | 6 +++--- dlls/opencl/opencl.c | 4 ++-- dlls/quartz/pin.c | 4 ++-- dlls/riched20/table.c | 2 +- dlls/rsaenh/mpi.c | 10 +++++----- dlls/rsaenh/tests/rsaenh.c | 4 ++-- dlls/shdocvw/tests/shortcut.c | 2 +- dlls/shell32/brsfolder.c | 4 ++-- dlls/shell32/shfldr_unixfs.c | 4 ++-- dlls/shell32/tests/shellpath.c | 2 +- dlls/shlwapi/tests/path.c | 4 ++-- dlls/urlmon/sec_mgr.c | 6 +++--- dlls/urlmon/tests/sec_mgr.c | 2 +- dlls/urlmon/tests/uri.c | 14 +++++++------- dlls/urlmon/tests/url.c | 2 +- dlls/urlmon/uri.c | 8 ++++---- dlls/user32/clipboard.c | 4 ++-- dlls/user32/edit.c | 4 ++-- dlls/user32/tests/menu.c | 2 +- dlls/vbscript/regexp.c | 2 +- dlls/wined3d/directx.c | 8 ++++---- dlls/winmm/tests/capture.c | 2 +- dlls/winmm/tests/wave.c | 4 ++-- dlls/wintrust/register.c | 2 +- libs/wpp/preproc.c | 2 +- programs/attrib/attrib.c | 8 ++++---- programs/cmd/builtins.c | 16 ++++++++-------- programs/cmd/tests/test_builtins.cmd | 4 ++-- programs/cmd/wcmdmain.c | 4 ++-- programs/netstat/netstat.c | 8 ++++---- programs/taskmgr/affinity.c | 2 +- programs/taskmgr/optnmenu.c | 2 +- programs/taskmgr/proclist.c | 2 +- programs/taskmgr/taskmgr.c | 4 ++-- programs/winedbg/debugger.h | 2 +- tools/c2man.pl | 4 ++-- tools/winedump/README | 2 +- tools/winedump/pdb.c | 2 +- tools/wrc/newstruc.c | 2 +- tools/wrc/parser.y | 4 ++-- tools/wrc/wrctypes.h | 2 +- 57 files changed, 117 insertions(+), 117 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f2bed51bdd73676406e9…
1
0
0
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
0
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
0
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
0
0
Jacek Caban : wmp: Added SetClientSite implementation.
by Alexandre Julliard
10 Feb '14
10 Feb '14
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
0
0
← Newer
1
...
32
33
34
35
36
37
38
...
51
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
Results per page:
10
25
50
100
200