Author: sserapion Date: Sat Oct 25 03:57:39 2008 New Revision: 36937
URL: http://svn.reactos.org/svn/reactos?rev=36937&view=rev Log: - Remove merge artifact - Fix user32 spec. - Fix userenv.rbuild
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/lang/de-DE.rc branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.spec branches/ros-amd64-bringup/reactos/dll/win32/userenv/userenv.rbuild
Modified: branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] Sat Oct 25 03:57:39 2008 @@ -227,4 +227,3 @@ IDS_DUP_IPADDR "Die IP-Adresse ist bereits in der Liste vorhanden." IDS_DUP_GW "Der Standardgateway ist bereits in der Liste vorhanden." END ->>>>>>> .merge-right.r36700
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.spec [iso-8859-1] Sat Oct 25 03:57:39 2008 @@ -625,7 +625,7 @@ @ stdcall SetInternalWindowPos(long long ptr ptr) @ stdcall SetKeyboardState(ptr) @ stdcall SetLastErrorEx(long long) -@ stdcall SetLayeredWindowAttributes(ptr long long long) win32k.NtUserSetLayeredWindowAttributes +@ stdcall SetLayeredWindowAttributes(ptr long long long) NtUserSetLayeredWindowAttributes @ stdcall SetLogonNotifyWindow(long long) @ stdcall SetMenu(long long) @ stdcall SetMenuContextHelpId(long long) @@ -725,7 +725,7 @@ @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey # @ stub UnregisterMessagePumpHook # @ stub UnregisterUserApiHook -@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) +@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) NtUserUpdateLayeredWindow @ stdcall UpdatePerUserSystemParameters(long long) @ stdcall UpdateWindow(long) @ stdcall User32InitializeImmEntryTable(ptr)
Modified: branches/ros-amd64-bringup/reactos/dll/win32/userenv/userenv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/userenv/userenv.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/userenv/userenv.rbuild [iso-8859-1] Sat Oct 25 03:57:39 2008 @@ -1,5 +1,5 @@ <module name="userenv" type="win32dll" baseaddress="${BASEADDRESS_USERENV}" installbase="system32" installname="userenv.dll"> - <importlibrary definition="userenv.spec.def" /> + <importlibrary definition="userenv.spec" /> <include base="userenv">.</include> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define>
-
sserapion＠svn.reactos.org