Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[gdalsnes] 17671: -surround user part (most of it) with a single lock (currently a mutex, but will be a resource). other now useless locks will be removed next.

by gdalsnes＠svn.reactos.com

-surround user part (most of it) with a single lock (currently a mutex, but will be a resource). other now useless locks will be removed next. -dont call NtUser fucnctions internally (they are syscalls only!) -prepend co_ to functions leading to a "callout" (callback, wait, etc) Modified: trunk/reactos/subsys/win32k/eng/window.c Modified: trunk/reactos/subsys/win32k/include/callback.h Modified: trunk/reactos/subsys/win32k/include/caret.h Modified: trunk/reactos/subsys/win32k/include/csr.h Modified: trunk/reactos/subsys/win32k/include/desktop.h Modified: trunk/reactos/subsys/win32k/include/focus.h Modified: trunk/reactos/subsys/win32k/include/guicheck.h Modified: trunk/reactos/subsys/win32k/include/hook.h Modified: trunk/reactos/subsys/win32k/include/msgqueue.h Modified: trunk/reactos/subsys/win32k/include/painting.h Modified: trunk/reactos/subsys/win32k/include/scroll.h Added: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/include/vis.h Modified: trunk/reactos/subsys/win32k/include/win32k.h Modified: trunk/reactos/subsys/win32k/include/winpos.h Modified: trunk/reactos/subsys/win32k/include/winsta.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c Modified: trunk/reactos/subsys/win32k/ntuser/caret.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/guicheck.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/metric.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Added: trunk/reactos/subsys/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/prop.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/timer.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/subsys/win32k/objects/color.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/win32k.xml _____ Modified: trunk/reactos/subsys/win32k/eng/window.c --- trunk/reactos/subsys/win32k/eng/window.c 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/eng/window.c 2005-09-05 21:19:23 UTC (rev 17671) @@ -207,15 +207,22 @@ WNDGDI *WndObjInt = NULL; WNDOBJ *WndObjUser = NULL; PWINDOW_OBJECT Window; + BOOL calledFromUser; + DECLARE_RETURN(WNDOBJ*); DPRINT("EngCreateWnd: pso = 0x%x, hwnd = 0x%x, pfn = 0x%x, fl = 0x%x, pixfmt = %d\n", pso, hwnd, pfn, fl, iPixelFormat); + calledFromUser = UserIsEntered(); + if (!calledFromUser){ + UserEnterShared(); + } + /* Get window object */ Window = IntGetWindowObject(hwnd); if (Window == NULL) { - return NULL; + RETURN( NULL); } /* Create WNDOBJ */ @@ -224,7 +231,7 @@ { IntReleaseWindowObject(Window); DPRINT1("Failed to allocate memory for a WND structure!\n"); - return NULL; + RETURN( NULL); } /* Fill the clipobj */ @@ -233,7 +240,7 @@ { IntReleaseWindowObject(Window); EngFreeMem(WndObjInt); - return NULL; + RETURN( NULL); } /* Fill user object */ @@ -257,7 +264,15 @@ DPRINT("EngCreateWnd: SUCCESS!\n"); - return WndObjUser; + RETURN( WndObjUser); + +CLEANUP: + + if (!calledFromUser){ + UserLeave(); + } + + END_CLEANUP; } @@ -271,9 +286,15 @@ { WNDGDI *WndObjInt = ObjToGDI(pwo, WND); PWINDOW_OBJECT Window; + BOOL calledFromUser; DPRINT("EngDeleteWnd: pwo = 0x%x\n", pwo); + calledFromUser = UserIsEntered(); + if (!calledFromUser){ + UserEnterExclusive(); + } + /* Get window object */ Window = IntGetWindowObject(WndObjInt->Hwnd); if (Window == NULL) @@ -290,6 +311,10 @@ IntReleaseWindowObject(Window); } + if (!calledFromUser){ + UserLeave(); + } + /* Free resources */ IntEngDeleteClipRegion(WndObjInt->ClientClipObj); EngFreeMem(WndObjInt); _____ Modified: trunk/reactos/subsys/win32k/include/callback.h --- trunk/reactos/subsys/win32k/include/callback.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/callback.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -2,7 +2,7 @@ #define _WIN32K_CALLBACK_H LRESULT STDCALL -IntCallWindowProc(WNDPROC Proc, +co_IntCallWindowProc(WNDPROC Proc, BOOLEAN IsAnsiProc, HWND Wnd, UINT Message, @@ -11,7 +11,7 @@ INT lParamBufferSize); VOID STDCALL -IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback, +co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback, HWND hWnd, UINT Msg, ULONG_PTR CompletionCallbackContext, @@ -19,13 +19,13 @@ HMENU STDCALL -IntLoadSysMenuTemplate(); +co_IntLoadSysMenuTemplate(); BOOL STDCALL -IntLoadDefaultCursors(VOID); +co_IntLoadDefaultCursors(VOID); LRESULT STDCALL -IntCallHookProc(INT HookId, +co_IntCallHookProc(INT HookId, INT Code, WPARAM wParam, LPARAM lParam, _____ Modified: trunk/reactos/subsys/win32k/include/caret.h --- trunk/reactos/subsys/win32k/include/caret.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/caret.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -4,13 +4,13 @@ #define IDCARETTIMER (0xffff) BOOL FASTCALL -IntDestroyCaret(PW32THREAD Win32Thread); +co_IntDestroyCaret(PW32THREAD Win32Thread); BOOL FASTCALL IntSetCaretBlinkTime(UINT uMSeconds); BOOL FASTCALL -IntSetCaretPos(int X, int Y); +co_IntSetCaretPos(int X, int Y); BOOL FASTCALL IntSwitchCaretShowing(PVOID Info); @@ -18,6 +18,11 @@ VOID FASTCALL IntDrawCaret(HWND hWnd); +BOOL FASTCALL co_UserShowCaret(PWINDOW_OBJECT WindowObject); + +BOOL FASTCALL co_UserHideCaret(PWINDOW_OBJECT WindowObject); + + #endif /* _WIN32K_CARET_H */ /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/include/csr.h --- trunk/reactos/subsys/win32k/include/csr.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/csr.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -13,7 +13,7 @@ extern PEPROCESS CsrProcess; extern NTSTATUS FASTCALL CsrInit(void); -extern NTSTATUS FASTCALL CsrNotify(PCSR_API_MESSAGE Request); +extern NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); extern NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); NTSTATUS STDCALL _____ Modified: trunk/reactos/subsys/win32k/include/desktop.h --- trunk/reactos/subsys/win32k/include/desktop.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/desktop.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -67,6 +67,9 @@ HWND FASTCALL IntGetDesktopWindow (VOID); +PWINDOW_OBJECT FASTCALL +UserGetDesktopWindow(VOID); + HWND FASTCALL IntGetCurrentThreadDesktopWindow(VOID); @@ -80,7 +83,7 @@ IntGetActiveDesktop(VOID); NTSTATUS FASTCALL -IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height); +co_IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height); NTSTATUS FASTCALL IntHideDesktop(PDESKTOP_OBJECT Desktop); @@ -107,7 +110,7 @@ BOOL IntRegisterShellHookWindow(HWND hWnd); BOOL IntDeRegisterShellHookWindow(HWND hWnd); -VOID IntShellHookNotify(WPARAM Message, LPARAM lParam); +VOID co_IntShellHookNotify(WPARAM Message, LPARAM lParam); #define IntIsActiveDesktop(Desktop) \ ((Desktop)->WindowStation->ActiveDesktop == (Desktop)) _____ Modified: trunk/reactos/subsys/win32k/include/focus.h --- trunk/reactos/subsys/win32k/include/focus.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/focus.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -16,10 +16,10 @@ IntGetThreadFocusWindow(); BOOL FASTCALL -IntMouseActivateWindow(PWINDOW_OBJECT Window); +co_IntMouseActivateWindow(PWINDOW_OBJECT Window); BOOL FASTCALL -IntSetForegroundWindow(PWINDOW_OBJECT Window); +co_IntSetForegroundWindow(PWINDOW_OBJECT Window); HWND FASTCALL -IntSetActiveWindow(PWINDOW_OBJECT Window); +co_IntSetActiveWindow(PWINDOW_OBJECT Window); #endif /* _WIN32K_FOCUS_H */ _____ Modified: trunk/reactos/subsys/win32k/include/guicheck.h --- trunk/reactos/subsys/win32k/include/guicheck.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/guicheck.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -1,7 +1,7 @@ #ifndef _WIN32K_GUICHECK_H #define _WIN32K_GUICHECK_H -BOOL FASTCALL IntGraphicsCheck(BOOL Create); +BOOL FASTCALL co_IntGraphicsCheck(BOOL Create); BOOL FASTCALL IntCreatePrimarySurface(); VOID FASTCALL IntDestroyPrimarySurface(); _____ Modified: trunk/reactos/subsys/win32k/include/hook.h --- trunk/reactos/subsys/win32k/include/hook.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/hook.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -24,7 +24,7 @@ UINT Counts[NB_HOOKS]; /* use counts for each hook chain */ } HOOKTABLE, *PHOOKTABLE; -LRESULT FASTCALL HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); +LRESULT FASTCALL co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); VOID FASTCALL HOOK_DestroyThreadHooks(PETHREAD Thread); #define IntLockHookTable(HookTable) \ _____ Modified: trunk/reactos/subsys/win32k/include/msgqueue.h --- trunk/reactos/subsys/win32k/include/msgqueue.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/msgqueue.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -1,7 +1,6 @@ #ifndef _WIN32K_MSGQUEUE_H #define _WIN32K_MSGQUEUE_H -#include "caret.h" #include "hook.h" #define MSQ_HUNG 5000 @@ -124,7 +123,7 @@ BOOL FASTCALL MsqIsHung(PUSER_MESSAGE_QUEUE MessageQueue); NTSTATUS FASTCALL -MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, +co_MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, UINT uTimeout, BOOL Block, BOOL HookMessage, ULONG_PTR *uResult); @@ -138,7 +137,7 @@ VOID FASTCALL MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode); BOOLEAN STDCALL -MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, +co_MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, IN BOOLEAN Hardware, IN BOOLEAN Remove, IN HWND Wnd, @@ -158,9 +157,9 @@ NTSTATUS FASTCALL MsqInitializeImpl(VOID); BOOLEAN FASTCALL -MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue); +co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue); NTSTATUS FASTCALL -MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue, HWND WndFilter, +co_MsqWaitForNewMessages(PUSER_MESSAGE_QUEUE MessageQueue, HWND WndFilter, UINT MsgFilterMin, UINT MsgFilterMax); VOID FASTCALL MsqSendNotifyMessage(PUSER_MESSAGE_QUEUE MessageQueue, @@ -170,17 +169,17 @@ VOID FASTCALL MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue); LRESULT FASTCALL -IntSendMessage(HWND hWnd, +co_IntSendMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); LRESULT FASTCALL -IntPostOrSendMessage(HWND hWnd, +co_IntPostOrSendMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); LRESULT FASTCALL -IntSendMessageTimeout(HWND hWnd, +co_IntSendMessageTimeout(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, @@ -193,7 +192,7 @@ IntTranslateKbdMessage(LPMSG lpMsg, HKL dwhkl); VOID FASTCALL -MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); +co_MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); VOID FASTCALL MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam); VOID FASTCALL _____ Modified: trunk/reactos/subsys/win32k/include/painting.h --- trunk/reactos/subsys/win32k/include/painting.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/painting.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -8,12 +8,12 @@ VOID FASTCALL IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion); BOOL FASTCALL -IntRedrawWindow(PWINDOW_OBJECT Wnd, const RECT* UpdateRect, HRGN UpdateRgn, ULONG Flags); +co_UserRedrawWindow(PWINDOW_OBJECT Wnd, const RECT* UpdateRect, HRGN UpdateRgn, ULONG Flags); BOOL FASTCALL IntGetPaintMessage(HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax, PW32THREAD Thread, MSG *Message, BOOL Remove); -BOOL STDCALL -NtUserValidateRgn(HWND hWnd, HRGN hRgn); +//BOOL STDCALL +//NtUserValidateRgn(HWND hWnd, HRGN hRgn); #define IntLockWindowUpdate(Window) \ ExAcquireFastMutex(&Window->UpdateLock) _____ Modified: trunk/reactos/subsys/win32k/include/scroll.h --- trunk/reactos/subsys/win32k/include/scroll.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/scroll.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -16,7 +16,7 @@ #define SBOBJ_TO_SBID(Obj) ((Obj) - OBJID_HSCROLL) #define SBID_IS_VALID(id) (id == SB_HORZ || id == SB_VERT || id == SB_CTL) -BOOL FASTCALL IntCreateScrollBars(PWINDOW_OBJECT Window); +BOOL FASTCALL co_IntCreateScrollBars(PWINDOW_OBJECT Window); BOOL FASTCALL IntDestroyScrollBars(PWINDOW_OBJECT Window); #endif /* _WIN32K_SCROLL_H */ _____ Added: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -0,0 +1,130 @@ +#ifndef _WIN32K_USERFUNCS_H +#define _WIN32K_USERFUNCS_H + +/*************** WINSTA.C ***************/ + +HWINSTA FASTCALL UserGetProcessWindowStation(VOID); + +/*************** INPUT.C ***************/ + +NTSTATUS FASTCALL +UserAcquireOrReleaseInputOwnership(BOOLEAN Release); + +/*************** WINPOS.C ***************/ + +BOOL FASTCALL +UserGetClientOrigin(HWND hWnd, LPPOINT Point); + +/*************** FOCUS.C ***************/ + +HWND FASTCALL UserGetActiveWindow(); + +HWND FASTCALL UserGetForegroundWindow(VOID); + +HWND FASTCALL UserSetFocus(HWND hWnd); + +/*************** WINDC.C ***************/ + +INT FASTCALL +UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc); + +HDC FASTCALL +UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags); + +DWORD FASTCALL +UserGetWindowDC(PWINDOW_OBJECT Wnd); + +/*************** METRIC.C ***************/ + +ULONG FASTCALL +UserGetSystemMetrics(ULONG Index); + +/*************** KEYBOARD.C ***************/ + +DWORD FASTCALL UserGetKeyState(DWORD key); + +DWORD FASTCALL UserGetKeyboardType(DWORD TypeFlag); + +HKL FASTCALL UserGetKeyboardLayout(DWORD dwThreadId); + + +/*************** MISC.C ***************/ + +BOOL FASTCALL +UserSystemParametersInfo( + UINT uiAction, + UINT uiParam, + PVOID pvParam, + UINT fWinIni); + +/*************** MESSAGE.C ***************/ + +BOOL FASTCALL +UserPostMessage(HWND Wnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); + + + +/*************** PAINTING.C ***************/ + +BOOL FASTCALL UserValidateRgn(HWND hWnd, HRGN hRgn); + + +/*************** WINDOW.C ***************/ + +VOID FASTCALL +co_DestroyThreadWindows(struct _ETHREAD *Thread); + +HWND FASTCALL UserGetShellWindow(); + +HWND FASTCALL UserSetParent(HWND hWndChild, HWND hWndNewParent); + +HWND FASTCALL UserGetWindow(HWND hWnd, UINT Relationship); + +HDC FASTCALL +UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags); + +BOOLEAN FASTCALL co_UserDestroyWindow(PWINDOW_OBJECT Wnd); + +LONG FASTCALL UserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); + +HWND FASTCALL UserGetAncestor(HWND hWnd, UINT Type); + +/*************** MENU.C ***************/ + +HMENU FASTCALL UserCreateMenu(BOOL PopupMenu); + +BOOL FASTCALL +UserSetMenuDefaultItem( + HMENU hMenu, + UINT uItem, + UINT fByPos); + +BOOL FASTCALL UserDestroyMenu(HMENU hMenu); + +BOOL FASTCALL +UserMenuItemInfo( + HMENU Menu, + UINT Item, + BOOL ByPosition, + PROSMENUITEMINFO UnsafeItemInfo, + BOOL SetOrGet); + +BOOL FASTCALL +UserMenuInfo( + HMENU Menu, + PROSMENUINFO UnsafeMenuInfo, + BOOL SetOrGet); + + +/*************** SCROLLBAR.C ***************/ + +DWORD FASTCALL +co_UserShowScrollBar(HWND hWnd, int wBar, DWORD bShow); + + +#endif /* _WIN32K_USERFUNCS_H */ + +/* EOF */ _____ Modified: trunk/reactos/subsys/win32k/include/vis.h --- trunk/reactos/subsys/win32k/include/vis.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/vis.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -18,7 +18,7 @@ BOOLEAN ClipChildren, BOOLEAN ClipSiblings); VOID FASTCALL -VIS_WindowLayoutChanged(PWINDOW_OBJECT Window, HRGN UncoveredRgn); +co_VIS_WindowLayoutChanged(PWINDOW_OBJECT Window, HRGN UncoveredRgn); #endif /* ! defined(_WIN32K_VIS_H) */ _____ Modified: trunk/reactos/subsys/win32k/include/win32k.h --- trunk/reactos/subsys/win32k/include/win32k.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/win32k.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -9,11 +9,11 @@ /* INCLUDES ******************************************************************/ /* Internal Win32k Headers */ +#include <include/ntuser.h> #include <include/win32.h> #include <include/ssec.h> #include <include/accelerator.h> #include <include/callback.h> -#include <include/caret.h> #include <include/class.h> #include <include/cleanup.h> #include <include/clipboard.h> @@ -53,6 +53,8 @@ #include <include/useratom.h> #include <include/vis.h> #include <include/window.h> +#include <include/caret.h> +#include <include/userfuncs.h> #include <include/winpos.h> #include <include/winsta.h> #include <include/mmcopy.h> _____ Modified: trunk/reactos/subsys/win32k/include/winpos.h --- trunk/reactos/subsys/win32k/include/winpos.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/winpos.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -15,25 +15,25 @@ (INT)((y) - (WndObject)->WindowRect.top)))) UINT -FASTCALL WinPosArrangeIconicWindows(PWINDOW_OBJECT parent); +FASTCALL co_WinPosArrangeIconicWindows(PWINDOW_OBJECT parent); BOOL FASTCALL IntGetClientOrigin(HWND hWnd, LPPOINT Point); LRESULT FASTCALL -WinPosGetNonClientSize(HWND Wnd, RECT* WindowRect, RECT* ClientRect); +co_WinPosGetNonClientSize(HWND Wnd, RECT* WindowRect, RECT* ClientRect); UINT FASTCALL -WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos, +co_WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos, POINT* MinTrack, POINT* MaxTrack); UINT FASTCALL -WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos); +co_WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos); BOOLEAN FASTCALL -WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, +co_WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, INT cy, UINT flags); BOOLEAN FASTCALL -WinPosShowWindow(HWND Wnd, INT Cmd); +co_WinPosShowWindow(HWND Wnd, INT Cmd); USHORT FASTCALL -WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, PUSER_MESSAGE_QUEUE OnlyHitTests, POINT *WinPoint, +co_WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, PUSER_MESSAGE_QUEUE OnlyHitTests, POINT *WinPoint, PWINDOW_OBJECT* Window); -VOID FASTCALL WinPosActivateOtherWindow(PWINDOW_OBJECT Window); +VOID FASTCALL co_WinPosActivateOtherWindow(PWINDOW_OBJECT Window); PINTERNALPOS FASTCALL WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT *pt, PRECT RestoreRect); _____ Modified: trunk/reactos/subsys/win32k/include/winsta.h --- trunk/reactos/subsys/win32k/include/winsta.h 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/include/winsta.h 2005-09-05 21:19:23 UTC (rev 17671) @@ -90,7 +90,7 @@ IntGetWindowStationObject(PWINSTATION_OBJECT Object); BOOL FASTCALL -IntInitializeDesktopGraphics(VOID); +co_IntInitializeDesktopGraphics(VOID); VOID FASTCALL IntEndDesktopGraphics(VOID); _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-05 21:19:23 UTC (rev 17671) @@ -42,7 +42,11 @@ BOOLEAN Create) { PW32PROCESS Win32Process; + DECLARE_RETURN(NTSTATUS); + DPRINT("Enter Win32kProcessCallback\n"); + UserEnterExclusive(); + /* Get the Win32 Process */ Win32Process = PsGetProcessWin32Process(Process); @@ -54,7 +58,7 @@ sizeof(W32PROCESS), TAG('W', '3', '2', 'p')); - if (Win32Process == NULL) return STATUS_NO_MEMORY; + if (Win32Process == NULL) RETURN( STATUS_NO_MEMORY); RtlZeroMemory(Win32Process, sizeof(W32PROCESS)); @@ -101,7 +105,7 @@ GDI_CleanupForProcess(Process); - IntGraphicsCheck(FALSE); + co_IntGraphicsCheck(FALSE); /* * Deregister logon application automatically @@ -112,7 +116,12 @@ } } - return STATUS_SUCCESS; + RETURN( STATUS_SUCCESS); + +CLEANUP: + UserLeave(); + DPRINT("Leave Win32kProcessCallback, ret=%i\n",_ret_); + END_CLEANUP; } @@ -123,6 +132,10 @@ { struct _EPROCESS *Process; PW32THREAD Win32Thread; + DECLARE_RETURN(NTSTATUS); + + DPRINT("Enter Win32kThreadCallback\n"); + UserEnterExclusive(); Process = Thread->ThreadsProcess; @@ -137,7 +150,7 @@ sizeof(W32THREAD), TAG('W', '3', '2', 't')); - if (Win32Thread == NULL) return STATUS_NO_MEMORY; + if (Win32Thread == NULL) RETURN( STATUS_NO_MEMORY); RtlZeroMemory(Win32Thread, sizeof(W32THREAD)); @@ -199,7 +212,7 @@ } } Win32Thread->IsExiting = FALSE; - IntDestroyCaret(Win32Thread); + co_IntDestroyCaret(Win32Thread); Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); Win32Thread->MessagePumpHookValue = 0; @@ -214,7 +227,7 @@ Win32Thread->IsExiting = TRUE; HOOK_DestroyThreadHooks(Thread); UnregisterThreadHotKeys(Thread); - DestroyThreadWindows(Thread); + co_DestroyThreadWindows(Thread); IntBlockInput(Win32Thread, FALSE); MsqDestroyMessageQueue(Win32Thread->MessageQueue); IntCleanupThreadCallbacks(Win32Thread); @@ -224,7 +237,12 @@ } } - return STATUS_SUCCESS; + RETURN( STATUS_SUCCESS); + +CLEANUP: + UserLeave(); + DPRINT("Leave Win32kThreadCallback, ret=%i\n",_ret_); + END_CLEANUP; } /* Only used in ntuser/input.c KeyboardThreadMain(). If it's @@ -316,6 +334,13 @@ DPRINT1("Failed to initialize the shared section pool: Status 0x%x\n", Status); } + Status = InitUserImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize user implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + Status = InitWindowStationImpl(); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-05 21:17:26 UTC (rev 17670) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-05 21:19:23 UTC (rev 17671) @@ -79,15 +79,19 @@ PACCELERATOR_TABLE AcceleratorTable; NTSTATUS Status; int Ret; + DECLARE_RETURN(int); - Status = IntValidateWindowStationHandle(NtUserGetProcessWindowStation(), + DPRINT("Enter NtUserCopyAcceleratorTable\n"); + UserEnterShared(); + + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), UserMode, 0, &WindowStation); if (!NT_SUCCESS(Status)) { SetLastNtError(STATUS_ACCESS_DENIED); - return 0; + RETURN(0); } Status = ObmReferenceObjectByHandle(WindowStation->HandleTable, @@ -98,7 +102,7 @@ { SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); ObDereferenceObject(WindowStation); - return 0; + RETURN(0); } if(Entries) @@ -110,7 +114,7 @@ ObmDereferenceObject(AcceleratorTable); ObDereferenceObject(WindowStation); SetLastNtError(Status); - return 0; + RETURN(0); } } else @@ -121,7 +125,12 @@ ObmDereferenceObject(AcceleratorTable); ObDereferenceObject(WindowStation); - return Ret; + RETURN(Ret); + +CLEANUP: + DPRINT("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } HACCEL @@ -134,11 +143,13 @@ PACCELERATOR_TABLE AcceleratorTable; NTSTATUS Status; HACCEL Handle; + DECLARE_RETURN(HACCEL); - DPRINT("NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", - Entries, EntriesCount); + DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", + Entries, EntriesCount); + UserEnterExclusive(); - Status = IntValidateWindowStationHandle(NtUserGetProcessWindowStation(), + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), UserMode, 0, &WindowStation); @@ -146,7 +157,7 @@ { SetLastNtError(STATUS_ACCESS_DENIED); DPRINT1("E1\n"); - return FALSE; + RETURN( FALSE ); } AcceleratorTable = ObmCreateObject( @@ -159,7 +170,7 @@ ObDereferenceObject(WindowStation); SetLastNtError(STATUS_NO_MEMORY); DPRINT1("E2\n"); - return (HACCEL) 0; + RETURN( (HACCEL) 0 ); } AcceleratorTable->Count = EntriesCount; @@ -172,7 +183,7 @@ ObDereferenceObject(WindowStation); SetLastNtError(Status); DPRINT1("E3\n"); - return (HACCEL) 0; + RETURN( (HACCEL) 0); } Status = MmCopyFromCaller(AcceleratorTable->Table, Entries, EntriesCount * sizeof(ACCEL)); @@ -183,7 +194,7 @@ ObDereferenceObject(WindowStation); SetLastNtError(Status); DPRINT1("E4\n"); - return (HACCEL) 0; + RETURN((HACCEL) 0); } } @@ -191,10 +202,13 @@ /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ - DPRINT("NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x end\n", - Entries, EntriesCount, Handle); - - return (HACCEL) Handle; + RETURN((HACCEL) Handle); + +CLEANUP: + DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", + Entries, EntriesCount,_ret_); + UserLeave(); + END_CLEANUP; } BOOLEAN @@ -205,16 +219,17 @@ PWINSTATION_OBJECT WindowStation; PACCELERATOR_TABLE AcceleratorTable; NTSTATUS Status; + DECLARE_RETURN(BOOLEAN); /* FIXME: If the handle table is from a call to LoadAcceleratorTable, decrement it's usage count (and return TRUE). FIXME: Destroy only tables created using CreateAcceleratorTable. */ - DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", - Table); + DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", Table); + UserEnterExclusive(); - Status = IntValidateWindowStationHandle(NtUserGetProcessWindowStation(), + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), UserMode, 0, &WindowStation); @@ -222,7 +237,7 @@ { SetLastNtError(STATUS_ACCESS_DENIED); DPRINT1("E1\n"); - return FALSE; + RETURN( FALSE); } Status = ObmReferenceObjectByHandle(WindowStation->HandleTable, @@ -234,7 +249,7 @@ SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); ObDereferenceObject(WindowStation); DPRINT1("E2\n"); - return FALSE; + RETURN( FALSE); } ObmCloseHandle(WindowStation->HandleTable, Table); @@ -249,11 +264,16 @@ DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", Table); - return TRUE; + RETURN( TRUE); + +CLEANUP: + DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", Table,_ret_); + UserLeave(); + END_CLEANUP; } static BOOLEAN -IntTranslateAccelerator(HWND hWnd, +co_IntTranslateAccelerator(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, @@ -289,15 +309,15 @@ wParam, 0xff & HIWORD(lParam)); DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n", - NtUserGetKeyState(VK_SHIFT)); + UserGetKeyState(VK_SHIFT)); DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n", - NtUserGetKeyState(VK_CONTROL)); + UserGetKeyState(VK_CONTROL)); DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n", - NtUserGetKeyState(VK_MENU)); + UserGetKeyState(VK_MENU)); - if (NtUserGetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT; - if (NtUserGetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL; - if (NtUserGetKeyState(VK_MENU) & 0x8000) mask |= FALT; + if (UserGetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT; + if (UserGetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL; + if (UserGetKeyState(VK_MENU) & 0x8000) mask |= FALT; if (mask == (fVirt & (FSHIFT | FCONTROL | FALT))) goto found; DPRINT("but incorrect SHIFT/CTRL/ALT-state\n"); } @@ -332,7 +352,7 @@ HMENU hMenu, hSubMenu, hSysMenu; UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; - hMenu = (NtUserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 : GetMenu(hWnd); + hMenu = (UserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 : GetMenu(hWnd); hSysMenu = get_win_sys_menu(hWnd); /* find menu item and ask application to initialize it */ @@ -341,12 +361,12 @@ nPos = cmd; if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) { - IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L); + co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L); if(hSubMenu != hSysMenu) { nPos = MENU_FindSubMenu(&hSysMenu, hSubMenu); TRACE_(accel)("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hSysMenu, hSubMenu, nPos); - IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); + co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); } uSysStat = GetMenuState(GetSubMenu(hSysMenu, 0), cmd, MF_BYCOMMAND); } @@ -356,12 +376,12 @@ nPos = cmd; if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) { - IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); + co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); if(hSubMenu != hMenu) { nPos = MENU_FindSubMenu(&hMenu, hSubMenu); TRACE_(accel)("hMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); - IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE)); + co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE)); } uStat = GetMenuState(hMenu, cmd, MF_BYCOMMAND); } @@ -402,12 +422,12 @@ if (mesg == WM_COMMAND) { DPRINT(", sending WM_COMMAND, wParam=%0x\n", 0x10000 | cmd); - IntSendMessage(hWnd, mesg, 0x10000 | cmd, 0L); + co_IntSendMessage(hWnd, mesg, 0x10000 | cmd, 0L); } else if (mesg == WM_SYSCOMMAND) { DPRINT(", sending WM_SYSCOMMAND, wParam=%0x\n", cmd); - IntSendMessage(hWnd, mesg, cmd, 0x00010000L); + co_IntSendMessage(hWnd, mesg, cmd, 0x00010000L); } else { @@ -444,23 +464,25 @@ PACCELERATOR_TABLE AcceleratorTable; NTSTATUS Status; ULONG i; + DECLARE_RETURN(int); DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n", hWnd, Table, Message); + UserEnterShared(); if (hWnd == NULL) - return 0; + RETURN( 0); if (Message == NULL) { SetLastNtError(STATUS_INVALID_PARAMETER); - return 0; + RETURN( 0); } if (Table == NULL) { SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); - return 0; + RETURN( 0); } if ((Message->message != WM_KEYDOWN) && @@ -468,17 +490,17 @@ (Message->message != WM_SYSCHAR) && (Message->message != WM_CHAR)) { - return 0; + RETURN( 0); } - Status = IntValidateWindowStationHandle(NtUserGetProcessWindowStation(), + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), UserMode, 0, &WindowStation); if (!NT_SUCCESS(Status)) [truncated at 1000 lines; 10081 more skipped]

19 years, 3 months

[gvg] 17670: Sync to Wine-20050830:

by gvg＠svn.reactos.com

Sync to Wine-20050830: Alexandre Julliard <julliard(a)winehq.org> - Mark DllMain and similar exports as private. Modified: trunk/reactos/lib/msimg32/msimg32.spec _____ Modified: trunk/reactos/lib/msimg32/msimg32.spec --- trunk/reactos/lib/msimg32/msimg32.spec 2005-09-05 21:15:50 UTC (rev 17669) +++ trunk/reactos/lib/msimg32/msimg32.spec 2005-09-05 21:17:26 UTC (rev 17670) @@ -1,5 +1,5 @@ @ stdcall AlphaBlend(long long long long long long long long long long long) gdi32.GdiAlphaBlend -@ stdcall DllInitialize(long long ptr) DllMain +@ stdcall -private DllInitialize(long long ptr) DllMain @ stdcall GradientFill(long ptr long ptr long long) gdi32.GdiGradientFill @ stdcall TransparentBlt(long long long long long long long long long long long) gdi32.GdiTransparentBlt @ stdcall vSetDdrawflag()

19 years, 3 months

[gvg] 17669: Sync to Wine-20050830:

by gvg＠svn.reactos.com

Sync to Wine-20050830: Alexandre Julliard <julliard(a)winehq.org> - Don't prefix the functions DllCanUnloadNow, DllGetClassObject and Dll(Un)RegisterServer with the dll name so that the compiler can check the prototypes. Modified: trunk/reactos/lib/mpr/mpr.spec Modified: trunk/reactos/lib/mpr/mpr_main.c _____ Modified: trunk/reactos/lib/mpr/mpr.spec --- trunk/reactos/lib/mpr/mpr.spec 2005-09-05 21:08:24 UTC (rev 17668) +++ trunk/reactos/lib/mpr/mpr.spec 2005-09-05 21:15:50 UTC (rev 17669) @@ -1,114 +1,114 @@ -# ordinal exports - 1 stub @ - 2 stub @ - 3 stub @ - 4 stub @ - 5 stub @ - 6 stub @ - 7 stub @ - 8 stub @ - 9 stub @ -12 stub @ -13 stub @ -14 stub @ -15 stub @ -16 stub @ -17 stub @ -18 stub @ -19 stub @ -20 stub @ -21 stub @ -22 stdcall @(long) MPR_Alloc -23 stdcall @(ptr long) MPR_ReAlloc -24 stdcall @(ptr) MPR_Free -25 stdcall @(ptr long) _MPR_25 - -@ stdcall -private DllCanUnloadNow() MPR_DllCanUnloadNow -@ stub DllGetClassObject -@ stdcall MultinetGetConnectionPerformanceA(ptr ptr) -@ stdcall MultinetGetConnectionPerformanceW(ptr ptr) -@ stdcall MultinetGetErrorTextA(long ptr long) -@ stdcall MultinetGetErrorTextW(long ptr long) -@ stdcall NPSAuthenticationDialogA(ptr) -@ stdcall NPSCopyStringA(str ptr ptr) -@ stdcall NPSDeviceGetNumberA(str ptr ptr) -@ stdcall NPSDeviceGetStringA(long long ptr long) -@ stdcall NPSGetProviderHandleA(ptr) -@ stdcall NPSGetProviderNameA(long ptr) -@ stdcall NPSGetSectionNameA(long ptr) -@ stdcall NPSNotifyGetContextA(ptr) -@ stdcall NPSNotifyRegisterA(long ptr) -@ stdcall NPSSetCustomTextA(str) -@ stdcall NPSSetExtendedErrorA(long str) -@ stub PwdChangePasswordA -@ stub PwdChangePasswordW -@ stub PwdGetPasswordStatusA -@ stub PwdGetPasswordStatusW -@ stub PwdSetPasswordStatusA -@ stub PwdSetPasswordStatusW -@ stdcall WNetAddConnection2A(ptr str str long) -@ stdcall WNetAddConnection2W(ptr wstr wstr long) -@ stdcall WNetAddConnection3A(long ptr str str long) -@ stdcall WNetAddConnection3W(long ptr wstr wstr long) -@ stdcall WNetAddConnectionA(str str str) -@ stdcall WNetAddConnectionW(wstr wstr wstr) -@ stdcall WNetCachePassword(str long str long long long) -@ stdcall WNetCancelConnection2A(str long long) -@ stdcall WNetCancelConnection2W(wstr long long) -@ stdcall WNetCancelConnectionA(str long) -@ stdcall WNetCancelConnectionW(wstr long) -@ stdcall WNetCloseEnum(long) -@ stdcall WNetConnectionDialog1A(ptr) -@ stdcall WNetConnectionDialog1W(ptr) -@ stdcall WNetConnectionDialog(long long) -@ stdcall WNetDisconnectDialog1A(ptr) -@ stdcall WNetDisconnectDialog1W(ptr) -@ stdcall WNetDisconnectDialog(long long) -@ stdcall WNetEnumCachedPasswords(str long long ptr long) -@ stdcall WNetEnumResourceA(long ptr ptr ptr) -@ stdcall WNetEnumResourceW(long ptr ptr ptr) -@ stub WNetFMXEditPerm -@ stub WNetFMXGetPermCaps -@ stub WNetFMXGetPermHelp -@ stub WNetFormatNetworkNameA -@ stub WNetFormatNetworkNameW -@ stdcall WNetGetCachedPassword(ptr long ptr ptr long) -@ stdcall WNetGetConnectionA(str ptr ptr) -@ stdcall WNetGetConnectionW(wstr ptr ptr) -@ stub WNetGetDirectoryTypeA -@ stub WNetGetHomeDirectoryA -@ stub WNetGetHomeDirectoryW -@ stdcall WNetGetLastErrorA(ptr ptr long ptr long) -@ stdcall WNetGetLastErrorW(ptr ptr long ptr long) -@ stdcall WNetGetNetworkInformationA(str ptr) -@ stdcall WNetGetNetworkInformationW(wstr ptr) -@ stub WNetGetPropertyTextA -@ stdcall WNetGetProviderNameA(long ptr ptr) -@ stdcall WNetGetProviderNameW(long ptr ptr) -@ stdcall WNetGetResourceInformationA(ptr ptr ptr ptr) -@ stdcall WNetGetResourceInformationW(ptr ptr ptr ptr) -@ stdcall WNetGetResourceParentA(ptr ptr ptr) -@ stdcall WNetGetResourceParentW(ptr ptr ptr) -@ stdcall WNetGetUniversalNameA (str long ptr ptr) -@ stdcall WNetGetUniversalNameW (wstr long ptr ptr) -@ stdcall WNetGetUserA(str ptr ptr) -@ stdcall WNetGetUserW(wstr wstr ptr) -@ stdcall WNetLogoffA(str long) -@ stdcall WNetLogoffW(wstr long) -@ stdcall WNetLogonA(str long) -@ stub WNetLogonNotify -@ stdcall WNetLogonW(wstr long) -@ stdcall WNetOpenEnumA(long long long ptr ptr) -@ stdcall WNetOpenEnumW(long long long ptr ptr) -@ stub WNetPasswordChangeNotify -@ stub WNetPropertyDialogA -@ stdcall WNetRemoveCachedPassword(long long long) -@ stub WNetRestoreConnection -@ stdcall WNetRestoreConnectionA(long str) -@ stdcall WNetRestoreConnectionW(long wstr) -@ stdcall WNetSetConnectionA(str long ptr) -@ stdcall WNetSetConnectionW(wstr long ptr) -@ stdcall WNetUseConnectionA(long ptr str str long str ptr ptr) -@ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr) -@ stdcall WNetVerifyPasswordA(str ptr) -@ stdcall WNetVerifyPasswordW(wstr ptr) +# ordinal exports + 1 stub @ + 2 stub @ + 3 stub @ + 4 stub @ + 5 stub @ + 6 stub @ + 7 stub @ + 8 stub @ + 9 stub @ +12 stub @ +13 stub @ +14 stub @ +15 stub @ +16 stub @ +17 stub @ +18 stub @ +19 stub @ +20 stub @ +21 stub @ +22 stdcall @(long) MPR_Alloc +23 stdcall @(ptr long) MPR_ReAlloc +24 stdcall @(ptr) MPR_Free +25 stdcall @(ptr long) _MPR_25 + +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall MultinetGetConnectionPerformanceA(ptr ptr) +@ stdcall MultinetGetConnectionPerformanceW(ptr ptr) +@ stdcall MultinetGetErrorTextA(long ptr long) +@ stdcall MultinetGetErrorTextW(long ptr long) +@ stdcall NPSAuthenticationDialogA(ptr) +@ stdcall NPSCopyStringA(str ptr ptr) +@ stdcall NPSDeviceGetNumberA(str ptr ptr) +@ stdcall NPSDeviceGetStringA(long long ptr long) +@ stdcall NPSGetProviderHandleA(ptr) +@ stdcall NPSGetProviderNameA(long ptr) +@ stdcall NPSGetSectionNameA(long ptr) +@ stdcall NPSNotifyGetContextA(ptr) +@ stdcall NPSNotifyRegisterA(long ptr) +@ stdcall NPSSetCustomTextA(str) +@ stdcall NPSSetExtendedErrorA(long str) +@ stub PwdChangePasswordA +@ stub PwdChangePasswordW +@ stub PwdGetPasswordStatusA +@ stub PwdGetPasswordStatusW +@ stub PwdSetPasswordStatusA +@ stub PwdSetPasswordStatusW +@ stdcall WNetAddConnection2A(ptr str str long) +@ stdcall WNetAddConnection2W(ptr wstr wstr long) +@ stdcall WNetAddConnection3A(long ptr str str long) +@ stdcall WNetAddConnection3W(long ptr wstr wstr long) +@ stdcall WNetAddConnectionA(str str str) +@ stdcall WNetAddConnectionW(wstr wstr wstr) +@ stdcall WNetCachePassword(str long str long long long) +@ stdcall WNetCancelConnection2A(str long long) +@ stdcall WNetCancelConnection2W(wstr long long) +@ stdcall WNetCancelConnectionA(str long) +@ stdcall WNetCancelConnectionW(wstr long) +@ stdcall WNetCloseEnum(long) +@ stdcall WNetConnectionDialog1A(ptr) +@ stdcall WNetConnectionDialog1W(ptr) +@ stdcall WNetConnectionDialog(long long) +@ stdcall WNetDisconnectDialog1A(ptr) +@ stdcall WNetDisconnectDialog1W(ptr) +@ stdcall WNetDisconnectDialog(long long) +@ stdcall WNetEnumCachedPasswords(str long long ptr long) +@ stdcall WNetEnumResourceA(long ptr ptr ptr) +@ stdcall WNetEnumResourceW(long ptr ptr ptr) +@ stub WNetFMXEditPerm +@ stub WNetFMXGetPermCaps +@ stub WNetFMXGetPermHelp +@ stub WNetFormatNetworkNameA +@ stub WNetFormatNetworkNameW +@ stdcall WNetGetCachedPassword(ptr long ptr ptr long) +@ stdcall WNetGetConnectionA(str ptr ptr) +@ stdcall WNetGetConnectionW(wstr ptr ptr) +@ stub WNetGetDirectoryTypeA +@ stub WNetGetHomeDirectoryA +@ stub WNetGetHomeDirectoryW +@ stdcall WNetGetLastErrorA(ptr ptr long ptr long) +@ stdcall WNetGetLastErrorW(ptr ptr long ptr long) +@ stdcall WNetGetNetworkInformationA(str ptr) +@ stdcall WNetGetNetworkInformationW(wstr ptr) +@ stub WNetGetPropertyTextA +@ stdcall WNetGetProviderNameA(long ptr ptr) +@ stdcall WNetGetProviderNameW(long ptr ptr) +@ stdcall WNetGetResourceInformationA(ptr ptr ptr ptr) +@ stdcall WNetGetResourceInformationW(ptr ptr ptr ptr) +@ stdcall WNetGetResourceParentA(ptr ptr ptr) +@ stdcall WNetGetResourceParentW(ptr ptr ptr) +@ stdcall WNetGetUniversalNameA (str long ptr ptr) +@ stdcall WNetGetUniversalNameW (wstr long ptr ptr) +@ stdcall WNetGetUserA(str ptr ptr) +@ stdcall WNetGetUserW(wstr wstr ptr) +@ stdcall WNetLogoffA(str long) +@ stdcall WNetLogoffW(wstr long) +@ stdcall WNetLogonA(str long) +@ stub WNetLogonNotify +@ stdcall WNetLogonW(wstr long) +@ stdcall WNetOpenEnumA(long long long ptr ptr) +@ stdcall WNetOpenEnumW(long long long ptr ptr) +@ stub WNetPasswordChangeNotify +@ stub WNetPropertyDialogA +@ stdcall WNetRemoveCachedPassword(long long long) +@ stub WNetRestoreConnection +@ stdcall WNetRestoreConnectionA(long str) +@ stdcall WNetRestoreConnectionW(long wstr) +@ stdcall WNetSetConnectionA(str long ptr) +@ stdcall WNetSetConnectionW(wstr long ptr) +@ stdcall WNetUseConnectionA(long ptr str str long str ptr ptr) +@ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr) +@ stdcall WNetVerifyPasswordA(str ptr) +@ stdcall WNetVerifyPasswordW(wstr ptr) Property changes on: trunk/reactos/lib/mpr/mpr.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/mpr/mpr_main.c --- trunk/reactos/lib/mpr/mpr_main.c 2005-09-05 21:08:24 UTC (rev 17668) +++ trunk/reactos/lib/mpr/mpr_main.c 2005-09-05 21:15:50 UTC (rev 17669) @@ -75,7 +75,7 @@ /***************************************************************** * DllCanUnloadNow [MPR.@] */ -DWORD WINAPI MPR_DllCanUnloadNow(void) +STDAPI DllCanUnloadNow(void) { FIXME("Stub\n"); return S_OK;

19 years, 3 months

[gvg] 17668: Sync to Wine-20050830:

by gvg＠svn.reactos.com

Sync to Wine-20050830: Mike McCormack <mike(a)codeweavers.com> - gcc 4.0 warning fixes. Modified: trunk/reactos/lib/icmp/icmp.spec Modified: trunk/reactos/lib/icmp/icmp_main.c _____ Modified: trunk/reactos/lib/icmp/icmp.spec --- trunk/reactos/lib/icmp/icmp.spec 2005-09-05 21:06:55 UTC (rev 17667) +++ trunk/reactos/lib/icmp/icmp.spec 2005-09-05 21:08:24 UTC (rev 17668) @@ -1,8 +1,8 @@ -@ stdcall IcmpCloseHandle(ptr) -@ stdcall IcmpCreateFile() -@ stub IcmpParseReplies -@ stub IcmpSendEcho2 -@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) -@ stub do_echo_rep -@ stub do_echo_req -@ stub register_icmp +@ stdcall IcmpCloseHandle(ptr) +@ stdcall IcmpCreateFile() +@ stub IcmpParseReplies +@ stub IcmpSendEcho2 +@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) +@ stub do_echo_rep +@ stub do_echo_req +@ stub register_icmp Property changes on: trunk/reactos/lib/icmp/icmp.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/icmp/icmp_main.c --- trunk/reactos/lib/icmp/icmp_main.c 2005-09-05 21:06:55 UTC (rev 17667) +++ trunk/reactos/lib/icmp/icmp_main.c 2005-09-05 21:08:24 UTC (rev 17668) @@ -213,7 +213,7 @@ struct timeval timeout; DWORD send_time,recv_time; struct sockaddr_in addr; - int addrlen; + unsigned int addrlen; unsigned short id,seq,cksum; int res; @@ -256,7 +256,7 @@ if (RequestOptions!=NULL) { int val; if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) { - int len; + unsigned int len; /* Before we mess with the options, get the default values */ len=sizeof(val); getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len); @@ -455,7 +455,7 @@ ier->Options.OptionsData=(unsigned char *) ier->Data-ier->Options.OptionsSize; /* FIXME: We are supposed to rearrange the option's 'source route' data */ memmove(ier->Options.OptionsData,((char*)ip_header)+ip_header_len,ier->O ptions.OptionsSize); - endbuf=ier->Options.OptionsData; + endbuf=(char*)ier->Options.OptionsData; } else { ier->Options.OptionsData=NULL; endbuf=ier->Data;

19 years, 3 months

[gvg] 17667: Sync to Wine-20050830:

by gvg＠svn.reactos.com

Sync to Wine-20050830: Alexandre Julliard <julliard(a)winehq.org> - Don't prefix the functions DllCanUnloadNow, DllGetClassObject and Dll(Un)RegisterServer with the dll name so that the compiler can check the prototypes. - Uncomment out DisableThreadLibraryCalls in DllMain and add the kernel32 imports that it requires. Deleted: trunk/reactos/lib/dinput8/Makefile.in Modified: trunk/reactos/lib/dinput8/dinput8.spec Modified: trunk/reactos/lib/dinput8/dinput8_main.c _____ Deleted: trunk/reactos/lib/dinput8/Makefile.in --- trunk/reactos/lib/dinput8/Makefile.in 2005-09-05 21:04:10 UTC (rev 17666) +++ trunk/reactos/lib/dinput8/Makefile.in 2005-09-05 21:06:55 UTC (rev 17667) @@ -1,17 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = dinput8.dll -IMPORTLIB = libdinput8.$(IMPLIBEXT) -IMPORTS = dinput -EXTRALIBS = -luuid - -C_SRCS = \ - dinput8_main.c - -RC_SRCS = version.rc - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Modified: trunk/reactos/lib/dinput8/dinput8.spec --- trunk/reactos/lib/dinput8/dinput8.spec 2005-09-05 21:04:10 UTC (rev 17666) +++ trunk/reactos/lib/dinput8/dinput8.spec 2005-09-05 21:06:55 UTC (rev 17667) @@ -1,5 +1,5 @@ -@ stdcall DirectInput8Create(long long ptr ptr ptr) -@ stdcall -private DllCanUnloadNow() DINPUT8_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) DINPUT8_DllGetClassObject -@ stdcall -private DllRegisterServer() DINPUT8_DllRegisterServer -@ stdcall -private DllUnregisterServer() DINPUT8_DllUnregisterServer +@ stdcall DirectInput8Create(long long ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Property changes on: trunk/reactos/lib/dinput8/dinput8.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/dinput8/dinput8_main.c --- trunk/reactos/lib/dinput8/dinput8_main.c 2005-09-05 21:04:10 UTC (rev 17666) +++ trunk/reactos/lib/dinput8/dinput8_main.c 2005-09-05 21:06:55 UTC (rev 17667) @@ -43,7 +43,7 @@ /*********************************************************************** * DllCanUnloadNow (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME("(void): stub\n"); @@ -53,8 +53,7 @@ /*********************************************************************** * DllGetClassObject (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllGetClassObject(REFCLSID rclsid, REFIID riid, - LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { FIXME("(%p, %p, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -65,7 +64,7 @@ /*********************************************************************** * DllRegisterServer (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { FIXME("(void): stub\n"); @@ -75,7 +74,7 @@ /*********************************************************************** * DllUnregisterServer (DINPUT8.@) */ -HRESULT WINAPI DINPUT8_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { FIXME("(void): stub\n");

19 years, 3 months

[gvg] 17666: Sync to Wine-20050830:

by gvg＠svn.reactos.com

Sync to Wine-20050830: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Check the GetPidlFromDataObject's doSelected parameter before calling a method on it. Alexandre Julliard <julliard(a)winehq.org> - Replace the _ICOM_THIS_From macros by inline functions the way it's already done in shelllink.c. Vincent Béron <vberon(a)mecano.gme.usherb.ca> - Uniformize DllMain TRACEing across dlls. Vitaly Lipatov <lav(a)etersoft.ru> - Restore paper orientation when pagesetupdlg is initializing. Troy Rollo <wine(a)troy.rollo.name> - Browse to the directory if a directory name is typed into the edit box of a file dialog and the confirmation button (or Enter key) is hit. Return any file name in the edit box if OFN_NOVALIDATE is set and OFN_FILEMUSTEXIST is not, even if that file name includes a path name or is the name of a folder. Modified: trunk/reactos/lib/comdlg32/cdlg32.c Modified: trunk/reactos/lib/comdlg32/comdlg32.spec Modified: trunk/reactos/lib/comdlg32/filedlg.c Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.c Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.h Modified: trunk/reactos/lib/comdlg32/printdlg.c _____ Modified: trunk/reactos/lib/comdlg32/cdlg32.c --- trunk/reactos/lib/comdlg32/cdlg32.c 2005-09-05 20:25:31 UTC (rev 17665) +++ trunk/reactos/lib/comdlg32/cdlg32.c 2005-09-05 21:04:10 UTC (rev 17666) @@ -73,7 +73,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) { - TRACE("(%p, %08lx, %p)\n", hInstance, Reason, Reserved); + TRACE("(%p, %ld, %p)\n", hInstance, Reason, Reserved); switch(Reason) { _____ Modified: trunk/reactos/lib/comdlg32/comdlg32.spec --- trunk/reactos/lib/comdlg32/comdlg32.spec 2005-09-05 20:25:31 UTC (rev 17665) +++ trunk/reactos/lib/comdlg32/comdlg32.spec 2005-09-05 21:04:10 UTC (rev 17666) @@ -1,25 +1,25 @@ -@ stdcall ChooseColorA(ptr) -@ stdcall ChooseColorW(ptr) -@ stdcall ChooseFontA(ptr) -@ stdcall ChooseFontW(ptr) -@ stdcall CommDlgExtendedError() -@ stdcall FindTextA(ptr) -@ stdcall FindTextW(ptr) -@ stdcall GetFileTitleA(str ptr long) -@ stdcall GetFileTitleW(wstr ptr long) -@ stdcall GetOpenFileNameA(ptr) -@ stdcall GetOpenFileNameW(ptr) -@ stdcall GetSaveFileNameA(ptr) -@ stdcall GetSaveFileNameW(ptr) -@ stub LoadAlterBitmap -@ stdcall PageSetupDlgA(ptr) -@ stdcall PageSetupDlgW(ptr) -@ stdcall PrintDlgA(ptr) -@ stdcall PrintDlgExA(ptr) -@ stdcall PrintDlgExW(ptr) -@ stdcall PrintDlgW(ptr) -@ stdcall ReplaceTextA(ptr) -@ stdcall ReplaceTextW(ptr) -@ stub WantArrows -@ stub dwLBSubclass -@ stub dwOKSubclass +@ stdcall ChooseColorA(ptr) +@ stdcall ChooseColorW(ptr) +@ stdcall ChooseFontA(ptr) +@ stdcall ChooseFontW(ptr) +@ stdcall CommDlgExtendedError() +@ stdcall FindTextA(ptr) +@ stdcall FindTextW(ptr) +@ stdcall GetFileTitleA(str ptr long) +@ stdcall GetFileTitleW(wstr ptr long) +@ stdcall GetOpenFileNameA(ptr) +@ stdcall GetOpenFileNameW(ptr) +@ stdcall GetSaveFileNameA(ptr) +@ stdcall GetSaveFileNameW(ptr) +@ stub LoadAlterBitmap +@ stdcall PageSetupDlgA(ptr) +@ stdcall PageSetupDlgW(ptr) +@ stdcall PrintDlgA(ptr) +@ stdcall PrintDlgExA(ptr) +@ stdcall PrintDlgExW(ptr) +@ stdcall PrintDlgW(ptr) +@ stdcall ReplaceTextA(ptr) +@ stdcall ReplaceTextW(ptr) +@ stub WantArrows +@ stub dwLBSubclass +@ stub dwOKSubclass _____ Modified: trunk/reactos/lib/comdlg32/filedlg.c --- trunk/reactos/lib/comdlg32/filedlg.c 2005-09-05 20:25:31 UTC (rev 17665) +++ trunk/reactos/lib/comdlg32/filedlg.c 2005-09-05 21:04:10 UTC (rev 17666) @@ -1711,8 +1711,9 @@ * * If the function succeeds, the return value is nonzero. */ -#define ONOPEN_OPEN 1 -#define ONOPEN_SEARCH 2 +#define ONOPEN_BROWSE 1 +#define ONOPEN_OPEN 2 +#define ONOPEN_SEARCH 3 static void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) { WCHAR strMsgTitle[MAX_PATH]; @@ -1739,15 +1740,15 @@ TRACE("hwnd=%p\n", hwnd); - if(BrowseSelectedFolder(hwnd)) - return FALSE; - /* get the files from the edit control */ nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, '\0'); /* try if the user selected a folder in the shellview */ if(nFileCount == 0) + { + BrowseSelectedFolder(hwnd); return FALSE; + } if(nFileCount > 1) { @@ -1808,7 +1809,12 @@ lpstrPathAndFile: cleaned up path */ - nOpenAction = ONOPEN_OPEN; + if (nFileCount && + (fodInfos->ofnInfos->Flags & OFN_NOVALIDATE) && + !(fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST)) + nOpenAction = ONOPEN_OPEN; + else + nOpenAction = ONOPEN_BROWSE; /* don't apply any checks with OFN_NOVALIDATE */ { @@ -1842,7 +1848,8 @@ *p = 0; lpszTemp = lpszTemp + strlenW(lpwstrTemp); - if(*lpszTemp==0) + /* There are no wildcards when OFN_NOVALIDATE is set */ + if(*lpszTemp==0 && !(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) { static const WCHAR wszWild[] = { '*', '?', 0 }; /* if the last element is a wildcard do a search */ @@ -1941,7 +1948,6 @@ int iPos; LPWSTR lpszTemp = PathFindFileNameW(lpstrPathAndFile); DWORD len; - IPersistFolder2 * ppf2; /* replace the current filter */ if(fodInfos->ShellInfos.lpstrCurrentFilter) @@ -1953,7 +1959,12 @@ /* set the filter cb to the extension when possible */ if(-1 < (iPos = FILEDLG95_FILETYPE_SearchExt(fodInfos->DlgInfos.hwndFileTypeCB, lpszTemp))) CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, iPos); - + } + /* fall through */ + case ONOPEN_BROWSE: /* browse to the highest folder we could bind to */ + TRACE("ONOPEN_BROWSE\n"); + { + IPersistFolder2 * ppf2; if(SUCCEEDED(IShellFolder_QueryInterface( lpsf, &IID_IPersistFolder2, (LPVOID*)&ppf2))) { LPITEMIDLIST pidlCurrent; @@ -1963,11 +1974,10 @@ { IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE); } - else + else if( nOpenAction == ONOPEN_SEARCH ) { IShellView_Refresh(fodInfos->Shell.FOIShellView); } - SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); COMDLG32_SHFree(pidlCurrent); } } @@ -1985,51 +1995,48 @@ fodInfos->ofnInfos->Flags &= ~OFN_READONLY; /* Attach the file extension with file name*/ - - if(!PathIsDirectoryW(lpstrPathAndFile)) + ext = PathFindExtensionW(lpstrPathAndFile); + if (! *ext) { - if((ext = PathFindExtensionW(lpstrPathAndFile)) == NULL) - { - /* if no extension is specified with file name, then */ - /* attach the extension from file filter or default one */ + /* if no extension is specified with file name, then */ + /* attach the extension from file filter or default one */ - WCHAR *filterExt = NULL; - LPWSTR lpstrFilter = NULL; - static const WCHAR szwDot[] = {'.',0}; - int PathLength = strlenW(lpstrPathAndFile); + WCHAR *filterExt = NULL; + LPWSTR lpstrFilter = NULL; + static const WCHAR szwDot[] = {'.',0}; + int PathLength = strlenW(lpstrPathAndFile); - /* Attach the dot*/ - strcatW(lpstrPathAndFile, szwDot); + /* Attach the dot*/ + strcatW(lpstrPathAndFile, szwDot); - /*Get the file extension from file type filter*/ - lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, - fodInfos->ofnInfos->nFilterIndex-1); + /*Get the file extension from file type filter*/ + lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, + fodInfos->ofnInfos->nFilterIndex-1); - if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ - filterExt = PathFindExtensionW(lpstrFilter); + if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ + filterExt = PathFindExtensionW(lpstrFilter); - if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/ - strcatW(lpstrPathAndFile, filterExt + 1); - else if ( fodInfos->defext ) /* attach the default file extension*/ - strcatW(lpstrPathAndFile, fodInfos->defext); + if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/ + strcatW(lpstrPathAndFile, filterExt + 1); + else if ( fodInfos->defext ) /* attach the default file extension*/ + strcatW(lpstrPathAndFile, fodInfos->defext); - /* In Open dialog: if file does not exist try without extension */ - if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) - lpstrPathAndFile[PathLength] = '\0'; - } - - if (fodInfos->defext) /* add default extension */ - { - /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ - if (*ext) - ext++; - if (!lstrcmpiW(fodInfos->defext, ext)) - fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; - else - fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; - } + /* In Open dialog: if file does not exist try without extension */ + if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) + lpstrPathAndFile[PathLength] = '\0'; } + if (fodInfos->defext) /* add default extension */ + { + /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ + if (*ext) + ext++; + if (!lstrcmpiW(fodInfos->defext, ext)) + fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; + else + fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; + } + /* In Save dialog: check if the file already exists */ if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG && fodInfos->ofnInfos->Flags & OFN_OVERWRITEPROMPT @@ -3201,6 +3208,9 @@ TRACE("sv=%p index=%u\n", doSelected, nPidlIndex); + if (!doSelected) + return NULL; + /* Set the FORMATETC structure*/ SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); _____ Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.c --- trunk/reactos/lib/comdlg32/filedlgbrowser.c 2005-09-05 20:25:31 UTC (rev 17665) +++ trunk/reactos/lib/comdlg32/filedlgbrowser.c 2005-09-05 21:04:10 UTC (rev 17666) @@ -55,6 +55,16 @@ } IShellBrowserImpl; +static inline IShellBrowserImpl *impl_from_ICommDlgBrowser( ICommDlgBrowser *iface ) +{ + return (IShellBrowserImpl *)((char*)iface - FIELD_OFFSET(IShellBrowserImpl, lpVtblCommDlgBrowser)); +} + +static inline IShellBrowserImpl *impl_from_IServiceProvider( IServiceProvider *iface ) +{ + return (IShellBrowserImpl *)((char*)iface - FIELD_OFFSET(IShellBrowserImpl, lpVtblServiceProvider)); +} + /*********************************************************************** *** * vtable */ @@ -728,11 +738,11 @@ REFIID riid, LPVOID *ppvObj) { - _ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface); + IShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); TRACE("(%p)\n", This); - return IShellBrowserImpl_QueryInterface(This,riid,ppvObj); + return IShellBrowserImpl_QueryInterface((IShellBrowser *)This,riid,ppvObj); } /*********************************************************************** *** @@ -740,11 +750,11 @@ */ static ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_AddRef(ICommDlgBrowser * iface) { - _ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface); + IShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); TRACE("(%p)\n", This); - return IShellBrowserImpl_AddRef(This); + return IShellBrowserImpl_AddRef((IShellBrowser *)This); } /*********************************************************************** *** @@ -752,11 +762,11 @@ */ static ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_Release(ICommDlgBrowser * iface) { - _ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface); + IShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); TRACE("(%p)\n", This); - return IShellBrowserImpl_Release(This); + return IShellBrowserImpl_Release((IShellBrowser *)This); } /*********************************************************************** *** @@ -770,7 +780,7 @@ LPITEMIDLIST pidl; FileOpenDlgInfos *fodInfos; - _ICOM_THIS_FromICommDlgBrowser(IShellBrowserImpl,iface); + IShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); TRACE("(%p)\n", This); @@ -812,7 +822,7 @@ ULONG uChange) { - _ICOM_THIS_FromICommDlgBrowser(IShellBrowserImpl,iface); + IShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); TRACE("(%p shv=%p)\n", This, ppshv); @@ -855,7 +865,7 @@ STRRET str; WCHAR szPathW[MAX_PATH]; - _ICOM_THIS_FromICommDlgBrowser(IShellBrowserImpl,iface); + IShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); TRACE("(%p)\n", This); @@ -895,7 +905,7 @@ { FileOpenDlgInfos *fodInfos; - _ICOM_THIS_FromICommDlgBrowser(IShellBrowserImpl,iface); + IShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr); TRACE("(%p do=%p view=%p)\n", This, fodInfos->Shell.FOIDataObject, fodInfos->Shell.FOIShellView); @@ -942,11 +952,11 @@ REFIID riid, LPVOID *ppvObj) { - _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface); + IShellBrowserImpl *This = impl_from_IServiceProvider(iface); FIXME("(%p)\n", This); - return IShellBrowserImpl_QueryInterface(This,riid,ppvObj); + return IShellBrowserImpl_QueryInterface((IShellBrowser *)This,riid,ppvObj); } /*********************************************************************** *** @@ -954,11 +964,11 @@ */ static ULONG WINAPI IShellBrowserImpl_IServiceProvider_AddRef(IServiceProvider * iface) { - _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface); + IShellBrowserImpl *This = impl_from_IServiceProvider(iface); FIXME("(%p)\n", This); - return IShellBrowserImpl_AddRef(This); + return IShellBrowserImpl_AddRef((IShellBrowser *)This); } /*********************************************************************** *** @@ -966,11 +976,11 @@ */ static ULONG WINAPI IShellBrowserImpl_IServiceProvider_Release(IServiceProvider * iface) { - _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface); + IShellBrowserImpl *This = impl_from_IServiceProvider(iface); FIXME("(%p)\n", This); - return IShellBrowserImpl_Release(This); + return IShellBrowserImpl_Release((IShellBrowser *)This); } /*********************************************************************** *** @@ -990,14 +1000,14 @@ REFIID riid, void** ppv) { - _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface); + IShellBrowserImpl *This = impl_from_IServiceProvider(iface); FIXME("(%p)\n\t%s\n\t%s\n", This,debugstr_guid(guidService), debugstr_guid(riid) ); *ppv = NULL; if(guidService && IsEqualIID(guidService, &SID_STopLevelBrowser)) { - return IShellBrowserImpl_QueryInterface(This,riid,ppv); + return IShellBrowserImpl_QueryInterface((IShellBrowser *)This,riid,ppv); } FIXME("(%p) unknown interface requested\n", This); return E_NOINTERFACE; _____ Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.h --- trunk/reactos/lib/comdlg32/filedlgbrowser.h 2005-09-05 20:25:31 UTC (rev 17665) +++ trunk/reactos/lib/comdlg32/filedlgbrowser.h 2005-09-05 21:04:10 UTC (rev 17666) @@ -37,12 +37,7 @@ /*********************************************************************** * Defines and global variables */ -#define _ICommDlgBrowser_Offset ((int)(&(((IShellBrowserImpl*)0)->lpVtblCommDlgBrowser))) -#define _ICOM_THIS_FromICommDlgBrowser(class, name) class* This = (class*)(((char*)name)-_ICommDlgBrowser_Offset); -#define _IServiceProvider_Offset ((int)(&(((IShellBrowserImpl*)0)->lpVtblServiceProvider))) -#define _ICOM_THIS_FromIServiceProvider(class, name) class* This = (class*)(((char*)name)-_IServiceProvider_Offset); - /* dialog internal property */ #define FODPROP_SAVEDLG 0x0001 /* File dialog is a Save file dialog */ _____ Modified: trunk/reactos/lib/comdlg32/printdlg.c --- trunk/reactos/lib/comdlg32/printdlg.c 2005-09-05 20:25:31 UTC (rev 17665) +++ trunk/reactos/lib/comdlg32/printdlg.c 2005-09-05 21:04:10 UTC (rev 17666) @@ -2968,7 +2968,7 @@ HDC hdc; HBRUSH hbrush, holdbrush; PageSetupDataA *pda; - int papersize=0, orientation=0; /* FIXME: set this values */ + int papersize=0, orientation=0; /* FIXME: set this values for user paint hook */ double scalx, scaly; #define CALLPAINTHOOK(msg,lprc) PRINTDLG_DefaultPagePaintHook( hWnd, msg, (WPARAM)hdc, (LPARAM)lprc, pda) @@ -3085,11 +3085,8 @@ /* FIXME: Paint hook. Must it be at begin of initializtion or at end? */ res = TRUE; if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) { - res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga); - if (!res) { + if (!pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga)) FIXME("Setup page hook failed?\n"); - res = TRUE; - } } /* if printer button disabled */ @@ -3102,11 +3099,14 @@ EnableWindow(GetDlgItem(hDlg, edt6), FALSE); EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } - /* width larger as height -> landscape */ - if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) + /* Set orientation radiobutton properly */ + dm = GlobalLock(pda->dlga->hDevMode); + if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) CheckRadioButton(hDlg, rad1, rad2, rad2); else /* this is default if papersize is not set */ CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->dlga->hDevMode); + /* if orientation disabled */ if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); @@ -3151,6 +3151,11 @@ GlobalUnlock(pda->pdlg.hDevMode); pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x); pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y); + if (IsDlgButtonChecked(hDlg, rad2) == BST_CHECKED) { /* Landscape orientation */ + DWORD tmp = pda->curdlg.ptPaperSize.y; + pda->curdlg.ptPaperSize.y = pda->curdlg.ptPaperSize.x; + pda->curdlg.ptPaperSize.x = tmp; + } } else WARN("GlobalLock(pda->pdlg.hDevMode) fail? hDevMode=%ld", (DWORD)pda->pdlg.hDevMode); /* Drawing paper prev */

19 years, 3 months

[hbirr] 17665: - Copy the map registers to the buffer only, if they are used (in IoFlushAdapterBuffers).

by hbirr＠svn.reactos.com

- Copy the map registers to the buffer only, if they are used (in IoFlushAdapterBuffers). - Do not use the byte offset into the page from a given buffer if the map registers are used, because the caller didn't request for one additional register in the call to IoAllocateAdapterChannel and it will not work for a 64k buffer. Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/include/haldma.h _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-09-05 20:25:16 UTC (rev 17664) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-09-05 20:25:31 UTC (rev 17665) @@ -646,12 +646,7 @@ } else { - /* - * In the equation below the additional map register added by - * the "+1" accounts for the case when a transfer does not start - * at a page-aligned address. - */ - MapRegisters = BYTES_TO_PAGES(MaximumLength) + 1; + MapRegisters = BYTES_TO_PAGES(MaximumLength); if (MapRegisters > 16) MapRegisters = 16; } @@ -1466,7 +1461,6 @@ { ULONG CurrentLength; ULONG_PTR CurrentAddress; - ULONG ByteOffset; PVOID VirtualAddress; VirtualAddress = MmGetSystemAddressForMdlSafe(Mdl, HighPagePriority); @@ -1487,15 +1481,11 @@ while (Length > 0) { - ByteOffset = BYTE_OFFSET(CurrentAddress); - CurrentLength = PAGE_SIZE - ByteOffset; - if (CurrentLength > Length) - CurrentLength = Length; - + CurrentLength = min(PAGE_SIZE, Length); if (WriteToDevice) { RtlCopyMemory( - (PVOID)((ULONG_PTR)MapRegisterBase->VirtualAddress + ByteOffset), + MapRegisterBase->VirtualAddress, (PVOID)CurrentAddress, CurrentLength); } @@ -1503,7 +1493,7 @@ { RtlCopyMemory( (PVOID)CurrentAddress, - (PVOID)((ULONG_PTR)MapRegisterBase->VirtualAddress + ByteOffset), + MapRegisterBase->VirtualAddress, CurrentLength); } @@ -1584,7 +1574,7 @@ RealMapRegisterBase = (PMAP_REGISTER_ENTRY)((ULONG_PTR)MapRegisterBase & ~MAP_BASE_SW_SG); - if (!WriteToDevice) + if (!WriteToDevice && RealMapRegisterBase->UseMapRegisters) { if ((ULONG_PTR)MapRegisterBase & MAP_BASE_SW_SG) { @@ -1654,7 +1644,6 @@ ULONG ByteOffset; ULONG TransferOffset; ULONG TransferLength; - BOOLEAN UseMapRegisters; PMAP_REGISTER_ENTRY RealMapRegisterBase; PHYSICAL_ADDRESS PhysicalAddress; PHYSICAL_ADDRESS HighestAcceptableAddress; @@ -1754,9 +1743,8 @@ if ((ULONG_PTR)MapRegisterBase & MAP_BASE_SW_SG && TransferLength < *Length) { - UseMapRegisters = TRUE; + RealMapRegisterBase->UseMapRegisters = TRUE; PhysicalAddress = RealMapRegisterBase->PhysicalAddress; - PhysicalAddress.QuadPart += ByteOffset; TransferLength = *Length; RealMapRegisterBase->Counter = ~0; Counter = 0; @@ -1769,7 +1757,7 @@ * the transfer progress. */ - UseMapRegisters = FALSE; + RealMapRegisterBase->UseMapRegisters = FALSE; Counter = RealMapRegisterBase->Counter; RealMapRegisterBase->Counter += BYTES_TO_PAGES(ByteOffset + TransferLength); @@ -1783,9 +1771,8 @@ if (PhysicalAddress.QuadPart + TransferLength > HighestAcceptableAddress.QuadPart) { - UseMapRegisters = TRUE; + RealMapRegisterBase->UseMapRegisters = TRUE; PhysicalAddress = RealMapRegisterBase->PhysicalAddress; - PhysicalAddress.QuadPart += ByteOffset; if ((ULONG_PTR)MapRegisterBase & MAP_BASE_SW_SG) { RealMapRegisterBase->Counter = ~0; @@ -1799,7 +1786,7 @@ * register memory. */ - if (UseMapRegisters && WriteToDevice) + if (RealMapRegisterBase->UseMapRegisters && WriteToDevice) { HalpCopyBufferMap(Mdl, RealMapRegisterBase + Counter, CurrentVa, TransferLength, WriteToDevice); _____ Modified: trunk/reactos/hal/halx86/include/haldma.h --- trunk/reactos/hal/halx86/include/haldma.h 2005-09-05 20:25:16 UTC (rev 17664) +++ trunk/reactos/hal/halx86/include/haldma.h 2005-09-05 20:25:31 UTC (rev 17665) @@ -315,6 +315,7 @@ PVOID VirtualAddress; PHYSICAL_ADDRESS PhysicalAddress; ULONG Counter; + BOOLEAN UseMapRegisters; } MAP_REGISTER_ENTRY, *PMAP_REGISTER_ENTRY; struct _ADAPTER_OBJECT {

19 years, 3 months

[gvg] 17664: Sync to Wine-20050830:

by gvg＠svn.reactos.com

Sync to Wine-20050830: Vitaliy Margolen <wine-patch(a)kievinfo.com> - Fix handling of minimum tab width. Add more tests to test it. Filip Navara <xnavara(a)volny.cz> - Use ReleaseDC instead of DeleteDC on DC handle. Phil Krylov <phil(a)newstar.rinet.ru> - Improved header control performance by maintaining an internal order array. - Draw header control items only within the header client area. Felix Nawothnig <felix.nawothnig(a)t-online.de> - Fix DPA_Search for sorted arrays. Michael Kaufmann <hallo(a)michael-kaufmann.ch> - Handle WM_GETFONT and WM_SETFONT. - Redraw immediately upon PBM_SETPOS, PBM_DELTAPOS, PBM_STEPIT. - New tests. Thomas Weidenmueller <wine-patches(a)reactsoft.com> - It should be allowed to pass NULL handles in the phpage array of the PROPSHEETHEADER structure to PropertySheet(), just ignore them. Aric Stewart <aric(a)codeweavers.com> - Fix for dreamweaver site definition dialog. Need to initialize the rect for a tab control to an empty rect if it is not visible. Alexandre Julliard <julliard(a)winehq.org> - Don't prefix the functions DllCanUnloadNow, DllGetClassObject and Dll(Un)RegisterServer with the dll name so that the compiler can check the prototypes. - Fixed regression in DPA_Search. Yuri Kozlov <kozlov.y(a)gmail.com> - Set default size for toolbar bitmap if not specified. Mike McCormack <mike(a)codeweavers.com> - Fix gcc 4.0 warnings. Vitaly Lipatov <lav(a)etersoft.ru> - Use STATEIMAGEINDEX / INDEXTOSTATEIMAGEMASK instead of bit operations. Steven Edwards <steven_ed4153(a)yahoo.com> - Correct RegCreateKeyEx[A/W] prototype to match the PSDK. Frank Richter <frank.richter(a)gmail.com> - Only draw a themed border when edit control has WS_EX_CLIENTEDGE style. - Merge subclass stubs and subclass proc. Having the stub set the window proc to the subclass proc was not a good idea since that breaks subclasses of themed standard controls (e.g. what Delphi does a lot). - Determining the superclass for a window subclassed for theming doesn't work - e.g. Delphi buttons have the classname "TButton" for which no superclass will be found. Instead, use initial subclass window procs that have the subclass hardcoded and store it for the "real" subclass window proc. - Add theming for toolbar control. - Improved trackbar theming. - Add initial theming support for trackbars. - Add theming for treeview control. - Add theming support for dialogs (to support tab page background). - Add theming for listbox (and combo listbox) controls. - Add theming for combo boxes. - Subclass edit control to draw themed border. - Added some generic code to allow subclassing (for the purpose of theming) of standard controls. - Fix warnings in 64bit. - Add hottracking support for the header control. - Since OpenThemeData() should return 0 in case theming is disabled globally or for the application we don't need to check that when calling OpenThemeData(). - Remove unneeded theming check. - Add theming for the monthcal control. - Instead of adding the border via WM_NCPAINT and WM_NCCALCSIZE, do what native does: just clear WS_EX_STATICEDGE when themed and reduce the area the actual bar is painted in to the progress bar theme part content rect. - Add theming for the progress control. - Split up the drawing code into a set of smaller functions and also moved some common computations into helper functions. All that to facilitate the implementation of the forthcoming theming support. - Add theming for the rebar control. - Add theming for status bar control. - Fix text color for "button" style tabs when theming is enabled. - Add theming support for the tab control. - Forward WM_DESTROY to superclass in edit & listbox theming. - Add WM_CTLCOLORSTATIC handler to dialog theming subclass so static text can appear transparent (for e.g. tab pages which commonly have a "fancy" background). Modified: trunk/reactos/lib/comctl32/animate.c Modified: trunk/reactos/lib/comctl32/comboex.c Modified: trunk/reactos/lib/comctl32/comctl32.h Modified: trunk/reactos/lib/comctl32/comctl32.spec Modified: trunk/reactos/lib/comctl32/comctl32.xml Modified: trunk/reactos/lib/comctl32/comctl32undoc.c Modified: trunk/reactos/lib/comctl32/commctrl.c Modified: trunk/reactos/lib/comctl32/datetime.c Modified: trunk/reactos/lib/comctl32/dpa.c Modified: trunk/reactos/lib/comctl32/header.c Modified: trunk/reactos/lib/comctl32/imagelist.c Modified: trunk/reactos/lib/comctl32/ipaddress.c Modified: trunk/reactos/lib/comctl32/listview.c Modified: trunk/reactos/lib/comctl32/monthcal.c Modified: trunk/reactos/lib/comctl32/progress.c Modified: trunk/reactos/lib/comctl32/propsheet.c Modified: trunk/reactos/lib/comctl32/rebar.c Modified: trunk/reactos/lib/comctl32/status.c Modified: trunk/reactos/lib/comctl32/tab.c Added: trunk/reactos/lib/comctl32/theme_combo.c Added: trunk/reactos/lib/comctl32/theme_dialog.c Added: trunk/reactos/lib/comctl32/theme_edit.c Added: trunk/reactos/lib/comctl32/theme_listbox.c Added: trunk/reactos/lib/comctl32/theming.c Modified: trunk/reactos/lib/comctl32/toolbar.c Modified: trunk/reactos/lib/comctl32/tooltips.c Modified: trunk/reactos/lib/comctl32/trackbar.c Modified: trunk/reactos/lib/comctl32/treeview.c Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/lib/comctl32/animate.c --- trunk/reactos/lib/comctl32/animate.c 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/animate.c 2005-09-05 20:25:16 UTC (rev 17664) @@ -53,7 +53,7 @@ HMODULE hModule; HIC (WINAPI *fnICOpen)(DWORD, DWORD, UINT); LRESULT (WINAPI *fnICClose)(HIC); - LRESULT (WINAPI *fnICSendMessage)(HIC, UINT, DWORD, DWORD); + LRESULT (WINAPI *fnICSendMessage)(HIC, UINT, DWORD_PTR, DWORD_PTR); DWORD (WINAPIV *fnICDecompress)(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER, LPVOID); } fnIC; @@ -139,7 +139,8 @@ { infoPtr->hMMio = mmioOpenW(lpName, 0, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); - return (BOOL)infoPtr->hMMio; + if(!infoPtr->hMMio) return FALSE; + return TRUE; } @@ -655,14 +656,14 @@ } outSize = fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, - (DWORD)infoPtr->inbih, 0L); + (DWORD_PTR)infoPtr->inbih, 0L); infoPtr->outbih = Alloc(outSize); if (!infoPtr->outbih) return FALSE; if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, - (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != outSize) + (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != outSize) { WARN("Can't get output BIH\n"); return FALSE; @@ -673,7 +674,7 @@ return FALSE; if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_BEGIN, - (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != ICERR_OK) { + (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != ICERR_OK) { WARN("Can't begin decompression\n"); return FALSE; } @@ -696,10 +697,10 @@ if (!hInstance) hInstance = (HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE); - if (HIWORD(lpszName)) - { - TRACE("(\"%s\");\n", debugstr_w(lpszName)); + TRACE("(%s)\n", debugstr_w(lpszName)); + if (HIWORD(lpszName)) + { if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName)) { TRACE("No AVI resource found!\n"); @@ -712,9 +713,7 @@ } else { - TRACE("(%u);\n", (WORD)(DWORD)lpszName); - - if (!ANIMATE_LoadResW(infoPtr, hInstance, MAKEINTRESOURCEW((INT)lpszName))) + if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName)) { WARN("No AVI resource found!\n"); return FALSE; _____ Modified: trunk/reactos/lib/comctl32/comboex.c --- trunk/reactos/lib/comctl32/comboex.c 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/comboex.c 2005-09-05 20:25:16 UTC (rev 17664) @@ -839,10 +839,10 @@ } -static DWORD COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT index) +static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT index) { CBE_ITEMDATA *item1, *item2; - DWORD ret = 0; + DWORD_PTR ret = 0; item1 = get_item_data(infoPtr, index); if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) { @@ -854,7 +854,7 @@ if (item1->mask & CBEIF_LPARAM) ret = item1->lParam; TRACE("returning 0x%08lx\n", ret); } else { - ret = (DWORD)item1; + ret = (DWORD_PTR)item1; TRACE("non-valid result from combo, returning 0x%08lx\n", ret); } return ret; @@ -878,7 +878,7 @@ } -static DWORD COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT index, DWORD data) +static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT index, DWORD_PTR data) { CBE_ITEMDATA *item1, *item2; @@ -894,8 +894,8 @@ TRACE("setting lparam to 0x%08lx\n", data); return 0; } - TRACE("non-valid result from combo 0x%08lx\n", (DWORD)item1); - return (LRESULT)item1; + TRACE("non-valid result from combo %p\n", item1); + return (DWORD_PTR)item1; } @@ -1136,10 +1136,10 @@ n = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0); for (cursel = 0; cursel < n; cursel++){ item = get_item_data(infoPtr, cursel); - if ((INT)item == CB_ERR) break; + if ((INT_PTR)item == CB_ERR) break; if (!cmptext(COMBOEX_GetText(infoPtr, item), wintext)) break; } - if ((cursel == n) || ((INT)item == CB_ERR)) { + if ((cursel == n) || ((INT_PTR)item == CB_ERR)) { TRACE("failed to find match??? item=%p cursel=%d\n", item, cursel); if (infoPtr->hwndEdit) @@ -1149,7 +1149,7 @@ } else { item = get_item_data(infoPtr, cursel); - if ((INT)item == CB_ERR) { + if ((INT_PTR)item == CB_ERR) { TRACE("failed to find match??? item=%p cursel=%d\n", item, cursel); if (infoPtr->hwndEdit) @@ -2223,7 +2223,7 @@ return COMBOEX_SetCursel (infoPtr, (INT)wParam); case CB_SETITEMDATA: - return COMBOEX_SetItemData (infoPtr, (INT)wParam, (DWORD)lParam); + return COMBOEX_SetItemData (infoPtr, (INT)wParam, (DWORD_PTR)lParam); case CB_SETITEMHEIGHT: return COMBOEX_SetItemHeight (infoPtr, (INT)wParam, (UINT)lParam); _____ Modified: trunk/reactos/lib/comctl32/comctl32.h --- trunk/reactos/lib/comctl32/comctl32.h 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/comctl32.h 2005-09-05 20:25:16 UTC (rev 17664) @@ -249,4 +249,8 @@ to->wMilliseconds = from->wMilliseconds; } +extern void THEMING_Initialize(void); +extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM); +extern void THEMING_SetSubclassData(HWND, ULONG_PTR); + #endif /* __WINE_COMCTL32_H */ _____ Modified: trunk/reactos/lib/comctl32/comctl32.spec --- trunk/reactos/lib/comctl32/comctl32.spec 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/comctl32.spec 2005-09-05 20:25:16 UTC (rev 17664) @@ -1,188 +1,188 @@ -# Functions exported by the Win95 comctl32.dll -# (these need to have these exact ordinals, because some win95 dlls -# import comctl32.dll by ordinal) -# This list was created from a comctl32.dll v5.81 (IE5.01). - - 2 stdcall MenuHelp(long long long long long long ptr) - 3 stdcall ShowHideMenuCtl(long long ptr) - 4 stdcall GetEffectiveClientRect(long long long) - 5 stdcall DrawStatusTextA(long ptr str long) - 6 stdcall CreateStatusWindowA(long str long long) - 7 stdcall CreateToolbar(long long long long long long ptr long) - 8 stdcall CreateMappedBitmap(long long long ptr long) - 9 stdcall -noname DPA_LoadStream(ptr ptr ptr long) - 10 stdcall -noname DPA_SaveStream(ptr ptr ptr long) - 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) -#12 stub Cctl1632_ThunkData32 - 13 stdcall MakeDragList(long) - 14 stdcall LBItemFromPt(long long long long) - 15 stdcall DrawInsert(long long long) - 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) - 17 stdcall InitCommonControls() - 71 stdcall -noname Alloc(long) - 72 stdcall -noname ReAlloc(ptr long) - 73 stdcall -noname Free(ptr) - 74 stdcall -noname GetSize(ptr) -151 stdcall -noname CreateMRUListA(ptr) -152 stdcall -noname FreeMRUList(long) -153 stdcall -noname AddMRUStringA(long str) -154 stdcall -noname EnumMRUListA(long long ptr long) -155 stdcall -noname FindMRUStringA(long str ptr) -156 stdcall -noname DelMRUString(long long) -157 stdcall -noname CreateMRUListLazyA(ptr long long long) -163 stub -noname CreatePage -164 stub -noname CreateProxyPage -167 stdcall -noname AddMRUData(long ptr long) -169 stdcall -noname FindMRUData(long ptr long ptr) -233 stdcall -noname Str_GetPtrA(str str long) -234 stdcall -noname Str_SetPtrA(str str) -235 stdcall -noname Str_GetPtrW(wstr wstr long) -236 stdcall -noname Str_SetPtrW(wstr wstr) -320 stdcall -noname DSA_Create(long long) -321 stdcall -noname DSA_Destroy(ptr) -322 stdcall -noname DSA_GetItem(ptr long long) -323 stdcall -noname DSA_GetItemPtr(ptr long) -324 stdcall -noname DSA_InsertItem(ptr long long) -325 stdcall -noname DSA_SetItem (ptr long long) -326 stdcall -noname DSA_DeleteItem(ptr long) -327 stdcall -noname DSA_DeleteAllItems(ptr) -328 stdcall -noname DPA_Create(long) -329 stdcall -noname DPA_Destroy(ptr) -330 stdcall -noname DPA_Grow(ptr long) -331 stdcall -noname DPA_Clone(ptr ptr) -332 stdcall -noname DPA_GetPtr(ptr long) -333 stdcall -noname DPA_GetPtrIndex(ptr ptr) -334 stdcall -noname DPA_InsertPtr(ptr long ptr) -335 stdcall -noname DPA_SetPtr(ptr long ptr) -336 stdcall -noname DPA_DeletePtr(ptr long) -337 stdcall -noname DPA_DeleteAllPtrs(ptr) -338 stdcall -noname DPA_Sort(ptr ptr long) -339 stdcall -noname DPA_Search(ptr ptr long ptr long long) -340 stdcall -noname DPA_CreateEx(long long) -341 stdcall -noname SendNotify(long long long ptr) -342 stdcall -noname SendNotifyEx(long long long ptr long) -350 stdcall -noname StrChrA(str str) -351 stdcall -noname StrRChrA(str str long) -352 stdcall -noname StrCmpNA(str str long) -353 stdcall -noname StrCmpNIA(str str long) -354 stdcall -noname StrStrA(str str) -355 stdcall -noname StrStrIA(str str) -356 stdcall -noname StrCSpnA(str str) -357 stdcall -noname StrToIntA(str) -358 stdcall -noname StrChrW(wstr long) -359 stdcall -noname StrRChrW(wstr wstr long) -360 stdcall -noname StrCmpNW(wstr wstr long) -361 stdcall -noname StrCmpNIW(wstr wstr long) -362 stdcall -noname StrStrW(wstr wstr) -363 stdcall -noname StrStrIW(wstr wstr) -364 stdcall -noname StrCSpnW(wstr wstr) -365 stdcall -noname StrToIntW(wstr) -366 stdcall -noname StrChrIA(str long) -367 stdcall -noname StrChrIW(wstr long) -368 stdcall -noname StrRChrIA(str str long) -369 stdcall -noname StrRChrIW(wstr wstr long) -372 stdcall -noname StrRStrIA(str str str) -373 stdcall -noname StrRStrIW(wstr wstr wstr) -374 stdcall -noname StrCSpnIA(str str) -375 stdcall -noname StrCSpnIW(wstr wstr) -376 stdcall -noname IntlStrEqWorkerA(long str str long) -377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long) -382 stdcall -noname SmoothScrollWindow(ptr) -383 stub -noname DoReaderMode -384 stdcall -noname SetPathWordBreakProc(ptr long) -385 stdcall -noname DPA_EnumCallback(long long long) -386 stdcall -noname DPA_DestroyCallback(ptr ptr long) -387 stdcall -noname DSA_EnumCallback(ptr ptr long) -388 stdcall -noname DSA_DestroyCallback(ptr ptr long) -389 stub -noname SHGetProcessDword -390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) -400 stdcall -noname CreateMRUListW(ptr) -401 stdcall -noname AddMRUStringW(long wstr) -402 stdcall -noname FindMRUStringW(long wstr ptr) -403 stdcall -noname EnumMRUListW(long long ptr long) -404 stdcall -noname CreateMRUListLazyW(ptr long long long) -410 stdcall -noname SetWindowSubclass(long ptr long long) -411 stdcall -noname GetWindowSubclass(long ptr long ptr) -412 stdcall -noname RemoveWindowSubclass(long ptr long) -413 stdcall -noname DefSubclassProc(long long long long) -414 stdcall -noname MirrorIcon(ptr ptr) -415 stdcall DrawTextWrap(long wstr long ptr long) user32.DrawTextW -416 stdcall DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW -417 stdcall ExtTextOutWrap(long long long long ptr wstr long ptr) gdi32.ExtTextOutW -418 stdcall GetCharWidthWrap(long long long long) gdi32.GetCharWidthW -419 stdcall GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW -420 stdcall GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W -421 stdcall TextOutWrap(long long long wstr long) gdi32.TextOutW - -# Functions imported by name - -@ stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPageA -@ stdcall CreatePropertySheetPageA(ptr) -@ stdcall CreatePropertySheetPageW(ptr) -@ stdcall CreateStatusWindow(long str long long) CreateStatusWindowA -@ stdcall CreateStatusWindowW(long wstr long long) -@ stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) -@ stdcall DestroyPropertySheetPage(long) -@ stdcall DllGetVersion(ptr) COMCTL32_DllGetVersion -@ stdcall DllInstall(long ptr) COMCTL32_DllInstall -@ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA -@ stdcall DrawStatusTextW(long ptr wstr long) -@ stdcall FlatSB_EnableScrollBar (long long long) -@ stdcall FlatSB_GetScrollInfo (long long ptr) -@ stdcall FlatSB_GetScrollPos (long long) -@ stdcall FlatSB_GetScrollProp (long long ptr) -@ stdcall FlatSB_GetScrollRange (long long ptr ptr) -@ stdcall FlatSB_SetScrollInfo (long long ptr long) -@ stdcall FlatSB_SetScrollPos (long long long long) -@ stdcall FlatSB_SetScrollProp (long long long long) -@ stdcall FlatSB_SetScrollRange (long long long long long) -@ stdcall FlatSB_ShowScrollBar (long long long) -@ stdcall GetMUILanguage() -@ stdcall ImageList_Add(ptr long long) -@ stdcall ImageList_AddIcon(ptr long) -@ stdcall ImageList_AddMasked(ptr long long) -@ stdcall ImageList_BeginDrag(ptr long long long) -@ stdcall ImageList_Copy(ptr long ptr long long) -@ stdcall ImageList_Create(long long long long long) -@ stdcall ImageList_Destroy(ptr) -@ stdcall ImageList_DragEnter(long long long) -@ stdcall ImageList_DragLeave(long) -@ stdcall ImageList_DragMove(long long) -@ stdcall ImageList_DragShowNolock(long) -@ stdcall ImageList_Draw(ptr long long long long long) -@ stdcall ImageList_DrawEx(ptr long long long long long long long long long) -@ stdcall ImageList_DrawIndirect(ptr) -@ stdcall ImageList_Duplicate(ptr) -@ stdcall ImageList_EndDrag() -@ stdcall ImageList_GetBkColor(ptr) -@ stdcall ImageList_GetDragImage(ptr ptr) -@ stdcall ImageList_GetFlags(ptr) -@ stdcall ImageList_GetIcon(ptr long long) -@ stdcall ImageList_GetIconSize(ptr ptr ptr) -@ stdcall ImageList_GetImageCount(ptr) -@ stdcall ImageList_GetImageInfo(ptr long ptr) -@ stdcall ImageList_GetImageRect(ptr long ptr) -@ stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImageA -@ stdcall ImageList_LoadImageA(long str long long long long long) -@ stdcall ImageList_LoadImageW(long wstr long long long long long) -@ stdcall ImageList_Merge(ptr long ptr long long long) -@ stdcall ImageList_Read(ptr) -@ stdcall ImageList_Remove(ptr long) -@ stdcall ImageList_Replace(ptr long long long) -@ stdcall ImageList_ReplaceIcon(ptr long long) -@ stdcall ImageList_SetBkColor(ptr long) -@ stdcall ImageList_SetDragCursorImage(ptr long long long) -@ stdcall ImageList_SetFilter(ptr long long) -@ stdcall ImageList_SetFlags(ptr long) -@ stdcall ImageList_SetIconSize(ptr long long) -@ stdcall ImageList_SetImageCount(ptr long) -@ stdcall ImageList_SetOverlayImage(ptr long long) -@ stdcall ImageList_Write(ptr ptr) -@ stdcall InitCommonControlsEx(ptr) -@ stdcall InitMUILanguage(long) -@ stdcall InitializeFlatSB(long) -@ stdcall PropertySheet(ptr) PropertySheetA -@ stdcall PropertySheetA(ptr) -@ stdcall PropertySheetW(ptr) -@ stdcall UninitializeFlatSB(long) -@ stdcall _TrackMouseEvent(ptr) +# Functions exported by the Win95 comctl32.dll +# (these need to have these exact ordinals, because some win95 dlls +# import comctl32.dll by ordinal) +# This list was created from a comctl32.dll v5.81 (IE5.01). + + 2 stdcall MenuHelp(long long long long long long ptr) + 3 stdcall ShowHideMenuCtl(long long ptr) + 4 stdcall GetEffectiveClientRect(long long long) + 5 stdcall DrawStatusTextA(long ptr str long) + 6 stdcall CreateStatusWindowA(long str long long) + 7 stdcall CreateToolbar(long long long long long long ptr long) + 8 stdcall CreateMappedBitmap(long long long ptr long) + 9 stdcall -noname DPA_LoadStream(ptr ptr ptr long) + 10 stdcall -noname DPA_SaveStream(ptr ptr ptr long) + 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) +#12 stub Cctl1632_ThunkData32 + 13 stdcall MakeDragList(long) + 14 stdcall LBItemFromPt(long long long long) + 15 stdcall DrawInsert(long long long) + 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) + 17 stdcall InitCommonControls() + 71 stdcall -noname Alloc(long) + 72 stdcall -noname ReAlloc(ptr long) + 73 stdcall -noname Free(ptr) + 74 stdcall -noname GetSize(ptr) +151 stdcall -noname CreateMRUListA(ptr) +152 stdcall -noname FreeMRUList(long) +153 stdcall -noname AddMRUStringA(long str) +154 stdcall -noname EnumMRUListA(long long ptr long) +155 stdcall -noname FindMRUStringA(long str ptr) +156 stdcall -noname DelMRUString(long long) +157 stdcall -noname CreateMRUListLazyA(ptr long long long) +163 stub -noname CreatePage +164 stub -noname CreateProxyPage +167 stdcall -noname AddMRUData(long ptr long) +169 stdcall -noname FindMRUData(long ptr long ptr) +233 stdcall -noname Str_GetPtrA(str str long) +234 stdcall -noname Str_SetPtrA(str str) +235 stdcall -noname Str_GetPtrW(wstr wstr long) +236 stdcall -noname Str_SetPtrW(wstr wstr) +320 stdcall -noname DSA_Create(long long) +321 stdcall -noname DSA_Destroy(ptr) +322 stdcall -noname DSA_GetItem(ptr long long) +323 stdcall -noname DSA_GetItemPtr(ptr long) +324 stdcall -noname DSA_InsertItem(ptr long long) +325 stdcall -noname DSA_SetItem (ptr long long) +326 stdcall -noname DSA_DeleteItem(ptr long) +327 stdcall -noname DSA_DeleteAllItems(ptr) +328 stdcall -noname DPA_Create(long) +329 stdcall -noname DPA_Destroy(ptr) +330 stdcall -noname DPA_Grow(ptr long) +331 stdcall -noname DPA_Clone(ptr ptr) +332 stdcall -noname DPA_GetPtr(ptr long) +333 stdcall -noname DPA_GetPtrIndex(ptr ptr) +334 stdcall -noname DPA_InsertPtr(ptr long ptr) +335 stdcall -noname DPA_SetPtr(ptr long ptr) +336 stdcall -noname DPA_DeletePtr(ptr long) +337 stdcall -noname DPA_DeleteAllPtrs(ptr) +338 stdcall -noname DPA_Sort(ptr ptr long) +339 stdcall -noname DPA_Search(ptr ptr long ptr long long) +340 stdcall -noname DPA_CreateEx(long long) +341 stdcall -noname SendNotify(long long long ptr) +342 stdcall -noname SendNotifyEx(long long long ptr long) +350 stdcall -noname StrChrA(str str) +351 stdcall -noname StrRChrA(str str long) +352 stdcall -noname StrCmpNA(str str long) +353 stdcall -noname StrCmpNIA(str str long) +354 stdcall -noname StrStrA(str str) +355 stdcall -noname StrStrIA(str str) +356 stdcall -noname StrCSpnA(str str) +357 stdcall -noname StrToIntA(str) +358 stdcall -noname StrChrW(wstr long) +359 stdcall -noname StrRChrW(wstr wstr long) +360 stdcall -noname StrCmpNW(wstr wstr long) +361 stdcall -noname StrCmpNIW(wstr wstr long) +362 stdcall -noname StrStrW(wstr wstr) +363 stdcall -noname StrStrIW(wstr wstr) +364 stdcall -noname StrCSpnW(wstr wstr) +365 stdcall -noname StrToIntW(wstr) +366 stdcall -noname StrChrIA(str long) +367 stdcall -noname StrChrIW(wstr long) +368 stdcall -noname StrRChrIA(str str long) +369 stdcall -noname StrRChrIW(wstr wstr long) +372 stdcall -noname StrRStrIA(str str str) +373 stdcall -noname StrRStrIW(wstr wstr wstr) +374 stdcall -noname StrCSpnIA(str str) +375 stdcall -noname StrCSpnIW(wstr wstr) +376 stdcall -noname IntlStrEqWorkerA(long str str long) +377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long) +382 stdcall -noname SmoothScrollWindow(ptr) +383 stub -noname DoReaderMode +384 stdcall -noname SetPathWordBreakProc(ptr long) +385 stdcall -noname DPA_EnumCallback(long long long) +386 stdcall -noname DPA_DestroyCallback(ptr ptr long) +387 stdcall -noname DSA_EnumCallback(ptr ptr long) +388 stdcall -noname DSA_DestroyCallback(ptr ptr long) +389 stub -noname SHGetProcessDword +390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) +400 stdcall -noname CreateMRUListW(ptr) +401 stdcall -noname AddMRUStringW(long wstr) +402 stdcall -noname FindMRUStringW(long wstr ptr) +403 stdcall -noname EnumMRUListW(long long ptr long) +404 stdcall -noname CreateMRUListLazyW(ptr long long long) +410 stdcall -noname SetWindowSubclass(long ptr long long) +411 stdcall -noname GetWindowSubclass(long ptr long ptr) +412 stdcall -noname RemoveWindowSubclass(long ptr long) +413 stdcall -noname DefSubclassProc(long long long long) +414 stdcall -noname MirrorIcon(ptr ptr) +415 stdcall DrawTextWrap(long wstr long ptr long) user32.DrawTextW +416 stdcall DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW +417 stdcall ExtTextOutWrap(long long long long ptr wstr long ptr) gdi32.ExtTextOutW +418 stdcall GetCharWidthWrap(long long long long) gdi32.GetCharWidthW +419 stdcall GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW +420 stdcall GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W +421 stdcall TextOutWrap(long long long wstr long) gdi32.TextOutW + +# Functions imported by name + +@ stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPageA +@ stdcall CreatePropertySheetPageA(ptr) +@ stdcall CreatePropertySheetPageW(ptr) +@ stdcall CreateStatusWindow(long str long long) CreateStatusWindowA +@ stdcall CreateStatusWindowW(long wstr long long) +@ stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) +@ stdcall DestroyPropertySheetPage(long) +@ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA +@ stdcall DrawStatusTextW(long ptr wstr long) +@ stdcall FlatSB_EnableScrollBar (long long long) +@ stdcall FlatSB_GetScrollInfo (long long ptr) +@ stdcall FlatSB_GetScrollPos (long long) +@ stdcall FlatSB_GetScrollProp (long long ptr) +@ stdcall FlatSB_GetScrollRange (long long ptr ptr) +@ stdcall FlatSB_SetScrollInfo (long long ptr long) +@ stdcall FlatSB_SetScrollPos (long long long long) +@ stdcall FlatSB_SetScrollProp (long long long long) +@ stdcall FlatSB_SetScrollRange (long long long long long) +@ stdcall FlatSB_ShowScrollBar (long long long) +@ stdcall GetMUILanguage() +@ stdcall ImageList_Add(ptr long long) +@ stdcall ImageList_AddIcon(ptr long) +@ stdcall ImageList_AddMasked(ptr long long) +@ stdcall ImageList_BeginDrag(ptr long long long) +@ stdcall ImageList_Copy(ptr long ptr long long) +@ stdcall ImageList_Create(long long long long long) +@ stdcall ImageList_Destroy(ptr) +@ stdcall ImageList_DragEnter(long long long) +@ stdcall ImageList_DragLeave(long) +@ stdcall ImageList_DragMove(long long) +@ stdcall ImageList_DragShowNolock(long) +@ stdcall ImageList_Draw(ptr long long long long long) +@ stdcall ImageList_DrawEx(ptr long long long long long long long long long) +@ stdcall ImageList_DrawIndirect(ptr) +@ stdcall ImageList_Duplicate(ptr) +@ stdcall ImageList_EndDrag() +@ stdcall ImageList_GetBkColor(ptr) +@ stdcall ImageList_GetDragImage(ptr ptr) +@ stdcall ImageList_GetFlags(ptr) +@ stdcall ImageList_GetIcon(ptr long long) +@ stdcall ImageList_GetIconSize(ptr ptr ptr) +@ stdcall ImageList_GetImageCount(ptr) +@ stdcall ImageList_GetImageInfo(ptr long ptr) +@ stdcall ImageList_GetImageRect(ptr long ptr) +@ stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImageA +@ stdcall ImageList_LoadImageA(long str long long long long long) +@ stdcall ImageList_LoadImageW(long wstr long long long long long) +@ stdcall ImageList_Merge(ptr long ptr long long long) +@ stdcall ImageList_Read(ptr) +@ stdcall ImageList_Remove(ptr long) +@ stdcall ImageList_Replace(ptr long long long) +@ stdcall ImageList_ReplaceIcon(ptr long long) +@ stdcall ImageList_SetBkColor(ptr long) +@ stdcall ImageList_SetDragCursorImage(ptr long long long) +@ stdcall ImageList_SetFilter(ptr long long) +@ stdcall ImageList_SetFlags(ptr long) +@ stdcall ImageList_SetIconSize(ptr long long) +@ stdcall ImageList_SetImageCount(ptr long) +@ stdcall ImageList_SetOverlayImage(ptr long long) +@ stdcall ImageList_Write(ptr ptr) +@ stdcall InitCommonControlsEx(ptr) +@ stdcall InitMUILanguage(long) +@ stdcall InitializeFlatSB(long) +@ stdcall PropertySheet(ptr) PropertySheetA +@ stdcall PropertySheetA(ptr) +@ stdcall PropertySheetW(ptr) +@ stdcall UninitializeFlatSB(long) +@ stdcall _TrackMouseEvent(ptr) Property changes on: trunk/reactos/lib/comctl32/comctl32.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/comctl32/comctl32.xml --- trunk/reactos/lib/comctl32/comctl32.xml 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/comctl32.xml 2005-09-05 20:25:16 UTC (rev 17664) @@ -40,6 +40,11 @@ <file>status.c</file> <file>syslink.c</file> <file>tab.c</file> + <file>theme_combo.c</file> + <file>theme_dialog.c</file> + <file>theme_edit.c</file> + <file>theme_listbox.c</file> + <file>theming.c</file> <file>toolbar.c</file> <file>tooltips.c</file> <file>trackbar.c</file> _____ Modified: trunk/reactos/lib/comctl32/comctl32undoc.c --- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-09-05 20:25:16 UTC (rev 17664) @@ -274,7 +274,6 @@ HKEY newkey; WCHAR realname[2]; LPWINEMRUITEM witem; - static const WCHAR emptyW[] = {'\0'}; /* or should we do the following instead of RegOpenKeyEx: */ @@ -287,7 +286,7 @@ err); if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, - (LPWSTR)emptyW, + NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0, @@ -653,7 +652,6 @@ WCHAR realname[2]; LPWINEMRUITEM witem; DWORD type; - static const WCHAR emptyW[] = {'\0'}; /* get space to save indices that will turn into names * but in order of most to least recently used @@ -668,16 +666,16 @@ /* open the sub key */ if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, - (LPWSTR)emptyW, + NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0, &newkey, &dwdisp))) { /* error - what to do ??? */ - ERR("(%lu %lu %lx %lx \"%s\" %p): Could not open key, error=%d\n", + ERR("(%lu %lu %lx %p %s %p): Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, - (DWORD)mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), + mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.lpfnCompare, err); return 0; } @@ -718,9 +716,9 @@ else mp->cursize = 0; - TRACE("(%lu %lu %lx %lx \"%s\" %p): Current Size = %ld\n", + TRACE("(%lu %lu %lx %p %s %p): Current Size = %ld\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, - (DWORD)mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), + mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.lpfnCompare, mp->cursize); return (HANDLE)mp; } _____ Modified: trunk/reactos/lib/comctl32/commctrl.c --- trunk/reactos/lib/comctl32/commctrl.c 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/commctrl.c 2005-09-05 20:25:16 UTC (rev 17664) @@ -119,7 +119,7 @@ COMCTL32_hModule = (HMODULE)hinstDLL; /* add global subclassing atom (used by 'tooltip' and 'updown') */ - COMCTL32_wSubclass = (LPWSTR)(DWORD)GlobalAddAtomW (strCC32SubclassInfo); + COMCTL32_wSubclass = (LPWSTR)(DWORD_PTR)GlobalAddAtomW (strCC32SubclassInfo); TRACE("Subclassing atom added: %p\n", COMCTL32_wSubclass); /* create local pattern brush */ @@ -144,6 +144,9 @@ TRACKBAR_Register (); TREEVIEW_Register (); UPDOWN_Register (); + + /* subclass user32 controls */ + THEMING_Initialize (); break; case DLL_PROCESS_DETACH: @@ -305,7 +308,7 @@ */ BOOL WINAPI -ShowHideMenuCtl (HWND hwnd, UINT uFlags, LPINT lpInfo) +ShowHideMenuCtl (HWND hwnd, UINT_PTR uFlags, LPINT lpInfo) { LPINT lpMenuId; @@ -322,9 +325,9 @@ while (*lpMenuId != uFlags) lpMenuId += 2; - if (GetMenuState ((HMENU)lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) { + if (GetMenuState ((HMENU)(DWORD_PTR)lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) { /* uncheck menu item */ - CheckMenuItem ((HMENU)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED); + CheckMenuItem ((HMENU)(DWORD_PTR)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED); /* hide control */ lpMenuId++; @@ -333,7 +336,7 @@ } else { /* check menu item */ - CheckMenuItem ((HMENU)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED); + CheckMenuItem ((HMENU)(DWORD_PTR)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED); /* show control */ lpMenuId++; @@ -373,8 +376,8 @@ INT *lpRun; HWND hwndCtrl; - TRACE("(0x%08lx 0x%08lx 0x%08lx)\n", - (DWORD)hwnd, (DWORD)lpRect, (DWORD)lpInfo); + TRACE("(%p %p %p)\n", + hwnd, lpRect, lpInfo); GetClientRect (hwnd, lpRect); lpRun = lpInfo; @@ -503,7 +506,7 @@ return CreateWindowA(STATUSCLASSNAMEA, text, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - parent, (HMENU)wid, 0, 0); + parent, (HMENU)(DWORD_PTR)wid, 0, 0); } @@ -529,7 +532,7 @@ return CreateWindowW(STATUSCLASSNAMEW, text, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - parent, (HMENU)wid, 0, 0); + parent, (HMENU)(DWORD_PTR)wid, 0, 0); } @@ -564,7 +567,7 @@ { HWND hUD = CreateWindowW (UPDOWN_CLASSW, 0, style, x, y, cx, cy, - parent, (HMENU)id, inst, 0); + parent, (HMENU)(DWORD_PTR)id, inst, 0); if (hUD) { SendMessageW (hUD, UDM_SETBUDDY, (WPARAM)buddy, 0); SendMessageW (hUD, UDM_SETRANGE, 0, MAKELONG(maxVal, minVal)); @@ -725,7 +728,7 @@ hwndTB = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style|WS_CHILD, 0,0,100,30, - hwnd, (HMENU)wID, COMCTL32_hModule, NULL); + hwnd, (HMENU)(DWORD_PTR)wID, COMCTL32_hModule, NULL); if(hwndTB) { TBADDBITMAP tbab; @@ -784,7 +787,7 @@ */ HBITMAP WINAPI -CreateMappedBitmap (HINSTANCE hInstance, INT idBitmap, UINT wFlags, +CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags, LPCOLORMAP lpColorMap, INT iNumMaps) { HGLOBAL hglb; @@ -931,8 +934,7 @@ * Returns version of a comctl32.dll from IE4.01 SP1. */ -HRESULT WINAPI -COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi) +HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) { if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) { WARN("wrong DLLVERSIONINFO size from app\n"); @@ -960,7 +962,7 @@ * Success: S_OK * Failure: A HRESULT error */ -HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline) +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", debugstr_w(cmdline)); _____ Modified: trunk/reactos/lib/comctl32/datetime.c --- trunk/reactos/lib/comctl32/datetime.c 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/datetime.c 2005-09-05 20:25:16 UTC (rev 17664) @@ -1164,6 +1164,15 @@ static LRESULT +DATETIME_SetFont (DATETIME_INFO *infoPtr, HFONT font, BOOL repaint) +{ + infoPtr->hFont = font; + if (repaint) InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return 0; +} + + +static LRESULT DATETIME_Create (HWND hwnd, LPCREATESTRUCTW lpcs) { static const WCHAR SysMonthCal32W[] = { 'S', 'y', 's', 'M', 'o', 'n', 't', 'h', 'C', 'a', 'l', '3', '2', 0 }; @@ -1314,6 +1323,12 @@ case WM_STYLECHANGED: return DATETIME_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + case WM_SETFONT: + return DATETIME_SetFont(infoPtr, (HFONT)wParam, (BOOL)lParam); + + case WM_GETFONT: + return (LRESULT) infoPtr->hFont; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", _____ Modified: trunk/reactos/lib/comctl32/dpa.c --- trunk/reactos/lib/comctl32/dpa.c 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/dpa.c 2005-09-05 20:25:16 UTC (rev 17664) @@ -787,11 +787,6 @@ * RETURNS * Success: index of the pointer in the array. * Failure: -1 - * - * NOTES - * Binary search taken from R.Sedgewick "Algorithms in C"! - * Function is NOT tested! - * If something goes wrong, blame HIM not ME! (Eric Kohl) */ INT WINAPI DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions) @@ -807,47 +802,34 @@ INT l, r, x, n; LPVOID *lpPtr; - TRACE("binary search\n"); - l = (nStart == -1) ? 0 : nStart; r = hdpa->nItemCount - 1; lpPtr = hdpa->ptrs; while (r >= l) { x = (l + r) / 2; n = (pfnCompare)(pFind, lpPtr[x], lParam); - if (n < 0) + if (n == 0) + return x; + else if (n < 0) r = x - 1; - else + else /* (n > 0) */ l = x + 1; - if (n == 0) { - TRACE("-- ret=%d\n", n); - return n; - } } - - if (uOptions & (DPAS_INSERTBEFORE | DPAS_INSERTAFTER)) { - TRACE("-- ret=%d\n", l); - return l; - } + if (uOptions & (DPAS_INSERTBEFORE|DPAS_INSERTAFTER)) return l; } else { /* array is not sorted --> use linear search */ LPVOID *lpPtr; INT nIndex; - TRACE("linear search\n"); - nIndex = (nStart == -1)? 0 : nStart; lpPtr = hdpa->ptrs; for (; nIndex < hdpa->nItemCount; nIndex++) { - if ((pfnCompare)(pFind, lpPtr[nIndex], lParam) == 0) { - TRACE("-- ret=%d\n", nIndex); + if ((pfnCompare)(pFind, lpPtr[nIndex], lParam) == 0) return nIndex; - } } } - TRACE("-- not found: ret=-1\n"); return -1; } _____ Modified: trunk/reactos/lib/comctl32/header.c --- trunk/reactos/lib/comctl32/header.c 2005-09-05 20:12:18 UTC (rev 17663) +++ trunk/reactos/lib/comctl32/header.c 2005-09-05 20:25:16 UTC (rev 17664) @@ -87,6 +87,7 @@ HIMAGELIST himl; /* handle to an image list (may be 0) */ HEADER_ITEM *items; /* pointer to array of HEADER_ITEM's */ + INT *order; /* array of item IDs indexed by order */ BOOL bRectsValid; /* validity flag for bounding rectangles */ } HEADER_INFO; @@ -113,14 +114,10 @@ { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); INT iorder = (INT)wParam; - UINT i; - if ((iorder <0) || iorder >infoPtr->uNumItem) + if ((iorder <0) || iorder >= infoPtr->uNumItem) return iorder; - for (i=0; i<infoPtr->uNumItem; i++) - if (HEADER_IndexToOrder(hwnd,i) == iorder) - return i; - return iorder; + return infoPtr->order[iorder]; } static void @@ -385,7 +382,7 @@ } x = rect.left; - for (i = 0; i < infoPtr->uNumItem; i++) { + for (i = 0; x <= rect.right && i < infoPtr->uNumItem; i++) { x = HEADER_DrawItem (hwnd, hdc, HEADER_OrderToIndex(hwnd,i), infoPtr->iHotItem == i); } @@ -416,7 +413,7 @@ hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); hOldFont = SelectObject (hdc, hFont); - HEADER_DrawItem (hwnd, hdc, iItem, FALSE); + HEADER_DrawItem (hwnd, hdc, iItem, infoPtr->iHotItem == iItem); SelectObject (hdc, hOldFont); } @@ -647,16 +644,19 @@ if (infoPtr->items[0].pszText) Free (infoPtr->items[0].pszText); Free (infoPtr->items); + Free(infoPtr->order); infoPtr->items = 0; + infoPtr->order = 0; infoPtr->uNumItem = 0; } else { HEADER_ITEM *oldItems = infoPtr->items; - HEADER_ITEM *pItem; INT i; INT iOrder; TRACE("Complex delete! [iItem=%d]\n", iItem); + for (i = 0; i < infoPtr->uNumItem; i++) + TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); if (infoPtr->items[iItem].pszText) Free (infoPtr->items[iItem].pszText); iOrder = infoPtr->items[iItem].iOrder; @@ -676,11 +676,21 @@ } /* Correct the orders */ - for (i=infoPtr->uNumItem, pItem = infoPtr->items; i; i--, pItem++) + if (iOrder < infoPtr->uNumItem) { - if (pItem->iOrder > iOrder) - pItem->iOrder--; + memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], + (infoPtr->uNumItem - iOrder) * sizeof(INT)); + for (i = 0; i < infoPtr->uNumItem; i++) + { + if (infoPtr->order[i] > iItem) + infoPtr->order[i]--; + if (i >= iOrder) + infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; + } } + + for (i = 0; i < infoPtr->uNumItem; i++) + TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); Free (oldItems); } @@ -850,14 +860,13 @@ static LRESULT HEADER_GetOrderArray(HWND hwnd, WPARAM wParam, LPARAM lParam) { - int i; LPINT order = (LPINT) lParam; HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); if ((unsigned int)wParam <infoPtr->uNumItem) return FALSE; - for (i=0; i<(int)wParam; i++) - *order++=HEADER_OrderToIndex(hwnd,i); + + memcpy(order, infoPtr->order, infoPtr->uNumItem * sizeof(INT)); return TRUE; } @@ -871,6 +880,7 @@ if ((unsigned int)wParam <infoPtr->uNumItem) return FALSE; + memcpy(infoPtr->order, order, infoPtr->uNumItem * sizeof(INT)); for (i=0; i<(int)wParam; i++) { lpItem = &infoPtr->items[*order++]; @@ -923,10 +933,12 @@ if (infoPtr->uNumItem == 0) { infoPtr->items = Alloc (sizeof (HEADER_ITEM)); + infoPtr->order = Alloc(sizeof(INT)); infoPtr->uNumItem++; } else { HEADER_ITEM *oldItems = infoPtr->items; + INT *oldOrder = infoPtr->order; infoPtr->uNumItem++; infoPtr->items = Alloc (sizeof (HEADER_ITEM) * infoPtr->uNumItem); @@ -949,13 +961,21 @@ } } + infoPtr->order = Alloc(sizeof(INT) * infoPtr->uNumItem); + memcpy(infoPtr->order, oldOrder, iOrder * sizeof(INT)); + infoPtr->order[iOrder] = nItem; + memcpy(&infoPtr->order[iOrder + 1], &oldOrder[iOrder], + (infoPtr->uNumItem - iOrder - 1) * sizeof(INT)); + Free (oldItems); + Free(oldOrder); [truncated at 1000 lines; 3635 more skipped]

19 years, 3 months

[gvg] 17663: Add forgotten files

by gvg＠svn.reactos.com

Add forgotten files Added: vendor/wine/dlls/comctl32/current/theme_combo.c Added: vendor/wine/dlls/comctl32/current/theme_dialog.c Added: vendor/wine/dlls/comctl32/current/theme_edit.c Added: vendor/wine/dlls/comctl32/current/theme_listbox.c Added: vendor/wine/dlls/comctl32/current/theming.c _____ Added: vendor/wine/dlls/comctl32/current/theme_combo.c --- vendor/wine/dlls/comctl32/current/theme_combo.c 2005-09-05 20:07:46 UTC (rev 17662) +++ vendor/wine/dlls/comctl32/current/theme_combo.c 2005-09-05 20:12:18 UTC (rev 17663) @@ -0,0 +1,319 @@ +/* + * Theming - Combo box control + * + * Copyright (c) 2005 by Frank Richter + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "uxtheme.h" +#include "tmschema.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(themingcombo); + +/* Subclass-private state flags */ +#define STATE_NOREDRAW 1 +#define STATE_HOT 2 + +/* some constants for metrics, same as in user32 */ +#define COMBO_XBORDERSIZE 2 +#define COMBO_YBORDERSIZE 2 +#define COMBO_EDITBUTTONSPACE 0 +#define EDIT_CONTROL_PADDING 1 + +/* paint text of combobox, needed for read-only drop downs. */ +static void paint_text (HWND hwnd, HDC hdc, DWORD dwStyle, COMBOBOXINFO* cbi) +{ + INT id, size = 0; + LPWSTR pText = NULL; + UINT itemState = ODS_COMBOBOXEDIT; + HFONT font = (HFONT)SendMessageW (hwnd, WM_GETFONT, 0, 0); + HFONT hPrevFont = (font) ? SelectObject(hdc, font) : 0; + RECT rectEdit; + BOOL focused = GetFocus () == hwnd; + BOOL dropped = cbi->stateButton == STATE_SYSTEM_PRESSED; + + TRACE("\n"); + + /* follow Windows combobox that sends a bunch of text + * inquiries to its listbox while processing WM_PAINT. */ + + if( (id = SendMessageW (cbi->hwndList, LB_GETCURSEL, 0, 0) ) != LB_ERR ) + { + size = SendMessageW (cbi->hwndList, LB_GETTEXTLEN, id, 0); + if (size == LB_ERR) + FIXME("LB_ERR probably not handled yet\n"); + if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) ) + { + /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */ + size=SendMessageW (cbi->hwndList, LB_GETTEXT, (WPARAM)id, (LPARAM)pText); + pText[size] = '\0'; /* just in case */ + } else return; + } + else + if( !(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) ) + return; + + /* + * Give ourselves some space. + */ + CopyRect (&rectEdit, &cbi->rcItem); + InflateRect( &rectEdit, -1, -1 ); + + if(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) + { + DRAWITEMSTRUCT dis; + HRGN clipRegion; + UINT ctlid = (UINT)GetWindowLongPtrW( hwnd, GWLP_ID ); + + /* setup state for DRAWITEM message. Owner will highlight */ + if ( focused && !dropped ) + itemState |= ODS_SELECTED | ODS_FOCUS; + + /* + * Save the current clip region. + * To retrieve the clip region, we need to create one "dummy" + * clip region. + */ + clipRegion = CreateRectRgnIndirect(&rectEdit); + + if (GetClipRgn(hdc, clipRegion)!=1) + { + DeleteObject(clipRegion); + clipRegion=NULL; + } + + if (!IsWindowEnabled(hwnd) & WS_DISABLED) itemState |= ODS_DISABLED; + + dis.CtlType = ODT_COMBOBOX; + dis.CtlID = ctlid; + dis.hwndItem = hwnd; + dis.itemAction = ODA_DRAWENTIRE; + dis.itemID = id; + dis.itemState = itemState; + dis.hDC = hdc; + dis.rcItem = rectEdit; + dis.itemData = SendMessageW(cbi->hwndList, LB_GETITEMDATA, + (WPARAM)id, 0 ); + + /* + * Clip the DC and have the parent draw the item. + */ + IntersectClipRect(hdc, + rectEdit.left, rectEdit.top, + rectEdit.right, rectEdit.bottom); + + SendMessageW(GetParent (hwnd), WM_DRAWITEM, ctlid, (LPARAM)&dis ); + + /* + * Reset the clipping region. + */ + SelectClipRgn(hdc, clipRegion); + } + else + { + static const WCHAR empty_stringW[] = { 0 }; + + if ( focused && !dropped ) { + + /* highlight */ + FillRect( hdc, &rectEdit, GetSysColorBrush(COLOR_HIGHLIGHT) ); + SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) ); + SetTextColor( hdc, GetSysColor( COLOR_HIGHLIGHTTEXT ) ); + } + + ExtTextOutW( hdc, + rectEdit.left + 1, + rectEdit.top + 1, + ETO_OPAQUE | ETO_CLIPPED, + &rectEdit, + pText ? pText : empty_stringW , size, NULL ); + + if ( focused && !dropped ) + DrawFocusRect( hdc, &rectEdit ); + } + + if( hPrevFont ) + SelectObject(hdc, hPrevFont ); + + HeapFree( GetProcessHeap(), 0, pText ); +} + +/* paint the combobox */ +static LRESULT paint (HTHEME theme, HWND hwnd, HDC hParamDC, ULONG state) +{ + PAINTSTRUCT ps; + HDC hDC; + COMBOBOXINFO cbi; + DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); + + hDC = (hParamDC) ? hParamDC + : BeginPaint( hwnd, &ps); + + TRACE("hdc=%p\n", hDC); + + if( hDC && !(state & STATE_NOREDRAW) ) + { + RECT frameRect; + int buttonState; + + cbi.cbSize = sizeof (cbi); + SendMessageW (hwnd, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbi); + + /* paint border */ + if ((dwStyle & CBS_DROPDOWNLIST) != CBS_SIMPLE) + GetClientRect (hwnd, &frameRect); + else + { + CopyRect (&frameRect, &cbi.rcItem); + + InflateRect(&frameRect, + EDIT_CONTROL_PADDING + COMBO_XBORDERSIZE, + EDIT_CONTROL_PADDING + COMBO_YBORDERSIZE); + } + + DrawThemeBackground (theme, hDC, 0, + IsWindowEnabled (hwnd) ? CBXS_NORMAL : CBXS_DISABLED, &frameRect, NULL); + + /* paint button */ + if (cbi.stateButton != STATE_SYSTEM_INVISIBLE) + { + if (!IsWindowEnabled (hwnd)) + buttonState = CBXS_DISABLED; + else if (cbi.stateButton == STATE_SYSTEM_PRESSED) + buttonState = CBXS_PRESSED; + else if (state & STATE_HOT) + buttonState = CBXS_HOT; + else + buttonState = CBXS_NORMAL; + DrawThemeBackground (theme, hDC, CP_DROPDOWNBUTTON, buttonState, + &cbi.rcButton, NULL); + } + + /* paint text, if we need to */ + if ((dwStyle & CBS_DROPDOWNLIST) == CBS_DROPDOWNLIST) + paint_text (hwnd, hDC, dwStyle, &cbi); + } + + if( !hParamDC ) + EndPaint(hwnd, &ps); + + return 0; +} + + +/********************************************************************** + * The combo control subclass window proc. + */ +LRESULT CALLBACK THEMING_ComboSubclassProc (HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + const WCHAR* themeClass = WC_COMBOBOXW; + HTHEME theme; + LRESULT result; + + switch (msg) + { + case WM_CREATE: + result = THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + OpenThemeData( hwnd, themeClass ); + return result; + + case WM_DESTROY: + theme = GetWindowTheme( hwnd ); + CloseThemeData ( theme ); + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + + case WM_THEMECHANGED: + theme = GetWindowTheme( hwnd ); + CloseThemeData ( theme ); + OpenThemeData( hwnd, themeClass ); + break; + + case WM_SYSCOLORCHANGE: + theme = GetWindowTheme( hwnd ); + if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, + * which will do the repaint. */ + break; + + case WM_PAINT: + theme = GetWindowTheme( hwnd ); + if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + return paint (theme, hwnd, (HDC)wParam, dwRefData); + + case WM_SETREDRAW: + /* Since there doesn't seem to be WM_GETREDRAW, do redraw tracking in + * the subclass as well. */ + if( wParam ) + dwRefData &= ~STATE_NOREDRAW; + else + dwRefData |= STATE_NOREDRAW; + THEMING_SetSubclassData (hwnd, dwRefData); + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + + case WM_MOUSEMOVE: + { + /* Dropdown button hot-tracking */ + COMBOBOXINFO cbi; + POINT pt = {LOWORD(lParam), HIWORD(lParam)}; + + cbi.cbSize = sizeof (cbi); + SendMessageW (hwnd, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbi); + + if (cbi.stateButton != STATE_SYSTEM_INVISIBLE) + { + if (PtInRect (&cbi.rcButton, pt)) + { + if (!(dwRefData & STATE_HOT)) + { + dwRefData |= STATE_HOT; + THEMING_SetSubclassData (hwnd, dwRefData); + RedrawWindow (hwnd, &cbi.rcButton, 0, + RDW_INVALIDATE | RDW_UPDATENOW); + } + } + else + { + if (dwRefData & STATE_HOT) + { + dwRefData &= ~STATE_HOT; + THEMING_SetSubclassData (hwnd, dwRefData); + RedrawWindow (hwnd, &cbi.rcButton, 0, + RDW_INVALIDATE | RDW_UPDATENOW); + } + } + } + } + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + + default: + /* Call old proc */ + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + } + return 0; +} Property changes on: vendor/wine/dlls/comctl32/current/theme_combo.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/comctl32/current/theme_dialog.c --- vendor/wine/dlls/comctl32/current/theme_dialog.c 2005-09-05 20:07:46 UTC (rev 17662) +++ vendor/wine/dlls/comctl32/current/theme_dialog.c 2005-09-05 20:12:18 UTC (rev 17663) @@ -0,0 +1,142 @@ +/* + * Theming - Dialogs + * + * Copyright (c) 2005 by Frank Richter + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "uxtheme.h" +#include "tmschema.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(themingdialog); + +/********************************************************************** + * The dialog subclass window proc. + */ +LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + HTHEME theme = GetWindowTheme ( hWnd ); + static const WCHAR themeClass[] = { 'W','i','n','d','o','w',0 }; + BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); + BOOL doTheming = themingActive && (theme != NULL); + LRESULT result; + + switch (msg) + { + case WM_CREATE: + result = THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + theme = OpenThemeData( hWnd, themeClass ); + return result; + + case WM_DESTROY: + CloseThemeData ( theme ); + return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + + case WM_THEMECHANGED: + CloseThemeData ( theme ); + OpenThemeData( hWnd, themeClass ); + InvalidateRect( hWnd, NULL, TRUE ); + return 0; + + case WM_SYSCOLORCHANGE: + if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, + * which will do the repaint. */ + break; + + case WM_ERASEBKGND: + if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + { + RECT rc; + DLGPROC dlgp = (DLGPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); + if (!dlgp (hWnd, msg, wParam, lParam)) + { + /* Draw background*/ + GetClientRect (hWnd, &rc); + if (IsThemePartDefined (theme, WP_DIALOG, 0)) + /* Although there is a theme for the WINDOW class/DIALOG part, + * but I[res] haven't seen Windows using it yet... Even when + * dialog theming is activated, the good ol' BTNFACE + * background seems to be used. */ +#if 0 + DrawThemeBackground (theme, (HDC)wParam, WP_DIALOG, 0, &rc, + NULL); +#endif + return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + else + /* We might have gotten a TAB theme class, so check if we can + * draw as a tab page. */ + if (IsThemePartDefined (theme, TABP_BODY, 0)) + DrawThemeBackground (theme, (HDC)wParam, TABP_BODY, 0, &rc, + NULL); + else + return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + } + return 1; + } + + case WM_CTLCOLORSTATIC: + if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + { + DLGPROC dlgp = (DLGPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); + LRESULT result = (LRESULT)dlgp (hWnd, msg, wParam, lParam); + if (!result) + { + /* Override defaults with more suitable values when themed */ + HDC controlDC = (HDC)wParam; + HWND controlWnd = (HWND)lParam; + WCHAR controlClass[32]; + RECT rc; + + GetClassNameW (controlWnd, controlClass, + sizeof(controlClass) / sizeof(controlClass[0])); + if (lstrcmpiW (controlClass, WC_STATICW) == 0) + { + /* Static control - draw parent background and set text to + * transparent, so it looks right on tab pages. */ + GetClientRect (controlWnd, &rc); + DrawThemeParentBackground (controlWnd, controlDC, &rc); + SetBkMode (controlDC, TRANSPARENT); + + /* Return NULL brush since we painted the BG already */ + return (LRESULT)GetStockObject (NULL_BRUSH); + } + else + return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + + } + return result; + } + + default: + /* Call old proc */ + return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + } + return 0; +} Property changes on: vendor/wine/dlls/comctl32/current/theme_dialog.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/comctl32/current/theme_edit.c --- vendor/wine/dlls/comctl32/current/theme_edit.c 2005-09-05 20:07:46 UTC (rev 17662) +++ vendor/wine/dlls/comctl32/current/theme_edit.c 2005-09-05 20:12:18 UTC (rev 17663) @@ -0,0 +1,134 @@ +/* + * Theming - Edit control + * + * Copyright (c) 2005 by Frank Richter + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "uxtheme.h" +#include "tmschema.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(themingedit); + +/* Draw themed border */ +static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) +{ + HRGN cliprgn = region; + DWORD exStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); + if (exStyle & WS_EX_CLIENTEDGE) + { + HDC dc; + RECT r; + int cxEdge = GetSystemMetrics (SM_CXEDGE), + cyEdge = GetSystemMetrics (SM_CYEDGE); + int part = EP_EDITTEXT; + int state = ETS_NORMAL; + DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); + + if (!IsWindowEnabled (hwnd)) + state = ETS_DISABLED; + else if (dwStyle & ES_READONLY) + state = ETS_READONLY; + else if (GetFocus() == hwnd) + state = ETS_FOCUSED; + + GetWindowRect(hwnd, &r); + + /* New clipping region passed to default proc to exclude border */ + cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, + r.right - cxEdge, r.bottom - cyEdge); + if (region != (HRGN)1) + CombineRgn (cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + + dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); + OffsetRect(&r, -r.left, -r.top); + + if (IsThemeBackgroundPartiallyTransparent (theme, part, state)) + DrawThemeParentBackground(hwnd, dc, &r); + DrawThemeBackground (theme, dc, part, state, &r, 0); + ReleaseDC(hwnd, dc); + } + + /* Call default proc to get the scrollbars etc. also painted */ + DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); +} + +/********************************************************************** + * The edit control subclass window proc. + */ +LRESULT CALLBACK THEMING_EditSubclassProc (HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + const WCHAR* themeClass = WC_EDITW; + HTHEME theme; + LRESULT result; + + switch (msg) + { + case WM_CREATE: + result = THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + OpenThemeData( hwnd, themeClass ); + return result; + + case WM_DESTROY: + theme = GetWindowTheme( hwnd ); + CloseThemeData ( theme ); + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + + case WM_THEMECHANGED: + theme = GetWindowTheme( hwnd ); + CloseThemeData ( theme ); + OpenThemeData( hwnd, themeClass ); + break; + + case WM_SYSCOLORCHANGE: + theme = GetWindowTheme( hwnd ); + if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, + * which will do the repaint. */ + break; + + case WM_NCPAINT: + theme = GetWindowTheme( hwnd ); + if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + nc_paint (theme, hwnd, (HRGN)wParam); + break; + + case WM_ENABLE: + theme = GetWindowTheme( hwnd ); + if (theme) RedrawWindow (hwnd, NULL, NULL, + RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + + default: + /* Call old proc */ + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + } + return 0; +} Property changes on: vendor/wine/dlls/comctl32/current/theme_edit.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/comctl32/current/theme_listbox.c --- vendor/wine/dlls/comctl32/current/theme_listbox.c 2005-09-05 20:07:46 UTC (rev 17662) +++ vendor/wine/dlls/comctl32/current/theme_listbox.c 2005-09-05 20:12:18 UTC (rev 17663) @@ -0,0 +1,118 @@ +/* + * Theming - List box control + * + * Copyright (c) 2005 by Frank Richter + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "uxtheme.h" +#include "tmschema.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(theminglistbox); + +/* Draw themed border */ +static void nc_paint (HTHEME theme, HWND hwnd, HRGN region) +{ + HRGN cliprgn = region; + DWORD exStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); + if (exStyle & WS_EX_CLIENTEDGE) + { + HDC dc; + RECT r; + int cxEdge = GetSystemMetrics (SM_CXEDGE), + cyEdge = GetSystemMetrics (SM_CYEDGE); + + GetWindowRect(hwnd, &r); + + /* New clipping region passed to default proc to exclude border */ + cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, + r.right - cxEdge, r.bottom - cyEdge); + if (region != (HRGN)1) + CombineRgn (cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + + dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); + OffsetRect(&r, -r.left, -r.top); + + if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) + DrawThemeParentBackground(hwnd, dc, &r); + DrawThemeBackground (theme, dc, 0, 0, &r, 0); + ReleaseDC(hwnd, dc); + } + + /* Call default proc to get the scrollbars etc. painted */ + DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0); +} + +/********************************************************************** + * The list control subclass window proc. + */ +LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + const WCHAR* themeClass = WC_LISTBOXW; + HTHEME theme; + LRESULT result; + + switch (msg) + { + case WM_CREATE: + result = THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + OpenThemeData( hwnd, themeClass ); + return result; + + case WM_DESTROY: + theme = GetWindowTheme( hwnd ); + CloseThemeData ( theme ); + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + + case WM_THEMECHANGED: + theme = GetWindowTheme( hwnd ); + CloseThemeData ( theme ); + OpenThemeData( hwnd, themeClass ); + break; + + case WM_SYSCOLORCHANGE: + theme = GetWindowTheme( hwnd ); + if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, + * which will do the repaint. */ + break; + + case WM_NCPAINT: + theme = GetWindowTheme( hwnd ); + if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + nc_paint (theme, hwnd, (HRGN)wParam); + break; + + default: + /* Call old proc */ + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + } + return 0; +} Property changes on: vendor/wine/dlls/comctl32/current/theme_listbox.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/comctl32/current/theming.c --- vendor/wine/dlls/comctl32/current/theming.c 2005-09-05 20:07:46 UTC (rev 17662) +++ vendor/wine/dlls/comctl32/current/theming.c 2005-09-05 20:12:18 UTC (rev 17663) @@ -0,0 +1,169 @@ +/* + * Theming - Initialization + * + * Copyright (c) 2005 by Frank Richter + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(theming); + +typedef LRESULT (CALLBACK* THEMING_SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM, + ULONG_PTR); + +extern LRESULT CALLBACK THEMING_ComboSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR); +extern LRESULT CALLBACK THEMING_DialogSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR); +extern LRESULT CALLBACK THEMING_EditSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR); +extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR); + +static const WCHAR dialogClass[] = {'#','3','2','7','7','0',0}; +static const WCHAR comboLboxClass[] = {'C','o','m','b','o','L','b','o','x',0}; + +static const struct ThemingSubclass +{ + const WCHAR* className; + THEMING_SUBCLASSPROC subclassProc; +} subclasses[] = { + /* Note: list must be sorted by class name */ + {dialogClass, THEMING_DialogSubclassProc}, + {WC_COMBOBOXW, THEMING_ComboSubclassProc}, + {comboLboxClass, THEMING_ListBoxSubclassProc}, + {WC_EDITW, THEMING_EditSubclassProc}, + {WC_LISTBOXW, THEMING_ListBoxSubclassProc} +}; + +#define NUM_SUBCLASSES (sizeof(subclasses)/sizeof(subclasses[0])) + +static WNDPROC originalProcs[NUM_SUBCLASSES]; +static ATOM atRefDataProp; +static ATOM atSubclassProp; + +/* Generate a number of subclass window procs. + * With a single proc alone, we can't really reliably find out the superclass, + * so have one for each subclass. The subclass number is also stored in a prop + * since it's needed by THEMING_CallOriginalClass(). Then, the the subclass + * proc and ref data are fetched and the proc called. + */ +#define MAKE_SUBCLASS_PROC(N) \ +static LRESULT CALLBACK subclass_proc ## N (HWND wnd, UINT msg, \ + WPARAM wParam, LPARAM lParam) \ +{ \ + LRESULT result; \ + ULONG_PTR refData; \ + SetPropW (wnd, MAKEINTATOMW (atSubclassProp), (HANDLE)N); \ + refData = (ULONG_PTR)GetPropW (wnd, MAKEINTATOMW (atRefDataProp)); \ + TRACE ("%d; (%p, %x, %x, %lx, %lx)\n", N, wnd, msg, wParam, lParam, \ + refData); \ + result = subclasses[N].subclassProc (wnd, msg, wParam, lParam, refData);\ + TRACE ("result = %lx\n", result); \ + return result; \ +} + +MAKE_SUBCLASS_PROC(0) +MAKE_SUBCLASS_PROC(1) +MAKE_SUBCLASS_PROC(2) +MAKE_SUBCLASS_PROC(3) +MAKE_SUBCLASS_PROC(4) + +const static WNDPROC subclassProcs[NUM_SUBCLASSES] = { + subclass_proc0, + subclass_proc1, + subclass_proc2, + subclass_proc3, + subclass_proc4 +}; + +/********************************************************************** * + * THEMING_Initialize + * + * Register classes for standard controls that will shadow the system + * classes. + */ +void THEMING_Initialize (void) +{ + int i; + static const WCHAR subclassPropName[] = + { 'C','C','3','2','T','h','e','m','i','n','g','S','u','b','C','l',0 }; + static const WCHAR refDataPropName[] = + { 'C','C','3','2','T','h','e','m','i','n','g','D','a','t','a',0 }; + + atSubclassProp = GlobalAddAtomW (subclassPropName); + atRefDataProp = GlobalAddAtomW (refDataPropName); + + for (i = 0; i < NUM_SUBCLASSES; i++) + { + WNDCLASSEXW class; + + class.cbSize = sizeof(class); + class.style |= CS_GLOBALCLASS; + GetClassInfoExW (NULL, subclasses[i].className, &class); + originalProcs[i] = class.lpfnWndProc; + class.lpfnWndProc = subclassProcs[i]; + + if (!class.lpfnWndProc) + { + ERR("Missing proc for class %s\n", + debugstr_w (subclasses[i].className)); + continue; + } + + if (!RegisterClassExW (&class)) + { + ERR("Could not re-register class %s: %lx\n", + debugstr_w (subclasses[i].className), GetLastError ()); + } + else + { + TRACE("Re-registered class %s\n", + debugstr_w (subclasses[i].className)); + } + } +} + +/********************************************************************** * + * THEMING_CallOriginalClass + * + * Determines the original window proc and calls it. + */ +LRESULT THEMING_CallOriginalClass (HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + INT_PTR subclass = (INT_PTR)GetPropW (wnd, MAKEINTATOMW (atSubclassProp)); + WNDPROC oldProc = originalProcs[subclass]; + return CallWindowProcW (oldProc, wnd, msg, wParam, lParam); +} + +/********************************************************************** * + * THEMING_SetSubclassData + * + * Update the "refData" value of the subclassed window. + */ +void THEMING_SetSubclassData (HWND wnd, ULONG_PTR refData) +{ + SetPropW (wnd, MAKEINTATOMW (atRefDataProp), (HANDLE)refData); +} Property changes on: vendor/wine/dlls/comctl32/current/theming.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 3 months

[gvg] 17662: Sync to Wine-20050830:

by gvg＠svn.reactos.com

Sync to Wine-20050830: Alexandre Julliard <julliard(a)winehq.org> - Don't prefix the functions DllCanUnloadNow, DllGetClassObject and Dll(Un)RegisterServer with the dll name so that the compiler can check the prototypes. Mike McCormack <mike(a)codeweavers.com> - Fix gcc 4.0 warnings. Modified: trunk/reactos/lib/cabinet/cabinet.h Modified: trunk/reactos/lib/cabinet/cabinet.spec Modified: trunk/reactos/lib/cabinet/cabinet_main.c _____ Modified: trunk/reactos/lib/cabinet/cabinet.h --- trunk/reactos/lib/cabinet/cabinet.h 2005-09-05 20:03:06 UTC (rev 17661) +++ trunk/reactos/lib/cabinet/cabinet.h 2005-09-05 20:07:46 UTC (rev 17662) @@ -324,15 +324,15 @@ cab_ULONG cDataBlocks; cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ /* of spanned file of a spanning folder of a spanning cabinet */ - cab_UBYTE szFileNameCFDATA1[CB_MAX_FILENAME]; + char szFileNameCFDATA1[CB_MAX_FILENAME]; int handleCFDATA1; - cab_UBYTE szFileNameCFFILE1[CB_MAX_FILENAME]; + char szFileNameCFFILE1[CB_MAX_FILENAME]; int handleCFFILE1; - cab_UBYTE szFileNameCFDATA2[CB_MAX_FILENAME]; + char szFileNameCFDATA2[CB_MAX_FILENAME]; int handleCFDATA2; - cab_UBYTE szFileNameCFFILE2[CB_MAX_FILENAME]; + char szFileNameCFFILE2[CB_MAX_FILENAME]; int handleCFFILE2; - cab_UBYTE szFileNameCFFOLDER[CB_MAX_FILENAME]; + char szFileNameCFFOLDER[CB_MAX_FILENAME]; int handleCFFOLDER; cab_ULONG sizeFileCFDATA1; cab_ULONG sizeFileCFFILE1; _____ Modified: trunk/reactos/lib/cabinet/cabinet.spec --- trunk/reactos/lib/cabinet/cabinet.spec 2005-09-05 20:03:06 UTC (rev 17661) +++ trunk/reactos/lib/cabinet/cabinet.spec 2005-09-05 20:07:46 UTC (rev 17662) @@ -1,14 +1,14 @@ -1 stub GetDllVersion -2 stdcall DllGetVersion (ptr) CABINET_DllGetVersion -3 stdcall Extract(ptr str) -4 stub DeleteExtractedFiles -10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -11 cdecl FCIAddFile(long ptr ptr long ptr ptr ptr long) -12 cdecl FCIFlushFolder(long ptr ptr) -13 cdecl FCIFlushCabinet(long long ptr ptr) -14 cdecl FCIDestroy(long) -20 cdecl FDICreate(ptr ptr ptr ptr ptr ptr ptr long ptr) -21 cdecl FDIIsCabinet(long long ptr) -22 cdecl FDICopy(long ptr ptr long ptr ptr ptr) -23 cdecl FDIDestroy(long) -24 cdecl FDITruncateCabinet(long ptr long) +1 stub GetDllVersion +2 stdcall -private DllGetVersion (ptr) +3 stdcall Extract(ptr str) +4 stub DeleteExtractedFiles +10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +11 cdecl FCIAddFile(long ptr ptr long ptr ptr ptr long) +12 cdecl FCIFlushFolder(long ptr ptr) +13 cdecl FCIFlushCabinet(long long ptr ptr) +14 cdecl FCIDestroy(long) +20 cdecl FDICreate(ptr ptr ptr ptr ptr ptr ptr long ptr) +21 cdecl FDIIsCabinet(long long ptr) +22 cdecl FDICopy(long ptr ptr long ptr ptr ptr) +23 cdecl FDIDestroy(long) +24 cdecl FDITruncateCabinet(long ptr long) Property changes on: trunk/reactos/lib/cabinet/cabinet.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cabinet/cabinet_main.c --- trunk/reactos/lib/cabinet/cabinet_main.c 2005-09-05 20:03:06 UTC (rev 17661) +++ trunk/reactos/lib/cabinet/cabinet_main.c 2005-09-05 20:07:46 UTC (rev 17662) @@ -52,7 +52,7 @@ * NOTES * Supposedly returns version from IE6SP1RP1 */ -HRESULT WINAPI CABINET_DllGetVersion (DLLVERSIONINFO *pdvi) +HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) { WARN("hmmm... not right version number \"5.1.1106.1\"?\n");

19 years, 3 months

← Newer
1
...
49
50
51
52
53
54
55
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005