Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 28621: Uncomment german translation again, this change accidentally got into my previous commit
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 20:01:59 2007 New Revision: 28621 URL: http://svn.reactos.org/svn/reactos?rev=28621&view=rev Log: Uncomment german translation again, this change accidentally got into my previous commit Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Tue Aug 28 20:01:59 2007 @@ -1,5 +1,5 @@ #include <windows.h> #include "resource.h" -//#include "lang/de-DE.rc" +#include "lang/de-DE.rc" #include "lang/en-US.rc"

1 0

[cfinck] 28620: - Remove most of the Usage text from the german translation. It was just copied from the Windows "more" utility and our tool does not support any of the extended options yet. I changed the text, so it only includes the features we currently support. - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL in the german translation - Add an English (US) translation - Use a consistent indentation in "more.c" - Exit the tool if reading IDS_CONTINUE fails instead of falling back to a hardcoded st
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 19:54:19 2007 New Revision: 28620 URL: http://svn.reactos.org/svn/reactos?rev=28620&view=rev Log: - Remove most of the Usage text from the german translation. It was just copied from the Windows "more" utility and our tool does not support any of the extended options yet. I changed the text, so it only includes the features we currently support. - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL in the german translation - Add an English (US) translation - Use a consistent indentation in "more.c" - Exit the tool if reading IDS_CONTINUE fails instead of falling back to a hardcoded string Added: trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc Modified: trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/more/more.c trunk/reactos/base/applications/cmdutils/more/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc Tue Aug 28 19:54:19 2007 @@ -1,34 +1,15 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_USAGE, "Zeigt Daten seitenweise auf dem Bildschirm an.\n\n\ - MORE [/E [/C] [/P] [/S] [/Tn] [+n]] < [Laufwerk:][Pfad]Dateiname\n\ - Befehl | MORE [/E [/C] [/P] [/S] [/Tn] [+n]] \n\ - MORE /E [/C] [/P] [/S] [/Tn] [+n] [Dateien]\n\n\ - [Laufwerk:][Pfad]Dateiname Ein Datei, deren Inhalt angezeigt\n\ -\t\t\t werden soll.\n\n\ - Befehl\t\t Ein Befehl, dessen Ausgabe angezeigt\n\ -\t\t\t werden soll.\n\n\ - /E\tAktiviert die erweiterten Möglichkeiten.\n\ - /C\tLöscht den Bildschirm, bevor eine Seite angezeigt wird.\n\ - /P\tFührt Seitenvorschubzeichen aus.\n\ - /S\tFasst mehrere leere Zeilen zu einer Zeile zusammen.\n\ - /Tn\tErsetzt Tabulatorenzeichen durch n Leerzeichen (Standard 8).\n\n\ -\tDie Optionen können in der Umgebungsvariablen MORE angegeben\n\ -\twerden.\n\n\ - +n\tBeginnt mit der Anzeige der ersten Datei in Zeile n.\n\n\ - Dateien Gibt eine Liste mit anzuzeigenden Dateien an.\n\ -\t Trennen sie die Dateinamen durch ein Leerzeichen.\n\n\ - Wenn die erweiterten Möglichkeiten aktiviert sind, können die folgenden\n\ - Befehle an der Eingabeforderung \"--Fortsetzung--\" eingegeben werden:\n\n\ - P n\t Zeigt die nächsten n Zeilen an.\n\ - S n\t Überspringt die nächsten n Zeilen.\n\ - Q\tBeendet die Ausgabe.\n\ - =\tZeigt die Zeilennummer an.\n\ - ?\tZeigt die Hilfezeile an.\n\ - <LEERTASTE> Zeigt die nächste Zeile an.\n\ - <EINGABETASTE> Zeigt die nächste Zeile an.\n" + MORE < [Laufwerk:][Pfad]Dateiname\n\ + Befehl | MORE \n\ + MORE [Laufwerk:][Pfad]Dateiname\n\n\ + [Laufwerk:][Pfad]Dateiname Eine Datei, deren Inhalt angezeigt werden soll.\n\ + Befehl\t\t Ein Befehl, dessen Ausgabe angezeigt werden soll.\n\n\ + An der Eingabeaufforderung ""-- Fortsetzung --"" kann eine beliebige\n\ + Taste gedrückt werden, um die nächste Seite anzuzeigen.\n" IDS_CONTINUE, " -- Fortsetzung (100%) -- " IDS_FILE_ACCESS, "Auf die Datei %s kann nicht zugegriffen werden." Added: trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc Tue Aug 28 19:54:19 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +{ + IDS_USAGE, "Displays data page-by-page on the screen.\n\n\ + MORE < [Drive:][Path]File name\n\ + Command | MORE \n\ + MORE [Drive:][Path]File name\n\n\ + [Drive:][Path]File name A file, whose content shall be displayed.\n\ + Command\t\t A command, whose output shall be displayed.\n\n\ + At the prompt ""-- Continue --"" you can press any key to show the next page.\n" + + IDS_CONTINUE, " -- Continue (100%) -- " + IDS_FILE_ACCESS, "Cannot access the file %s." +} Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c Tue Aug 28 19:54:19 2007 @@ -30,11 +30,11 @@ static VOID GetScreenSize (PSHORT maxx, PSHORT maxy) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (hStdOut, &csbi); - *maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; - *maxy = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo (hStdOut, &csbi); + *maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; + *maxy = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; } @@ -42,40 +42,40 @@ static VOID ConOutPuts (LPTSTR szText) { - DWORD dwWritten; - - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL); - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL); + DWORD dwWritten; + + WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL); + WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL); } static VOID ConInKey (VOID) { - INPUT_RECORD ir; - DWORD dwRead; - - do - { - ReadConsoleInput (hKeyboard, &ir, 1, &dwRead); - if ((ir.EventType == KEY_EVENT) && - (ir.Event.KeyEvent.bKeyDown == TRUE)) - return; - } - while (TRUE); + INPUT_RECORD ir; + DWORD dwRead; + + do + { + ReadConsoleInput (hKeyboard, &ir, 1, &dwRead); + if ((ir.EventType == KEY_EVENT) && + (ir.Event.KeyEvent.bKeyDown == TRUE)) + return; + } + while (TRUE); } static VOID WaitForKey (VOID) { - DWORD dwWritten; + DWORD dwWritten; WriteFile (hStdErr, szCont , szContLength, &dwWritten, NULL); - ConInKey(); - - WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL); + ConInKey(); + + WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL); // FlushConsoleInputBuffer (hConsoleIn); } @@ -84,125 +84,125 @@ //INT CommandMore (LPTSTR cmd, LPTSTR param) int main (int argc, char **argv) { - SHORT maxx,maxy; - SHORT line_count=0,ch_count=0; - DWORD i, last; - HANDLE hFile = INVALID_HANDLE_VALUE; - TCHAR szFullPath[MAX_PATH]; + SHORT maxx,maxy; + SHORT line_count=0,ch_count=0; + DWORD i, last; + HANDLE hFile = INVALID_HANDLE_VALUE; + TCHAR szFullPath[MAX_PATH]; TCHAR szMsg[1024]; - /*reading/writing buffer*/ - TCHAR *buff; - - /*bytes written by WriteFile and ReadFile*/ - DWORD dwRead,dwWritten; - - /*ReadFile() return value*/ - BOOL bRet; - - - hStdIn = GetStdHandle(STD_INPUT_HANDLE); - hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); - hStdErr = GetStdHandle(STD_ERROR_HANDLE); + /*reading/writing buffer*/ + TCHAR *buff; + + /*bytes written by WriteFile and ReadFile*/ + DWORD dwRead,dwWritten; + + /*ReadFile() return value*/ + BOOL bRet; + + + hStdIn = GetStdHandle(STD_INPUT_HANDLE); + hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); + hStdErr = GetStdHandle(STD_ERROR_HANDLE); hApp = GetModuleHandle(NULL); - buff=malloc(4096); - if (!buff) - { - ConOutPuts(_T("Error: no memory")); - return 0; - } - - if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) - { - if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR)) - { - CharToOem(buff, buff); - ConOutPuts(buff); - } - - free(buff); - return 0; - } - - hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ, - 0,NULL,OPEN_ALWAYS,0,0); - - GetScreenSize(&maxx,&maxy); - - - - FlushConsoleInputBuffer (hKeyboard); - - if(argc > 1) - { - GetFullPathNameA(argv[1], MAX_PATH, szFullPath, NULL); - hFile = CreateFile (szFullPath, + buff=malloc(4096); + if (!buff) + { + ConOutPuts(_T("Error: no memory")); + return 1; + } + + if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) + { + if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR)) + { + CharToOem(buff, buff); + ConOutPuts(buff); + } + + free(buff); + return 0; + } + + hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ, + 0,NULL,OPEN_ALWAYS,0,0); + + GetScreenSize(&maxx,&maxy); + + + + FlushConsoleInputBuffer (hKeyboard); + + if(argc > 1) + { + GetFullPathNameA(argv[1], MAX_PATH, szFullPath, NULL); + hFile = CreateFile (szFullPath, GENERIC_READ, - 0, + 0, NULL, OPEN_EXISTING, 0, 0); - if (hFile == INVALID_HANDLE_VALUE) - { - if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR)) - { - _stprintf(buff, szMsg, szFullPath); - CharToOem(buff, buff); - ConOutPuts(buff); - } - - free(buff); - return 0; - } - } - else - { - hFile = hStdIn; - } + if (hFile == INVALID_HANDLE_VALUE) + { + if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR)) + { + _stprintf(buff, szMsg, szFullPath); + CharToOem(buff, buff); + ConOutPuts(buff); + } + + free(buff); + return 0; + } + } + else + { + hFile = hStdIn; + } if (!LoadString(hApp, IDS_CONTINUE, szCont, sizeof(szCont) / sizeof(TCHAR))) { - /* fail back to english */ - _tcscpy(szCont, _T("--- continue ---")); + /* Shouldn't happen, so exit */ + return 1; } szContLength = _tcslen(szCont); - do - { - bRet = ReadFile(hFile,buff,4096,&dwRead,NULL); - - for(last=i=0;i<dwRead && bRet;i++) - { - ch_count++; - if(buff[i] == _T('\n') || ch_count == maxx) - { - ch_count=0; - line_count++; - if (line_count == maxy) - { - line_count = 0; - WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL); - last=i+1; - FlushFileBuffers (hStdOut); - WaitForKey (); - } - } - } - if (last<dwRead && bRet) - WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL); - - } - while(dwRead>0 && bRet); - - free (buff); - CloseHandle (hKeyboard); - if (hFile != hStdIn) - CloseHandle (hFile); - - return 0; + do + { + bRet = ReadFile(hFile,buff,4096,&dwRead,NULL); + + for(last=i=0;i<dwRead && bRet;i++) + { + ch_count++; + if(buff[i] == _T('\n') || ch_count == maxx) + { + ch_count=0; + line_count++; + if (line_count == maxy) + { + line_count = 0; + WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL); + last=i+1; + FlushFileBuffers (hStdOut); + WaitForKey (); + } + } + } + if (last<dwRead && bRet) + WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL); + + } + while(dwRead>0 && bRet); + + free (buff); + CloseHandle (hKeyboard); + if (hFile != hStdIn) + CloseHandle (hFile); + + return 0; } /* EOF */ Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Tue Aug 28 19:54:19 2007 @@ -1,5 +1,5 @@ #include <windows.h> #include "resource.h" -#include "lang/de-DE.rc" - +//#include "lang/de-DE.rc" +#include "lang/en-US.rc"

1 0

[tkreuzer] 28619: - rename ASSERT1 to ASSERT - link to w32kdll instead of implementing all syscalls as stubs. I will remove the rest of the syscall code as soon as our syscall db is more complete - more TEST -> RTEST - update w32kdll_ros.def - add tests for NtGdiEngCreatePalette, NtGdiEnumFontOpen - Add some gdi handle table code to w32knapi - header cleanup
by tkreuzer＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: tkreuzer Date: Tue Aug 28 19:06:36 2007 New Revision: 28619 URL: http://svn.reactos.org/svn/reactos?rev=28619&view=rev Log: - rename ASSERT1 to ASSERT - link to w32kdll instead of implementing all syscalls as stubs. I will remove the rest of the syscall code as soon as our syscall db is more complete - more TEST -> RTEST - update w32kdll_ros.def - add tests for NtGdiEngCreatePalette, NtGdiEnumFontOpen - Add some gdi handle table code to w32knapi - header cleanup Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c Modified: trunk/rostests/apitests/apitest.h trunk/rostests/apitests/gdi32api/testlist.c trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c trunk/rostests/apitests/gdi32api/tests/GetObject.c trunk/rostests/apitests/user32api/tests/ScrollDC.c trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.c trunk/rostests/apitests/w32knapi/w32knapi.h trunk/rostests/apitests/w32knapi/w32knapi.rbuild Modified: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=28… ============================================================================== --- trunk/rostests/apitests/apitest.h (original) +++ trunk/rostests/apitests/apitest.h Tue Aug 28 19:06:36 2007 @@ -1,7 +1,5 @@ #ifndef _APITEST_H #define _APITEST_H - -#define WINVER 0x501 #include <stdlib.h> #include <stdarg.h> @@ -84,8 +82,8 @@ } \ } - -#define ASSERT1(x) \ +#undef ASSERT +#define ASSERT(x) \ if (!(x)) \ { \ printf("Assertion failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c (original) +++ trunk/rostests/apitests/gdi32api/testlist.c Tue Aug 28 19:06:36 2007 @@ -26,12 +26,12 @@ { L"CreateRectRgn", Test_CreateRectRgn }, { L"ExtCreatePen", Test_ExtCreatePen }, { L"GetClipRgn", Test_GetClipRgn }, + { L"GetObject", Test_GetObject }, { L"GetStockObject", Test_GetStockObject }, { L"SetSysColors", Test_SetSysColors }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, // { L"SetWorldTransform", Test_SetWorldTransform }, - { L"GetObject", Test_GetObject } }; /* The function that gives us the number of tests */ Modified: trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetClipRgn.c Tue Aug 28 19:06:36 2007 @@ -3,9 +3,24 @@ INT Test_GetClipRgn(PTESTINFO pti) { -// HRGN hRgn; + HWND hWnd; + HDC hDC; + HRGN hrgn;//, hrgn2; -// hRgn = CreateRectRgn( + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, g_hInstance, 0); + + hDC = GetDC(hWnd); + hrgn = CreateRectRgn(0,0,0,0); + + SetLastError(ERROR_SUCCESS); +// TEST(GetClipRgn(hDC) + + ReleaseDC(hWnd, hDC); + DestroyWindow(hWnd); + return APISTATUS_NORMAL; } Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetObject.c Tue Aug 28 19:06:36 2007 @@ -178,21 +178,21 @@ TEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_BRUSH, 0, NULL) == sizeof(LOGBRUSH)); TEST(GetObject(hBrush, sizeof(WORD), NULL) == sizeof(LOGBRUSH)); TEST(GetObject(hBrush, 0, NULL) == sizeof(LOGBRUSH)); - TEST(GetObject(hBrush, 5, NULL) == sizeof(LOGBRUSH)); - TEST(GetObject(hBrush, -5, NULL) == sizeof(LOGBRUSH)); - - TEST(GetObject(hBrush, 0, &logbrush) == 0); - TEST(logbrush.lbStyle == 0x77777777); - TEST(GetObject(hBrush, 5, &logbrush) == sizeof(LOGBRUSH)); - TEST(logbrush.lbStyle == 0); - TEST(logbrush.lbColor == 0x77777701); - - TEST(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush) == sizeof(LOGBRUSH)); - TEST(GetObject(hBrush, sizeof(LOGBRUSH)+2, &logbrush) == sizeof(LOGBRUSH)); - TEST(GetObject(hBrush, -1, &logbrush) == sizeof(LOGBRUSH)); + RTEST(GetObject(hBrush, 5, NULL) == sizeof(LOGBRUSH)); + RTEST(GetObject(hBrush, -5, NULL) == sizeof(LOGBRUSH)); + + RTEST(GetObject(hBrush, 0, &logbrush) == 0); + RTEST(logbrush.lbStyle == 0x77777777); + RTEST(GetObject(hBrush, 5, &logbrush) == sizeof(LOGBRUSH)); + RTEST(logbrush.lbStyle == 0); + RTEST(logbrush.lbColor == 0x77777701); + + RTEST(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush) == sizeof(LOGBRUSH)); + RTEST(GetObject(hBrush, sizeof(LOGBRUSH)+2, &logbrush) == sizeof(LOGBRUSH)); + RTEST(GetObject(hBrush, -1, &logbrush) == sizeof(LOGBRUSH)); // TODO: test all members - TEST(GetLastError() == ERROR_SUCCESS); + RTEST(GetLastError() == ERROR_SUCCESS); DeleteObject(hBrush); return TRUE; } @@ -207,21 +207,21 @@ hPen = CreatePen(PS_SOLID, 3, RGB(4,5,6)); if (!hPen) return FALSE; SetLastError(ERROR_SUCCESS); - TEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN)); - TEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, sizeof(BITMAP), NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, 0, NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, 5, NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, -5, NULL) == sizeof(LOGPEN)); - TEST(GetObject(hPen, sizeof(LOGPEN), &logpen) == sizeof(LOGPEN)); - TEST(GetObject(hPen, sizeof(LOGPEN)-1, &logpen) == 0); - TEST(GetObject(hPen, sizeof(LOGPEN)+2, &logpen) == sizeof(LOGPEN)); - TEST(GetObject(hPen, 0, &logpen) == 0); - TEST(GetObject(hPen, -5, &logpen) == sizeof(LOGPEN)); - TEST(GetLastError() == ERROR_SUCCESS); + RTEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN)); + RTEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, sizeof(BITMAP), NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, 0, NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, 5, NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, -5, NULL) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, sizeof(LOGPEN), &logpen) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, sizeof(LOGPEN)-1, &logpen) == 0); + RTEST(GetObject(hPen, sizeof(LOGPEN)+2, &logpen) == sizeof(LOGPEN)); + RTEST(GetObject(hPen, 0, &logpen) == 0); + RTEST(GetObject(hPen, -5, &logpen) == sizeof(LOGPEN)); + RTEST(GetLastError() == ERROR_SUCCESS); /* test if the fields are filled correctly */ - TEST(logpen.lopnStyle == PS_SOLID); + RTEST(logpen.lopnStyle == PS_SOLID); DeleteObject(hPen); @@ -242,8 +242,8 @@ } elpUserStyle; SetLastError(ERROR_SUCCESS); - TEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); - TEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); + RTEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); + RTEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); TEST(GetLastError() == ERROR_INVALID_PARAMETER); FillMemory(&extlogpen, sizeof(EXTLOGPEN), 0x77); @@ -252,12 +252,12 @@ logbrush.lbHatch = 22; hPen = ExtCreatePen(PS_GEOMETRIC | PS_DASH, 5, &logbrush, 0, NULL); - TEST(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN); - TEST(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); - TEST(GetObject(hPen, sizeof(EXTLOGPEN), NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject((HANDLE)GDI_HANDLE_GET_INDEX(hPen), 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject(hPen, 5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN); + RTEST(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0); + RTEST(GetObject(hPen, sizeof(EXTLOGPEN), NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject((HANDLE)GDI_HANDLE_GET_INDEX(hPen), 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject(hPen, 5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); RTEST(GetObject(hPen, -5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); RTEST(GetObject(hPen, 0, &extlogpen) == 0); RTEST(GetObject(hPen, 4, &extlogpen) == 0); Modified: trunk/rostests/apitests/user32api/tests/ScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/ScrollDC.c (original) +++ trunk/rostests/apitests/user32api/tests/ScrollDC.c Tue Aug 28 19:06:36 2007 @@ -17,7 +17,7 @@ /* Assert that no update region is there */ hrgn = CreateRectRgn(0,0,0,0); - ASSERT1(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION); + ASSERT(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION); /* Test normal scrolling */ TEST(ScrollDC(hDC, 0, 0, NULL, NULL, hrgn, NULL) == TRUE); Modified: trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c (original) +++ trunk/rostests/apitests/user32api/tests/ScrollWindowEx.c Tue Aug 28 19:06:36 2007 @@ -15,7 +15,7 @@ /* Assert that no update region is there */ hrgn = CreateRectRgn(0,0,0,0); - ASSERT1(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION); + ASSERT(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION); Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, NULL, NULL, 0); TEST(Result == SIMPLEREGION); Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def Tue Aug 28 19:06:36 2007 @@ -10,48 +10,48 @@ EXPORTS NtGdiAbortDoc@4 NtGdiAbortPath@4 -;NtGdiAddFontResourceW@24 -;NtGdiAddRemoteFontToDC@16 -;NtGdiAddFontMemResourceEx@20 -;NtGdiRemoveMergeFont@8 -;NtGdiAddRemoteMMInstanceToDC@12 +NtGdiAddFontResourceW@24 +NtGdiAddRemoteFontToDC@16 +NtGdiAddFontMemResourceEx@20 +NtGdiRemoveMergeFont@8 +NtGdiAddRemoteMMInstanceToDC@12 NtGdiAlphaBlend@48 NtGdiAngleArc@24 -;NtGdiAnyLinkedFonts@0 -;NtGdiFontIsLinked@4 +NtGdiAnyLinkedFonts@0 +NtGdiFontIsLinked@4 NtGdiArcInternal@40 NtGdiBeginPath@4 NtGdiBitBlt@44 NtGdiCancelDC@4 -;NtGdiCheckBitmapBits@32 +NtGdiCheckBitmapBits@32 NtGdiCloseFigure@4 -;NtGdiClearBitmapAttributes@8 -;NtGdiClearBrushAttributes@8 -;NtGdiColorCorrectPalette@24 +NtGdiClearBitmapAttributes@8 +NtGdiClearBrushAttributes@8 +NtGdiColorCorrectPalette@24 NtGdiCombineRgn@16 NtGdiCombineTransform@12 -;NtGdiComputeXformCoefficients@4 -;NtGdiConsoleTextOut@16 -;NtGdiConvertMetafileRect@8 +NtGdiComputeXformCoefficients@4 +NtGdiConsoleTextOut@16 +NtGdiConvertMetafileRect@8 NtGdiCreateBitmap@20 NtGdiCreateClientObj@4 NtGdiCreateColorSpace@4 -;NtGdiCreateColorTransform@32 +NtGdiCreateColorTransform@32 NtGdiCreateCompatibleBitmap@12 NtGdiCreateCompatibleDC@4 NtGdiCreateDIBBrush@24 -;NtGdiCreateDIBitmapInternal@44 +NtGdiCreateDIBitmapInternal@44 NtGdiCreateDIBSection@36 NtGdiCreateEllipticRgn@16 NtGdiCreateHalftonePalette@4 NtGdiCreateHatchBrushInternal@12 -;NtGdiCreateMetafileDC@4 -;NtGdiCreatePaletteInternal@8 +NtGdiCreateMetafileDC@4 +NtGdiCreatePaletteInternal@8 NtGdiCreatePatternBrushInternal@12 NtGdiCreatePen@16 NtGdiCreateRectRgn@16 NtGdiCreateRoundRectRgn@24 -;NtGdiCreateServerMetaFile@24 +NtGdiCreateServerMetaFile@24 NtGdiCreateSolidBrush@8 NtGdiD3dContextCreate@16 NtGdiD3dContextDestroy@4 @@ -109,44 +109,44 @@ NtGdiDdUnlockD3D@8 NtGdiDdUpdateOverlay@12 NtGdiDdWaitForVerticalBlank@8 -;NtGdiDvpCanCreateVideoPort@8 -;NtGdiDvpColorControl@8 -;NtGdiDvpCreateVideoPort@8 -;NtGdiDvpDestroyVideoPort@8 -;NtGdiDvpFlipVideoPort@16 -;NtGdiDvpGetVideoPortBandwidth@8 -;NtGdiDvpGetVideoPortField@8 -;NtGdiDvpGetVideoPortFlipStatus@8 -;NtGdiDvpGetVideoPortInputFormats@8 -;NtGdiDvpGetVideoPortLine@8 -;NtGdiDvpGetVideoPortOutputFormats@8 -;NtGdiDvpGetVideoPortConnectInfo@8 -;NtGdiDvpGetVideoSignalStatus@8 -;NtGdiDvpUpdateVideoPort@16 -;NtGdiDvpWaitForVideoPortSync@8 -;NtGdiDvpAcquireNotification@12 -;NtGdiDvpReleaseNotification@8 -;NtGdiDxgGenericThunk@24 +NtGdiDvpCanCreateVideoPort@8 +NtGdiDvpColorControl@8 +NtGdiDvpCreateVideoPort@8 +NtGdiDvpDestroyVideoPort@8 +NtGdiDvpFlipVideoPort@16 +NtGdiDvpGetVideoPortBandwidth@8 +NtGdiDvpGetVideoPortField@8 +NtGdiDvpGetVideoPortFlipStatus@8 +NtGdiDvpGetVideoPortInputFormats@8 +NtGdiDvpGetVideoPortLine@8 +NtGdiDvpGetVideoPortOutputFormats@8 +NtGdiDvpGetVideoPortConnectInfo@8 +NtGdiDvpGetVideoSignalStatus@8 +NtGdiDvpUpdateVideoPort@16 +NtGdiDvpWaitForVideoPortSync@8 +NtGdiDvpAcquireNotification@12 +NtGdiDvpReleaseNotification@8 +NtGdiDxgGenericThunk@24 NtGdiDeleteClientObj@4 NtGdiDeleteColorSpace@4 -;NtGdiDeleteColorTransform@8 +NtGdiDeleteColorTransform@8 NtGdiDeleteObjectApp@4 NtGdiDescribePixelFormat@16 -;NtGdiGetPerBandInfo@8 -;NtGdiDoBanding@16 +NtGdiGetPerBandInfo@8 +NtGdiDoBanding@16 NtGdiDoPalette@24 NtGdiDrawEscape@16 NtGdiEllipse@20 -;NtGdiEnableEUDC@4 +NtGdiEnableEudc@4 NtGdiEndDoc@4 NtGdiEndPage@4 NtGdiEndPath@4 -;NtGdiEnumFontChunk@20 -;NtGdiEnumFontClose@4 -;NtGdiEnumFontOpen@28 +NtGdiEnumFontChunk@20 +NtGdiEnumFontClose@4 +NtGdiEnumFontOpen@28 NtGdiEnumObjects@16 NtGdiEqualRgn@8 -;NtGdiEudcLoadUnloadLink@28 +NtGdiEudcLoadUnloadLink@28 NtGdiExcludeClipRect@20 NtGdiExtCreatePen@44 NtGdiExtCreateRegion@12 @@ -154,37 +154,37 @@ NtGdiExtFloodFill@20 NtGdiExtGetObjectW@12 NtGdiExtSelectClipRgn@12 -;NtGdiExtTextOutW@36 +NtGdiExtTextOutW@36 NtGdiFillPath@4 NtGdiFillRgn@12 NtGdiFlattenPath@4 -;NtGdiFlushUserBatch@0 +NtGdiFlushUserBatch@0 NtGdiFlush@0 -;NtGdiForceUFIMapping@8 +NtGdiForceUFIMapping@8 NtGdiFrameRgn@20 -;NtGdiFullscreenControl@20 +NtGdiFullscreenControl@20 NtGdiGetAndSetDCDword@16 -;NtGdiGetAppClipBox@8 +NtGdiGetAppClipBox@8 NtGdiGetBitmapBits@12 NtGdiGetBitmapDimension@8 NtGdiGetBoundsRect@12 -;NtGdiGetCharABCWidthsW@24 -;NtGdiGetCharacterPlacementW@24 +NtGdiGetCharABCWidthsW@24 +NtGdiGetCharacterPlacementW@24 NtGdiGetCharSet@4 -;NtGdiGetCharWidthW@24 -;NtGdiGetCharWidthInfo@8 +NtGdiGetCharWidthW@24 +NtGdiGetCharWidthInfo@8 NtGdiGetColorAdjustment@8 -;NtGdiGetColorSpaceforBitmap@4 +NtGdiGetColorSpaceforBitmap@4 NtGdiGetDCDword@12 -;NtGdiGetDCforBitmap@4 -;NtGdiGetDCObject@8 +NtGdiGetDCforBitmap@4 +NtGdiGetDCObject@8 NtGdiGetDCPoint@12 NtGdiGetDeviceCaps@8 NtGdiGetDeviceGammaRamp@8 -;NtGdiGetDeviceCapsAll@8 -;NtGdiGetDIBitsInternal@36 -;NtGdiGetETM@8 -;NtGdiGetEudcTimeStampEx@12 +NtGdiGetDeviceCapsAll@8 +NtGdiGetDIBitsInternal@36 +NtGdiGetETM@8 +NtGdiGetEudcTimeStampEx@12 NtGdiGetFontData@20 NtGdiGetFontResourceInfoInternalW@28 ;NtGdiGetGlyphIndicesW@20 Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild Tue Aug 28 19:06:36 2007 @@ -1,4 +1,4 @@ -<module name="w32kdll_ros" type="win32dll" entrypoint="0" installname="w32kdll_ros.dll"> +<module name="w32kdll" type="win32dll" entrypoint="0" installname="w32kdll.dll"> <importlibrary definition="w32kdll_ros.def" /> <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0502</define> Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdCreateDirectDrawObject.c Tue Aug 28 19:06:36 2007 @@ -1,22 +1,11 @@ #include "../w32knapi.h" - - -W32KAPI -HANDLE -APIENTRY -NtGdiDdCreateDirectDrawObject( - IN HDC hdc -) -{ - return (HANDLE)Syscall(L"NtGdiDdCreateDirectDrawObject", 1, &hdc); -} INT Test_NtGdiDdCreateDirectDrawObject(PTESTINFO pti) { HANDLE hDirectDraw; HDC hdc = CreateDCW(L"DISPLAY",NULL,NULL,NULL); - ASSERT1(hdc != NULL); + ASSERT(hdc != NULL); /* Test ReactX */ RTEST(NtGdiDdCreateDirectDrawObject(NULL) == NULL); Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdDeleteDirectDrawObject.c Tue Aug 28 19:06:36 2007 @@ -15,12 +15,12 @@ { HANDLE hDirectDraw; HDC hdc = CreateDCW(L"DISPLAY",NULL,NULL,NULL); - ASSERT1(hdc != NULL); + ASSERT(hdc != NULL); /* Test ReactX */ RTEST(NtGdiDdDeleteDirectDrawObject(NULL) == FALSE); RTEST((hDirectDraw=NtGdiDdCreateDirectDrawObject(hdc)) != NULL); - ASSERT1(hDirectDraw != NULL); + ASSERT(hDirectDraw != NULL); RTEST(NtGdiDdDeleteDirectDrawObject(hDirectDraw) == TRUE); /* Cleanup ReactX setup */ Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Tue Aug 28 19:06:36 2007 @@ -64,10 +64,10 @@ EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); hdc = CreateDCW(L"DISPLAY",NULL,NULL,NULL); - ASSERT1(hdc != NULL); + ASSERT(hdc != NULL); hDirectDraw = (HANDLE) Syscall(L"NtGdiDdCreateDirectDrawObject", 1, &hdc); - ASSERT1(hDirectDraw != NULL); + ASSERT(hDirectDraw != NULL); /* Test ReactX */ hDirectDraw = (HANDLE) Syscall(L"NtGdiDdCreateDirectDrawObject", 1, &hdc); @@ -123,7 +123,7 @@ RTEST(puD3dTextureFormats == NULL); RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); @@ -131,7 +131,7 @@ (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) { RTEST(pHalInfo->dwSize != sizeof(DD_HALINFO)); - ASSERT1(pHalInfo->dwSize != sizeof(DD_HALINFO)); + ASSERT(pHalInfo->dwSize != sizeof(DD_HALINFO)); } if (pHalInfo->dwSize == sizeof(DD_HALINFO)) @@ -149,7 +149,7 @@ RTEST(pHalInfo->vmiData.lDisplayPitch == 0x1700; */ RTEST(pHalInfo->vmiData.ddpfDisplay.dwSize == sizeof(DDPIXELFORMAT) ); - ASSERT1(pHalInfo->vmiData.ddpfDisplay.dwSize == sizeof(DDPIXELFORMAT)); + ASSERT(pHalInfo->vmiData.ddpfDisplay.dwSize == sizeof(DDPIXELFORMAT)); /* Fail on 8bit screen deep */ RTEST(pHalInfo->vmiData.ddpfDisplay.dwFlags == DDPF_RGB); @@ -225,7 +225,7 @@ RTEST(puD3dTextureFormats == NULL); RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); @@ -266,7 +266,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); @@ -307,7 +307,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); @@ -351,7 +351,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); @@ -395,7 +395,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); @@ -453,7 +453,7 @@ RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT1(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); /* We do not retesting DD_HALINFO, instead we compare it */ RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiArcInternal.c Tue Aug 28 19:06:36 2007 @@ -1,22 +1,3 @@ -#include "../w32knapi.h" - -BOOL -STDCALL -NtGdiArcInternal( - ARCTYPE arctype, - HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XStartArc, - int YStartArc, - int XEndArc, - int YEndArc) -{ - return (BOOL)Syscall(L"NtGdiArcInternal", 10, &arctype); -} - INT Test_NtGdiArcInternal(PTESTINFO pti) { Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Tue Aug 28 19:06:36 2007 @@ -1,19 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -HBITMAP -APIENTRY -NtGdiCreateBitmap( - IN INT cx, - IN INT cy, - IN UINT cPlanes, - IN UINT cBPP, - IN OPTIONAL LPBYTE pjInit -) -{ - return (HBITMAP)Syscall(L"NtGdiCreateBitmap", 5, &cx); -} - INT Test_NtGdiCreateBitmap_Params(PTESTINFO pti) { @@ -66,7 +50,7 @@ SetLastError(ERROR_SUCCESS); TEST((hBmp = NtGdiCreateBitmap(1, 1, 0, 1, NULL)) != NULL); TEST(GetLastError() == ERROR_SUCCESS); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmType == 0); TEST(bitmap.bmWidth == 1); TEST(bitmap.bmHeight == 1); @@ -88,7 +72,7 @@ SetLastError(ERROR_SUCCESS); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 0, NULL)) != NULL); TEST(GetLastError() == ERROR_SUCCESS); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmType == 0); TEST(bitmap.bmWidth == 1); TEST(bitmap.bmHeight == 1); @@ -105,32 +89,32 @@ /* Test bad cBPP */ SetLastError(ERROR_SUCCESS); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 3, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 4); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 6, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 8); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 15, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 16); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 17, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 24); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 3, 7, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 24); DeleteObject(hBmp); TEST((hBmp = NtGdiCreateBitmap(1, 1, 1, 25, NULL)) != NULL); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmBitsPixel == 32); DeleteObject(hBmp); @@ -154,7 +138,7 @@ SetLastError(ERROR_SUCCESS); TEST((hBmp = NtGdiCreateBitmap(5, 7, 2, 4, NULL)) != NULL); TEST(GetLastError() == ERROR_SUCCESS); - ASSERT1(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); + ASSERT(GetObject(hBmp, sizeof(BITMAP), &bitmap) == sizeof(BITMAP)); TEST(bitmap.bmType == 0); TEST(bitmap.bmWidth == 5); TEST(bitmap.bmHeight == 7); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleBitmap.c Tue Aug 28 19:06:36 2007 @@ -1,16 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -HBITMAP -APIENTRY -NtGdiCreateCompatibleBitmap( - IN HDC hdc, - IN INT cx, - IN INT cy -) -{ - return (HBITMAP)Syscall(L"NtGdiCreateCompatibleBitmap", 3, &hdc); -} INT Test_NtGdiCreateCompatibleBitmap(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c Tue Aug 28 19:06:36 2007 @@ -1,20 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -LONG -APIENTRY -NtGdiDoPalette( - IN HPALETTE hpal, - IN WORD iStart, - IN WORD cEntries, - IN PALETTEENTRY *pPalEntries, - IN DWORD iFunc, - IN BOOL bInbound -) -{ - return (LONG)Syscall(L"NtGdiDoPalette", 6, &hpal); -} - HPALETTE CreateTestPalette() { Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEngCreatePalette.c Tue Aug 28 19:06:36 2007 @@ -1,0 +1,33 @@ + +HPALETTE +APIENTRY +NtGdiEngCreatePalette( + IN ULONG iMode, + IN ULONG cColors, + IN ULONG *pulColors, + IN FLONG flRed, + IN FLONG flGreen, + IN FLONG flBlue) +{ + return (HPALETTE)Syscall(L"NtGdiEngCreatePalette", 6, &iMode); +} + +INT +Test_NtGdiEngCreatePalette(PTESTINFO pti) +{ + HPALETTE hPal; + ULONG Colors[3] = {1,2,3}; + PGDI_TABLE_ENTRY pEntry; + + hPal = NtGdiEngCreatePalette(PAL_RGB, 3, Colors, 0xff000000, 0x00ff0000, 0x0000ff00); + + TEST(hPal != 0); + TEST(GDI_HANDLE_GET_TYPE(hPal) == GDI_OBJECT_TYPE_PALETTE); + pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(hPal)]; + TEST(pEntry->KernelData != NULL); + TEST(pEntry->ProcessId == (HANDLE)GetCurrentProcessId()); + TEST(pEntry->UserData == 0); + TEST(pEntry->Type == (((UINT)hPal >> 16) | GDI_OBJECT_TYPE_PALETTE)); + + return APISTATUS_NORMAL; +} Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiEnumFontOpen.c Tue Aug 28 19:06:36 2007 @@ -1,0 +1,31 @@ +INT +Test_NtGdiEnumFontOpen(PTESTINFO pti) +{ + HDC hDC; + ULONG_PTR idEnum; + ULONG ulCount; + PGDI_TABLE_ENTRY pEntry; + + hDC = CreateDCW(L"DISPLAY",NULL,NULL,NULL); + + // FIXME: We should load the font first + + idEnum = NtGdiEnumFontOpen(hDC, 2, 0, 32, L"Courier", ANSI_CHARSET, &ulCount); + ASSERT(idEnum != 0); + + /* we should have a gdi handle here */ + TEST(GDI_HANDLE_GET_TYPE(idEnum) == GDI_OBJECT_TYPE_ENUMFONT); + pEntry = &GdiHandleTable[GDI_HANDLE_GET_INDEX(idEnum)]; + TEST(pEntry->KernelData != NULL); + TEST(pEntry->ProcessId == (HANDLE)GetCurrentProcessId()); + TEST(pEntry->UserData == 0); + TEST(pEntry->Type == ((idEnum >> 16) | GDI_OBJECT_TYPE_ENUMFONT)); + + /* We should not be able to use DeleteObject() on the handle */ + TEST(DeleteObject((HGDIOBJ)idEnum) == FALSE); + + // FIXME: Close the enum handle + + return APISTATUS_NORMAL; +} + Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetBitmapBits.c Tue Aug 28 19:06:36 2007 @@ -1,15 +1,3 @@ -#include "../w32knapi.h" - -LONG STDCALL -NtGdiGetBitmapBits( - HBITMAP hBitmap, - DWORD Bytes, - IN PBYTE Bits) -{ - return (LONG)Syscall(L"NtGdiGetBitmapBits", 3, &hBitmap); -} - - INT Test_NtGdiGetBitmapBits(PTESTINFO pti) { Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c Tue Aug 28 19:06:36 2007 @@ -1,17 +1,3 @@ -#include "../w32knapi.h" - -W32KAPI -INT -APIENTRY -NtGdiGetRandomRgn( - IN HDC hdc, - IN HRGN hrgn, - IN INT iRgn) -{ - return (INT)Syscall(L"NtGdiGetRandomRgn", 3, &hdc); -} - - INT Test_NtGdiGetRandomRgn(PTESTINFO pti) { @@ -26,7 +12,7 @@ // UpdateWindow(hWnd); hDC = GetDC(hWnd); - ASSERT1(hDC != NULL); + ASSERT(hDC != NULL); hrgn = CreateRectRgn(0,0,0,0); hrgn2 = CreateRectRgn(3,3,10,10); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetBitmapBits.c Tue Aug 28 19:06:36 2007 @@ -1,14 +1,4 @@ #include "../w32knapi.h" - -LONG STDCALL -NtGdiSetBitmapBits( - HBITMAP hBitmap, - DWORD Bytes, - IN PBYTE Bits) -{ - return (LONG)Syscall(L"NtGdiSetBitmapBits", 3, &hBitmap); -} - INT Test_NtGdiSetBitmapBits(PTESTINFO pti) Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Tue Aug 28 19:06:36 2007 @@ -1,4 +1,4 @@ -#include "../apitest.h" +#include "w32knapi.h" /* include the tests */ @@ -10,6 +10,9 @@ #include "ntgdi/NtGdiCreateBitmap.c" #include "ntgdi/NtGdiCreateCompatibleBitmap.c" #include "ntgdi/NtGdiDoPalette.c" +#include "ntgdi/NtGdiEngCreatePalette.c" +//#include "ntgdi/NtGdiEnumFontChunk.c" +#include "ntgdi/NtGdiEnumFontOpen.c" #include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiGetRandomRgn.c" #include "ntgdi/NtGdiSetBitmapBits.c" @@ -30,6 +33,9 @@ { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, { L"NtGdiDoPalette", Test_NtGdiDoPalette }, + { L"NtGdiEngCreatePalette", Test_NtGdiEngCreatePalette }, +// { L"NtGdiEnumFontChunk", Test_NtGdiEnumFontChunk }, + { L"NtGdiEnumFontOpen", Test_NtGdiEnumFontOpen }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Tue Aug 28 19:06:36 2007 @@ -2,6 +2,7 @@ HINSTANCE g_hInstance; HMODULE g_hModule = NULL; +PGDI_TABLE_ENTRY GdiHandleTable; static DWORD STDCALL IntSyscall(FARPROC proc, UINT cParams, PVOID pFirstParam) @@ -58,7 +59,8 @@ int nCmdShow) { g_hInstance = hInstance; - + GDIQUERYPROC GdiQueryHandleTable; + printf("Win32k native API test\n"); /* Convert to gui thread */ @@ -68,7 +70,18 @@ if (!g_hModule) { printf("w32kdll.dll not found!\n"); - return FALSE; + return -1; + } + + GdiQueryHandleTable = (GDIQUERYPROC)GetProcAddress(GetModuleHandleW(L"GDI32.DLL"), "GdiQueryTable"); + if(!GdiQueryHandleTable) + { + return -1; + } + GdiHandleTable = GdiQueryHandleTable(); + if(!GdiHandleTable) + { + return -1; } printf("\n"); Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Tue Aug 28 19:06:36 2007 @@ -1,10 +1,16 @@ #ifndef _W32KNAPI_H #define _W32KNAPI_H -#include "../apitest.h" +#define WIN32_NO_STATUS +#define NTOS_MODE_USER +#define WINVER 0x501 -#include <ddk/winddi.h> -#include <ddk/ntddk.h> +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <ntddk.h> +#include <d3dnthal.h> +#include <prntfont.h> /* Public Win32K Headers */ #include <win32k/callback.h> @@ -12,11 +18,13 @@ #include <win32k/ntgdityp.h> #include <win32k/ntgdihdl.h> +#include <ntgdi.h> + +#include "../apitest.h" + #define OS_UNSUPPORTED 0 #define OS_REACTOS 1 #define OS_WINDOWS 2 - -#define W32KAPI typedef struct { @@ -25,11 +33,11 @@ INT nParams; } SYCALL_ENTRY, *PSYSCALL_ENTRY; +typedef PGDI_TABLE_ENTRY (CALLBACK * GDIQUERYPROC) (void); + extern HINSTANCE g_hInstance; -extern SYCALL_ENTRY SyscallTable_XP_2600[]; -extern SYCALL_ENTRY SyscallTable_2K_2195[]; extern HMODULE g_hModule; -extern INT g_nOsVer; +extern PGDI_TABLE_ENTRY GdiHandleTable; DWORD Syscall(LPWSTR lpszFunction, int cParams, void* pParams); BOOL InitOsVersion(); Modified: trunk/rostests/apitests/w32knapi/w32knapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.rbuild (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.rbuild Tue Aug 28 19:06:36 2007 @@ -7,6 +7,7 @@ <library>user32</library> <library>gdi32</library> <library>shell32</library> + <library>w32kdll</library> <file>w32knapi.c</file> <file>testlist.c</file> </module>

1 0

[gedmurphy] 28618: - don't read the description directly from the registry - give each property dialog it's own service data instead of relying on the the global current. This will eventually allow us to have multiple property dialogs open.
by gedmurphy＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: gedmurphy Date: Tue Aug 28 18:49:47 2007 New Revision: 28618 URL: http://svn.reactos.org/svn/reactos?rev=28618&view=rev Log: - don't read the description directly from the registry - give each property dialog it's own service data instead of relying on the the global current. This will eventually allow us to have multiple property dialogs open. Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/reg.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Tue Aug 28 18:49:47 2007 @@ -161,7 +161,7 @@ { LPTSTR lpDescription; - lpDescription = GetDescription(Info->pCurrentService->lpServiceName); + lpDescription = GetServiceDescription(Info->pCurrentService->lpServiceName); item.pszText = lpDescription; SendMessage(Info->hListView, Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Tue Aug 28 18:49:47 2007 @@ -71,13 +71,14 @@ /* query.c */ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); -LPTSTR GetExecutablePath(PMAIN_WND_INFO Info); +LPQUERY_SERVICE_CONFIG GetServiceConfig(LPTSTR lpServiceName); +LPTSTR GetServiceDescription(LPTSTR lpServiceName); +LPTSTR GetExecutablePath(LPTSTR lpServiceName); BOOL RefreshServiceList(PMAIN_WND_INFO Info); BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); /* reg */ BOOL SetDescription(LPTSTR, LPTSTR); -LPTSTR GetDescription(LPTSTR); /* propsheet.c */ LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info); Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Tue Aug 28 18:49:47 2007 @@ -9,15 +9,22 @@ #include "precomp.h" +typedef struct _SERVICEPROPSHEET +{ + PMAIN_WND_INFO Info; + ENUM_SERVICE_STATUS_PROCESS *pService; +} SERVICEPROPSHEET, *PSERVICEPROPSHEET; + + static VOID -SetButtonStates(PMAIN_WND_INFO Info, +SetButtonStates(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) { HWND hButton; DWORD Flags, State; - Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; + Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted; + State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState; if (State == SERVICE_STOPPED) { @@ -49,56 +56,53 @@ * values and sets it to value of the selected item */ static VOID -SetStartupType(PMAIN_WND_INFO Info, +SetStartupType(LPTSTR lpServiceName, HWND hwndDlg) { HWND hList; - HKEY hKey; - TCHAR buf[25]; - DWORD dwValueSize = 0; + LPQUERY_SERVICE_CONFIG pServiceConfig; + LPTSTR lpBuf; DWORD StartUp = 0; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR KeyBuf[300]; - - /* open the registry key for the service */ - _sntprintf(KeyBuf, - sizeof(KeyBuf) / sizeof(TCHAR), - Path, - Info->pCurrentService->lpServiceName); - - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - KeyBuf, + UINT i; + + hList = GetDlgItem(hwndDlg, IDC_START_TYPE); + + for (i = IDS_SERVICES_AUTO; i <= IDS_SERVICES_DIS; i++) + { + if (AllocAndLoadString(&lpBuf, + hInstance, + i)) + { + SendMessage(hList, + CB_ADDSTRING, + 0, + (LPARAM)lpBuf); + HeapFree(ProcessHeap, + 0, + lpBuf); + } + } + + pServiceConfig = GetServiceConfig(lpServiceName); + + if (pServiceConfig) + { + switch (pServiceConfig->dwStartType) + { + case SERVICE_AUTO_START: StartUp = 0; break; + case SERVICE_DEMAND_START: StartUp = 1; break; + case SERVICE_DISABLED: StartUp = 2; break; + } + + SendMessage(hList, + CB_SETCURSEL, + StartUp, + 0); + + HeapFree(ProcessHeap, 0, - KEY_READ, - &hKey); - - hList = GetDlgItem(hwndDlg, IDC_START_TYPE); - - LoadString(hInstance, IDS_SERVICES_AUTO, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); - LoadString(hInstance, IDS_SERVICES_MAN, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); - LoadString(hInstance, IDS_SERVICES_DIS, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); - - dwValueSize = sizeof(DWORD); - if (RegQueryValueEx(hKey, - _T("Start"), - NULL, - NULL, - (LPBYTE)&StartUp, - &dwValueSize)) - { - RegCloseKey(hKey); - return; - } - - if (StartUp == 0x02) - SendMessage(hList, CB_SETCURSEL, 0, 0); - else if (StartUp == 0x03) - SendMessage(hList, CB_SETCURSEL, 1, 0); - else if (StartUp == 0x04) - SendMessage(hList, CB_SETCURSEL, 2, 0); + pServiceConfig); + } } @@ -107,28 +111,28 @@ * the relevant service information */ static VOID -GetDlgInfo(PMAIN_WND_INFO Info, +GetDlgInfo(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) { + LPQUERY_SERVICE_CONFIG pServiceConfig; LPTSTR lpDescription; - LPTSTR lpPathToExe; /* set the service name */ SendDlgItemMessage(hwndDlg, IDC_SERV_NAME, WM_SETTEXT, 0, - (LPARAM)Info->pCurrentService->lpServiceName); + (LPARAM)dlgInfo->pService->lpServiceName); /* set the display name */ SendDlgItemMessage(hwndDlg, IDC_DISP_NAME, WM_SETTEXT, 0, - (LPARAM)Info->pCurrentService->lpDisplayName); + (LPARAM)dlgInfo->pService->lpDisplayName); /* set the description */ - if ((lpDescription = GetDescription(Info->pCurrentService->lpServiceName))) + if ((lpDescription = GetServiceDescription(dlgInfo->pService->lpServiceName))) { SendDlgItemMessage(hwndDlg, IDC_DESCRIPTION, @@ -139,29 +143,24 @@ HeapFree(ProcessHeap, 0, lpDescription); - - - } - - /* set the executable path */ - if ((lpPathToExe = GetExecutablePath(Info))) + } + + pServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName); + if (pServiceConfig) { SendDlgItemMessage(hwndDlg, IDC_EXEPATH, WM_SETTEXT, 0, - (LPARAM)lpPathToExe); - - HeapFree(ProcessHeap, - 0, - lpPathToExe); - } + (LPARAM)pServiceConfig->lpBinaryPathName); + } + /* set startup type */ - SetStartupType(Info, hwndDlg); + SetStartupType(dlgInfo->pService->lpServiceName, hwndDlg); /* set service status */ - if (Info->pCurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + if (dlgInfo->pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) { TCHAR szServiceStatus[32]; @@ -192,7 +191,6 @@ (LPARAM)szServiceStatus); } } - /* @@ -205,13 +203,12 @@ WPARAM wParam, LPARAM lParam) { - PMAIN_WND_INFO Info; + PSERVICEPROPSHEET dlgInfo; /* Get the window context */ - Info = (PMAIN_WND_INFO)GetWindowLongPtr(hwndDlg, - GWLP_USERDATA); - - if (Info == NULL && uMsg != WM_INITDIALOG) + dlgInfo = (PSERVICEPROPSHEET)GetWindowLongPtr(hwndDlg, + GWLP_USERDATA); + if (dlgInfo == NULL && uMsg != WM_INITDIALOG) { return FALSE; } @@ -220,14 +217,14 @@ { case WM_INITDIALOG: { - Info = (PMAIN_WND_INFO)(((LPPROPSHEETPAGE)lParam)->lParam); - if (Info != NULL) + dlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam); + if (dlgInfo != NULL) { SetWindowLongPtr(hwndDlg, GWLP_USERDATA, - (LONG_PTR)Info); - GetDlgInfo(Info, hwndDlg); - SetButtonStates(Info, hwndDlg); + (LONG_PTR)dlgInfo); + GetDlgInfo(dlgInfo, hwndDlg); + SetButtonStates(dlgInfo, hwndDlg); } } break; @@ -236,31 +233,34 @@ switch(LOWORD(wParam)) { case IDC_START_TYPE: - /* Enable the 'Apply' button */ - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + if (HIWORD(wParam) == CBN_SELCHANGE) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_START: - SendMessage(Info->hMainWnd, WM_COMMAND, ID_START, 0); + if (DoStart(dlgInfo->Info)) + { + //UpdateServiceStatus(dlgInfo->pService); + //ChangeListViewText(dlgInfo, LVSTATUS); + //SetMenuAndButtonStates(Info); + } break; case IDC_STOP: - SendMessage(Info->hMainWnd, WM_COMMAND, ID_STOP, 0); + //SendMessage(Info->hMainWnd, WM_COMMAND, ID_STOP, 0); break; case IDC_PAUSE: - SendMessage(Info->hMainWnd, WM_COMMAND, ID_PAUSE, 0); + //SendMessage(Info->hMainWnd, WM_COMMAND, ID_PAUSE, 0); break; case IDC_RESUME: - SendMessage(Info->hMainWnd, WM_COMMAND, ID_RESUME, 0); + //SendMessage(Info->hMainWnd, WM_COMMAND, ID_RESUME, 0); break; case IDC_START_PARAM: - /* Enable the 'Apply' button */ - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; } break; @@ -273,9 +273,8 @@ switch (lpnm->code) { - case MCN_SELECT: - /* Enable the 'Apply' button */ - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + case PSN_APPLY: + MessageBox(NULL, _T("apply"), NULL, 0); break; } } @@ -381,7 +380,7 @@ static VOID InitPropSheetPage(PROPSHEETPAGE *psp, - PMAIN_WND_INFO Info, + PSERVICEPROPSHEET dlgInfo, WORD idDlg, DLGPROC DlgProc) { @@ -391,7 +390,7 @@ psp->hInstance = hInstance; psp->pszTemplate = MAKEINTRESOURCE(idDlg); psp->pfnDlgProc = DlgProc; - psp->lParam = (LPARAM)Info; + psp->lParam = (LPARAM)dlgInfo; } @@ -400,6 +399,8 @@ { PROPSHEETHEADER psh; PROPSHEETPAGE psp[2]; + PSERVICEPROPSHEET pServicePropSheet; + LONG Ret = 0; ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); @@ -414,11 +415,27 @@ psh.ppsp = psp; - InitPropSheetPage(&psp[0], Info, IDD_DLG_GENERAL, GeneralPageProc); - //InitPropSheetPage(&psp[1], Info, IDD_DLG_GENERAL, LogonPageProc); - //InitPropSheetPage(&psp[2], Info, IDD_DLG_GENERAL, RecoveryPageProc); - InitPropSheetPage(&psp[1], Info, IDD_DLG_DEPEND, DependanciesPageProc); - - return (LONG)(PropertySheet(&psh) != -1); -} - + pServicePropSheet = HeapAlloc(ProcessHeap, + 0, + sizeof(*pServicePropSheet)); + if (pServicePropSheet) + { + /* save current service, as it could change while the dialog is open */ + pServicePropSheet->pService = Info->pCurrentService; + pServicePropSheet->Info = Info; + + InitPropSheetPage(&psp[0], pServicePropSheet, IDD_DLG_GENERAL, GeneralPageProc); + //InitPropSheetPage(&psp[1], Info, IDD_DLG_GENERAL, LogonPageProc); + //InitPropSheetPage(&psp[2], Info, IDD_DLG_GENERAL, RecoveryPageProc); + InitPropSheetPage(&psp[1], pServicePropSheet, IDD_DLG_DEPEND, DependanciesPageProc); + + Ret = (LONG)(PropertySheet(&psh) != -1); + + HeapFree(ProcessHeap, + 0, + pServicePropSheet); + } + + return Ret; +} + Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Tue Aug 28 18:49:47 2007 @@ -27,29 +27,25 @@ } -/* get vendor of service binary */ -LPTSTR -GetExecutablePath(PMAIN_WND_INFO Info) +LPQUERY_SERVICE_CONFIG +GetServiceConfig(LPTSTR lpServiceName) { SC_HANDLE hSCManager = NULL; SC_HANDLE hSc = NULL; LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; DWORD BytesNeeded = 0; - LPTSTR lpExePath = NULL; - - /* open handle to the SCM */ + hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); if (hSCManager == NULL) { GetError(); - return FALSE; - } - - /* get a handle to the service requested for starting */ + return NULL; + } + hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, + lpServiceName, SERVICE_QUERY_CONFIG); if (hSc == NULL) { @@ -70,32 +66,101 @@ if (pServiceConfig == NULL) goto cleanup; - if (QueryServiceConfig(hSc, - pServiceConfig, - BytesNeeded, - &BytesNeeded)) - { - lpExePath = HeapAlloc(ProcessHeap, - 0, - (_tcslen(pServiceConfig->lpBinaryPathName) +1 ) * sizeof(TCHAR)); - - _tcscpy(lpExePath, pServiceConfig->lpBinaryPathName); + if (!QueryServiceConfig(hSc, + pServiceConfig, + BytesNeeded, + &BytesNeeded)) + { + HeapFree(ProcessHeap, + 0, + pServiceConfig); + + pServiceConfig = NULL; } } } cleanup: - if (pServiceConfig) - HeapFree(ProcessHeap, - 0, - pServiceConfig); if (hSCManager != NULL) CloseServiceHandle(hSCManager); if (hSc != NULL) CloseServiceHandle(hSc); - return lpExePath; -} + return pServiceConfig; +} + + +LPTSTR +GetServiceDescription(LPTSTR lpServiceName) +{ + SC_HANDLE hSCManager = NULL; + SC_HANDLE hSc = NULL; + SERVICE_DESCRIPTION *pServiceDescription = NULL; + LPTSTR lpDescription = NULL; + DWORD BytesNeeded = 0; + + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); + if (hSCManager == NULL) + { + GetError(); + return NULL; + } + + hSc = OpenService(hSCManager, + lpServiceName, + SERVICE_QUERY_CONFIG); + if (hSc) + { + if (!QueryServiceConfig2(hSc, + SERVICE_CONFIG_DESCRIPTION, + NULL, + 0, + &BytesNeeded)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + pServiceDescription = (SERVICE_DESCRIPTION *) HeapAlloc(ProcessHeap, + 0, + BytesNeeded); + if (pServiceDescription == NULL) + goto cleanup; + + if (QueryServiceConfig2(hSc, + SERVICE_CONFIG_DESCRIPTION, + (LPBYTE)pServiceDescription, + BytesNeeded, + &BytesNeeded)) + { + if (pServiceDescription->lpDescription) + { + lpDescription = HeapAlloc(ProcessHeap, + 0, + (_tcslen(pServiceDescription->lpDescription) + 1) * sizeof(TCHAR)); + if (lpDescription) + _tcscpy(lpDescription, + pServiceDescription->lpDescription); + } + } + } + } + } + +cleanup: + if (pServiceDescription) + HeapFree(ProcessHeap, + 0, + pServiceDescription); + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hSc != NULL) + CloseServiceHandle(hSc); + + return lpDescription; +} + + static BOOL @@ -206,6 +271,7 @@ RefreshServiceList(PMAIN_WND_INFO Info) { ENUM_SERVICE_STATUS_PROCESS *pService; + LPTSTR lpDescription; LVITEM lvItem; TCHAR szNumServices[32]; TCHAR szStatus[64]; @@ -223,7 +289,6 @@ for (Index = 0; Index < NumServices; Index++) { HKEY hKey = NULL; - LPTSTR lpDescription = NULL; LPTSTR lpLogOnAs = NULL; DWORD StartUp = 0; DWORD dwValueSize; @@ -260,7 +325,7 @@ lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); /* set the description */ - if ((lpDescription = GetDescription(pService->lpServiceName))) + if ((lpDescription = GetServiceDescription(pService->lpServiceName))) { lvItem.pszText = lpDescription; lvItem.iSubItem = 1; Modified: trunk/reactos/base/applications/mscutils/servman/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/reg.c (original) +++ trunk/reactos/base/applications/mscutils/servman/reg.c Tue Aug 28 18:49:47 2007 @@ -57,46 +57,3 @@ return bRet; } - - -LPTSTR -GetDescription(LPTSTR lpServiceName) -{ - HKEY hKey; - LPTSTR lpDescription = NULL; - DWORD dwValueSize = 0; - - hKey = OpenServiceKey(lpServiceName); - if (hKey) - { - if (RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - NULL, - &dwValueSize) == ERROR_SUCCESS) - { - lpDescription = HeapAlloc(ProcessHeap, - 0, - dwValueSize); - if (lpDescription) - { - if(RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - (LPBYTE)lpDescription, - &dwValueSize) != ERROR_SUCCESS) - { - HeapFree(ProcessHeap, - 0, - lpDescription); - } - } - } - - RegCloseKey(hKey); - } - - return lpDescription; -}

1 0

[hpoussin] 28617: Install VBE and VGA drivers when a compatible graphic adapter is detected See issue #2589 for more details.
by hpoussin＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: hpoussin Date: Tue Aug 28 18:27:23 2007 New Revision: 28617 URL: http://svn.reactos.org/svn/reactos?rev=28617&view=rev Log: Install VBE and VGA drivers when a compatible graphic adapter is detected See issue #2589 for more details. Modified: trunk/reactos/media/inf/display.inf Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/display.inf (original) +++ trunk/reactos/media/inf/display.inf Tue Aug 28 18:27:23 2007 @@ -1,16 +1,19 @@ ; Display.INF ; -; Installation file for the Display class +; Installation file for the display adapters and display class ; [Version] Signature = "$Windows NT$" ;Signature = "$ReactOS$" LayoutFile = layout.inf +Class = Display +ClassGUID = {4D36E968-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 08/25/2007,1.10 -Class = Display -ClassGUID = {4d36e968-e325-11ce-bfc1-08002be10318} -Provider = %ReactOS% -DriverVer = 10/18/2005,1.00 +[DestinationDirs] +DefaultDestDir = 12 +VGA.Display_CopyFiles.NT = 11 [ClassInstall32.NT] AddReg = DisplayClass.NT.AddReg @@ -20,6 +23,50 @@ HKR, , Icon, 0, "-1" HKR, , Installer32, 0, "desk.cpl,DisplayClassInstaller" +[Manufacturer] +%StdMfg% = StdMfg + +[StdMfg] +%VGA.DeviceDesc% = VGA_Inst,PCI\CC_0001 +%VGA.DeviceDesc% = VGA_Inst,PCI\CC_0300 +%VGA.DeviceDesc% = VGA_Inst,PCI\CC_0301 + +;---------------------------- VGA/VBE DRIVER ---------------------------- + +[VGA_Inst.NT] +CopyFiles = VGA.Miniport_CopyFiles.NT, VGA.Display_CopyFiles.NT + +[VGA.Miniport_CopyFiles.NT] +vgamp.sys +vbemp.sys + +[VGA.Display_CopyFiles.NT] +vgaddi.dll +framebuf.dll + +[VGA_Inst.NT.Services] +AddService = VGA, , VGA_Service_Inst +AddService = VBE, 0x00000002, VBE_Service_Inst + +[VGA_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 0 +ServiceBinary = %12%\vgamp.sys +LoadOrderGroup = Video Save + +[VBE_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 0 +ServiceBinary = %12%\vbemp.sys +LoadOrderGroup = Video SVGA Save + +;-------------------------------- STRINGS ------------------------------- + [Strings] ReactOS = "ReactOS Team" DisplayClassName = "Display Adapters" + +StdMfg = "(Standard display adapters)" +VGA.DeviceDesc = "VGA-compatible graphic card"

1 0

[janderwald] 28616: - search for ReactOS installation cd and try locate directly the unattend.inf. This allows us to use the _same_ unattend.inf which is used in usetup. As a result we no longer need to put a second unattend.inf in the reactos.cab which revives the bootcdregtest
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Tue Aug 28 18:00:24 2007 New Revision: 28616 URL: http://svn.reactos.org/svn/reactos?rev=28616&view=rev Log: - search for ReactOS installation cd and try locate directly the unattend.inf. This allows us to use the _same_ unattend.inf which is used in usetup. As a result we no longer need to put a second unattend.inf in the reactos.cab which revives the bootcdregtest Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Tue Aug 28 18:00:24 2007 @@ -60,6 +60,8 @@ /* FUNCTIONS ****************************************************************/ +BOOL +GetRosInstallCD(WCHAR * szPath, DWORD dwPathLength); #ifdef VMWINST static BOOL @@ -779,7 +781,7 @@ static BOOL -RunControlPanelApplet(HWND hwnd, TCHAR *lpCommandLine) +RunControlPanelApplet(HWND hwnd, WCHAR *lpCommandLine) { STARTUPINFO StartupInfo; PROCESS_INFORMATION ProcessInformation; @@ -787,7 +789,7 @@ ZeroMemory(&StartupInfo, sizeof(STARTUPINFO)); StartupInfo.cb = sizeof(STARTUPINFO); - if (!CreateProcess(NULL, + if (!CreateProcessW(NULL, lpCommandLine, NULL, NULL, @@ -815,7 +817,7 @@ LPARAM lParam) { PSETUPDATA SetupData; - TCHAR szBuffer[MAX_PATH]; + WCHAR szBuffer[1024]; /* Retrieve pointer to the global setup data */ SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); @@ -841,7 +843,7 @@ { case IDC_CUSTOMLOCALE: { - _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,5")); + wcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,5")); RunControlPanelApplet(hwndDlg, szBuffer); /* FIXME: Update input locale name */ } @@ -849,7 +851,7 @@ case IDC_CUSTOMLAYOUT: { - _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL main.cpl,@1")); + wcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL main.cpl,@1")); RunControlPanelApplet(hwndDlg, szBuffer); } break; @@ -868,7 +870,16 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (SetupData->UnattendSetup) { - _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\"")); + WCHAR szPath[MAX_PATH]; + if (GetRosInstallCD(szPath, MAX_PATH)) + { + wsprintf(szBuffer, L"rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"%s\\reactos\\unattend.inf\"", szPath); + } + else + { + wcscpy(szBuffer, L"rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\""); + } + RunControlPanelApplet(hwndDlg, szBuffer); SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); return TRUE; @@ -2144,29 +2155,103 @@ return TRUE; } +/* + * GetRosInstallCD should find the path to ros installation medium + * BUG 1 + * If there are more than one CDDrive in it containing a ReactOS + * installation cd, then it will pick the first one regardless if + * it is really the installation cd + * + * The best way to implement this is to set the key + * HKLM\Software\Microsoft\Windows NT\CurrentVersion\SourcePath (REG_SZ) + */ + +BOOL +GetRosInstallCD(WCHAR * szPath, DWORD dwPathLength) +{ + WCHAR szDrives[512]; + WCHAR szDrive[] = L"D:\\"; + DWORD dwLength, dwIndex; + WCHAR * pDrive; + dwLength = GetLogicalDriveStringsW(sizeof(szDrives) / sizeof(WCHAR), szDrives); + + if (dwLength > (sizeof(szDrives) / sizeof(WCHAR)) || dwLength == 0) + { + /* buffer too small or failure */ + LogItem(SYSSETUP_SEVERITY_INFORMATION, L"GetLogicalDriveStringsW failed"); + return FALSE; + } + + pDrive = szDrives; + for (dwIndex = 0; dwIndex < dwLength; dwIndex++) + { + szDrive[0] = pDrive[dwIndex]; + if (GetDriveType(szDrive) == DRIVE_CDROM) + { + WCHAR szBuffer[MAX_PATH]; + wcscpy(szBuffer, szDrive); + wcscat(szBuffer, L"reactos\\ntoskrnl.exe"); + LogItem(SYSSETUP_SEVERITY_INFORMATION, szBuffer); + if (FileExists(szBuffer, NULL)) + { + wcsncpy(szPath, szDrive, dwPathLength); + return TRUE; + } + } + } + return FALSE; +} VOID -InstallWizard(VOID) -{ - PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[8]; - PROPSHEETPAGE psp = {0}; - UINT nPages = 0; +ProcessUnattendSetup() +{ + WCHAR szPath[MAX_PATH]; HINF hUnattendedInf; - - /* Clear setup data */ - ZeroMemory(&SetupData, sizeof(SETUPDATA)); - - hUnattendedInf = SetupOpenInfFileW(L"unattend.inf", + DWORD dwLength; + + if (!GetRosInstallCD(szPath, MAX_PATH)) + { + /* no cd drive found */ + return; + } + + dwLength = wcslen(szPath); + if (dwLength + 21 > MAX_PATH) + { + /* FIXME + * allocate bigger buffer + */ + return; + } + + wcscat(szPath, L"reactos\\unattend.inf"); + + hUnattendedInf = SetupOpenInfFileW(szPath, NULL, INF_STYLE_OLDNT, NULL); - + if (hUnattendedInf != INVALID_HANDLE_VALUE) { SetupData.UnattendSetup = ProcessUnattendInf(hUnattendedInf); SetupCloseInfFile(hUnattendedInf); } +} + + +VOID +InstallWizard(VOID) +{ + PROPSHEETHEADER psh; + HPROPSHEETPAGE ahpsp[8]; + PROPSHEETPAGE psp = {0}; + UINT nPages = 0; + + /* Clear setup data */ + ZeroMemory(&SetupData, sizeof(SETUPDATA)); + + ProcessUnattendSetup(); + /* Create the Welcome page */ psp.dwSize = sizeof(PROPSHEETPAGE);

1 0

[hpoussin] 28615: Revert r28603 and add the correct fix
by hpoussin＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: hpoussin Date: Tue Aug 28 17:40:56 2007 New Revision: 28615 URL: http://svn.reactos.org/svn/reactos?rev=28615&view=rev Log: Revert r28603 and add the correct fix Modified: trunk/reactos/include/reactos/typedefs_host.h trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/reactos/typedefs_host.h Tue Aug 28 17:40:56 2007 @@ -11,6 +11,16 @@ #include <stdlib.h> #include <limits.h> + +#ifndef __fastcall +#define __fastcall __attribute__((fastcall)) +#endif +#ifndef __cdecl +#define __cdecl __attribute__((cdecl)) +#endif +#ifndef __stdcall +#define __stdcall __attribute__((stdcall)) +#endif #define UNIMPLEMENTED { printf("%s unimplemented\n", __FUNCTION__); exit(1); } #define ASSERT(x) { if (!(x)) { printf("Assertion " #x " at %s:%d failed\n", __FILE__, __LINE__); exit(1); } } Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=28615… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c (original) +++ trunk/reactos/lib/rtl/bitmap.c Tue Aug 28 17:40:56 2007 @@ -36,6 +36,7 @@ static int +__cdecl NTDLL_RunSortFn(const void *lhs, const void *rhs) {

1 0

[hpoussin] 28614: Forgot one file
by hpoussin＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: hpoussin Date: Tue Aug 28 10:35:54 2007 New Revision: 28614 URL: http://svn.reactos.org/svn/reactos?rev=28614&view=rev Log: Forgot one file Modified: trunk/rostests/winetests/shell32/shellpath.c Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… ============================================================================== --- trunk/rostests/winetests/shell32/shellpath.c (original) +++ trunk/rostests/winetests/shell32/shellpath.c Tue Aug 28 10:35:54 2007 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * This is a test program for the SHGet{Special}Folder{Path|Location} functions * of shell32, that get either a filesytem path or a LPITEMIDLIST (shell * namespace) path for a given folder (CSIDL value). @@ -30,7 +30,6 @@ #include <stdio.h> #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "shlguid.h" #include "shlobj.h" #include "shlwapi.h" @@ -74,7 +73,7 @@ BYTE pidlType; }; -static HMODULE hShell32; +static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO *); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static HRESULT (WINAPI *pSHGetFolderLocation)(HWND, int, HANDLE, DWORD, LPITEMIDLIST *); @@ -153,55 +152,57 @@ static void loadShell32(void) { - hShell32 = LoadLibraryA("shell32"); - if (hShell32) - { - HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO *); - - pSHGetFolderPathA = (void *)GetProcAddress(hShell32, - "SHGetFolderPathA"); - pSHGetFolderLocation = (void *)GetProcAddress(hShell32, - "SHGetFolderLocation"); - pSHGetSpecialFolderPathA = (void *)GetProcAddress(hShell32, - "SHGetSpecialFolderPathA"); - pSHGetSpecialFolderLocation = (void *)GetProcAddress(hShell32, - "SHGetSpecialFolderLocation"); - pDllGetVersion = (void *)GetProcAddress(hShell32, "DllGetVersion"); - pILFindLastID = (void *)GetProcAddress(hShell32, "ILFindLastID"); - if (!pILFindLastID) - pILFindLastID = (void *)GetProcAddress(hShell32, (LPCSTR)16); - pSHFileOperationA = (void *)GetProcAddress(hShell32, - "SHFileOperationA"); - pSHGetMalloc = (void *)GetProcAddress(hShell32, "SHGetMalloc"); - - ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); - if (pSHGetMalloc) - { - HRESULT hr = pSHGetMalloc(&pMalloc); - - ok(SUCCEEDED(hr), "SHGetMalloc failed: 0x%08lx\n", hr); - ok(pMalloc != NULL, "SHGetMalloc returned a NULL IMalloc\n"); - } - - if (pDllGetVersion) - { - shellVersion.cbSize = sizeof(shellVersion); - pDllGetVersion(&shellVersion); - if (winetest_interactive) - printf("shell32 version is %ld.%ld\n", - shellVersion.dwMajorVersion, shellVersion.dwMinorVersion); - } - } + HMODULE hShell32 = GetModuleHandleA("shell32"); + +#define GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hShell32, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + + GET_PROC(DllGetVersion) + GET_PROC(SHGetFolderPathA) + GET_PROC(SHGetFolderLocation) + GET_PROC(SHGetSpecialFolderPathA) + GET_PROC(SHGetSpecialFolderLocation) + GET_PROC(ILFindLastID) + if (!pILFindLastID) + pILFindLastID = (void *)GetProcAddress(hShell32, (LPCSTR)16); + GET_PROC(SHFileOperationA) + GET_PROC(SHGetMalloc) + + ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); + if (pSHGetMalloc) + { + HRESULT hr = pSHGetMalloc(&pMalloc); + + ok(SUCCEEDED(hr), "SHGetMalloc failed: 0x%08x\n", hr); + ok(pMalloc != NULL, "SHGetMalloc returned a NULL IMalloc\n"); + } + + if (pDllGetVersion) + { + shellVersion.cbSize = sizeof(shellVersion); + pDllGetVersion(&shellVersion); + if (winetest_interactive) + printf("shell32 version is %d.%d\n", + shellVersion.dwMajorVersion, shellVersion.dwMinorVersion); + } +#undef GET_PROC } #ifndef CSIDL_PROFILES #define CSIDL_PROFILES 0x003e #endif +/* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want + * here is its original value. + */ +#define OLD_CSIDL_MYDOCUMENTS 0x000c + /* A couple utility printing functions */ static const char *getFolderName(int folder) { - static char unknown[17]; + static char unknown[32]; #define CSIDL_TO_STR(x) case x: return#x; switch (folder) @@ -218,7 +219,7 @@ CSIDL_TO_STR(CSIDL_SENDTO); CSIDL_TO_STR(CSIDL_BITBUCKET); CSIDL_TO_STR(CSIDL_STARTMENU); - CSIDL_TO_STR(CSIDL_MYDOCUMENTS); + CSIDL_TO_STR(OLD_CSIDL_MYDOCUMENTS); CSIDL_TO_STR(CSIDL_MYMUSIC); CSIDL_TO_STR(CSIDL_MYVIDEO); CSIDL_TO_STR(CSIDL_DESKTOPDIRECTORY); @@ -266,7 +267,7 @@ CSIDL_TO_STR(CSIDL_COMPUTERSNEARME); #undef CSIDL_TO_STR default: - wnsprintfA(unknown, sizeof(unknown), "unknown (0x%04x)", folder); + sprintf(unknown, "unknown (0x%04x)", folder); return unknown; } } @@ -277,8 +278,7 @@ if (!guid) return NULL; - wnsprintfA(guidSTR, sizeof(guidSTR), - "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + sprintf(guidSTR, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); @@ -297,7 +297,7 @@ hr = pSHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl); ok(hr == E_INVALIDARG, "SHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl)\n" - "returned 0x%08lx, expected E_INVALIDARG\n", hr); + "returned 0x%08x, expected E_INVALIDARG\n", hr); if (SUCCEEDED(hr)) IMalloc_Free(pMalloc, pidl); /* check a bogus user token: */ @@ -305,7 +305,7 @@ hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, (HANDLE)2, 0, &pidl); ok(hr == E_FAIL, "SHGetFolderLocation(NULL, CSIDL_FAVORITES, 2, 0, &pidl)\n" - "returned 0x%08lx, expected E_FAIL\n", hr); + "returned 0x%08x, expected E_FAIL\n", hr); if (SUCCEEDED(hr)) IMalloc_Free(pMalloc, pidl); /* check reserved is not zero: */ @@ -313,7 +313,7 @@ hr = pSHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 1, &pidl); ok(hr == E_INVALIDARG, "SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 1, &pidl)\n" - "returned 0x%08lx, expected E_INVALIDARG\n", hr); + "returned 0x%08x, expected E_INVALIDARG\n", hr); if (SUCCEEDED(hr)) IMalloc_Free(pMalloc, pidl); /* a NULL pidl pointer crashes, so don't test it */ @@ -329,7 +329,7 @@ /* SHGetSpecialFolderLocation(NULL, 0, NULL) crashes */ hr = pSHGetSpecialFolderLocation(NULL, 0xeeee, &pidl); ok(hr == E_INVALIDARG, - "SHGetSpecialFolderLocation(NULL, 0xeeee, &pidl) returned 0x%08lx, " + "SHGetSpecialFolderLocation(NULL, 0xeeee, &pidl) returned 0x%08x, " "expected E_INVALIDARG\n", hr); } @@ -345,11 +345,11 @@ SHGFP_TYPE_DEFAULT, path); ok(hr == E_FAIL, "SHGetFolderPathA(NULL, CSIDL_DESKTOP, 2, SHGFP_TYPE_DEFAULT, path)\n" - "returned 0x%08lx, expected E_FAIL\n", hr); + "returned 0x%08x, expected E_FAIL\n", hr); hr = pSHGetFolderPathA(NULL, 0xeeee, NULL, SHGFP_TYPE_DEFAULT, path); ok(hr == E_INVALIDARG, "SHGetFolderPathA(NULL, 0xeeee, NULL, SHGFP_TYPE_DEFAULT, path)\n" - "returned 0x%08lx, expected E_INVALIDARG\n", hr); + "returned 0x%08x, expected E_INVALIDARG\n", hr); } static void testSHGetSpecialFolderPathInvalidArgs(void) @@ -359,16 +359,18 @@ if (!pSHGetSpecialFolderPathA) return; +#if 0 ret = pSHGetSpecialFolderPathA(NULL, NULL, CSIDL_BITBUCKET, FALSE); ok(!ret, "SHGetSpecialFolderPathA(NULL, NULL, CSIDL_BITBUCKET, FALSE)\n" "returned TRUE, expected FALSE\n"); +#endif /* odd but true: calling with a NULL path still succeeds if it's a real - * dir + * dir (on some windows platform). on winME it generates exception. */ - ret = pSHGetSpecialFolderPathA(NULL, NULL, CSIDL_PROGRAMS, FALSE); + ret = pSHGetSpecialFolderPathA(NULL, path, CSIDL_PROGRAMS, FALSE); ok(ret, - "SHGetSpecialFolderPathA(NULL, NULL, CSIDL_PROGRAMS, FALSE)\n" + "SHGetSpecialFolderPathA(NULL, path, CSIDL_PROGRAMS, FALSE)\n" "returned FALSE, expected TRUE\n"); ret = pSHGetSpecialFolderPathA(NULL, path, 0xeeee, FALSE); ok(!ret, @@ -398,7 +400,7 @@ hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); ok(SUCCEEDED(hr) || optional, "SHGetFolderLocation(NULL, %s, NULL, 0, &pidl)\n" - "failed: 0x%08lx\n", getFolderName(folder), hr); + "failed: 0x%08x\n", getFolderName(folder), hr); if (SUCCEEDED(hr)) { ok(pidl != NULL, @@ -432,7 +434,7 @@ hr = pSHGetSpecialFolderLocation(NULL, folder, &pidl); ok(SUCCEEDED(hr) || optional, "SHGetSpecialFolderLocation(NULL, %s, &pidl)\n" - "failed: 0x%08lx\n", getFolderName(folder), hr); + "failed: 0x%08x\n", getFolderName(folder), hr); if (SUCCEEDED(hr)) { ok(pidl != NULL, @@ -462,7 +464,7 @@ hr = pSHGetFolderPathA(NULL, folder, NULL, SHGFP_TYPE_CURRENT, path); ok(SUCCEEDED(hr) || optional, "SHGetFolderPathA(NULL, %s, NULL, SHGFP_TYPE_CURRENT, path)\n" - "failed: 0x%08lx\n", getFolderName(folder), hr); + "failed: 0x%08x\n", getFolderName(folder), hr); } static void testSHGetSpecialFolderPath(BOOL optional, int folder) @@ -720,21 +722,21 @@ /* test some failure cases first: */ hr = pSHGetFolderPathA(NULL, CSIDL_FAVORITES, NULL, - SHGFP_TYPE_CURRENT, NULL); + SHGFP_TYPE_CURRENT, path); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "SHGetFolderPath returned 0x%08lx, expected 0x80070002\n", hr); + "SHGetFolderPath returned 0x%08x, expected 0x80070002\n", hr); pidl = NULL; hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, NULL, 0, &pidl); ok(hr == E_FAIL, - "SHGetFolderLocation returned 0x%08lx, expected E_FAIL\n", hr); + "SHGetFolderLocation returned 0x%08x, expected E_FAIL\n", hr); if (SUCCEEDED(hr) && pidl) IMalloc_Free(pMalloc, pidl); ok(!pSHGetSpecialFolderPathA(NULL, path, CSIDL_FAVORITES, FALSE), "SHGetSpecialFolderPath succeeded, expected failure\n"); pidl = NULL; hr = pSHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &pidl); - ok(hr == E_FAIL, "SHGetFolderLocation returned 0x%08lx, expected E_FAIL\n", + ok(hr == E_FAIL, "SHGetFolderLocation returned 0x%08x, expected E_FAIL\n", hr); if (SUCCEEDED(hr) && pidl) IMalloc_Free(pMalloc, pidl); @@ -753,13 +755,13 @@ "with ERROR_ALREADY_EXISTS\n"); if (!ret) ok(GetLastError() == ERROR_ALREADY_EXISTS, - "CreateDirectoryA failed with %ld, " + "CreateDirectoryA failed with %d, " "expected ERROR_ALREADY_EXISTS\n", GetLastError()); } ok(SUCCEEDED(hr), "SHGetFolderPath(NULL, CSIDL_FAVORITES | CSIDL_FLAG_CREATE, " - "NULL, SHGFP_TYPE_CURRENT, path)\nfailed: 0x%08lx\n", hr); + "NULL, SHGFP_TYPE_CURRENT, path)\nfailed: 0x%08x\n", hr); } /* Subprocess helper 2: make sure SHGetFolderPath still succeeds when the @@ -768,10 +770,11 @@ static void testNonExistentPath2(void) { HRESULT hr; + char path[MAX_PATH]; hr = pSHGetFolderPathA(NULL, CSIDL_FAVORITES | CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_CURRENT, NULL); - ok(SUCCEEDED(hr), "SHGetFolderPath failed: 0x%08lx\n", hr); + SHGFP_TYPE_CURRENT, path); + ok(SUCCEEDED(hr), "SHGetFolderPath failed: 0x%08x\n", hr); } static void doChild(const char *arg) @@ -825,16 +828,15 @@ modifiedPath[len++] = '\0'; if (winetest_interactive) printf("Changing CSIDL_FAVORITES to %s\n", modifiedPath); - if (!RegSetValueExA(key, "Favorites", 0, type, (LPBYTE) modifiedPath, len)) + if (!RegSetValueExA(key, "Favorites", 0, type, + (LPBYTE)modifiedPath, len)) { - char buffer[MAX_PATH]; + char buffer[MAX_PATH+20]; STARTUPINFOA startup; PROCESS_INFORMATION info; HRESULT hr; - BOOL ret; - - wnsprintfA(buffer, sizeof(buffer), "%s tests/shellpath.c 1", - selfname); + + sprintf(buffer, "%s tests/shellpath.c 1", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -847,7 +849,7 @@ /* Query the path to be able to delete it below */ hr = pSHGetFolderPathA(NULL, CSIDL_FAVORITES, NULL, SHGFP_TYPE_CURRENT, modifiedPath); - ok(SUCCEEDED(hr), "SHGetFolderPathA failed: 0x%08lx\n", hr); + ok(SUCCEEDED(hr), "SHGetFolderPathA failed: 0x%08x\n", hr); /* restore original values: */ if (winetest_interactive) @@ -856,8 +858,7 @@ strlen(originalPath) + 1); RegFlushKey(key); - wnsprintfA(buffer, sizeof(buffer), "%s tests/shellpath.c 2", - selfname); + sprintf(buffer, "%s tests/shellpath.c 2", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -867,8 +868,10 @@ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "child process termination\n"); - ret = RemoveDirectoryA(modifiedPath); - ok( ret, "RemoveDirectoryA failed: %ld\n", GetLastError()); + strcpy(buffer, modifiedPath); + strcat(buffer, "\\desktop.ini"); + DeleteFileA(buffer); + RemoveDirectoryA(modifiedPath); } } else if (winetest_interactive) @@ -886,7 +889,6 @@ if (!init()) return; loadShell32(); - if (!hShell32) return; if (myARGC >= 3) doChild(myARGV[2]);

1 0

[janderwald] 28613: - implement AutoPartioning - set AutoPartition = 1 if you want unattended setup to create one partition with maximum size of disk
by janderwald＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: janderwald Date: Tue Aug 28 00:03:06 2007 New Revision: 28613 URL: http://svn.reactos.org/svn/reactos?rev=28613&view=rev Log: - implement AutoPartioning - set AutoPartition = 1 if you want unattended setup to create one partition with maximum size of disk Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Tue Aug 28 00:03:06 2007 @@ -1394,13 +1394,21 @@ if (IsUnattendedSetup) { - if (SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber)) + if (!SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber)) { - return(SELECT_FILE_SYSTEM_PAGE); + if (AutoPartition) + { + PPARTENTRY PartEntry = PartEntry = PartitionList->CurrentPartition; + ULONG MaxSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; /* in MBytes (rounded) */ + CreateNewPartition (PartitionList, + MaxSize, + TRUE); + return (SELECT_FILE_SYSTEM_PAGE); + } } else { - return (CREATE_PARTITION_PAGE); + return(SELECT_FILE_SYSTEM_PAGE); } } @@ -1706,17 +1714,9 @@ while (TRUE) { MaxSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if (!IsUnattendedSetup || !AutoPartition) - { - ShowPartitionSizeInputBox (12, 14, xScreen - 12, 17, /* left, top, right, bottom */ + ShowPartitionSizeInputBox (12, 14, xScreen - 12, 17, /* left, top, right, bottom */ MaxSize, InputBuffer, &Quit, &Cancel); - } - else - { - Quit = FALSE; - Cancel = FALSE; - } - if (Quit == TRUE) + if (Quit == TRUE) { if (ConfirmQuit (Ir) == TRUE) { @@ -1729,7 +1729,7 @@ } else { - PartSize = atoi (InputBuffer); + PartSize = atoi (InputBuffer); if (PartSize < 1) { /* Too small */

1 0

[gedmurphy] 28612: - update the stored service status after attempting to change it - add functionality for changing the list view text and use it to change the status text - various other bits and bobs
by gedmurphy＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: gedmurphy Date: Mon Aug 27 23:31:09 2007 New Revision: 28612 URL: http://svn.reactos.org/svn/reactos?rev=28612&view=rev Log: - update the stored service status after attempting to change it - add functionality for changing the list view text and use it to change the status text - various other bits and bobs Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/reg.c trunk/reactos/base/applications/mscutils/servman/resource.h trunk/reactos/base/applications/mscutils/servman/start.c Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c Mon Aug 27 23:31:09 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/servman/control + * FILE: base/applications/mscutils/servman/control.c * PURPOSE: Stops, pauses and resumes a service - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -41,7 +41,7 @@ /* open handle to the service */ hSc = OpenService(hSCManager, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, SC_MANAGER_ALL_ACCESS); if (hSc == NULL) { @@ -138,7 +138,7 @@ HWND hProgDlg; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_STOP); if (hProgDlg) { @@ -158,7 +158,7 @@ HWND hProgDlg; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_PAUSE); if (hProgDlg) { @@ -178,7 +178,7 @@ HWND hProgDlg; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_RESUME); if (hProgDlg) { Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c Mon Aug 27 23:31:09 2007 @@ -28,7 +28,7 @@ /* get a handle to the service requested for deleting */ hSc = OpenService(hSCManager, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, DELETE); if (hSc == NULL) { @@ -87,7 +87,7 @@ IDC_DEL_NAME, WM_SETTEXT, 0, - (LPARAM)Info->CurrentService->lpDisplayName); + (LPARAM)Info->pCurrentService->lpDisplayName); item.mask = LVIF_TEXT; Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc Mon Aug 27 23:31:09 2007 @@ -146,7 +146,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Äà", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Íå", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Íå", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc Mon Aug 27 23:31:09 2007 @@ -143,7 +143,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Ja", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Nein", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Nein", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc Mon Aug 27 23:31:09 2007 @@ -143,7 +143,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Yes", IDOK, 26, 129, 54, 13 - PUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc Mon Aug 27 23:31:09 2007 @@ -144,7 +144,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Oui", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Non", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Non", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc Mon Aug 27 23:31:09 2007 @@ -143,7 +143,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Ya", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Tidak", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Tidak", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc Mon Aug 27 23:31:09 2007 @@ -143,7 +143,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Si", IDOK, 26, 129, 54, 13 - PUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc Mon Aug 27 23:31:09 2007 @@ -150,7 +150,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Tak", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Nie", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Nie", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Mon Aug 27 23:31:09 2007 @@ -142,7 +142,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Äà", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Íåò", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Íåò", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc Mon Aug 27 23:31:09 2007 @@ -152,7 +152,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "ãªè", IDOK, 26, 129, 54, 13 - PUSHBUTTON "äÁèãªè", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "äÁèãªè", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Mon Aug 27 23:31:09 2007 @@ -8,6 +8,12 @@ */ #include "precomp.h" + +#define LVNAME 0 +#define LVDESC 1 +#define LVSTATUS 2 +#define LVSTARTUP 3 +#define LVLOGONAS 4 static const TCHAR szMainWndClass[] = TEXT("ServManWndClass"); @@ -136,6 +142,73 @@ } } +static VOID +ChangeListViewText(PMAIN_WND_INFO Info, + UINT Column) +{ + LVITEM item; + + item.iItem = Info->SelectedItem; + item.iSubItem = Column; + + switch (Column) + { + case LVNAME: + + break; + + case LVDESC: + { + LPTSTR lpDescription; + + lpDescription = GetDescription(Info->pCurrentService->lpServiceName); + + item.pszText = lpDescription; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + item.iItem, + (LPARAM) &item); + + HeapFree(ProcessHeap, + 0, + lpDescription); + } + break; + + case LVSTATUS: + { + TCHAR szStatus[64]; + + if (Info->pCurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + { + LoadString(hInstance, + IDS_SERVICES_STARTED, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + } + else + { + szStatus[0] = 0; + } + + item.pszText = szStatus; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + item.iItem, + (LPARAM) &item); + } + break; + + case LVSTARTUP: + + break; + + case LVLOGONAS: + + break; + } +} + VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info) { @@ -163,8 +236,8 @@ EnableMenuItem(hMainMenu, ID_DELETE, MF_ENABLED); EnableMenuItem(Info->hShortcutMenu, ID_DELETE, MF_ENABLED); - Flags = Info->CurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->CurrentService->ServiceStatusProcess.dwCurrentState; + Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; + State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; if (State == SERVICE_STOPPED) { @@ -369,9 +442,8 @@ lvc.fmt = LVCFMT_LEFT; /* Add columns to the list-view */ - /* name */ - lvc.iSubItem = 0; + lvc.iSubItem = LVNAME; lvc.cx = 150; LoadString(hInstance, IDS_FIRSTCOLUMN, @@ -383,7 +455,7 @@ &lvc); /* description */ - lvc.iSubItem = 1; + lvc.iSubItem = LVDESC; lvc.cx = 240; LoadString(hInstance, IDS_SECONDCOLUMN, @@ -395,7 +467,7 @@ &lvc); /* status */ - lvc.iSubItem = 2; + lvc.iSubItem = LVSTATUS; lvc.cx = 55; LoadString(hInstance, IDS_THIRDCOLUMN, @@ -407,7 +479,7 @@ &lvc); /* startup type */ - lvc.iSubItem = 3; + lvc.iSubItem = LVSTARTUP; lvc.cx = 80; LoadString(hInstance, IDS_FOURTHCOLUMN, @@ -419,7 +491,7 @@ &lvc); /* logon as */ - lvc.iSubItem = 4; + lvc.iSubItem = LVLOGONAS; lvc.cx = 100; LoadString(hInstance, IDS_FITHCOLUMN, @@ -509,7 +581,7 @@ Info->SelectedItem = pnmv->iItem; /* get pointer to selected service */ - Info->CurrentService = GetSelectedService(Info); + Info->pCurrentService = GetSelectedService(Info); /* alter options for the service */ SetMenuAndButtonStates(Info); @@ -518,7 +590,7 @@ SendMessage(Info->hStatus, SB_SETTEXT, 1, - (LPARAM)Info->CurrentService->lpDisplayName); + (LPARAM)Info->pCurrentService->lpDisplayName); /* show the properties button */ SendMessage(Info->hTool, @@ -613,7 +685,7 @@ case ID_DELETE: { - if (Info->CurrentService->ServiceStatusProcess.dwCurrentState != SERVICE_RUNNING) + if (Info->pCurrentService->ServiceStatusProcess.dwCurrentState != SERVICE_RUNNING) { DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_DELETE), @@ -640,22 +712,8 @@ { if (DoStart(Info)) { - LVITEM item; - TCHAR szStatus[64]; - - LoadString(hInstance, - IDS_SERVICES_STARTED, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - item.pszText = szStatus; - item.iItem = Info->SelectedItem; - item.iSubItem = 2; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - - Info->CurrentService->ServiceStatusProcess.dwCurrentState = SERVICE_RUNNING; + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, LVSTATUS); SetMenuAndButtonStates(Info); SetFocus(Info->hListView); } @@ -665,17 +723,8 @@ case ID_STOP: if (DoStop(Info)) { - LVITEM item; - - item.pszText = 0; - item.iItem = Info->SelectedItem; - item.iSubItem = 2; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - - Info->CurrentService->ServiceStatusProcess.dwCurrentState = SERVICE_STOPPED; + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, LVSTATUS); SetMenuAndButtonStates(Info); SetFocus(Info->hListView); } @@ -692,22 +741,11 @@ case ID_RESTART: if (DoStop(Info)) { - if(!DoStart(Info)) - { - LVITEM item; - - item.pszText = 0; - item.iItem = Info->SelectedItem; - item.iSubItem = 2; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - - Info->CurrentService->ServiceStatusProcess.dwCurrentState = SERVICE_STOPPED; - SetMenuAndButtonStates(Info); - SetFocus(Info->hListView); - } + DoStart(Info); + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, LVSTATUS); + SetMenuAndButtonStates(Info); + SetFocus(Info->hListView); } break; Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Mon Aug 27 23:31:09 2007 @@ -26,7 +26,7 @@ int nCmdShow; ENUM_SERVICE_STATUS_PROCESS *pAllServices; - ENUM_SERVICE_STATUS_PROCESS *CurrentService; /* Stores the current selected service */ + ENUM_SERVICE_STATUS_PROCESS *pCurrentService; INT SelectedItem;/* selection number in the list view */ BOOL bDlgOpen; @@ -59,9 +59,6 @@ /* start */ BOOL DoStart(PMAIN_WND_INFO Info); -/* stop */ - - /* control */ BOOL DoStop(PMAIN_WND_INFO Info); BOOL DoPause(PMAIN_WND_INFO Info); @@ -76,6 +73,7 @@ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); LPTSTR GetExecutablePath(PMAIN_WND_INFO Info); BOOL RefreshServiceList(PMAIN_WND_INFO Info); +BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); /* reg */ BOOL SetDescription(LPTSTR, LPTSTR); Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Mon Aug 27 23:31:09 2007 @@ -16,8 +16,8 @@ HWND hButton; DWORD Flags, State; - Flags = Info->CurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->CurrentService->ServiceStatusProcess.dwCurrentState; + Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; + State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; if (State == SERVICE_STOPPED) { @@ -64,7 +64,7 @@ _sntprintf(KeyBuf, sizeof(KeyBuf) / sizeof(TCHAR), Path, - Info->CurrentService->lpServiceName); + Info->pCurrentService->lpServiceName); RegOpenKeyEx(HKEY_LOCAL_MACHINE, KeyBuf, @@ -118,17 +118,17 @@ IDC_SERV_NAME, WM_SETTEXT, 0, - (LPARAM)Info->CurrentService->lpServiceName); + (LPARAM)Info->pCurrentService->lpServiceName); /* set the display name */ SendDlgItemMessage(hwndDlg, IDC_DISP_NAME, WM_SETTEXT, 0, - (LPARAM)Info->CurrentService->lpDisplayName); + (LPARAM)Info->pCurrentService->lpDisplayName); /* set the description */ - if ((lpDescription = GetDescription(Info->CurrentService->lpServiceName))) + if ((lpDescription = GetDescription(Info->pCurrentService->lpServiceName))) { SendDlgItemMessage(hwndDlg, IDC_DESCRIPTION, @@ -161,7 +161,7 @@ SetStartupType(Info, hwndDlg); /* set service status */ - if (Info->CurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + if (Info->pCurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) { TCHAR szServiceStatus[32]; @@ -407,7 +407,7 @@ psh.hwndParent = Info->hMainWnd; psh.hInstance = hInstance; psh.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON)); - psh.pszCaption = Info->CurrentService->lpDisplayName; + psh.pszCaption = Info->pCurrentService->lpDisplayName; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.pfnCallback = AddEditButton; Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Mon Aug 27 23:31:09 2007 @@ -49,7 +49,7 @@ /* get a handle to the service requested for starting */ hSc = OpenService(hSCManager, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, SERVICE_QUERY_CONFIG); if (hSc == NULL) { @@ -169,6 +169,40 @@ BOOL +UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService) +{ + SC_HANDLE hScm; + BOOL bRet = FALSE; + + hScm = OpenSCManager(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); + if (hScm != INVALID_HANDLE_VALUE) + { + SC_HANDLE hService; + + hService = OpenService(hScm, + pService->lpServiceName, + SERVICE_QUERY_STATUS); + if (hService) + { + DWORD size; + + QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&pService->ServiceStatusProcess, + sizeof(*pService), + &size); + + bRet = TRUE; + } + } + + return bRet; +} + + +BOOL RefreshServiceList(PMAIN_WND_INFO Info) { ENUM_SERVICE_STATUS_PROCESS *pService; Modified: trunk/reactos/base/applications/mscutils/servman/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/reg.c (original) +++ trunk/reactos/base/applications/mscutils/servman/reg.c Mon Aug 27 23:31:09 2007 @@ -2,104 +2,100 @@ * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/reg.c - * PURPOSE: Query service information - * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * PURPOSE: functions for querying a services registry key + * COPYRIGHT: Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" -/* Sets the service description in the registry */ -BOOL SetDescription(LPTSTR ServiceName, LPTSTR Description) +static HKEY +OpenServiceKey(LPTSTR lpServiceName) +{ + HKEY hKey = NULL; + LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); + TCHAR buf[300]; + + _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, lpServiceName); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + return hKey; + } + else + { + return NULL; + } +} + +BOOL +SetDescription(LPTSTR lpServiceName, + LPTSTR lpDescription) { HKEY hKey; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR buf[300]; TCHAR szBuf[MAX_PATH]; - LONG val; + BOOL bRet = FALSE; + hKey = OpenServiceKey(lpServiceName); + if (hKey) + { + if (RegSetValueEx(hKey, + _T("Description"), + 0, + REG_SZ, + (LPBYTE)lpDescription, + (DWORD)(_tcslen(szBuf) + 1 ) * sizeof(TCHAR)) == ERROR_SUCCESS) + { + bRet = TRUE; + } - /* open the registry key for the service */ - _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, ServiceName); - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_WRITE, - &hKey); + RegCloseKey(hKey); + } - - if ((val = RegSetValueEx(hKey, - _T("Description"), - 0, - REG_SZ, - (LPBYTE)Description, - (DWORD)lstrlen(szBuf)+1)) != ERROR_SUCCESS) - { - //GetError(val); - return FALSE; - } - - - RegCloseKey(hKey); - return TRUE; + return bRet; } - -/* Retrives the service description from the registry */ LPTSTR GetDescription(LPTSTR lpServiceName) { HKEY hKey; LPTSTR lpDescription = NULL; DWORD dwValueSize = 0; - LONG ret; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR buf[300]; - /* open the registry key for the service */ - _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, lpServiceName); - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_READ, - &hKey); - - ret = RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - NULL, - &dwValueSize); - if (ret != ERROR_SUCCESS && ret != ERROR_FILE_NOT_FOUND && ret != ERROR_INVALID_HANDLE) + hKey = OpenServiceKey(lpServiceName); + if (hKey) { - RegCloseKey(hKey); - return FALSE; - } - - if (ret != ERROR_FILE_NOT_FOUND) - { - lpDescription = HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - dwValueSize); - if (lpDescription == NULL) + if (RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + NULL, + &dwValueSize) == ERROR_SUCCESS) { - RegCloseKey(hKey); - return FALSE; + lpDescription = HeapAlloc(ProcessHeap, + 0, + dwValueSize); + if (lpDescription) + { + if(RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + (LPBYTE)lpDescription, + &dwValueSize) != ERROR_SUCCESS) + { + HeapFree(ProcessHeap, + 0, + lpDescription); + } + } } - if(RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - (LPBYTE)lpDescription, - &dwValueSize)) - { - HeapFree(ProcessHeap, - 0, - lpDescription); - RegCloseKey(hKey); - } + RegCloseKey(hKey); } return lpDescription; Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/resource.h (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h Mon Aug 27 23:31:09 2007 @@ -172,5 +172,3 @@ #define IDS_PROGRESS_INFO_STOP 7005 #define IDS_PROGRESS_INFO_PAUSE 7006 #define IDS_PROGRESS_INFO_RESUME 7007 - - Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c Mon Aug 27 23:31:09 2007 @@ -32,7 +32,7 @@ /* get a handle to the service requested for starting */ hSc = OpenService(hSCManager, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, SERVICE_ALL_ACCESS); if (hSc == NULL) { @@ -130,7 +130,7 @@ BOOL bRet = FALSE; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_START); if (hProgDlg)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs