Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 17046: Fix grammar...
by navaraf＠svn.reactos.com 04 Aug '05

04 Aug '05

Fix grammar... Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt _____ Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt --- branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 17:49:53 UTC (rev 17045) +++ branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 18:01:47 UTC (rev 17046) @@ -20,7 +20,7 @@ ^ This is wrong, one can attach message queue to different thread using AttachThreadInput. The number of thread sharing a queue is stored in the message queue structure and can be considered a reference count. Also on -Windows systems the a global list of thread attachments is maintained. +Windows systems there is maintained a global list of thread attachments. Above references create following dependencies: -----------------------------------------------

1 0

[navaraf] 17045: Update comments.
by navaraf＠svn.reactos.com 04 Aug '05

04 Aug '05

Update comments. Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt _____ Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt --- branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 16:32:18 UTC (rev 17044) +++ branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 17:49:53 UTC (rev 17045) @@ -17,6 +17,11 @@ -If the (w32)thread exist, so does the message queue. So if you want the queue to hang around, you reference the thread instead. +^ This is wrong, one can attach message queue to different thread using +AttachThreadInput. The number of thread sharing a queue is stored in the +message queue structure and can be considered a reference count. Also on +Windows systems the a global list of thread attachments is maintained. + Above references create following dependencies: ----------------------------------------------- @@ -28,33 +33,46 @@ process -> winsta -> session - - NtUser/NtGdi/win32k syscalls ---------------------------- -A process automatically establishes a connection to a window station and desktop -when it first calls a USER32 or GDI32 function (other than the window station or -desktop functions). The process also get a Win32Proccess. +A process and/or thread automatically gets converted to a GUI thread when +the first syscall from the shadow service table is called (ie. any NtUser* +or NtGdi* call). GUI threads have bigger kernel stack (FIXME: not the case +on ReactOS yet) and have associated storage for the Win32 structures. The +conversion itself happens in the syscall handler and the win32k callbacks +(registered with PsEstablishWin32Callouts) are called accordingly. -A thread is automatically assigned a desktop when it first calls a USER32 or GDI32 -function (other than the window station or desktop functions). The thread also get -a Win32Thread, a message queue and a thread input. +A process automatically establishes a connection to a window station on the +GUI thread conversion. The Win32 process initialization callback routine +also creates and initializes the W32PROCESS structure and associates it with +the process. -This means that when you are in a win32k syscall function (other than the window station -or desktop functions) you can be 100% sure that the following exists: --the process WinSta --the win32process --the win32thread --the thread message queue --the thread input --the thread desktop --the process desktop (if there is such a thing) +Similary for thread the callback routine automatically assigns a desktop +when the thread is converted to GUI thread. The thread also gets a W32THREAD +structure, a message queue and a thread input structures. +Beware that there is an exception to these rules and that's WinLogon. Since +at the time the process starts no window stations or desktops exist, none +are assigned to the the initial thread / process. The first Win32k calls +the thread does are to create the window station and desktop and to associate +them with itself. -There is no need to validate any of these values, because they MUST EXIST! +FIXME: At the time of this writing there's a second exception, a "primitive +message queue" thread in CSRSS that is created before any window stations +exist and is used to capture keyboard input in console mode. Eventually we +should get rid of it and replace is with hidden window w/ focus or something +similar. - !!!!!NOTE!!!! -Reactos is currently wrong on the thread desktop, process desktop and process WinSta, -since they can be NULL!! +Generally this means that when you are in a Win32k syscall function (other +than the window station or desktop functions) you can be 100% sure that the +following exists: +- Process window station +- Win32 process structure +- Win32 thread structure +- Thread message queue +- Thread input +- Thread desktop + +There is no need to validate any of these values, because they MUST EXIST!

1 0

[gdalsnes] 17044: -fix timerbug (abiword splash)
by gdalsnes＠svn.reactos.com 04 Aug '05

04 Aug '05

