Author: tfaber
Date: Wed Jun 20 22:57:37 2012
New Revision: 56766
URL: http://svn.reactos.org/svn/reactos?rev=56766&view=rev
Log:
[IMM32][MSCTF] - Remove unused files
[XINPUT1_3] - Move header file to PSDK, where it belongs
[MLANG][OBJSEL] - Remove unneeded import library references
[README.WINE] - Mark modules as synced to 1.5.4 if they are
Added:
trunk/reactos/include/psdk/xinput.h
- copied, changed from r56745, trunk/reactos/dll/win32/xinput1_3/xinput.h
Removed:
trunk/reactos/dll/win32/imm32/imm.spec
trunk/reactos/dll/win32/msctf/regsvr.c
trunk/reactos/dll/win32/xinput1_3/xinput.h
Modified:
trunk/reactos/dll/win32/mlang/CMakeLists.txt
trunk/reactos/dll/win32/msctf/CMakeLists.txt
trunk/reactos/dll/win32/objsel/CMakeLists.txt
trunk/reactos/media/doc/README.WINE
Removed: trunk/reactos/dll/win32/imm32/imm.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.spec?rev=56765&view=auto
==============================================================================
--- trunk/reactos/dll/win32/imm32/imm.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/imm32/imm.spec (removed)
@@ -1,54 +1,0 @@
-4 stub IMMGETDEFAULTIMEWND
-7 stub IMMGETDESCRIPTIONA
-8 stub IMMGETIMEFILENAMEA
-9 stub IMMGETPROPERTY
-11 stub IMMINSTALLIMEA
-#15 stub ___EXPORTEDSTUB
-17 stub IMMISIME
-25 stub IMMGETHOTKEY
-26 stub IMMSETHOTKEY
-27 stub IMMSIMULATEHOTKEY
-35 stub IMMCREATECONTEXT
-36 stub IMMDESTROYCONTEXT
-37 stub IMMGETCONTEXT
-38 stub IMMRELEASECONTEXT
-39 stub IMMASSOCIATECONTEXT
-41 stub IMMASSOCIATECONTEXTEX
-43 stub IMMGETCOMPOSITIONSTRINGA
-44 stub IMMSETCOMPOSITIONSTRINGA
-45 stub IMMGETCANDIDATELISTCOUNTA
-46 stub IMMGETCANDIDATELISTA
-47 stub IMMGETGUIDELINEA
-51 stub IMMGETCONVERSIONSTATUS
-52 stub IMMSETCONVERSIONSTATUS
-53 stub IMMGETOPENSTATUS
-54 stub IMMSETOPENSTATUS
-55 stub IMMGETCOMPOSITIONFONTA
-56 stub IMMSETCOMPOSITIONFONTA
-61 stub IMMCONFIGUREIMEA
-63 stub IMMESCAPEA
-64 stub IMMGETCONVERSIONLISTA
-65 stub IMMNOTIFYIME
-71 stub IMMISUIMESSAGEA
-72 stub IMMGENERATEMESSAGE
-73 stub IMMGETVIRTUALKEY
-87 stub IMMGETSTATUSWINDOWPOS
-88 stub IMMSETSTATUSWINDOWPOS
-89 stub IMMGETCOMPOSITIONWINDOW
-90 stub IMMSETCOMPOSITIONWINDOW
-91 stub IMMGETCANDIDATEWINDOW
-92 stub IMMSETCANDIDATEWINDOW
-95 stub IMMUNINSTALLIMEA
-110 stub IMMLOCKIMC
-111 stub IMMUNLOCKIMC
-112 stub IMMGETIMCLOCKCOUNT
-116 stub IMMCREATEIMCC
-117 stub IMMDESTROYIMCC
-118 stub IMMLOCKIMCC
-119 stub IMMUNLOCKIMCC
-120 stub IMMGETIMCCLOCKCOUNT
-121 stub IMMRESIZEIMCC
-122 stub IMMGETIMCCSIZE
-#160 stub FT_IMMFTHKTHKCONNECTIONDATA
-#161 stub IMM32THKCONNECTIONDATASL
-180 stub IMMSYNCCONVERSION
Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists.txt?rev=56766&r1=56765&r2=56766&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Wed Jun 20
22:57:37 2012
@@ -23,10 +23,9 @@
add_importlibs(mlang
ole32
- user32
gdi32
advapi32
- msvcrt
+ msvcrt
kernel32
ntdll)
Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/CMakeLists.txt?rev=56766&r1=56765&r2=56766&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] Wed Jun 20
22:57:37 2012
@@ -5,8 +5,6 @@
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
-set_rc_compiler()
spec2def(msctf.dll msctf.spec)
Removed: trunk/reactos/dll/win32/msctf/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/regsvr.c?rev=56765&view=auto
==============================================================================
--- trunk/reactos/dll/win32/msctf/regsvr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/regsvr.c (removed)
@@ -1,518 +1,0 @@
-/*
- * self-registerable dll functions for msctf
- *
- * Copyright (C) 2004 Stefan Leichter
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdarg.h>
-#include <string.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
-#include "winreg.h"
-#include "winerror.h"
-
-#include "ole2.h"
-#include "shlguid.h"
-#include "msctf.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
-
-/*
- * Near the bottom of this file are the exported DllRegisterServer and
- * DllUnregisterServer, which make all this worthwhile.
- */
-
-/***********************************************************************
- * interface for self-registering
- */
-struct regsvr_interface
-{
- IID const *iid; /* NULL for end of list */
- LPCSTR name; /* can be NULL to omit */
- IID const *base_iid; /* can be NULL to omit */
- int num_methods; /* can be <0 to omit */
- CLSID const *ps_clsid; /* can be NULL to omit */
- CLSID const *ps_clsid32; /* can be NULL to omit */
-};
-
-static HRESULT register_interfaces(struct regsvr_interface const *list);
-static HRESULT unregister_interfaces(struct regsvr_interface const *list);
-
-struct regsvr_coclass
-{
- CLSID const *clsid; /* NULL for end of list */
- LPCSTR name; /* can be NULL to omit */
- LPCSTR ips; /* can be NULL to omit */
- LPCSTR ips32; /* can be NULL to omit */
- LPCSTR ips32_tmodel; /* can be NULL to omit */
- LPCSTR progid; /* can be NULL to omit */
- LPCSTR viprogid; /* can be NULL to omit */
- LPCSTR progid_extra; /* can be NULL to omit */
-};
-
-static HRESULT register_coclasses(struct regsvr_coclass const *list);
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
-
-/***********************************************************************
- * static string constants
- */
-static WCHAR const interface_keyname[10] = {
- 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 };
-static WCHAR const base_ifa_keyname[14] = {
- 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c',
- 'e', 0 };
-static WCHAR const num_methods_keyname[11] = {
- 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 };
-static WCHAR const ps_clsid_keyname[15] = {
- 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
- 'i', 'd', 0 };
-static WCHAR const ps_clsid32_keyname[17] = {
- 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
- 'i', 'd', '3', '2', 0 };
-static WCHAR const clsid_keyname[6] = {
- 'C', 'L', 'S', 'I', 'D', 0 };
-static WCHAR const curver_keyname[7] = {
- 'C', 'u', 'r', 'V', 'e', 'r', 0 };
-static WCHAR const ips_keyname[13] = {
- 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
- 0 };
-static WCHAR const ips32_keyname[15] = {
- 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
- '3', '2', 0 };
-static WCHAR const progid_keyname[7] = {
- 'P', 'r', 'o', 'g', 'I', 'D', 0 };
-static WCHAR const viprogid_keyname[25] = {
- 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p',
- 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D',
- 0 };
-static char const tmodel_valuename[] = "ThreadingModel";
-
-/***********************************************************************
- * static helper functions
- */
-static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid);
-static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
- WCHAR const *value);
-static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
- char const *value);
-static LONG register_progid(WCHAR const *clsid,
- char const *progid, char const *curver_progid,
- char const *name, char const *extra);
-
-/***********************************************************************
- * register_interfaces
- */
-static HRESULT register_interfaces(struct regsvr_interface const *list)
-{
- LONG res = ERROR_SUCCESS;
- HKEY interface_key;
-
- res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL, &interface_key, NULL);
- if (res != ERROR_SUCCESS) goto error_return;
-
- for (; res == ERROR_SUCCESS && list->iid; ++list) {
- WCHAR buf[39];
- HKEY iid_key;
-
- StringFromGUID2(list->iid, buf, 39);
- res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL, &iid_key, NULL);
- if (res != ERROR_SUCCESS) goto error_close_interface_key;
-
- if (list->name) {
- res = RegSetValueExA(iid_key, NULL, 0, REG_SZ,
- (CONST BYTE*)(list->name),
- strlen(list->name) + 1);
- if (res != ERROR_SUCCESS) goto error_close_iid_key;
- }
-
- if (list->base_iid) {
- res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
- if (res != ERROR_SUCCESS) goto error_close_iid_key;
- }
-
- if (0 <= list->num_methods) {
- static WCHAR const fmt[3] = { '%', 'd', 0 };
- HKEY key;
-
- res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL, &key, NULL);
- if (res != ERROR_SUCCESS) goto error_close_iid_key;
-
- wsprintfW(buf, fmt, list->num_methods);
- res = RegSetValueExW(key, NULL, 0, REG_SZ,
- (CONST BYTE*)buf,
- (lstrlenW(buf) + 1) * sizeof(WCHAR));
- RegCloseKey(key);
-
- if (res != ERROR_SUCCESS) goto error_close_iid_key;
- }
-
- if (list->ps_clsid) {
- res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
- if (res != ERROR_SUCCESS) goto error_close_iid_key;
- }
-
- if (list->ps_clsid32) {
- res = register_key_guid(iid_key, ps_clsid32_keyname,
list->ps_clsid32);
- if (res != ERROR_SUCCESS) goto error_close_iid_key;
- }
-
- error_close_iid_key:
- RegCloseKey(iid_key);
- }
-
-error_close_interface_key:
- RegCloseKey(interface_key);
-error_return:
- return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- * unregister_interfaces
- */
-static HRESULT unregister_interfaces(struct regsvr_interface const *list)
-{
- LONG res = ERROR_SUCCESS;
- HKEY interface_key;
-
- res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0,
- KEY_READ | KEY_WRITE, &interface_key);
- if (res == ERROR_FILE_NOT_FOUND) return S_OK;
- if (res != ERROR_SUCCESS) goto error_return;
-
- for (; res == ERROR_SUCCESS && list->iid; ++list) {
- WCHAR buf[39];
-
- StringFromGUID2(list->iid, buf, 39);
- res = RegDeleteTreeW(interface_key, buf);
- if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
- }
-
- RegCloseKey(interface_key);
-error_return:
- return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- * register_coclasses
- */
-static HRESULT register_coclasses(struct regsvr_coclass const *list)
-{
- LONG res = ERROR_SUCCESS;
- HKEY coclass_key;
-
- res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL);
- if (res != ERROR_SUCCESS) goto error_return;
-
- for (; res == ERROR_SUCCESS && list->clsid; ++list) {
- WCHAR buf[39];
- HKEY clsid_key;
-
- StringFromGUID2(list->clsid, buf, 39);
- res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
- if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
- if (list->name) {
- res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
- (CONST BYTE*)(list->name),
- strlen(list->name) + 1);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
- }
-
- if (list->ips) {
- res = register_key_defvalueA(clsid_key, ips_keyname, list->ips);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
- }
-
- if (list->ips32) {
- HKEY ips32_key;
-
- res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL,
- &ips32_key, NULL);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
- res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
- (CONST BYTE*)list->ips32,
- lstrlenA(list->ips32) + 1);
- if (res == ERROR_SUCCESS && list->ips32_tmodel)
- res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ,
- (CONST BYTE*)list->ips32_tmodel,
- strlen(list->ips32_tmodel) + 1);
- RegCloseKey(ips32_key);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
- }
-
- if (list->progid) {
- res = register_key_defvalueA(clsid_key, progid_keyname,
- list->progid);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
- res = register_progid(buf, list->progid, NULL,
- list->name, list->progid_extra);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
- }
-
- if (list->viprogid) {
- res = register_key_defvalueA(clsid_key, viprogid_keyname,
- list->viprogid);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
- res = register_progid(buf, list->viprogid, list->progid,
- list->name, list->progid_extra);
- if (res != ERROR_SUCCESS) goto error_close_clsid_key;
- }
-
- error_close_clsid_key:
- RegCloseKey(clsid_key);
- }
-
-error_close_coclass_key:
- RegCloseKey(coclass_key);
-error_return:
- return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- * unregister_coclasses
- */
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
-{
- LONG res = ERROR_SUCCESS;
- HKEY coclass_key;
-
- res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
- KEY_READ | KEY_WRITE, &coclass_key);
- if (res == ERROR_FILE_NOT_FOUND) return S_OK;
- if (res != ERROR_SUCCESS) goto error_return;
-
- for (; res == ERROR_SUCCESS && list->clsid; ++list) {
- WCHAR buf[39];
-
- StringFromGUID2(list->clsid, buf, 39);
- res = RegDeleteTreeW(coclass_key, buf);
- if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
- if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
- if (list->progid) {
- res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
- if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
- if (res != ERROR_SUCCESS) goto error_close_coclass_key;
- }
-
- if (list->viprogid) {
- res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid);
- if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
- if (res != ERROR_SUCCESS) goto error_close_coclass_key;
- }
- }
-
-error_close_coclass_key:
- RegCloseKey(coclass_key);
-error_return:
- return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- * regsvr_key_guid
- */
-static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid)
-{
- WCHAR buf[39];
-
- StringFromGUID2(guid, buf, 39);
- return register_key_defvalueW(base, name, buf);
-}
-
-/***********************************************************************
- * regsvr_key_defvalueW
- */
-static LONG register_key_defvalueW(
- HKEY base,
- WCHAR const *name,
- WCHAR const *value)
-{
- LONG res;
- HKEY key;
-
- res = RegCreateKeyExW(base, name, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL, &key, NULL);
- if (res != ERROR_SUCCESS) return res;
- res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
- (lstrlenW(value) + 1) * sizeof(WCHAR));
- RegCloseKey(key);
- return res;
-}
-
-/***********************************************************************
- * regsvr_key_defvalueA
- */
-static LONG register_key_defvalueA(
- HKEY base,
- WCHAR const *name,
- char const *value)
-{
- LONG res;
- HKEY key;
-
- res = RegCreateKeyExW(base, name, 0, NULL, 0,
- KEY_READ | KEY_WRITE, NULL, &key, NULL);
- if (res != ERROR_SUCCESS) return res;
- res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
- lstrlenA(value) + 1);
- RegCloseKey(key);
- return res;
-}
-
-/***********************************************************************
- * regsvr_progid
- */
-static LONG register_progid(
- WCHAR const *clsid,
- char const *progid,
- char const *curver_progid,
- char const *name,
- char const *extra)
-{
- LONG res;
- HKEY progid_key;
-
- res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0,
- NULL, 0, KEY_READ | KEY_WRITE, NULL,
- &progid_key, NULL);
- if (res != ERROR_SUCCESS) return res;
-
- if (name) {
- res = RegSetValueExA(progid_key, NULL, 0, REG_SZ,
- (CONST BYTE*)name, strlen(name) + 1);
- if (res != ERROR_SUCCESS) goto error_close_progid_key;
- }
-
- if (clsid) {
- res = register_key_defvalueW(progid_key, clsid_keyname, clsid);
- if (res != ERROR_SUCCESS) goto error_close_progid_key;
- }
-
- if (curver_progid) {
- res = register_key_defvalueA(progid_key, curver_keyname,
- curver_progid);
- if (res != ERROR_SUCCESS) goto error_close_progid_key;
- }
-
- if (extra) {
- HKEY extra_key;
-
- res = RegCreateKeyExA(progid_key, extra, 0,
- NULL, 0, KEY_READ | KEY_WRITE, NULL,
- &extra_key, NULL);
- if (res == ERROR_SUCCESS)
- RegCloseKey(extra_key);
- }
-
-error_close_progid_key:
- RegCloseKey(progid_key);
- return res;
-}
-
-/***********************************************************************
- * coclass list
- */
-static struct regsvr_coclass const coclass_list[] = {
- {
- &CLSID_TF_ThreadMgr,
- "TF_ThreadMgr",
- NULL,
- "msctf.dll",
- "Apartment"
- },
- {
- &CLSID_TF_InputProcessorProfiles,
- "TF_InputProcessorProfiles",
- NULL,
- "msctf.dll",
- "Apartment"
- },
- {
- &CLSID_TF_CategoryMgr,
- "TF_CategoryMgr",
- NULL,
- "msctf.dll",
- "Apartment"
- },
- {
- &CLSID_TF_LangBarMgr,
- "TF_LangBarMgr",
- NULL,
- "msctf.dll",
- "Apartment"
- },
- {
- &CLSID_TF_DisplayAttributeMgr,
- "TF_DisplayAttributeMgr",
- NULL,
- "msctf.dll",
- "Apartment"
- },
- { NULL } /* list terminator */
-};
-
-/***********************************************************************
- * interface list
- */
-
-static struct regsvr_interface const interface_list[] = {
- { NULL } /* list terminator */
-};
-
-/***********************************************************************
- * DllRegisterServer (MSCTF.@)
- */
-HRESULT WINAPI DllRegisterServer(void)
-{
- HRESULT hr;
-
- TRACE("\n");
-
- hr = register_coclasses(coclass_list);
- if (SUCCEEDED(hr))
- hr = register_interfaces(interface_list);
- return hr;
-}
-
-/***********************************************************************
- * DllUnregisterServer (MSCTF.@)
- */
-HRESULT WINAPI DllUnregisterServer(void)
-{
- HRESULT hr;
-
- TRACE("\n");
-
- hr = unregister_coclasses(coclass_list);
- if (SUCCEEDED(hr))
- hr = unregister_interfaces(interface_list);
- return hr;
-}
Modified: trunk/reactos/dll/win32/objsel/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/CMakeLists.txt?rev=56766&r1=56765&r2=56766&view=diff
==============================================================================
--- trunk/reactos/dll/win32/objsel/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/CMakeLists.txt [iso-8859-1] Wed Jun 20
22:57:37 2012
@@ -6,7 +6,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-set_rc_compiler()
spec2def(objsel.dll objsel.spec)
list(APPEND SOURCE
@@ -23,7 +22,6 @@
add_importlibs(objsel
ole32
- user32
advapi32
msvcrt
kernel32
Removed: trunk/reactos/dll/win32/xinput1_3/xinput.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput.h?rev=56765&view=auto
==============================================================================
--- trunk/reactos/dll/win32/xinput1_3/xinput.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/xinput1_3/xinput.h (removed)
@@ -1,239 +1,0 @@
-/*
- * The Wine project - Xinput Joystick Library
- * Copyright 2008 Andrew Fenn
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * 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 __WINE_XINPUT_H
-#define __WINE_XINPUT_H
-
-#include <windef.h>
-
-/*
- * Bitmasks for the joysticks buttons, determines what has
- * been pressed on the joystick, these need to be mapped
- * to whatever device you're using instead of an xbox 360
- * joystick
- */
-
-#define XINPUT_GAMEPAD_DPAD_UP 0x0001
-#define XINPUT_GAMEPAD_DPAD_DOWN 0x0002
-#define XINPUT_GAMEPAD_DPAD_LEFT 0x0004
-#define XINPUT_GAMEPAD_DPAD_RIGHT 0x0008
-#define XINPUT_GAMEPAD_START 0x0010
-#define XINPUT_GAMEPAD_BACK 0x0020
-#define XINPUT_GAMEPAD_LEFT_THUMB 0x0040
-#define XINPUT_GAMEPAD_RIGHT_THUMB 0x0080
-#define XINPUT_GAMEPAD_LEFT_SHOULDER 0x0100
-#define XINPUT_GAMEPAD_RIGHT_SHOULDER 0x0200
-#define XINPUT_GAMEPAD_A 0x1000
-#define XINPUT_GAMEPAD_B 0x2000
-#define XINPUT_GAMEPAD_X 0x4000
-#define XINPUT_GAMEPAD_Y 0x8000
-
-/*
- * Defines the flags used to determine if the user is pushing
- * down on a button, not holding a button, etc
- */
-
-#define XINPUT_KEYSTROKE_KEYDOWN 0x0001
-#define XINPUT_KEYSTROKE_KEYUP 0x0002
-#define XINPUT_KEYSTROKE_REPEAT 0x0004
-
-/*
- * Defines the codes which are returned by XInputGetKeystroke
- */
-
-#define VK_PAD_A 0x5800
-#define VK_PAD_B 0x5801
-#define VK_PAD_X 0x5802
-#define VK_PAD_Y 0x5803
-#define VK_PAD_RSHOULDER 0x5804
-#define VK_PAD_LSHOULDER 0x5805
-#define VK_PAD_LTRIGGER 0x5806
-#define VK_PAD_RTRIGGER 0x5807
-#define VK_PAD_DPAD_UP 0x5810
-#define VK_PAD_DPAD_DOWN 0x5811
-#define VK_PAD_DPAD_LEFT 0x5812
-#define VK_PAD_DPAD_RIGHT 0x5813
-#define VK_PAD_START 0x5814
-#define VK_PAD_BACK 0x5815
-#define VK_PAD_LTHUMB_PRESS 0x5816
-#define VK_PAD_RTHUMB_PRESS 0x5817
-#define VK_PAD_LTHUMB_UP 0x5820
-#define VK_PAD_LTHUMB_DOWN 0x5821
-#define VK_PAD_LTHUMB_RIGHT 0x5822
-#define VK_PAD_LTHUMB_LEFT 0x5823
-#define VK_PAD_LTHUMB_UPLEFT 0x5824
-#define VK_PAD_LTHUMB_UPRIGHT 0x5825
-#define VK_PAD_LTHUMB_DOWNRIGHT 0x5826
-#define VK_PAD_LTHUMB_DOWNLEFT 0x5827
-#define VK_PAD_RTHUMB_UP 0x5830
-#define VK_PAD_RTHUMB_DOWN 0x5831
-#define VK_PAD_RTHUMB_RIGHT 0x5832
-#define VK_PAD_RTHUMB_LEFT 0x5833
-#define VK_PAD_RTHUMB_UPLEFT 0x5834
-#define VK_PAD_RTHUMB_UPRIGHT 0x5835
-#define VK_PAD_RTHUMB_DOWNRIGHT 0x5836
-#define VK_PAD_RTHUMB_DOWNLEFT 0x5837
-
-/*
- * Deadzones are for analogue joystick controls on the joypad
- * which determine when input should be assumed to be in the
- * middle of the pad. This is a threshold to stop a joypad
- * controlling the game when the player isn't touching the
- * controls.
- */
-
-#define XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE 7849
-#define XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE 8689
-#define XINPUT_GAMEPAD_TRIGGER_THRESHOLD 30
-
-
-/*
- * Defines what type of abilities the type of joystick has
- * DEVTYPE_GAMEPAD is avaliable for all joysticks, however
- * there may be more specfic identifiers for other joysticks
- * which are being used.
- */
-
-#define XINPUT_DEVTYPE_GAMEPAD 0x01
-#define XINPUT_DEVSUBTYPE_GAMEPAD 0x01
-#define XINPUT_DEVSUBTYPE_WHEEL 0x02
-#define XINPUT_DEVSUBTYPE_ARCADE_STICK 0x03
-#define XINPUT_DEVSUBTYPE_FLIGHT_SICK 0x04
-#define XINPUT_DEVSUBTYPE_DANCE_PAD 0x05
-#define XINPUT_DEVSUBTYPE_GUITAR 0x06
-#define XINPUT_DEVSUBTYPE_DRUM_KIT 0x08
-
-/*
- * These are used with the XInputGetCapabilities function to
- * determine the abilities to the joystick which has been
- * plugged in.
- */
-
-#define XINPUT_CAPS_VOICE_SUPPORTED 0x0004
-#define XINPUT_FLAG_GAMEPAD 0x00000001
-
-/*
- * Defines the status of the battery if one is used in the
- * attached joystick. The first two define if the joystick
- * supports a battery. Disconnected means that the joystick
- * isn't connected. Wired shows that the joystick is a wired
- * joystick.
- */
-
-#define BATTERY_DEVTYPE_GAMEPAD 0x00
-#define BATTERY_DEVTYPE_HEADSET 0x01
-#define BATTERY_TYPE_DISCONNECTED 0x00
-#define BATTERY_TYPE_WIRED 0x01
-#define BATTERY_TYPE_ALKALINE 0x02
-#define BATTERY_TYPE_NIMH 0x03
-#define BATTERY_TYPE_UNKNOWN 0xFF
-#define BATTERY_LEVEL_EMPTY 0x00
-#define BATTERY_LEVEL_LOW 0x01
-#define BATTERY_LEVEL_MEDIUM 0x02
-#define BATTERY_LEVEL_FULL 0x03
-
-/*
- * How many joysticks can be used with this library. Games that
- * use the xinput library will not go over this number.
- */
-
-#define XUSER_MAX_COUNT 4
-#define XUSER_INDEX_ANY 0x000000FF
-
-/*
- * Defines the structure of an xbox 360 joystick.
- */
-
-typedef struct _XINPUT_GAMEPAD {
- WORD wButtons;
- BYTE bLeftTrigger;
- BYTE bRightTrigger;
- SHORT sThumbLX;
- SHORT sThumbLY;
- SHORT sThumbRX;
- SHORT sThumbRY;
-} XINPUT_GAMEPAD, *PXINPUT_GAMEPAD;
-
-typedef struct _XINPUT_STATE {
- DWORD dwPacketNumber;
- XINPUT_GAMEPAD Gamepad;
-} XINPUT_STATE, *PXINPUT_STATE;
-
-/*
- * Defines the structure of how much vibration is set on both the
- * right and left motors in a joystick. If you're not using a 360
- * joystick you will have to map these to your device.
- */
-
-typedef struct _XINPUT_VIBRATION {
- WORD wLeftMotorSpeed;
- WORD wRightMotorSpeed;
-} XINPUT_VIBRATION, *PXINPUT_VIBRATION;
-
-/*
- * Defines the structure for what kind of abilities the joystick has
- * such abilites are things such as if the joystick has the ability
- * to send and receive audio, if the joystick is infact a driving
- * wheel or perhaps if the joystick is some kind of dance pad or
- * guitar.
- */
-
-typedef struct _XINPUT_CAPABILITIES {
- BYTE Type;
- BYTE SubType;
- WORD Flags;
- XINPUT_GAMEPAD Gamepad;
- XINPUT_VIBRATION Vibration;
-} XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES;
-
-/*
- * Defines the structure for a joystick input event which is
- * retrieved using the function XInputGetKeystroke
- */
-typedef struct _XINPUT_KEYSTROKE {
- WORD VirtualKey;
- WCHAR Unicode;
- WORD Flags;
- BYTE UserIndex;
- BYTE HidCode;
-} XINPUT_KEYSTROKE, *PXINPUT_KEYSTROKE;
-
-typedef struct _XINPUT_BATTERY_INFORMATION
-{
- BYTE BatteryType;
- BYTE BatteryLevel;
-} XINPUT_BATTERY_INFORMATION, *PXINPUT_BATTERY_INFORMATION;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void WINAPI XInputEnable(BOOL);
-DWORD WINAPI XInputSetState(DWORD, XINPUT_VIBRATION*);
-DWORD WINAPI XInputGetState(DWORD, XINPUT_STATE*);
-DWORD WINAPI XInputGetKeystroke(DWORD, DWORD, PXINPUT_KEYSTROKE);
-DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*);
-DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*);
-DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE,
XINPUT_BATTERY_INFORMATION*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __WINE_XINPUT_H */
Copied: trunk/reactos/include/psdk/xinput.h (from r56745,
trunk/reactos/dll/win32/xinput1_3/xinput.h)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xinput.h?p2=trunk/reactos/include/psdk/xinput.h&p1=trunk/reactos/dll/win32/xinput1_3/xinput.h&r1=56745&r2=56766&rev=56766&view=diff
==============================================================================
--- trunk/reactos/dll/win32/xinput1_3/xinput.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/xinput.h [iso-8859-1] Wed Jun 20 22:57:37 2012
@@ -105,8 +105,8 @@
/*
* Defines what type of abilities the type of joystick has
- * DEVTYPE_GAMEPAD is avaliable for all joysticks, however
- * there may be more specfic identifiers for other joysticks
+ * DEVTYPE_GAMEPAD is available for all joysticks, however
+ * there may be more specific identifiers for other joysticks
* which are being used.
*/
@@ -188,8 +188,8 @@
/*
* Defines the structure for what kind of abilities the joystick has
- * such abilites are things such as if the joystick has the ability
- * to send and receive audio, if the joystick is infact a driving
+ * such abilities are things such as if the joystick has the ability
+ * to send and receive audio, if the joystick is in fact a driving
* wheel or perhaps if the joystick is some kind of dance pad or
* guitar.
*/
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=56766&r1=56765&r2=56766&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Jun 20 22:57:37 2012
@@ -40,17 +40,17 @@
reactos/dll/directx/msdmo # Autosync
reactos/dll/directx/qedit # Autosync
reactos/dll/directx/quartz # Autosync
-reactos/dll/win32/advpack # Synced to Wine-1.3.37
+reactos/dll/win32/advpack # Synced to Wine-1.5.4
reactos/dll/win32/atl # Synced to Wine-1.3.37
reactos/dll/win32/avifil32 # Synced to Wine-1.3.37
-reactos/dll/win32/bcrypt # Synced to Wine-1.3.37
+reactos/dll/win32/bcrypt # Synced to Wine-1.5.4
reactos/dll/win32/browseui # Out of sync
-reactos/dll/win32/cabinet # Synced to Wine-1.3.37
-reactos/dll/win32/clusapi # Synced to Wine-1.3.37
-reactos/dll/win32/comcat # Synced to Wine-1.3.37
+reactos/dll/win32/cabinet # Synced to Wine-1.5.4
+reactos/dll/win32/clusapi # Synced to Wine-1.5.4
+reactos/dll/win32/comcat # Synced to Wine-1.5.4
reactos/dll/win32/comctl32 # Synced to Wine 1.3.37
reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37
-reactos/dll/win32/compstui # Synced to Wine-1.3.37
+reactos/dll/win32/compstui # Synced to Wine-1.5.4
reactos/dll/win32/credui # Synced to Wine-1.3.37
reactos/dll/win32/crypt32 # Synced to Wine-1.3.37
reactos/dll/win32/cryptdlg # Synced to Wine-1.3.37
@@ -58,105 +58,105 @@
reactos/dll/win32/cryptnet # Synced to Wine-1.3.37
reactos/dll/win32/cryptui # Synced to Wine-1.3.37
reactos/dll/win32/dbghelp # Synced to Wine-1.3.37
-reactos/dll/win32/dciman32 # Synced to Wine-1.3.37
-reactos/dll/win32/dwmapi # Synced to Wine-1.3.37
+reactos/dll/win32/dciman32 # Synced to Wine-1.5.4
+reactos/dll/win32/dwmapi # Synced to Wine-1.5.4
reactos/dll/win32/fusion # Synced to Wine-1.5.4
reactos/dll/win32/gdiplus # Synced to Wine-1.5.4
reactos/dll/win32/hhctrl.ocx # Autosync
reactos/dll/win32/hlink # Synced to Wine-1.5.4
-reactos/dll/win32/hnetcfg # Synced to Wine-1.3.37
-reactos/dll/win32/httpapi # Synced to Wine-1.3.37
+reactos/dll/win32/hnetcfg # Synced to Wine-1.5.4
+reactos/dll/win32/httpapi # Synced to Wine-1.5.4
reactos/dll/win32/iccvid # Autosync
reactos/dll/win32/icmp # Synced to Wine-0_9_10
-reactos/dll/win32/imaadp32.acm # Synced to Wine-1.3.37
-reactos/dll/win32/imagehlp # Synced to Wine-1.3.37
-reactos/dll/win32/imm32 # Synced to Wine-1.3.37
-reactos/dll/win32/inetcomm # Synced to Wine-1.3.37
-reactos/dll/win32/inetmib1 # Synced to Wine-1.3.37
-reactos/dll/win32/initpki # Synced to Wine-1.3.37
-reactos/dll/win32/inseng # Synced to Wine-1.3.37
+reactos/dll/win32/imaadp32.acm # Synced to Wine-1.5.4
+reactos/dll/win32/imagehlp # Synced to Wine-1.5.4
+reactos/dll/win32/imm32 # Synced to Wine-1.5.4
+reactos/dll/win32/inetcomm # Synced to Wine-1.5.4
+reactos/dll/win32/inetmib1 # Synced to Wine-1.5.4
+reactos/dll/win32/initpki # Synced to Wine-1.5.4
+reactos/dll/win32/inseng # Synced to Wine-1.5.4
reactos/dll/win32/iphlpapi # Out of sync
-reactos/dll/win32/itircl # Synced to Wine-1.3.37
+reactos/dll/win32/itircl # Synced to Wine-1.5.4
reactos/dll/win32/itss # Synced to Wine-1.5.4
reactos/dll/win32/jscript # Autosync
reactos/dll/win32/localspl # Autosync
reactos/dll/win32/localui # Autosync
-reactos/dll/win32/lz32 # Synced to Wine-1.3.37
+reactos/dll/win32/lz32 # Synced to Wine-1.5.4
reactos/dll/win32/mapi32 # Autosync
-reactos/dll/win32/mciavi32 # Synced to Wine-1.3.37
-reactos/dll/win32/mcicda # Synced to Wine-1.3.37
+reactos/dll/win32/mciavi32 # Synced to Wine-1.5.4
+reactos/dll/win32/mcicda # Synced to Wine-1.5.4
reactos/dll/win32/mciqtz32 # Synced to Wine-1.5.4
-reactos/dll/win32/mciseq # Synced to Wine-1.3.37
+reactos/dll/win32/mciseq # Synced to Wine-1.5.4
reactos/dll/win32/mciwave # Synced to Wine-1.5.4
-reactos/dll/win32/mlang # Synced to Wine-1.3.37
+reactos/dll/win32/mlang # Synced to Wine-1.5.4
reactos/dll/win32/mpr # Autosync
-reactos/dll/win32/mprapi # Synced to Wine-1.3.37
+reactos/dll/win32/mprapi # Synced to Wine-1.5.4
reactos/dll/win32/msacm32 # Autosync
-reactos/dll/win32/msadp32.acm # Synced to Wine-1.3.37
-reactos/dll/win32/mscat32 # Synced to Wine-1.3.37
+reactos/dll/win32/msadp32.acm # Synced to Wine-1.5.4
+reactos/dll/win32/mscat32 # Synced to Wine-1.5.4
reactos/dll/win32/mscms # Synced to Wine-1.5.4
reactos/dll/win32/mscoree # Synced to Wine-1.5.4
-reactos/dll/win32/msctf # Synced to Wine-1.3.37
-reactos/dll/win32/msftedit # Synced to Wine-1.3.37
-reactos/dll/win32/msg711.acm # Synced to Wine-1.3.37
-reactos/dll/win32/msgsm32.acm # Synced to Wine-1.3.37
+reactos/dll/win32/msctf # Synced to Wine-1.5.4
+reactos/dll/win32/msftedit # Synced to Wine-1.5.4
+reactos/dll/win32/msg711.acm # Synced to Wine-1.5.4
+reactos/dll/win32/msgsm32.acm # Synced to Wine-1.5.4
reactos/dll/win32/mshtml # Autosync
reactos/dll/win32/mshtml.tlb # Autosync
reactos/dll/win32/msi # Synced to Wine-1.5.4
-reactos/dll/win32/msimg32 # Synced to Wine-1.3.37
-reactos/dll/win32/msimtf # Synced to Wine-1.3.37
-reactos/dll/win32/msisip # Synced to Wine-1.3.37
-reactos/dll/win32/msisys.ocx # Synced to Wine-1.3.37
-reactos/dll/win32/msnet32 # Synced to Wine-1.3.37
+reactos/dll/win32/msimg32 # Synced to Wine-1.5.4
+reactos/dll/win32/msimtf # Synced to Wine-1.5.4
+reactos/dll/win32/msisip # Synced to Wine-1.5.4
+reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4
+reactos/dll/win32/msnet32 # Synced to Wine-1.5.4
reactos/dll/win32/msrle32 # Autosync
reactos/dll/win32/mssign32 # Synced to Wine-1.5.4
-reactos/dll/win32/mssip32 # Synced to Wine-1.3.37
-reactos/dll/win32/mstask # Synced to Wine-1.3.37
+reactos/dll/win32/mssip32 # Synced to Wine-1.5.4
+reactos/dll/win32/mstask # Synced to Wine-1.5.4
reactos/dll/win32/msvcrt20 # Autosync
reactos/dll/win32/msvfw32 # Autosync
reactos/dll/win32/msvidc32 # Autosync
reactos/dll/win32/msxml3 # Autosync
-reactos/dll/win32/nddeapi # Synced to Wine-1.3.37
+reactos/dll/win32/nddeapi # Synced to Wine-1.5.4
reactos/dll/win32/netapi32 # Autosync
-reactos/dll/win32/ntdsapi # Synced to Wine-1.3.37
-reactos/dll/win32/ntprint # Synced to Wine-1.3.37
-reactos/dll/win32/objsel # Synced to Wine-1.3.37
+reactos/dll/win32/ntdsapi # Synced to Wine-1.5.4
+reactos/dll/win32/ntprint # Synced to Wine-1.5.4
+reactos/dll/win32/objsel # Synced to Wine-1.5.4
reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC.
-reactos/dll/win32/odbccp32 # Synced to Wine-1.3.37
+reactos/dll/win32/odbccp32 # Synced to Wine-1.5.4
reactos/dll/win32/ole32 # Synced to Wine-1.5.4
reactos/dll/win32/oleacc # Autosync
reactos/dll/win32/oleaut32 # Autosync
-reactos/dll/win32/olecli32 # Synced to Wine-1.3.37
+reactos/dll/win32/olecli32 # Synced to Wine-1.5.4
reactos/dll/win32/oledlg # Autosync
reactos/dll/win32/olepro32 # Autosync
-reactos/dll/win32/olesvr32 # Synced to Wine-1.3.37
-reactos/dll/win32/olethk32 # Synced to Wine-1.3.37
+reactos/dll/win32/olesvr32 # Synced to Wine-1.5.4
+reactos/dll/win32/olethk32 # Synced to Wine-1.5.4
reactos/dll/win32/pdh # Autosync
-reactos/dll/win32/pidgen # Synced to Wine-1.3.37
+reactos/dll/win32/pidgen # Synced to Wine-1.5.4
reactos/dll/win32/powrprof # Forked at Wine-1.0rc5
-reactos/dll/win32/printui # Synced to Wine-1.3.37
+reactos/dll/win32/printui # Synced to Wine-1.5.4
reactos/dll/win32/pstorec # Synced to Wine-1.5.4
-reactos/dll/win32/query # Synced to Wine-1.3.37
-reactos/dll/win32/rasapi32 # Synced to Wine-1.3.37
-reactos/dll/win32/resutils # Synced to Wine-1.3.37
+reactos/dll/win32/query # Synced to Wine-1.5.4
+reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4
+reactos/dll/win32/resutils # Synced to Wine-1.5.4
reactos/dll/win32/riched20 # Synced to Wine-1.5.4
-reactos/dll/win32/riched32 # Synced to Wine-1.3.37
+reactos/dll/win32/riched32 # Synced to Wine-1.5.4
reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26
reactos/dll/win32/rsabase # Autosync
reactos/dll/win32/rsaenh # Synced to Wine-1.5.4
-reactos/dll/win32/sccbase # Synced to Wine-1.3.37
-reactos/dll/win32/schannel # Synced to Wine-1.3.37
+reactos/dll/win32/sccbase # Synced to Wine-1.5.4
+reactos/dll/win32/schannel # Synced to Wine-1.5.4
reactos/dll/win32/secur32 # Forked
reactos/dll/win32/security # Forked (different .spec)
-reactos/dll/win32/sensapi # Synced to Wine-1.3.37
+reactos/dll/win32/sensapi # Synced to Wine-1.5.4
reactos/dll/win32/setupapi # Forked at Wine-20050524
reactos/dll/win32/shell32 # Forked at Wine-20071011
reactos/dll/win32/shdocvw # Autosync
reactos/dll/win32/shfolder # Autosync
reactos/dll/win32/shlwapi # Autosync
-reactos/dll/win32/slbcsp # Synced to Wine-1.3.37
-reactos/dll/win32/snmpapi # Synced to Wine-1.3.37
-reactos/dll/win32/softpub # Synced to Wine-1.3.37
+reactos/dll/win32/slbcsp # Synced to Wine-1.5.4
+reactos/dll/win32/snmpapi # Synced to Wine-1.5.4
+reactos/dll/win32/softpub # Synced to Wine-1.5.4
reactos/dll/win32/spoolss # Synced to Wine-1.5.4
reactos/dll/win32/stdole2.tlb # Synced to Wine-1.3.37
reactos/dll/win32/stdole32.tlb # Synced to Wine-1.3.37
@@ -165,7 +165,7 @@
reactos/dll/win32/tapi32 # Autosync
reactos/dll/win32/traffic # Synced to Wine-1.5.4
reactos/dll/win32/twain_32 # Out of sync
-reactos/dll/win32/updspapi # Synced to Wine-1.3.37
+reactos/dll/win32/updspapi # Synced to Wine-1.5.4
reactos/dll/win32/url # Synced to Wine-1.5.4
reactos/dll/win32/urlmon # Autosync
reactos/dll/win32/usp10 # Synced to Wine-1.5.4
@@ -173,7 +173,7 @@
reactos/dll/win32/version # Autosync
reactos/dll/win32/wer # Autosync
reactos/dll/win32/windowscodecs # Autosync
-reactos/dll/win32/winemp3.acm # Synced to Wine-1.3.37
+reactos/dll/win32/winemp3.acm # Synced to Wine-1.5.4
reactos/dll/win32/winhttp # Autosync
reactos/dll/win32/wininet # Synced to Wine-1.5.4
reactos/dll/win32/winmm # Forked at Wine-20050628
@@ -181,14 +181,14 @@
reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628
reactos/dll/win32/wintrust # Autosync
reactos/dll/win32/wldap32 # Autosync
-reactos/dll/win32/wmi # Synced to Wine-1.3.37
-reactos/dll/win32/wtsapi32 # Synced to Wine-1.3.37
+reactos/dll/win32/wmi # Synced to Wine-1.5.4
+reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4
reactos/dll/win32/wuapi # Autosync
-reactos/dll/win32/xinput1_1 # Synced to Wine-1.3.37
-reactos/dll/win32/xinput1_2 # Synced to Wine-1.3.37
-reactos/dll/win32/xinput1_3 # Autosync
-reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.3.37
-reactos/dll/win32/xmllite # Synced to Wine-1.3.37
+reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.4
+reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.4
+reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.4
+reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.5.4
+reactos/dll/win32/xmllite # Synced to Wine-1.5.4
reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21
