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
October 2018
----- 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
1 participants
602 discussions
Start a n
N
ew thread
Alexandre Julliard : ntdll: Align string data in RtlCreateProcessParametersEx().
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: 179c0ee6fb2a25736e0bf74613415ebce54c875f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=179c0ee6fb2a25736e0bf746…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 20:45:10 2018 +0200 ntdll: Align string data in RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 417efb6..1d34e62 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -421,15 +421,21 @@ PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams( RTL_USER_PROCES } +#define ROUND_SIZE(size) (((size) + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) + /* append a unicode string to the process params data; helper for RtlCreateProcessParameters */ static void append_unicode_string( void **data, const UNICODE_STRING *src, UNICODE_STRING *dst ) { dst->Length = src->Length; dst->MaximumLength = src->MaximumLength; - dst->Buffer = *data; - memcpy( dst->Buffer, src->Buffer, dst->MaximumLength ); - *data = (char *)dst->Buffer + dst->MaximumLength; + if (dst->MaximumLength) + { + dst->Buffer = *data; + memcpy( dst->Buffer, src->Buffer, dst->Length ); + *data = (char *)dst->Buffer + ROUND_SIZE( dst->MaximumLength ); + } + else dst->Buffer = NULL; } @@ -482,17 +488,17 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu env = Environment; while (*env) env += strlenW(env) + 1; env++; - env_size = (env - Environment) * sizeof(WCHAR); + env_size = ROUND_SIZE( (env - Environment) * sizeof(WCHAR) ); size = (sizeof(RTL_USER_PROCESS_PARAMETERS) - + ImagePathName->MaximumLength - + DllPath->MaximumLength - + CurrentDirectoryName->MaximumLength - + CommandLine->MaximumLength - + WindowTitle->MaximumLength - + Desktop->MaximumLength - + ShellInfo->MaximumLength - + RuntimeInfo->MaximumLength); + + ROUND_SIZE( ImagePathName->MaximumLength ) + + ROUND_SIZE( DllPath->MaximumLength ) + + ROUND_SIZE( curdir.MaximumLength ) + + ROUND_SIZE( CommandLine->MaximumLength ) + + ROUND_SIZE( WindowTitle->MaximumLength ) + + ROUND_SIZE( Desktop->MaximumLength ) + + ROUND_SIZE( ShellInfo->MaximumLength ) + + ROUND_SIZE( RuntimeInfo->MaximumLength )); total_size = size + env_size; ptr = NULL;
1
0
0
0
Alexandre Julliard : ntdll: Fixup size of the current directory in RtlCreateProcessParametersEx().
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: ae7ccbba48b99ca6e7f9ee4564082c2d331fa205 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ae7ccbba48b99ca6e7f9ee45…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 20:43:42 2018 +0200 ntdll: Fixup size of the current directory in RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 10 +++++++--- dlls/ntdll/thread.c | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index fdd5d4f..417efb6 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -452,6 +452,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; static const UNICODE_STRING null_str = { 0, 0, NULL }; + UNICODE_STRING curdir; const RTL_USER_PROCESS_PARAMETERS *cur_params; SIZE_T size, env_size, total_size; void *ptr; @@ -464,10 +465,13 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu if (!CurrentDirectoryName) { if (NtCurrentTeb()->Tib.SubSystemTib) /* FIXME: hack */ - CurrentDirectoryName = &((WIN16_SUBSYSTEM_TIB *)NtCurrentTeb()->Tib.SubSystemTib)->curdir.DosPath; + curdir = ((WIN16_SUBSYSTEM_TIB *)NtCurrentTeb()->Tib.SubSystemTib)->curdir.DosPath; else - CurrentDirectoryName = &cur_params->CurrentDirectory.DosPath; + curdir = cur_params->CurrentDirectory.DosPath; } + else curdir = *CurrentDirectoryName; + curdir.MaximumLength = MAX_PATH * sizeof(WCHAR); + if (!CommandLine) CommandLine = ImagePathName; if (!Environment) Environment = cur_params->Environment; if (!WindowTitle) WindowTitle = &empty_str; @@ -503,7 +507,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu /* all other fields are zero */ ptr = params + 1; - append_unicode_string( &ptr, CurrentDirectoryName, ¶ms->CurrentDirectory.DosPath ); + append_unicode_string( &ptr, &curdir, ¶ms->CurrentDirectory.DosPath ); append_unicode_string( &ptr, DllPath, ¶ms->DllPath ); append_unicode_string( &ptr, ImagePathName, ¶ms->ImagePathName ); append_unicode_string( &ptr, CommandLine, ¶ms->CommandLine ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9b23fbf..c4e02da 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -68,7 +68,7 @@ struct startup_info static PEB *peb; static PEB_LDR_DATA ldr; static RTL_USER_PROCESS_PARAMETERS params; /* default parameters if no parent */ -static WCHAR current_dir[MAX_NT_PATH_LENGTH]; +static WCHAR current_dir[MAX_PATH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; @@ -130,7 +130,7 @@ static NTSTATUS init_user_process_params( SIZE_T data_size ) if (status != STATUS_SUCCESS) goto done; size = sizeof(*params); - size += MAX_NT_PATH_LENGTH * sizeof(WCHAR); + size += sizeof(current_dir); size += info->dllpath_len + sizeof(WCHAR); size += info->imagepath_len + sizeof(WCHAR); size += info->cmdline_len + sizeof(WCHAR); @@ -169,8 +169,8 @@ static NTSTATUS init_user_process_params( SIZE_T data_size ) /* current directory needs more space */ get_unicode_string( ¶ms->CurrentDirectory.DosPath, &src, &dst, info->curdir_len ); - params->CurrentDirectory.DosPath.MaximumLength = MAX_NT_PATH_LENGTH * sizeof(WCHAR); - dst = (WCHAR *)(params + 1) + MAX_NT_PATH_LENGTH; + params->CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); + dst = (WCHAR *)(params + 1) + ARRAY_SIZE(current_dir); get_unicode_string( ¶ms->DllPath, &src, &dst, info->dllpath_len ); get_unicode_string( ¶ms->ImagePathName, &src, &dst, info->imagepath_len );
1
0
0
0
Alexandre Julliard : ntdll: Store a copy of the environment in RtlCreateProcessParametersEx().
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: fce198cc5e797679f904c0ec58ed715fd0e8c481 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=fce198cc5e797679f904c0ec…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 15:15:27 2018 +0200 ntdll: Store a copy of the environment in RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 9288713..fdd5d4f 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -453,8 +453,9 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu static const UNICODE_STRING null_str = { 0, 0, NULL }; const RTL_USER_PROCESS_PARAMETERS *cur_params; - SIZE_T size, total_size; + SIZE_T size, env_size, total_size; void *ptr; + const WCHAR *env; NTSTATUS status; RtlAcquirePebLock(); @@ -474,6 +475,11 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu if (!ShellInfo) ShellInfo = &empty_str; if (!RuntimeInfo) RuntimeInfo = &null_str; + env = Environment; + while (*env) env += strlenW(env) + 1; + env++; + env_size = (env - Environment) * sizeof(WCHAR); + size = (sizeof(RTL_USER_PROCESS_PARAMETERS) + ImagePathName->MaximumLength + DllPath->MaximumLength @@ -484,7 +490,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu + ShellInfo->MaximumLength + RuntimeInfo->MaximumLength); - total_size = size; + total_size = size + env_size; ptr = NULL; if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, &total_size, MEM_COMMIT, PAGE_READWRITE )) == STATUS_SUCCESS) @@ -494,7 +500,6 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; params->ConsoleFlags = cur_params->ConsoleFlags; - params->Environment = Environment; /* all other fields are zero */ ptr = params + 1; @@ -506,6 +511,8 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu append_unicode_string( &ptr, Desktop, ¶ms->Desktop ); append_unicode_string( &ptr, ShellInfo, ¶ms->ShellInfo ); append_unicode_string( &ptr, RuntimeInfo, ¶ms->RuntimeInfo ); + params->Environment = ptr; + memcpy( ptr, Environment, (env - Environment) * sizeof(WCHAR) ); *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); }
1
0
0
0
Alistair Leslie-Hughes : shell32: Properly fail when a data object cannot be created.
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: cce8398dea7d8ac8198f95c0af91f8154afcca1b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=cce8398dea7d8ac8198f95c0…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 16 00:41:38 2018 +0000 shell32: Properly fail when a data object cannot be created. Based on a patch by Mark Jansen. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 15 +++++++-------- dlls/shell32/tests/shlexec.c | 8 ++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 0b794b0..1e795ac 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1165,13 +1165,12 @@ static HKEY ShellExecute_GetClassKey( const SHELLEXECUTEINFOW *sei ) return hkey; } -static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) +static HRESULT shellex_get_dataobj( LPSHELLEXECUTEINFOW sei, IDataObject **dataobj ) { LPCITEMIDLIST pidllast = NULL; - IDataObject *dataobj = NULL; IShellFolder *shf = NULL; LPITEMIDLIST pidl = NULL; - HRESULT r; + HRESULT r = SE_ERR_DLLNOTFOUND; if (sei->fMask & SEE_MASK_CLASSALL) pidl = sei->lpIDList; @@ -1192,15 +1191,15 @@ static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) if ( FAILED( r ) ) goto end; - IShellFolder_GetUIObjectOf( shf, NULL, 1, &pidllast, - &IID_IDataObject, NULL, (LPVOID*) &dataobj ); + r = IShellFolder_GetUIObjectOf( shf, NULL, 1, &pidllast, + &IID_IDataObject, NULL, (void**)dataobj ); end: if ( pidl != sei->lpIDList ) ILFree( pidl ); if ( shf ) IShellFolder_Release( shf ); - return dataobj; + return r; } static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, @@ -1295,8 +1294,8 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC goto end; } - dataobj = shellex_get_dataobj( sei ); - if ( !dataobj ) + r = shellex_get_dataobj( sei, &dataobj ); + if ( FAILED( r ) ) { ERR("failed to get data object\n"); goto end; diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index bb2b842..9dff9f8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1780,7 +1780,7 @@ static fileurl_tests_t fileurl_tests[]= {"file:///", "%%TMPDIR%%\\test file.shlexec", 0, 0}, /* Test shortcuts vs. URLs */ - {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, + {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1c}, /* Confuse things by mixing protocols */ {"file://", "shlproto://foo/bar", USE_COLON, 0}, @@ -1926,11 +1926,11 @@ static void test_urls(void) } /* A .lnk ending does not turn a URL into a shortcut */ - todo_wait rc = shell_execute(NULL, "shlproto://foo/bar.lnk", NULL, NULL); + rc = shell_execute(NULL, "shlproto://foo/bar.lnk", NULL, NULL); ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "URL"); - todo_wine okChildString("argvA4", "shlproto://foo/bar.lnk"); + okChildString("argvA3", "URL"); + okChildString("argvA4", "shlproto://foo/bar.lnk"); /* Neither does a .exe extension */ rc = shell_execute(NULL, "shlproto://foo/bar.exe", NULL, NULL);
1
0
0
0
Mark Jansen : shell32: Expand environment strings in ShellExecute.
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: f7d47b4951a8d1656ba7b2cfc452b92dd45f7878 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f7d47b4951a8d1656ba7b2cf…
Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Tue Oct 16 00:41:36 2018 +0000 shell32: Expand environment strings in ShellExecute. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 47 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlexec.c | 6 +++--- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 40306d6..0b794b0 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1557,6 +1557,26 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); } +static WCHAR *expand_environment( const WCHAR *str ) +{ + WCHAR *buf; + DWORD len; + + len = ExpandEnvironmentStringsW(str, NULL, 0); + if (!len) return NULL; + + buf = heap_alloc(len * sizeof(WCHAR)); + if (!buf) return NULL; + + len = ExpandEnvironmentStringsW(str, buf, len); + if (!len) + { + heap_free(buf); + return NULL; + } + return buf; +} + /************************************************************************* * SHELL_execute [Internal] */ @@ -1570,7 +1590,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; - WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd; + WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd = NULL; DWORD dwApplicationNameLen = MAX_PATH+2; DWORD parametersLen = ARRAY_SIZE(parametersBuffer); DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer); @@ -1676,6 +1696,30 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } + if (sei_tmp.fMask & SEE_MASK_DOENVSUBST) + { + WCHAR *tmp; + + tmp = expand_environment(sei_tmp.lpFile); + if (!tmp) + { + retval = SE_ERR_OOM; + goto end; + } + heap_free(wszApplicationName); + sei_tmp.lpFile = wszApplicationName = tmp; + + tmp = expand_environment(sei_tmp.lpDirectory); + if (!tmp) + { + retval = SE_ERR_OOM; + goto end; + } + if (wszDir != dirBuffer) + heap_free(wszDir); + sei_tmp.lpDirectory = wszDir = tmp; + } + if ( ERROR_SUCCESS == ShellExecute_FromContextMenu( &sei_tmp ) ) { sei->hInstApp = (HINSTANCE) 33; @@ -1846,6 +1890,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); } +end: TRACE("retval %lu\n", retval); heap_free(wszApplicationName); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ab77fa1..bb2b842 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2133,13 +2133,13 @@ static void test_lnks(void) get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); - todo_wait rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); okShell(rc > 32, "failed: rc=%lu err=%u\n", rc, GetLastError()); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "Open"); + okChildString("argvA3", "Open"); sprintf(params, "%s\\test file.shlexec", tmpdir); get_long_path_name(params, filename, sizeof(filename)); - todo_wine okChildPath("argvA4", filename); + okChildPath("argvA4", filename); } /* Should just run our executable */
1
0
0
0
Zebediah Figura : oleaut32/tests: Add some tests for marshalling base types.
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: 55e3a4d82f98e37d4cb11657f759f1d772257b04 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=55e3a4d82f98e37d4cb11657…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 14 22:41:03 2018 -0500 oleaut32/tests: Add some tests for marshalling base types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 129 ++++++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 56 +++++++++++++- dlls/oleaut32/tests/tmarshal_dispids.h | 52 ------------- 3 files changed, 183 insertions(+), 54 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=55e3a4d82f98e37d4cb1…
1
0
0
0
Zebediah Figura : oleaut32: Handle VT_(U)I8 in get_type_size().
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: 1d15103c2b3c35ee19ee39a8a4ff95c659582b37 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1d15103c2b3c35ee19ee39a8…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 14 22:41:02 2018 -0500 oleaut32: Handle VT_(U)I8 in get_type_size(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/usrmarshal.c | 30 ++++++++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 3 +++ 2 files changed, 33 insertions(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 5ea13e4..0185b6d 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -964,6 +964,36 @@ static void test_marshal_VARIANT(void) VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); + /*** I8 ***/ + VariantInit(&v); + V_VT(&v) = VT_I8; + V_I8(&v) = (LONGLONG)1000000 * 1000000; + + rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v); + ok(stubMsg.BufferLength == 32, "size %d\n", stubMsg.BufferLength); + + buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer); + stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength; + memset(buffer, 0xcc, stubMsg.BufferLength); + next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); + ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + wirev = (DWORD*)buffer; + + wirev = check_variant_header(wirev, &v, stubMsg.BufferLength); + ok(*wirev == 0xcccccccc, "wv[5] %08x\n", *wirev); /* pad */ + wirev++; + ok(*(LONGLONG *)wirev == V_I8(&v), "wv[6] %s\n", wine_dbgstr_longlong(*(LONGLONG *)wirev)); + VariantInit(&v2); + stubMsg.Buffer = buffer; + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); + ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); + ok(V_I8(&v) == V_I8(&v2), "got i8 %s expect %s\n", + wine_dbgstr_longlong(V_I8(&v)), wine_dbgstr_longlong(V_I8(&v2))); + + VARIANT_UserFree(&umcb.Flags, &v2); + HeapFree(GetProcessHeap(), 0, oldbuffer); + /*** R4 ***/ VariantInit(&v); V_VT(&v) = VT_R4; diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index da524c8..d3dc93a 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -227,6 +227,9 @@ unsigned int get_type_size(ULONG *pFlags, VARTYPE vt) case VT_INT: case VT_UINT: return sizeof(INT); + case VT_I8: + case VT_UI8: + return sizeof(LONGLONG); case VT_R4: return sizeof(FLOAT); case VT_R8:
1
0
0
0
Alistair Leslie-Hughes : hnetcfg/tests: Add IUPnPNAT interface tests.
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: 6670048908220ae2b2fe62584714273e2c1a8e1d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6670048908220ae2b2fe6258…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 14 23:27:09 2018 +0000 hnetcfg/tests: Add IUPnPNAT interface tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 208f583..61175f9 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -27,6 +27,7 @@ #include "wine/test.h" #include "netfw.h" +#include "natupnp.h" static void test_policy2_rules(INetFwPolicy2 *policy2) { @@ -160,6 +161,35 @@ static void test_NetFwAuthorizedApplication(void) INetFwAuthorizedApplication_Release(app); } +static void test_IUPnPNAT(void) +{ + IUPnPNAT *nat; + IStaticPortMappingCollection *static_ports; + IDynamicPortMappingCollection *dync_ports; + INATEventManager *manager; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUPnPNAT, (void**)&nat); + ok(hr == S_OK, "got: %08x\n", hr); + + hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); + todo_wine ok(hr == S_OK, "got: %08x\n", hr); + if(hr == S_OK && static_ports) + IStaticPortMappingCollection_Release(static_ports); + + hr = IUPnPNAT_get_DynamicPortMappingCollection(nat, &dync_ports); + ok(hr == S_OK || hr == E_NOTIMPL /* Windows 8.1 */, "got: %08x\n", hr); + if(hr == S_OK && dync_ports) + IDynamicPortMappingCollection_Release(dync_ports); + + hr = IUPnPNAT_get_NATEventManager(nat, &manager); + todo_wine ok(hr == S_OK, "got: %08x\n", hr); + if(hr == S_OK && manager) + INATEventManager_Release(manager); + + IUPnPNAT_Release(nat); +} + START_TEST(policy) { INetFwMgr *manager; @@ -180,6 +210,7 @@ START_TEST(policy) test_interfaces(); test_NetFwAuthorizedApplication(); + test_IUPnPNAT(); CoUninitialize(); }
1
0
0
0
Alistair Leslie-Hughes : hnetcfg: Link to uuid library.
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: d65bd95ecd4fee57cbfe17b375f0b0325f9e076e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d65bd95ecd4fee57cbfe17b3…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 14 23:27:07 2018 +0000 hnetcfg: Link to uuid library. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/Makefile.in | 2 +- dlls/hnetcfg/manager.c | 2 -- dlls/uuid/uuid.c | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 44c9cb5..e4960ab 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,5 +1,5 @@ MODULE = hnetcfg.dll -IMPORTS = oleaut32 ole32 advapi32 mpr +IMPORTS = oleaut32 ole32 advapi32 mpr uuid C_SRCS = \ apps.c \ diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index d3f089e..2d89479 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -25,10 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "initguid.h" #include "ole2.h" #include "netfw.h" -#include "natupnp.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 913e99c..aa3b30c 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -79,6 +79,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "perhist.h" #include "netcon.h" #include "netfw.h" +#include "natupnp.h" #include "msctf.h" #include "sensevts.h" #include "ocmm.h"
1
0
0
0
Alistair Leslie-Hughes : hnetcfg: Support IUPnPNAT interface.
by Alexandre Julliard
16 Oct '18
16 Oct '18
Module: wine Branch: master Commit: 449833b48aabe25ef500fe12b2b00e83bd9b2efd URL:
https://source.winehq.org/git/wine.git/?a=commit;h=449833b48aabe25ef500fe12…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 14 23:27:06 2018 +0000 hnetcfg: Support IUPnPNAT interface. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=34711
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/apps.c | 4 +- dlls/hnetcfg/hnetcfg.c | 7 ++ dlls/hnetcfg/hnetcfg_private.h | 2 + dlls/hnetcfg/manager.c | 1 + dlls/hnetcfg/port.c | 167 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 1 deletion(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index e671e8c..9972468 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "wine/heap.h" @@ -115,7 +116,8 @@ static REFIID tid_id[] = &IID_INetFwOpenPorts, &IID_INetFwPolicy, &IID_INetFwPolicy2, - &IID_INetFwProfile + &IID_INetFwProfile, + &IID_IUPnPNAT }; HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index e56dbab..5cc24a1 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -25,6 +25,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "hnetcfg_private.h" @@ -114,6 +115,8 @@ static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; static hnetcfg_cf fw_policy2_cf = { { &hnetcfg_cf_vtbl }, NetFwPolicy2_create }; +static hnetcfg_cf upnpnat_cf = { { &hnetcfg_cf_vtbl }, IUPnPNAT_create }; + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { @@ -156,6 +159,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &fw_policy2_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_UPnPNAT )) + { + cf = &upnpnat_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 5245883..be2d0f3 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -27,6 +27,7 @@ enum type_id INetFwPolicy2_tid, INetFwProfile_tid, INetFwRules_tid, + IUPnPNAT_tid, last_tid }; @@ -42,3 +43,4 @@ HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwOpenPort_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT IUPnPNAT_create(IUnknown *, void **) DECLSPEC_HIDDEN; diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index 1d548b4..d3f089e 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 7d74965..f497bcb 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -27,7 +27,9 @@ #include "winuser.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" #include "hnetcfg_private.h" @@ -603,3 +605,168 @@ HRESULT NetFwOpenPorts_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("returning iface %p\n", *ppObj); return S_OK; } + +typedef struct _upnpnat +{ + IUPnPNAT IUPnPNAT_iface; + LONG ref; +} upnpnat; + +static inline upnpnat *impl_from_IUPnPNAT( IUPnPNAT *iface ) +{ + return CONTAINING_RECORD(iface, upnpnat, IUPnPNAT_iface); +} + +static HRESULT WINAPI upnpnat_QueryInterface(IUPnPNAT *iface, REFIID riid, void **object) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), object ); + + if ( IsEqualGUID( riid, &IID_IUPnPNAT ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *object = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IUPnPNAT_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI upnpnat_AddRef(IUPnPNAT *iface) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI upnpnat_Release(IUPnPNAT *iface) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + LONG refs = InterlockedDecrement( &This->ref ); + if (!refs) + { + heap_free( This ); + } + return refs; +} + +static HRESULT WINAPI upnpnat_GetTypeInfoCount(IUPnPNAT *iface, UINT *pctinfo) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI upnpnat_GetTypeInfo(IUPnPNAT *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( IUPnPNAT_tid, ppTInfo ); +} + +static HRESULT WINAPI upnpnat_GetIDsOfNames(IUPnPNAT *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI upnpnat_Invoke(IUPnPNAT *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->IUPnPNAT_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI upnpnat_get_StaticPortMappingCollection(IUPnPNAT *iface, IStaticPortMappingCollection **collection) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, collection); + if(collection) + *collection = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI upnpnat_get_DynamicPortMappingCollection(IUPnPNAT *iface, IDynamicPortMappingCollection **collection) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, collection); + if(collection) + *collection = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI upnpnat_get_NATEventManager(IUPnPNAT *iface, INATEventManager **manager) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, manager); + if(manager) + *manager = NULL; + return E_NOTIMPL; +} + +const static IUPnPNATVtbl upnpnat_vtbl = +{ + upnpnat_QueryInterface, + upnpnat_AddRef, + upnpnat_Release, + upnpnat_GetTypeInfoCount, + upnpnat_GetTypeInfo, + upnpnat_GetIDsOfNames, + upnpnat_Invoke, + upnpnat_get_StaticPortMappingCollection, + upnpnat_get_DynamicPortMappingCollection, + upnpnat_get_NATEventManager +}; + + +HRESULT IUPnPNAT_create(IUnknown *outer, void **object) +{ + upnpnat *nat; + + TRACE("(%p,%p)\n", outer, object); + + nat = heap_alloc( sizeof(*nat) ); + if (!nat) return E_OUTOFMEMORY; + + nat->IUPnPNAT_iface.lpVtbl = &upnpnat_vtbl; + nat->ref = 1; + + *object = &nat->IUPnPNAT_iface; + + TRACE("returning iface %p\n", *object); + return S_OK; +}
1
0
0
0
← Newer
1
...
31
32
33
34
35
36
37
...
61
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
52
53
54
55
56
57
58
59
60
61
Results per page:
10
25
50
100
200