-fix timerbug (abiword splash) -misc Somewhat works now (thanks to filip), but closing gui consoles makes ros go 100% cpu Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt Modified: branches/win32k rewrite attempt/win32k/include/caret.h Modified: branches/win32k rewrite attempt/win32k/include/msgqueue.h Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h Modified: branches/win32k rewrite attempt/win32k/include/window.h Modified: branches/win32k rewrite attempt/win32k/main/dllmain.c Modified: branches/win32k rewrite attempt/win32k/ntuser/accelerator.c Modified: branches/win32k rewrite attempt/win32k/ntuser/caret.c Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c Modified: branches/win32k rewrite attempt/win32k/ntuser/clipboard.c Modified: branches/win32k rewrite attempt/win32k/ntuser/csr.c Modified: branches/win32k rewrite attempt/win32k/ntuser/cursoricon.c Modified: branches/win32k rewrite attempt/win32k/ntuser/desktop.c Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c Modified: branches/win32k rewrite attempt/win32k/ntuser/guicheck.c Modified: branches/win32k rewrite attempt/win32k/ntuser/handle.c Modified: branches/win32k rewrite attempt/win32k/ntuser/hook.c Modified: branches/win32k rewrite attempt/win32k/ntuser/hotkey.c Modified: branches/win32k rewrite attempt/win32k/ntuser/input.c Modified: branches/win32k rewrite attempt/win32k/ntuser/menu.c Modified: branches/win32k rewrite attempt/win32k/ntuser/message.c Modified: branches/win32k rewrite attempt/win32k/ntuser/misc.c Modified: branches/win32k rewrite attempt/win32k/ntuser/monitor.c Modified: branches/win32k rewrite attempt/win32k/ntuser/msgqueue.c Modified: branches/win32k rewrite attempt/win32k/ntuser/ntuser.c Modified: branches/win32k rewrite attempt/win32k/ntuser/painting.c Modified: branches/win32k rewrite attempt/win32k/ntuser/prop.c Modified: branches/win32k rewrite attempt/win32k/ntuser/timer.c Modified: branches/win32k rewrite attempt/win32k/ntuser/vis.c Modified: branches/win32k rewrite attempt/win32k/ntuser/window.c Modified: branches/win32k rewrite attempt/win32k/ntuser/winpos.c Modified: branches/win32k rewrite attempt/win32k/ntuser/winsta.c _____ Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt --- branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 16:32:18 UTC (rev 17044) @@ -4,8 +4,7 @@ window -> desktop window -> class -window -> queue/thread_input ????????? -thread -> queue/thread_input ????????? +thread_input -> thread thread -> process process -> winsta @@ -13,6 +12,10 @@ desktop -> winsta winsta -> session +NOTE: Message queue has 1:1 relationship with (w32)thread and need no ref. count. + -If the (w32)thread is destroyed, so is the message queue. + -If the (w32)thread exist, so does the message queue. + So if you want the queue to hang around, you reference the thread instead. Above references create following dependencies: ----------------------------------------------- @@ -24,3 +27,34 @@ thread -> desktop -> winsta -> session process -> winsta -> session + + + +NtUser/NtGdi/win32k syscalls +---------------------------- + +A process automatically establishes a connection to a window station and desktop +when it first calls a USER32 or GDI32 function (other than the window station or +desktop functions). The process also get a Win32Proccess. + +A thread is automatically assigned a desktop when it first calls a USER32 or GDI32 +function (other than the window station or desktop functions). The thread also get +a Win32Thread, a message queue and a thread input. + +This means that when you are in a win32k syscall function (other than the window station +or desktop functions) you can be 100% sure that the following exists: +-the process WinSta +-the win32process +-the win32thread +-the thread message queue +-the thread input +-the thread desktop +-the process desktop (if there is such a thing) + + +There is no need to validate any of these values, because they MUST EXIST! + + !!!!!NOTE!!!! +Reactos is currently wrong on the thread desktop, process desktop and process WinSta, +since they can be NULL!! + _____ Modified: branches/win32k rewrite attempt/win32k/include/caret.h --- branches/win32k rewrite attempt/win32k/include/caret.h 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/include/caret.h 2005-08-04 16:32:18 UTC (rev 17044) @@ -9,8 +9,6 @@ BOOL FASTCALL UserSetCaretBlinkTime(UINT uMSeconds); -BOOL FASTCALL -UserSwitchCaretShowing(PVOID Info); VOID FASTCALL UserDrawCaret(HWND hWnd); _____ Modified: branches/win32k rewrite attempt/win32k/include/msgqueue.h --- branches/win32k rewrite attempt/win32k/include/msgqueue.h 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/include/msgqueue.h 2005-08-04 16:32:18 UTC (rev 17044) @@ -39,8 +39,39 @@ LIST_ENTRY ListEntry; } USER_SENT_MESSAGE_NOTIFY, *PUSER_SENT_MESSAGE_NOTIFY; +typedef struct _USER_THREAD_INPUT +{ +#if 0 + struct desktop *desktop; /* desktop that this thread input belongs to */ + user_handle_t focus; /* focus window */ + user_handle_t capture; /* capture window */ + user_handle_t active; /* active window */ + user_handle_t menu_owner; /* current menu owner window */ + user_handle_t move_size; /* current moving/resizing window */ + user_handle_t caret; /* caret window */ + rectangle_t caret_rect; /* caret rectangle */ + int caret_hide; /* caret hide count */ + int caret_state; /* caret on/off state */ + struct list msg_list; /* list of hardware messages */ + unsigned char keystate[256]; /* state of each key */ +#endif + /* Current window with focus (ie. receives keyboard input) for this queue. */ + HWND FocusWindow; + /* Current capture window for this queue. */ + HWND CaptureWindow; + /* Current active window for this queue. */ + HWND ActiveWindow; + /* Current menu owner window for this queue */ + HWND MenuOwner; + /* Current move/size window for this queue */ + HWND MoveSize; + /* Caret information for this queue */ + THRDCARETINFO CaretInfo; + +} USER_THREAD_INPUT, *PUSER_THREAD_INPUT; + typedef struct _USER_MESSAGE_QUEUE { /* Reference counter, only access this variable with interlocked functions! */ @@ -73,24 +104,12 @@ HANDLE NewMessagesHandle; /* Last time PeekMessage() was called. */ ULONG LastMsgRead; - /* Current window with focus (ie. receives keyboard input) for this queue. */ - HWND FocusWindow; /* True if a window needs painting. */ BOOLEAN PaintPosted; /* Count of paints pending. */ LONG PaintCount; - /* Current active window for this queue. */ - HWND ActiveWindow; - /* Current capture window for this queue. */ - HWND CaptureWindow; - /* Current move/size window for this queue */ - HWND MoveSize; - /* Current menu owner window for this queue */ - HWND MenuOwner; /* Identifes the menu state */ BYTE MenuState; - /* Caret information for this queue */ - PTHRDCARETINFO CaretInfo; /* Window hooks */ PHOOKTABLE Hooks; @@ -104,14 +123,15 @@ /* extra message information */ LPARAM ExtraInfo; - /* messages that are currently dispatched by other threads */ LIST_ENTRY DispatchingMessagesHead; /* messages that are currently dispatched by this message queue, required for cleanup */ LIST_ENTRY LocalDispatchingMessagesHead; - /* Desktop that the message queue is attached to */ struct _DESKTOP_OBJECT *Desktop; + + PUSER_THREAD_INPUT Input; + } USER_MESSAGE_QUEUE, *PUSER_MESSAGE_QUEUE; BOOL FASTCALL @@ -144,8 +164,6 @@ MsqCleanupMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); PUSER_MESSAGE_QUEUE FASTCALL MsqCreateMessageQueue(struct _ETHREAD *Thread); -VOID FASTCALL -MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); PUSER_MESSAGE_QUEUE FASTCALL MsqGetHardwareMessageQueue(VOID); NTSTATUS FASTCALL @@ -198,8 +216,6 @@ MsqInsertSystemMessage(MSG* Msg); BOOL FASTCALL MsqIsDblClk(LPMSG Msg, BOOL Remove); -HWND FASTCALL -MsqSetStateWindow(PUSER_MESSAGE_QUEUE MessageQueue, ULONG Type, HWND hWnd); inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue ); inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); @@ -223,8 +239,6 @@ #define IntReferenceMessageQueue(MsgQueue) \ InterlockedIncrement(&(MsgQueue)->References) -VOID FASTCALL -IntDereferenceMessageQueue(PUSER_MESSAGE_QUEUE MsgQueue); #define IS_BTN_MESSAGE(message,code) \ _____ Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h --- branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-08-04 16:32:18 UTC (rev 17044) @@ -111,6 +111,10 @@ BOOL FASTCALL UserHideCaret(PWINDOW_OBJECT Wnd); +BOOL FASTCALL +UserSwitchCaretShowing(PTHRDCARETINFO Info); + + /************************* WINPOS.C ****************************/ @@ -188,10 +192,21 @@ PMONITOR_OBJECT UserGetMonitorObject(HANDLE hCursor); -/* msgqueue.c */ +/******************* MSGQUEUE.C ********************/ +VOID FASTCALL +UserDereferenceQueue(PUSER_MESSAGE_QUEUE MsgQueue); + +VOID FASTCALL +MsqDestroyMessageQueue(PW32THREAD WThread); + +HWND FASTCALL +MsqSetStateWindow(PUSER_THREAD_INPUT Input, ULONG Type, HWND hWnd); + +inline PUSER_THREAD_INPUT FASTCALL UserGetCurrentInput(); + VOID FASTCALL -MsqRemoveWindowMessagesFromQueue(PWINDOW_OBJECT pWindow); +MsqCleanupWindow(PWINDOW_OBJECT pWindow); inline BOOL FASTCALL UserMessageFilter(UINT Message, UINT FilterMin, UINT FilterMax); @@ -218,6 +233,16 @@ UINT Message ); +/**************************** NTUSER.C ************************/ + +inline PVOID FASTCALL UserAlloc(SIZE_T bytes); +inline PVOID FASTCALL UserAllocTag(SIZE_T bytes, ULONG tag); +inline PVOID FASTCALL UserAllocZero(SIZE_T bytes); +inline PVOID FASTCALL UserAllocZeroTag(SIZE_T bytes, ULONG tag); +inline VOID FASTCALL UserFree(PVOID mem); + + + /* windc.c */ HDC FASTCALL _____ Modified: branches/win32k rewrite attempt/win32k/include/window.h --- branches/win32k rewrite attempt/win32k/include/window.h 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/include/window.h 2005-08-04 16:32:18 UTC (rev 17044) @@ -64,7 +64,7 @@ /* Handle of the window region. */ HANDLE WindowRegion; /* Lock to be held when manipulating (NC)UpdateRegion */ - FAST_MUTEX UpdateLock; + // FAST_MUTEX UpdateLock; /* Pointer to the owning thread's message queue. */ PUSER_MESSAGE_QUEUE MessageQueue; struct _WINDOW_OBJECT* FirstChild; _____ Modified: branches/win32k rewrite attempt/win32k/main/dllmain.c --- branches/win32k rewrite attempt/win32k/main/dllmain.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/main/dllmain.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -47,6 +47,8 @@ DPRINT("Enter Win32kProcessCallback\n"); UserEnterExclusive(); +CHECKPOINT1; + /* Get the Win32 Process */ Win32Process = PsGetProcessWin32Process(Process); @@ -71,7 +73,7 @@ DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); InitializeListHead(&Win32Process->ClassListHead); - ExInitializeFastMutex(&Win32Process->ClassListLock); +// ExInitializeFastMutex(&Win32Process->ClassListLock); InitializeListHead(&Win32Process->MenuListHead); ExInitializeFastMutex(&Win32Process->MenuListLock); @@ -139,6 +141,8 @@ DPRINT("Enter Win32kThreadCallback\n"); UserEnterExclusive(); +CHECKPOINT1; + Process = Thread->ThreadsProcess; /* Get the Win32 Thread */ @@ -229,7 +233,6 @@ Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); Win32Thread->MessagePumpHookValue = 0; InitializeListHead(&Win32Thread->WindowListHead); - ExInitializeFastMutex(&Win32Thread->WindowListLock); InitializeListHead(&Win32Thread->W32CallbackListHead); } else @@ -238,15 +241,26 @@ Win32Thread->IsExiting = TRUE; HOOK_DestroyThreadHooks(Thread); +CHECKPOINT1; UnregisterThreadHotKeys(Thread); +CHECKPOINT1; DestroyThreadWindows(Thread); +CHECKPOINT1; IntBlockInput(Win32Thread, FALSE); - MsqDestroyMessageQueue(Win32Thread->MessageQueue); +CHECKPOINT1; + /* all windows for this thread must de totally destroyed at this point. */ + ASSERT(IsListEmpty(&Win32Thread->WindowListHead)); + MsqDestroyMessageQueue(Win32Thread); +CHECKPOINT1; IntCleanupThreadCallbacks(Win32Thread); +CHECKPOINT1; + /* FIXME: having a thresd desktop is mandatory!! */ if(Win32Thread->Desktop != NULL) { + CHECKPOINT1; ObDereferenceObject(Win32Thread->Desktop); } +CHECKPOINT1; } RETURN( STATUS_SUCCESS); @@ -316,6 +330,7 @@ BOOLEAN Result; W32_CALLOUT_DATA CalloutData; +CHECKPOINT1; /* * Register user mode call interface * (system service table index = 1) @@ -330,7 +345,7 @@ DPRINT1("Adding system services failed!\n"); return STATUS_UNSUCCESSFUL; } - +CHECKPOINT1; /* * Register Object Manager Callbacks */ @@ -342,14 +357,15 @@ CalloutData.DesktopDelete = IntDesktopObjectDelete; CalloutData.W32ProcessCallout = Win32kProcessCallback; CalloutData.W32ThreadCallout = Win32kThreadCallback; - + CHECKPOINT1; /* * Register our per-process and per-thread structures. */ PsEstablishWin32Callouts(&CalloutData); - +CHECKPOINT1; Status = IntUserCreateSharedSectionPool(48 * 1024 * 1024, /* 48 MB by default */ &SessionSharedSectionPool); + CHECKPOINT1; if (!NT_SUCCESS(Status)) { DPRINT1("Failed to initialize the shared section pool: Status 0x%x\n", Status); _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/accelerator.c --- branches/win32k rewrite attempt/win32k/ntuser/accelerator.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/accelerator.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -51,7 +51,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ @@ -203,41 +203,36 @@ BOOLEAN STDCALL -NtUserDestroyAcceleratorTable(HACCEL Table) +NtUserDestroyAcceleratorTable(HACCEL hAccel) { - PACCELERATOR_TABLE AcceleratorTable; + PACCELERATOR_TABLE Accel; 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("Enter NtUserDestroyAcceleratorTable(Table %x)\n", Table); + DPRINT("Enter NtUserDestroyAcceleratorTable(Table %x)\n", Accel); UserEnterExclusive(); - //FIXME - AcceleratorTable = UserGetAccelObject(Table); + Accel = UserGetAccelObject(hAccel); - if (!AcceleratorTable) + if (!Accel) { SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); DPRINT1("E2\n"); RETURN(FALSE); } -// ObmCloseHandle(WindowStation->HandleTable, Table); - - if (AcceleratorTable->Table != NULL) + if (Accel->Table != NULL) { - ExFreePool(AcceleratorTable->Table); + ExFreePool(Accel->Table); } -// ObDereferenceObject(WindowStation); - RETURN(TRUE); CLEANUP: - DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", Table,_ret_); + DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", Accel,_ret_); UserLeave(); END_CLEANUP; } @@ -443,7 +438,6 @@ HACCEL Table, LPMSG Message) { - PWINSTATION_OBJECT WindowStation; PACCELERATOR_TABLE AcceleratorTable; ULONG i; DECLARE_RETURN(int); @@ -490,7 +484,6 @@ AcceleratorTable->Table[i].fVirt, AcceleratorTable->Table[i].key, AcceleratorTable->Table[i].cmd)) { - ObDereferenceObject(WindowStation); DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", hWnd, Table, Message, 1); RETURN(1); _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/caret.c --- branches/win32k rewrite attempt/win32k/ntuser/caret.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/caret.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -11,7 +11,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> #define MIN_CARETBLINKRATE 100 @@ -35,19 +35,20 @@ BOOL FASTCALL UserDestroyCaret(PW32THREAD Win32Thread /* unused param!!!*/) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_MESSAGE_QUEUE Queue; - ThreadQueue = UserGetCurrentQueue(); + Queue = UserGetCurrentQueue(); - if(!ThreadQueue || !ThreadQueue->CaretInfo) + //FIXME: can queue be NULL? + if(!Queue) return FALSE; - IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; - ThreadQueue->CaretInfo->hWnd = (HWND)0; - ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; - ThreadQueue->CaretInfo->Showing = 0; - ThreadQueue->CaretInfo->Visible = 0; + IntHideCaret(&Queue->Input->CaretInfo); + Queue->Input->CaretInfo.Bitmap = (HBITMAP)0; + Queue->Input->CaretInfo.hWnd = (HWND)0; + Queue->Input->CaretInfo.Size.cx = Queue->Input->CaretInfo.Size.cy = 0; + Queue->Input->CaretInfo.Showing = 0; + Queue->Input->CaretInfo.Visible = 0; return TRUE; } @@ -162,20 +163,20 @@ BOOL FASTCALL UserSetCaretPos(int X, int Y) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; + + Input = UserGetCurrentInput(); - ThreadQueue = UserGetCurrentQueue(); - - if(ThreadQueue->CaretInfo->hWnd) + if(Input->CaretInfo.hWnd) { - if(ThreadQueue->CaretInfo->Pos.x != X || ThreadQueue->CaretInfo->Pos.y != Y) + if(Input->CaretInfo.Pos.x != X || Input->CaretInfo.Pos.y != Y) { - IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Showing = 0; - ThreadQueue->CaretInfo->Pos.x = X; - ThreadQueue->CaretInfo->Pos.y = Y; - IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - UserSetTimer(GetWnd(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, UserGetCaretBlinkTime(), NULL, TRUE); + IntHideCaret(&Input->CaretInfo); + Input->CaretInfo.Showing = 0; + Input->CaretInfo.Pos.x = X; + Input->CaretInfo.Pos.y = Y; + IntSendMessage(Input->CaretInfo.hWnd, WM_SYSTIMER, IDCARETTIMER, 0); + UserSetTimer(GetWnd(Input->CaretInfo.hWnd), IDCARETTIMER, UserGetCaretBlinkTime(), NULL, TRUE); } return TRUE; } @@ -184,17 +185,18 @@ } BOOL FASTCALL -UserSwitchCaretShowing(PVOID Info) +UserSwitchCaretShowing(PTHRDCARETINFO Info) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd) + if(Input->CaretInfo.hWnd) { - ThreadQueue->CaretInfo->Showing = (ThreadQueue->CaretInfo->Showing ? 0 : 1); + Input->CaretInfo.Showing = !Input->CaretInfo.Showing; //FIXME: internal. no SEH here! - MmCopyToCaller(Info, ThreadQueue->CaretInfo, sizeof(THRDCARETINFO)); + MmCopyToCaller(Info, &Input->CaretInfo, sizeof(THRDCARETINFO)); + //*Info = Input->CaretInfo; return TRUE; } @@ -204,15 +206,15 @@ VOID FASTCALL UserDrawCaret(HWND hWnd /* FIXME: Unused param?!?! */) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd && ThreadQueue->CaretInfo->Visible && - ThreadQueue->CaretInfo->Showing) + if(Input->CaretInfo.hWnd && Input->CaretInfo.Visible && + Input->CaretInfo.Showing) { - IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - ThreadQueue->CaretInfo->Showing = 1; + IntSendMessage(Input->CaretInfo.hWnd, WM_SYSTIMER, IDCARETTIMER, 0); + Input->CaretInfo.Showing = 1; } } @@ -227,7 +229,7 @@ int nHeight) { PWINDOW_OBJECT WindowObject; - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserCreateCaret\n"); @@ -246,28 +248,28 @@ RETURN(FALSE); } - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if (ThreadQueue->CaretInfo->Visible) + if (Input->CaretInfo.Visible) { UserKillTimer(WindowObject, IDCARETTIMER, TRUE); - IntHideCaret(ThreadQueue->CaretInfo); + IntHideCaret(&Input->CaretInfo); } - ThreadQueue->CaretInfo->hWnd = hWnd; + Input->CaretInfo.hWnd = hWnd; if(hBitmap) { - ThreadQueue->CaretInfo->Bitmap = hBitmap; - ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; + Input->CaretInfo.Bitmap = hBitmap; + Input->CaretInfo.Size.cx = Input->CaretInfo.Size.cy = 0; } else { - ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; - ThreadQueue->CaretInfo->Size.cx = nWidth; - ThreadQueue->CaretInfo->Size.cy = nHeight; + Input->CaretInfo.Bitmap = (HBITMAP)0; + Input->CaretInfo.Size.cx = nWidth; + Input->CaretInfo.Size.cy = nHeight; } - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + Input->CaretInfo.Visible = 0; + Input->CaretInfo.Showing = 0; RETURN(TRUE); @@ -300,16 +302,16 @@ NtUserGetCaretPos( LPPOINT lpPoint) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; NTSTATUS Status; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserGetCaretPos\n"); UserEnterExclusive(); - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - Status = MmCopyToCaller(lpPoint, &(ThreadQueue->CaretInfo->Pos), sizeof(POINT)); + Status = MmCopyToCaller(lpPoint, &(Input->CaretInfo.Pos), sizeof(POINT)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -331,7 +333,7 @@ HWND hWnd) { PWINDOW_OBJECT WindowObject; - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; DECLARE_RETURN(BOOL); DPRINT1("Enter NtUserHideCaret\n"); @@ -350,21 +352,21 @@ RETURN(FALSE); } - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd != hWnd) + if(Input->CaretInfo.hWnd != hWnd) { SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN(FALSE); } - if(ThreadQueue->CaretInfo->Visible) + if(Input->CaretInfo.Visible) { UserKillTimer(WindowObject, IDCARETTIMER, TRUE); - IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + IntHideCaret(&Input->CaretInfo); + Input->CaretInfo.Visible = 0; + Input->CaretInfo.Showing = 0; } RETURN(TRUE); @@ -380,7 +382,7 @@ BOOL FASTCALL UserHideCaret(PWINDOW_OBJECT Wnd) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; ASSERT(Wnd); @@ -390,22 +392,22 @@ return(FALSE); } - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd != GetHwnd(Wnd)) + if(Input->CaretInfo.hWnd != GetHwnd(Wnd)) { SetLastWin32Error(ERROR_ACCESS_DENIED); return(FALSE); } - if(ThreadQueue->CaretInfo->Visible) + if(Input->CaretInfo.Visible) { UserKillTimer(Wnd, IDCARETTIMER, TRUE); //FIXME: fix IntHideCaret vs. NtHideCaret vs. UserHideCaret mess - IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + IntHideCaret(&Input->CaretInfo); + Input->CaretInfo.Visible = 0; + Input->CaretInfo.Showing = 0; } return(TRUE); @@ -443,7 +445,7 @@ BOOL FASTCALL UserShowCaret(PWINDOW_OBJECT Wnd) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; ASSERT(Wnd); @@ -453,20 +455,20 @@ return(FALSE); } - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd != GetHwnd(Wnd)) + if(Input->CaretInfo.hWnd != GetHwnd(Wnd)) { SetLastWin32Error(ERROR_ACCESS_DENIED); return(FALSE); } - if(!ThreadQueue->CaretInfo->Visible) + if(!Input->CaretInfo.Visible) { - ThreadQueue->CaretInfo->Visible = 1; - if(!ThreadQueue->CaretInfo->Showing) + Input->CaretInfo.Visible = 1; + if(!Input->CaretInfo.Showing) { - IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); + IntSendMessage(Input->CaretInfo.hWnd, WM_SYSTIMER, IDCARETTIMER, 0); } UserSetTimer(Wnd, IDCARETTIMER, UserGetCaretBlinkTime(), NULL, TRUE); } _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c --- branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -30,7 +30,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/clipboard.c --- branches/win32k rewrite attempt/win32k/ntuser/clipboard.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/clipboard.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -26,7 +26,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> #define CHECK_LOCK \ _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/csr.c --- branches/win32k rewrite attempt/win32k/ntuser/csr.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/csr.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -9,7 +9,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> static HANDLE WindowsApiPort = NULL; _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/cursoricon.c --- branches/win32k rewrite attempt/win32k/ntuser/cursoricon.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/cursoricon.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -38,12 +38,11 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> static PAGED_LOOKASIDE_LIST ProcessLookasideList; static LIST_ENTRY CurIconList; -//static FAST_MUTEX CurIconListLock; /* Look up the location of the cursor in the GDIDEVICE structure * when all we know is the window station object _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/desktop.c --- branches/win32k rewrite attempt/win32k/ntuser/desktop.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/desktop.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -31,12 +31,17 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ /* Currently active desktop */ + +/* + FIXME: this is not global data. this belongs in the (inter)active window station + (current input desktop = interactive desktop = InputDesktop = active desktop on interactive winsta) +*/ PDESKTOP_OBJECT InputDesktop = NULL; HDESK InputDesktopHandle = NULL; HDC ScreenDeviceContext = NULL; _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c --- branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -21,21 +21,21 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> PWINDOW_OBJECT FASTCALL UserGetCaptureWindow() { PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); - return ForegroundQueue != NULL ? GetWnd(ForegroundQueue->CaptureWindow) : 0; + return ForegroundQueue != NULL ? GetWnd(ForegroundQueue->Input->CaptureWindow) : 0; } PWINDOW_OBJECT FASTCALL UserGetFocusWindow() { PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); - return ForegroundQueue != NULL ? GetWnd(ForegroundQueue->FocusWindow) : 0; + return ForegroundQueue != NULL ? GetWnd(ForegroundQueue->Input->FocusWindow) : 0; } PWINDOW_OBJECT FASTCALL @@ -43,7 +43,7 @@ { PUSER_MESSAGE_QUEUE ThreadQueue; ThreadQueue = UserGetCurrentQueue(); - return ThreadQueue != NULL ? GetWnd(ThreadQueue->FocusWindow) : 0; + return ThreadQueue != NULL ? GetWnd(ThreadQueue->Input->FocusWindow) : 0; } VOID FASTCALL @@ -169,7 +169,7 @@ if (PrevForegroundQueue != 0) { //FIXME uhm... focus er ikke samme som active window... er UserGetFocusMessageQueue riktig? - hWndPrev = PrevForegroundQueue->ActiveWindow; + hWndPrev = PrevForegroundQueue->Input->ActiveWindow; } if (hWndPrev == hWnd) @@ -179,7 +179,7 @@ } hWndFocusPrev = (PrevForegroundQueue == FocusWindow->MessageQueue - ? FocusWindow->MessageQueue->FocusWindow : NULL); + ? FocusWindow->MessageQueue->Input->FocusWindow : NULL); /* FIXME: Call hooks. */ @@ -189,11 +189,11 @@ IntSetFocusMessageQueue(Window->MessageQueue); if (Window->MessageQueue) { - Window->MessageQueue->ActiveWindow = hWnd; + Window->MessageQueue->Input->ActiveWindow = hWnd; } if (FocusWindow->MessageQueue) { - FocusWindow->MessageQueue->FocusWindow = hWndFocus; + FocusWindow->MessageQueue->Input->FocusWindow = hWndFocus; } if (PrevForegroundQueue != Window->MessageQueue) @@ -277,14 +277,14 @@ // return 0; // else // { - WndPrev = IntGetWindowObject(ThreadQueue->ActiveWindow); + WndPrev = IntGetWindowObject(ThreadQueue->Input->ActiveWindow); return( WndPrev ? WndPrev->Self : NULL ); // } } } - WndPrev = IntGetWindowObject(ThreadQueue->ActiveWindow); + WndPrev = IntGetWindowObject(ThreadQueue->Input->ActiveWindow); if (WndPrev == Wnd) { return WndPrev; @@ -294,7 +294,7 @@ /* FIXME: Call hooks. */ - ThreadQueue->ActiveWindow = GetHwnd(Wnd); + ThreadQueue->Input->ActiveWindow = GetHwnd(Wnd); //FIXME!!! hva hvis prev active var invalid dvs. NULL? //FIXME!!! hva hvis Wnd er NULL? @@ -315,13 +315,13 @@ ThreadQueue = UserGetCurrentQueue(); ASSERT(ThreadQueue != 0); - hWndPrev = ThreadQueue->FocusWindow; + hWndPrev = ThreadQueue->Input->FocusWindow; if (hWndPrev == GetHwnd(Wnd)) { return GetWnd(hWndPrev); } - ThreadQueue->FocusWindow = GetHwnd(Wnd); + ThreadQueue->Input->FocusWindow = GetHwnd(Wnd); IntSendKillFocusMessages(GetWnd(hWndPrev), Wnd); IntSendSetFocusMessages(GetWnd(hWndPrev), Wnd); @@ -357,8 +357,8 @@ { PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); - if (ForegroundQueue && ForegroundQueue->ActiveWindow) - return IntGetWindowObject(ForegroundQueue->ActiveWindow); + if (ForegroundQueue && ForegroundQueue->Input->ActiveWindow) + return IntGetWindowObject(ForegroundQueue->Input->ActiveWindow); return NULL; } @@ -390,18 +390,18 @@ PUSER_MESSAGE_QUEUE ThreadQueue; ThreadQueue = UserGetCurrentQueue(); - if (ThreadQueue && ThreadQueue->ActiveWindow) + if (ThreadQueue && ThreadQueue->Input->ActiveWindow) { PWINDOW_OBJECT ActiveWnd; - if ((ActiveWnd = IntGetWindowObject(ThreadQueue->ActiveWindow))) + if ((ActiveWnd = IntGetWindowObject(ThreadQueue->Input->ActiveWindow))) { return ActiveWnd; } else { /* active hwnd not valid. set to NULL */ - ThreadQueue->ActiveWindow = NULL; + ThreadQueue->Input->ActiveWindow = NULL; } } return NULL; @@ -466,7 +466,7 @@ UserEnterExclusive(); ThreadQueue = UserGetCurrentQueue();//FIXME??? current?? - RETURN(ThreadQueue ? ThreadQueue->CaptureWindow : 0); + RETURN(ThreadQueue ? ThreadQueue->Input->CaptureWindow : 0); CLEANUP: DPRINT("Leave NtUserGetCapture, ret=%i\n",_ret_); @@ -496,17 +496,17 @@ RETURN(NULL); } } - hWndPrev = MsqSetStateWindow(ThreadQueue, MSQ_STATE_CAPTURE, hWnd); + hWndPrev = MsqSetStateWindow(ThreadQueue->Input, MSQ_STATE_CAPTURE, hWnd); /* also remove other windows if not capturing anymore */ if(hWnd == NULL) { - MsqSetStateWindow(ThreadQueue, MSQ_STATE_MENUOWNER, NULL); - MsqSetStateWindow(ThreadQueue, MSQ_STATE_MOVESIZE, NULL); + MsqSetStateWindow(ThreadQueue->Input, MSQ_STATE_MENUOWNER, NULL); + MsqSetStateWindow(ThreadQueue->Input, MSQ_STATE_MOVESIZE, NULL); } IntPostOrSendMessage(hWndPrev, WM_CAPTURECHANGED, 0, (LPARAM)hWnd); - ThreadQueue->CaptureWindow = hWnd; + ThreadQueue->Input->CaptureWindow = hWnd; RETURN(hWndPrev); @@ -544,7 +544,7 @@ if (Wnd->Style & (WS_MINIMIZE | WS_DISABLED)) { - RETURN(ThreadQueue ? ThreadQueue->FocusWindow : 0); [truncated at 1000 lines; 1198 more skipped]

1 0

[greatlrd] 17043: Windows TAB complete style instead for unix style patch by Brandon Turner. Thuse does people do not like windows tab complete, the can always change in config.h to unix/linux tab complete code again.
by greatlrd＠svn.reactos.com 04 Aug '05

04 Aug '05

Windows TAB complete style instead for unix style patch by Brandon Turner. Thuse does people do not like windows tab complete, the can always change in config.h to unix/linux tab complete code again. Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmdinput.c Modified: trunk/reactos/subsys/system/cmd/config.h Modified: trunk/reactos/subsys/system/cmd/filecomp.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-08-04 10:41:58 UTC (rev 17042) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-08-04 12:41:42 UTC (rev 17043) @@ -228,6 +228,7 @@ INT ShowCompletionMatches (LPTSTR, INT); #endif #ifdef FEATURE_4NT_FILENAME_COMPLETION +VOID CompleteFilename (LPTSTR, BOOL, LPTSTR, INT); #endif _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-08-04 10:41:58 UTC (rev 17042) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-08-04 12:41:42 UTC (rev 17043) @@ -98,6 +98,7 @@ */ #include <precomp.h> +#include "resource.h" SHORT maxx; @@ -314,10 +315,6 @@ charcount = _tcslen (str); current = charcount; - if (current > 0 && - str[current-1] == _T('"')) - current--; - SetCursorXY (orgx, orgy); ConOutPrintf (_T("%s"), str); @@ -366,17 +363,50 @@ } #endif #ifdef FEATURE_4NT_FILENAME_COMPLETION - /* this is not implemented yet */ - if (ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) + + /* used to later see if we went down to the next line */ + tempscreen = charcount; + TCHAR szPath[MAX_PATH]; + szPath[0]=_T('\0'); + + /* str is the whole things that is on the current line + that is and and out. arg 2 is weather it goes back + one file or forward one file */ + CompleteFilename(str, !(ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED), szPath, current); + /* Attempt to clear the line */ + ClearCommandLine (str, maxlen, orgx, orgy); + curx = orgx; + cury = orgy; + current = charcount = 0; + //str[0]=_T('\0'); + + /* Everything is deleted, lets add it back in */ + _tcscpy(str,szPath); + + /* Figure out where cusor is going to be after we print it */ + charcount = _tcslen (str); + current = charcount; + + SetCursorXY (orgx, orgy); + /* Print out what we have now */ + ConOutPrintf (_T("%s"), str); + + /* Move cursor accordingly */ + if(tempscreen > charcount) { - /* get previous match */ - + GetCursorXY (&curx, &cury); + for(count = tempscreen - charcount; count--; ) + ConOutChar (_T(' ')); + SetCursorXY (curx, cury); } else { - /* get next match */ + if(((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + } + SetCursorXY((orgx + current) % maxx, orgy + (orgx + current) / maxx); + GetCursorXY(&curx, &cury); - } #endif break; _____ Modified: trunk/reactos/subsys/system/cmd/config.h --- trunk/reactos/subsys/system/cmd/config.h 2005-08-04 10:41:58 UTC (rev 17042) +++ trunk/reactos/subsys/system/cmd/config.h 2005-08-04 12:41:42 UTC (rev 17043) @@ -37,8 +37,8 @@ /* Define one of these to enable filename completion */ -#define FEATURE_UNIX_FILENAME_COMPLETION -/* #define FEATURE_4NT_FILENAME_COMPLETION */ +//#define FEATURE_UNIX_FILENAME_COMPLETION +#define FEATURE_4NT_FILENAME_COMPLETION /* Define to enable the directory stack */ _____ Modified: trunk/reactos/subsys/system/cmd/filecomp.c --- trunk/reactos/subsys/system/cmd/filecomp.c 2005-08-04 10:41:58 UTC (rev 17042) +++ trunk/reactos/subsys/system/cmd/filecomp.c 2005-08-04 12:41:42 UTC (rev 17043) @@ -21,8 +21,8 @@ */ #include <precomp.h> +#include "cmd.h" - #ifdef FEATURE_UNIX_FILENAME_COMPLETION VOID CompleteFilename (LPTSTR str, INT charcount) @@ -169,18 +169,8 @@ _tcscat (&str[start], maxmatch); } - /* append a space if last word is not a directory */ - if(perfectmatch) + if(!perfectmatch) { - curplace = _tcslen(&str[start]); - if(str[start+curplace-1] == _T('"')) - curplace--; - - if(str[start+curplace-1] != _T('\\')) - _tcscat(&str[start], _T(" ")); - } - else - { #ifdef __REACTOS__ Beep (440, 50); #else @@ -370,11 +360,377 @@ #ifdef FEATURE_4NT_FILENAME_COMPLETION -//static VOID BuildFilenameMatchList (...) +typedef struct _FileName +{ + TCHAR Name[MAX_PATH]; +} FileName; -// VOID CompleteFilenameNext (LPTSTR, INT) -// VOID CompleteFilenamePrev (LPTSTR, INT) +VOID FindPrefixAndSuffix(LPTSTR strIN, LPTSTR szPrefix, LPTSTR szSuffix) +{ + /* String that is to be examined */ + TCHAR str[MAX_PATH]; + /* temp pointers to used to find needed parts */ + TCHAR * szSearch; + TCHAR * szSearch1; + TCHAR * szSearch2; + /* number of quotes in the string */ + INT nQuotes = 0; + /* used in for loops */ + INT i; + /* Char number to break the string at */ + INT PBreak = 0; + INT SBreak = 0; + /* when phrasing a string, this tells weather + you are inside quotes ot not. */ + BOOL bInside = FALSE; + + szPrefix[0] = _T('\0'); + szSuffix[0] = _T('\0'); -// VOID RemoveFilenameMatchList (VOID) + /* Copy over the string to later be edited */ + _tcscpy(str,strIN); + /* Count number of " */ + for(i = 0; i < _tcslen(str); i++) + if(str[i] == _T('\"')) + nQuotes++; + + /* Find the prefix and suffix */ + if(nQuotes % 2 && nQuotes) + { + /* Odd number of quotes. Just start from the last " */ + /* THis is the way MS does it, and is an easy way out */ + szSearch = _tcsrchr(str, _T('\"')); + /* Move to the next char past the " */ + szSearch++; + _tcscpy(szSuffix,szSearch); + /* Find the one closest to end */ + szSearch1 = _tcsrchr(str, _T('\"')); + szSearch2 = _tcsrchr(str, _T('\\')); + if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) + szSearch = szSearch2; + else + szSearch = szSearch1; + /* Move one char past */ + szSearch++; + szSearch[0] = _T('\0'); + _tcscpy(szPrefix,str); + return; + + } + + if(!_tcschr(str, _T(' '))) + { + /* No spaces, everything goes to Suffix */ + _tcscpy(szSuffix,str); + /* look for a slash just in case */ + szSearch = _tcsrchr(str, _T('\\')); + if(szSearch) + { + szSearch++; + szSearch[0] = _T('\0'); + _tcscpy(szPrefix,str); + } + else + { + szPrefix[0] = _T('\0'); + } + return; + } + + if(!nQuotes) + { + /* No quotes, and there is a space*/ + /* Take it after the last space */ + szSearch = _tcsrchr(str, _T(' ')); + szSearch++; + _tcscpy(szSuffix,szSearch); + /* Find the closest to the end space or \ */ + _tcscpy(str,strIN); + szSearch1 = _tcsrchr(str, _T(' ')); + szSearch2 = _tcsrchr(str, _T('\\')); + if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) + szSearch = szSearch2; + else + szSearch = szSearch1; + szSearch++; + szSearch[0] = _T('\0'); + _tcscpy(szPrefix,str); + return; + } + + /* All else fails and there is a lot of quotes, spaces and | + Then we search through and find the last space or \ that is + not inside a quotes */ + for(i = 0; i < _tcslen(str); i++) + { + if(str[i] == _T('\"')) + bInside = !bInside; + if(str[i] == _T(' ') && !bInside) + SBreak = i; + if((!_tcsncmp(&str[i], _T(" "),1) || !_tcsncmp(&str[i], _T("\\"),1)) && !bInside) + PBreak = i; + + } + SBreak++; + PBreak++; + _tcscpy(szSuffix,&strIN[SBreak]); + strIN[PBreak] = _T('\0'); + _tcscpy(szPrefix,strIN); + if(!_tcsncmp(&szPrefix[_tcslen(szPrefix) - 2],_T("\""),1)) + { + /* need to remove the " right before a \ at the end to + allow the next stuff to stay inside one set of quotes + otherwise you would have multiple sets of quotes*/ + _tcscpy(&szPrefix[_tcslen(szPrefix) - 2],_T("\\")); + + } + +} + int compare(const void *arg1,const void *arg2) + { + FileName * File1; + FileName * File2; + INT ret; + + File1 = malloc(sizeof(FileName)); + File2 = malloc(sizeof(FileName)); + if(!File1 || !File2) + return 0; + + memcpy(File1,arg1,sizeof(FileName)); + memcpy(File2,arg2,sizeof(FileName)); + + ret = _tcsicmp(File1->Name, File2->Name); + + free(File1); + free(File2); + return ret; + } + +VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, INT cusor) +{ + /* Length of string before we complete it */ + INT StartLength; + /* Length of string after completed */ + INT EndLength; + /* The number of chars added too it */ + static INT DiffLength = 0; + /* Used to find and assemble the string that is returned */ + TCHAR szBaseWord[MAX_PATH]; + TCHAR szPrefix[MAX_PATH]; + TCHAR szOrginal[MAX_PATH]; + TCHAR szSearchPath[MAX_PATH]; + /* Save the strings used last time, so if they hit tab again */ + static TCHAR LastReturned[MAX_PATH]; + static TCHAR LastSearch[MAX_PATH]; + static TCHAR LastPrefix[MAX_PATH]; + /* Used to search for files */ + HANDLE hFile; + WIN32_FIND_DATA file; + /* List of all the files */ + FileName * FileList = NULL; + /* Number of files */ + INT FileListSize = 0; + /* Used for loops */ + INT i; + INT ii; + /* Editable string of what was passed in */ + TCHAR str[MAX_PATH]; + /* Keeps track of what element was last selected */ + static INT Sel; + BOOL NeededQuote = FALSE; + + strOut[0] = _T('\0'); + + /* Copy the string, str can be edited and orginal should not be */ + _tcscpy(str,strIN); + _tcscpy(szOrginal,strIN); + + /* Look to see if the cusor is not at the end of the string */ + if((cusor + 1) < _tcslen(str)) + str[cusor] = _T('\0'); + + /* Look to see if they hit tab again, if so cut off the diff length */ + if(_tcscmp(str,LastReturned)) + { + /* We need to know how many chars we added from the start */ + StartLength = _tcslen(str); + + /* no string, we need all files in that directory */ + if(!StartLength) + _tcscat(str,_T("*")); + + /* Zero it out first */ + szBaseWord[0] = _T('\0'); + szPrefix[0] = _T('\0'); + + /*What comes out of this needs to be: + szBaseWord = path no quotes to the object + szPrefix = what leads up to the filename + no quote at the END of the full name */ + FindPrefixAndSuffix(str,szPrefix,szBaseWord); + /* Strip quotes */ + for(i = 0; i < _tcslen(szBaseWord); i++) + { + if(!_tcsncmp(&szBaseWord[i], _T("\""),1)) + { + for(ii = i; ii < (_tcslen(szBaseWord)); ii++) + szBaseWord[ii] = szBaseWord[ii + 1]; + } + } + + /* clear it out */ + memset(szSearchPath, 0, sizeof(szSearchPath)); + + /* Start the search for all the files */ + GetFullPathName(szBaseWord, MAX_PATH, szSearchPath, NULL); + if(StartLength > 0) + _tcscat(szSearchPath,_T("*")); + _tcscpy(LastSearch,szSearchPath); + _tcscpy(LastPrefix,szPrefix); + } + else + { + _tcscpy(szSearchPath, LastSearch); + _tcscpy(szPrefix, LastPrefix); + } + /* search for the files it might be */ + hFile = FindFirstFile (szSearchPath, &file); + + /* aseemble a list of all files names */ + do + { + if(hFile == INVALID_HANDLE_VALUE) + { + /* Assemble the orginal string and return */ + _tcscpy(strOut,szOrginal); + CloseHandle(hFile); + if(FileList != NULL) + free(FileList); + return; + } + + if(!_tcscmp (file.cFileName, _T(".")) || + !_tcscmp (file.cFileName, _T(".."))) + continue; + /* Add the file to the list of files */ + if(FileList == NULL) + { + FileListSize = 1; + FileList = malloc(FileListSize * sizeof(FileName)); + } + else + { + FileListSize++; + FileList = realloc(FileList, FileListSize * sizeof(FileName)); + } + + if(FileList == NULL) + { + /* Assemble the orginal string and return */ + _tcscpy(strOut,szOrginal); + CloseHandle(hFile); + ConOutFormatMessage (GetLastError()); + return; + } + /* Copies the file name into the struct */ + _tcscpy(FileList[FileListSize-1].Name,file.cFileName); + + }while(FindNextFile(hFile,&file)); + + + /* Sort the files */ + qsort(FileList,FileListSize,sizeof(FileName), compare); + + /* Find the next/previous */ + if(!_tcscmp(szOrginal,LastReturned)) + { + if(bNext) + { + if(FileListSize - 1 == Sel) + Sel = 0; + else + Sel++; + } + else + { + if(!Sel) + Sel = FileListSize - 1; + else + Sel--; + } + } + else + { + Sel = 0; + } + + /* nothing found that matched last time + so return the first thing in the list */ + strOut[0] = _T('\0'); + + /* space in the name */ + if(_tcschr(FileList[Sel].Name, _T(' '))) + { + /* It needs a " at the end */ + NeededQuote = TRUE; + INT LastSpace = -1; + BOOL bInside = FALSE; + /* Find the place to put the " at the start */ + for(i = 0; i < _tcslen(szPrefix); i++) + { + if(szPrefix[i] == _T('\"')) + bInside = !bInside; + if(szPrefix[i] == _T(' ') && !bInside) + LastSpace = i; + + } + /* insert the space and move things around */ + if(_tcsncmp(&szPrefix[LastSpace + 1],_T("\""),1) && LastSpace != -1) + { + /* add another char or you will lose a null char ending */ + _tcsncat(szPrefix,&szPrefix[_tcslen(szPrefix) - 1],1); + for(i = _tcslen(szPrefix) - 1; i > LastSpace; i--) + { + szPrefix[i] = szPrefix[i - 1]; + } + + if(LastSpace + 1 == _tcslen(szPrefix)) + { + _tcscat(szPrefix,_T("\"")); + } + szPrefix[LastSpace + 1] = _T('\"'); + } + else if(LastSpace == -1) + { + _tcscpy(szBaseWord,_T("\"")); + _tcscat(szBaseWord,szPrefix); + _tcscpy(szPrefix,szBaseWord); + + } + } + + _tcscpy(strOut,szPrefix); + _tcscat(strOut,FileList[Sel].Name); + + /* check for odd number of quotes means we need to close them */ + if(!NeededQuote) + { + for(i = 0; i < _tcslen(strOut); i++) + if(strOut[i] == _T('\"')) + NeededQuote = !NeededQuote; + } + + if(szPrefix[_tcslen(szPrefix) - 1] == _T('\"') || NeededQuote) + _tcscat(strOut,_T("\"")); + + _tcscpy(LastReturned,strOut); + EndLength = _tcslen(strOut); + DiffLength = EndLength - StartLength; + CloseHandle(hFile); + if(FileList != NULL) + free(FileList); + +} #endif

1 0

[weiden] 17042: compile welcome.exe as unicode application by default
by weiden＠svn.reactos.com 04 Aug '05

04 Aug '05

compile welcome.exe as unicode application by default Modified: trunk/reactos/subsys/system/welcome/welcome.c Modified: trunk/reactos/subsys/system/welcome/welcome.xml _____ Modified: trunk/reactos/subsys/system/welcome/welcome.c --- trunk/reactos/subsys/system/welcome/welcome.c 2005-08-04 06:52:58 UTC (rev 17041) +++ trunk/reactos/subsys/system/welcome/welcome.c 2005-08-04 10:41:58 UTC (rev 17042) @@ -176,7 +176,7 @@ rcRightPanel.right = ulInnerWidth - 1; if (!LoadString(hInstance, (UINT)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) - lstrcpy(szAppTitle, TEXT("ReactOS Welcome")); + _tcscpy(szAppTitle, TEXT("ReactOS Welcome")); /* Create main window */ hwndMain = CreateWindow(szFrameClass, @@ -248,13 +248,13 @@ if (nLength == 0) return TRUE; - if (!lstrcmpi(AppName, TEXT("<exit>"))) + if (!_tcsicmp(AppName, TEXT("<exit>"))) return FALSE; - if (lstrcmpi(AppName, TEXT("explorer.exe")) == 0) + if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0) { - lstrcat(AppName, TEXT(" ")); - lstrcat(AppName, CurrentDir); + _tcscat(AppName, TEXT(" ")); + _tcscat(AppName, CurrentDir); } memset(&StartupInfo, 0, sizeof(STARTUPINFO)); @@ -285,7 +285,7 @@ static DWORD GetButtonHeight(HDC hDC, HFONT hFont, - PSZ szText, + LPCTSTR szText, DWORD dwWidth) { HFONT hOldFont; @@ -324,7 +324,7 @@ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, - "Arial"); + TEXT("Arial")); /* Topic description font */ hfontTopicDescription = CreateFont(-11,0,0,0,FW_THIN, @@ -333,7 +333,7 @@ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, - "Arial"); + TEXT("Arial")); /* Topic button font */ hfontTopicButton = CreateFont(-11,0,0,0,FW_BOLD, @@ -342,7 +342,7 @@ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, - "Arial"); + TEXT("Arial")); /* Load title bitmap */ if (hTitleBitmap != 0) _____ Modified: trunk/reactos/subsys/system/welcome/welcome.xml --- trunk/reactos/subsys/system/welcome/welcome.xml 2005-08-04 06:52:58 UTC (rev 17041) +++ trunk/reactos/subsys/system/welcome/welcome.xml 2005-08-04 10:41:58 UTC (rev 17042) @@ -4,6 +4,8 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>kernel32</library> <library>gdi32</library> <library>user32</library>

1 0

[gvg] 17041: Sync to Wine-20050628:
by gvg＠svn.reactos.com 04 Aug '05

04 Aug '05

Sync to Wine-20050628: Phil Krylov <phil(a)newstar.rinet.ru> - Implemented EM_GETTEXTLENGTHEX RichEdit message. Krzysztof Foltman <wdev(a)foltman.com> - added support for \ulnone (turning underline off) - support for basic subscript and superscript - untested support for text offset - Emit \tx for user-defined TABs. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Make remaining OLE interface vtables const. Stefan Huehner <stefan(a)huehner.org> - Fix some more -Wstrict-prototypes warnings. Vitaly Lipatov <lav(a)etersoft.ru> - Allow null pointers for EM_GETSEL message (as MSDN says). Robert Shearman <rob(a)codeweavers.com> - Richedit classes should be global. Modified: trunk/reactos/lib/riched20/caret.c Modified: trunk/reactos/lib/riched20/editor.c Modified: trunk/reactos/lib/riched20/editor.h Modified: trunk/reactos/lib/riched20/paint.c Modified: trunk/reactos/lib/riched20/richole.c Modified: trunk/reactos/lib/riched20/style.c Modified: trunk/reactos/lib/riched20/writer.c _____ Modified: trunk/reactos/lib/riched20/caret.c --- trunk/reactos/lib/riched20/caret.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/caret.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -41,6 +41,38 @@ return ME_CharOfsFromRunOfs(editor, ME_FindItemBack(editor->pBuffer->pLast, diRun), 0); } + +int ME_GetTextLengthEx(ME_TextEditor *editor, GETTEXTLENGTHEX *how) +{ + int length; + + if (how->flags & GTL_PRECISE && how->flags & GTL_CLOSE) + return E_INVALIDARG; + if (how->flags & GTL_NUMCHARS && how->flags & GTL_NUMBYTES) + return E_INVALIDARG; + + length = ME_GetTextLength(editor); + + if (how->flags & GTL_USECRLF) + length += editor->nParagraphs; + + if (how->flags & GTL_NUMBYTES) + { + CPINFO cpinfo; + + if (how->codepage == 1200) + return length * 2; + if (how->flags & GTL_PRECISE) + FIXME("GTL_PRECISE flag unsupported. Using GTL_CLOSE\n"); + if (GetCPInfo(how->codepage, &cpinfo)) + return length * cpinfo.MaxCharSize; + ERR("Invalid codepage %u\n", how->codepage); + return E_INVALIDARG; + } + return length; +} + + void ME_SetSelection(ME_TextEditor *editor, int from, int to) { if (from == 0 && to == -1) _____ Modified: trunk/reactos/lib/riched20/editor.c --- trunk/reactos/lib/riched20/editor.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/editor.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -65,7 +65,7 @@ - EM_GETSCROLLPOS 3.0 ! - EM_GETTHUMB - EM_GETTEXTEX 2.0 - - EM_GETTEXTLENGTHEX + + EM_GETTEXTLENGTHEX (GTL_PRECISE unimplemented) - EM_GETTEXTMODE 2.0 ? + EM_GETTEXTRANGE (ANSI&Unicode) - EM_GETTYPOGRAPHYOPTIONS 3.0 @@ -231,7 +231,7 @@ int me_debug = 0; HANDLE me_heap = NULL; -ME_TextBuffer *ME_MakeText() { +ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); @@ -321,11 +321,26 @@ case rtfUnderline: fmt.dwMask = CFM_UNDERLINE; fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; + fmt.bUnderlineType = CFU_CF1UNDERLINE; break; + case rtfNoUnderline: + fmt.dwMask = CFM_UNDERLINE; + fmt.dwEffects = 0; + break; case rtfStrikeThru: fmt.dwMask = CFM_STRIKEOUT; fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; break; + case rtfSubScript: + case rtfSuperScript: + case rtfSubScrShrink: + case rtfSuperScrShrink: + case rtfNoSuperSub: + fmt.dwMask = CFM_SUBSCRIPT|CFM_SUPERSCRIPT; + if (info->rtfMinor == rtfSubScrShrink) fmt.dwEffects = CFE_SUBSCRIPT; + if (info->rtfMinor == rtfSuperScrShrink) fmt.dwEffects = CFE_SUPERSCRIPT; + if (info->rtfMinor == rtfNoSuperSub) fmt.dwEffects = 0; + break; case rtfBackColor: fmt.dwMask = CFM_BACKCOLOR; fmt.dwEffects = 0; @@ -831,7 +846,6 @@ UNSUPPORTED_MSG(EM_GETREDONAME) UNSUPPORTED_MSG(EM_GETSCROLLPOS) UNSUPPORTED_MSG(EM_GETTEXTEX) - UNSUPPORTED_MSG(EM_GETTEXTLENGTHEX) UNSUPPORTED_MSG(EM_GETTEXTMODE) UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) @@ -901,10 +915,14 @@ return 0; case EM_GETSEL: { - ME_GetSelection(editor, (int *)wParam, (int *)lParam); - if (!((wParam|lParam) & 0xFFFF0000)) - return (lParam<<16)|wParam; - return -1; + /* Note: wParam/lParam can be NULL */ + UINT from, to; + PUINT pfrom = wParam ? (PUINT)wParam : &from; + PUINT pto = lParam ? (PUINT)lParam : &to; + ME_GetSelection(editor, pfrom, pto); + if ((*pfrom|*pto) & 0xFFFF0000) + return -1; + return MAKELONG(*pfrom,*pto); } case EM_EXGETSEL: { @@ -1156,6 +1174,8 @@ } case WM_GETTEXTLENGTH: return ME_GetTextLength(editor); + case EM_GETTEXTLENGTHEX: + return ME_GetTextLengthEx(editor, (GETTEXTLENGTHEX *)wParam); case WM_GETTEXT: { TEXTRANGEW tr; /* W and A differ only by rng->lpstrText */ @@ -1464,7 +1484,7 @@ WNDCLASSW wcW; WNDCLASSA wcA; - wcW.style = CS_HREDRAW | CS_VREDRAW; + wcW.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcW.lpfnWndProc = RichEditANSIWndProc; wcW.cbClsExtra = 0; wcW.cbWndExtra = 4; @@ -1480,7 +1500,7 @@ bResult = RegisterClassW(&wcW); assert(bResult); - wcA.style = CS_HREDRAW | CS_VREDRAW; + wcA.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcA.lpfnWndProc = RichEditANSIWndProc; wcA.cbClsExtra = 0; wcA.cbWndExtra = 4; _____ Modified: trunk/reactos/lib/riched20/editor.h --- trunk/reactos/lib/riched20/editor.h 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/editor.h 2005-08-04 06:52:58 UTC (rev 17041) @@ -160,6 +160,7 @@ void ME_InsertGraphicsFromCursor(ME_TextEditor *editor, int nCursor); void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars); int ME_GetTextLength(ME_TextEditor *editor); +int ME_GetTextLengthEx(ME_TextEditor *editor, GETTEXTLENGTHEX *how); ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor); BOOL ME_UpdateSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor); @@ -202,7 +203,7 @@ /* wintest.c */ /* editor.c */ -void ME_RegisterEditorClass(); +void ME_RegisterEditorClass(HINSTANCE hInstance); ME_TextEditor *ME_MakeEditor(HWND hWnd); void ME_DestroyEditor(ME_TextEditor *editor); void ME_SendOldNotify(ME_TextEditor *editor, int nCode); _____ Modified: trunk/reactos/lib/riched20/paint.c --- trunk/reactos/lib/riched20/paint.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/paint.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -178,13 +178,23 @@ HDC hDC = c->hDC; HGDIOBJ hOldFont; COLORREF rgbOld, rgbBack; + int yOffset = 0, yTwipsOffset = 0; hOldFont = ME_SelectStyleFont(c->editor, hDC, s); rgbBack = ME_GetBackColor(c->editor); if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) rgbOld = SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); else rgbOld = SetTextColor(hDC, s->fmt.crTextColor); - ExtTextOutW(hDC, x, y, 0, NULL, szText, nChars, NULL); + if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) { + yTwipsOffset = s->fmt.yOffset; + } + if ((s->fmt.dwMask & s->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) { + if (s->fmt.dwEffects & CFE_SUPERSCRIPT) yTwipsOffset = s->fmt.yHeight/3; + if (s->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -s->fmt.yHeight/12; + } + if (yTwipsOffset) + yOffset = yTwipsOffset*GetDeviceCaps(hDC, LOGPIXELSY)/1440; + ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); if (width) { SIZE sz; GetTextExtentPoint32W(hDC, szText, nChars, &sz); _____ Modified: trunk/reactos/lib/riched20/richole.c --- trunk/reactos/lib/riched20/richole.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/richole.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); typedef struct IRichEditOleImpl { - IRichEditOleVtbl *lpVtbl; + const IRichEditOleVtbl *lpVtbl; DWORD ref; } IRichEditOleImpl; @@ -228,7 +228,7 @@ return E_NOTIMPL; } -static IRichEditOleVtbl revt = { +static const IRichEditOleVtbl revt = { IRichEditOle_fnQueryInterface, IRichEditOle_fnAddRef, IRichEditOle_fnRelease, _____ Modified: trunk/reactos/lib/riched20/style.c --- trunk/reactos/lib/riched20/style.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/style.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -268,6 +268,8 @@ lf->lfUnderline = 1; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT) lf->lfStrikeOut = 1; + if (s->fmt.dwEffects & s->fmt.dwMask & (CFM_SUBSCRIPT|CFM_SUPERSCRIPT)) + lf->lfHeight = (lf->lfHeight*2)/3; /*lf.lfQuality = PROOF_QUALITY; */ lf->lfPitchAndFamily = s->fmt.bPitchAndFamily; lf->lfCharSet = s->fmt.bCharSet; _____ Modified: trunk/reactos/lib/riched20/writer.c --- trunk/reactos/lib/riched20/writer.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/writer.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -45,11 +45,23 @@ { LONG nStart = 0; LONG nWritten = 0; + LONG nRemaining = 0; EDITSTREAM *stream = editor->pStream->stream; do { + TRACE("sending %lu bytes\n", editor->pStream->pos - nStart); + /* Some apps seem not to set *pcb unless a problem arises, relying + on initial random nWritten value, which is usually >STREAMOUT_BUFFER_SIZE */ + nRemaining = editor->pStream->pos - nStart; + nWritten = 0xDEADBEEF; stream->dwError = stream->pfnCallback(stream->dwCookie, editor->pStream->buffer + nStart, editor->pStream->pos - nStart, &nWritten); + TRACE("error=%lu written=%lu\n", stream->dwError, nWritten); + if (nWritten > (editor->pStream->pos - nStart) || nWritten<0) { + FIXME("Invalid returned written size *pcb: 0x%x (%ld) instead of %ld\n", + (unsigned)nWritten, nWritten, nRemaining); + nWritten = nRemaining; + } if (nWritten == 0 || stream->dwError) return FALSE; editor->pStream->written += nWritten; @@ -64,6 +76,7 @@ ME_StreamOutFree(ME_TextEditor *editor) { LONG written = editor->pStream->written; + TRACE("total length = %lu\n", written); FREE_OBJ(editor->pStream); editor->pStream = NULL; @@ -379,6 +392,7 @@ } if (fmt->rgxTabs[i] >> 28 <= 5) strcat(props, leader[fmt->rgxTabs[i] >> 28]); + sprintf(props+strlen(props), "\\tx%ld", fmt->rgxTabs[i]&0x00FFFFFF); } } @@ -781,7 +795,7 @@ ME_StreamOutRTF(editor, nStart, nTo - nStart, dwFormat); else if (dwFormat & SF_TEXT || dwFormat & SF_TEXTIZED) ME_StreamOutText(editor, nStart, nTo - nStart, dwFormat); - - ME_StreamOutFlush(editor); + if (!editor->pStream->stream->dwError) + ME_StreamOutFlush(editor); return ME_StreamOutFree(editor); }

1 0

[weiden] 17040: properly implement scrolling
by weiden＠svn.reactos.com 04 Aug '05

04 Aug '05

properly implement scrolling Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-08-03 23:07:10 UTC (rev 17039) +++ trunk/reactos/lib/aclui/checklist.c 2005-08-04 00:16:41 UTC (rev 17040) @@ -352,23 +352,12 @@ OUT UINT *CheckBox, OUT BOOL *DirectlyInCheckBox) { - LONG Style; INT FirstVisible, Index; PCHECKITEM Item; - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); + FirstVisible = GetScrollPos(infoPtr->hSelf, + SB_VERT); - if (Style & WS_VSCROLL) - { - FirstVisible = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - FirstVisible = 0; - } - Index = FirstVisible + (ppt->y / infoPtr->ItemHeight); Item = FindCheckItemByIndex(infoPtr, @@ -535,12 +524,10 @@ } static VOID -UpdateControl(IN PCHECKLISTWND infoPtr, - IN BOOL AllowChangeStyle) +UpdateControl(IN PCHECKLISTWND infoPtr) { RECT rcClient; SCROLLINFO ScrollInfo; - LONG Style; INT VisibleItems; GetClientRect(infoPtr->hSelf, @@ -566,28 +553,6 @@ &ScrollInfo, TRUE); - if (AllowChangeStyle) - { - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); - - /* determine whether the vertical scrollbar has to be visible or not */ - if (ScrollInfo.nMax > VisibleItems && - !(Style & WS_VSCROLL)) - { - SetWindowLong(infoPtr->hSelf, - GWL_STYLE, - Style | WS_VSCROLL); - } - else if (ScrollInfo.nMax <= VisibleItems && - (Style & WS_VSCROLL)) - { - SetWindowLong(infoPtr->hSelf, - GWL_STYLE, - Style & ~WS_VSCROLL); - } - } - RedrawWindow(infoPtr->hSelf, NULL, NULL, @@ -598,25 +563,14 @@ UpdateCheckItem(IN PCHECKLISTWND infoPtr, IN PCHECKITEM Item) { - LONG Style; RECT rcClient; INT VisibleFirst, VisibleItems; INT Index = CheckItemToIndex(infoPtr, Item); if (Index != -1) { - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); - - if (Style & WS_VSCROLL) - { - VisibleFirst = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - VisibleFirst = 0; - } + VisibleFirst = GetScrollPos(infoPtr->hSelf, + SB_VERT); if (Index >= VisibleFirst) { @@ -647,69 +601,62 @@ MakeCheckItemVisible(IN PCHECKLISTWND infoPtr, IN PCHECKITEM Item) { - LONG Style; RECT rcClient; INT VisibleFirst, VisibleItems, NewPos; INT Index = CheckItemToIndex(infoPtr, Item); if (Index != -1) { - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); - - if (Style & WS_VSCROLL) + VisibleFirst = GetScrollPos(infoPtr->hSelf, + SB_VERT); + + if (Index <= VisibleFirst) { - VisibleFirst = GetScrollPos(infoPtr->hSelf, - SB_VERT); - - if (Index <= VisibleFirst) + NewPos = Index; + } + else + { + GetClientRect(infoPtr->hSelf, + &rcClient); + + VisibleItems = (rcClient.bottom - rcClient.top) / infoPtr->ItemHeight; + if (Index - VisibleItems + 1 > VisibleFirst) { - NewPos = Index; + NewPos = Index - VisibleItems + 1; } else { - GetClientRect(infoPtr->hSelf, - &rcClient); - - VisibleItems = (rcClient.bottom - rcClient.top) / infoPtr->ItemHeight; - if (Index - VisibleItems + 1 > VisibleFirst) - { - NewPos = Index - VisibleItems + 1; - } - else - { - NewPos = VisibleFirst; - } + NewPos = VisibleFirst; } + } + + if (VisibleFirst != NewPos) + { + SCROLLINFO ScrollInfo; + ScrollInfo.cbSize = sizeof(ScrollInfo); + ScrollInfo.fMask = SIF_POS; + ScrollInfo.nPos = NewPos; + NewPos = SetScrollInfo(infoPtr->hSelf, + SB_VERT, + &ScrollInfo, + TRUE); + if (VisibleFirst != NewPos) { - SCROLLINFO ScrollInfo; - - ScrollInfo.cbSize = sizeof(ScrollInfo); - ScrollInfo.fMask = SIF_POS; - ScrollInfo.nPos = NewPos; - NewPos = SetScrollInfo(infoPtr->hSelf, - SB_VERT, - &ScrollInfo, - TRUE); + ScrollWindowEx(infoPtr->hSelf, + 0, + (NewPos - VisibleFirst) * infoPtr->ItemHeight, + NULL, + NULL, + NULL, + NULL, + SW_INVALIDATE | SW_SCROLLCHILDREN); - if (VisibleFirst != NewPos) - { - ScrollWindowEx(infoPtr->hSelf, - 0, - (NewPos - VisibleFirst) * infoPtr->ItemHeight, - NULL, - NULL, - NULL, - NULL, - SW_INVALIDATE | SW_SCROLLCHILDREN); - - RedrawWindow(infoPtr->hSelf, - NULL, - NULL, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN); - } + RedrawWindow(infoPtr->hSelf, + NULL, + NULL, + RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN); } } } @@ -769,8 +716,7 @@ infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT)); } - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); return hOldFont; } @@ -809,7 +755,6 @@ INT ScrollPos; PCHECKITEM FirstItem, Item; RECT rcClient; - LONG Style; UINT VisibleFirstIndex = rcUpdate->top / infoPtr->ItemHeight; UINT LastTouchedIndex = rcUpdate->bottom / infoPtr->ItemHeight; @@ -819,19 +764,9 @@ GetClientRect(infoPtr->hSelf, &rcClient); - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); + ScrollPos = GetScrollPos(infoPtr->hSelf, + SB_VERT); - if (Style & WS_VSCROLL) - { - ScrollPos = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - ScrollPos = 0; - } - FirstItem = FindCheckItemByIndex(infoPtr, ScrollPos + VisibleFirstIndex); if (FirstItem != NULL) @@ -1126,26 +1061,15 @@ IN PCHECKITEM Item, IN UINT ItemBox) { - LONG Style; RECT rcClient; INT VisibleFirst, VisibleItems; INT Index = CheckItemToIndex(infoPtr, Item); if (Index != -1) { - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); + VisibleFirst = GetScrollPos(infoPtr->hSelf, + SB_VERT); - if (Style & WS_VSCROLL) - { - VisibleFirst = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - VisibleFirst = 0; - } - if (Index >= VisibleFirst) { GetClientRect(infoPtr->hSelf, @@ -1278,23 +1202,12 @@ if (Index != -1) { RECT rcClient; - LONG Style; INT VisibleFirst; GetClientRect(infoPtr->hSelf, &rcClient); - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); - - if (Style & WS_VSCROLL) - { - VisibleFirst = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - VisibleFirst = 0; - } + VisibleFirst = GetScrollPos(infoPtr->hSelf, + SB_VERT); prcItem->left = rcClient.left; prcItem->right = rcClient.right; @@ -1774,8 +1687,7 @@ &Index); if (Item != NULL) { - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); Ret = (LRESULT)Index; } else @@ -1795,8 +1707,7 @@ Item); if (Ret) { - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); } } else @@ -1838,8 +1749,7 @@ } } - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); } Ret = TRUE; } @@ -1859,8 +1769,7 @@ case CLM_CLEAR: { ClearCheckItems(infoPtr); - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); break; } @@ -1882,8 +1791,7 @@ Ret = (LRESULT)ClearCheckBoxes(infoPtr); if (Ret) { - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); } break; } @@ -1926,18 +1834,9 @@ case WM_STYLECHANGED: { - LPSTYLESTRUCT Style = (LPSTYLESTRUCT)lParam; - if (wParam == (WPARAM)GWL_STYLE) { - BOOL AllowChangeStyle; - - /* don't allow the control to enable/disable the vertical scrollbar - if this message was invoked due to such a window style change! */ - AllowChangeStyle = ((Style->styleNew & WS_VSCROLL) == (Style->styleOld & WS_VSCROLL)); - - UpdateControl(infoPtr, - AllowChangeStyle); + UpdateControl(infoPtr); } break; } @@ -1946,8 +1845,7 @@ { EscapeQuickSearch(infoPtr); - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); break; } @@ -2449,8 +2347,7 @@ case WM_SIZE: { - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); break; }

1 0

[weiden] 17039: fail as documented when the pointer to the buffer equals the pointer to the string to be converted in MultiByteToWideChar and WideCharToMultiByte
by weiden＠svn.reactos.com 03 Aug '05

03 Aug '05

fail as documented when the pointer to the buffer equals the pointer to the string to be converted in MultiByteToWideChar and WideCharToMultiByte Modified: trunk/reactos/lib/kernel32/misc/nls.c _____ Modified: trunk/reactos/lib/kernel32/misc/nls.c --- trunk/reactos/lib/kernel32/misc/nls.c 2005-08-03 22:49:47 UTC (rev 17038) +++ trunk/reactos/lib/kernel32/misc/nls.c 2005-08-03 23:07:10 UTC (rev 17039) @@ -745,7 +745,8 @@ { /* Check the parameters. */ if (MultiByteString == NULL || - (WideCharString == NULL && WideCharCount > 0)) + (WideCharString == NULL && WideCharCount > 0) || + (PVOID)MultiByteString == (PVOID)WideCharString) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -823,7 +824,8 @@ { /* Check the parameters. */ if (WideCharString == NULL || - (MultiByteString == NULL && MultiByteCount > 0)) + (MultiByteString == NULL && MultiByteCount > 0) || + (PVOID)WideCharString == (PVOID)MultiByteString) { SetLastError(ERROR_INVALID_PARAMETER); return 0;

1 0

[gvg] 17038: Francois Gouget <fgouget@free.fr>
by gvg＠svn.reactos.com 03 Aug '05

03 Aug '05

Francois Gouget <fgouget(a)free.fr> Fix winapi_check documentation warnings. Modified: trunk/reactos/lib/olepro32/olepro32stubs.c _____ Modified: trunk/reactos/lib/olepro32/olepro32stubs.c --- trunk/reactos/lib/olepro32/olepro32stubs.c 2005-08-03 22:46:31 UTC (rev 17037) +++ trunk/reactos/lib/olepro32/olepro32stubs.c 2005-08-03 22:49:47 UTC (rev 17038) @@ -59,7 +59,7 @@ } /*********************************************************************** - * DllGetClassObject (OLEPRO32.256) + * DllGetClassObject (OLEPRO32.@) */ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) {

1 0

[gvg] 17037: Sync to Wine-20050628:
by gvg＠svn.reactos.com 03 Aug '05

03 Aug '05

Sync to Wine-20050628: Dmitry Timoshkov <dmitry(a)codeweavers.com> - Make remaining OLE interface vtables const. Robert Shearman <rob(a)codeweavers.com> - DispInvoke is correct so there is no need to print a fixme. - The typelib marshaler should only free the memory it actually allocated. - Add special cases for two lesser used types that aren't sizeof(DWORD) sized. - If we are accessing a method from a superclass then we need to use the superclass's ITypeInfo otherwise we could get errors when accessing hreftypes that aren't present in the subclass. - Don't print out cryptic message if IDispatch or IUnknown object is just NULL. - puArgErr is a ref pointer so we have to provide a dummy pointer if it is NULL. - Fail gracefully and notify caller if we ran out of memoy or if variant copying failed. - Clear out parameters to stop bad pointers lying around in memory if the function doesn't set them to anything. - Fix the return values from QueryPathOfRegTypeLib. - Open registry key with least access rights necessary. - Documentation updates. Michael Stefaniuc <mstefani(a)redhat.de> - VarCmp: handle comparision of VT_EMPTY with an integer - small comment fix - Reimplement VarAdd, had missing functionality and wrong behaviour. - Fix a typo in VarMul. - more VarFormat fixes for number formats (exponent, mixed '#' and '0' in formats, rounding, etc). Simplify the code. - previous VarFormat todo_wine tests pass now + add more tests - Fix VarFormat for formats that mix '0' and '#' in the whole number part. - Fix VarFormat for negative exponent formats. - Add tests for the above + a couple of "todo_wine"'s. - implement handling of exponents (e+,e-,E+,E-) when parsing number formats - fix a small cut'n'paste error in the comments Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Marcus Meissner <marcus(a)jet.franken.de> - Added VarMonthName() implementation. - Corrected string length method in ITypeLib::IsName() and FindName() for LPOLESTR type. - Fixed IType::Invoke in regards to handling propertyget variables longer than 4 bytes (like VT_DATE). - Added testcases for OLE Picture handling. - Implemented PICTYPE_NONE loading. - Cleaned up stream loading, handle "lt" magic. - Fixed some small problems exposed by tests against native. Stefan Huehner <stefan(a)huehner.org> - Fix some more -Wstrict-prototypes warnings. Huw Davies <huw(a)codeweavers.com> - Add comments describing the first DWORD in an import table entry. Modified: trunk/reactos/lib/oleaut32/connpt.c Modified: trunk/reactos/lib/oleaut32/dispatch.c Modified: trunk/reactos/lib/oleaut32/oaidl_p.c Modified: trunk/reactos/lib/oleaut32/oleaut32.spec Modified: trunk/reactos/lib/oleaut32/olefont.c Modified: trunk/reactos/lib/oleaut32/olepicture.c Modified: trunk/reactos/lib/oleaut32/recinfo.c Modified: trunk/reactos/lib/oleaut32/tmarshal.c Modified: trunk/reactos/lib/oleaut32/typelib.c Modified: trunk/reactos/lib/oleaut32/typelib.h Modified: trunk/reactos/lib/oleaut32/typelib2.c Modified: trunk/reactos/lib/oleaut32/usrmarshal.c Modified: trunk/reactos/lib/oleaut32/varformat.c Modified: trunk/reactos/lib/oleaut32/variant.c _____ Modified: trunk/reactos/lib/oleaut32/connpt.c --- trunk/reactos/lib/oleaut32/connpt.c 2005-08-03 22:31:39 UTC (rev 17036) +++ trunk/reactos/lib/oleaut32/connpt.c 2005-08-03 22:46:31 UTC (rev 17037) @@ -48,7 +48,7 @@ */ typedef struct ConnectionPointImpl { - IConnectionPointVtbl *lpvtbl; + const IConnectionPointVtbl *lpvtbl; /* IUnknown of our main object*/ IUnknown *Obj; @@ -66,7 +66,7 @@ DWORD nSinks; } ConnectionPointImpl; -static IConnectionPointVtbl ConnectionPointImpl_VTable; +static const IConnectionPointVtbl ConnectionPointImpl_VTable; /*********************************************************************** * @@ -74,7 +74,7 @@ */ typedef struct EnumConnectionsImpl { - IEnumConnectionsVtbl *lpvtbl; + const IEnumConnectionsVtbl *lpvtbl; DWORD ref; @@ -351,7 +351,7 @@ return hr; } -static IConnectionPointVtbl ConnectionPointImpl_VTable = +static const IConnectionPointVtbl ConnectionPointImpl_VTable = { ConnectionPointImpl_QueryInterface, ConnectionPointImpl_AddRef, @@ -364,7 +364,7 @@ }; -static IEnumConnectionsVtbl EnumConnectionsImpl_VTable; +static const IEnumConnectionsVtbl EnumConnectionsImpl_VTable; static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface); /*********************************************************************** * @@ -587,7 +587,7 @@ return S_OK; } -static IEnumConnectionsVtbl EnumConnectionsImpl_VTable = +static const IEnumConnectionsVtbl EnumConnectionsImpl_VTable = { EnumConnectionsImpl_QueryInterface, EnumConnectionsImpl_AddRef, _____ Modified: trunk/reactos/lib/oleaut32/dispatch.c --- trunk/reactos/lib/oleaut32/dispatch.c 2005-08-03 22:31:39 UTC (rev 17036) +++ trunk/reactos/lib/oleaut32/dispatch.c 2005-08-03 22:46:31 UTC (rev 17037) @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * TODO: Type coercion is implemented in variant.c but not called yet. */ #include "config.h" @@ -78,11 +77,7 @@ EXCEPINFO *pexcepinfo, /* [out] Destination for exception information */ UINT *puArgErr) /* [out] Destination for bad argument */ { - /** - * TODO: - * For each param, call DispGetParam to perform type coercion - */ - FIXME("Coercion of arguments not implemented\n"); + TRACE("\n"); return ITypeInfo_Invoke(ptinfo, _this, dispidMember, wFlags, pparams, pvarResult, pexcepinfo, puArgErr); @@ -219,7 +214,7 @@ typedef struct { - IDispatchVtbl *lpVtbl; + const IDispatchVtbl *lpVtbl; void * pvThis; ITypeInfo * pTypeInfo; ULONG ref; @@ -422,7 +417,7 @@ return DispInvoke(This->pvThis, This->pTypeInfo, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } -static IDispatchVtbl StdDispatch_VTable = +static const IDispatchVtbl StdDispatch_VTable = { StdDispatch_QueryInterface, StdDispatch_AddRef, _____ Modified: trunk/reactos/lib/oleaut32/oaidl_p.c --- trunk/reactos/lib/oleaut32/oaidl_p.c 2005-08-03 22:31:39 UTC (rev 17036) +++ trunk/reactos/lib/oleaut32/oaidl_p.c 2005-08-03 22:46:31 UTC (rev 17037) @@ -906,7 +906,7 @@ } -const CINTERFACE_PROXY_VTABLE(7) _IDispatchProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(7) _IDispatchProxyVtbl = { { &IID_IDispatch }, { @@ -929,7 +929,7 @@ IDispatch_RemoteInvoke_Stub }; -const CInterfaceStubVtbl _IDispatchStubVtbl = +static const CInterfaceStubVtbl _IDispatchStubVtbl = { { &IID_IDispatch, @@ -1447,7 +1447,7 @@ } -const CINTERFACE_PROXY_VTABLE(7) _IEnumVARIANTProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(7) _IEnumVARIANTProxyVtbl = { { &IID_IEnumVARIANT }, { @@ -1470,7 +1470,7 @@ IEnumVARIANT_Clone_Stub }; -const CInterfaceStubVtbl _IEnumVARIANTStubVtbl = +static const CInterfaceStubVtbl _IEnumVARIANTStubVtbl = { { &IID_IEnumVARIANT, @@ -2009,7 +2009,7 @@ } -const CINTERFACE_PROXY_VTABLE(5) _ITypeCompProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(5) _ITypeCompProxyVtbl = { { &IID_ITypeComp }, { @@ -2028,7 +2028,7 @@ ITypeComp_RemoteBindType_Stub }; -const CInterfaceStubVtbl _ITypeCompStubVtbl = +static const CInterfaceStubVtbl _ITypeCompStubVtbl = { { &IID_ITypeComp, @@ -4804,7 +4804,7 @@ } -const CINTERFACE_PROXY_VTABLE(22) _ITypeInfoProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(22) _ITypeInfoProxyVtbl = { { &IID_ITypeInfo }, { @@ -4857,7 +4857,7 @@ ITypeInfo_LocalReleaseVarDesc_Stub }; -const CInterfaceStubVtbl _ITypeInfoStubVtbl = +static const CInterfaceStubVtbl _ITypeInfoStubVtbl = { { &IID_ITypeInfo, @@ -7141,7 +7141,7 @@ } -const CINTERFACE_PROXY_VTABLE(37) _ITypeInfo2ProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(37) _ITypeInfo2ProxyVtbl = { { &IID_ITypeInfo2 }, { @@ -7224,7 +7224,7 @@ ITypeInfo2_GetAllImplTypeCustData_Stub }; -const CInterfaceStubVtbl _ITypeInfo2StubVtbl = +static const CInterfaceStubVtbl _ITypeInfo2StubVtbl = { { &IID_ITypeInfo2, @@ -8924,7 +8924,7 @@ } -const CINTERFACE_PROXY_VTABLE(13) _ITypeLibProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(13) _ITypeLibProxyVtbl = { { &IID_ITypeLib }, { @@ -8959,7 +8959,7 @@ ITypeLib_LocalReleaseTLibAttr_Stub }; -const CInterfaceStubVtbl _ITypeLibStubVtbl = +static const CInterfaceStubVtbl _ITypeLibStubVtbl = { { &IID_ITypeLib, @@ -9631,7 +9631,7 @@ } -const CINTERFACE_PROXY_VTABLE(17) _ITypeLib2ProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(17) _ITypeLib2ProxyVtbl = { { &IID_ITypeLib2 }, { @@ -10330,7 +10330,7 @@ } -const CINTERFACE_PROXY_VTABLE(8) _IErrorInfoProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(8) _IErrorInfoProxyVtbl = { { &IID_IErrorInfo }, { @@ -10355,7 +10355,7 @@ IErrorInfo_GetHelpContext_Stub }; -const CInterfaceStubVtbl _IErrorInfoStubVtbl = +static const CInterfaceStubVtbl _IErrorInfoStubVtbl = { { &IID_IErrorInfo, @@ -10926,7 +10926,7 @@ } -const CINTERFACE_PROXY_VTABLE(8) _ICreateErrorInfoProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(8) _ICreateErrorInfoProxyVtbl = { { &IID_ICreateErrorInfo }, { @@ -10951,7 +10951,7 @@ ICreateErrorInfo_SetHelpContext_Stub }; -const CInterfaceStubVtbl _ICreateErrorInfoStubVtbl = +static const CInterfaceStubVtbl _ICreateErrorInfoStubVtbl = { { &IID_ICreateErrorInfo, @@ -11080,7 +11080,7 @@ } -const CINTERFACE_PROXY_VTABLE(4) _ISupportErrorInfoProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(4) _ISupportErrorInfoProxyVtbl = { { &IID_ISupportErrorInfo }, { @@ -11097,7 +11097,7 @@ ISupportErrorInfo_InterfaceSupportsErrorInfo_Stub }; -const CInterfaceStubVtbl _ISupportErrorInfoStubVtbl = +static const CInterfaceStubVtbl _ISupportErrorInfoStubVtbl = { { &IID_ISupportErrorInfo, @@ -11347,7 +11347,7 @@ 0 /* Reserved5 */ }; -const CINTERFACE_PROXY_VTABLE(4) _ITypeFactoryProxyVtbl = +static const CINTERFACE_PROXY_VTABLE(4) _ITypeFactoryProxyVtbl = { { &IID_ITypeFactory }, { @@ -11364,7 +11364,7 @@ ITypeFactory_CreateFromTypeInfo_Stub }; -const CInterfaceStubVtbl _ITypeFactoryStubVtbl = +static const CInterfaceStubVtbl _ITypeFactoryStubVtbl = { { &IID_ITypeFactory, @@ -13702,39 +13702,39 @@ } }; -const CInterfaceProxyVtbl * _oaidl_ProxyVtblList[] = +static const CInterfaceProxyVtbl * _oaidl_ProxyVtblList[] = { - ( CInterfaceProxyVtbl *) &_IDispatchProxyVtbl, - ( CInterfaceProxyVtbl *) &_ITypeInfoProxyVtbl, - ( CInterfaceProxyVtbl *) &_ITypeLibProxyVtbl, - ( CInterfaceProxyVtbl *) &_ITypeCompProxyVtbl, - ( CInterfaceProxyVtbl *) &_IEnumVARIANTProxyVtbl, - ( CInterfaceProxyVtbl *) &_ITypeLib2ProxyVtbl, - ( CInterfaceProxyVtbl *) &_ITypeInfo2ProxyVtbl, - ( CInterfaceProxyVtbl *) &_IErrorInfoProxyVtbl, - ( CInterfaceProxyVtbl *) &_ITypeFactoryProxyVtbl, - ( CInterfaceProxyVtbl *) &_ICreateErrorInfoProxyVtbl, - ( CInterfaceProxyVtbl *) &_ISupportErrorInfoProxyVtbl, + ( const CInterfaceProxyVtbl *) &_IDispatchProxyVtbl, + ( const CInterfaceProxyVtbl *) &_ITypeInfoProxyVtbl, + ( const CInterfaceProxyVtbl *) &_ITypeLibProxyVtbl, + ( const CInterfaceProxyVtbl *) &_ITypeCompProxyVtbl, + ( const CInterfaceProxyVtbl *) &_IEnumVARIANTProxyVtbl, + ( const CInterfaceProxyVtbl *) &_ITypeLib2ProxyVtbl, + ( const CInterfaceProxyVtbl *) &_ITypeInfo2ProxyVtbl, + ( const CInterfaceProxyVtbl *) &_IErrorInfoProxyVtbl, + ( const CInterfaceProxyVtbl *) &_ITypeFactoryProxyVtbl, + ( const CInterfaceProxyVtbl *) &_ICreateErrorInfoProxyVtbl, + ( const CInterfaceProxyVtbl *) &_ISupportErrorInfoProxyVtbl, 0 }; -const CInterfaceStubVtbl * _oaidl_StubVtblList[] = +static const CInterfaceStubVtbl * _oaidl_StubVtblList[] = { - ( CInterfaceStubVtbl *) &_IDispatchStubVtbl, - ( CInterfaceStubVtbl *) &_ITypeInfoStubVtbl, - ( CInterfaceStubVtbl *) &_ITypeLibStubVtbl, - ( CInterfaceStubVtbl *) &_ITypeCompStubVtbl, - ( CInterfaceStubVtbl *) &_IEnumVARIANTStubVtbl, - ( CInterfaceStubVtbl *) &_ITypeLib2StubVtbl, - ( CInterfaceStubVtbl *) &_ITypeInfo2StubVtbl, - ( CInterfaceStubVtbl *) &_IErrorInfoStubVtbl, - ( CInterfaceStubVtbl *) &_ITypeFactoryStubVtbl, - ( CInterfaceStubVtbl *) &_ICreateErrorInfoStubVtbl, - ( CInterfaceStubVtbl *) &_ISupportErrorInfoStubVtbl, + ( const CInterfaceStubVtbl *) &_IDispatchStubVtbl, + ( const CInterfaceStubVtbl *) &_ITypeInfoStubVtbl, + ( const CInterfaceStubVtbl *) &_ITypeLibStubVtbl, + ( const CInterfaceStubVtbl *) &_ITypeCompStubVtbl, + ( const CInterfaceStubVtbl *) &_IEnumVARIANTStubVtbl, + ( const CInterfaceStubVtbl *) &_ITypeLib2StubVtbl, + ( const CInterfaceStubVtbl *) &_ITypeInfo2StubVtbl, + ( const CInterfaceStubVtbl *) &_IErrorInfoStubVtbl, + ( const CInterfaceStubVtbl *) &_ITypeFactoryStubVtbl, + ( const CInterfaceStubVtbl *) &_ICreateErrorInfoStubVtbl, + ( const CInterfaceStubVtbl *) &_ISupportErrorInfoStubVtbl, 0 }; -PCInterfaceName const _oaidl_InterfaceNamesList[] = +static const PCInterfaceName _oaidl_InterfaceNamesList[] = { "IDispatch", "ITypeInfo", @@ -13767,8 +13767,8 @@ const ExtendedProxyFileInfo oaidl_ProxyFileInfo = { - (PCInterfaceProxyVtblList *) & _oaidl_ProxyVtblList, - (PCInterfaceStubVtblList *) & _oaidl_StubVtblList, + (const PCInterfaceProxyVtblList *) & _oaidl_ProxyVtblList, + (const PCInterfaceStubVtblList *) & _oaidl_StubVtblList, (const PCInterfaceName * ) & _oaidl_InterfaceNamesList, 0, /* no delegation */ & _oaidl_IID_Lookup, _____ Modified: trunk/reactos/lib/oleaut32/oleaut32.spec --- trunk/reactos/lib/oleaut32/oleaut32.spec 2005-08-03 22:31:39 UTC (rev 17036) +++ trunk/reactos/lib/oleaut32/oleaut32.spec 2005-08-03 22:46:31 UTC (rev 17037) @@ -126,7 +126,7 @@ 126 stdcall VarBoolFromDisp(ptr long ptr) 127 stdcall VarFormatCurrency(ptr long long long long long ptr) 128 stub VarWeekdayName # stdcall (long long long long ptr) -129 stub VarMonthName # stdcall (long long long ptr) +129 stdcall VarMonthName(long long long ptr) 130 stdcall VarUI1FromI2(long ptr) 131 stdcall VarUI1FromI4(long ptr) 132 stdcall VarUI1FromR4(long ptr) _____ Modified: trunk/reactos/lib/oleaut32/olefont.c --- trunk/reactos/lib/oleaut32/olefont.c 2005-08-03 22:31:39 UTC (rev 17036) +++ trunk/reactos/lib/oleaut32/olefont.c 2005-08-03 22:46:31 UTC (rev 17037) @@ -63,12 +63,12 @@ * The first two are supported by the first vtable, the next two are * supported by the second table and the last two have their own. */ - IFontVtbl* lpvtbl1; - IDispatchVtbl* lpvtbl2; - IPersistStreamVtbl* lpvtbl3; - IConnectionPointContainerVtbl* lpvtbl4; - IPersistPropertyBagVtbl* lpvtbl5; - IPersistStreamInitVtbl* lpvtbl6; + const IFontVtbl* lpvtbl1; + const IDispatchVtbl* lpvtbl2; + const IPersistStreamVtbl* lpvtbl3; + const IConnectionPointContainerVtbl* lpvtbl4; + const IPersistPropertyBagVtbl* lpvtbl5; + const IPersistStreamInitVtbl* lpvtbl6; /* * Reference count for that instance of the class. */ @@ -219,7 +219,7 @@ /* * Virtual function tables for the OLEFontImpl class. */ -static IFontVtbl OLEFontImpl_VTable = +static const IFontVtbl OLEFontImpl_VTable = { OLEFontImpl_QueryInterface, OLEFontImpl_AddRef, @@ -250,7 +250,7 @@ OLEFontImpl_SetHdc }; -static IDispatchVtbl OLEFontImpl_IDispatch_VTable = +static const IDispatchVtbl OLEFontImpl_IDispatch_VTable = { OLEFontImpl_IDispatch_QueryInterface, OLEFontImpl_IDispatch_AddRef, @@ -261,7 +261,7 @@ OLEFontImpl_Invoke }; -static IPersistStreamVtbl OLEFontImpl_IPersistStream_VTable = +static const IPersistStreamVtbl OLEFontImpl_IPersistStream_VTable = { OLEFontImpl_IPersistStream_QueryInterface, OLEFontImpl_IPersistStream_AddRef, @@ -273,7 +273,7 @@ OLEFontImpl_GetSizeMax }; -static IConnectionPointContainerVtbl +static const IConnectionPointContainerVtbl OLEFontImpl_IConnectionPointContainer_VTable = { OLEFontImpl_IConnectionPointContainer_QueryInterface, @@ -283,8 +283,9 @@ OLEFontImpl_FindConnectionPoint }; -static IPersistPropertyBagVtbl OLEFontImpl_IPersistPropertyBag_VTable; -static IPersistStreamInitVtbl OLEFontImpl_IPersistStreamInit_VTable; +static const IPersistPropertyBagVtbl OLEFontImpl_IPersistPropertyBag_VTable; +static const IPersistStreamInitVtbl OLEFontImpl_IPersistStreamInit_VTable; + /*********************************************************************** ******* * OleCreateFontIndirect [OLEAUT32.420] */ @@ -2002,7 +2003,7 @@ return E_FAIL; } -static IPersistPropertyBagVtbl OLEFontImpl_IPersistPropertyBag_VTable = +static const IPersistPropertyBagVtbl OLEFontImpl_IPersistPropertyBag_VTable = { OLEFontImpl_IPersistPropertyBag_QueryInterface, OLEFontImpl_IPersistPropertyBag_AddRef, @@ -2080,7 +2081,7 @@ return S_OK; } -static IPersistStreamInitVtbl OLEFontImpl_IPersistStreamInit_VTable = +static const IPersistStreamInitVtbl OLEFontImpl_IPersistStreamInit_VTable = { OLEFontImpl_IPersistStreamInit_QueryInterface, OLEFontImpl_IPersistStreamInit_AddRef, @@ -2100,7 +2101,7 @@ typedef struct { /* IUnknown fields */ - IClassFactoryVtbl *lpVtbl; + const IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; @@ -2137,7 +2138,7 @@ return S_OK; } -static IClassFactoryVtbl SFCF_Vtbl = { +static const IClassFactoryVtbl SFCF_Vtbl = { SFCF_QueryInterface, SFCF_AddRef, SFCF_Release, _____ Modified: trunk/reactos/lib/oleaut32/olepicture.c --- trunk/reactos/lib/oleaut32/olepicture.c 2005-08-03 22:31:39 UTC (rev 17036) +++ trunk/reactos/lib/oleaut32/olepicture.c 2005-08-03 22:46:31 UTC (rev 17037) @@ -103,10 +103,10 @@ * IPicture handles IUnknown */ - IPictureVtbl *lpvtbl1; - IDispatchVtbl *lpvtbl2; - IPersistStreamVtbl *lpvtbl3; - IConnectionPointContainerVtbl *lpvtbl4; + const IPictureVtbl *lpvtbl1; + const IDispatchVtbl *lpvtbl2; + const IPersistStreamVtbl *lpvtbl3; + const IConnectionPointContainerVtbl *lpvtbl4; /* Object reference count */ DWORD ref; @@ -156,10 +156,10 @@ /* * Predeclare VTables. They get initialized at the end. */ -static IPictureVtbl OLEPictureImpl_VTable; -static IDispatchVtbl OLEPictureImpl_IDispatch_VTable; -static IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable; -static IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable; +static const IPictureVtbl OLEPictureImpl_VTable; +static const IDispatchVtbl OLEPictureImpl_IDispatch_VTable; +static const IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable; +static const IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable; /*********************************************************************** * Implementation of the OLEPictureImpl class. @@ -334,6 +334,9 @@ case PICTYPE_ENHMETAFILE: DeleteEnhMetaFile(Obj->desc.u.emf.hemf); break; + case PICTYPE_NONE: + /* Nothing to do */ + break; default: FIXME("Unsupported type %d - unable to delete\n", Obj->desc.picType); break; @@ -485,6 +488,9 @@ OLEPictureImpl *This = (OLEPictureImpl *)iface; TRACE("(%p)->(%p)\n", This, phandle); switch(This->desc.picType) { + case PICTYPE_NONE: + *phandle = 0; + break; case PICTYPE_BITMAP: *phandle = (OLE_HANDLE)This->desc.u.bmp.hbitmap; break; @@ -512,8 +518,10 @@ OLE_HANDLE *phandle) { OLEPictureImpl *This = (OLEPictureImpl *)iface; - FIXME("(%p)->(%p): stub\n", This, phandle); - return E_NOTIMPL; + FIXME("(%p)->(%p): stub, return 0 palette.\n", This, phandle); + + *phandle = 0; + return S_OK; } /*********************************************************************** * @@ -992,7 +1000,8 @@ */ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { HRESULT hr = E_FAIL; - ULONG xread; + BOOL headerisdata = FALSE; + ULONG xread, toread; BYTE *xbuf; DWORD header[2]; WORD magic; @@ -1013,43 +1022,54 @@ */ hr=IStream_Stat(pStm,&statstg,STATFLAG_NONAME); if (hr) - FIXME("Stat failed with hres %lx\n",hr); + FIXME("Stat failed with hres %lx\n",hr); hr=IStream_Read(pStm,header,8,&xread); if (hr || xread!=8) { FIXME("Failure while reading picture header (hr is %lx, nread is %ld).\n",hr,xread); return hr; } - if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ - !memcmp(&(header[0]), "BM", 2) || /* BMP header */ - !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ - header[1] > statstg.cbSize.QuadPart || (header[1]==0)) {/* Incorrect header, assume none. */ - xread = 8; - xbuf = This->data = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,statstg.cbSize.QuadPart); - memcpy(xbuf,&header,8); - This->datalen = statstg.cbSize.QuadPart; - while (xread < This->datalen) { + + headerisdata = FALSE; + xread = 0; + if (!memcmp(&(header[0]),"lt\0\0", 4) && (header[1] <= statstg.cbSize.QuadPart-8)) { + toread = header[1]; + } else { + if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ + !memcmp(&(header[0]), "BM", 2) || /* BMP header */ + !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ + (header[1] > statstg.cbSize.QuadPart) || /* invalid size */ + (header[1]==0) + ) {/* Incorrect header, assume none. */ + headerisdata = TRUE; + toread = statstg.cbSize.QuadPart-8; + xread = 8; + } else { + FIXME("Unknown stream header magic: %08lx\n", header[0]); + toread = header[1]; + } + } + + This->datalen = toread+(headerisdata?8:0); + xbuf = This->data = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, This->datalen); + + if (headerisdata) + memcpy (xbuf, &header, 8); + + while (xread < This->datalen) { ULONG nread; hr = IStream_Read(pStm,xbuf+xread,This->datalen-xread,&nread); xread+=nread; if (hr || !nread) break; - } - if (xread != This->datalen) - FIXME("Could only read %ld of %d bytes in no-header case?\n",xread,This->datalen); - } else { - xread = 0; - xbuf = This->data = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,header[1]); - This->datalen = header[1]; - while (xread < header[1]) { - ULONG nread; - hr = IStream_Read(pStm,xbuf+xread,header[1]-xread,&nread); - xread+=nread; - if (hr || !nread) - break; - } - if (xread != header[1]) - FIXME("Could only read %ld of %ld bytes?\n",xread,header[1]); } + if (xread != This->datalen) + FIXME("Could only read %ld of %d bytes out of stream?\n",xread,This->datalen); + + if (This->datalen == 0) { /* Marks the "NONE" picture */ + This->desc.picType = PICTYPE_NONE; + return S_OK; + } + magic = xbuf[0] + (xbuf[1]<<8); switch (magic) { case 0x4947: { /* GIF */ @@ -1917,7 +1937,7 @@ } -static IPictureVtbl OLEPictureImpl_VTable = +static const IPictureVtbl OLEPictureImpl_VTable = { OLEPictureImpl_QueryInterface, OLEPictureImpl_AddRef, @@ -1938,7 +1958,7 @@ OLEPictureImpl_get_Attributes }; -static IDispatchVtbl OLEPictureImpl_IDispatch_VTable = +static const IDispatchVtbl OLEPictureImpl_IDispatch_VTable = { OLEPictureImpl_IDispatch_QueryInterface, OLEPictureImpl_IDispatch_AddRef, @@ -1949,7 +1969,7 @@ OLEPictureImpl_Invoke }; -static IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable = +static const IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable = { OLEPictureImpl_IPersistStream_QueryInterface, OLEPictureImpl_IPersistStream_AddRef, @@ -1961,7 +1981,7 @@ OLEPictureImpl_GetSizeMax }; -static IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable = +static const IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable = { OLEPictureImpl_IConnectionPointContainer_QueryInterface, OLEPictureImpl_IConnectionPointContainer_AddRef, @@ -2189,7 +2209,7 @@ typedef struct { /* IUnknown fields */ - IClassFactoryVtbl *lpVtbl; + const IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; @@ -2227,7 +2247,7 @@ return S_OK; } -static IClassFactoryVtbl SPCF_Vtbl = { +static const IClassFactoryVtbl SPCF_Vtbl = { SPCF_QueryInterface, SPCF_AddRef, SPCF_Release, _____ Modified: trunk/reactos/lib/oleaut32/recinfo.c --- trunk/reactos/lib/oleaut32/recinfo.c 2005-08-03 22:31:39 UTC (rev 17036) +++ trunk/reactos/lib/oleaut32/recinfo.c 2005-08-03 22:46:31 UTC (rev 17037) @@ -41,7 +41,7 @@ } fieldstr; typedef struct { - IRecordInfoVtbl *lpVtbl; + const IRecordInfoVtbl *lpVtbl; ULONG ref; GUID guid; @@ -476,7 +476,7 @@ return S_OK; } -static IRecordInfoVtbl IRecordInfoImplVtbl = { +static const IRecordInfoVtbl IRecordInfoImplVtbl = { IRecordInfoImpl_QueryInterface, IRecordInfoImpl_AddRef, IRecordInfoImpl_Release, _____ Modified: trunk/reactos/lib/oleaut32/tmarshal.c --- trunk/reactos/lib/oleaut32/tmarshal.c 2005-08-03 22:31:39 UTC (rev 17036) +++ trunk/reactos/lib/oleaut32/tmarshal.c 2005-08-03 22:46:31 UTC (rev 17037) @@ -355,8 +355,8 @@ #endif typedef struct _TMProxyImpl { - LPVOID *lpvtbl; - IRpcProxyBufferVtbl *lpvtbl2; + LPVOID *lpvtbl; + const IRpcProxyBufferVtbl *lpvtbl2; ULONG ref; TMAsmProxy *asmstubs; @@ -443,7 +443,7 @@ } -static IRpcProxyBufferVtbl tmproxyvtable = { +static const IRpcProxyBufferVtbl tmproxyvtable = { TMProxyImpl_QueryInterface, TMProxyImpl_AddRef, TMProxyImpl_Release, @@ -455,6 +455,10 @@ int _argsize(DWORD vt) { switch (vt) { + case VT_R8: + return sizeof(double)/sizeof(DWORD); + case VT_CY: + return sizeof(CY)/sizeof(DWORD); case VT_DATE: return sizeof(DATE)/sizeof(DWORD); case VT_VARIANT: @@ -607,7 +611,10 @@ } case VT_PTR: { DWORD cookie; + BOOL derefhere; + derefhere = (tdesc->u.lptdesc->vt != VT_USERDEFINED); + if (debugout) TRACE_(olerelay)("*"); /* Write always, so the other side knows when it gets a NULL pointer. */ @@ -620,7 +627,7 @@ return S_OK; } hres = serialize_param(tinfo,writeit,debugout,dealloc,tdesc->u.lptdesc,(DWORD*) *arg,buf); - if (dealloc) HeapFree(GetProcessHeap(),0,(LPVOID)arg); + if (derefhere && dealloc) HeapFree(GetProcessHeap(),0,(LPVOID)*arg); return hres; } case VT_UNKNOWN: @@ -686,6 +693,7 @@ (DWORD*)(((LPBYTE)arg)+vdesc->u.oInst), buf ); + ITypeInfo_ReleaseVarDesc(tinfo2, vdesc); if (hres!=S_OK) return hres; if (debugout && (i<(tattr->cVars-1))) @@ -1432,7 +1440,7 @@ /* Searches function, also in inherited interfaces */ static HRESULT _get_funcdesc( - ITypeInfo *tinfo, int iMethod, FUNCDESC **fdesc, BSTR *iname, BSTR *fname) + ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, FUNCDESC **fdesc, BSTR *iname, BSTR *fname) { int i = 0, j = 0; HRESULT hres; @@ -1440,6 +1448,9 @@ if (fname) *fname = NULL; if (iname) *iname = NULL; + *tactual = tinfo; + ITypeInfo_AddRef(*tactual); + while (1) { hres = ITypeInfo_GetFuncDesc(tinfo, i, fdesc); if (hres) { @@ -1464,7 +1475,7 @@ ERR("Did not find a typeinfo for reftype %ld?\n",href); continue; } - hres = _get_funcdesc(tinfo2,iMethod,fdesc,iname,fname); + hres = _get_funcdesc(tinfo2,iMethod,tactual,fdesc,iname,fname); ITypeInfo_Release(tinfo2); if (!hres) return S_OK; } @@ -1496,12 +1507,14 @@ int nrofnames; int is_idispatch_getidsofnames = 0; DWORD remoteresult = 0; + ITypeInfo *tinfo; EnterCriticalSection(&tpinfo->crit); - hres = _get_funcdesc(tpinfo->tinfo,method,&fdesc,&iname,&fname); + hres = _get_funcdesc(tpinfo->tinfo,method,&tinfo,&fdesc,&iname,&fname); if (hres) { ERR("Did not find typeinfo/funcdesc entry for method %d!\n",method); + ITypeInfo_Release(tinfo); LeaveCriticalSection(&tpinfo->crit); return E_FAIL; } @@ -1509,6 +1522,7 @@ if (!tpinfo->chanbuf) { WARN("Tried to use disconnected proxy\n"); + ITypeInfo_Release(tinfo); LeaveCriticalSection(&tpinfo->crit); return RPC_E_DISCONNECTED; } @@ -1537,6 +1551,8 @@ hres = serialize_IDispatch_GetIDsOfNames(TRUE,relaydeb,args,&buf); if (hres != S_OK) { FIXME("serialize of IDispatch::GetIDsOfNames failed!\n"); + ITypeInfo_Release(tinfo); + LeaveCriticalSection(&tpinfo->crit); return hres; } goto afterserialize; @@ -1553,7 +1569,7 @@ /* Need them for hack below */ memset(names,0,sizeof(names)); - if (ITypeInfo_GetNames(tpinfo->tinfo,fdesc->memid,names,sizeof(names)/sizeo f(names[0]),&nrofnames)) + if (ITypeInfo_GetNames(tinfo,fdesc->memid,names,sizeof(names)/sizeof(names[ 0]),&nrofnames)) nrofnames = 0; if (nrofnames > sizeof(names)/sizeof(names[0])) ERR("Need more names!\n"); @@ -1582,7 +1598,7 @@ /* DISPPARAMS* needs special serializer */ if (!lstrcmpW(names[i+1],pdispparamsW)) { hres = serialize_DISPPARAM_ptr( - tpinfo->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, relaydeb, FALSE, @@ -1594,7 +1610,7 @@ } if (!lstrcmpW(names[i+1],ppvObjectW)) { hres = serialize_LPVOID_ptr( - tpinfo->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, relaydeb, FALSE, @@ -1608,7 +1624,7 @@ } if (!isserialized) hres = serialize_param( - tpinfo->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, relaydeb, FALSE, @@ -1695,7 +1711,7 @@ /* deserialize DISPPARAM */ if (!lstrcmpW(names[i+1],pdispparamsW)) { hres = deserialize_DISPPARAM_ptr( - tpinfo->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, relaydeb, FALSE, @@ -1711,7 +1727,7 @@ } if (!lstrcmpW(names[i+1],ppvObjectW)) { hres = deserialize_LPVOID_ptr( - tpinfo->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, relaydeb, FALSE, @@ -1725,7 +1741,7 @@ } if (!isdeserialized) hres = deserialize_param( - tpinfo->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, relaydeb, FALSE, @@ -1750,6 +1766,7 @@ return status; HeapFree(GetProcessHeap(),0,buf.base); + ITypeInfo_Release(tinfo); LeaveCriticalSection(&tpinfo->crit); return remoteresult; } @@ -1842,7 +1859,9 @@ int j; /* nrofargs without This */ int nrofargs; - hres = _get_funcdesc(tinfo,i,&fdesc,NULL,NULL); + ITypeInfo *tinfo2; + hres = _get_funcdesc(tinfo,i,&tinfo2,&fdesc,NULL,NULL); + ITypeInfo_Release(tinfo2); if (hres) { ERR("GetFuncDesc %lx should not fail here.\n",hres); return hres; @@ -1891,7 +1910,7 @@ } typedef struct _TMStubImpl { - IRpcStubBufferVtbl *lpvtbl; + const IRpcStubBufferVtbl *lpvtbl; ULONG ref; LPUNKNOWN pUnk; @@ -1976,6 +1995,7 @@ BSTR names[10]; BSTR fname = NULL,iname = NULL; BOOL is_idispatch_getidsofnames = 0; + ITypeInfo *tinfo; memset(&buf,0,sizeof(buf)); buf.size = xmsg->cbBuffer; @@ -1996,7 +2016,7 @@ xmsg->cbBuffer = buf.size; return hres; } - hres = _get_funcdesc(This->tinfo,xmsg->iMethod,&fdesc,&iname,&fname); + hres = _get_funcdesc(This->tinfo,xmsg->iMethod,&tinfo,&fdesc,&iname,&fname); if (hres) { ERR("GetFuncDesc on method %ld failed with %lx\n",xmsg->iMethod,hres); return hres; @@ -2010,7 +2030,7 @@ /* Need them for hack below */ memset(names,0,sizeof(names)); - ITypeInfo_GetNames(This->tinfo,fdesc->memid,names,sizeof(names)/sizeof(n ames[0]),&nrofnames); + ITypeInfo_GetNames(tinfo,fdesc->memid,names,sizeof(names)/sizeof(names[0 ]),&nrofnames); if (nrofnames > sizeof(names)/sizeof(names[0])) { ERR("Need more names!\n"); } @@ -2047,7 +2067,7 @@ /* deserialize DISPPARAM */ if (!lstrcmpW(names[i+1],pdispparamsW)) { hres = deserialize_DISPPARAM_ptr( - This->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, FALSE, TRUE, @@ -2063,7 +2083,7 @@ } if (!lstrcmpW(names[i+1],ppvObjectW)) { hres = deserialize_LPVOID_ptr( - This->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, FALSE, TRUE, @@ -2077,7 +2097,7 @@ } if (!isdeserialized) hres = deserialize_param( - This->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN, FALSE, TRUE, @@ -2129,7 +2149,7 @@ /* DISPPARAMS* needs special serializer */ if (!lstrcmpW(names[i+1],pdispparamsW)) { hres = serialize_DISPPARAM_ptr( - This->tinfo, + tinfo, elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT, FALSE, [truncated at 1000 lines; 1479 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs