Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[dreimer] 29851: After Geds Help to get it run, here the rest you need :-) Thx to Ged.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Oct 24 15:28:18 2007 New Revision: 29851 URL: http://svn.reactos.org/svn/reactos?rev=29851&view=rev Log: After Geds Help to get it run, here the rest you need :-) Thx to Ged. Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE-Windows/Tools/config/resources.h Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Wed Oct 24 15:28:18 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 242 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" @@ -11,16 +11,22 @@ LTEXT "Schriftfarbe", 0x0, 10, 60, 60, 12 COMBOBOX IDC_FONT, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Beispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 10, 85, 235, 15 - CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 90, 21 - CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 60, 21 - CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21 - CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 60, 21 + CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 100, 95, 21 + CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 95, 21 + CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 95, 21 + CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 95, 21 + CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 140, 95, 21 + CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 140, 95, 21 EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP - PUSHBUTTON "Speichern", ID_OK, 63, 205, 59, 26, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 205, 59, 26, WS_TABSTOP + EDITTEXT ID_OBJDIR, 10, 196, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 196, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_OUTDIR, 10, 214, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 214, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Speichern", ID_OK, 63, 240, 59, 26, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 240, 59, 26, WS_TABSTOP END STRINGTABLE Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Wed Oct 24 15:28:18 2007 @@ -1,11 +1,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 242 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Reactos Build Environment Settings", 0x0, 10, 10, 140, 13 + LTEXT "ReactOS Build Environment Settings", 0x0, 10, 10, 140, 13 LTEXT "Background Color", 0x0, 10, 35, 60, 12 COMBOBOX IDC_BACK, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Font Color", 0x0, 10, 60, 60, 12 @@ -15,12 +15,18 @@ CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 60, 21 CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21 CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 60, 21 + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 140, 95, 21 + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 140, 95, 21 EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP - PUSHBUTTON "Save", ID_OK, 63, 205, 59, 26, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Cancel", ID_CANCEL, 133, 205, 59, 26, WS_TABSTOP + EDITTEXT ID_OBJDIR, 10, 196, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 196, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_OUTDIR, 10, 214, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 214, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Save", ID_OK, 63, 240, 59, 26, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Cancel", ID_CANCEL, 133, 240, 59, 26, WS_TABSTOP END STRINGTABLE Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Wed Oct 24 15:28:18 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 242 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Paramètre du RosBE" FONT 8, "MS Shell Dlg" @@ -15,12 +15,18 @@ CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 100, 85, 21 CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21 CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 135, 120, 90, 21 + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 140, 95, 21 + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 140, 95, 21 EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP - PUSHBUTTON "Sauvegarder", ID_OK, 63, 205, 59, 26, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Annuler", ID_CANCEL, 133, 205, 59, 26, WS_TABSTOP + EDITTEXT ID_OBJDIR, 10, 196, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 196, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_OUTDIR, 10, 214, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 214, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Sauvegarder", ID_OK, 63, 240, 59, 26, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Annuler", ID_CANCEL, 133, 240, 59, 26, WS_TABSTOP END STRINGTABLE Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Wed Oct 24 15:28:18 2007 @@ -2,7 +2,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 242 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 270 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè RosBE" FONT 8,"MS Sans Serif",0,0 @@ -17,12 +17,18 @@ CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 100, 60, 21 CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 120, 90, 21 CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 120, 60, 21 + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 140, 95, 21 + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 140, 95, 21 EDITTEXT ID_LOGDIR, 10, 160, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 160, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 178, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 178, 30, 13, WS_TABSTOP - PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 205, 59, 26, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 205, 59, 26, WS_TABSTOP + EDITTEXT ID_OBJDIR, 10, 196, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 196, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_OUTDIR, 10, 214, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 214, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 240, 59, 26, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 240, 59, 26, WS_TABSTOP END STRINGTABLE Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE-Windows/Tools/config/resources.h Wed Oct 24 15:28:18 2007 @@ -1,21 +1,27 @@ /* Controls */ -#define ID_OK 0x1 -#define ID_CANCEL 0x2 -#define ID_OPTICON 0x3 -#define ID_SAVELOGS 0x4 -#define ID_SHOWBUILDTIME 0x5 -#define ID_LOGDIR 0x6 -#define ID_BROWSE 0x7 -#define ID_MGWDIR 0x8 -#define ID_BROWSEMGW 0x9 -#define ID_DIALOG 0xa -#define ID_EXAMPLE 0xb -#define ID_USECCACHE 0xc -#define ID_STRIP 0xd -#define IDC_FONT 0xe -#define IDC_BACK 0xf +#define ID_OK 0x01 +#define ID_CANCEL 0x02 +#define ID_OPTICON 0x03 +#define ID_SAVELOGS 0x04 +#define ID_SHOWBUILDTIME 0x05 +#define ID_LOGDIR 0x06 +#define ID_BROWSE 0x07 +#define ID_MGWDIR 0x08 +#define ID_BROWSEMGW 0x09 +#define ID_DIALOG 0x0a +#define ID_EXAMPLE 0x0b +#define ID_USECCACHE 0x0c +#define ID_STRIP 0x0d +#define ID_OBJDIR 0x0e +#define ID_OUTDIR 0x0f +#define ID_BROWSEOBJ 0x10 +#define ID_BROWSEOUT 0x11 +#define ID_OTHEROBJ 0x12 +#define ID_OTHEROUT 0x13 +#define IDC_FONT 0x14 +#define IDC_BACK 0x15 /* Strings */ -#define MSG_NOGCCFOUND 0x50 -#define MSG_FILEFAILED 0x51 -#define MSG_DIREFAILED 0x52 +#define MSG_NOGCCFOUND 0x16 +#define MSG_FILEFAILED 0x17 +#define MSG_DIREFAILED 0x18

17 years, 2 months

[gedmurphy] 29850: fix some small problems EmuandCo was having, in what is very problematic code....

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Oct 24 15:20:23 2007 New Revision: 29850 URL: http://svn.reactos.org/svn/reactos?rev=29850&view=rev Log: fix some small problems EmuandCo was having, in what is very problematic code.... Modified: trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Wed Oct 24 15:20:23 2007 @@ -27,7 +27,7 @@ #define MINGWVERSION L"\\4.1.3" -typedef LPITEMIDLIST __stdcall (CALLBACK* ILCREATEFROMPATHW)(LPCWSTR path); +typedef LPITEMIDLIST (CALLBACK* ILCREATEFROMPATHW)(LPCWSTR path); // note: do not change the order - theses are the color under winxp they might differ in another OSes WCHAR *Colors[] = { L"black", L"dark blue", L"dark green", L"turquoise", L"dark red", L"purple", @@ -53,12 +53,12 @@ HANDLE hFile; FILE *pFile; - showtime = SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED; - writelog = SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED; - useccache = SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0); - strip = SendDlgItemMessage(hwnd, ID_STRIP, BM_GETCHECK, 0, 0); - foreground = SendDlgItemMessage(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); - background = SendDlgItemMessage(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); + showtime = (SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); + writelog = (SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); + useccache = (SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); + strip = (SendDlgItemMessage(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + foreground = (UINT)SendDlgItemMessage(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); + background = (UINT)SendDlgItemMessage(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); GetDlgItemText(hwnd, ID_LOGDIR, logdir, MAX_PATH); GetDlgItemText(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); @@ -83,7 +83,7 @@ wcscpy(checkmgw, mingwpath); if ((wcslen(checkmgw) + wcslen(L"\\bin\\gcc.exe")) < MAX_PATH) wcscat(checkmgw, L"\\bin\\gcc.exe"); - hFile = CreateFile(checkmgw, (INT)NULL, (INT)NULL, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFile(checkmgw, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { LoadString(hInstance, MSG_NOGCCFOUND, msgerror, 256); @@ -117,13 +117,15 @@ INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - WCHAR Path[MAX_PATH]; static HICON hIcon; switch (Msg) { case WM_INITDIALOG: { + WCHAR Path[MAX_PATH]; + UINT i; + hIcon = LoadImage( hInstance, MAKEINTRESOURCE(ID_OPTICON), IMAGE_ICON, @@ -133,7 +135,7 @@ if(hIcon) SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); - for(unsigned int i = 0; i < sizeof(Colors) / sizeof(char *); i++) + for(i = 0; i < sizeof(Colors) / sizeof(char *); i++) { SendDlgItemMessage(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); SendDlgItemMessage(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); @@ -177,9 +179,12 @@ BROWSEINFO PathInfo; LPITEMIDLIST pidl; INT Control = ID_LOGDIR; + WCHAR path[MAX_PATH]; + ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); PathInfo.hwndOwner = Dlg; PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; + if (wParam == ID_BROWSEMGW) { HINSTANCE hDLL; @@ -192,16 +197,21 @@ ILCreateFromPathW = (ILCREATEFROMPATHW)GetProcAddress(hDLL, "ILCreateFromPathW"); if (ILCreateFromPathW) { - GetDlgItemText(Dlg, ID_MGWDIR, Path, MAX_PATH); - PathInfo.pidlRoot = ILCreateFromPathW(Path); + GetDlgItemText(Dlg, ID_MGWDIR, path, MAX_PATH); + PathInfo.pidlRoot = ILCreateFromPathW(path); } FreeLibrary(hDLL); } } + pidl = SHBrowseForFolder(&PathInfo); - if (!pidl && !SHGetPathFromIDList(pidl, Path)) - break; - SetDlgItemText(Dlg, Control, Path); + if (pidl) + { + if (SHGetPathFromIDList(pidl, path)) + { + SetDlgItemText(Dlg, Control, path); + } + } } case ID_STRIP: case ID_USECCACHE: @@ -237,7 +247,8 @@ case WM_DESTROY: { - DestroyIcon(hIcon); + if (hIcon) + DestroyIcon(hIcon); } case WM_CLOSE:

17 years, 2 months

[jimtabor] 29849: - Implement NtUserGetComboBoxInfo and use it in GetComboBoxInfo. - Use Shared locks.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 24 15:19:30 2007 New Revision: 29849 URL: http://svn.reactos.org/svn/reactos?rev=29849&view=rev Log: - Implement NtUserGetComboBoxInfo and use it in GetComboBoxInfo. - Use Shared locks. Modified: trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Wed Oct 24 15:19:30 2007 @@ -2375,5 +2375,9 @@ PCOMBOBOXINFO pcbi /* [in/out] combo box information */) { TRACE("(%p, %p)\n", hwndCombo, pcbi); +#ifndef __REACTOS__ return SendMessageW(hwndCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi); -} +#else + return NtUserGetComboBoxInfo(hwndCombo, pcbi); +#endif +} Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Wed Oct 24 15:19:30 2007 @@ -272,17 +272,6 @@ return 0; } -BOOL -STDCALL -NtUserGetComboBoxInfo( - HWND hWnd, - PCOMBOBOXINFO pcbi) -{ - UNIMPLEMENTED - - return 0; -} - DWORD STDCALL NtUserGetControlBrush( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Wed Oct 24 15:19:30 2007 @@ -2809,6 +2809,48 @@ } +BOOL +STDCALL +NtUserGetComboBoxInfo( + HWND hWnd, + PCOMBOBOXINFO pcbi) +{ + PWINDOW_OBJECT Wnd; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserGetComboBoxInfo\n"); + UserEnterShared(); + + if (!(Wnd = UserGetWindowObject(hWnd))) + { + RETURN( FALSE ); + } + _SEH_TRY + { + if(pcbi) + { + ProbeForWrite(pcbi, + sizeof(COMBOBOXINFO), + 1); + } + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + _SEH_YIELD(RETURN(FALSE)); + } + _SEH_END; + + // Pass the user pointer, it was already probed. + RETURN( (BOOL) co_IntSendMessage( Wnd->hSelf, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi)); + +CLEANUP: + DPRINT("Leave NtUserGetComboBoxInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + + /* * @implemented */ @@ -2882,7 +2924,7 @@ DECLARE_RETURN(DWORD); DPRINT("Enter NtUserGetListBoxInfo\n"); - UserEnterExclusive(); + UserEnterShared(); if (!(Wnd = UserGetWindowObject(hWnd))) {

17 years, 2 months

[greatlrd] 29848: add complete startup process code for dxg.sys

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Oct 24 15:05:44 2007 New Revision: 29848 URL: http://svn.reactos.org/svn/reactos?rev=29848&view=rev Log: add complete startup process code for dxg.sys Added: branches/reactx/reactos/drivers/directx/dxg/eng.c (with props) branches/reactx/reactos/drivers/directx/dxg/tags.h (with props) Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild branches/reactx/reactos/drivers/directx/dxg/dxg_int.h branches/reactx/reactos/drivers/directx/dxg/main.c Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild Wed Oct 24 15:05:44 2007 @@ -6,7 +6,9 @@ <include base="dxg">.</include> <define name="__USE_W32API" /> <library>dxgthk</library> + <library>ntoskrnl</library> <file>main.c</file> + <file>eng.c</file> <file>historic.c</file> <file>dxg.rc</file> </module> Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_int.h Wed Oct 24 15:05:44 2007 @@ -27,6 +27,8 @@ #include <reactos/drivers/directx/dxg.h> #include <reactos/drivers/directx/dxeng.h> +#include "tags.h" + /* exported functions */ NTSTATUS DriverEntry(IN PVOID Context1, IN PVOID Context2); @@ -39,5 +41,6 @@ DWORD STDCALL DxDdIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize); /* Internel functions */ +BOOL DdHmgCreate(); BOOL DdHmgDestroy(); Added: branches/reactx/reactos/drivers/directx/dxg/eng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/eng.c (added) +++ branches/reactx/reactos/drivers/directx/dxg/eng.c Wed Oct 24 15:05:44 2007 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver for dxg implementation + * FILE: drivers/directx/dxg/main.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 15/10-2007 Magnus Olsen + */ + + + + + Propchange: branches/reactx/reactos/drivers/directx/dxg/eng.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxg/main.c Wed Oct 24 15:05:44 2007 @@ -20,6 +20,11 @@ HSEMAPHORE ghsemDummyPage = NULL; VOID *gpDummyPage = NULL; PEPROCESS gpepSession = NULL; +PLARGE_INTEGER gpLockShortDelay = NULL; +HANDLE ghFreeDdHmgr = 0; +VOID *gpentDdHmgr = NULL; +VOID *gpentDdHmgrLast = NULL; + PDRVFN gpEngFuncs; const ULONG gcDxgFuncs = DXG_INDEX_DxDdIoctl + 1; @@ -92,7 +97,6 @@ /* Note 12/1-2004 : Why is this set to 0x618 */ *DirectDrawContext = 0x618; -#if 0 if (DdHmgCreate()) { ghsemDummyPage = EngCreateSemaphore(); @@ -103,7 +107,6 @@ return STATUS_SUCCESS; } } -#endif DdHmgDestroy(); @@ -119,16 +122,13 @@ NTSTATUS DxDdCleanupDxGraphics() { - DdHmgDestroy(); if (!ghsemDummyPage) { if (!gpDummyPage) { -#if 0 ExFreePoolWithTag(gpDummyPage,0); -#endif gpDummyPage = NULL; gcDummyPageRefCnt = 0; } @@ -143,16 +143,15 @@ { gcMaxDdHmgr = 0; gcSizeDdHmgr = 0; -#if 0 ghFreeDdHmgr = 0; - gpentDdHmgrLast = 0; + gpentDdHmgrLast = NULL; if (gpentDdHmgr) { EngFreeMem(gpentDdHmgr); - gpentDdHmgr = 0; + gpentDdHmgr = NULL; } -#endif + if (ghsemHmgr) { EngDeleteSemaphore(ghsemHmgr); @@ -162,3 +161,35 @@ return TRUE; } + +BOOL +DdHmgCreate() +{ + gpentDdHmgr = EngAllocMem(FL_ZERO_MEMORY, gcSizeDdHmgr, TAG_THDD); + ghFreeDdHmgr = 0; + gcMaxDdHmgr = 1; + + if (gpentDdHmgr) + { + ghsemHmgr = EngCreateSemaphore(); + + if (ghsemHmgr) + { + gpLockShortDelay = EngAllocMem(FL_ZERO_MEMORY | FL_NONPAGED_MEMORY, sizeof(LARGE_INTEGER), TAG_GINI); + + if (gpLockShortDelay) + { + gpLockShortDelay->QuadPart = ((LONGLONG)-100000); + return TRUE; + } + + EngDeleteSemaphore(ghsemHmgr); + ghsemHmgr = NULL; + } + + EngFreeMem(gpentDdHmgr); + gpentDdHmgr = NULL; + } + + return FALSE; +} Added: branches/reactx/reactos/drivers/directx/dxg/tags.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/tags.h (added) +++ branches/reactx/reactos/drivers/directx/dxg/tags.h Wed Oct 24 15:05:44 2007 @@ -1,0 +1,8 @@ + + + +#define TAG_THDD TAG('t', 'h', 'd', 'd') +#define TAG_GINI TAG('G', 'i', 'n', 'i') + + + Propchange: branches/reactx/reactos/drivers/directx/dxg/tags.h ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 2 months

[greatlrd] 29847: Add documentations for EngDxIoctl, NtGdiDxgGenericThunk optimize for EngDxIoctl, NtGdiDxgGenericThunk implement DxDxgGenericThunk, DxDdIoctl for they are outdated, they are left for compatible issue.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Oct 24 12:13:39 2007 New Revision: 29847 URL: http://svn.reactos.org/svn/reactos?rev=29847&view=rev Log: Add documentations for EngDxIoctl, NtGdiDxgGenericThunk optimize for EngDxIoctl, NtGdiDxgGenericThunk implement DxDxgGenericThunk, DxDdIoctl for they are outdated, they are left for compatible issue. Added: branches/reactx/reactos/drivers/directx/dxg/historic.c (with props) Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h branches/reactx/reactos/drivers/directx/dxg/dxg_int.h branches/reactx/reactos/include/reactos/drivers/directx/dxg.h branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild Wed Oct 24 12:13:39 2007 @@ -7,5 +7,6 @@ <define name="__USE_W32API" /> <library>dxgthk</library> <file>main.c</file> + <file>historic.c</file> <file>dxg.rc</file> </module> Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h Wed Oct 24 12:13:39 2007 @@ -3,95 +3,96 @@ DRVFN gaDxgFuncs [] = { {DXG_INDEX_DxDxgGenericThunk, (PFN)DxDxgGenericThunk}, - {DXG_INDEX_DxD3dContextCreate, (PFN)DxD3dContextCreate}, - {DXG_INDEX_DxD3dContextDestroy, (PFN)DxD3dContextDestroy}, - {DXG_INDEX_DxD3dContextDestroyAll, (PFN)DxD3dContextDestroyAll}, - {DXG_INDEX_DxD3dValidateTextureStageState, (PFN)DxD3dValidateTextureStageState}, - {DXG_INDEX_DxD3dDrawPrimitives2, (PFN)DxD3dDrawPrimitives2}, - {DXG_INDEX_DxDdGetDriverState, (PFN)DxDdGetDriverState}, - {DXG_INDEX_DxDdAddAttachedSurface, (PFN)DxDdAddAttachedSurface}, - {DXG_INDEX_DxDdAlphaBlt, (PFN)DxDdAlphaBlt}, - {DXG_INDEX_DxDdAttachSurface, (PFN)DxDdAttachSurface}, - {DXG_INDEX_DxDdBeginMoCompFrame, (PFN)DxDdBeginMoCompFrame}, - {DXG_INDEX_DxDdBlt, (PFN)DxDdBlt}, - {DXG_INDEX_DxDdCanCreateSurface, (PFN)DxDdCanCreateSurface}, - {DXG_INDEX_DxDdCanCreateD3DBuffer, (PFN)DxDdCanCreateD3DBuffer}, - {DXG_INDEX_DxDdColorControl, (PFN)DxDdColorControl}, - {DXG_INDEX_DxDdCreateDirectDrawObject, (PFN)DxDdCreateDirectDrawObject}, - {DXG_INDEX_DxDdCreateD3DBuffer, (PFN)DxDdCreateD3DBuffer}, - {DXG_INDEX_DxDdCreateD3DBuffer2, (PFN)DxDdCreateD3DBuffer}, - {DXG_INDEX_DxDdCreateMoComp, (PFN)DxDdCreateMoComp}, - {DXG_INDEX_DxDdCreateSurfaceObject, (PFN)DxDdCreateSurfaceObject}, - {DXG_INDEX_DxDdDeleteDirectDrawObject, (PFN)DxDdDeleteDirectDrawObject}, - {DXG_INDEX_DxDdDeleteSurfaceObject, (PFN)DxDdDeleteSurfaceObject}, - {DXG_INDEX_DxDdDestroyMoComp, (PFN)DxDdDestroyMoComp}, - {DXG_INDEX_DxDdDestroySurface, (PFN)DxDdDestroySurface}, - {DXG_INDEX_DxDdDestroyD3DBuffer, (PFN)DxDdDestroyD3DBuffer}, - {DXG_INDEX_DxDdEndMoCompFrame, (PFN)DxDdEndMoCompFrame}, - {DXG_INDEX_DxDdFlip, (PFN)DxDdFlip}, - {DXG_INDEX_DxDdFlipToGDISurface, (PFN)DxDdFlipToGDISurface}, - {DXG_INDEX_DxDdGetAvailDriverMemory, (PFN)DxDdGetAvailDriverMemory}, - {DXG_INDEX_DxDdGetBltStatus, (PFN)DxDdGetBltStatus}, - {DXG_INDEX_DxDdGetDC, (PFN)DxDdGetDC}, - {DXG_INDEX_DxDdGetDriverInfo, (PFN)DxDdGetDriverInfo}, - {DXG_INDEX_DxDdGetDxHandle, (PFN)DxDdGetDxHandle}, - {DXG_INDEX_DxDdGetFlipStatus, (PFN)}, - {DXG_INDEX_DxDdGetInternalMoCompInfo, (PFN)}, - {DXG_INDEX_DxDdGetMoCompBuffInfo, (PFN)}, - {DXG_INDEX_DxDdGetMoCompGuids, (PFN)}, - {DXG_INDEX_DxDdGetMoCompFormats, (PFN)}, - {DXG_INDEX_DxDdGetScanLine, (PFN)}, - {DXG_INDEX_DxDdLock, (PFN)}, - {DXG_INDEX_DxDdLockD3D, (PFN)}, - {DXG_INDEX_DxDdQueryDirectDrawObject, (PFN)}, - {DXG_INDEX_DxDdQueryMoCompStatus, (PFN)}, - {DXG_INDEX_DxDdReenableDirectDrawObject, (PFN)}, - {DXG_INDEX_DxDdReleaseDC, (PFN)}, - {DXG_INDEX_DxDdRenderMoComp, (PFN)}, - {DXG_INDEX_DxDdResetVisrgn, (PFN)}, - {DXG_INDEX_DxDdSetColorKey, (PFN)}, - {DXG_INDEX_DxDdSetExclusiveMode, (PFN)}, - {DXG_INDEX_DxDdSetGammaRamp, (PFN)}, - {DXG_INDEX_DxDdCreateSurfaceEx, (PFN)}, - {DXG_INDEX_DxDdSetOverlayPosition, (PFN)}, - {DXG_INDEX_DxDdUnattachSurface, (PFN)}, - {DXG_INDEX_DxDdUnlockD3D, (PFN)DxDdUnlockD3D}, - {DXG_INDEX_DxDdUnlockD3D2, (PFN)DxDdUnlockD3D}, - {DXG_INDEX_DxDdUpdateOverlay, (PFN)DxDdUpdateOverlay}, - {DXG_INDEX_DxDdWaitForVerticalBlank, (PFN)DxDdWaitForVerticalBlank}, - {DXG_INDEX_DxDvpCanCreateVideoPort, (PFN)DxDvpCanCreateVideoPort}, - {DXG_INDEX_DxDvpColorControl, (PFN)DxDvpColorControl}, - {DXG_INDEX_DxDvpCreateVideoPort, (PFN)DxDvpCreateVideoPort}, - {DXG_INDEX_DxDvpDestroyVideoPort, (PFN)DxDvpDestroyVideoPort}, - {DXG_INDEX_DxDvpFlipVideoPort, (PFN)DxDvpFlipVideoPort}, - {DXG_INDEX_DxDvpGetVideoPortBandwidth, (PFN)DxDvpGetVideoPortBandwidth}, - {DXG_INDEX_DxDvpGetVideoPortField, (PFN)DxDvpGetVideoPortField}, - {DXG_INDEX_DxDvpGetVideoPortFlipStatus, (PFN)DxDvpGetVideoPortFlipStatus}, - {DXG_INDEX_DxDvpGetVideoPortInputFormats, (PFN)DxDvpGetVideoPortInputFormats}, - {DXG_INDEX_DxDvpGetVideoPortLine, (PFN)DxDvpGetVideoPortLine}, - {DXG_INDEX_DxDvpGetVideoPortOutputFormats, (PFN)DxDvpGetVideoPortOutputFormats}, - {DXG_INDEX_DxDvpGetVideoPortConnectInfo, (PFN)DxDvpGetVideoPortConnectInfo}, - {DXG_INDEX_DxDvpGetVideoSignalStatus, (PFN)DxDvpGetVideoSignalStatus}, - {DXG_INDEX_DxDvpUpdateVideoPort, (PFN)DxDvpUpdateVideoPort}, - {DXG_INDEX_DxDvpWaitForVideoPortSync, (PFN)DxDvpWaitForVideoPortSync}, - {DXG_INDEX_DxDvpAcquireNotification, (PFN)DxDvpAcquireNotification}, - {DXG_INDEX_DxDvpReleaseNotification, (PFN)DxDvpReleaseNotification}, - {DXG_INDEX_DxDdHeapVidMemAllocAligned, (PFN)DxDdHeapVidMemAllocAligned}, - {DXG_INDEX_DxDdHeapVidMemFree, (PFN)DxDdHeapVidMemFree}, - {DXG_INDEX_DxDdEnableDirectDraw, (PFN)DxDdEnableDirectDraw}, - {DXG_INDEX_DxDdDisableDirectDraw, (PFN)DxDdDisableDirectDraw}, - {DXG_INDEX_DxDdSuspendDirectDraw, (PFN)DxDdSuspendDirectDraw}, - {DXG_INDEX_DxDdResumeDirectDraw, (PFN)DxDdResumeDirectDraw}, - {DXG_INDEX_DxDdDynamicModeChange, (PFN)DxDdDynamicModeChange}, - {DXG_INDEX_DxDdCloseProcess, (PFN)DxDdCloseProcess}, - {DXG_INDEX_DxDdGetDirectDrawBound, (PFN)DxDdGetDirectDrawBound}, - {DXG_INDEX_DxDdEnableDirectDrawRedirection, (PFN)DxDdEnableDirectDrawRedirection}, - {DXG_INDEX_DxDdAllocPrivateUserMem, (PFN)DxDdAllocPrivateUserMem}, - {DXG_INDEX_DxDdFreePrivateUserMem, (PFN)DxDdFreePrivateUserMem}, - {DXG_INDEX_DxDdLockDirectDrawSurface, (PFN)DxDdLockDirectDrawSurface}, - {DXG_INDEX_DxDdUnlockDirectDrawSurface, (PFN)DxDdUnlockDirectDrawSurface}, - {DXG_INDEX_DxDdSetAccelLevel, (PFN)DxDdSetAccelLevel}, - {DXG_INDEX_DxDdGetSurfaceLock, (PFN)DxDdGetSurfaceLock}, - {DXG_INDEX_DxDdEnumLockedSurfaceRect, (PFN)DxDdEnumLockedSurfaceRect}, + //{DXG_INDEX_DxD3dContextCreate, (PFN)DxD3dContextCreate}, + //{DXG_INDEX_DxD3dContextDestroy, (PFN)DxD3dContextDestroy}, + //{DXG_INDEX_DxD3dContextDestroyAll, (PFN)DxD3dContextDestroyAll}, + //{DXG_INDEX_DxD3dValidateTextureStageState, (PFN)DxD3dValidateTextureStageState}, + //{DXG_INDEX_DxD3dDrawPrimitives2, (PFN)DxD3dDrawPrimitives2}, + //{DXG_INDEX_DxDdGetDriverState, (PFN)DxDdGetDriverState}, + //{DXG_INDEX_DxDdAddAttachedSurface, (PFN)DxDdAddAttachedSurface}, + //{DXG_INDEX_DxDdAlphaBlt, (PFN)DxDdAlphaBlt}, + //{DXG_INDEX_DxDdAttachSurface, (PFN)DxDdAttachSurface}, + //{DXG_INDEX_DxDdBeginMoCompFrame, (PFN)DxDdBeginMoCompFrame}, + //{DXG_INDEX_DxDdBlt, (PFN)DxDdBlt}, + //{DXG_INDEX_DxDdCanCreateSurface, (PFN)DxDdCanCreateSurface}, + //{DXG_INDEX_DxDdCanCreateD3DBuffer, (PFN)DxDdCanCreateD3DBuffer}, + //{DXG_INDEX_DxDdColorControl, (PFN)DxDdColorControl}, + //{DXG_INDEX_DxDdCreateDirectDrawObject, (PFN)DxDdCreateDirectDrawObject}, + //{DXG_INDEX_DxDdCreateSurface, (PFN)DxDdCreateD3DBuffer}, + //{DXG_INDEX_DxDdCreateD3DBuffer, (PFN)DxDdCreateD3DBuffer}, + //{DXG_INDEX_DxDdCreateMoComp, (PFN)DxDdCreateMoComp}, + //{DXG_INDEX_DxDdCreateSurfaceObject, (PFN)DxDdCreateSurfaceObject}, + //{DXG_INDEX_DxDdDeleteDirectDrawObject, (PFN)DxDdDeleteDirectDrawObject}, + //{DXG_INDEX_DxDdDeleteSurfaceObject, (PFN)DxDdDeleteSurfaceObject}, + //{DXG_INDEX_DxDdDestroyMoComp, (PFN)DxDdDestroyMoComp}, + //{DXG_INDEX_DxDdDestroySurface, (PFN)DxDdDestroySurface}, + //{DXG_INDEX_DxDdDestroyD3DBuffer, (PFN)DxDdDestroyD3DBuffer}, + //{DXG_INDEX_DxDdEndMoCompFrame, (PFN)DxDdEndMoCompFrame}, + //{DXG_INDEX_DxDdFlip, (PFN)DxDdFlip}, + //{DXG_INDEX_DxDdFlipToGDISurface, (PFN)DxDdFlipToGDISurface}, + //{DXG_INDEX_DxDdGetAvailDriverMemory, (PFN)DxDdGetAvailDriverMemory}, + //{DXG_INDEX_DxDdGetBltStatus, (PFN)DxDdGetBltStatus}, + //{DXG_INDEX_DxDdGetDC, (PFN)DxDdGetDC}, + //{DXG_INDEX_DxDdGetDriverInfo, (PFN)DxDdGetDriverInfo}, + //{DXG_INDEX_DxDdGetDxHandle, (PFN)DxDdGetDxHandle}, + //{DXG_INDEX_DxDdGetFlipStatus, (PFN)DxDdGetFlipStatus}, + //{DXG_INDEX_DxDdGetInternalMoCompInfo, (PFN)DxDdGetInternalMoCompInfo}, + //{DXG_INDEX_DxDdGetMoCompBuffInfo, (PFN)DxDdGetMoCompBuffInfo}, + //{DXG_INDEX_DxDdGetMoCompGuids, (PFN)DxDdGetMoCompGuids}, + //{DXG_INDEX_DxDdGetMoCompFormats, (PFN)DxDdGetMoCompFormats}, + //{DXG_INDEX_DxDdGetScanLine, (PFN)DxDdGetScanLine}, + //{DXG_INDEX_DxDdLock, (PFN)DxDdLock}, + //{DXG_INDEX_DxDdLockD3D, (PFN)DxDdLockD3D}, + //{DXG_INDEX_DxDdQueryDirectDrawObject, (PFN)DxDdQueryDirectDrawObject}, + //{DXG_INDEX_DxDdQueryMoCompStatus, (PFN)DxDdQueryMoCompStatus}, + //{DXG_INDEX_DxDdReenableDirectDrawObject, (PFN)DxDdReenableDirectDrawObject}, + //{DXG_INDEX_DxDdReleaseDC, (PFN)DxDdReleaseDC}, + //{DXG_INDEX_DxDdRenderMoComp, (PFN)DxDdRenderMoComp}, + //{DXG_INDEX_DxDdResetVisrgn, (PFN)DxDdResetVisrgn}, + //{DXG_INDEX_DxDdSetColorKey, (PFN)DxDdSetColorKey}, + //{DXG_INDEX_DxDdSetExclusiveMode, (PFN)DxDdSetExclusiveMode}, + //{DXG_INDEX_DxDdSetGammaRamp, (PFN)DxDdSetGammaRamp}, + //{DXG_INDEX_DxDdCreateSurfaceEx, (PFN)DxDdCreateSurfaceEx}, + //{DXG_INDEX_DxDdSetOverlayPosition, (PFN)DxDdSetOverlayPosition}, + //{DXG_INDEX_DxDdUnattachSurface, (PFN)DxDdUnattachSurface}, + //{DXG_INDEX_DxDdUnlock, (PFN)DxDdUnlock}, + //{DXG_INDEX_DxDdUnlockD3D2, (PFN)DxDdUnlockD3D}, + //{DXG_INDEX_DxDdUpdateOverlay, (PFN)DxDdUpdateOverlay}, + //{DXG_INDEX_DxDdWaitForVerticalBlank, (PFN)DxDdWaitForVerticalBlank}, + //{DXG_INDEX_DxDvpCanCreateVideoPort, (PFN)DxDvpCanCreateVideoPort}, + //{DXG_INDEX_DxDvpColorControl, (PFN)DxDvpColorControl}, + //{DXG_INDEX_DxDvpCreateVideoPort, (PFN)DxDvpCreateVideoPort}, + //{DXG_INDEX_DxDvpDestroyVideoPort, (PFN)DxDvpDestroyVideoPort}, + //{DXG_INDEX_DxDvpFlipVideoPort, (PFN)DxDvpFlipVideoPort}, + //{DXG_INDEX_DxDvpGetVideoPortBandwidth, (PFN)DxDvpGetVideoPortBandwidth}, + //{DXG_INDEX_DxDvpGetVideoPortField, (PFN)DxDvpGetVideoPortField}, + //{DXG_INDEX_DxDvpGetVideoPortFlipStatus, (PFN)DxDvpGetVideoPortFlipStatus}, + //{DXG_INDEX_DxDvpGetVideoPortInputFormats, (PFN)DxDvpGetVideoPortInputFormats}, + //{DXG_INDEX_DxDvpGetVideoPortLine, (PFN)DxDvpGetVideoPortLine}, + //{DXG_INDEX_DxDvpGetVideoPortOutputFormats, (PFN)DxDvpGetVideoPortOutputFormats}, + //{DXG_INDEX_DxDvpGetVideoPortConnectInfo, (PFN)DxDvpGetVideoPortConnectInfo}, + //{DXG_INDEX_DxDvpGetVideoSignalStatus, (PFN)DxDvpGetVideoSignalStatus}, + //{DXG_INDEX_DxDvpUpdateVideoPort, (PFN)DxDvpUpdateVideoPort}, + //{DXG_INDEX_DxDvpWaitForVideoPortSync, (PFN)DxDvpWaitForVideoPortSync}, + //{DXG_INDEX_DxDvpAcquireNotification, (PFN)DxDvpAcquireNotification}, + //{DXG_INDEX_DxDvpReleaseNotification, (PFN)DxDvpReleaseNotification}, + //{DXG_INDEX_DxDdHeapVidMemAllocAligned, (PFN)DxDdHeapVidMemAllocAligned}, + //{DXG_INDEX_DxDdHeapVidMemFree, (PFN)DxDdHeapVidMemFree}, + //{DXG_INDEX_DxDdEnableDirectDraw, (PFN)DxDdEnableDirectDraw}, + //{DXG_INDEX_DxDdDisableDirectDraw, (PFN)DxDdDisableDirectDraw}, + //{DXG_INDEX_DxDdSuspendDirectDraw, (PFN)DxDdSuspendDirectDraw}, + //{DXG_INDEX_DxDdResumeDirectDraw, (PFN)DxDdResumeDirectDraw}, + //{DXG_INDEX_DxDdDynamicModeChange, (PFN)DxDdDynamicModeChange}, + //{DXG_INDEX_DxDdCloseProcess, (PFN)DxDdCloseProcess}, + //{DXG_INDEX_DxDdGetDirectDrawBound, (PFN)DxDdGetDirectDrawBound}, + //{DXG_INDEX_DxDdEnableDirectDrawRedirection, (PFN)DxDdEnableDirectDrawRedirection}, + //{DXG_INDEX_DxDdAllocPrivateUserMem, (PFN)DxDdAllocPrivateUserMem}, + //{DXG_INDEX_DxDdFreePrivateUserMem, (PFN)DxDdFreePrivateUserMem}, + //{DXG_INDEX_DxDdLockDirectDrawSurface, (PFN)DxDdLockDirectDrawSurface}, + //{DXG_INDEX_DxDdUnlockDirectDrawSurface, (PFN)DxDdUnlockDirectDrawSurface}, + //{DXG_INDEX_DxDdSetAccelLevel, (PFN)DxDdSetAccelLevel}, + //{DXG_INDEX_DxDdGetSurfaceLock, (PFN)DxDdGetSurfaceLock}, + //{DXG_INDEX_DxDdEnumLockedSurfaceRect, (PFN)DxDdEnumLockedSurfaceRect}, {DXG_INDEX_DxDdIoctl, (PFN)DxDdIoctl} + }; Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_int.h Wed Oct 24 12:13:39 2007 @@ -23,7 +23,7 @@ #include <reactos/win32k/ntgdityp.h> #include <reactos/win32k/ntgdihdl.h> -#include <reactos/win32k/win32kdc.h> + #include <reactos/drivers/directx/dxg.h> #include <reactos/drivers/directx/dxeng.h> @@ -35,6 +35,8 @@ /* Driver list export functions */ +DWORD STDCALL DxDxgGenericThunk(ULONG_PTR ulIndex, ULONG_PTR ulHandle, SIZE_T *pdwSizeOfPtr1, PVOID pvPtr1, SIZE_T *pdwSizeOfPtr2, PVOID pvPtr2); +DWORD STDCALL DxDdIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize); /* Internel functions */ BOOL DdHmgDestroy(); Added: branches/reactx/reactos/drivers/directx/dxg/historic.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/historic.c (added) +++ branches/reactx/reactos/drivers/directx/dxg/historic.c Wed Oct 24 12:13:39 2007 @@ -1,0 +1,88 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver for dxg implementation + * FILE: drivers/directx/dxg/main.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 15/10-2007 Magnus Olsen + */ + +#include <dxg_int.h> + +/*++ +* @name DxDxgGenericThunk +* @implemented +* +* The function DxDxgGenericThunk redirect dx call to other thing. +* +* @param ULONG_PTR ulIndex +* The functions we want redirct +* +* @param ULONG_PTR ulHandle +* Unknown +* +* @param SIZE_T *pdwSizeOfPtr1 +* Unknown +* +* @param PVOID pvPtr1 +* Unknown +* +* @param SIZE_T *pdwSizeOfPtr2 +* Unknown +* +* @param PVOID pvPtr2 +* Unknown +* +* @return +* always return DDHAL_DRIVER_NOTHANDLED +* +* @remarks. +* This api are not longer use in Windows NT 2000/XP/2003 +* +*--*/ +DWORD +STDCALL +DxDxgGenericThunk(ULONG_PTR ulIndex, + ULONG_PTR ulHandle, + SIZE_T *pdwSizeOfPtr1, + PVOID pvPtr1, + SIZE_T *pdwSizeOfPtr2, + PVOID pvPtr2) +{ + return DDHAL_DRIVER_NOTHANDLED; +} + + +/*++ +* @name DxDdIoctl +* @implemented +* +* The function DxDdIoctl is the ioctl call to diffent dx functions +* +* @param ULONG ulIoctl +* The ioctl code that we want call to +* +* @param PVOID pBuffer +* Our in or out buffer with data to the ioctl code we are using +* +* @param ULONG ulBufferSize +* The buffer size in bytes +* +* @return +* always return DDERR_UNSUPPORTED +* +* @remarks. +* This api are not longer use in Windows NT 2000/XP/2003 +* +*--*/ +DWORD +STDCALL +DxDdIoctl(ULONG ulIoctl, + PVOID pBuffer, + ULONG ulBufferSize) +{ + return DDERR_UNSUPPORTED; +} + Propchange: branches/reactx/reactos/drivers/directx/dxg/historic.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Wed Oct 24 12:13:39 2007 @@ -116,3 +116,102 @@ #define DXG_INDEX_DxDdGetSurfaceLock 0x59 #define DXG_INDEX_DxDdEnumLockedSurfaceRect 0x5A + +/***********************************************************************************/ +/* Driver Functions Protypes */ +/***********************************************************************************/ +typedef DWORD (NTAPI *PGD_DXDXGGENERICTHUNK)(ULONG_PTR, ULONG_PTR, SIZE_T *, PVOID, SIZE_T *, PVOID); +//typedef x (NTAPI *PGD_DxD3dContextCreate)( +//typedef x (NTAPI *PGD_DxD3dContextDestroy)( +//typedef x (NTAPI *PGD_DxD3dContextDestroyAll)( +//typedef x (NTAPI *PGD_DxD3dValidateTextureStageState)( +//typedef x (NTAPI *PGD_DxD3dDrawPrimitives2)( +//typedef x (NTAPI *PGD_DxDdGetDriverState)( +//typedef x (NTAPI *PGD_DxDdAddAttachedSurface)( +//typedef x (NTAPI *PGD_DxDdAlphaBlt)( +//typedef x (NTAPI *PGD_DxDdAttachSurface)( +//typedef x (NTAPI *PGD_DxDdBeginMoCompFrame)( +//typedef x (NTAPI *PGD_DxDdBlt)( +//typedef x (NTAPI *PGD_DxDdCanCreateSurface)( +//typedef x (NTAPI *PGD_DxDdCanCreateD3DBuffer)( +//typedef x (NTAPI *PGD_DxDdColorControl)( +//typedef x (NTAPI *PGD_DxDdCreateDirectDrawObject)( +//typedef x (NTAPI *PGD_DxDdCreateSurface)( +//typedef x (NTAPI *PGD_DxDdCreateD3DBuffer)( +//typedef x (NTAPI *PGD_DxDdCreateMoComp)( +//typedef x (NTAPI *PGD_DxDdCreateSurfaceObject)( +//typedef x (NTAPI *PGD_DxDdDeleteDirectDrawObject)( +//typedef x (NTAPI *PGD_DxDdDeleteSurfaceObject)( +//typedef x (NTAPI *PGD_DxDdDestroyMoComp)( +//typedef x (NTAPI *PGD_DxDdDestroySurface)( +//typedef x (NTAPI *PGD_DxDdDestroyD3DBuffer)( +//typedef x (NTAPI *PGD_DxDdEndMoCompFrame)( +//typedef x (NTAPI *PGD_DxDdFlip)( +//typedef x (NTAPI *PGD_DxDdFlipToGDISurface)( +//typedef x (NTAPI *PGD_DxDdGetAvailDriverMemory)( +//typedef x (NTAPI *PGD_DxDdGetBltStatus)( +//typedef x (NTAPI *PGD_DxDdGetDC)( +//typedef x (NTAPI *PGD_DxDdGetDriverInfo)( +//typedef x (NTAPI *PGD_DxDdGetDxHandle)( +//typedef x (NTAPI *PGD_DxDdGetFlipStatus)( +//typedef x (NTAPI *PGD_DxDdGetInternalMoCompInfo)( +//typedef x (NTAPI *PGD_DxDdGetMoCompBuffInfo)( +//typedef x (NTAPI *PGD_DxDdGetMoCompGuids)( +//typedef x (NTAPI *PGD_DxDdGetMoCompFormats)( +//typedef x (NTAPI *PGD_DxDdGetScanLine)( +//typedef x (NTAPI *PGD_DxDdLock)( +//typedef x (NTAPI *PGD_DxDdLockD3D)( +//typedef x (NTAPI *PGD_DxDdQueryDirectDrawObject)( +//typedef x (NTAPI *PGD_DxDdQueryMoCompStatus)( +//typedef x (NTAPI *PGD_DxDdReenableDirectDrawObject)( +//typedef x (NTAPI *PGD_DxDdReleaseDC)( +//typedef x (NTAPI *PGD_DxDdRenderMoComp)( +//typedef x (NTAPI *PGD_DxDdResetVisrgn)( +//typedef x (NTAPI *PGD_DxDdSetColorKey)( +//typedef x (NTAPI *PGD_DxDdSetExclusiveMode)( +//typedef x (NTAPI *PGD_DxDdSetGammaRamp)( +//typedef x (NTAPI *PGD_DxDdCreateSurfaceEx)( +//typedef x (NTAPI *PGD_DxDdSetOverlayPosition)( +//typedef x (NTAPI *PGD_DxDdUnattachSurface)( +//typedef x (NTAPI *PGD_DxDdUnlock)( +//typedef x (NTAPI *PGD_DxDdUnlockD3D)( +//typedef x (NTAPI *PGD_DxDdUpdateOverlay)( +//typedef x (NTAPI *PGD_DxDdWaitForVerticalBlank)( +//typedef x (NTAPI *PGD_DxDvpCanCreateVideoPort)( +//typedef x (NTAPI *PGD_DxDvpColorControl)( +//typedef x (NTAPI *PGD_DxDvpCreateVideoPort)( +//typedef x (NTAPI *PGD_DxDvpDestroyVideoPort)( +//typedef x (NTAPI *PGD_DxDvpFlipVideoPort)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortBandwidth)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortField)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortFlipStatus)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortInputFormats)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortLine)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortOutputFormats)( +//typedef x (NTAPI *PGD_DxDvpGetVideoPortConnectInfo)( +//typedef x (NTAPI *PGD_DxDvpGetVideoSignalStatus)( +//typedef x (NTAPI *PGD_DxDvpUpdateVideoPort)( +//typedef x (NTAPI *PGD_DxDvpWaitForVideoPortSync)( +//typedef x (NTAPI *PGD_DxDvpAcquireNotification)( +//typedef x (NTAPI *PGD_DxDvpReleaseNotification)( +//typedef x (NTAPI *PGD_DxDdHeapVidMemAllocAligned)( +//typedef x (NTAPI *PGD_DxDdHeapVidMemFree)( +//typedef x (NTAPI *PGD_DxDdEnableDirectDraw)( +//typedef x (NTAPI *PGD_DxDdDisableDirectDraw)( +//typedef x (NTAPI *PGD_DxDdSuspendDirectDraw)( +//typedef x (NTAPI *PGD_DxDdResumeDirectDraw)( +//typedef x (NTAPI *PGD_DxDdDynamicModeChange)( +//typedef x (NTAPI *PGD_DxDdCloseProcess)( +//typedef x (NTAPI *PGD_DxDdGetDirectDrawBound)( +//typedef x (NTAPI *PGD_DxDdEnableDirectDrawRedirection)( +//typedef x (NTAPI *PGD_DxDdAllocPrivateUserMem)( +//typedef x (NTAPI *PGD_DxDdFreePrivateUserMem)( +//typedef x (NTAPI *PGD_DxDdLockDirectDrawSurface)( +//typedef x (NTAPI *PGD_DxDdUnlockDirectDrawSurface)( +//typedef x (NTAPI *PGD_DxDdSetAccelLevel)( +//typedef x (NTAPI *PGD_DxDdGetSurfaceLock)( +//typedef x (NTAPI *PGD_DxDdEnumLockedSurfaceRect)( +typedef DWORD (NTAPI *PGD_ENGDXIOCTL)(ULONG, PVOID, ULONG); + + + Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Wed Oct 24 12:13:39 2007 @@ -14,7 +14,6 @@ typedef BOOL (NTAPI* PGD_DDRESTVISRGN)(HANDLE, HWND); typedef HANDLE (NTAPI* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *); -typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL*); typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA); typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA); @@ -103,7 +102,6 @@ typedef VOID (NTAPI *PGD_VIDMEMFREE)(LPVMEMHEAP, FLATPTR); typedef PVOID (NTAPI *PGD_ENGALLOCPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, SIZE_T, ULONG) ; typedef VOID (NTAPI *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID); -typedef DWORD (NTAPI *PGD_ENGDXIOCTL)(ULONG, PVOID, ULONG); typedef PDD_SURFACE_LOCAL (NTAPI *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); typedef BOOL (NTAPI *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); @@ -123,7 +121,4 @@ } -BOOL INTERNAL_CALL DD_Cleanup(PVOID pDD); -BOOL INTERNAL_CALL DDSURF_Cleanup(PVOID pDDSurf); - #endif /* _INT_W32k_DDRAW */ Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Oct 24 12:13:39 2007 @@ -150,11 +150,39 @@ } - - -/************************************************************************/ -/* NtGdiDxgGenericThunk */ -/************************************************************************/ +/*++ +* @name NtGdiDxgGenericThunk +* @implemented +* +* The function NtGdiDxgGenericThunk redirect dx call to other thing. +* from dxg.sys +* +* @param ULONG_PTR ulIndex +* The functions we want redirct +* +* @param ULONG_PTR ulHandle +* Unknown +* +* @param SIZE_T *pdwSizeOfPtr1 +* Unknown +* +* @param PVOID pvPtr1 +* Unknown +* +* @param SIZE_T *pdwSizeOfPtr2 +* Unknown +* +* @param PVOID pvPtr2 +* Unknown +* +* @return +* always return DDHAL_DRIVER_NOTHANDLED +* +* @remarks. +* dxg.sys NtGdiDxgGenericThunk call are redirect to dxg.sys +* This api are not longer use in Windows NT 2000/XP/2003 +* +*--*/ DWORD STDCALL NtGdiDxgGenericThunk(ULONG_PTR ulIndex, @@ -164,10 +192,7 @@ SIZE_T *pdwSizeOfPtr2, PVOID pvPtr2) { - PGD_DXGENERICTRUNK pfnDxgGenericThunk = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDxgGenericThunk, pfnDxgGenericThunk); + PGD_DXGENERICTRUNK pfnDxgGenericThunk = (PGD_DXGENERICTRUNK)gpDxFuncs[DXG_INDEX_DxDxgGenericThunk].pfn; if (pfnDxgGenericThunk == NULL) { Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Wed Oct 24 12:13:39 2007 @@ -112,24 +112,42 @@ } } -/************************************************************************/ -/* EngDxIoctl */ -/************************************************************************/ +/*++ +* @name EngDxIoctl +* @implemented +* +* The function EngDxIoctl is the ioctl call to diffent dx functions +* to the driver dxg.sys +* +* @param ULONG ulIoctl +* The ioctl code that we want call to +* +* @param PVOID pBuffer +* Our in or out buffer with data to the ioctl code we are using +* +* @param ULONG ulBufferSize +* The buffer size in bytes +* +* @return +* always return DDERR_UNSUPPORTED +* +* @remarks. +* dxg.sys EngDxIoctl call are redirect to dxg.sys +* This api are not longer use in Windows NT 2000/XP/2003 +* +*--*/ DWORD STDCALL EngDxIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize) { - PGD_ENGDXIOCTL pfnEngDxIoctl = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdIoctl, pfnEngDxIoctl); + PGD_ENGDXIOCTL pfnEngDxIoctl = (PGD_ENGDXIOCTL)gpDxFuncs[DXG_INDEX_DxDdIoctl].pfn; if (pfnEngDxIoctl == NULL) { DPRINT1("Warring no pfnEngDxIoctl"); - return DDHAL_DRIVER_NOTHANDLED; + return DDERR_UNSUPPORTED; } DPRINT1("Calling on dxg.sys pfnEngDxIoctl");

