Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [PSTOREC] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80b69aa034096632f9ec9… commit 80b69aa034096632f9ec9e24d423cf738559381b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 13:11:14 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 13:11:14 2018 +0100 [PSTOREC] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/pstorec/pstorec.c | 19 ++++++++----------- media/doc/README.WINE | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dll/win32/pstorec/pstorec.c b/dll/win32/pstorec/pstorec.c index 88fa802305..02cd803c11 100644 --- a/dll/win32/pstorec/pstorec.c +++ b/dll/win32/pstorec/pstorec.c @@ -18,20 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #include <stdarg.h> #define COBJMACROS -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <pstore.h> - -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "initguid.h" +#include "ole2.h" +#include "pstore.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(pstores); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 94973e6bf2..32a7264789 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -152,7 +152,7 @@ reactos/dll/win32/pidgen # Synced to WineStaging-3.3 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-3.3 reactos/dll/win32/propsys # Synced to WineStaging-3.3 -reactos/dll/win32/pstorec # Synced to WineStaging-2.2 +reactos/dll/win32/pstorec # Synced to WineStaging-3.3 reactos/dll/win32/qmgr # Synced to WineStaging-2.9 reactos/dll/win32/qmgrprxy # Synced to WineStaging-2.9 reactos/dll/win32/query # Synced to WineStaging-2.9

6 years, 7 months

