Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 14165: more stuff for ddraw.dll not tested yet.
by greatlrd＠svn.reactos.com 17 Mar '05

17 Mar '05

more stuff for ddraw.dll not tested yet. Modified: trunk/reactos/lib/ddraw/Makefile Modified: trunk/reactos/lib/ddraw/ddraw.c Added: trunk/reactos/lib/ddraw/rosddraw.h _____ Modified: trunk/reactos/lib/ddraw/Makefile --- trunk/reactos/lib/ddraw/Makefile 2005-03-17 19:35:16 UTC (rev 14164) +++ trunk/reactos/lib/ddraw/Makefile 2005-03-17 20:15:44 UTC (rev 14165) @@ -12,7 +12,7 @@ # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror -TARGET_SDKLIBS = ntdll.a gdi32.a dxguid.a ole32.a user32.a +TARGET_SDKLIBS = ntdll.a gdi32.a dxguid.a ole32.a user32.a d3d8thk.a TARGET_OBJECTS = \ _____ Modified: trunk/reactos/lib/ddraw/ddraw.c --- trunk/reactos/lib/ddraw/ddraw.c 2005-03-17 19:35:16 UTC (rev 14164) +++ trunk/reactos/lib/ddraw/ddraw.c 2005-03-17 20:15:44 UTC (rev 14165) @@ -10,27 +10,18 @@ */ #include <windows.h> -//#include <ddraw.h> +#include "ddraw.h" +#include "rosddraw.h" - #define DD_OK 0 -HRESULT STDCALL DirectDrawCreate( - GUID FAR* lpGUID, - DWORD FAR* lplpDD, - IUnknown FAR* pUnkOuter -) -{ - return DD_OK; +HRESULT WINAPI DirectDrawCreate(LPGUID lpGUID, LPVOID* lplpDD, LPUNKNOWN pUnkOuter) +{ + return DDRAW_Create(lpGUID, (LPVOID*) lplpDD, pUnkOuter, &IID_IDirectDraw, FALSE); } -HRESULT STDCALL DirectDrawCreateEx( - GUID FAR* lpGUID, - DWORD FAR* lplpDD, - DWORD Unknown3, - IUnknown FAR* pUnkOuter -) +HRESULT WINAPI DirectDrawCreateEx(LPGUID lpGUID, LPVOID* lplpDD, REFIID iid, LPUNKNOWN pUnkOuter) { - return DD_OK; + return DDRAW_Create(lpGUID, lplpDD, pUnkOuter, iid, TRUE); } HRESULT WINAPI DirectDrawEnumerateA( @@ -77,6 +68,29 @@ return DD_OK; } +HRESULT DDRAW_Create( + LPGUID lpGUID, LPVOID *lplpDD, LPUNKNOWN pUnkOuter, REFIID iid, BOOL ex) +{ + HDC desktop; + + /* BOOL ex == TRUE it is DirectDrawCreateEx call here. */ + + /* TODO: + check the GUID are right + add scanner that DirectDrawCreate / DirectDrawCreateEx select right driver. + now we will assume it is the current display driver + */ + + if (pUnkOuter != NULL) return DDERR_INVALIDPARAMS; + + desktop = GetWindowDC(GetDesktopWindow()); + + lplpDD = OsThunkDdCreateDirectDrawObject(desktop); + if (lplpDD == NULL) return DDERR_NODIRECTDRAWHW; + + return DD_OK; +} + BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD fwdReason, LPVOID lpvReserved) { switch(fwdReason) _____ Added: trunk/reactos/lib/ddraw/rosddraw.h --- trunk/reactos/lib/ddraw/rosddraw.h 2005-03-17 19:35:16 UTC (rev 14164) +++ trunk/reactos/lib/ddraw/rosddraw.h 2005-03-17 20:15:44 UTC (rev 14165) @@ -0,0 +1,15 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ddraw/ddraw.c + * PURPOSE: ddraw lib + * PROGRAMMER: Magnus Olsen + * UPDATE HISTORY: + */ + + + HANDLE STDCALL OsThunkDdCreateDirectDrawObject(HDC hdc); + + +HRESULT DDRAW_Create(LPGUID lpGUID, LPVOID *lplpDD, LPUNKNOWN pUnkOuter, REFIID iid, BOOL ex);

1 0

[hbirr] 14162: - Moved the deleting of the process id from PiTerminateProcess to PiDeleteProcessWorker.
by hbirr＠svn.reactos.com 17 Mar '05

17 Mar '05

- Moved the deleting of the process id from PiTerminateProcess to PiDeleteProcessWorker. - Checked the status at the end of NtOpenProcessTokenEx. Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-03-17 16:09:12 UTC (rev 14161) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-03-17 18:51:20 UTC (rev 14162) @@ -329,11 +329,6 @@ } ObDeleteHandleTable(Process); - if(Process->UniqueProcessId != NULL) - { - PsDeleteCidHandle(Process->UniqueProcessId, PsProcessType); - } - if (Process != CurrentProcess) { KeDetachProcess(); _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-03-17 16:09:12 UTC (rev 14161) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-03-17 18:51:20 UTC (rev 14162) @@ -243,15 +243,23 @@ &hToken); ObDereferenceObject(Token); - _SEH_TRY + if (NT_SUCCESS(Status)) { - *TokenHandle = hToken; + + _SEH_TRY + { + *TokenHandle = hToken; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) + { + NtClose(hToken); + } } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; } return Status; @@ -518,6 +526,11 @@ KeDetachProcess(); } + if(Process->UniqueProcessId != NULL) + { + PsDeleteCidHandle(Process->UniqueProcessId, PsProcessType); + } + MmReleaseMmInfo(Process); if (Context->IsWorkerQueue) { @@ -1371,7 +1384,6 @@ DPRINT("NtOpenProcess() = STATUS_UNSUCCESSFUL\n"); return(STATUS_UNSUCCESSFUL); } - return(STATUS_UNSUCCESSFUL); }

3 3

[hbirr] 14164: Don't close the handle if the write back does fail (in NtOpenProcessTokenEx).
by hbirr＠svn.reactos.com 17 Mar '05

17 Mar '05

Don't close the handle if the write back does fail (in NtOpenProcessTokenEx). Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-03-17 19:03:55 UTC (rev 14163) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-03-17 19:35:16 UTC (rev 14164) @@ -255,10 +255,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if (!NT_SUCCESS(Status)) - { - NtClose(hToken); - } } }

1 0

[sedwards] 14163: Dedicated to Alex.
by sedwards＠svn.reactos.com 17 Mar '05

17 Mar '05

