Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[gvg] 20086: Merge from trunk:

by gvg＠svn.reactos.com

Merge from trunk: Put back extra info if it was present Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/http.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/wininet/http.c --- branches/ros-branch-0_2_9/reactos/lib/wininet/http.c 2005-12-11 21:24:27 UTC (rev 20085) +++ branches/ros-branch-0_2_9/reactos/lib/wininet/http.c 2005-12-11 21:24:51 UTC (rev 20086) @@ -1369,6 +1369,10 @@ if (urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) urlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; + if (sizeof(path) / sizeof(path[0]) <= strlenW(path) + strlenW(extra)) + return FALSE; + strcatW(path, extra); + #if 0 /* * This upsets redirects to binary files on sourceforge.net

18 years, 9 months

[gvg] 20085: Put back extra info if it was present

by gvg＠svn.reactos.com

Put back extra info if it was present Modified: trunk/reactos/lib/wininet/http.c _____ Modified: trunk/reactos/lib/wininet/http.c --- trunk/reactos/lib/wininet/http.c 2005-12-11 21:22:45 UTC (rev 20084) +++ trunk/reactos/lib/wininet/http.c 2005-12-11 21:24:27 UTC (rev 20085) @@ -1369,6 +1369,10 @@ if (urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) urlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; + if (sizeof(path) / sizeof(path[0]) <= strlenW(path) + strlenW(extra)) + return FALSE; + strcatW(path, extra); + #if 0 /* * This upsets redirects to binary files on sourceforge.net

18 years, 9 months

[sgasiorek] 20084: added polish resource by Kokodin <kuraxxl(at)wp.pl>

by sgasiorek＠svn.reactos.com

added polish resource by Kokodin <kuraxxl(at)wp.pl> Added: trunk/reactos/subsys/system/explorer/explorer-pl.rc Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc _____ Added: trunk/reactos/subsys/system/explorer/explorer-pl.rc --- trunk/reactos/subsys/system/explorer/explorer-pl.rc 2005-12-11 21:18:32 UTC (rev 20083) +++ trunk/reactos/subsys/system/explorer/explorer-pl.rc 2005-12-11 21:22:45 UTC (rev 20084) @@ -0,0 +1,399 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// Polish (PL) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL +#pragma code_page(1250) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Plik" + BEGIN + MENUITEM "Urucho&m...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "Za&ko±cz", ID_FILE_EXIT + END + POPUP "&Widok" + BEGIN + MENUITEM "Przyciski &standardowe", ID_VIEW_TOOL_BAR + MENUITEM "P&rzyciski dodatkowe", ID_VIEW_EXTRA_BAR + MENUITEM "Pasek &dysk¾w", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Pasek &boczny", ID_VIEW_SIDE_BAR + MENUITEM "Pasek sta&nu", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Od£wie?\tF5", ID_REFRESH + MENUITEM "P&e?ny ekran\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Okna" + BEGIN + MENUITEM "Nowe &okno", ID_WINDOW_NEW + MENUITEM "&Kaskada\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&S?siaduj?co poziomo", ID_WINDOW_TILE_HORZ + MENUITEM "S?siaduj?co &pionowo\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "&Autorozmieszczenie", ID_WINDOW_AUTOSORT + MENUITEM "Rozmie£µ wed?ug &nazwy", ID_WINDOW_ARRANGE + END + POPUP "&NarzÛdzia" + BEGIN + MENUITEM "&Opcje", ID_TOOLS_OPTIONS + END + POPUP "Pomo&c" + BEGIN + MENUITEM "Explorer &FAQ", ID_EXPLORER_FAQ + MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS - I&nformacje", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&W?a£ciwo£ci", ID_DESKTOPBAR_SETTINGS + MENUITEM "Mened?er &zada±", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Otw¾rz regulacje g?o£no£ci", ID_TRAY_VOLUME + MENUITEM "&Ustaw w?a£ciwo£ci audio", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Poka? ukryte ikony", ID_SHOW_HIDDEN_ICONS + MENUITEM "&Ukrywaj nieu?ywane ikony", ID_SHOW_ICON_BUTTON + MENUITEM "&Konfiguruj powiadomienia", ID_CONFIG_NOTIFYAREA + MENUITEM "Ustaw &datÛ/godzinÛ", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Plik" + BEGIN + MENUITEM "Urucho&m...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "Za&ko±cz", ID_FILE_EXIT + END + POPUP "&Widok" + BEGIN + MENUITEM "Przyciski &standardowe", ID_VIEW_TOOL_BAR + MENUITEM "Pasek &boczny", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "Pasek sta&nu", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Od£wie?\tF5", ID_REFRESH + MENUITEM "P&e?ny ekran\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&NarzÛdzia" + BEGIN + MENUITEM "&Opcje", ID_TOOLS_OPTIONS + END + POPUP "Pomo&c" + BEGIN + MENUITEM "Explorer &FAQ", ID_EXPLORER_FAQ + MENUITEM "ReactOS Explorer - &Informacje", ID_ABOUT_EXPLORER + MENUITEM "ReactOS - I&nformacje", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Uruchom" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Polecenie:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Jako &symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Anuluj",2,158,23,47,14 + PUSHBUTTON "Pomo&c",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Szukaj programu w menu start" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filtry:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Szukaj nazwy",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "W?a£ciwo£ci pulpitu" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Wybierz spos¾b uk?adania ikon:", + IDC_STATIC,7,7,166,8 + CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Wy£wietlaj &numer wersji",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "W?a£ciwo£ci paska zada±" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Poka? &zegar",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&Ukrywaj nieaktywne ikony", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Dostosuj",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "W?a£ciwo£ci Menu Start" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Konfiguracja ikon powiadomie±" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Podpowiedf:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "&Tytu? okna:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "îcie?ka:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Spos¾b wy£wietlania",IDC_LABEL4,7,96,157,28 + CONTROL "&widoczny",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&ukryty",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "&autoukrywanie",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Zmodyfikowany:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "Po&ka? wszystkie",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Anuluj",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Tryb wy£wietlania okien" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Wybierz tryb wy£wietlania okien:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (Otwieraj w jednym oknie)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (Otwieraj we w?asnym oknie)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "&Otwieraj podkatalogi w nowych oknach", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 + LTEXT "Te opcje bÛd? stosowane w przysz?o£ci do wszystkich okien.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Anuluj",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Explorer - &Informacje" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Explorer" + IDS_START "Start" + IDS_LOGOFF "Wyloguj..." + IDS_SHUTDOWN "Zamknij system..." + IDS_LAUNCH "Uruchom..." + IDS_START_HELP "Pomoc" + IDS_SEARCH_FILES "Szukaj..." + IDS_DOCUMENTS "Dokumenty" + IDS_FAVORITES "Ulubione" + IDS_PROGRAMS "Programy" + IDS_SETTINGS "Ustawienia" + IDS_EXPLORE "Eksploruj" + IDS_EMPTY "(pusty)" + IDS_RECENT "Ostatnio otwarte" + IDS_ADMIN "Administracja" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Menu start" + IDS_MINIMIZE_ALL "Minimalizuj wszystko" + IDS_DESKTOP_NUM "Pulpit %d" + IDS_VOLUME "G?o£no£µ" + IDS_ITEMS_CUR "Aktualne pozycje" + IDS_ITEMS_CONFIGURED "ustawienia" + IDS_ITEMS_VISIBLE "widoczne" + IDS_ITEMS_HIDDEN "ukryte" + IDS_NOTIFY_SHOW "poka?" + IDS_NOTIFY_HIDE "ukryj" + IDS_NOTIFY_AUTOHIDE "autoukrywanie" + IDS_SHOW_HIDDEN_ICONS "Poka? ukryte ikony" + IDS_HIDE_ICONS "Ukryj ikony" + IDS_TERMINATE "Zako±cz dzia?anie ROS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Sieµ" + IDS_CONNECTIONS "Po??czenia sieciowe" + IDS_DRIVES "Dysk" + IDS_SEARCH_COMPUTER "Znajdf komputar..." + IDS_SETTINGS_MENU "Settings menu" + IDS_CONTROL_PANEL "Panel sterowania" + IDS_PRINTERS "Drukarki" + IDS_BROWSE "Przegl?daj" + IDS_SEARCH_PRG "Znajdf progarm..." + IDS_ALL_USERS "All Users\\" + IDS_SEARCH "Szukaj" + IDS_ABOUT_EXPLORER "ReactOS Explorer - &Informacje" + IDS_LAUNCH_MANY_PROGRAMS + "Zaznaczy?e£ wiÛcej ni? jeden program.\nCzy chcesz uruchomiµ je jednocze£nie?" + IDS_DESKTOPBAR_SETTINGS "W?a£ciwo£ci pulpitu" + IDS_DESKTOP "Pulpit" + IDS_TASKBAR "Pasek zada±" +END + +#endif // Polish (PL) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-12-11 21:18:32 UTC (rev 20083) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-12-11 21:22:45 UTC (rev 20084) @@ -110,6 +110,7 @@ "#include ""explorer-de.rc""\r\n" "#include ""explorer-es.rc""\r\n" "#include ""explorer-sv.rc""\r\n" + "#include ""explorer-pl.rc""\r\n" "#include ""explorer-pt.rc""\r\n" "#include ""explorer-cz.rc""\r\n" "#include ""explorer-ro.rc""\r\n" @@ -196,6 +197,7 @@ #include "explorer-de.rc" #include "explorer-es.rc" #include "explorer-sv.rc" +#include "explorer-pl.rc" #include "explorer-pt.rc" #include "explorer-cz.rc" #include "explorer-ro.rc"

18 years, 9 months

[gvg] 20083: Merge from trunk:

by gvg＠svn.reactos.com

Merge from trunk: Resolve chained CNAME records Modified: branches/ros-branch-0_2_9/reactos/lib/dnsapi/dnsapi/query.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/dnsapi/dnsapi/query.c --- branches/ros-branch-0_2_9/reactos/lib/dnsapi/dnsapi/query.c 2005-12-11 21:17:58 UTC (rev 20082) +++ branches/ros-branch-0_2_9/reactos/lib/dnsapi/dnsapi/query.c 2005-12-11 21:18:32 UTC (rev 20083) @@ -34,8 +34,10 @@ char *xstrsave(const char *str) { char *p; - p= RtlAllocateHeap( RtlGetProcessHeap(), 0, strlen(str)+1 ); - strcpy(p,str); + p = RtlAllocateHeap( RtlGetProcessHeap(), 0, strlen(str)+1 ); + if ( NULL != p ) { + strcpy(p,str); + } return p; } @@ -50,6 +52,8 @@ int quflags = 0; int adns_error; adns_answer *answer; + LPSTR CurrentName; + unsigned CNameLoop; *QueryResultSet = 0; @@ -64,31 +68,78 @@ return DnsIntTranslateAdnsToDNS_STATUS( adns_error ); } - adns_error = adns_synchronous( astate, - Name, - adns_r_addr, - quflags, - &answer ); + /* + * adns doesn't resolve chained CNAME records (a CNAME which points to + * another CNAME pointing to another... pointing to an A record), according + * to a mailing list thread the authors believe that chained CNAME records + * are invalid and the DNS entries should be fixed. That's a nice academic + * standpoint, but there certainly are chained CNAME records out there, + * even some fairly major ones (at the time of this writing + * download.mozilla.org is a chained CNAME). Everyone else seems to resolve + * these fine, so we should too. So we loop here to try to resolve CNAME + * chains ourselves. Of course, there must be a limit to protect against + * CNAME loops. + */ + +#define CNAME_LOOP_MAX 16 + + CurrentName = (LPSTR) Name; + for ( CNameLoop = 0; CNameLoop < CNAME_LOOP_MAX; CNameLoop++ ) { + adns_error = adns_synchronous( astate, + CurrentName, + adns_r_addr, + quflags, + &answer ); - if( adns_error != adns_s_ok ) { - adns_finish( astate ); - return DnsIntTranslateAdnsToDNS_STATUS( adns_error ); + if( adns_error != adns_s_ok ) { + adns_finish( astate ); + if ( CurrentName != Name ) { + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + } + return DnsIntTranslateAdnsToDNS_STATUS( adns_error ); + } + + if( answer && answer->rrs.addr ) { + if ( CurrentName != Name ) { + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + } + *QueryResultSet = + (PDNS_RECORD)RtlAllocateHeap( RtlGetProcessHeap(), 0, + sizeof( DNS_RECORD ) ); + if ( NULL == *QueryResultSet ) { + adns_finish( astate ); + return ERROR_OUTOFMEMORY; + } + (*QueryResultSet)->pNext = NULL; + (*QueryResultSet)->wType = Type; + (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); + (*QueryResultSet)->Data.A.IpAddress = + answer->rrs.addr->addr.inet.sin_addr.s_addr; + adns_finish( astate ); + (*QueryResultSet)->pName = xstrsave( Name ); + return NULL != (*QueryResultSet)->pName ? ERROR_SUCCESS : + ERROR_OUTOFMEMORY; + } + if ( NULL == answer || adns_s_prohibitedcname != answer->status || + NULL == answer->cname ) { + adns_finish( astate ); + if ( CurrentName != Name ) { + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + } + return ERROR_FILE_NOT_FOUND; + } + if ( CurrentName != Name ) { + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + } + CurrentName = xstrsave( answer->cname ); + if ( NULL == CurrentName ) { + adns_finish( astate ); + return ERROR_OUTOFMEMORY; + } } - - if( answer && answer->rrs.addr ) { - *QueryResultSet = - (PDNS_RECORD)RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof( DNS_RECORD ) ); - (*QueryResultSet)->pNext = NULL; - (*QueryResultSet)->wType = Type; - (*QueryResultSet)->pName = xstrsave( Name ); - (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); - (*QueryResultSet)->Data.A.IpAddress = - answer->rrs.addr->addr.inet.sin_addr.s_addr; - adns_finish( astate ); - return ERROR_SUCCESS; - } else - return ERROR_FILE_NOT_FOUND; + adns_finish( astate ); + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + return ERROR_FILE_NOT_FOUND; default: return ERROR_OUTOFMEMORY; /* XXX arty: find a better error code. */ }

18 years, 9 months

[gvg] 20082: Resolve chained CNAME records

by gvg＠svn.reactos.com

Resolve chained CNAME records Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c --- trunk/reactos/lib/dnsapi/dnsapi/query.c 2005-12-11 21:12:22 UTC (rev 20081) +++ trunk/reactos/lib/dnsapi/dnsapi/query.c 2005-12-11 21:17:58 UTC (rev 20082) @@ -34,8 +34,10 @@ char *xstrsave(const char *str) { char *p; - p= RtlAllocateHeap( RtlGetProcessHeap(), 0, strlen(str)+1 ); - strcpy(p,str); + p = RtlAllocateHeap( RtlGetProcessHeap(), 0, strlen(str)+1 ); + if ( NULL != p ) { + strcpy(p,str); + } return p; } @@ -50,6 +52,8 @@ int quflags = 0; int adns_error; adns_answer *answer; + LPSTR CurrentName; + unsigned CNameLoop; *QueryResultSet = 0; @@ -64,31 +68,78 @@ return DnsIntTranslateAdnsToDNS_STATUS( adns_error ); } - adns_error = adns_synchronous( astate, - Name, - adns_r_addr, - quflags, - &answer ); + /* + * adns doesn't resolve chained CNAME records (a CNAME which points to + * another CNAME pointing to another... pointing to an A record), according + * to a mailing list thread the authors believe that chained CNAME records + * are invalid and the DNS entries should be fixed. That's a nice academic + * standpoint, but there certainly are chained CNAME records out there, + * even some fairly major ones (at the time of this writing + * download.mozilla.org is a chained CNAME). Everyone else seems to resolve + * these fine, so we should too. So we loop here to try to resolve CNAME + * chains ourselves. Of course, there must be a limit to protect against + * CNAME loops. + */ + +#define CNAME_LOOP_MAX 16 + + CurrentName = (LPSTR) Name; + for ( CNameLoop = 0; CNameLoop < CNAME_LOOP_MAX; CNameLoop++ ) { + adns_error = adns_synchronous( astate, + CurrentName, + adns_r_addr, + quflags, + &answer ); - if( adns_error != adns_s_ok ) { - adns_finish( astate ); - return DnsIntTranslateAdnsToDNS_STATUS( adns_error ); + if( adns_error != adns_s_ok ) { + adns_finish( astate ); + if ( CurrentName != Name ) { + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + } + return DnsIntTranslateAdnsToDNS_STATUS( adns_error ); + } + + if( answer && answer->rrs.addr ) { + if ( CurrentName != Name ) { + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + } + *QueryResultSet = + (PDNS_RECORD)RtlAllocateHeap( RtlGetProcessHeap(), 0, + sizeof( DNS_RECORD ) ); + if ( NULL == *QueryResultSet ) { + adns_finish( astate ); + return ERROR_OUTOFMEMORY; + } + (*QueryResultSet)->pNext = NULL; + (*QueryResultSet)->wType = Type; + (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); + (*QueryResultSet)->Data.A.IpAddress = + answer->rrs.addr->addr.inet.sin_addr.s_addr; + adns_finish( astate ); + (*QueryResultSet)->pName = xstrsave( Name ); + return NULL != (*QueryResultSet)->pName ? ERROR_SUCCESS : + ERROR_OUTOFMEMORY; + } + if ( NULL == answer || adns_s_prohibitedcname != answer->status || + NULL == answer->cname ) { + adns_finish( astate ); + if ( CurrentName != Name ) { + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + } + return ERROR_FILE_NOT_FOUND; + } + if ( CurrentName != Name ) { + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + } + CurrentName = xstrsave( answer->cname ); + if ( NULL == CurrentName ) { + adns_finish( astate ); + return ERROR_OUTOFMEMORY; + } } - - if( answer && answer->rrs.addr ) { - *QueryResultSet = - (PDNS_RECORD)RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof( DNS_RECORD ) ); - (*QueryResultSet)->pNext = NULL; - (*QueryResultSet)->wType = Type; - (*QueryResultSet)->pName = xstrsave( Name ); - (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); - (*QueryResultSet)->Data.A.IpAddress = - answer->rrs.addr->addr.inet.sin_addr.s_addr; - adns_finish( astate ); - return ERROR_SUCCESS; - } else - return ERROR_FILE_NOT_FOUND; + adns_finish( astate ); + RtlFreeHeap( CurrentName, 0, GetProcessHeap() ); + return ERROR_FILE_NOT_FOUND; default: return ERROR_OUTOFMEMORY; /* XXX arty: find a better error code. */ }

18 years, 9 months

[weiden] 20081: fixed some missing NULL checks, reported by M Bealby in bug #1110

by weiden＠svn.reactos.com

fixed some missing NULL checks, reported by M Bealby in bug #1110 Modified: trunk/reactos/lib/kernel32/misc/atom.c Modified: trunk/reactos/lib/kernel32/misc/env.c Modified: trunk/reactos/lib/kernel32/misc/lzexpand_main.c Modified: trunk/reactos/lib/kernel32/process/cmdline.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/kernel32/process/proc.c _____ Modified: trunk/reactos/lib/kernel32/misc/atom.c --- trunk/reactos/lib/kernel32/misc/atom.c 2005-12-11 20:22:21 UTC (rev 20080) +++ trunk/reactos/lib/kernel32/misc/atom.c 2005-12-11 21:12:22 UTC (rev 20081) @@ -238,6 +238,11 @@ Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, BufferSize); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } Status = NtQueryInformationAtom(nAtom, AtomBasicInformation, @@ -249,6 +254,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetLastErrorByStatus(Status); return 0; } @@ -287,6 +293,11 @@ Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, BufferSize); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } Status = NtQueryInformationAtom(nAtom, AtomBasicInformation, @@ -298,6 +309,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetLastErrorByStatus(Status); return 0; } @@ -552,6 +564,11 @@ Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, NameLength); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } Status = RtlQueryAtomInAtomTable(AtomTable, nAtom, @@ -564,6 +581,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetLastErrorByStatus(Status); return 0; } _____ Modified: trunk/reactos/lib/kernel32/misc/env.c --- trunk/reactos/lib/kernel32/misc/env.c 2005-12-11 20:22:21 UTC (rev 20080) +++ trunk/reactos/lib/kernel32/misc/env.c 2005-12-11 21:12:22 UTC (rev 20081) @@ -290,6 +290,11 @@ EnvPtr = RtlAllocateHeap (RtlGetProcessHeap (), 0, Length + 1); + if (EnvPtr == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } DPRINT("EnvPtr %p\n", EnvPtr); /* convert unicode environment to ansi */ @@ -392,9 +397,14 @@ RtlInitAnsiString (&Source, (LPSTR)lpSrc); - RtlAnsiStringToUnicodeString (&SourceU, - &Source, - TRUE); + Status = RtlAnsiStringToUnicodeString (&SourceU, + &Source, + TRUE); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus (Status); + return 0; + } Destination.Length = 0; Destination.MaximumLength = nSize; @@ -405,6 +415,12 @@ DestinationU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), 0, DestinationU.MaximumLength); + if (DestinationU.Buffer == NULL) + { + RtlFreeUnicodeString(&SourceU); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } Status = RtlExpandEnvironmentStrings_U (NULL, &SourceU, _____ Modified: trunk/reactos/lib/kernel32/misc/lzexpand_main.c --- trunk/reactos/lib/kernel32/misc/lzexpand_main.c 2005-12-11 20:22:21 UTC (rev 20080) +++ trunk/reactos/lib/kernel32/misc/lzexpand_main.c 2005-12-11 21:12:22 UTC (rev 20081) @@ -294,14 +294,23 @@ INT WINAPI GetExpandedNameW( LPWSTR in, LPWSTR out ) { INT ret; - DWORD len = WideCharToMultiByte( CP_ACP, 0, in, -1, NULL, 0, NULL, NULL ); - char *xin = RtlAllocateHeap( GetProcessHeap(), 0, len ); - char *xout = RtlAllocateHeap( GetProcessHeap(), 0, len+3 ); + DWORD len; + char *xin, *xout; + len = WideCharToMultiByte( CP_ACP, 0, in, -1, NULL, 0, NULL, NULL ); + xin = RtlAllocateHeap( RtlGetProcessHeap(), 0, len ); + if (xin == NULL) + return LZERROR_BADVALUE; + xout = RtlAllocateHeap( RtlGetProcessHeap(), 0, len+3 ); + if (xout == NULL) + { + RtlFreeHeap( RtlGetProcessHeap(), 0, xin ); + return LZERROR_BADVALUE; + } WideCharToMultiByte( CP_ACP, 0, in, -1, xin, len, NULL, NULL ); if ((ret = GetExpandedNameA( xin, xout )) > 0) MultiByteToWideChar( CP_ACP, 0, xout, -1, out, wcslen(in)+4 ); - RtlFreeHeap( GetProcessHeap(), 0, xin ); - RtlFreeHeap( GetProcessHeap(), 0, xout ); + RtlFreeHeap( RtlGetProcessHeap(), 0, xin ); + RtlFreeHeap( RtlGetProcessHeap(), 0, xout ); return ret; } _____ Modified: trunk/reactos/lib/kernel32/process/cmdline.c --- trunk/reactos/lib/kernel32/process/cmdline.c 2005-12-11 20:22:21 UTC (rev 20080) +++ trunk/reactos/lib/kernel32/process/cmdline.c 2005-12-11 21:12:22 UTC (rev 20081) @@ -32,6 +32,8 @@ { PRTL_USER_PROCESS_PARAMETERS Params; + /* FIXME - not thread-safe! */ + // get command line Params = NtCurrentPeb()->ProcessParameters; RtlNormalizeProcessParams (Params); @@ -42,6 +44,10 @@ CommandLineStringW.Buffer = RtlAllocateHeap(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY, CommandLineStringW.MaximumLength); + if (CommandLineStringW.Buffer == NULL) + { + return; + } RtlInitAnsiString(&CommandLineStringA, NULL); _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-12-11 20:22:21 UTC (rev 20080) +++ trunk/reactos/lib/kernel32/process/create.c 2005-12-11 21:12:22 UTC (rev 20081) @@ -160,7 +160,11 @@ &Context, &InitialTeb, TRUE); - + if (!NT_SUCCESS(Status)) + { + return NULL; + } + /* Success */ return hThread; } @@ -603,7 +607,7 @@ NULL); /* Cleanup */ - RtlFreeHeap(GetProcessHeap(), 0, DllPath.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath.Buffer); RtlDestroyProcessParameters(ProcessParameters); DPRINT("Completed\n"); @@ -635,10 +639,10 @@ BOOLEAN FoundQuotes = FALSE; BOOLEAN QuotesNeeded = FALSE; BOOLEAN CmdLineIsAppName = FALSE; - UNICODE_STRING ApplicationName; + UNICODE_STRING ApplicationName = {0}; OBJECT_ATTRIBUTES LocalObjectAttributes; POBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hSection, hProcess, hThread; + HANDLE hSection = NULL, hProcess = NULL, hThread = NULL; SECTION_IMAGE_INFORMATION SectionImageInfo; LPWSTR CurrentDirectory = NULL; LPWSTR CurrentDirectoryPart; @@ -662,6 +666,7 @@ PPEB OurPeb = NtCurrentPeb(); PPEB RemotePeb; SIZE_T EnvSize = 0; + BOOL Ret = FALSE; DPRINT("CreateProcessW: lpApplicationName: %S lpCommandLine: %S" " lpEnvironment: %p lpCurrentDirectory: %S dwCreationFlags: %lx\n", @@ -767,9 +772,14 @@ if (!lpApplicationName) { /* The fun begins */ - NameBuffer = RtlAllocateHeap(GetProcessHeap(), + NameBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if (NameBuffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto Cleanup; + } /* This is all we have to work with :( */ lpApplicationName = lpCommandLine; @@ -929,7 +939,7 @@ } /* We totally failed */ - return FALSE; + goto Cleanup; } /* Put back the command line */ @@ -963,8 +973,8 @@ if ((BasepCheckDosApp(&ApplicationName))) { DPRINT1("Launching VDM...\n"); - RtlFreeHeap(GetProcessHeap(), 0, NameBuffer); - RtlFreeHeap(GetProcessHeap(), 0, ApplicationName.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, ApplicationName.Buffer); return CreateProcessW(L"ntvdm.exe", (LPWSTR)lpApplicationName, lpProcessAttributes, @@ -996,9 +1006,14 @@ CmdLineLength *= sizeof(WCHAR); /* Allocate space for the new command line */ - BatchCommandLine = RtlAllocateHeap(GetProcessHeap(), + BatchCommandLine = RtlAllocateHeap(RtlGetProcessHeap(), 0, CmdLineLength); + if (BatchCommandLine == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto Cleanup; + } /* Build it */ wcscpy(BatchCommandLine, CMD_STRING); @@ -1020,7 +1035,7 @@ lpApplicationName = NULL; /* Free memory */ - RtlFreeHeap(GetProcessHeap(), 0, ApplicationName.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, ApplicationName.Buffer); ApplicationName.Buffer = NULL; goto GetAppName; break; @@ -1029,8 +1044,8 @@ /* It's a Win16 Image, use VDM */ DPRINT1("Launching VDM...\n"); - RtlFreeHeap(GetProcessHeap(), 0, NameBuffer); - RtlFreeHeap(GetProcessHeap(), 0, ApplicationName.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, ApplicationName.Buffer); return CreateProcessW(L"ntvdm.exe", (LPWSTR)lpApplicationName, lpProcessAttributes, @@ -1045,7 +1060,7 @@ default: /* Invalid Image Type */ SetLastError(ERROR_BAD_EXE_FORMAT); - return FALSE; + goto Cleanup; } } @@ -1067,19 +1082,17 @@ NULL); if(!NT_SUCCESS(Status)) { - NtClose(hSection); DPRINT1("Unable to get SectionImageInformation, status 0x%x\n", Status); SetLastErrorByStatus(Status); - return FALSE; + goto Cleanup; } /* Don't execute DLLs */ if (SectionImageInfo.ImageCharacteristics & IMAGE_FILE_DLL) { - NtClose(hSection); DPRINT1("Can't execute a DLL\n"); SetLastError(ERROR_BAD_EXE_FORMAT); - return FALSE; + goto Cleanup; } /* FIXME: Check for Debugger */ @@ -1090,10 +1103,9 @@ if (IMAGE_SUBSYSTEM_WINDOWS_GUI != SectionImageInfo.SubsystemType && IMAGE_SUBSYSTEM_WINDOWS_CUI != SectionImageInfo.SubsystemType) { - NtClose(hSection); DPRINT1("Invalid subsystem %d\n", SectionImageInfo.SubsystemType); SetLastError(ERROR_BAD_EXE_FORMAT); - return FALSE; + goto Cleanup; } /* Initialize the process object attributes */ @@ -1112,10 +1124,9 @@ NULL); if(!NT_SUCCESS(Status)) { - NtClose(hSection); DPRINT1("Unable to create process, status 0x%x\n", Status); SetLastErrorByStatus(Status); - return FALSE; + goto Cleanup; } /* Set new class */ @@ -1125,11 +1136,9 @@ sizeof(PROCESS_PRIORITY_CLASS)); if(!NT_SUCCESS(Status)) { - NtClose(hProcess); - NtClose(hSection); DPRINT1("Unable to set new process priority, status 0x%x\n", Status); SetLastErrorByStatus(Status); - return FALSE; + goto Cleanup; } /* Set Error Mode */ @@ -1146,9 +1155,15 @@ if (lpCurrentDirectory) { /* Allocate a buffer */ - CurrentDirectory = RtlAllocateHeap(GetProcessHeap(), + CurrentDirectory = RtlAllocateHeap(RtlGetProcessHeap(), 0, - MAX_PATH * sizeof(WCHAR) + 2); + (MAX_PATH + 1) * sizeof(WCHAR)); + if (CurrentDirectory == NULL) + { + DPRINT1("Cannot allocate memory for directory name\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto Cleanup; + } /* Get the length */ if (GetFullPathNameW(lpCurrentDirectory, @@ -1158,7 +1173,7 @@ { DPRINT1("Directory name too long\n"); SetLastError(ERROR_DIRECTORY); - return FALSE; + goto Cleanup; } } @@ -1166,10 +1181,16 @@ if (QuotesNeeded || CmdLineIsAppName) { /* Allocate a buffer */ - QuotedCmdLine = RtlAllocateHeap(GetProcessHeap(), + QuotedCmdLine = RtlAllocateHeap(RtlGetProcessHeap(), 0, (wcslen(lpCommandLine) + 2 + 1) * sizeof(WCHAR)); + if (QuotedCmdLine == NULL) + { + DPRINT1("Cannot allocate memory for quoted command line\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto Cleanup; + } /* Copy the first quote */ wcscpy(QuotedCmdLine, L"\""); @@ -1199,9 +1220,14 @@ { if (QuotedCmdLine == NULL) { - QuotedCmdLine = RtlAllocateHeap(GetProcessHeap(), + QuotedCmdLine = RtlAllocateHeap(RtlGetProcessHeap(), 0, (wcslen(lpCommandLine) + 1) * sizeof(WCHAR)); + if (QuotedCmdLine == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto Cleanup; + } wcscpy(QuotedCmdLine, lpCommandLine); } @@ -1227,7 +1253,7 @@ if(lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)) { lpEnvironment = BasepConvertUnicodeEnvironment(&EnvSize, lpEnvironment); - if (!lpEnvironment) return FALSE; + if (!lpEnvironment) goto Cleanup; } /* Create Process Environment */ @@ -1254,7 +1280,7 @@ { DPRINT1("Could not initialize Process Environment\n"); SetLastErrorByStatus(Status); - return FALSE; + goto Cleanup; } /* Close the section */ @@ -1276,7 +1302,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to read memory\n"); - return FALSE; + goto Cleanup; } /* Duplicate and write the handles */ @@ -1292,7 +1318,7 @@ } /* Create the first thread */ - DPRINT("Creating thread for process (EntryPoint = 0x%.08x)\n", + DPRINT("Creating thread for process (EntryPoint = 0x%p)\n", SectionImageInfo.TransferAddress); hThread = BasepCreateFirstThread(hProcess, lpThreadAttributes, @@ -1302,7 +1328,8 @@ if (hThread == NULL) { DPRINT1("Could not create Initial Thread\n"); - return FALSE; + /* FIXME - set last error code */ + goto Cleanup; } @@ -1315,7 +1342,7 @@ { DPRINT1("CSR Notification Failed"); SetLastErrorByStatus(Status); - return FALSE; + goto Cleanup; } if (!(dwCreationFlags & CREATE_SUSPENDED)) @@ -1328,16 +1355,18 @@ lpProcessInformation->dwThreadId = (DWORD)ClientId.UniqueThread; lpProcessInformation->hProcess = hProcess; lpProcessInformation->hThread = hThread; - DPRINT("hThread[%lx]: %lx inside hProcess[%lx]: %lx\n", hThread, + DPRINT("hThread[%p]: %p inside hProcess[%p]: %p\n", hThread, ClientId.UniqueThread, ClientId.UniqueProcess, hProcess); hProcess = hThread = NULL; - + Ret = TRUE; + +Cleanup: /* De-allocate heap strings */ - if (NameBuffer) RtlFreeHeap(GetProcessHeap(), 0, NameBuffer); + if (NameBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, NameBuffer); if (ApplicationName.Buffer) - RtlFreeHeap(GetProcessHeap(), 0, ApplicationName.Buffer); - if (CurrentDirectory) RtlFreeHeap(GetProcessHeap(), 0, CurrentDirectory); - if (QuotedCmdLine) RtlFreeHeap(GetProcessHeap(), 0, QuotedCmdLine); + RtlFreeHeap(RtlGetProcessHeap(), 0, ApplicationName.Buffer); + if (CurrentDirectory) RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentDirectory); + if (QuotedCmdLine) RtlFreeHeap(RtlGetProcessHeap(), 0, QuotedCmdLine); /* Kill any handles still alive */ if (hSection) NtClose(hSection); @@ -1350,7 +1379,7 @@ if (hProcess) NtClose(hProcess); /* Return Success */ - return TRUE; + return Ret; } /* @@ -1498,9 +1527,9 @@ RtlFreeUnicodeString(&ApplicationName); RtlFreeUnicodeString(&LiveCommandLine); RtlFreeUnicodeString(&CurrentDirectory); - RtlFreeHeap(GetProcessHeap(), 0, StartupInfo.lpDesktop); - RtlFreeHeap(GetProcessHeap(), 0, StartupInfo.lpReserved); - RtlFreeHeap(GetProcessHeap(), 0, StartupInfo.lpTitle); + RtlFreeHeap(RtlGetProcessHeap(), 0, StartupInfo.lpDesktop); + RtlFreeHeap(RtlGetProcessHeap(), 0, StartupInfo.lpReserved); + RtlFreeHeap(RtlGetProcessHeap(), 0, StartupInfo.lpTitle); /* Return what Unicode did */ return bRetVal; _____ Modified: trunk/reactos/lib/kernel32/process/proc.c --- trunk/reactos/lib/kernel32/process/proc.c 2005-12-11 20:22:21 UTC (rev 20080) +++ trunk/reactos/lib/kernel32/process/proc.c 2005-12-11 21:12:22 UTC (rev 20081) @@ -489,12 +489,19 @@ RtlAcquirePebLock (); + /* FIXME - not thread-safe */ if (lpLocalStartupInfo == NULL) { /* create new local startup info (ansi) */ lpLocalStartupInfo = RtlAllocateHeap (RtlGetProcessHeap (), 0, sizeof(STARTUPINFOA)); + if (lpLocalStartupInfo == NULL) + { + RtlReleasePebLock (); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return; + } lpLocalStartupInfo->cb = sizeof(STARTUPINFOA);

18 years, 9 months

[sgasiorek] 20080: merge 20065

by sgasiorek＠svn.reactos.com

merge 20065 Modified: branches/ros-branch-0_2_9/reactos/lib/shell32/control.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/shell32/control.c --- branches/ros-branch-0_2_9/reactos/lib/shell32/control.c 2005-12-11 20:04:38 UTC (rev 20079) +++ branches/ros-branch-0_2_9/reactos/lib/shell32/control.c 2005-12-11 20:22:21 UTC (rev 20080) @@ -352,6 +352,7 @@ unsigned sp = 0; LPWSTR extraPmts = NULL; int quoted = 0; + BOOL spSet = FALSE; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -366,8 +367,10 @@ if (beg) { if (*beg == '@') { sp = atoiW(beg + 1); + spSet = TRUE; } else if (*beg == '\0') { sp = 0; + spSet = TRUE; } else { extraPmts = beg; } @@ -381,6 +384,9 @@ while ((ptr = StrChrW(buffer, '"'))) memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + while ((ptr = StrChrW(extraPmts, '"'))) + memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); Control_LoadApplet(hWnd, buffer, panel); @@ -393,6 +399,13 @@ WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); sp = 0; } + + if ((extraPmts)&&(!spSet)) + { + while ((lstrcmpiW(extraPmts, applet->info[sp].szName)) && (sp < applet->count)) + sp++; + } + if (applet->info[sp].dwSize) { if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData);

18 years, 9 months

[weiden] 20079: fixed some missing NULL checks, reported by M Bealby in bug #1110

by weiden＠svn.reactos.com

fixed some missing NULL checks, reported by M Bealby in bug #1110 Modified: trunk/reactos/lib/kernel32/file/dir.c Modified: trunk/reactos/lib/kernel32/file/npipe.c Modified: trunk/reactos/lib/kernel32/file/volume.c _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-12-11 19:42:08 UTC (rev 20078) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-12-11 20:04:38 UTC (rev 20079) @@ -828,16 +828,17 @@ LPSTR *lpFilePart ) { - UNICODE_STRING PathU; - UNICODE_STRING FileNameU; - UNICODE_STRING ExtensionU; - UNICODE_STRING BufferU; + UNICODE_STRING PathU = {0}; + UNICODE_STRING FileNameU = {0}; + UNICODE_STRING ExtensionU = {0}; + UNICODE_STRING BufferU = {0}; ANSI_STRING Path; ANSI_STRING FileName; ANSI_STRING Extension; ANSI_STRING Buffer; PWCHAR FilePartW; - DWORD RetValue; + DWORD RetValue = 0; + NTSTATUS Status = STATUS_SUCCESS; RtlInitAnsiString (&Path, (LPSTR)lpPath); @@ -849,36 +850,54 @@ /* convert ansi (or oem) strings to unicode */ if (bIsFileApiAnsi) { - RtlAnsiStringToUnicodeString (&PathU, - &Path, - TRUE); - RtlAnsiStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - RtlAnsiStringToUnicodeString (&ExtensionU, - &Extension, - TRUE); + Status = RtlAnsiStringToUnicodeString (&PathU, + &Path, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + + Status = RtlAnsiStringToUnicodeString (&FileNameU, + &FileName, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + + Status = RtlAnsiStringToUnicodeString (&ExtensionU, + &Extension, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; } else { - RtlOemStringToUnicodeString (&PathU, - &Path, - TRUE); - RtlOemStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - RtlOemStringToUnicodeString (&ExtensionU, - &Extension, - TRUE); + Status = RtlOemStringToUnicodeString (&PathU, + &Path, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + Status = RtlOemStringToUnicodeString (&FileNameU, + &FileName, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + + Status = RtlOemStringToUnicodeString (&ExtensionU, + &Extension, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; } - BufferU.Length = 0; BufferU.MaximumLength = nBufferLength * sizeof(WCHAR); BufferU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), 0, BufferU.MaximumLength); + if (BufferU.Buffer == NULL) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } - Buffer.Length = 0; Buffer.MaximumLength = nBufferLength; Buffer.Buffer = lpBuffer; @@ -889,16 +908,6 @@ BufferU.Buffer, &FilePartW); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - PathU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - FileNameU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - ExtensionU.Buffer); - if (0 != RetValue) { BufferU.Length = wcslen(BufferU.Buffer) * sizeof(WCHAR); @@ -913,15 +922,31 @@ FALSE); /* nul-terminate ascii string */ Buffer.Buffer[BufferU.Length / sizeof(WCHAR)] = '\0'; + + if (NULL != lpFilePart && BufferU.Length != 0) + { + *lpFilePart = strrchr (lpBuffer, '\\') + 1; + } } +Cleanup: RtlFreeHeap (RtlGetProcessHeap (), 0, + PathU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + FileNameU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + ExtensionU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), + 0, BufferU.Buffer); - if (NULL != lpFilePart) + if (!NT_SUCCESS(Status)) { - *lpFilePart = strrchr (lpBuffer, '\\') + 1; + SetLastErrorByStatus(Status); + return 0; } return RetValue; @@ -1032,9 +1057,14 @@ if (lpPath == NULL) { - AppPathW = (PWCHAR) RtlAllocateHeap(GetProcessHeap(), + AppPathW = (PWCHAR) RtlAllocateHeap(RtlGetProcessHeap(), HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY, MAX_PATH * sizeof(WCHAR)); + if (AppPathW == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } wcscat (AppPathW, NtCurrentPeb()->ProcessParameters->ImagePathName.Buffer); @@ -1052,11 +1082,12 @@ len += 1 + GetWindowsDirectoryW(&Buffer, 0); len += 1 + wcslen(AppPathW) * sizeof(WCHAR); - EnvironmentBufferW = (PWCHAR) RtlAllocateHeap(GetProcessHeap(), + EnvironmentBufferW = (PWCHAR) RtlAllocateHeap(RtlGetProcessHeap(), HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); if (EnvironmentBufferW == NULL) { + RtlFreeHeap(RtlGetProcessHeap(), 0, AppPathW); SetLastError(ERROR_OUTOFMEMORY); return 0; } _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-12-11 19:42:08 UTC (rev 20078) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-12-11 20:04:38 UTC (rev 20079) @@ -353,6 +353,16 @@ return FALSE; } + /* Now calculate the total length of the structure and allocate it */ + WaitPipeInfoSize = FIELD_OFFSET(FILE_PIPE_WAIT_FOR_BUFFER, Name[0]) + + NewName.Length; + WaitPipeInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, WaitPipeInfoSize); + if (WaitPipeInfo == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + /* Initialize the object attributes */ DPRINT("Opening: %wZ\n", &DevicePath); InitializeObjectAttributes(&ObjectAttributes, @@ -374,14 +384,10 @@ DPRINT1("Status: %lx\n", Status); SetLastErrorByStatus(Status); RtlFreeUnicodeString(&NamedPipeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, WaitPipeInfo); return(FALSE); } - /* Now calculate the total length of the structure and allocate it */ - WaitPipeInfoSize = FIELD_OFFSET(FILE_PIPE_WAIT_FOR_BUFFER, Name[0]) + - NewName.Length; - WaitPipeInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, WaitPipeInfoSize); - /* Check what timeout we got */ if (nTimeOut == NMPWAIT_USE_DEFAULT_WAIT) { @@ -1022,6 +1028,11 @@ /* Calculate the buffer space that we'll need and allocate it */ BufferSize = nBufferSize + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]); Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferSize); + if (Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } /* Tell the driver to seek */ Status = NtFsControlFile(hNamedPipe, _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2005-12-11 19:42:08 UTC (rev 20078) +++ trunk/reactos/lib/kernel32/file/volume.c 2005-12-11 20:04:38 UTC (rev 20079) @@ -444,7 +444,7 @@ ) { UNICODE_STRING FileSystemNameU; - UNICODE_STRING VolumeNameU; + UNICODE_STRING VolumeNameU = {0}; ANSI_STRING VolumeName; ANSI_STRING FileSystemName; PWCHAR RootPathNameW; @@ -455,11 +455,14 @@ if (lpVolumeNameBuffer) { - VolumeNameU.Length = 0; VolumeNameU.MaximumLength = nVolumeNameSize * sizeof(WCHAR); VolumeNameU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), 0, VolumeNameU.MaximumLength); + if (VolumeNameU.Buffer == NULL) + { + goto FailNoMem; + } } if (lpFileSystemNameBuffer) @@ -469,6 +472,19 @@ FileSystemNameU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), 0, FileSystemNameU.MaximumLength); + if (FileSystemNameU.Buffer == NULL) + { + if (VolumeNameU.Buffer != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + VolumeNameU.Buffer); + } + +FailNoMem: + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } } Result = GetVolumeInformationW (RootPathNameW, @@ -724,6 +740,11 @@ 0, sizeof(FILE_FS_LABEL_INFORMATION) + LabelLength); + if (LabelInfo == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } LabelInfo->VolumeLabelLength = LabelLength; memcpy(LabelInfo->VolumeLabel, lpVolumeName,

18 years, 9 months

[greatlrd] 20078: bugfix a bsod in DD_Cleanup

by greatlrd＠svn.reactos.com

bugfix a bsod in DD_Cleanup Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-11 19:36:43 UTC (rev 20077) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-11 19:42:08 UTC (rev 20078) @@ -19,16 +19,19 @@ BOOL INTERNAL_CALL DD_Cleanup(PVOID ObjectBody) -{ - if (ObjectBody == NULL) - return FALSE; - +{ PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; DPRINT1("DD_Cleanup\n"); if (!pDirectDraw) return FALSE; - + + if (pDirectDraw->Global.dhpdev == NULL) + return FALSE; + + if (pDirectDraw->DrvDisableDirectDraw == NULL) + return FALSE; + pDirectDraw->DrvDisableDirectDraw(pDirectDraw->Global.dhpdev); return TRUE; }

18 years, 9 months

[weiden] 20077: fixed converting the unicode string back to ansi in GetNamedPipeHandleStateA, also check if memory allocation failed (reported by M Bealby in bug #1110)

by weiden＠svn.reactos.com

fixed converting the unicode string back to ansi in GetNamedPipeHandleStateA, also check if memory allocation failed (reported by M Bealby in bug #1110) Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-12-11 19:30:07 UTC (rev 20076) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-12-11 19:36:43 UTC (rev 20077) @@ -905,15 +905,19 @@ LPSTR lpUserName, DWORD nMaxUserNameSize) { - UNICODE_STRING UserNameW; + UNICODE_STRING UserNameW = {0}; ANSI_STRING UserNameA; BOOL Ret; if(lpUserName != NULL) { - UserNameW.Length = 0; UserNameW.MaximumLength = nMaxUserNameSize * sizeof(WCHAR); - UserNameW.Buffer = HeapAlloc(GetCurrentProcess(), 0, UserNameW.MaximumLength); + UserNameW.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, UserNameW.MaximumLength); + if (UserNameW.Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } UserNameA.Buffer = lpUserName; UserNameA.Length = 0; @@ -930,7 +934,10 @@ if(Ret && lpUserName != NULL) { - NTSTATUS Status = RtlUnicodeStringToAnsiString(&UserNameA, &UserNameW, FALSE); + NTSTATUS Status; + + RtlInitUnicodeString(&UserNameW, UserNameW.Buffer); + Status = RtlUnicodeStringToAnsiString(&UserNameA, &UserNameW, FALSE); if(!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); @@ -940,7 +947,7 @@ if(UserNameW.Buffer != NULL) { - HeapFree(GetCurrentProcess(), 0, UserNameW.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, UserNameW.Buffer); } return Ret;

18 years, 9 months

← Newer
1
...
39
40
41
42
43
44
45
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005