01/01: [PROPSYS_WINETEST] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e270fbfd8d9bc917a7a1b… commit e270fbfd8d9bc917a7a1bb63348604c49fd028a4 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 13:10:09 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 13:10:09 2018 +0100 [PROPSYS_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/propsys/propstore.c | 18 ++-- modules/rostests/winetests/propsys/propsys.c | 124 ++++++++++++++++++++++--- 2 files changed, 116 insertions(+), 26 deletions(-) diff --git a/modules/rostests/winetests/propsys/propstore.c b/modules/rostests/winetests/propsys/propstore.c index 78c1979bff..01500dd3f9 100644 --- a/modules/rostests/winetests/propsys/propstore.c +++ b/modules/rostests/winetests/propsys/propstore.c @@ -18,24 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define COBJMACROS #include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> #define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <propsys.h> -#include <wine/test.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "propsys.h" +#include "wine/test.h" -#include <initguid.h> +#include "initguid.h" DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); diff --git a/modules/rostests/winetests/propsys/propsys.c b/modules/rostests/winetests/propsys/propsys.c index f226c164eb..a6c7023527 100644 --- a/modules/rostests/winetests/propsys/propsys.c +++ b/modules/rostests/winetests/propsys/propsys.c @@ -19,27 +19,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define COBJMACROS -//#include <stdarg.h> +#include <stdarg.h> #include <stdio.h> #define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <winnls.h> -//#include "objbase.h" -#include <ole2.h> -#include <initguid.h> -#include <propsys.h> -#include <propvarutil.h> -#include <wine/test.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "initguid.h" +#include "propsys.h" +#include "propvarutil.h" +#include "wine/test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(dummy_guid, 0xdeadbeef, 0xdead, 0xbeef, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0xba, 0xbe); @@ -1101,6 +1094,106 @@ static void test_PropVariantToBoolean(void) ok(val == TRUE, "Unexpected value %d\n", val); } +static void test_PropVariantToStringWithDefault(void) +{ + PROPVARIANT propvar; + static WCHAR default_value[] = {'t', 'e', 's', 't', 0}; + static WCHAR wstr_test2[] = {'t', 'e', 's', 't', '2', 0}; + static WCHAR wstr_empty[] = {0}; + static WCHAR wstr_space[] = {' ', 0}; + static CHAR str_test2[] = "test2"; + static CHAR str_empty[] = ""; + static CHAR str_space[] = " "; + LPCWSTR result; + + propvar.vt = VT_EMPTY; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BOOL; + propvar.u.boolVal = VARIANT_TRUE; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_I4; + propvar.u.lVal = 15; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPWSTR */ + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_empty, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_space, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_test2, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPSTR */ + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_BSTR */ + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_empty); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_space); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_space), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_test2); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_test2), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); +} + static void test_PropVariantChangeType_LPWSTR(void) { PROPVARIANT dest, src; @@ -1150,4 +1243,5 @@ START_TEST(propsys) test_intconversions(); test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); + test_PropVariantToStringWithDefault(); }

6 years, 7 months

01/01: [PROPSYS] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e3d28dfef501b75850ed… commit 3e3d28dfef501b75850ed5091c497742e3e0d0dc Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 13:09:31 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 13:09:31 2018 +0100 [PROPSYS] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/propsys/CMakeLists.txt | 4 ++-- dll/win32/propsys/precomp.h | 26 +++++++++++++++++++++++ dll/win32/propsys/propstore.c | 20 +++++++++++++++--- dll/win32/propsys/propsys.spec | 2 +- dll/win32/propsys/propsys_main.c | 15 +++++++++++++- dll/win32/propsys/propsys_private.h | 26 +---------------------- dll/win32/propsys/propvar.c | 41 +++++++++++++++++++++++++++++++++---- media/doc/README.WINE | 2 +- 8 files changed, 99 insertions(+), 37 deletions(-) diff --git a/dll/win32/propsys/CMakeLists.txt b/dll/win32/propsys/CMakeLists.txt index 1c60f7b926..7b61789aa2 100644 --- a/dll/win32/propsys/CMakeLists.txt +++ b/dll/win32/propsys/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE propstore.c propsys_main.c propvar.c - propsys_private.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c) add_library(propsys SHARED @@ -18,5 +18,5 @@ add_library(propsys SHARED set_module_type(propsys win32dll) target_link_libraries(propsys uuid wine) add_importlibs(propsys ole32 oleaut32 msvcrt kernel32 ntdll) -add_pch(propsys propsys_private.h SOURCE) +add_pch(propsys precomp.h SOURCE) add_cd_file(TARGET propsys DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/propsys/precomp.h b/dll/win32/propsys/precomp.h new file mode 100644 index 0000000000..74eabdd3cf --- /dev/null +++ b/dll/win32/propsys/precomp.h @@ -0,0 +1,26 @@ + +#ifndef _PROPSYS_PRECOMP_H_ +#define _PROPSYS_PRECOMP_H_ + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <propsys.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "propsys_private.h" + +#endif /* !_PROPSYS_PRECOMP_H_ */ diff --git a/dll/win32/propsys/propstore.c b/dll/win32/propsys/propstore.c index 9669fef0b4..9c848fcaba 100644 --- a/dll/win32/propsys/propstore.c +++ b/dll/win32/propsys/propstore.c @@ -18,13 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "propsys_private.h" +#define COBJMACROS +#include "config.h" + +#include <stdarg.h> -#include <wine/list.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "propsys.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" + +#include "initguid.h" +#include "propsys_private.h" -#include <initguid.h> DEFINE_GUID(FMTID_NamedProperties, 0xd5cdd505, 0x2e9c, 0x101b, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae); +WINE_DEFAULT_DEBUG_CHANNEL(propsys); + typedef struct { struct list entry; DWORD pid; diff --git a/dll/win32/propsys/propsys.spec b/dll/win32/propsys/propsys.spec index 2ee71ba370..791618e5f5 100644 --- a/dll/win32/propsys/propsys.spec +++ b/dll/win32/propsys/propsys.spec @@ -138,7 +138,7 @@ @ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc -@ stub PropVariantToStringWithDefault +@ stdcall PropVariantToStringWithDefault(ptr wstr) @ stdcall PropVariantToUInt16(ptr ptr) @ stub PropVariantToUInt16Vector @ stub PropVariantToUInt16VectorAlloc diff --git a/dll/win32/propsys/propsys_main.c b/dll/win32/propsys/propsys_main.c index de4e24fd41..7631023b83 100644 --- a/dll/win32/propsys/propsys_main.c +++ b/dll/win32/propsys/propsys_main.c @@ -19,9 +19,22 @@ * 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 "objbase.h" +#include "rpcproxy.h" +#include "propsys.h" +#include "wine/debug.h" +#include "wine/unicode.h" + #include "propsys_private.h" -#include <rpcproxy.h> +WINE_DEFAULT_DEBUG_CHANNEL(propsys); static HINSTANCE propsys_hInstance; diff --git a/dll/win32/propsys/propsys_private.h b/dll/win32/propsys/propsys_private.h index 8cb748b8a8..d43de7534d 100644 --- a/dll/win32/propsys/propsys_private.h +++ b/dll/win32/propsys/propsys_private.h @@ -18,30 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _PROPSYS_PRIVATE_H_ -#define _PROPSYS_PRIVATE_H_ - -#include <config.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <propsys.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(propsys); +#pragma once HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN; - -#endif /* _PROPSYS_PRIVATE_H_ */ diff --git a/dll/win32/propsys/propvar.c b/dll/win32/propsys/propvar.c index 4b9292eecb..f0877329af 100644 --- a/dll/win32/propsys/propvar.c +++ b/dll/win32/propsys/propvar.c @@ -18,12 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "propsys_private.h" +#include "config.h" +#include "wine/port.h" +#include <stdarg.h> #include <stdio.h> -#include <winreg.h> -#include <oleauto.h> -#include <propvarutil.h> +#include <stdlib.h> + +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winreg.h" +#include "winuser.h" +#include "shlobj.h" +#include "propvarutil.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(propsys); static HRESULT PROPVAR_ConvertFILETIME(const FILETIME *ft, PROPVARIANT *ppropvarDest, VARTYPE vt) { @@ -322,6 +337,24 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) return hr; } +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault) +{ + static const WCHAR str_empty[] = {0}; + if (propvarIn->vt == VT_BSTR) + { + if (propvarIn->u.bstrVal == NULL) + return str_empty; + + return propvarIn->u.bstrVal; + } + + if (propvarIn->vt == VT_LPWSTR && propvarIn->u.pwszVal != NULL) + return propvarIn->u.pwszVal; + + return pszDefault; +} + + /****************************************************************** * PropVariantChangeType (PROPSYS.@) */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a6afb21f40..94973e6bf2 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -151,7 +151,7 @@ reactos/dll/win32/pdh # Synced to WineStaging-3.3 reactos/dll/win32/pidgen # Synced to WineStaging-3.3 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-3.3 -reactos/dll/win32/propsys # Synced to Wine-3.0 +reactos/dll/win32/propsys # Synced to WineStaging-3.3 reactos/dll/win32/pstorec # Synced to WineStaging-2.2 reactos/dll/win32/qmgr # Synced to WineStaging-2.9 reactos/dll/win32/qmgrprxy # Synced to WineStaging-2.9

6 years, 7 months

01/01: [PSDK] Update propvarutil.h. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94e293b6fda0876c28a12… commit 94e293b6fda0876c28a124b9ea72d7229f504bde Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 13:08:15 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 13:08:15 2018 +0100 [PSDK] Update propvarutil.h. CORE-14434 --- sdk/include/psdk/propvarutil.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/propvarutil.h b/sdk/include/psdk/propvarutil.h index 4dc3521a02..ced51ec295 100644 --- a/sdk/include/psdk/propvarutil.h +++ b/sdk/include/psdk/propvarutil.h @@ -77,6 +77,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);

6 years, 7 months

01/01: [PRINTUI] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28a3cf7b47254d9ff1a87… commit 28a3cf7b47254d9ff1a87700d1c1d3bf7807b861 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 13:07:10 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 13:07:10 2018 +0100 [PRINTUI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/printui/printui.c | 29 ++++++++++++----------------- dll/win32/printui/printui.rc | 4 ++-- media/doc/README.WINE | 2 +- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dll/win32/printui/printui.c b/dll/win32/printui/printui.c index f47e8f67db..32e7b52e3d 100644 --- a/dll/win32/printui/printui.c +++ b/dll/win32/printui/printui.c @@ -18,26 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" -//#include "winreg.h" -//#include "winver.h" -//#include "winnls.h" -#include <shellapi.h> - -#include <wine/unicode.h> -#include <wine/debug.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winver.h" +#include "winnls.h" +#include "shellapi.h" + +#include "wine/unicode.h" +#include "wine/debug.h" #include "printui_private.h" WINE_DEFAULT_DEBUG_CHANNEL(printui); diff --git a/dll/win32/printui/printui.rc b/dll/win32/printui/printui.rc index 1deadb19e8..bfbae9820a 100644 --- a/dll/win32/printui/printui.rc +++ b/dll/win32/printui/printui.rc @@ -19,7 +19,7 @@ * */ -//#include "winver.h" +#include "winver.h" #define WINE_FILENAME_STR "printui.dll" #define WINE_FILEDESCRIPTION_STR "User Interface for Printing" @@ -31,4 +31,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 9b77c6c519..a6afb21f40 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -150,7 +150,7 @@ reactos/dll/win32/olethk32 # Synced to WineStaging-3.3 reactos/dll/win32/pdh # Synced to WineStaging-3.3 reactos/dll/win32/pidgen # Synced to WineStaging-3.3 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to WineStaging-2.9 +reactos/dll/win32/printui # Synced to WineStaging-3.3 reactos/dll/win32/propsys # Synced to Wine-3.0 reactos/dll/win32/pstorec # Synced to WineStaging-2.2 reactos/dll/win32/qmgr # Synced to WineStaging-2.9

6 years, 7 months

01/01: [PIDGEN] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0e5146422a0585842db8… commit c0e5146422a0585842db806e801408aaa4735990 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 13:05:31 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 13:05:31 2018 +0100 [PIDGEN] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/pidgen/main.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dll/win32/pidgen/main.c b/dll/win32/pidgen/main.c index dfd77f8004..3aa3e84444 100644 --- a/dll/win32/pidgen/main.c +++ b/dll/win32/pidgen/main.c @@ -16,14 +16,12 @@ * 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(pidgen); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a9a74aa607..9b77c6c519 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -148,7 +148,7 @@ reactos/dll/win32/olepro32 # Synced to WineStaging-3.3 reactos/dll/win32/olesvr32 # Synced to WineStaging-3.3 reactos/dll/win32/olethk32 # Synced to WineStaging-3.3 reactos/dll/win32/pdh # Synced to WineStaging-3.3 -reactos/dll/win32/pidgen # Synced to WineStaging-2.9 +reactos/dll/win32/pidgen # Synced to WineStaging-3.3 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-2.9 reactos/dll/win32/propsys # Synced to Wine-3.0

6 years, 7 months

01/01: [PDH] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acca9f5810d22b8af8384… commit acca9f5810d22b8af8384aa11b336120451c03b1 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 13:04:47 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 13:04:47 2018 +0100 [PDH] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/pdh/pdh_main.c | 36 ++++++++++-------------------------- media/doc/README.WINE | 2 +- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/dll/win32/pdh/pdh_main.c b/dll/win32/pdh/pdh_main.c index 3a3f882d16..fb131bd354 100644 --- a/dll/win32/pdh/pdh_main.c +++ b/dll/win32/pdh/pdh_main.c @@ -19,23 +19,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <stdarg.h> #include <math.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -#include <pdh.h> -#include <pdhmsg.h> -//#include "winperf.h" +#include "windef.h" +#include "winbase.h" + +#include "pdh.h" +#include "pdhmsg.h" +#include "winperf.h" -#include <wine/debug.h> -#include <wine/list.h> -#include <wine/unicode.h> +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(pdh); @@ -49,21 +48,6 @@ static CRITICAL_SECTION_DEBUG pdh_handle_cs_debug = }; static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 }; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *pdh_strdup( const WCHAR *src ) { WCHAR *dst; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5a0d98b04c..a9a74aa607 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -147,7 +147,7 @@ reactos/dll/win32/oledlg # Synced to WineStaging-3.3 reactos/dll/win32/olepro32 # Synced to WineStaging-3.3 reactos/dll/win32/olesvr32 # Synced to WineStaging-3.3 reactos/dll/win32/olethk32 # Synced to WineStaging-3.3 -reactos/dll/win32/pdh # Synced to WineStaging-2.9 +reactos/dll/win32/pdh # Synced to WineStaging-3.3 reactos/dll/win32/pidgen # Synced to WineStaging-2.9 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-2.9

6 years, 7 months

01/01: [OLETHK32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f03366e3eb080be418282… commit f03366e3eb080be41828243eebb7e4c69f485a1e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 13:00:35 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 13:00:35 2018 +0100 [OLETHK32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/olethk32/main.c | 8 +++----- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dll/win32/olethk32/main.c b/dll/win32/olethk32/main.c index 89fb7ee538..13de72eb19 100644 --- a/dll/win32/olethk32/main.c +++ b/dll/win32/olethk32/main.c @@ -16,12 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #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(olethk32); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index fe18ef70bd..5a0d98b04c 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -146,7 +146,7 @@ reactos/dll/win32/olecli32 # Synced to WineStaging-3.3 reactos/dll/win32/oledlg # Synced to WineStaging-3.3 reactos/dll/win32/olepro32 # Synced to WineStaging-3.3 reactos/dll/win32/olesvr32 # Synced to WineStaging-3.3 -reactos/dll/win32/olethk32 # Synced to WineStaging-2.9 +reactos/dll/win32/olethk32 # Synced to WineStaging-3.3 reactos/dll/win32/pdh # Synced to WineStaging-2.9 reactos/dll/win32/pidgen # Synced to WineStaging-2.9 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5

6 years, 7 months

01/01: [OLESVR32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cca3488a9b3cc5bf18d9… commit 6cca3488a9b3cc5bf18d9115879bb705dbad9a65 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 12:59:37 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 12:59:37 2018 +0100 [OLESVR32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/olesvr32/olesvr_main.c | 12 ++++++------ media/doc/README.WINE | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/olesvr32/olesvr_main.c b/dll/win32/olesvr32/olesvr_main.c index 959ec61f83..57c28e1b9b 100644 --- a/dll/win32/olesvr32/olesvr_main.c +++ b/dll/win32/olesvr32/olesvr_main.c @@ -21,14 +21,14 @@ /* At the moment, these are only empty stubs. */ -#include <config.h> +#include "config.h" -//#include <stdarg.h> +#include <stdarg.h> -//#include "windef.h" -//#include "winbase.h" -//#include "objbase.h" -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0d7ff3c93d..fe18ef70bd 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -145,7 +145,7 @@ reactos/dll/win32/oleaut32 # Synced to WineStaging-3.3 reactos/dll/win32/olecli32 # Synced to WineStaging-3.3 reactos/dll/win32/oledlg # Synced to WineStaging-3.3 reactos/dll/win32/olepro32 # Synced to WineStaging-3.3 -reactos/dll/win32/olesvr32 # Synced to WineStaging-2.9 +reactos/dll/win32/olesvr32 # Synced to WineStaging-3.3 reactos/dll/win32/olethk32 # Synced to WineStaging-2.9 reactos/dll/win32/pdh # Synced to WineStaging-2.9 reactos/dll/win32/pidgen # Synced to WineStaging-2.9

6 years, 7 months

01/01: [OLEPRO32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b79d65111d5f8d5dbe79d… commit b79d65111d5f8d5dbe79d3af77d55f6682d460ae Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Wed Mar 21 12:58:44 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Wed Mar 21 12:58:44 2018 +0100 [OLEPRO32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/olepro32/olepro32stubs.c | 12 ++++++------ dll/win32/olepro32/version.rc | 2 +- media/doc/README.WINE | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/olepro32/olepro32stubs.c b/dll/win32/olepro32/olepro32stubs.c index 037b68f168..70bf5c870b 100644 --- a/dll/win32/olepro32/olepro32stubs.c +++ b/dll/win32/olepro32/olepro32stubs.c @@ -20,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> +#include <stdarg.h> -#include <wine/debug.h> -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "ole2.h" +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dll/win32/olepro32/version.rc b/dll/win32/olepro32/version.rc index 9806d1790e..b212206f13 100644 --- a/dll/win32/olepro32/version.rc +++ b/dll/win32/olepro32/version.rc @@ -27,4 +27,4 @@ #define WINE_PRODUCTVERSION_STR "2.40" #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 a577454652..0d7ff3c93d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -144,7 +144,7 @@ reactos/dll/win32/oleacc # Synced to WineStaging-3.3 reactos/dll/win32/oleaut32 # Synced to WineStaging-3.3 reactos/dll/win32/olecli32 # Synced to WineStaging-3.3 reactos/dll/win32/oledlg # Synced to WineStaging-3.3 -reactos/dll/win32/olepro32 # Synced to WineStaging-2.9 +reactos/dll/win32/olepro32 # Synced to WineStaging-3.3 reactos/dll/win32/olesvr32 # Synced to WineStaging-2.9 reactos/dll/win32/olethk32 # Synced to WineStaging-2.9 reactos/dll/win32/pdh # Synced to WineStaging-2.9

6 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2018