ReactOS.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
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
List overview
Download
Ros-diffs
March 2018
----- 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
ros-diffs@reactos.org
25 participants
436 discussions
Start a n
N
ew thread
01/01: [SLBCSP] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61c7c8217af67634bf554…
commit 61c7c8217af67634bf55449119a6ab14495ce77a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:26:28 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:26:28 2018 +0100 [SLBCSP] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/slbcsp/main.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dll/win32/slbcsp/main.c b/dll/win32/slbcsp/main.c index cdabe6e15c..d0e74e68ad 100644 --- a/dll/win32/slbcsp/main.c +++ b/dll/win32/slbcsp/main.c @@ -16,15 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "config.h" #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(slbcsp); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 61740cc4ce..b4c886cba7 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -175,7 +175,7 @@ reactos/dll/win32/shdocvw # Synced to WineStaging-3.3 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-3.3 reactos/dll/win32/shlwapi # Synced to WineStaging-3.3 -reactos/dll/win32/slbcsp # Synced to WineStaging-2.9 +reactos/dll/win32/slbcsp # Synced to WineStaging-3.3 reactos/dll/win32/snmpapi # Synced to WineStaging-2.9 reactos/dll/win32/softpub # Synced to WineStaging-2.9 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-2.9
6 years, 9 months
1
0
0
0
01/01: [SHFOLDER] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73bf97c894c50115933db…
commit 73bf97c894c50115933db5c4c7635e82b807d8d2 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:25:46 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:25:46 2018 +0100 [SHFOLDER] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/shfolder/version.rc | 2 +- media/doc/README.WINE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shfolder/version.rc b/dll/win32/shfolder/version.rc index 714bef700c..145254e947 100644 --- a/dll/win32/shfolder/version.rc +++ b/dll/win32/shfolder/version.rc @@ -22,4 +22,4 @@ #define WINE_PRODUCTVERSION_STR "6,00,2800,1106" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 23c4ed6176..61740cc4ce 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -173,7 +173,7 @@ reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to WineStaging-3.3 reactos/dll/win32/shdocvw # Synced to WineStaging-3.3 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to WineStaging-2.9 +reactos/dll/win32/shfolder # Synced to WineStaging-3.3 reactos/dll/win32/shlwapi # Synced to WineStaging-3.3 reactos/dll/win32/slbcsp # Synced to WineStaging-2.9 reactos/dll/win32/snmpapi # Synced to WineStaging-2.9
6 years, 9 months
1
0
0
0
01/01: [SHDOCVW_WINETEST] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2da768d403f7518c94c7b…
commit 2da768d403f7518c94c7bc4a9c7840d40efcc98c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:24:56 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:24:56 2018 +0100 [SHDOCVW_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/shdocvw/shdocvw.c | 25 +++++++++++++------------ modules/rostests/winetests/shdocvw/shortcut.c | 22 +++++++++------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/modules/rostests/winetests/shdocvw/shdocvw.c b/modules/rostests/winetests/shdocvw/shdocvw.c index 3bdceb5728..cdf1814f6d 100644 --- a/modules/rostests/winetests/shdocvw/shdocvw.c +++ b/modules/rostests/winetests/shdocvw/shdocvw.c @@ -21,13 +21,13 @@ #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <wininet.h> -#include <winnls.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wininet.h" +#include "winnls.h" -#include <wine/test.h> +#include "wine/test.h" /* ################ */ @@ -212,13 +212,13 @@ static void test_ParseURLFromOutsideSourceA(void) buffer[sizeof(buffer)-1] = '\0'; len = sizeof(buffer); dummy = 0; - /* on success, len+1 is returned. No idea, if someone depend on this */ + /* on success, string size including terminating 0 is returned for ansi version */ res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); /* len does not include the terminating 0, when buffer is large enough */ - ok( res != 0 && len == ParseURL_table[i].len && + ok( res == (ParseURL_table[i].len+1) && len == ParseURL_table[i].len && !lstrcmpA(buffer, ParseURL_table[i].newurl), - "#%d: got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", - i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl); + "#%d: got %d and %d with '%s' (expected %d and %d with '%s')\n", + i, res, len, buffer, ParseURL_table[i].len+1, ParseURL_table[i].len, ParseURL_table[i].newurl); /* use the size test only for the first examples */ @@ -308,11 +308,12 @@ static void test_ParseURLFromOutsideSourceW(void) /* len is in characters */ len = sizeof(bufferW)/sizeof(bufferW[0]); dummy = 0; + /* on success, 1 is returned for unicode version */ res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); WideCharToMultiByte(CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL); - ok( res != 0 && len == ParseURL_table[0].len && + ok( res == 1 && len == ParseURL_table[0].len && !lstrcmpA(bufferA, ParseURL_table[0].newurl), - "got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", + "got %d and %d with '%s' (expected 1 and %d with '%s')\n", res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl); diff --git a/modules/rostests/winetests/shdocvw/shortcut.c b/modules/rostests/winetests/shdocvw/shortcut.c index 95916a0a6b..cb62c25892 100644 --- a/modules/rostests/winetests/shdocvw/shortcut.c +++ b/modules/rostests/winetests/shdocvw/shortcut.c @@ -34,23 +34,19 @@ #include <stdarg.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define COBJMACROS -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" -//#include "initguid.h" -#include <shlobj.h> -//#include "shobjidl.h" -//#include "shlguid.h" -//#include "ole2.h" +#include "initguid.h" +#include "shlobj.h" +#include "shobjidl.h" +#include "shlguid.h" +#include "ole2.h" -#include <wine/test.h> +#include "wine/test.h" /* The following definitions and helper functions are meant to make the de-/registration * of the various necessary registry keys easier. */
6 years, 9 months
1
0
0
0
01/01: [SHDOCVW] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fefb011f46b2f2f16c9f…
commit 9fefb011f46b2f2f16c9fc39016cab6bd60d9661 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:24:25 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:24:25 2018 +0100 [SHDOCVW] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/shdocvw/CMakeLists.txt | 4 +-- dll/win32/shdocvw/precomp.h | 17 +++++++++++++ dll/win32/shdocvw/shdocvw.h | 36 ++++++++------------------ dll/win32/shdocvw/shdocvw.rc | 4 +-- dll/win32/shdocvw/shdocvw.spec | 4 +-- dll/win32/shdocvw/shdocvw_main.c | 55 ++++++++++++++++++++++++++++++++++++---- dll/win32/shdocvw/shlinstobj.c | 15 +++++++++++ media/doc/README.WINE | 2 +- 8 files changed, 99 insertions(+), 38 deletions(-) diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index f79613e308..5efd1fda99 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -9,7 +9,7 @@ spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB) list(APPEND SOURCE shdocvw_main.c shlinstobj.c - shdocvw.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c) add_typelib(shdocvw_v1.idl) @@ -25,5 +25,5 @@ target_link_libraries(shdocvw uuid wine) add_delay_importlibs(shdocvw ole32 oleaut32 ieframe) add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll) add_dependencies(shdocvw stdole2) -add_pch(shdocvw shdocvw.h SOURCE) +add_pch(shdocvw precomp.h SOURCE) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/shdocvw/precomp.h b/dll/win32/shdocvw/precomp.h new file mode 100644 index 0000000000..48f0f29716 --- /dev/null +++ b/dll/win32/shdocvw/precomp.h @@ -0,0 +1,17 @@ + +#ifndef _SHDOCVW_PRECOMP_H +#define _SHDOCVW_PRECOMP_H + +#include <wine/config.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include "shdocvw.h" + +#include <winreg.h> + +#include <wine/debug.h> + +#endif /* !_SHDOCVW_PRECOMP_H */ diff --git a/dll/win32/shdocvw/shdocvw.h b/dll/win32/shdocvw/shdocvw.h index 626a9f8eeb..8cac507321 100644 --- a/dll/win32/shdocvw/shdocvw.h +++ b/dll/win32/shdocvw/shdocvw.h @@ -22,24 +22,21 @@ #ifndef __WINE_SHDOCVW_H #define __WINE_SHDOCVW_H -#include <wine/config.h> +#define COBJMACROS #include <stdarg.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <winreg.h> -#include <shlobj.h> +#include "ole2.h" +#include "shlobj.h" +#include "exdisp.h" -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +#include "wine/unicode.h" +#include "wine/heap.h" +#include "wine/list.h" /********************************************************************** * Shell Instance Objects @@ -54,17 +51,4 @@ extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN; static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } - -/* memory allocation functions */ - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_SHDOCVW_H */ diff --git a/dll/win32/shdocvw/shdocvw.rc b/dll/win32/shdocvw/shdocvw.rc index ba5c8ae8f3..b262a8d3cc 100644 --- a/dll/win32/shdocvw/shdocvw.rc +++ b/dll/win32/shdocvw/shdocvw.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> +#include "windef.h" 1 WINE_REGISTRY "shdocvw_v1.rgs" @@ -32,4 +32,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_PRODUCTVERSION_STR "6.0.2900.2180" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" diff --git a/dll/win32/shdocvw/shdocvw.spec b/dll/win32/shdocvw/shdocvw.spec index 55c81d1c4b..f90cd11c6f 100644 --- a/dll/win32/shdocvw/shdocvw.spec +++ b/dll/win32/shdocvw/shdocvw.spec @@ -29,8 +29,8 @@ 129 stub DoFileDownloadEx 130 stdcall -noname RunInstallUninstallStubs2(long) 131 stub -noname SHCreateSplashScreen -132 stub DoOrganizeFavDlg -133 stub DoOrganizeFavDlgW +132 stdcall DoOrganizeFavDlg(long str) +133 stdcall DoOrganizeFavDlgW(long wstr) 134 stub DoPrivacyDlg 135 stub -noname IsFileUrl 136 stub -noname IsFileUrlW diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index 8a4c8c0269..ef9e3a7dfb 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -20,10 +20,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#include "wine/unicode.h" +#include "wine/debug.h" + #include "shdocvw.h" -#include <shlwapi.h> -#include <wininet.h> +#include "winreg.h" +#include "shlwapi.h" +#include "wininet.h" +#include "isguids.h" + +#include "initguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); LONG SHDOCVW_refCount = 0; @@ -365,8 +379,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L HRESULT hr; DWORD needed; DWORD len; - DWORD res = 0; - + DWORD res; TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); @@ -392,10 +405,12 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L needed = lstrlenW(buffer_out)+1; TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed); + res = 0; if (*plen >= needed) { if (out != NULL) { lstrcpyW(out, buffer_out); - res++; + /* On success, 1 is returned for unicode version */ + res = 1; } needed--; } @@ -438,6 +453,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD if (*plen >= needed) { if (out != NULL) { WideCharToMultiByte(CP_ACP, 0, buffer, -1, out, *plen, NULL, NULL); + /* On success, string size including terminating 0 is returned for ansi version */ res = needed; } needed--; @@ -546,3 +562,32 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) FIXME("(%s) stub\n", debugstr_w(filename)); return FALSE; } + +/****************************************************************** + * DoOrganizeFavDlgW (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlgW(HWND hwnd, LPCWSTR initDir) +{ + FIXME("(%p %s) stub\n", hwnd, debugstr_w(initDir)); + return FALSE; +} + +/****************************************************************** + * DoOrganizeFavDlg (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlg(HWND hwnd, LPCSTR initDir) +{ + LPWSTR initDirW = NULL; + BOOL res; + + TRACE("(%p %s)\n", hwnd, debugstr_a(initDir)); + + if (initDir) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, initDir, -1, NULL, 0); + initDirW = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, initDir, -1, initDirW, len); + } + res = DoOrganizeFavDlgW(hwnd, initDirW); + heap_free(initDirW); + return res; +} diff --git a/dll/win32/shdocvw/shlinstobj.c b/dll/win32/shdocvw/shlinstobj.c index 1a4e2d2f56..9c3232c65e 100644 --- a/dll/win32/shdocvw/shlinstobj.c +++ b/dll/win32/shdocvw/shlinstobj.c @@ -23,8 +23,23 @@ * some registry entries. This feature was introduced with win2k. Please * search for 'Shell Instance Objects' on MSDN to get more information. */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "objbase.h" +#include "oleauto.h" + #include "shdocvw.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + #define CHARS_IN_GUID 39 /****************************************************************************** diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a360d2838e..23c4ed6176 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -171,7 +171,7 @@ reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-3.3 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to WineStaging-3.3 -reactos/dll/win32/shdocvw # Synced to Wine-3.0 +reactos/dll/win32/shdocvw # Synced to WineStaging-3.3 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-2.9 reactos/dll/win32/shlwapi # Synced to WineStaging-3.3
6 years, 9 months
1
0
0
0
01/01: [SHDOCLC] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d85a7bfbd665a4191d02…
commit 1d85a7bfbd665a4191d026280498c02387cd1848 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:23:29 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:23:29 2018 +0100 [SHDOCLC] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/shdoclc/rsrc.rc | 6 +----- dll/win32/shdoclc/shdoclc.h | 4 ++-- media/doc/README.WINE | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dll/win32/shdoclc/rsrc.rc b/dll/win32/shdoclc/rsrc.rc index 3e197a9b81..445bc2a94d 100644 --- a/dll/win32/shdoclc/rsrc.rc +++ b/dll/win32/shdoclc/rsrc.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 Jacek Caban + * Copyright 2005-2006 Jacek Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,10 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -//#include "winuser.h" -#include <mshtmcid.h> - #include "shdoclc.h" /* UTF-8 */ diff --git a/dll/win32/shdoclc/shdoclc.h b/dll/win32/shdoclc/shdoclc.h index cc0ab28d5c..b5492d6243 100644 --- a/dll/win32/shdoclc/shdoclc.h +++ b/dll/win32/shdoclc/shdoclc.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <windef.h> -//#include <mshtmcid.h> +#include <windef.h> +#include <mshtmcid.h> #define IDS_MESSAGE_BOX_TITLE 2213 diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0921d33275..a360d2838e 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -170,7 +170,7 @@ reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-3.3 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to WineStaging-2.9 +reactos/dll/win32/shdoclc # Synced to WineStaging-3.3 reactos/dll/win32/shdocvw # Synced to Wine-3.0 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-2.9
6 years, 9 months
1
0
0
0
01/01: [SENSAPI] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22d7799b346c5a162423d…
commit 22d7799b346c5a162423d1629296a9ee644373dd Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:22:47 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:22:47 2018 +0100 [SENSAPI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/sensapi/sensapi.c | 26 ++++++++++++-------------- media/doc/README.WINE | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dll/win32/sensapi/sensapi.c b/dll/win32/sensapi/sensapi.c index 209cc74487..0d2f2128ce 100644 --- a/dll/win32/sensapi/sensapi.c +++ b/dll/win32/sensapi/sensapi.c @@ -22,27 +22,25 @@ * connections. For Wine we just report that we are always connected. */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "config.h" #include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> #define COBJMACROS -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" -//#include "ole2.h" -//#include "sensevts.h" -#include <sensapi.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "ole2.h" +#include "sensevts.h" +#include "sensapi.h" -//#include "uuids.h" +#include "uuids.h" -//#include "wine/unicode.h" -#include <wine/debug.h> +#include "wine/unicode.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sensapi); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 1a61dfada4..0921d33275 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -168,7 +168,7 @@ reactos/dll/win32/schannel # Synced to WineStaging-3.3 reactos/dll/win32/scrrun # Synced to WineStaging-3.3 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to WineStaging-2.9 +reactos/dll/win32/sensapi # Synced to WineStaging-3.3 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to WineStaging-2.9 reactos/dll/win32/shdocvw # Synced to Wine-3.0
6 years, 9 months
1
0
0
0
01/01: [SCRRUN] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24c1f25a26d685be6a2a4…
commit 24c1f25a26d685be6a2a410d2ae8b8898a074106 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:22:03 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:22:03 2018 +0100 [SCRRUN] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/scrrun/CMakeLists.txt | 4 ++-- dll/win32/scrrun/dictionary.c | 22 ++++++++++++++++++---- dll/win32/scrrun/filesystem.c | 34 ++++++++++++++++++++++++++-------- dll/win32/scrrun/precomp.h | 27 +++++++++++++++++++++++++++ dll/win32/scrrun/scrrun.c | 18 ++++++++++++++++-- dll/win32/scrrun/scrrun_private.h | 34 ++-------------------------------- media/doc/README.WINE | 2 +- 7 files changed, 92 insertions(+), 49 deletions(-) diff --git a/dll/win32/scrrun/CMakeLists.txt b/dll/win32/scrrun/CMakeLists.txt index 1bafb176bf..d77282faf2 100644 --- a/dll/win32/scrrun/CMakeLists.txt +++ b/dll/win32/scrrun/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND SOURCE dictionary.c filesystem.c scrrun.c - scrrun_private.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c) list(APPEND scrrun_rc_deps @@ -29,5 +29,5 @@ add_dependencies(scrrun scrrun_idlheader stdole2) set_module_type(scrrun win32dll) target_link_libraries(scrrun uuid wine) add_importlibs(scrrun oleaut32 version advapi32 msvcrt kernel32 ntdll) -add_pch(scrrun scrrun_private.h SOURCE) +add_pch(scrrun precomp.h SOURCE) add_cd_file(TARGET scrrun DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/scrrun/dictionary.c b/dll/win32/scrrun/dictionary.c index 17810ce778..681274e321 100644 --- a/dll/win32/scrrun/dictionary.c +++ b/dll/win32/scrrun/dictionary.c @@ -16,13 +16,27 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "olectl.h" +#include "dispex.h" +#include "scrrun.h" #include "scrrun_private.h" -#include <olectl.h> -#include <wine/list.h> -#include <wine/port.h> -#include <wine/unicode.h> +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/heap.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scrrun); #define BUCKET_COUNT 509 #define DICT_HASH_MOD 1201 diff --git a/dll/win32/scrrun/filesystem.c b/dll/win32/scrrun/filesystem.c index 45370e1e39..7a162a2776 100644 --- a/dll/win32/scrrun/filesystem.c +++ b/dll/win32/scrrun/filesystem.c @@ -16,12 +16,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> +#include <limits.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "olectl.h" +#include "dispex.h" +#include "ntsecapi.h" +#include "scrrun.h" #include "scrrun_private.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/heap.h" + +#ifdef __REACTOS__ #include <winver.h> -#include <olectl.h> -#include <ntsecapi.h> -#include <wine/unicode.h> +#endif + +WINE_DEFAULT_DEBUG_CHANNEL(scrrun); static const WCHAR bsW[] = {'\\',0}; static const WCHAR utf16bom = 0xfeff; @@ -987,7 +1005,7 @@ static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) return E_POINTER; *name = NULL; - ret = GetVolumeInformationW(This->root, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, NULL, NULL, NULL, 0); + ret = GetVolumeInformationW(This->root, nameW, ARRAY_SIZE(nameW), NULL, NULL, NULL, NULL, 0); if (ret) *name = SysAllocString(nameW); return ret ? S_OK : E_FAIL; @@ -1012,7 +1030,7 @@ static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) return E_POINTER; *fs = NULL; - ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, sizeof(nameW)/sizeof(WCHAR)); + ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, ARRAY_SIZE(nameW)); if (ret) *fs = SysAllocString(nameW); return ret ? S_OK : E_FAIL; @@ -3427,13 +3445,13 @@ static HRESULT WINAPI filesys_GetSpecialFolder(IFileSystem3 *iface, switch (SpecialFolder) { case WindowsFolder: - ret = GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + ret = GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); break; case SystemFolder: - ret = GetSystemDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); + ret = GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); break; case TemporaryFolder: - ret = GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + ret = GetTempPathW(ARRAY_SIZE(pathW), pathW); /* we don't want trailing backslash */ if (ret && pathW[ret-1] == '\\') pathW[ret-1] = 0; diff --git a/dll/win32/scrrun/precomp.h b/dll/win32/scrrun/precomp.h new file mode 100644 index 0000000000..6832cbfa94 --- /dev/null +++ b/dll/win32/scrrun/precomp.h @@ -0,0 +1,27 @@ + +#ifndef _SCRRUN_PRECOMP_H_ +#define _SCRRUN_PRECOMP_H_ + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <objbase.h> +#include <oleauto.h> +#include <dispex.h> +#include <scrrun.h> + +#include <wine/debug.h> + +#include "scrrun_private.h" + +#endif /* !_SCRRUN_PRECOMP_H_ */ diff --git a/dll/win32/scrrun/scrrun.c b/dll/win32/scrrun/scrrun.c index 946f8b71ec..8c60c8072f 100644 --- a/dll/win32/scrrun/scrrun.c +++ b/dll/win32/scrrun/scrrun.c @@ -15,10 +15,24 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "olectl.h" +#include "rpcproxy.h" + +#include <initguid.h> +#include "scrrun.h" #include "scrrun_private.h" -#include <rpcproxy.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scrrun); static HINSTANCE scrrun_instance; @@ -166,7 +180,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); diff --git a/dll/win32/scrrun/scrrun_private.h b/dll/win32/scrrun/scrrun_private.h index 69ff610a45..d9ff2416a5 100644 --- a/dll/win32/scrrun/scrrun_private.h +++ b/dll/win32/scrrun/scrrun_private.h @@ -15,30 +15,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #ifndef _SCRRUN_PRIVATE_H_ #define _SCRRUN_PRIVATE_H_ -#include <wine/config.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <objbase.h> -#include <oleauto.h> -#include <dispex.h> -#include <scrrun.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; @@ -68,14 +48,4 @@ struct provideclassinfo { extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - -#endif /* _SCRRUN_PRIVATE_H_ */ +#endif diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5283c09505..1a61dfada4 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -165,7 +165,7 @@ reactos/dll/win32/rsabase # Synced to WineStaging-3.3 reactos/dll/win32/rsaenh # Synced to WineStaging-2.9 reactos/dll/win32/sccbase # Synced to WineStaging-3.3 reactos/dll/win32/schannel # Synced to WineStaging-3.3 -reactos/dll/win32/scrrun # Synced to WineStaging-2.9 +reactos/dll/win32/scrrun # Synced to WineStaging-3.3 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-2.9
6 years, 9 months
1
0
0
0
01/01: [SCHANNEL_WINETEST] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1d57446f8365323dc8c3…
commit e1d57446f8365323dc8c316c935d8534603c8acc Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:21:22 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:21:22 2018 +0100 [SCHANNEL_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/schannel/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/schannel/main.c b/modules/rostests/winetests/schannel/main.c index 4240dd76cb..fc913c14a9 100644 --- a/modules/rostests/winetests/schannel/main.c +++ b/modules/rostests/winetests/schannel/main.c @@ -213,12 +213,17 @@ static void testGetInfo(void) pTables = getNextSecPkgTable(pTables, Version); if (!pTables) return; + if (!pTables->GetInfo) + { + win_skip("GetInfo function missing\n"); + return; + } status = pTables->GetInfo(&PackageInfo); - ok(status == STATUS_SUCCESS || + ok(SUCCEEDED(status) || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ "status: 0x%x\n", status); - if (status == STATUS_SUCCESS) + if (SUCCEEDED(status)) { ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH),
6 years, 9 months
1
0
0
0
01/01: [SCHANNEL] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5f897f2199384078cc7d…
commit b5f897f2199384078cc7d7c3240c49e815c2c328 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:20:45 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:20:45 2018 +0100 [SCHANNEL] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/schannel/lsamode.c | 15 +++++++++++++-- dll/win32/schannel/precomp.h | 10 ++++------ dll/win32/schannel/schannel_main.c | 16 +++++++++++++++- dll/win32/schannel/schannel_mbedtls.c | 2 ++ dll/win32/schannel/schannel_wine.c | 2 ++ dll/win32/schannel/secur32_wine.c | 2 ++ dll/win32/schannel/usermode.c | 14 +++++++++++++- dll/win32/schannel/version.rc | 2 +- media/doc/README.WINE | 2 +- 9 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dll/win32/schannel/lsamode.c b/dll/win32/schannel/lsamode.c index f00cff11ec..96ca240c08 100644 --- a/dll/win32/schannel/lsamode.c +++ b/dll/win32/schannel/lsamode.c @@ -18,9 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> -#include <schannel.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "sspi.h" +#include "ntsecapi.h" +#include "ntsecpkg.h" +#include "schannel.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schannel); /*********************************************************************** * SpGetInfoUnified diff --git a/dll/win32/schannel/precomp.h b/dll/win32/schannel/precomp.h index 7c18e61d89..e2de158fcd 100644 --- a/dll/win32/schannel/precomp.h +++ b/dll/win32/schannel/precomp.h @@ -1,3 +1,4 @@ + #ifndef _SCHANNEL_PCH_ #define _SCHANNEL_PCH_ @@ -15,15 +16,12 @@ #include <sspi.h> #include <ntsecapi.h> #include <ntsecpkg.h> - #include <schannel.h> -#include <wine/list.h> -#include "schannel_priv.h" - #include <wine/debug.h> +#include <wine/list.h> #include <wine/unicode.h> -WINE_DEFAULT_DEBUG_CHANNEL(schannel); +#include "schannel_priv.h" -#endif /* _SCHANNEL_PCH_ */ +#endif /* !_SCHANNEL_PCH_ */ diff --git a/dll/win32/schannel/schannel_main.c b/dll/win32/schannel/schannel_main.c index 16a5fec3da..546ad14756 100644 --- a/dll/win32/schannel/schannel_main.c +++ b/dll/win32/schannel/schannel_main.c @@ -18,7 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +#ifdef __REACTOS__ +#include <sspi.h> +#include <schannel.h> +#include <wine/list.h> +#include "schannel_priv.h" +#endif + +WINE_DEFAULT_DEBUG_CHANNEL(schannel); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dll/win32/schannel/schannel_mbedtls.c b/dll/win32/schannel/schannel_mbedtls.c index 64e8655a07..e23bf89fa0 100644 --- a/dll/win32/schannel/schannel_mbedtls.c +++ b/dll/win32/schannel/schannel_mbedtls.c @@ -36,6 +36,8 @@ #include "wine/library.h" #endif +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + #if defined(SONAME_LIBMBEDTLS) && !defined(HAVE_SECURITY_SECURITY_H) && !defined(SONAME_LIBGNUTLS) #include <mbedtls/ssl.h> diff --git a/dll/win32/schannel/schannel_wine.c b/dll/win32/schannel/schannel_wine.c index ed0754a3ff..540b075807 100644 --- a/dll/win32/schannel/schannel_wine.c +++ b/dll/win32/schannel/schannel_wine.c @@ -22,6 +22,8 @@ #include <wine/config.h> +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + #if defined(SONAME_LIBGNUTLS) || defined (HAVE_SECURITY_SECURITY_H) || defined (SONAME_LIBMBEDTLS) #define SCHAN_INVALID_HANDLE ~0UL diff --git a/dll/win32/schannel/secur32_wine.c b/dll/win32/schannel/secur32_wine.c index 48ba2c9174..c64616a502 100644 --- a/dll/win32/schannel/secur32_wine.c +++ b/dll/win32/schannel/secur32_wine.c @@ -21,6 +21,8 @@ #include <assert.h> +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + typedef struct _SecurePackageTable { DWORD numPackages; diff --git a/dll/win32/schannel/usermode.c b/dll/win32/schannel/usermode.c index 2efa3f39d4..0713f822f9 100644 --- a/dll/win32/schannel/usermode.c +++ b/dll/win32/schannel/usermode.c @@ -18,7 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "sspi.h" +#include "ntsecapi.h" +#include "ntsecpkg.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schannel); static SECPKG_USER_FUNCTION_TABLE secPkgUserTables[2] = { { diff --git a/dll/win32/schannel/version.rc b/dll/win32/schannel/version.rc index 95a12d7f72..0b41bd5d7d 100644 --- a/dll/win32/schannel/version.rc +++ b/dll/win32/schannel/version.rc @@ -23,4 +23,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,2180 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 884d6e047d..5283c09505 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -164,7 +164,7 @@ reactos/dll/win32/rpcrt4 # Synced to WineStaging-3.3 reactos/dll/win32/rsabase # Synced to WineStaging-3.3 reactos/dll/win32/rsaenh # Synced to WineStaging-2.9 reactos/dll/win32/sccbase # Synced to WineStaging-3.3 -reactos/dll/win32/schannel # Synced to WineStaging-2.9 +reactos/dll/win32/schannel # Synced to WineStaging-3.3 reactos/dll/win32/scrrun # Synced to WineStaging-2.9 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec)
6 years, 9 months
1
0
0
0
01/01: [SCCBASE] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97ac90d7ca0e2d0db63a8…
commit 97ac90d7ca0e2d0db63a8f1fedeaf42b9f9d505e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Fri Mar 23 12:19:48 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Fri Mar 23 12:19:48 2018 +0100 [SCCBASE] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/sccbase/main.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dll/win32/sccbase/main.c b/dll/win32/sccbase/main.c index 51713dc081..1fb221f340 100644 --- a/dll/win32/sccbase/main.c +++ b/dll/win32/sccbase/main.c @@ -16,15 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "config.h" #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sccbase); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 47689385cf..884d6e047d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -163,7 +163,7 @@ reactos/dll/win32/riched32 # Synced to WineStaging-3.3 reactos/dll/win32/rpcrt4 # Synced to WineStaging-3.3 reactos/dll/win32/rsabase # Synced to WineStaging-3.3 reactos/dll/win32/rsaenh # Synced to WineStaging-2.9 -reactos/dll/win32/sccbase # Synced to WineStaging-2.9 +reactos/dll/win32/sccbase # Synced to WineStaging-3.3 reactos/dll/win32/schannel # Synced to WineStaging-2.9 reactos/dll/win32/scrrun # Synced to WineStaging-2.9 reactos/dll/win32/secur32 # Forked
6 years, 9 months
1
0
0
0
← Newer
1
...
15
16
17
18
19
20
21
...
44
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
Results per page:
10
25
50
100
200