Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[cwittich] 18589: set eol-style:native
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

set eol-style:native Property changes on: trunk/reactos/lib/cpl/control/Cz.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/cpl/intl/cz.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/cpl/ncpa/cz.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/cpl/sysdm/cz.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/lib/cpl/timedate/Cz.rc ___________________________________________________________________ Name: svn:eol-style + native

1 0

[cwittich] 18588: fixed some msvc compile issues
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

fixed some msvc compile issues fixed duplicated IDs in rc files Modified: trunk/reactos/lib/cpl/desk/Ja.rc Modified: trunk/reactos/lib/cpl/desk/background.c Modified: trunk/reactos/lib/cpl/desk/cz.rc Modified: trunk/reactos/lib/cpl/desk/desk.rc Modified: trunk/reactos/lib/cpl/desk/desk.xml Modified: trunk/reactos/lib/cpl/desk/en.rc Modified: trunk/reactos/lib/cpl/desk/es.rc Modified: trunk/reactos/lib/cpl/desk/nl.rc Modified: trunk/reactos/lib/cpl/desk/pl.rc Modified: trunk/reactos/lib/cpl/desk/resource.h Modified: trunk/reactos/lib/cpl/desk/sv.rc _____ Modified: trunk/reactos/lib/cpl/desk/Ja.rc --- trunk/reactos/lib/cpl/desk/Ja.rc 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/Ja.rc 2005-10-19 02:41:18 UTC (rev 18588) @@ -31,7 +31,7 @@ LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 109 PUSHBUTTON "ìÝÅ£(&D)",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "ÆÃë?(&A)",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + PUSHBUTTON "ÆÃë?(&A)",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 PUSHBUTTON "É¦ÆÞ(&T)...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP PUSHBUTTON "âvâîârâàü[(&V)",IDC_SCREENS_TESTSC,192, 164, 43, 12 @@ -46,7 +46,7 @@ WS_BORDER | WS_GROUP,52, 149, 12, 12 LTEXT "ò¬îoë?éÁé¢éþâXâNâèü[âô âZü[âoü[éò\\ÄªéÀéÚüB",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "âéâjâ^ü[é?Å?ôdù?ï@ö\\(&E)",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "âéâjâ^ü[é?Å?ôdù?ï@ö\\(&E)",IDC_SCREENS_DUMMY2,5, 186, 238, 35 LTEXT "âéâjâ^é?ôdî?É¦ÆÞéÆ?É«éÀéÚé?é?üA[ôdî?É¦ÆÞ] éâNâèâbâNéÁé?é¡é¥é?éóüB", IDC_STATIC,16, 199, 155, 19 PUSHBUTTON "ôdî?É¦ÆÞ(&O)",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 _____ Modified: trunk/reactos/lib/cpl/desk/background.c --- trunk/reactos/lib/cpl/desk/background.c 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/background.c 2005-10-19 02:41:18 UTC (rev 18588) @@ -71,6 +71,8 @@ LONG result; UINT i = 0; BackgroundItem *backgroundItem = NULL; + TCHAR separators[] = TEXT(";"); + TCHAR *token; GetClientRect(g_hBackgroundList, &clientRect); @@ -156,8 +158,6 @@ LoadString(hApplet, IDS_SUPPORTED_EXT, szFileTypes, sizeof(szFileTypes) / sizeof(TCHAR)); - TCHAR separators[] = TEXT(";"); - TCHAR *token; token = _tcstok ( szFileTypes, separators ); while ( token != NULL ) @@ -229,15 +229,20 @@ void InitBackgroundDialog() { - g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); + TCHAR szString[256]; + HKEY regKey; + TCHAR szBuffer[2]; + DWORD bufferSize = sizeof(szBuffer); + DWORD varType = REG_SZ; + LONG result; + + g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); g_hBackgroundPreview = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_PREVIEW); g_hPlacementCombo = GetDlgItem(g_hBackgroundPage, IDC_PLACEMENT_COMBO); g_hColorButton = GetDlgItem(g_hBackgroundPage, IDC_COLOR_BUTTON); AddListViewItems(); - TCHAR szString[256]; - LoadString(hApplet, IDS_CENTER, szString, sizeof(szString) / sizeof(TCHAR)); SendMessage(g_hPlacementCombo, CB_INSERTSTRING, PLACEMENT_CENTER, (LPARAM)szString); @@ -248,13 +253,6 @@ SendMessage(g_hPlacementCombo, CB_INSERTSTRING, PLACEMENT_TILE, (LPARAM)szString); /* Load the default settings from the registry */ - HKEY regKey; - - TCHAR szBuffer[2]; - DWORD bufferSize = sizeof(szBuffer); - DWORD varType = REG_SZ; - LONG result; - RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); result = RegQueryValueEx(regKey, TEXT("WallpaperStyle"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); @@ -310,6 +308,8 @@ TCHAR fileTitle[256]; TCHAR filter[MAX_PATH]; BackgroundItem *backgroundItem = NULL; + SHFILEINFO sfi; + LV_ITEM listItem; ZeroMemory(&ofn, sizeof(OPENFILENAME)); @@ -336,9 +336,6 @@ if(CheckListBoxFilename(g_hBackgroundList, filename) == TRUE) return; - SHFILEINFO sfi; - LV_ITEM listItem; - if(g_listViewItemCount > (MAX_BACKGROUNDS - 1)) return; @@ -402,6 +399,13 @@ void DrawBackgroundPreview(LPDRAWITEMSTRUCT draw) { + float scaleX; + float scaleY; + int scaledWidth; + int scaledHeight; + int posX; + int posY; + if(g_backgroundItems[g_backgroundSelection].bWallpaper == FALSE) { FillRect(draw->hDC, &draw->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); @@ -411,14 +415,14 @@ if(g_pWallpaperBitmap == NULL) return; - float scaleX = ((float)GetSystemMetrics(SM_CXSCREEN) - 1) / (float)draw->rcItem.right; - float scaleY = ((float)GetSystemMetrics(SM_CYSCREEN) - 1) / (float)draw->rcItem.bottom; + scaleX = ((float)GetSystemMetrics(SM_CXSCREEN) - 1) / (float)draw->rcItem.right; + scaleY = ((float)GetSystemMetrics(SM_CYSCREEN) - 1) / (float)draw->rcItem.bottom; - int scaledWidth = g_pWallpaperBitmap->width / scaleX; - int scaledHeight = g_pWallpaperBitmap->height / scaleY; + scaledWidth = g_pWallpaperBitmap->width / scaleX; + scaledHeight = g_pWallpaperBitmap->height / scaleY; - int posX = (draw->rcItem.right / 2) - (scaledWidth / 2); - int posY = (draw->rcItem.bottom / 2) - (scaledHeight / 2); + posX = (draw->rcItem.right / 2) - (scaledWidth / 2); + posY = (draw->rcItem.bottom / 2) - (scaledHeight / 2); FillRect(draw->hDC, &draw->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); _____ Modified: trunk/reactos/lib/cpl/desk/cz.rc --- trunk/reactos/lib/cpl/desk/cz.rc 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/cz.rc 2005-10-19 02:41:18 UTC (rev 18588) @@ -31,7 +31,7 @@ LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 109 PUSHBUTTON "&Odebrat",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&P°idat",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + PUSHBUTTON "&P°idat",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 PUSHBUTTON "&NastavenÝ...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP PUSHBUTTON "&Ukßzka",IDC_SCREENS_TESTSC,192, 164, 43, 12 @@ -46,7 +46,7 @@ WS_BORDER | WS_GROUP,52, 149, 12, 12 LTEXT "Minut ne× se spustÝ spo°iÞ obrazovky.",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "èet°enÝ &energie monitoru",IDC_SCREENS_DUMMY2,5, 186, 238, 35 LTEXT "Pro mo×nosti napßjenÝ monitoru klepnýta na tlaÞÝtko Mo×nosti napßjenÝ.", IDC_STATIC,16, 199, 155, 19 PUSHBUTTON "M&o×nosti napßjenÝ",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-10-19 02:41:18 UTC (rev 18588) @@ -1,4 +1,5 @@ #include <windows.h> +#include <commctrl.h> #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL _____ Modified: trunk/reactos/lib/cpl/desk/desk.xml --- trunk/reactos/lib/cpl/desk/desk.xml 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/desk.xml 2005-10-19 02:41:18 UTC (rev 18588) @@ -7,12 +7,14 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> + <define name="_WIN32" /> <library>kernel32</library> <library>user32</library> <library>advapi32</library> <library>gdi32</library> <library>comctl32</library> <library>comdlg32</library> + <library>shell32</library> <file>desk.c</file> <file>background.c</file> <file>screensaver.c</file> _____ Modified: trunk/reactos/lib/cpl/desk/en.rc --- trunk/reactos/lib/cpl/desk/en.rc 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/en.rc 2005-10-19 02:41:18 UTC (rev 18588) @@ -31,7 +31,7 @@ LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 109 PUSHBUTTON "&Delete",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&Add",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + PUSHBUTTON "&Add",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 PUSHBUTTON "Se&ttings...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,192, 164, 43, 12 @@ -46,7 +46,7 @@ WS_BORDER | WS_GROUP,52, 149, 12, 12 LTEXT "Minutes before showing Screensaver.",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY2,5, 186, 238, 35 LTEXT "To adjust the power settings for your monitor, click on Power Settings.", IDC_STATIC,16, 199, 155, 19 PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 _____ Modified: trunk/reactos/lib/cpl/desk/es.rc --- trunk/reactos/lib/cpl/desk/es.rc 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/es.rc 2005-10-19 02:41:18 UTC (rev 18588) @@ -38,7 +38,7 @@ LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 109 PUSHBUTTON "Eliminar",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&A±adir",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + PUSHBUTTON "&A±adir",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 PUSHBUTTON "Configuraci¾n...",IDC_SCREENS_SETTINGS,133, 164, 56, 12,WS_GROUP PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,192, 164, 43, 12 @@ -53,7 +53,7 @@ WS_BORDER | WS_GROUP,62, 148, 12, 12 LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,79, 150, 161, 9 - GROUPBOX "Ahorro de energÝa del monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "Ahorro de energÝa del monitor",IDC_SCREENS_DUMMY2,5, 186, 238, 35 LTEXT "Para ajustar la configuraci¾n de energÝa del monitor, haga click en EnergÝa.", IDC_STATIC,16, 199, 155, 19 PUSHBUTTON "EnergÝa...",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 _____ Modified: trunk/reactos/lib/cpl/desk/nl.rc --- trunk/reactos/lib/cpl/desk/nl.rc 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/nl.rc 2005-10-19 02:41:18 UTC (rev 18588) @@ -31,7 +31,7 @@ LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 109 PUSHBUTTON "&Wissen",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&Toevoegen",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + PUSHBUTTON "&Toevoegen",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,192, 164, 43, 12 @@ -46,7 +46,7 @@ WS_BORDER | WS_GROUP,52, 149, 12, 12 LTEXT "minuten.",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY2,5, 186, 238, 35 LTEXT "Klik op Instellingen om de energiebesparende mogelijkheden van de monitor in te stellen.", IDC_STATIC,16, 199, 155, 19 PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 _____ Modified: trunk/reactos/lib/cpl/desk/pl.rc --- trunk/reactos/lib/cpl/desk/pl.rc 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/pl.rc 2005-10-19 02:41:18 UTC (rev 18588) @@ -32,7 +32,7 @@ LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 109 PUSHBUTTON "&Usu±",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&Dodaj",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + PUSHBUTTON "&Dodaj",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP PUSHBUTTON "&Podgl?d",IDC_SCREENS_TESTSC,192, 164, 43, 12 @@ -47,7 +47,7 @@ WS_BORDER | WS_GROUP,52, 149, 12, 12 LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY2,5, 186, 238, 35 LTEXT "Kliknij przycisk Zasilanie, aby dopasowaµ ustawienia zasilania dla monitora.", IDC_STATIC,16, 199, 155, 19 PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 _____ Modified: trunk/reactos/lib/cpl/desk/resource.h --- trunk/reactos/lib/cpl/desk/resource.h 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/resource.h 2005-10-19 02:41:18 UTC (rev 18588) @@ -40,7 +40,9 @@ #define IDC_SCREENS_TIMEDELAY 1016 #define IDC_SCREENS_TIME 1017 #define IDC_SCREENS_DELETE 1018 +#define IDC_SCREENS_ADD_BUTTON 1019 #define IDC_SCREENS_DUMMY 5000 +#define IDC_SCREENS_DUMMY2 5001 #define IDS_CPLNAME 2000 #define IDS_CPLDESCRIPTION 2001 _____ Modified: trunk/reactos/lib/cpl/desk/sv.rc --- trunk/reactos/lib/cpl/desk/sv.rc 2005-10-19 02:21:19 UTC (rev 18587) +++ trunk/reactos/lib/cpl/desk/sv.rc 2005-10-19 02:41:18 UTC (rev 18588) @@ -34,7 +34,7 @@ LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 109 PUSHBUTTON "&Ta bort",IDC_SCREENS_DELETE, 189,47,39,10 - PUSHBUTTON "&Lõgg till",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + PUSHBUTTON "&Lõgg till",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 PUSHBUTTON "&Instõllningar",IDC_SCREENS_SETTINGS,138, 164, 48, 12,WS_GROUP PUSHBUTTON "&F÷rhandsvisa",IDC_SCREENS_TESTSC,190, 164, 48, 12 @@ -49,7 +49,7 @@ WS_BORDER | WS_GROUP,52, 149, 12, 12 LTEXT "minuter innan skõrmslõckaren visas.",IDC_STATIC,70, 151, 147, 9 - GROUPBOX "&Energisparfunktioner f÷r din bildskõrm",IDC_SCREENS_DUMMY,5, 186, 238, 35 + GROUPBOX "&Energisparfunktioner f÷r din bildskõrm",IDC_SCREENS_DUMMY2,5, 186, 238, 35 LTEXT "F÷r att õndra energisparfunktionerna f÷r din bildskõrm,\nklicka pÕ Instõllningar.", IDC_STATIC,16, 199, 155, 19 PUSHBUTTON "Ins&tõllningar",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12

1 0

[cwittich] 18587: set eol-style:native
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

set eol-style:native Property changes on: trunk/reactos/lib/cpl/desk/cz.rc ___________________________________________________________________ Name: svn:eol-style + native

1 0

[cwittich] 18586: added missing advapi32.lib
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

added missing advapi32.lib Modified: trunk/reactos/lib/cpl/appwiz/appwiz.xml _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.xml --- trunk/reactos/lib/cpl/appwiz/appwiz.xml 2005-10-19 01:59:25 UTC (rev 18585) +++ trunk/reactos/lib/cpl/appwiz/appwiz.xml 2005-10-19 02:01:23 UTC (rev 18586) @@ -8,6 +8,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> + <library>advapi32</library> <library>user32</library> <library>comctl32</library> <file>appwiz.c</file>

1 0

[cwittich] 18585: add support for control panel applets
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

add support for control panel applets Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-19 00:56:49 UTC (rev 18584) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-19 01:59:25 UTC (rev 18585) @@ -50,7 +50,7 @@ string module_type = GetExtension(module.GetTargetName()); bool lib = (module_type == ".lib") || (module_type == ".a"); - bool dll = (module_type == ".dll"); + bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool exe = (module_type == ".exe"); // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? @@ -555,6 +555,7 @@ // TODO FIXME - do we need their kludge? //if ( module.name == "ntdll" ) fprintf ( OUT, " /nodefaultlib" ); // FIXME: Kludge if ( dll ) fprintf ( OUT, " /def:\"%s.def\"", module.name.c_str() ); + if (( dll ) && ( module_type == ".cpl")) fprintf ( OUT, " /out:\"Win32\\%s%s\"", module.name.c_str(), module_type.c_str() ); if ( debug ) fprintf ( OUT, " /pdbtype:sept" ); fprintf ( OUT, "\r\n" ); }

1 0

[cwittich] 18584: fixed msvc compile problem
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

fixed msvc compile problem Modified: trunk/reactos/services/tcpsvcs/skelserver.c _____ Modified: trunk/reactos/services/tcpsvcs/skelserver.c --- trunk/reactos/services/tcpsvcs/skelserver.c 2005-10-19 00:46:31 UTC (rev 18583) +++ trunk/reactos/services/tcpsvcs/skelserver.c 2005-10-19 00:56:49 UTC (rev 18584) @@ -19,12 +19,13 @@ DWORD WINAPI StartServer(LPVOID lpParam) { + SOCKET ListeningSocket; const TCHAR* HostIP = "127.0.0.1"; PSERVICES pServices; pServices = (PSERVICES)lpParam; - SOCKET ListeningSocket = SetUpListener(HostIP, htons(pServices->Port)); + ListeningSocket = SetUpListener(HostIP, htons(pServices->Port)); if (ListeningSocket == INVALID_SOCKET) { _tprintf(_T("error setting up socket\n"));

1 0

[cwittich] 18583: fixed some compile problems with msvc 2003/2005
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

fixed some compile problems with msvc 2003/2005 Modified: trunk/reactos/subsys/system/taskmgr/about.c Modified: trunk/reactos/subsys/system/taskmgr/affinity.c Modified: trunk/reactos/subsys/system/taskmgr/applpage.c Modified: trunk/reactos/subsys/system/taskmgr/column.c Modified: trunk/reactos/subsys/system/taskmgr/dbgchnl.c Modified: trunk/reactos/subsys/system/taskmgr/debug.c Modified: trunk/reactos/subsys/system/taskmgr/endproc.c Modified: trunk/reactos/subsys/system/taskmgr/font.c Modified: trunk/reactos/subsys/system/taskmgr/graph.c Modified: trunk/reactos/subsys/system/taskmgr/graphctl.c Modified: trunk/reactos/subsys/system/taskmgr/optnmenu.c Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c Modified: trunk/reactos/subsys/system/taskmgr/priority.c Modified: trunk/reactos/subsys/system/taskmgr/proclist.c Modified: trunk/reactos/subsys/system/taskmgr/procpage.c Modified: trunk/reactos/subsys/system/taskmgr/run.c Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c _____ Modified: trunk/reactos/subsys/system/taskmgr/about.c --- trunk/reactos/subsys/system/taskmgr/about.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/about.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" INT_PTR CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); _____ Modified: trunk/reactos/subsys/system/taskmgr/affinity.c --- trunk/reactos/subsys/system/taskmgr/affinity.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/affinity.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" HANDLE hProcessAffinityHandle; TCHAR szTemp[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/applpage.c --- trunk/reactos/subsys/system/taskmgr/applpage.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/applpage.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" typedef struct { _____ Modified: trunk/reactos/subsys/system/taskmgr/column.c --- trunk/reactos/subsys/system/taskmgr/column.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/column.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" UINT ColumnDataHints[25]; TCHAR szTemp[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/dbgchnl.c --- trunk/reactos/subsys/system/taskmgr/dbgchnl.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/dbgchnl.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" /* TODO: * - the dialog box could be non modal _____ Modified: trunk/reactos/subsys/system/taskmgr/debug.c --- trunk/reactos/subsys/system/taskmgr/debug.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/debug.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" void ProcessPage_OnDebug(void) { _____ Modified: trunk/reactos/subsys/system/taskmgr/endproc.c --- trunk/reactos/subsys/system/taskmgr/endproc.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/endproc.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" TCHAR szTemp[256]; TCHAR szTempA[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/font.c --- trunk/reactos/subsys/system/taskmgr/font.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/font.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" void Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y) { _____ Modified: trunk/reactos/subsys/system/taskmgr/graph.c --- trunk/reactos/subsys/system/taskmgr/graph.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/graph.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" LONG OldGraphWndProc; _____ Modified: trunk/reactos/subsys/system/taskmgr/graphctl.c --- trunk/reactos/subsys/system/taskmgr/graphctl.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/graphctl.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <precomp.h> +#include "precomp.h" LONG OldGraphCtrlWndProc; _____ Modified: trunk/reactos/subsys/system/taskmgr/optnmenu.c --- trunk/reactos/subsys/system/taskmgr/optnmenu.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/optnmenu.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -26,7 +26,7 @@ * Menu item handlers for the options menu. */ -#include <precomp.h> +#include "precomp.h" void TaskManager_OnOptionsAlwaysOnTop(void) { _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c --- trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" CRITICAL_SECTION PerfDataCriticalSection; PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ _____ Modified: trunk/reactos/subsys/system/taskmgr/perfpage.c --- trunk/reactos/subsys/system/taskmgr/perfpage.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/perfpage.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <precomp.h> +#include "precomp.h" TGraphCtrl PerformancePageCpuUsageHistoryGraph; TGraphCtrl PerformancePageMemUsageHistoryGraph; _____ Modified: trunk/reactos/subsys/system/taskmgr/priority.c --- trunk/reactos/subsys/system/taskmgr/priority.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/priority.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" TCHAR szTemp[256]; TCHAR szTempA[256]; _____ Modified: trunk/reactos/subsys/system/taskmgr/proclist.c --- trunk/reactos/subsys/system/taskmgr/proclist.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/proclist.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" INT_PTR CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); _____ Modified: trunk/reactos/subsys/system/taskmgr/procpage.c --- trunk/reactos/subsys/system/taskmgr/procpage.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/procpage.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" HWND hProcessPage; /* Process List Property Page */ _____ Modified: trunk/reactos/subsys/system/taskmgr/run.c --- trunk/reactos/subsys/system/taskmgr/run.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/run.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" void TaskManager_OnFileNew(void) { _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.c --- trunk/reactos/subsys/system/taskmgr/taskmgr.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" #define STATUS_WINDOW 2001 _____ Modified: trunk/reactos/subsys/system/taskmgr/trayicon.c --- trunk/reactos/subsys/system/taskmgr/trayicon.c 2005-10-19 00:19:25 UTC (rev 18582) +++ trunk/reactos/subsys/system/taskmgr/trayicon.c 2005-10-19 00:46:31 UTC (rev 18583) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <precomp.h> +#include "precomp.h" HICON TrayIcon_GetProcessorUsageIcon(void) {

1 0

[cwittich] 18582: fixed compile problems with msvc 2003/2005
by cwittich＠svn.reactos.com 19 Oct '05

19 Oct '05

fixed compile problems with msvc 2003/2005 Modified: trunk/reactos/subsys/system/msconfig/msconfig.c Modified: trunk/reactos/subsys/system/msconfig/srvpage.c Modified: trunk/reactos/subsys/system/msconfig/toolspage.c _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.c --- trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-18 23:53:47 UTC (rev 18581) +++ trunk/reactos/subsys/system/msconfig/msconfig.c 2005-10-19 00:19:25 UTC (rev 18582) @@ -1,4 +1,4 @@ -#include <precomp.h> +#include "precomp.h" HINSTANCE hInst = 0; _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-18 23:53:47 UTC (rev 18581) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-19 00:19:25 UTC (rev 18582) @@ -1,4 +1,4 @@ -#include <precomp.h> +#include "precomp.h" HWND hServicesPage; HWND hServicesListCtrl; _____ Modified: trunk/reactos/subsys/system/msconfig/toolspage.c --- trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-18 23:53:47 UTC (rev 18581) +++ trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-19 00:19:25 UTC (rev 18582) @@ -1,4 +1,4 @@ -#include <precomp.h> +#include "precomp.h" HWND hToolsPage; HWND hToolsListCtrl;

1 0

[cwittich] 18581: added missing shell32.lib
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

added missing shell32.lib Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.xml _____ Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.xml --- trunk/reactos/subsys/system/regsvr32/regsvr32.xml 2005-10-18 23:48:37 UTC (rev 18580) +++ trunk/reactos/subsys/system/regsvr32/regsvr32.xml 2005-10-18 23:53:47 UTC (rev 18581) @@ -4,6 +4,7 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>user32</library> + <library>shell32</library> <library>ole32</library> <file>regsvr32.c</file> <file>regsvr32.rc</file>

1 0

[cwittich] 18580: added missing shell32.lib
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

added missing shell32.lib Modified: trunk/reactos/subsys/system/winver/winver.xml _____ Modified: trunk/reactos/subsys/system/winver/winver.xml --- trunk/reactos/subsys/system/winver/winver.xml 2005-10-18 23:43:51 UTC (rev 18579) +++ trunk/reactos/subsys/system/winver/winver.xml 2005-10-18 23:48:37 UTC (rev 18580) @@ -5,5 +5,6 @@ <define name="_UNICODE" /> <define name="_WIN32_IE">0x501</define> <define name="_WIN32_WINNT">0x0501</define> - <file>winver.c</file> + <library>shell32</library> + <file>winver.c</file> </module>

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005