17 years, 2 months

[hpoussin] 29846: Better check of GetWindowsDirectory() return value

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Oct 24 11:49:40 2007 New Revision: 29846 URL: http://svn.reactos.org/svn/reactos?rev=29846&view=rev Log: Better check of GetWindowsDirectory() return value Modified: trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Wed Oct 24 11:49:40 2007 @@ -207,6 +207,13 @@ UINT len; BOOL ret; + len = GetWindowsDirectoryW(CurrentDirectory, MAX_PATH); + if (len == 0 || len > MAX_PATH) + { + WARN("GetWindowsDirectoryW() failed\n"); + return FALSE; + } + ret = DuplicateTokenEx(pgContext->UserToken, MAXIMUM_ALLOWED, NULL, SecurityImpersonation, TokenPrimary, &hAppToken); if (!ret) { @@ -222,13 +229,6 @@ StartupInfo.wShowWindow = SW_SHOW; StartupInfo.lpDesktop = pszDesktopName; - len = GetWindowsDirectoryW(CurrentDirectory, MAX_PATH); - if (len > MAX_PATH) - { - WARN("GetWindowsDirectoryW() failed\n"); - CloseHandle(hAppToken); - return FALSE; - } ret = CreateProcessAsUserW( hAppToken, pszCmdLine,

17 years, 2 months

[hpoussin] 29845: Duplicate the user token before calling CreateProcessAsUser() See issue #2569 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Oct 24 11:45:44 2007 New Revision: 29845 URL: http://svn.reactos.org/svn/reactos?rev=29845&view=rev Log: Duplicate the user token before calling CreateProcessAsUser() See issue #2569 for more details. Modified: trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Wed Oct 24 11:45:44 2007 @@ -203,8 +203,16 @@ STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; WCHAR CurrentDirectory[MAX_PATH]; + HANDLE hAppToken; UINT len; BOOL ret; + + ret = DuplicateTokenEx(pgContext->UserToken, MAXIMUM_ALLOWED, NULL, SecurityImpersonation, TokenPrimary, &hAppToken); + if (!ret) + { + WARN("DuplicateTokenEx() failed with error %lu\n", GetLastError()); + return FALSE; + } ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); StartupInfo.cb = sizeof(STARTUPINFOW); @@ -218,10 +226,11 @@ if (len > MAX_PATH) { WARN("GetWindowsDirectoryW() failed\n"); + CloseHandle(hAppToken); return FALSE; } ret = CreateProcessAsUserW( - pgContext->UserToken, + hAppToken, pszCmdLine, NULL, NULL, @@ -232,6 +241,7 @@ CurrentDirectory, &StartupInfo, &ProcessInformation); + CloseHandle(hAppToken); if (!ret) WARN("CreateProcessAsUserW() failed with error %lu\n", GetLastError()); return ret;

17 years, 2 months

[dreimer] 29844: Update part of the Documentation Add two new settings into the cmd Part of RosBE.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Oct 24 11:13:17 2007 New Revision: 29844 URL: http://svn.reactos.org/svn/reactos?rev=29844&view=rev Log: Update part of the Documentation Add two new settings into the cmd Part of RosBE. Added: trunk/tools/RosBE-Windows/Documentation/files/options.html (with props) trunk/tools/RosBE-Windows/Documentation/files/options.jpg (with props) Modified: trunk/tools/RosBE-Windows/Documentation/files/menu.html trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Documentation/files/menu.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/menu.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/menu.html Wed Oct 24 11:13:17 2007 @@ -23,6 +23,7 @@ <li><a href="basic.html">Basic Functions</a></li> <li><a href="adv.html">Advanced Functions</a></li> <li><a href="howto.html">FAQ</a></li> + <li><a href="options.html">Configuration</a></li> <li><a href="credits.html">Credits</a></li> </ol> Added: trunk/tools/RosBE-Windows/Documentation/files/options.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/options.html (added) +++ trunk/tools/RosBE-Windows/Documentation/files/options.html Wed Oct 24 11:13:17 2007 @@ -1,0 +1,27 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +</head> +<body> +RosBE has a small configuration application, which lets you control +many aspects of RosBE's look and feel. Additionally you can change +settings which affect the build process.<br> +<br> +<div style="text-align: center;"><img + style="width: 389px; height: 425px;" alt="RosBE Configurator" + src="options.jpg"><br> +<div style="text-align: left;"><br> +As you can see, it is possible to edit the font and background color +with RosBE Configurator. Additionally you can check the look in the +Preview below.<br> +Additionally you can Enable/Disable many Things with it. So you can +switch on/off showing the time the build process needed. A new feature +is the usage of ccache which can speed up the build process for ~5-10% +for a cost of ~1,5 GB of Cache size. You can switch off/on the logging +and stripping the Output Files, too. Stripping might help if you want +to use ReactOS on a PC with less than 48 MB RAM, because stripped apps +use less RAM.<br> +</div> +</div> +</body> +</html> Propchange: trunk/tools/RosBE-Windows/Documentation/files/options.html ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE-Windows/Documentation/files/options.jpg URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE-Windows/Documentation/files/options.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Wed Oct 24 11:13:17 2007 @@ -51,7 +51,23 @@ set TARGET_CPP=g++ ) ) - +if defined _ROSBE_OBJPATH ( + if not exist "%_ROSBE_OBJPATH%\." ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOB + ) else ( + set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% + ) +) +if defined _ROSBE_OUTPATH ( + if not exist "%_ROSBE_OUTPATH%\." ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOB + ) else ( + set ROS_OUTPUT=%_ROSBE_OUTPATH% + set ROS_TEMPORARY=%_ROSBE_OUTPATH% + ) +) :: :: Get the current date and time for use in in our build log's file name. :: Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Wed Oct 24 11:13:17 2007 @@ -26,7 +26,8 @@ set _ROSBE_STRIP=0 set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 set _ROSBE_LOGDIR=%CD%\RosBE-Logs - +set _ROSBE_OBJPATH= +set _ROSBE_OUTPATH= :: :: Check if the user has used the options utility and :: if so, load their options.

17 years, 2 months

[peterw] 29843: - Added a small utility (chknewer) to check if one file is newer than another. - This removes the dependency on test from Config.cmd and Build.cmd. - Some other miscellaneous cleanup.

by peterw＠svn.reactos.org

Author: peterw Date: Wed Oct 24 11:04:52 2007 New Revision: 29843 URL: http://svn.reactos.org/svn/reactos?rev=29843&view=rev Log: - Added a small utility (chknewer) to check if one file is newer than another. - This removes the dependency on test from Config.cmd and Build.cmd. - Some other miscellaneous cleanup. Added: trunk/tools/RosBE-Windows/Tools/chknewer.c (with props) Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Tools/buildtime.c trunk/tools/RosBE-Windows/Tools/cpucount.c trunk/tools/RosBE-Windows/Tools/echoh.c trunk/tools/RosBE-Windows/Tools/flash.c trunk/tools/RosBE-Windows/Tools/getdate.c trunk/tools/RosBE-Windows/Tools/info.txt trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Wed Oct 24 11:04:52 2007 @@ -17,7 +17,7 @@ :: abort the build and inform the user. :: if exist "config.rbuild" ( - test "config.template.rbuild" -nt "config.rbuild" + chknewer "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Wed Oct 24 11:04:52 2007 @@ -85,7 +85,7 @@ :: inform the user and offer an update. :: if exist "%_ROSBE_BASEDIR%\config.rbuild" ( - test "config.template.rbuild" -nt "%_ROSBE_BASEDIR%\config.rbuild" + chknewer "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than working config.rbuild *** Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/buildtim… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/buildtime.c (original) +++ trunk/tools/RosBE-Windows/Tools/buildtime.c Wed Oct 24 11:04:52 2007 @@ -1,13 +1,12 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/buildtime.c * PURPOSE: Buildtime Counter * COPYRIGHT: Copyright 2007 KJK::Hyperion * Copyright 2007 Peter Ward <dralnix(a)gmail.com> * */ - #include <windows.h> #include <time.h> Added: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (added) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Wed Oct 24 11:04:52 2007 @@ -1,0 +1,106 @@ +/* + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/chknewer.c + * PURPOSE: Check if a file is newer than another. + * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * + */ + +#include <time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +time_t +StatFile( + char* FileName +); + +int main(int argc, char* argv[]) +{ + FILE *FILE1, *FILE2; + time_t file1time = 0, file2time = 0; + + if (argc > 3) + { + printf("%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + if ((argc == 1) || + (!strncmp(argv[1], "/?", 2)) || + (!strncmp(argv[1], "-h", 2)) || + (!strncmp(argv[1], "--help", 6))) + { + printf("Usage: %s FILE1 FILE2\n", argv[0]); + printf("Checks if FILE1 is newer than FILE2 by checking\n"); + printf("the last data modification time's. Returns 1 if\n"); + printf("FILE1 is newer and 2 if FILE2 is.\n\n"); + return 0; + } + + FILE1 = fopen(argv[1], "r"); + if (!FILE1) + { + printf("%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[1]); + return -1; + } + else + { + if (fclose(FILE1)) + { + printf("%s: Error closing file \"%s\"\n", argv[0], argv[1]); + } + file1time = StatFile(argv[1]); + if (!file1time) + { + printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); + return -1; + } + } + + FILE2 = fopen(argv[2], "r"); + if (!FILE2) + { + printf("%s: Error file \"%s\" doesn't seem to exist.\n", argv[0], argv[2]); + return -1; + } + else + { + if (fclose(FILE2)) + { + printf("%s: Error closing file \"%s\"\n", argv[0], argv[2]); + } + file2time = StatFile(argv[2]); + if (!file2time) + { + printf("%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]); + return -1; + } + } + + if (file1time > file2time) + { + return 1; + } + else + { + return 2; + } +} + +time_t StatFile(char* FileName) +{ + struct stat filestat; + + if (!stat(FileName, &filestat)) + { + return mktime(localtime(&filestat.st_mtime)); + } + else + { + return 0; + } +} Propchange: trunk/tools/RosBE-Windows/Tools/chknewer.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cpucount.c (original) +++ trunk/tools/RosBE-Windows/Tools/cpucount.c Wed Oct 24 11:04:52 2007 @@ -1,13 +1,12 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/cpucount.c * PURPOSE: CPU Core Counter * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> * Copyright 2007 Peter Ward <dralnix(a)gmail.com> * */ - #include <windows.h> #include <stdio.h> Modified: trunk/tools/RosBE-Windows/Tools/echoh.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/echoh.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/echoh.c (original) +++ trunk/tools/RosBE-Windows/Tools/echoh.c Wed Oct 24 11:04:52 2007 @@ -1,12 +1,11 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/echoh.c * PURPOSE: Converts a value to hex and displays it * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> * */ - #include <stdio.h> #include <stdlib.h> Modified: trunk/tools/RosBE-Windows/Tools/flash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/flash.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/flash.c (original) +++ trunk/tools/RosBE-Windows/Tools/flash.c Wed Oct 24 11:04:52 2007 @@ -1,12 +1,11 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/flash.c * PURPOSE: Taskbar Flasher * COPYRIGHT: Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * */ - #include <windows.h> Modified: trunk/tools/RosBE-Windows/Tools/getdate.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/getdate.… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/getdate.c (original) +++ trunk/tools/RosBE-Windows/Tools/getdate.c Wed Oct 24 11:04:52 2007 @@ -1,6 +1,6 @@ /* - * PROJECT: RosBE - ReactOS Build Environment for Windows - * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: RosBE - ReactOS Build Environment for Windows. + * LICENSE: GPL - See LICENSE.txt in the top level directory. * FILE: Tools/getdate.c * PURPOSE: Returns System Date * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Wed Oct 24 11:04:52 2007 @@ -1,6 +1,5 @@ Additional Tools needed: tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm -test: http://gnuwin32.sourceforge.net/packages/coreutils.htm cut: http://www.ltr-data.se/files/cut.zip sed: http://gnuwin32.sourceforge.net/packages/sed.htm grep: http://gnuwin32.sourceforge.net/packages/grep.htm Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Wed Oct 24 11:04:52 2007 @@ -7,10 +7,13 @@ LFLAGS := -s WINVER := 0x502 -all: buildtime cpucount echoh flash getdate +all: buildtime chknewer cpucount echoh flash getdate buildtime: buildtime.c ${CC} ${CFLAGS} buildtime buildtime.c + +chknewer: chknewer.c + ${CC} ${CFLAGS} chknewer chknewer.c cpucount: cpucount.c ${CC} ${CFLAGS} cpucount cpucount.c @@ -25,4 +28,4 @@ ${CC} ${CFLAGS} getdate getdate.c clean: - del buildtime.exe cpucount.exe echoh.exe flash.exe getdate.exe + del /f buildtime.exe chknewer.exe cpucount.exe echoh.exe flash.exe getdate.exe

17 years, 2 months

[arty] 29842: Remove extra var.

by arty＠svn.reactos.org

Author: arty Date: Wed Oct 24 07:34:58 2007 New Revision: 29842 URL: http://svn.reactos.org/svn/reactos?rev=29842&view=rev Log: Remove extra var. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Wed Oct 24 07:34:58 2007 @@ -473,7 +473,7 @@ /* Handle relocation sections */ for (i = 0; i < shnum; i++) { Elf32_Rela reloc = { }; - ULONG *Target32, x; + ULONG *Target32; USHORT *Target16; int numreloc, relstart, targetSection; Elf32_Sym symbol; @@ -531,7 +531,6 @@ Target32 = (ULONG*)(((PCHAR)MemLoadAddr) + (P - KernelAddr)); Target16 = (USHORT *)Target32; - x = *Target32; switch (ELF32_R_TYPE(reloc.r_info)) {

17 years, 2 months

← Newer
1
...
16
17
18
19
20
21
22
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007