mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 10:04:49 +00:00
[MSCMS] Sync with Wine Staging 3.3. CORE-14434
This commit is contained in:
parent
6244404e01
commit
8123ffac58
7 changed files with 61 additions and 67 deletions
|
@ -18,18 +18,18 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <wine/debug.h>
|
||||
#include "config.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
//#include <stdarg.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
//#include "wingdi.h"
|
||||
//#include "winuser.h"
|
||||
//#include "icm.h"
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "winuser.h"
|
||||
#include "icm.h"
|
||||
|
||||
//#include "mscms_priv.h"
|
||||
#include "mscms_priv.h"
|
||||
|
||||
#ifdef HAVE_LCMS2
|
||||
|
||||
|
|
|
@ -18,18 +18,18 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "config.h"
|
||||
|
||||
//#include <stdarg.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
//#include "wingdi.h"
|
||||
//#include "winuser.h"
|
||||
//#include "winternl.h"
|
||||
//#include "icm.h"
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "winuser.h"
|
||||
#include "wine/winternl.h"
|
||||
#include "icm.h"
|
||||
|
||||
//#include "mscms_priv.h"
|
||||
#include "mscms_priv.h"
|
||||
|
||||
#ifdef HAVE_LCMS2
|
||||
|
||||
|
|
|
@ -18,21 +18,21 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "config.h"
|
||||
|
||||
//#include "wine/port.h"
|
||||
#include <wine/debug.h>
|
||||
#include <wine/library.h>
|
||||
#include "wine/port.h"
|
||||
#include "wine/debug.h"
|
||||
#include "wine/library.h"
|
||||
|
||||
//#include <stdarg.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
//#include "wingdi.h"
|
||||
//#include "winuser.h"
|
||||
//#include "icm.h"
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "winuser.h"
|
||||
#include "icm.h"
|
||||
|
||||
//#include "mscms_priv.h"
|
||||
#include "mscms_priv.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(mscms);
|
||||
|
||||
|
|
|
@ -18,24 +18,22 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#include "config.h"
|
||||
#include "wine/debug.h"
|
||||
#include "wine/unicode.h"
|
||||
|
||||
#include <config.h>
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
//#include <stdarg.h>
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winnls.h"
|
||||
#include "wingdi.h"
|
||||
#include "winuser.h"
|
||||
#include "winreg.h"
|
||||
#include "shlwapi.h"
|
||||
#include "icm.h"
|
||||
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
//#include "winnls.h"
|
||||
#include <wingdi.h>
|
||||
#include <winuser.h>
|
||||
#include <winreg.h>
|
||||
//#include "shlwapi.h"
|
||||
#include <icm.h>
|
||||
|
||||
//#include "mscms_priv.h"
|
||||
#include "mscms_priv.h"
|
||||
|
||||
static void basename( LPCWSTR path, LPWSTR name )
|
||||
{
|
||||
|
|
|
@ -18,18 +18,16 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#include "config.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
#include <config.h>
|
||||
#include <wine/debug.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
//#include <stdarg.h>
|
||||
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
#include <wingdi.h>
|
||||
#include <winuser.h>
|
||||
#include <icm.h>
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "winuser.h"
|
||||
#include "icm.h"
|
||||
|
||||
#include "mscms_priv.h"
|
||||
|
||||
|
|
|
@ -18,21 +18,19 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#include "config.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
#include <config.h>
|
||||
#include <wine/debug.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
//#include <stdarg.h>
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winnls.h"
|
||||
#include "wingdi.h"
|
||||
#include "winuser.h"
|
||||
#include "icm.h"
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winnls.h>
|
||||
#include <wingdi.h>
|
||||
#include <winuser.h>
|
||||
#include <icm.h>
|
||||
|
||||
//#include "mscms_priv.h"
|
||||
#include "mscms_priv.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(mscms);
|
||||
|
||||
|
|
|
@ -104,7 +104,7 @@ reactos/dll/win32/msacm32 # Synced to WineStaging-3.3
|
|||
reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3
|
||||
reactos/dll/win32/msadp32.acm # Synced to WineStaging-3.3
|
||||
reactos/dll/win32/mscat32 # Synced to WineStaging-3.3
|
||||
reactos/dll/win32/mscms # Synced to WineStaging-2.9
|
||||
reactos/dll/win32/mscms # Synced to WineStaging-3.3
|
||||
reactos/dll/win32/mscoree # Synced to Wine-1.5.4
|
||||
reactos/dll/win32/msctf # Synced to WineStaging-2.9
|
||||
reactos/dll/win32/msftedit # Synced to WineStaging-2.9
|
||||
|
|
Loading…
Reference in a new issue