Dedicated to Alex. I give to you "The ReactOS License Manager" No its just a dummy dialog I wrote to learn how to make Control Panel Applets. Please don't implement this. Added: trunk/reactos/lib/cpl/liccpa/ Added: trunk/reactos/lib/cpl/liccpa/Makefile Added: trunk/reactos/lib/cpl/liccpa/liccpa.c Added: trunk/reactos/lib/cpl/liccpa/liccpa.def Added: trunk/reactos/lib/cpl/liccpa/liccpa.h Added: trunk/reactos/lib/cpl/liccpa/liccpa.rc Added: trunk/reactos/lib/cpl/liccpa/resource.h Added: trunk/reactos/lib/cpl/liccpa/resources/ Added: trunk/reactos/lib/cpl/liccpa/resources/cpl_icon1.ico _____ Added: trunk/reactos/lib/cpl/liccpa/Makefile --- trunk/reactos/lib/cpl/liccpa/Makefile 2005-03-17 18:51:20 UTC (rev 14162) +++ trunk/reactos/lib/cpl/liccpa/Makefile 2005-03-17 19:03:55 UTC (rev 14163) @@ -0,0 +1,49 @@ +# $Id: Makefile 12852 2005-01-06 13:58:04Z mf $ + +PATH_TO_TOP = ../../.. + +TARGET_TYPE = dynlink + +TARGET_EXTENSION = .cpl + +TARGET_NAME = liccpa + +TARGET_INSTALLDIR = system32 + +TARGET_BASE = 0x75970000 + +TARGET_CFLAGS = \ + -D_WIN32_IE=0x0600 \ + -D_WIN32_WINNT=0x0501 \ + -D__USE_W32API \ + -I./include \ + -DUNICODE \ + -D_UNICODE \ + -D__REACTOS__ \ + -Wall \ + -fno-builtin + +TARGET_LFLAGS = -nostartfiles + +TARGET_SDKLIBS = kernel32.a user32.a comctl32.a + +TARGET_GCCLIBS = gcc + +TARGET_PCH = + +TARGET_CLEAN = + +TARGET_OBJECTS = liccpa.o + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk + +%/TAGS: + etags -o $(@D)/TAGS $((a)D)/\*.c + +etags: ./TAGS _____ Added: trunk/reactos/lib/cpl/liccpa/liccpa.c --- trunk/reactos/lib/cpl/liccpa/liccpa.c 2005-03-17 18:51:20 UTC (rev 14162) +++ trunk/reactos/lib/cpl/liccpa/liccpa.c 2005-03-17 19:03:55 UTC (rev 14163) @@ -0,0 +1,141 @@ +/* $Id: appearance.c 13406 2005-02-04 20:39:10Z weiden $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS License Manager + * FILE: lib/cpl/liccpa + * PURPOSE: License Manager GUI + * + * PROGRAMMERS: Steven Edwards (steven_ed4153(a)yahoo.com) + * + * NOTES: + * This application does almost nothing and its really good at it. + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include "resource.h" +#include "liccpa.h" + +HINSTANCE hApplet = 0; + +INT_PTR CALLBACK +DlgMainProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + TCHAR szString[256]; + HWND hPlacementCombo; + + switch(uMsg) + { + case WM_INITDIALOG: + hPlacementCombo = GetDlgItem(hwndDlg, IDC_LICENSE); + LoadString(hApplet, IDS_REACTOS, szString, sizeof(szString) / sizeof(TCHAR)); + SendMessage(hPlacementCombo, CB_INSERTSTRING, 0, (LPARAM)szString); + break; + + case WM_COMMAND: + { + switch(HIWORD(wParam)) + { + case LBN_DBLCLK: + { + switch(LOWORD(wParam)) + { + } + break; + } + default: + { + switch(LOWORD(wParam)) + { + case IDC_OK: + { + break; + } + case IDC_CANCEL: + { + EndDialog(hwndDlg, IDC_CANCEL); + break; + } + } + break; + } + } + break; + } + + + + + + + + + + + case WM_CLOSE: + { + EndDialog(hwndDlg, IDC_CANCEL); + return TRUE; + } + } + return FALSE; +} + +LONG CALLBACK +CPlApplet( + HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) +{ + switch(uMsg) + { + case CPL_INIT: + { + return TRUE; + } + case CPL_GETCOUNT: + { + return 1; + } + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = IDC_CPLICON_1; + CPlInfo->idName = IDS_CPLNAME_1; + CPlInfo->idInfo = IDS_CPLDESCRIPTION_1; + break; + } + case CPL_DBLCLK: + { + DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_PROPPAGE1), hwndCPl, DlgMainProc, WM_INITDIALOG); + break; + } + } + return FALSE; +} + + +BOOL STDCALL +DllMain( + HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) +{ + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + return TRUE; +} _____ Added: trunk/reactos/lib/cpl/liccpa/liccpa.def --- trunk/reactos/lib/cpl/liccpa/liccpa.def 2005-03-17 18:51:20 UTC (rev 14162) +++ trunk/reactos/lib/cpl/liccpa/liccpa.def 2005-03-17 19:03:55 UTC (rev 14163) @@ -0,0 +1,6 @@ +LIBRARY liccpa.cpl + +EXPORTS +CPlApplet@16 + +; EOF _____ Added: trunk/reactos/lib/cpl/liccpa/liccpa.h --- trunk/reactos/lib/cpl/liccpa/liccpa.h 2005-03-17 18:51:20 UTC (rev 14162) +++ trunk/reactos/lib/cpl/liccpa/liccpa.h 2005-03-17 19:03:55 UTC (rev 14163) @@ -0,0 +1,16 @@ +#ifndef __CPL_SAMPLE_H +#define __CPL_SAMPLE_H + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + APPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +extern HINSTANCE hApplet; + +#endif /* __CPL_SAMPLE_H */ + +/* EOF */ _____ Added: trunk/reactos/lib/cpl/liccpa/liccpa.rc --- trunk/reactos/lib/cpl/liccpa/liccpa.rc 2005-03-17 18:51:20 UTC (rev 14162) +++ trunk/reactos/lib/cpl/liccpa/liccpa.rc 2005-03-17 19:03:55 UTC (rev 14163) @@ -0,0 +1,40 @@ +/* $Id: cplsample.rc 12852 2005-01-06 13:58:04Z mf $ */ + +#include <defines.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sample Control Panel\0" +#define REACTOS_STR_INTERNAL_NAME "cplsample\0" +#define REACTOS_STR_ORIGINAL_FILENAME "cplsample.cpl\0" +#include <reactos/version.rc> + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDC_CPLICON_1 ICON "resources/cpl_icon1.ico" + +IDD_PROPPAGE1 DIALOG DISCARDABLE 20, 40, 315, 104 +STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU +CAPTION "Chose Licensing Mode" +FONT 8, "Helv" +BEGIN + CONTROL "Client Licensing Mode", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 + CONTROL "Per Device or Per User", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12 + CONTROL "Per Server. Number of concurrent connections:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "Product:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 + CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12 + CONTROL "OK", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 261, 7, 47, 14 + CONTROL "Cancel", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 45, 14 + CONTROL "Help", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 47, 14 + CONTROL "Replication...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14 + CONTROL "Add Licenses", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 + CONTROL "Remove Licenses", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 + CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "License Manager" + IDS_CPLDESCRIPTION_1 "License Manager" + IDS_REACTOS "ReactOS - FreeSoftware" +END _____ Added: trunk/reactos/lib/cpl/liccpa/resource.h --- trunk/reactos/lib/cpl/liccpa/resource.h 2005-03-17 18:51:20 UTC (rev 14162) +++ trunk/reactos/lib/cpl/liccpa/resource.h 2005-03-17 19:03:55 UTC (rev 14163) @@ -0,0 +1,18 @@ +#ifndef __CPL_RESOURCE_H +#define __CPL_RESOURCE_H + +/* ids */ + +#define IDC_CPLICON_1 1 +#define IDD_PROPPAGE1 100 +#define IDS_CPLNAME_1 1001 +#define IDS_REACTOS 1002 +#define IDS_CPLDESCRIPTION_1 2001 + +#define IDC_LICENSE 106 +#define IDC_OK 107 +#define IDC_CANCEL 108 + +#endif /* __CPL_RESOURCE_H */ + +/* EOF */ _____ Added: trunk/reactos/lib/cpl/liccpa/resources/cpl_icon1.ico (Binary files differ) Property changes on: trunk/reactos/lib/cpl/liccpa/resources/cpl_icon1.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[fireball] 14161: One more assert added, but unfortunately it isn't triggered currently...
by fireball＠svn.reactos.com 17 Mar '05

17 Mar '05

One more assert added, but unfortunately it isn't triggered currently... Modified: trunk/reactos/lib/rtl/bitmap.c _____ Modified: trunk/reactos/lib/rtl/bitmap.c --- trunk/reactos/lib/rtl/bitmap.c 2005-03-17 13:17:05 UTC (rev 14160) +++ trunk/reactos/lib/rtl/bitmap.c 2005-03-17 16:09:12 UTC (rev 14161) @@ -833,8 +833,7 @@ if (StartingIndex >= Size || NumberToSet == 0) return; - if (StartingIndex + NumberToSet > Size) - NumberToSet = Size - StartingIndex; + ASSERT(StartingIndex + NumberToSet <= Size); Ptr = (PULONG)BitMapHeader->Buffer + (StartingIndex / 32); while (NumberToSet)

1 0

[navaraf] 14160: - Don't try to kill non-existing timers.
by navaraf＠svn.reactos.com 17 Mar '05

17 Mar '05

- Don't try to kill non-existing timers. - Close dialog using EndDialog instead of DestroyWindow. Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c --- trunk/reactos/subsys/system/taskmgr/taskmgr.c 2005-03-17 13:07:28 UTC (rev 14159) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.c 2005-03-17 13:17:05 UTC (rev 14160) @@ -257,7 +257,7 @@ OnAbout(); break; case ID_FILE_EXIT: - DestroyWindow(hDlg); + EndDialog(hDlg, IDOK); break; } break; @@ -590,23 +590,12 @@ TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 2); TabCtrl_SetCurFocus/*Sel*/(hTabWnd, nActivePage); - if (TaskManagerSettings.UpdateSpeed == 0) - KillTimer(hWnd, 1); - else if (TaskManagerSettings.UpdateSpeed == 1) - { - KillTimer(hWnd, 1); + if (TaskManagerSettings.UpdateSpeed == 1) SetTimer(hWnd, 1, 1000, NULL); - } else if (TaskManagerSettings.UpdateSpeed == 2) - { - KillTimer(hWnd, 1); SetTimer(hWnd, 1, 2000, NULL); - } else if (TaskManagerSettings.UpdateSpeed == 4) - { - KillTimer(hWnd, 1); SetTimer(hWnd, 1, 4000, NULL); - } /* * Refresh the performance data

1 0

[navaraf] 14159: Now that CSRSS is getting unloaded we must unregister the primitive message queue when it's about to be destroyed.
by navaraf＠svn.reactos.com 17 Mar '05

17 Mar '05

Now that CSRSS is getting unloaded we must unregister the primitive message queue when it's about to be destroyed. Modified: trunk/reactos/subsys/win32k/include/input.h Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: trunk/reactos/subsys/win32k/include/input.h --- trunk/reactos/subsys/win32k/include/input.h 2005-03-17 02:11:04 UTC (rev 14158) +++ trunk/reactos/subsys/win32k/include/input.h 2005-03-17 13:07:28 UTC (rev 14159) @@ -8,6 +8,7 @@ NTSTATUS FASTCALL InitKeyboardImpl(VOID); PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue(VOID); +VOID W32kUnregisterPrimitiveMessageQueue(VOID); PKBDTABLES W32kGetDefaultKeyLayout(VOID); VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout); BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt); _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-03-17 02:11:04 UTC (rev 14158) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-03-17 13:07:28 UTC (rev 14159) @@ -17,13 +17,15 @@ /* registered Logon process */ PW32PROCESS LogonProcess = NULL; -void W32kRegisterPrimitiveMessageQueue() { +VOID W32kRegisterPrimitiveMessageQueue(VOID) +{ extern PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue; if( !pmPrimitiveMessageQueue ) { PW32THREAD pThread; pThread = PsGetWin32Thread(); if( pThread && pThread->MessageQueue ) { pmPrimitiveMessageQueue = pThread->MessageQueue; + IntReferenceMessageQueue(pmPrimitiveMessageQueue); DPRINT( "Installed primitive input queue.\n" ); } } else { @@ -31,8 +33,16 @@ } } -PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue() { +VOID W32kUnregisterPrimitiveMessageQueue(VOID) +{ extern PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue; + IntDereferenceMessageQueue(pmPrimitiveMessageQueue); + pmPrimitiveMessageQueue = NULL; +} + +PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue() +{ + extern PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue; return pmPrimitiveMessageQueue; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-03-17 02:11:04 UTC (rev 14158) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-03-17 13:07:28 UTC (rev 14159) @@ -1413,15 +1413,21 @@ MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue) { PDESKTOP_OBJECT desk; + /* remove the message queue from any desktops */ - if((desk = (PDESKTOP_OBJECT)InterlockedExchange((LONG*)&MessageQueue->Desktop, 0))) - { - InterlockedExchange((LONG*)&desk->ActiveMessageQueue, 0); - IntDereferenceMessageQueue(MessageQueue); - } + if ((desk = (PDESKTOP_OBJECT)InterlockedExchange((LONG*)&MessageQueue->Desktop, 0))) + { + InterlockedExchange((LONG*)&desk->ActiveMessageQueue, 0); + IntDereferenceMessageQueue(MessageQueue); + } + /* if this is the primitive message queue, deregister it */ + if (MessageQueue == W32kGetPrimitiveMessageQueue()) + W32kUnregisterPrimitiveMessageQueue(); + /* clean it up */ MsqCleanupMessageQueue(MessageQueue); + /* decrease the reference counter, if it hits zero, the queue will be freed */ IntDereferenceMessageQueue(MessageQueue); }

1 0

[gdalsnes] 14158: scanf: fix handling of %n token
by gdalsnes＠svn.reactos.com 17 Mar '05

17 Mar '05

scanf: fix handling of %n token Modified: branches/ros-branch-0_2_6/reactos/lib/ntdll/stdio/scanf.h _____ Modified: branches/ros-branch-0_2_6/reactos/lib/ntdll/stdio/scanf.h --- branches/ros-branch-0_2_6/reactos/lib/ntdll/stdio/scanf.h 2005-03-17 00:31:40 UTC (rev 14157) +++ branches/ros-branch-0_2_6/reactos/lib/ntdll/stdio/scanf.h 2005-03-17 02:11:04 UTC (rev 14158) @@ -422,13 +422,36 @@ } } break; - case 'n': { - if (!suppress) { - int*n = va_arg(ap, int*); - *n = consumed - (nch!=_EOF_); - } - } - break; + case 'n': { + if (!suppress) { + int*n = va_arg(ap, int*); + + /* + *n = consumed - (nch!=_EOF_); + + FIXME: The above is the Wine version and it doesnt work in ros + when %n is at end of input string (return one too many). + But does it fail in Wine too?? If so wine also needs fixin. + -Gunnar + */ + + *n = consumed - 1; + } + /* This is an odd one: according to the standard, + * "Execution of a %n directive does not increment the + * assignment count returned at the completion of + * execution" even if it wasn't suppressed with the + * '*' flag. The Corrigendum to the standard seems + * to contradict this (comment out the assignment to + * suppress below if you want to implement these + * alternate semantics) but the windows program I'm + * looking at expects the behavior I've coded here + * (which happens to be what glibc does as well). + */ + suppress = 1; + st = 1; + } + break; case '[': { _CHAR_ *str = suppress ? NULL : va_arg(ap, _CHAR_*); _CHAR_ *sptr = str;

1 0

[gdalsnes] 14157: scanf: fix handling of %n token
by gdalsnes＠svn.reactos.com 17 Mar '05

17 Mar '05

scanf: fix handling of %n token Modified: trunk/reactos/lib/ntdll/stdio/scanf.h _____ Modified: trunk/reactos/lib/ntdll/stdio/scanf.h --- trunk/reactos/lib/ntdll/stdio/scanf.h 2005-03-17 00:30:09 UTC (rev 14156) +++ trunk/reactos/lib/ntdll/stdio/scanf.h 2005-03-17 00:31:40 UTC (rev 14157) @@ -422,13 +422,36 @@ } } break; - case 'n': { - if (!suppress) { - int*n = va_arg(ap, int*); - *n = consumed - (nch!=_EOF_); - } - } - break; + case 'n': { + if (!suppress) { + int*n = va_arg(ap, int*); + + /* + *n = consumed - (nch!=_EOF_); + + FIXME: The above is the Wine version and it doesnt work in ros + when %n is at end of input string (return one too many). + But does it fail in Wine too?? If so wine also needs fixin. + -Gunnar + */ + + *n = consumed - 1; + } + /* This is an odd one: according to the standard, + * "Execution of a %n directive does not increment the + * assignment count returned at the completion of + * execution" even if it wasn't suppressed with the + * '*' flag. The Corrigendum to the standard seems + * to contradict this (comment out the assignment to + * suppress below if you want to implement these + * alternate semantics) but the windows program I'm + * looking at expects the behavior I've coded here + * (which happens to be what glibc does as well). + */ + suppress = 1; + st = 1; + } + break; case '[': { _CHAR_ *str = suppress ? NULL : va_arg(ap, _CHAR_*); _CHAR_ *sptr = str;

1 0

[robertk] 14156: version info 0.2.6-RC1
by robertk＠svn.reactos.com 17 Mar '05

17 Mar '05

version info 0.2.6-RC1 Modified: branches/ros-branch-0_2_6/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_6/reactos/include/reactos/version.h --- branches/ros-branch-0_2_6/reactos/include/reactos/version.h 2005-03-17 00:17:09 UTC (rev 14155) +++ branches/ros-branch-0_2_6/reactos/include/reactos/version.h 2005-03-17 00:30:09 UTC (rev 14156) @@ -18,11 +18,11 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 3 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 2 +#define KERNEL_VERSION_PATCH_LEVEL 6 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"RC1" #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs