Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49941: [SPEC2DEF] Implement support for -noname

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 3 22:18:57 2010 New Revision: 49941 URL: http://svn.reactos.org/svn/reactos?rev=49941&view=rev Log: [SPEC2DEF] Implement support for -noname Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Fri Dec 3 22:18:57 2010 @@ -28,6 +28,7 @@ { FL_PRIVATE = 1, FL_STUB = 2, + FL_NONAME = 4, }; enum @@ -323,6 +324,11 @@ if (pexp->uFlags & FL_PRIVATE) { fprintf(fileDest, " PRIVATE"); + } + + if (pexp->uFlags & FL_NONAME) + { + fprintf(fileDest, " NONAME"); } fprintf(fileDest, "\n"); @@ -445,12 +451,16 @@ { exp.uFlags |= FL_PRIVATE; } + else if (CompareToken(pc, "-noname")) + { + exp.uFlags |= FL_NONAME; + } else if (CompareToken(pc, "-stub")) { exp.uFlags |= FL_STUB; } - else if (CompareToken(pc, "-noname") || - CompareToken(pc, "-norelay") || + else if (CompareToken(pc, "-norelay") || + CompareToken(pc, "-register") || CompareToken(pc, "-ret64")) { /* silently ignore these */ @@ -604,7 +614,7 @@ " -l=<file> generates an asm lib stub\n" " -d=<file> generates a def file\n" " -s=<file> generates a stub file\n" - " -n=<file> names the dll\n" + " -n=<name> name of the dll\n" " -@ removes @xx decorations from def file\n" " -r removes redirections from def file\n" " -a=<arch> Set architecture to <arch>. (i386, x86_64, arm)\n");

14 years, 11 months

[tkreuzer] 49940: [CMAKE] Remove duplicated dll import

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 3 21:05:01 2010 New Revision: 49940 URL: http://svn.reactos.org/svn/reactos?rev=49940&view=rev Log: [CMAKE] Remove duplicated dll import Modified: branches/cmake-bringup/base/system/format/CMakeLists.txt Modified: branches/cmake-bringup/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… ============================================================================== --- branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] Fri Dec 3 21:05:01 2010 @@ -7,6 +7,6 @@ set_module_type(format win32cui) -add_importlibs(format ntdll user32 fmifs msvcrt kernel32 ntdll) +add_importlibs(format user32 fmifs msvcrt kernel32 ntdll) add_cab_target(format 1)

14 years, 11 months

[tkreuzer] 49939: [SPEC2DEF] Add aother syntax check, fail on stubs that only have @ as name

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 3 20:43:46 2010 New Revision: 49939 URL: http://svn.reactos.org/svn/reactos?rev=49939&view=rev Log: [SPEC2DEF] Add aother syntax check, fail on stubs that only have @ as name Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Fri Dec 3 20:43:46 2010 @@ -555,6 +555,11 @@ { int i; exp.nNameLength = p - pc; + if (exp.nNameLength < 1) + { + fprintf(stderr, "error, @ in line %d\n", nLine); + return -1; + } exp.nStackBytes = atoi(p + 1); exp.nArgCount = exp.nStackBytes / 4; exp.nCallingConvention = CC_STDCALL;

14 years, 11 months

[spetreolle] 49938: [CMAKE] Revert 49926. Its not needed anymore after timo's stubs.h fix in 49933.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Dec 3 19:41:06 2010 New Revision: 49938 URL: http://svn.reactos.org/svn/reactos?rev=49938&view=rev Log: [CMAKE] Revert 49926. Its not needed anymore after timo's stubs.h fix in 49933. Removed: branches/cmake-bringup/dll/win32/user32/stubs.c Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/user32.spec Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:41:06 2010 @@ -64,7 +64,6 @@ windows/text.c windows/window.c windows/winpos.c - stubs.c user32.rc ${CMAKE_CURRENT_BINARY_DIR}/user32.def) Removed: branches/cmake-bringup/dll/win32/user32/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/stubs.c (removed) @@ -1,201 +1,0 @@ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/config.h" -#include "wine/exception.h" - -#include <stubs.h> - -WINE_DEFAULT_DEBUG_CHANNEL(user32); - -int __stdcall BuildReasonArray() -{ - FIXME("WARNING: calling stub BuildReasonArray()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall CalcMenuBar() -{ - FIXME("WARNING: calling stub CalcMenuBar()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall CreateSystemThreads() -{ - FIXME("WARNING: calling stub CreateSystemThreads()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall DestroyReasons() -{ - FIXME("WARNING: calling stub DestroyReasons()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall DeviceEventWorker() -{ - FIXME("WARNING: calling stub DeviceEventWorker()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall EnterReaderModeHelper() -{ - FIXME("WARNING: calling stub EnterReaderModeHelper()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall GetCursorFrameInfo() -{ - FIXME("WARNING: calling stub GetCursorFrameInfo()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall GetReasonTitleFromReasonCode() -{ - FIXME("WARNING: calling stub GetReasonTitleFromReasonCode()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall InitializeWin32EntryTable() -{ - FIXME("WARNING: calling stub InitializeWin32EntryTable()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall IsProcess16Bit() -{ - FIXME("WARNING: calling stub IsProcess16Bit()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall IsSETEnabled() -{ - FIXME("WARNING: calling stub IsSETEnabled()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall IsWow64Message() -{ - FIXME("WARNING: calling stub IsWow64Message()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall LoadKeyboardLayoutEx() -{ - FIXME("WARNING: calling stub LoadKeyboardLayoutEx()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall MessageBoxTimeoutA() -{ - FIXME("WARNING: calling stub MessageBoxTimeoutA()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall MessageBoxTimeoutW() -{ - FIXME("WARNING: calling stub MessageBoxTimeoutW()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall PaintMenuBar() -{ - FIXME("WARNING: calling stub PaintMenuBar()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall ReasonCodeNeedsBugID() -{ - FIXME("WARNING: calling stub ReasonCodeNeedsBugID()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall ReasonCodeNeedsComment() -{ - FIXME("WARNING: calling stub ReasonCodeNeedsComment()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall RecordShutdownReason() -{ - FIXME("WARNING: calling stub RecordShutdownReason()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall RegisterMessagePumpHook() -{ - FIXME("WARNING: calling stub RegisterMessagePumpHook()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall SetConsoleReserveKeys() -{ - FIXME("WARNING: calling stub SetConsoleReserveKeys()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall SoftModalMessageBox() -{ - FIXME("WARNING: calling stub SoftModalMessageBox()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall TranslateMessageEx() -{ - FIXME("WARNING: calling stub TranslateMessageEx()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -#if 0 -int __stdcall UnregisterMessagePumpHook() -{ - FIXME("WARNING: calling stub UnregisterMessagePumpHook()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} -#endif - -int __stdcall UserLpkPSMTextOut() -{ - FIXME("WARNING: calling stub UserLpkPSMTextOut()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall UserLpkTabbedTextOut() -{ - FIXME("WARNING: calling stub UserLpkTabbedTextOut()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - -int __stdcall Win32PoolAllocationStats() -{ - FIXME("WARNING: calling stub Win32PoolAllocationStats()\n"); - __wine_spec_unimplemented_stub("user32.dll", __FUNCTION__); - return 0; -} - Modified: branches/cmake-bringup/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/user32.spec [iso-8859-1] Fri Dec 3 19:41:06 2010 @@ -20,8 +20,8 @@ @ stdcall BroadcastSystemMessageExA(long ptr long long long ptr) @ stdcall BroadcastSystemMessageExW(long ptr long long long ptr) @ stdcall BroadcastSystemMessageW(long ptr long long long) -@ stdcall BuildReasonArray() -@ stdcall CalcMenuBar() +@ stub BuildReasonArray +@ stub CalcMenuBar @ stdcall CallMsgFilter(ptr long) CallMsgFilterA @ stdcall CallMsgFilterA(ptr long) @ stdcall CallMsgFilterW(ptr long) @@ -94,7 +94,7 @@ @ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) @ stdcall CreateMenu() @ stdcall CreatePopupMenu() -@ stdcall CreateSystemThreads() +@ stub CreateSystemThreads @ stdcall CreateWindowExA(long str str long long long long long long long long ptr) @ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) @ stdcall CreateWindowStationA(str long long ptr) @@ -151,9 +151,9 @@ @ stdcall DestroyCursor(long) @ stdcall DestroyIcon(long) @ stdcall DestroyMenu(long) NtUserDestroyMenu -@ stdcall DestroyReasons() +@ stub DestroyReasons @ stdcall DestroyWindow(long) NtUserDestroyWindow -@ stdcall DeviceEventWorker() +@ stub DeviceEventWorker @ stdcall DialogBoxIndirectParamA(long ptr long ptr long) @ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long) @ stdcall DialogBoxIndirectParamW(long ptr long ptr long) @@ -201,7 +201,7 @@ @ stdcall EndMenu() @ stdcall EndPaint(long ptr) NtUserEndPaint @ stdcall EndTask(ptr long long) -@ stdcall EnterReaderModeHelper() +@ stub EnterReaderModeHelper @ stdcall EnumChildWindows(long ptr long) @ stdcall EnumClipboardFormats(long) @ stdcall EnumDesktopWindows(long ptr ptr) @@ -266,7 +266,7 @@ @ stdcall GetClipboardViewer() NtUserGetClipboardViewer @ stdcall GetComboBoxInfo(long ptr) ; Direct call NtUserGetComboBoxInfo @ stdcall GetCursor() -@ stdcall GetCursorFrameInfo() +@ stub GetCursorFrameInfo @ stdcall GetCursorInfo(ptr) NtUserGetCursorInfo @ stdcall GetCursorPos(ptr) @ stdcall GetDC(long) NtUserGetDC @@ -339,7 +339,7 @@ @ stdcall GetRawInputDeviceInfoA(ptr long ptr ptr) @ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) @ stdcall GetRawInputDeviceList(ptr ptr long) -@ stdcall GetReasonTitleFromReasonCode() +@ stub GetReasonTitleFromReasonCode @ stdcall GetRegisteredRawInputDevices(ptr ptr long) @ stdcall GetScrollBarInfo(long long ptr) NtUserGetScrollBarInfo @ stdcall GetScrollInfo(long long ptr) @@ -399,7 +399,7 @@ @ stdcall InSendMessageEx(ptr) @ stdcall InflateRect(ptr long long) @ stdcall InitializeLpkHooks(ptr) -@ stdcall InitializeWin32EntryTable() +@ stub InitializeWin32EntryTable @ stdcall InsertMenuA(long long long long ptr) @ stdcall InsertMenuItemA(long long long ptr) @ stdcall InsertMenuItemW(long long long ptr) @@ -427,9 +427,9 @@ @ stdcall IsHungAppWindow(long) @ stdcall IsIconic(long) @ stdcall IsMenu(long) -@ stdcall IsProcess16Bit() +@ stub IsProcess16Bit @ stdcall IsRectEmpty(ptr) -@ stdcall IsSETEnabled() +@ stub IsSETEnabled @ stdcall IsServerSideWindow(long) @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @@ -437,7 +437,7 @@ @ stdcall IsWindowInDestroy(long) @ stdcall IsWindowUnicode(long) @ stdcall IsWindowVisible(long) -@ stdcall IsWow64Message() +@ stub IsWow64Message @ stdcall IsZoomed(long) @ stdcall KillSystemTimer(long long) @ stdcall KillTimer(long long) NtUserKillTimer @@ -454,7 +454,7 @@ @ stdcall LoadImageA(long str long long long long) @ stdcall LoadImageW(long wstr long long long long) @ stdcall LoadKeyboardLayoutA(str long) -@ stdcall LoadKeyboardLayoutEx() +@ stub LoadKeyboardLayoutEx @ stdcall LoadKeyboardLayoutW(wstr long) @ stdcall LoadLocalFonts() @ stdcall LoadMenuA(long str) @@ -487,8 +487,8 @@ @ stdcall MessageBoxExW(long wstr wstr long long) @ stdcall MessageBoxIndirectA(ptr) @ stdcall MessageBoxIndirectW(ptr) -@ stdcall MessageBoxTimeoutA() -@ stdcall MessageBoxTimeoutW() +@ stub MessageBoxTimeoutA +@ stub MessageBoxTimeoutW @ stdcall MessageBoxW(long wstr wstr long) @ stdcall ModifyMenuA(long long long long ptr) @ stdcall ModifyMenuW(long long long long ptr) @@ -514,7 +514,7 @@ @ stdcall OpenWindowStationW(wstr long long) @ stdcall PackDDElParam(long long long) @ stdcall PaintDesktop(long) NtUserPaintDesktop -@ stdcall PaintMenuBar() +@ stub PaintMenuBar @ stdcall PeekMessageA(ptr long long long long) @ stdcall PeekMessageW(ptr long long long long) @ stdcall PostMessageA(long long long long) @@ -533,9 +533,9 @@ @ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA @ stdcall RealGetWindowClassA(long ptr long) @ stdcall RealGetWindowClassW(long ptr long) -@ stdcall ReasonCodeNeedsBugID() -@ stdcall ReasonCodeNeedsComment() -@ stdcall RecordShutdownReason() +@ stub ReasonCodeNeedsBugID +@ stub ReasonCodeNeedsComment +@ stub RecordShutdownReason @ stdcall RedrawWindow(long ptr long long) NtUserRedrawWindow @ stdcall RegisterClassA(ptr) @ stdcall RegisterClassExA(ptr) @@ -547,7 +547,7 @@ @ stdcall RegisterDeviceNotificationW(long ptr long) @ stdcall RegisterHotKey(long long long long) NtUserRegisterHotKey @ stdcall RegisterLogonProcess(long long) -@ stdcall RegisterMessagePumpHook() +@ stub RegisterMessagePumpHook @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow(long) @@ -593,7 +593,7 @@ @ stdcall SetClassWord(long long long) ; Direct call NtUserSetClassWord @ stdcall SetClipboardData(long long) @ stdcall SetClipboardViewer(long) NtUserSetClipboardViewer -@ stdcall SetConsoleReserveKeys() +@ stub SetConsoleReserveKeys @ stdcall SetCursor(long) NtUserSetCursor @ stdcall SetCursorContents(ptr ptr) NtUserSetCursorContents @ stdcall SetCursorPos(long long) @@ -667,7 +667,7 @@ @ stdcall ShowStartGlass(long) @ stdcall ShowWindow(long long) NtUserShowWindow @ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync -@ stdcall SoftModalMessageBox() +@ stub SoftModalMessageBox @ stdcall SubtractRect(ptr ptr ptr) @ stdcall SwapMouseButton(long) @ stdcall SwitchDesktop(long) NtUserSwitchDesktop @@ -690,7 +690,7 @@ @ stdcall TranslateAcceleratorW(long long ptr) @ stdcall TranslateMDISysAccel(long ptr) @ stdcall TranslateMessage(ptr) -@ stdcall TranslateMessageEx() +@ stub TranslateMessageEx @ stdcall UnhookWinEvent(long) NtUserUnhookWinEvent @ stdcall UnhookWindowsHook(long ptr) @ stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx @@ -702,7 +702,7 @@ @ stdcall UnregisterClassW(wstr long) @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey -@ stdcall UnregisterMessagePumpHook() +@ stub UnregisterMessagePumpHook @ stdcall UnregisterUserApiHook() NtUserUnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) @@ -711,8 +711,8 @@ @ stdcall User32InitializeImmEntryTable(ptr) @ stdcall UserClientDllInitialize(long long ptr) DllMain @ stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess -@ stdcall UserLpkPSMTextOut() -@ stdcall UserLpkTabbedTextOut() +@ stub UserLpkPSMTextOut +@ stub UserLpkTabbedTextOut @ stdcall UserRealizePalette(long) @ stdcall UserRegisterWowHandlers(ptr ptr) @ stdcall ValidateRect(long ptr) NtUserValidateRect @@ -727,7 +727,7 @@ @ stdcall WINNLSGetIMEHotkey(long) @ stdcall WaitForInputIdle(long long) @ stdcall WaitMessage() NtUserWaitMessage -@ stdcall Win32PoolAllocationStats() +@ stub Win32PoolAllocationStats @ stdcall WinHelpA(long str long long) @ stdcall WinHelpW(long wstr long long) @ stdcall WindowFromDC(long)

14 years, 11 months

[akhaldi] 49937: [CMAKE] - Improve some modules. - Convert notifyhook def into a spec, and add the import lib target. - Get rid of the import libs that we already generate (the rest are still just ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 3 19:20:45 2010 New Revision: 49937 URL: http://svn.reactos.org/svn/reactos?rev=49937&view=rev Log: [CMAKE] - Improve some modules. - Convert notifyhook def into a spec, and add the import lib target. - Get rid of the import libs that we already generate (the rest are still just temporary) Added: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.spec - copied, changed from r49933, branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def Removed: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def branches/cmake-bringup/importlibs/libadvapi32.a branches/cmake-bringup/importlibs/libbattc.a branches/cmake-bringup/importlibs/libbootvid.a branches/cmake-bringup/importlibs/libcabinet.a branches/cmake-bringup/importlibs/libclass2.a branches/cmake-bringup/importlibs/libcomctl32.a branches/cmake-bringup/importlibs/libcrypt32.a branches/cmake-bringup/importlibs/libcryptui.a branches/cmake-bringup/importlibs/libcsrsrv.a branches/cmake-bringup/importlibs/libd3d9.a branches/cmake-bringup/importlibs/libd3dx9_24.a branches/cmake-bringup/importlibs/libd3dx9_36.a branches/cmake-bringup/importlibs/libdbghelp.a branches/cmake-bringup/importlibs/libdevmgr.a branches/cmake-bringup/importlibs/libdhcpcsvc.a branches/cmake-bringup/importlibs/libdrmk.a branches/cmake-bringup/importlibs/libdxgthk.a branches/cmake-bringup/importlibs/libfmifs.a branches/cmake-bringup/importlibs/libftfd.a branches/cmake-bringup/importlibs/libgdi32.a branches/cmake-bringup/importlibs/libgdiplus.a branches/cmake-bringup/importlibs/libhal.a branches/cmake-bringup/importlibs/libimm32.a branches/cmake-bringup/importlibs/libkdcom.a branches/cmake-bringup/importlibs/libkernel32.a branches/cmake-bringup/importlibs/libks.a branches/cmake-bringup/importlibs/libloadperf.a branches/cmake-bringup/importlibs/liblsasrv.a branches/cmake-bringup/importlibs/libmlang.a branches/cmake-bringup/importlibs/libmpr.a branches/cmake-bringup/importlibs/libmsi.a branches/cmake-bringup/importlibs/libmsimg32.a branches/cmake-bringup/importlibs/libmsvcrt.a branches/cmake-bringup/importlibs/libnetapi32.a branches/cmake-bringup/importlibs/libnotifyhook.a branches/cmake-bringup/importlibs/libntdll.a branches/cmake-bringup/importlibs/libntoskrnl.a branches/cmake-bringup/importlibs/libole32.a branches/cmake-bringup/importlibs/liboleaut32.a branches/cmake-bringup/importlibs/libpciidex.a branches/cmake-bringup/importlibs/libriched20.a branches/cmake-bringup/importlibs/librpcrt4.a branches/cmake-bringup/importlibs/librsaenh.a branches/cmake-bringup/importlibs/libsamlib.a branches/cmake-bringup/importlibs/libscsiport.a branches/cmake-bringup/importlibs/libsetupapi.a branches/cmake-bringup/importlibs/libshdocvw.a branches/cmake-bringup/importlibs/libshell32.a branches/cmake-bringup/importlibs/libshlwapi.a branches/cmake-bringup/importlibs/libsmdll.a branches/cmake-bringup/importlibs/libsnmpapi.a branches/cmake-bringup/importlibs/libspoolss.a branches/cmake-bringup/importlibs/liburlmon.a branches/cmake-bringup/importlibs/libuser32.a branches/cmake-bringup/importlibs/libuserenv.a branches/cmake-bringup/importlibs/libvideoprt.a branches/cmake-bringup/importlibs/libwin32k.a branches/cmake-bringup/importlibs/libwindowscodecs.a branches/cmake-bringup/importlibs/libwined3d.a branches/cmake-bringup/importlibs/libwinspool.a branches/cmake-bringup/importlibs/libwintrust.a branches/cmake-bringup/importlibs/libwmilib.a branches/cmake-bringup/importlibs/libws2_32.a branches/cmake-bringup/importlibs/libws2help.a Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -66,23 +66,12 @@ wine mingw_wmain mingw_common - uuid - -ladvapi32 - -lgdi32 - -luser32 - -lws2_32 - -lmsimg32 - -lcomctl32 - -lole32 - -loleaut32 - -lshell32 - -lnotifyhook - -lmsvcrt - -lkernel32 - -lntdll) + uuid) + +add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 notifyhook msvcrt kernel32 ntdll) set_image_base(explorer 0x00400000) add_dependencies(explorer psdk buildno_header) add_cab_target(explorer 4) -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4) Modified: branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -1,13 +1,18 @@ add_definitions(-D_NOTIFYHOOK_IMPL) -add_library(notifyhook SHARED +spec2def(notifyhook.dll notifyhook.spec) + +list(APPEND SOURCE notifyhook.c notifyhook.rc - notifyhook.def) + ${CMAKE_CURRENT_BINARY_DIR}/notifyhook.def) + +add_library(notifyhook SHARED ${SOURCE}) set_module_type(notifyhook win32dll) add_importlibs(notifyhook user32 msvcrt kernel32) +add_importlib_target(notifyhook.spec) add_cab_target(notifyhook 1) Removed: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def (removed) @@ -1,6 +1,0 @@ -LIBRARY notifyhook.dll -EXPORTS -DeinstallNotifyHook -GetWindowModulePath -GetWindowModulePathCopyData -InstallNotifyHook Copied: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.spec (from r49933, branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def) URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.spec [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -1,6 +1,4 @@ -LIBRARY notifyhook.dll -EXPORTS -DeinstallNotifyHook -GetWindowModulePath -GetWindowModulePathCopyData -InstallNotifyHook +@ cdecl DeinstallNotifyHook() +@ cdecl GetWindowModulePath(ptr) +@ cdecl GetWindowModulePathCopyData(ptr ptr ptr long) +@ cdecl InstallNotifyHook() Modified: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -60,15 +60,19 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D_SHELL32_) -add_definitions(-DCOM_NO_WINDOWS_H) -add_definitions(-D_WINE) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/lib/recyclebin) -include_directories(${REACTOS_SOURCE_DIR}) +add_definitions( + -D_SHELL32_ + -DCOM_NO_WINDOWS_H + -D_WINE) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/recyclebin + ${REACTOS_SOURCE_DIR}) add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE}) set_module_type(shell32 win32dll) @@ -94,7 +98,5 @@ msvcrt ntdll) - add_cab_target(shell32 1) add_importlib_target(shell32.spec) - Removed: branches/cmake-bringup/importlibs/libadvapi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libadv… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libbattc.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libbat… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libbootvid.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libboo… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcabinet.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcab… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libclass2.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcla… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcomctl32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcom… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcrypt32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcry… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcryptui.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcry… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcsrsrv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcsr… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libd3d9.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libd3dx9_24.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libd3dx9_36.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdbghelp.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdbg… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdevmgr.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdev… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdhcpcsvc.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdhc… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdrmk.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdrm… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdxgthk.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdxg… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libfmifs.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libfmi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libftfd.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libftf… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libgdi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libgdi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libgdiplus.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libgdi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libhal.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libhal… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libimm32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libimm… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libkdcom.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libkdc… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libkernel32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libker… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libks.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libks.… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libloadperf.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libloa… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/liblsasrv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/liblsa… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmlang.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmla… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmpr.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmpr… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmsi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmsimg32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmsvcrt.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsv… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libnetapi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnet… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libnotifyhook.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnot… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libntdll.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libntd… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libntoskrnl.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnto… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libole32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libole… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/liboleaut32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libole… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libpciidex.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libpci… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libriched20.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libric… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/librpcrt4.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librpc… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/librsaenh.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librsa… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libsamlib.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsam… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libscsiport.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libscs… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libsetupapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libset… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libshdocvw.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshd… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libshell32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshe… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libshlwapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshl… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libsmdll.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsmd… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libsnmpapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsnm… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libspoolss.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libspo… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/liburlmon.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/liburl… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libuser32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libuse… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libuserenv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libuse… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libvideoprt.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libvid… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwin32k.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwindowscodecs.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwined3d.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwinspool.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwintrust.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwmilib.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwmi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libws2_32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libws2… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libws2help.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libws2… ============================================================================== Binary file - no diff available.

14 years, 11 months

[jimtabor] 49936: [Win32k] - More fixes to In Send message support. One more case fixed in looping back.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 3 18:13:28 2010 New Revision: 49936 URL: http://svn.reactos.org/svn/reactos?rev=49936&view=rev Log: [Win32k] - More fixes to In Send message support. One more case fixed in looping back. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Dec 3 18:13:28 2010 @@ -532,7 +532,8 @@ /* free the message */ ExFreePoolWithTag(Message, TAG_USRMSG); - pti->pcti->CTI_flags &= ~CTI_INSENDMESSAGE; + /* do not hangup on the user if this is reentering */ + if (!SaveMsg) pti->pcti->CTI_flags &= ~CTI_INSENDMESSAGE; pti->pusmCurrent = SaveMsg; return(TRUE);

14 years, 11 months

[jimtabor] 49935: [Win32k] - More fixes to In Send and Reply message support.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 3 18:02:02 2010 New Revision: 49935 URL: http://svn.reactos.org/svn/reactos?rev=49935&view=rev Log: [Win32k] - More fixes to In Send and Reply message support. Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Fri Dec 3 18:02:02 2010 @@ -38,6 +38,7 @@ LRESULT* Result; LRESULT lResult; struct _USER_MESSAGE_QUEUE* SenderQueue; + struct _USER_MESSAGE_QUEUE* CallBackSenderQueue; SENDASYNCPROC CompletionCallback; ULONG_PTR CompletionCallbackContext; /* entry in the dispatching list of the sender's message queue */ Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Fri Dec 3 18:02:02 2010 @@ -75,6 +75,7 @@ PCLIENTINFO pClientInfo; FLONG TIF_flags; PUNICODE_STRING pstrAppName; + struct _USER_SENT_MESSAGE *pusmCurrent; LONG timeLast; ULONG_PTR idLast; INT exitCode; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Fri Dec 3 18:02:02 2010 @@ -1383,7 +1383,8 @@ Message->Result = 0; Message->lResult = 0; Message->QS_Flags = 0; - Message->SenderQueue = NULL; // mjmartin, you are right! This is null. Win32Thread->MessageQueue; + Message->SenderQueue = NULL; // mjmartin, you are right! This is null. + Message->CallBackSenderQueue = Win32Thread->MessageQueue; IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Fri Dec 3 18:02:02 2010 @@ -102,18 +102,13 @@ break; case THREADSTATE_INSENDMESSAGE: { - PUSER_SENT_MESSAGE Message; - PLIST_ENTRY Entry; - PUSER_MESSAGE_QUEUE MessageQueue = - ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue; + PUSER_SENT_MESSAGE Message = + ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->pusmCurrent; DPRINT1("THREADSTATE_INSENDMESSAGE\n"); ret = ISMEX_NOSEND; - if (!IsListEmpty(&MessageQueue->SentMessagesListHead)) + if (Message) { - Entry = MessageQueue->SentMessagesListHead.Flink; - Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); - if (Message->SenderQueue) ret = ISMEX_SEND; else Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Dec 3 18:02:02 2010 @@ -418,7 +418,7 @@ BOOLEAN FASTCALL co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue) { - PUSER_SENT_MESSAGE Message; + PUSER_SENT_MESSAGE SaveMsg, Message; PLIST_ENTRY Entry; LRESULT Result; PTHREADINFO pti; @@ -433,9 +433,14 @@ Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); pti = MessageQueue->Thread->Tcb.Win32Thread; + + SaveMsg = pti->pusmCurrent; + pti->pusmCurrent = Message; + // Processing a message sent to it from another thread. - if ( MessageQueue != Message->SenderQueue ) // most likely, but, to be sure. - { + if ( ( Message->SenderQueue && MessageQueue != Message->SenderQueue) || + ( Message->CallBackSenderQueue && MessageQueue != Message->CallBackSenderQueue )) + { // most likely, but, to be sure. pti->pcti->CTI_flags |= CTI_INSENDMESSAGE; // Let the user know... } @@ -528,6 +533,7 @@ ExFreePoolWithTag(Message, TAG_USRMSG); pti->pcti->CTI_flags &= ~CTI_INSENDMESSAGE; + pti->pusmCurrent = SaveMsg; return(TRUE); } @@ -659,6 +665,7 @@ Message->lResult = 0; Message->QS_Flags = 0; Message->SenderQueue = ThreadQueue; + Message->CallBackSenderQueue = NULL; IntReferenceMessageQueue(ThreadQueue); Message->CompletionCallback = NULL; Message->CompletionCallbackContext = 0; @@ -1606,34 +1613,26 @@ return MessageQueue->ExtraInfo; } +// ReplyMessage is called by the thread receiving the window message. BOOL FASTCALL co_MsqReplyMessage( LRESULT lResult ) { PUSER_SENT_MESSAGE Message; - PLIST_ENTRY Entry; PTHREADINFO pti; - PUSER_MESSAGE_QUEUE MessageQueue; pti = PsGetCurrentThreadWin32Thread(); - MessageQueue = pti->MessageQueue; - - if(!MessageQueue) return FALSE; - - if (IsListEmpty(&MessageQueue->SentMessagesListHead)) - { - return(FALSE); - } - // Do we loop through all msgs or just set the first one? - Entry = MessageQueue->SentMessagesListHead.Flink; - Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); + Message = pti->pusmCurrent; + + if(!Message) return FALSE; if (Message->QS_Flags & QS_SMRESULT) return FALSE; + // SendMessageXxx || Callback msg and not a notify msg if (Message->SenderQueue || Message->CompletionCallback) { Message->lResult = lResult; Message->QS_Flags |= QS_SMRESULT; - MsqWakeQueue(MessageQueue, 0, TRUE); // Wake it up!? Bits? + // See co_MsqDispatchOneSentMessage, change bits already accounted for and cleared and this msg is going away.. } return TRUE; }

14 years, 11 months

[tkreuzer] 49934: [CMAKE] define inline to __inline for host tools on MSVC builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 3 17:51:03 2010 New Revision: 49934 URL: http://svn.reactos.org/svn/reactos?rev=49934&view=rev Log: [CMAKE] define inline to __inline for host tools on MSVC builds Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:51:03 2010 @@ -8,6 +8,9 @@ if(NOT CMAKE_CROSSCOMPILING) add_definitions(-DTARGET_i386) +if(MSVC) +add_definitions(-Dinline=__inline) +endif() include_directories( ${REACTOS_SOURCE_DIR}/tools/unicode

14 years, 11 months

[tkreuzer] 49933: [CMAKE] include debug.h explicitly from reactos folder, to avoid including the wine one. Fixes ws2_32

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 3 17:48:03 2010 New Revision: 49933 URL: http://svn.reactos.org/svn/reactos?rev=49933&view=rev Log: [CMAKE] include debug.h explicitly from reactos folder, to avoid including the wine one. Fixes ws2_32 Modified: branches/cmake-bringup/include/reactos/stubs.h Modified: branches/cmake-bringup/include/reactos/stubs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/s… ============================================================================== --- branches/cmake-bringup/include/reactos/stubs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/stubs.h [iso-8859-1] Fri Dec 3 17:48:03 2010 @@ -5,7 +5,7 @@ #include "wine/config.h" #include "wine/exception.h" -#include <debug.h> +#include <reactos/debug.h> #define __wine_spec_unimplemented_stub(module, function) \ { \

14 years, 11 months

[akhaldi] 49932: [CMAKE] - Improve more modules.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 3 17:41:29 2010 New Revision: 49932 URL: http://svn.reactos.org/svn/reactos?rev=49932&view=rev Log: [CMAKE] - Improve more modules. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -102,8 +102,8 @@ add_subdirectory(mssip32) #add_subdirectory(mstask) add_subdirectory(msvcrt) -add_subdirectory(msvcrt20) -add_subdirectory(msvcrt40) +#add_subdirectory(msvcrt20) FIX spec2def +#add_subdirectory(msvcrt40) FIX spec2def add_subdirectory(msvfw32) add_subdirectory(msvidc32) add_subdirectory(mswsock) @@ -212,7 +212,7 @@ add_subdirectory(wlanapi) add_subdirectory(wldap32) add_subdirectory(wmi) -add_subdirectory(ws2_32) +#add_subdirectory(ws2_32) SPEC add_subdirectory(ws2_32_new) add_subdirectory(ws2help) add_subdirectory(wshirda) Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/b… ============================================================================== --- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -12,4 +12,4 @@ add_importlibs(battc ntoskrnl hal) add_cab_target(battc 2) -add_importlib_target(battc.spec) +add_importlib_target(battc.spec batc.sys) Modified: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -11,6 +11,6 @@ set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k) -add_importlib_target(dxgthk.spec) +add_importlib_target(dxgthk.spec dxgthk.sys) add_cab_target(dxgthk 2) Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -5,7 +5,7 @@ -DBUILDING_KS -D_COMDDK_) -add_library(ks SHARED +list(APPEND SOURCE api.c allocators.c bag.c @@ -30,16 +30,18 @@ ks.rc ${CMAKE_CURRENT_BINARY_DIR}/ks.def) +add_library(ks SHARED ${SOURCE}) + set_target_properties(ks PROPERTIES SUFFIX ".sys") + set_entrypoint(ks 0) set_subsystem(ks native) set_image_base(ks 0x00010000) -target_link_libraries(ks - ${PSEH_LIB}) +target_link_libraries(ks ${PSEH_LIB}) add_importlibs(ks ntoskrnl hal msvcrt) add_dependencies(ks psdk bugcodes) add_cab_target(ks 2) -add_importlib_target(ks.spec) +add_importlib_target(ks.spec ks.sys) Modified: branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/n… ============================================================================== --- branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -43,4 +43,4 @@ add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE}) add_cab_target(ndis 2) -add_importlib_target(ndis.spec) +add_importlib_target(ndis.spec ndis.sys) Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -3,14 +3,17 @@ spec2def(class2.sys class2.spec) -add_library(class2 SHARED +list(APPEND SOURCE class2.c class2.rc ${CMAKE_CURRENT_BINARY_DIR}/class2.def) +add_library(class2 SHARED ${SOURCE}) + set_module_type(class2 kernelmodedriver) + add_importlibs(class2 scsiport ntoskrnl hal) +add_importlib_target(class2.spec class2.sys) add_minicd_target(class2 reactos class2.sys) add_livecd_target(class2 reactos/system32/drivers) -add_importlib_target(class2.spec) Modified: branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -1,7 +1,7 @@ spec2def(pciidex.sys pciidex.spec) -add_library(pciidex SHARED +list(APPEND SOURCE fdo.c miniport.c misc.c @@ -10,8 +10,10 @@ pciidex.rc ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def) +add_library(pciidex SHARED ${SOURCE}) + set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl) add_cab_target(pciidex 2) -add_importlib_target(pciidex.spec) +add_importlib_target(pciidex.spec pciidex.sys) Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -1,17 +1,18 @@ spec2def(scsiport.sys scsiport.spec) -add_library(scsiport SHARED - scsiport.c - stubs.c - scsiport.rc - ) - -target_link_libraries(scsiport ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def) +list(APPEND SOURCE + scsiport.c + stubs.c + scsiport.rc + ${CMAKE_CURRENT_BINARY_DIR}/scsiport.def) + +add_library(scsiport SHARED ${SOURCE}) set_module_type(scsiport kernelmodedriver) + add_importlibs(scsiport ntoskrnl hal) +add_importlib_target(scsiport.spec scsiport.sys) add_minicd_target(scsiport reactos scsiport.sys) add_livecd_target(scsiport reactos/system32/drivers) -add_importlib_target(scsiport.spec) Modified: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -30,4 +30,4 @@ add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) add_cab_target(videoprt 2) -add_importlib_target(videoprt.spec) +add_importlib_target(videoprt.spec videoprt.sys) Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -12,6 +12,6 @@ set_module_type(drmk kernelmodedriver) add_importlibs(drmk ntoskrnl) -add_importlib_target(drmk.spec) +add_importlib_target(drmk.spec drmk.sys) add_cab_target(drmk 2) Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -11,6 +11,6 @@ set_module_type(wmilib kernelmodedriver) add_importlibs(wmilib ntoskrnl) -add_importlib_target(wmilib.spec) +add_importlib_target(wmilib.spec wmilib.sys) add_cab_target(wmilib 2) Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -192,5 +192,5 @@ add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) add_dependencies(win32k gendib_generated subsystem_napi) add_cab_target(win32k 1) -add_importlib_target(win32k.spec) +add_importlib_target(win32k.spec win32k.sys)

14 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs