Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 22378: Sync with wine.
by jimtabor＠svn.reactos.org 17 Jun '06

17 Jun '06

Author: jimtabor Date: Sat Jun 17 09:02:55 2006 New Revision: 22378 URL: http://svn.reactos.ru/svn/reactos?rev=22378&view=rev Log: Sync with wine. Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/i… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c Sat Jun 17 09:02:55 2006 @@ -53,7 +53,7 @@ HWND ICONTITLE_Create( HWND owner ) { HWND hWnd; - HINSTANCE instance = (HINSTANCE)GetWindowLongA( owner, GWL_HINSTANCE ); + HINSTANCE instance = (HINSTANCE)GetWindowLongPtrA( owner, GWLP_HINSTANCE ); LONG style = WS_CLIPSIBLINGS; if (!IsWindowEnabled(owner)) style |= WS_DISABLED; @@ -142,7 +142,7 @@ { if( GetWindowLongA( hwnd, GWL_STYLE ) & WS_CHILD ) { - hBrush = (HBRUSH) GetClassLongA(hwnd, GCL_HBRBACKGROUND); + hBrush = (HBRUSH) GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND); if( hBrush ) { INT level;

1 0

[jimtabor] 22377: Vitaly Lipatov : Fix character conversion in combo box. Which needed to be synced to wine.
by jimtabor＠svn.reactos.org 16 Jun '06

16 Jun '06

Author: jimtabor Date: Fri Jun 16 19:33:59 2006 New Revision: 22377 URL: http://svn.reactos.ru/svn/reactos?rev=22377&view=rev Log: Vitaly Lipatov : Fix character conversion in combo box. Which needed to be synced to wine. Modified: trunk/reactos/dll/win32/user32/controls/combo.c Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/c… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Fri Jun 16 19:33:59 2006 @@ -432,6 +432,10 @@ lprLB->right = lprLB->left + lphc->droppedWidth; } + /* don't allow negative window width */ + if (lprEdit->right < lprEdit->left) + lprEdit->right = lprEdit->left; + TRACE("\ttext\t= (%ld,%ld-%ld,%ld)\n", lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom); @@ -1839,6 +1843,19 @@ pcbi->hwndItem = lphc->hWndEdit; pcbi->hwndList = lphc->hWndLBox; return TRUE; +} + +static char *strdupA(LPCSTR str) +{ + char *ret; + DWORD len; + + if(!str) return NULL; + + len = strlen(str); + ret = HeapAlloc(GetProcessHeap(), 0, len + 1); + memcpy(ret, str, len + 1); + return ret; } /*********************************************************************** @@ -2068,17 +2085,33 @@ /* fall through */ #endif case CB_ADDSTRING: - { - UINT msg = LB_ADDSTRING; - if( lphc->dwStyle & CBS_LOWERCASE ) - msg = LB_ADDSTRING_LOWER; - else if( lphc->dwStyle & CBS_UPPERCASE ) - msg = LB_ADDSTRING_UPPER; - if( unicode ) - return SendMessageW(lphc->hWndLBox, msg, 0, lParam); - else - return SendMessageA(lphc->hWndLBox, msg, 0, lParam); - } + if( unicode ) + { + if( lphc->dwStyle & CBS_LOWERCASE ) + CharLowerW((LPWSTR)lParam); + else if( lphc->dwStyle & CBS_UPPERCASE ) + CharUpperW((LPWSTR)lParam); + return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); + } + else /* unlike the unicode version, the ansi version does not overwrite + the string if converting case */ + { + char *p, *string = NULL; + LRESULT ret; + if( lphc->dwStyle & CBS_LOWERCASE ) + { + string = strdupA((LPSTR)lParam); + CharLowerA(string); + } + else if( lphc->dwStyle & CBS_UPPERCASE ) + { + string = strdupA((LPSTR)lParam); + CharUpperA(string); + } + ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); + HeapFree(GetProcessHeap(), 0, string); + return ret; + } #ifndef __REACTOS__ case CB_INSERTSTRING16: wParam = (INT)(INT16)wParam; @@ -2086,17 +2119,23 @@ /* fall through */ #endif case CB_INSERTSTRING: - { - UINT msg = LB_INSERTSTRING; - if( lphc->dwStyle & CBS_LOWERCASE ) - msg = LB_INSERTSTRING_LOWER; - else if( lphc->dwStyle & CBS_UPPERCASE ) - msg = LB_INSERTSTRING_UPPER; - if( unicode ) - return SendMessageW(lphc->hWndLBox, msg, 0, lParam); + if( unicode ) + { + if( lphc->dwStyle & CBS_LOWERCASE ) + CharLowerW((LPWSTR)lParam); + else if( lphc->dwStyle & CBS_UPPERCASE ) + CharUpperW((LPWSTR)lParam); + return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); + } else - return SendMessageA(lphc->hWndLBox, msg, 0, lParam); - } + { + char *p; + if( lphc->dwStyle & CBS_LOWERCASE ) + CharLowerA((LPSTR)lParam); + else if( lphc->dwStyle & CBS_UPPERCASE ) + CharUpperA((LPSTR)lParam); + return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); + } #ifndef __REACTOS__ case CB_DELETESTRING16: #endif

1 0

[jimtabor] 22376: qingdoa daoo : Fix selection handling for listboxes with LBS_EXTENDEDSEL style. Also synced to wine.
by jimtabor＠svn.reactos.org 16 Jun '06

16 Jun '06

Author: jimtabor Date: Fri Jun 16 19:32:06 2006 New Revision: 22376 URL: http://svn.reactos.ru/svn/reactos?rev=22376&view=rev Log: qingdoa daoo : Fix selection handling for listboxes with LBS_EXTENDEDSEL style. Also synced to wine. Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/l… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Fri Jun 16 19:32:06 2006 @@ -1240,6 +1240,9 @@ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BOOL repaint ) { + if (height > MAXBYTE) + return -1; + if (!height) height = 1; if (descr->style & LBS_OWNERDRAWVARIABLE) @@ -1436,11 +1439,13 @@ /* A few sanity checks */ if (descr->style & LBS_NOSEL) return LB_ERR; - if ((last == -1) && (descr->nb_items == 0)) return LB_OKAY; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; - if (last == -1) last = descr->nb_items - 1; - if ((first < 0) || (first >= descr->nb_items)) return LB_ERR; - if ((last < 0) || (last >= descr->nb_items)) return LB_ERR; + + if (!descr->nb_items) return LB_OKAY; + + if (last == -1 || last >= descr->nb_items) last = descr->nb_items - 1; + if (first < 0) first = 0; + if (last < first) return LB_OKAY; if (on) /* Turn selection on */ { @@ -1817,7 +1822,7 @@ else if (count < descr->nb_items) { while (count < descr->nb_items) - if ((ret = LISTBOX_RemoveItem( descr, -1 )) < 0) + if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) return ret; } return LB_OKAY; @@ -1978,8 +1983,7 @@ descr->top_item + page * descr->page_size, TRUE ); break; case SB_THUMBPOSITION: - LISTBOX_SetTopItem( descr, pos*descr->page_size, - TRUE ); + LISTBOX_SetTopItem( descr, pos*descr->page_size, TRUE ); break; case SB_THUMBTRACK: info.cbSize = sizeof(info); @@ -2203,7 +2207,6 @@ /* Check Vertical scroll bar */ if (style & WS_VSCROLL) { - clientRect.right += GetSystemMetrics(SM_CXVSCROLL); if (PtInRect( &clientRect, mousePos )) nHitTestType = HTVSCROLL; @@ -3163,10 +3166,11 @@ case WM_GETDLGCODE: return DLGC_WANTARROWS | DLGC_WANTCHARS; + case WM_PRINTCLIENT: case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc = ( wParam ) ? ((HDC)wParam) : BeginPaint( hwnd, &ps ); + HDC hdc = ( wParam ) ? ((HDC)wParam) : BeginPaint( descr->self, &ps ); ret = LISTBOX_Paint( descr, hdc ); if( !wParam ) EndPaint( hwnd, &ps ); }

1 0

[janderwald] 22375: french translation by Usurp
by janderwald＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: janderwald Date: Fri Jun 16 00:50:47 2006 New Revision: 22375 URL: http://svn.reactos.ru/svn/reactos?rev=22375&view=rev Log: french translation by Usurp Added: trunk/reactos/dll/cpl/powercfg/fr.rc Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc Added: trunk/reactos/dll/cpl/powercfg/fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/fr.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/fr.rc (added) +++ trunk/reactos/dll/cpl/powercfg/fr.rc Fri Jun 16 00:50:47 2006 @@ -1,0 +1,162 @@ +// French (fr) resources by Usurp (spetreolle at users dot sourceforge dot net) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Profils d'alimentation" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7,7,28,22 + LTEXT "Choisissez le profil d'alimentation le plus approprié pour cet ordinateur. Notez que modifier les réglages suivants modifiera le profil sélectionné.", + -1,45,13,194,36 + GROUPBOX "P&rofils d'alimentation", -1, 7,57,240,46 + COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Sauvegarder sous...", -1, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Supprimer", -1, 180,85,55,15,WS_DISABLED + GROUPBOX "Inconnu", IDC_GRPDETAIL, 7,108,240,105 + LTEXT "Alimentation:",IDC_SAT,15,120,60,10 + LTEXT "Branché",IDC_SAC,100,120,45,15 + ICON IDI_AC, IDC_IAC, 75,115,25,15 + LTEXT "Sur piles",IDC_SDC,197,120,45,15 + ICON IDI_DC, IDC_IDC, 165,115,25,15 + LTEXT "Eteindre le &moniteur:",IDC_MONITOR,15,145,80,10 + COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Eteindre les d&isques durs:",IDC_DISK,15,160,80,10 + COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Mode s&tandby:",IDC_STANDBY,15,180,80,10 + COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Mise en veille du système:",IDC_HYBERNATE,15,195,80,10 + COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Alarmes" +FONT 8, "MS Sans Serif" +BEGIN + GROUPBOX "Alarme de batterie faible",-1,10,15,235,95 + CONTROL "Activer l'alarme de batterie faible quand le niveau d'énergie atteint:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15 + LTEXT "Inconnu",IDC_ALARMVALUE1,200,25,40,10 + LTEXT "0%",-1,20,40,15,15 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15 + LTEXT "100%",-1,215,40,25,10 + PUSHBUTTON "Action d'alarme...",-1,20,70,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,70,50,10 + LTEXT "Inconnu",IDC_ALARMMSG1,145,70,95,10 + LTEXT "Action:",-1,95,80,45,10 + LTEXT "Inconnu",IDC_ALARMAKTION1,145,80,95,10 + LTEXT "Lancer le Programme:",-1,95,90,50,10 + LTEXT "Inconnu",IDC_ALARMPROG1,150,90,40,10 + + GROUPBOX "Alarme de batterie Critique",-1,10,115,235,95 + CONTROL "Activer l'alarme de batterie critique quand le niveau d'énergie atteint:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15 + LTEXT "Inconnu",IDC_ALARMVALUE2,200,125,40,10 + LTEXT "0%",-1,20,140,15,15 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15 + LTEXT "100%",-1,215,140,25,10 + PUSHBUTTON "Action d'alarme...",-1,20,170,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,170,50,10 + LTEXT "Inconnu",IDC_ALARMMSG2,145,170,95,10 + LTEXT "Action:",-1,95,180,45,10 + LTEXT "Inconnu",IDC_ALARMAKTION2,145,180,95,10 + LTEXT "Lancer le Programme:",-1,95,190,50,10 + LTEXT "Inconnu",IDC_ALARMPROG2,150,190,40,10 +END + +IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avancé" +FONT 8, "MS Sans Serif" +BEGIN + ICON IDI_ACDC,IDI_ACDC,5,5,20,20 + LTEXT "Choisissez les options d'économie d'énergie que vous voulez utiliser.",-1,30,5,205,20 + GROUPBOX "Options",-1,5,35,225,55 + CONTROL "Toujours &afficher l'icone sur la barre des taches",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,45,200,10 + CONTROL "&Demander un mot de passe pour sortir de la mise en veille",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,55,200,10 + CONTROL "&Luminosité faible quand l'ordinateur est sur piles.",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,65,200,10 + GROUPBOX "Boutons d'alimentation",-1,5,100,230,105 + LTEXT "&Quand je ferme le couvercle de mon portable:", IDC_SLIDCLOSE,10,110,210,10 + COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Quand j'appuie sur le bouton Power de l'ordinateur:", IDC_SPOWERBUTTON,10,135,210,10 + COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Quand j'appuie sur le bouton Sleep de l'ordinateur:", IDC_SSLEEPBUTTON,10,165,210,10 + COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mise en veille" +FONT 8, "MS Sans Serif" +BEGIN + ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 + LTEXT "Quand votre ordinateur se met en veille, il enregistre tout ce qu'il a en memoire sur le disque dur et s'arrête. Quand votre ordinateur sort de la mise en veille, il reprend son état précédent. ", + -1,35,5,195,35 + GROUPBOX "Mise en veille",-1,5,45,235,25 + CONTROL "Activer la mise en veille",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,55,210,10 + GROUPBOX "Espace disque pour la mise en veille",-1,5,80,240,60 + LTEXT "Espace disque libre:",-1,10,90,100,10 + LTEXT "Inconnu",IDC_FREESPACE,120,90,70,10 + LTEXT "Espace disque nécessaire :",-1,10,100,115,10 + LTEXT "Inconnu",IDC_SPACEFORHIBERNATEFILE,120,100,55,10 + LTEXT "Vous devez libérer de l'espace avant que votre ordinateur se mette en veille. ",IDC_TOLESSFREESPACE,10,115,220,20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Options d'alimentation" + IDS_CPLDESCRIPTION_1 "Configure les Options d'alimentation de votre ordinateur." + IDS_PROCENT "%i%%" + IDS_SOUND "Son" + IDS_TEXT "Texte" + IDS_CONFIG1 "Réglages pour le profil d'alimentation %1" + IDS_CONFIG2 "Réglages avancés pour %1" + + IDS_SIZEBYTS "%i octets" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "Ne rien faire" + + IDS_PowerActionNone1 "Pas d'action" + IDS_PowerActionUnknown "Inconnue" + IDS_PowerActionSleep "Stand by" + IDS_PowerActionHibernate "Mettre en veille" + IDS_PowerActionShutdown "Eteindre" + IDS_PowerActionRestart "Redémarrer" + IDS_PowerActionShutdownOff "Arreter le système et éteindre" + IDS_PowerActionWarmEject "Me demander quoi faire" + IDS_PowerActionNone2 "Aucune" + + IDS_TIMEOUT1 "Après 1 min" + IDS_TIMEOUT2 "Après 2 mins" + IDS_TIMEOUT3 "Après 3 mins" + IDS_TIMEOUT4 "Après 5 mins" + IDS_TIMEOUT5 "Après 10 mins" + IDS_TIMEOUT6 "Après 15 mins" + IDS_TIMEOUT7 "Après 20 mins" + IDS_TIMEOUT8 "Après 25 mins" + IDS_TIMEOUT9 "Après 30 mins" + IDS_TIMEOUT10 "Après 45 mins" + IDS_TIMEOUT11 "Après 1 heure" + IDS_TIMEOUT12 "Après 2 heures" + IDS_TIMEOUT13 "Après 3 heures" + IDS_TIMEOUT14 "Après 4 heures" + IDS_TIMEOUT15 "Après 5 heures" + IDS_TIMEOUT16 "Jamais" +END + Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Fri Jun 16 00:50:47 2006 @@ -17,3 +17,4 @@ #include "en.rc" #include "de.rc" #include "ru.rc" +#include "fr.rc"

1 0

[janderwald] 22374: add powercfg, powerprof to bootcd
by janderwald＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: janderwald Date: Thu Jun 15 22:29:23 2006 New Revision: 22374 URL: http://svn.reactos.ru/svn/reactos?rev=22374&view=rev Log: add powercfg, powerprof to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Jun 15 22:29:23 2006 @@ -106,6 +106,7 @@ dll\cpl\main\main.cpl 1 dll\cpl\mmsys\mmsys.cpl 1 dll\cpl\ncpa\ncpa.cpl 1 +dll\cpl\powercfg\powercfg.cpl 1 dll\cpl\sysdm\sysdm.cpl 1 dll\cpl\timedate\timedate.cpl 1 @@ -191,6 +192,7 @@ dll\win32\olepro32\olepro32.dll 1 dll\win32\opengl32\opengl32.dll 1 dll\win32\psapi\psapi.dll 1 +dll\win32\powrprof\powrprof.dll 1 dll\win32\riched20\riched20.dll 1 dll\win32\richedit\riched32.dll 1 dll\win32\rpcrt4\rpcrt4.dll 1

1 0

[jimtabor] 22373: Fix functionality in WM_SHOWWINDOW. Part II of last nights patch for TWOPARAM_ROUTINE_ROS_SHOWWINDOW.
by jimtabor＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: jimtabor Date: Thu Jun 15 20:23:24 2006 New Revision: 22373 URL: http://svn.reactos.ru/svn/reactos?rev=22373&view=rev Log: Fix functionality in WM_SHOWWINDOW. Part II of last nights patch for TWOPARAM_ROUTINE_ROS_SHOWWINDOW. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/de… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Thu Jun 15 20:23:24 2006 @@ -1268,7 +1268,8 @@ case WM_SHOWWINDOW: { LONG Style; - + INT Ret = 0; + if (!lParam) return 0; Style = GetWindowLongW(hWnd, GWL_STYLE); @@ -1280,8 +1281,13 @@ return 0; if (!GetWindow(hWnd, GW_OWNER)) return 0; - NtUserCallTwoParam((DWORD) hWnd, (DWORD) wParam, TWOPARAM_ROUTINE_ROS_SHOWWINDOW); - ShowWindow(hWnd, wParam ? SW_SHOWNA : SW_HIDE); + Ret = NtUserCallTwoParam((DWORD) hWnd, (DWORD) wParam, TWOPARAM_ROUTINE_ROS_SHOWWINDOW); + if(Ret) + { + if( Ret == -1) return 0; + return Ret; + } + ShowWindow(hWnd, wParam ? SW_SHOWNOACTIVATE : SW_HIDE); break; }

1 0

[fireball] 22372: - Add russian translation by Andrey Korotaev - Fix small typo in german resources
by fireball＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: fireball Date: Thu Jun 15 20:08:32 2006 New Revision: 22372 URL: http://svn.reactos.ru/svn/reactos?rev=22372&view=rev Log: - Add russian translation by Andrey Korotaev - Fix small typo in german resources Added: trunk/reactos/dll/cpl/powercfg/ru.rc (with props) Modified: trunk/reactos/dll/cpl/powercfg/de.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc Modified: trunk/reactos/dll/cpl/powercfg/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/de.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/de.rc (original) +++ trunk/reactos/dll/cpl/powercfg/de.rc Thu Jun 15 20:08:32 2006 @@ -1,4 +1,4 @@ -// German (De) resources by Lohegrim (Lohnegrim at gmx dot net) +// German (De) resources by Lohnegrim (Lohnegrim at gmx dot net) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Thu Jun 15 20:08:32 2006 @@ -16,3 +16,4 @@ #include "en.rc" #include "de.rc" +#include "ru.rc" Added: trunk/reactos/dll/cpl/powercfg/ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/ru.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/ru.rc (added) +++ trunk/reactos/dll/cpl/powercfg/ru.rc Thu Jun 15 20:08:32 2006 @@ -1,0 +1,162 @@ +// Russian (ru) resources by Andrey Korotaev (unC0Rr(a)gmail.com) + +LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "å¥¬ë ã¯à ¢«¥¨ï ¯¨â ¨¥¬" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7,7,28,22 + LTEXT "ë¡¥à¨â¥ áå¥¬ã ã¯à ¢«¥¨ï í«¥ªâà®¯¨â ¨¥¬ á ¨¡®«¥¥ ¯®¤å®¤ïé¨¬¨ ¯ à ¬¥âà ¬¨ ¤«ï íâ®£® ª®¬¯ìîâ¥à . §¬¥¥¨¥ ¨¦¥á«¥¤ãîé¨å ¯ à ¬¥âà®¢ ¨§¬¥¨â ¢ë¡à ãî áå¥¬ã.", + -1,45,13,194,36 + GROUPBOX "&å¥¬ë ã¯à ¢«¥¨ï ¯¨â ¨¥¬", -1, 7,57,240,46 + COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "®åà ¨âì &ª ª...", -1, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&¤ «¨âì", -1, 180,85,55,15,WS_DISABLED + GROUPBOX "¥â ¤ ëå", IDC_GRPDETAIL, 7,108,240,105 + LTEXT "à¨ ¯¨â ¨¨:",IDC_SAT,15,120,60,10 + LTEXT "®â á¥â¨",IDC_SAC,100,120,45,15 + ICON IDI_AC, IDC_IAC, 75,115,25,15 + LTEXT "®â ¡ â à¥©",IDC_SDC,197,120,45,15 + ICON IDI_DC, IDC_IDC, 165,115,25,15 + LTEXT "âª«îç¨âì &¬®¨â®à:",IDC_MONITOR,15,142,80,10 + COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "âª«îç¨âì &¤¨áª¨:",IDC_DISK,15,157,80,10 + COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&¤ãé¨© à¥¦¨¬ ç¥à¥§:",IDC_STANDBY,15,177,80,10 + COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&¯ïé¨© à¥¦¨¬ ç¥à¥§:",IDC_HYBERNATE,15,192,80,10 + COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "¢¥¤®¬«¥¨ï" +FONT 8, "MS Sans Serif" +BEGIN + GROUPBOX "¨£ « ¨§ª®£® § àï¤ ¡ â à¥©",-1,10,15,235,95 + CONTROL "ª«îç¨âì á¨£ « &¨§ª®£® § àï¤ ¯à¨ ãà®¢¥:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15 + LTEXT "¥â ¤ ëå",IDC_ALARMVALUE1,200,25,40,10 + LTEXT "0%",-1,20,40,15,15 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15 + LTEXT "100%",-1,215,40,25,10 + PUSHBUTTON "&¥©áâ¢¨¥...",-1,20,70,70,15,WS_DISABLED + LTEXT "¢¥¤®¬«¥¨¥:",-1,95,70,50,10 + LTEXT "¥â ¤ ëå",IDC_ALARMMSG1,145,70,95,10 + LTEXT "¥©áâ¢¨¥:",-1,95,80,45,10 + LTEXT "¥â ¤ ëå",IDC_ALARMAKTION1,145,80,95,10 + LTEXT " ¯ãáª ¯à®£à ¬¬ë:",-1,95,90,50,10 + LTEXT "¥â ¤ ëå",IDC_ALARMPROG1,150,90,40,10 + + GROUPBOX "¨£ « ªà¨â¨ç¥áª¨ ¨§ª®£® § àï¤ ¡ â à¥©",-1,10,115,235,95 + CONTROL "ª«îç¨âì â ª®© &á¨£ « ¯à¨ ãà®¢¥:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15 + LTEXT "¥â ¤ ëå",IDC_ALARMVALUE2,200,125,40,10 + LTEXT "0%",-1,20,140,15,15 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15 + LTEXT "100%",-1,215,140,25,10 + PUSHBUTTON "¥&©áâ¢¨¥...",-1,20,170,70,15,WS_DISABLED + LTEXT "¢¥¤®¬«¥¨¥:",-1,95,170,50,10 + LTEXT "¥â ¤ ëå",IDC_ALARMMSG2,145,170,95,10 + LTEXT "¥©áâ¢¨¥:",-1,95,180,45,10 + LTEXT "¥â ¤ ëå",IDC_ALARMAKTION2,145,180,95,10 + LTEXT " ¯ãáª ¯à®£à ¬¬ë:",-1,95,190,50,10 + LTEXT "¥â ¤ ëå",IDC_ALARMPROG2,150,190,40,10 +END + +IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "®¯®«¨â¥«ì®" +FONT 8, "MS Sans Serif" +BEGIN + ICON IDI_ACDC,IDI_ACDC,5,5,20,20 + LTEXT "ë¡¥à¨â¥ ¦¥« ¥¬ë¥ ¯ à ¬¥âàë í¥à£®á¡¥à¥¦¥¨ï.",-1,30,5,205,20 + GROUPBOX " à ¬¥âàë",-1,5,35,225,55 + CONTROL "&á¥£¤ ®â®¡à ¦ âì § ç®ª ¯ ¥«¨ § ¤ ç",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,48,200,10 + CONTROL "& ¯à è¨¢ âì ¯ à®«ì ¯à¨ ¢ëå®¤¥ ¨§ ¦¤ãé¥£® à¥¦¨¬ ",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,60,200,10 + CONTROL "&¨§¨âì ïàª®áâì ¬®¨â®à ¯à¨ à ¡®â¥ ®â ¡ â à¥©",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,72,200,10 + GROUPBOX "®¯ª¨ ¯¨â ¨ï",-1,5,100,230,105 + LTEXT "&à¨ § ªàëâ¨¨ ªàëèª¨ ¯¥à¥®á®£® ª®¬¯ìîâ¥à :", IDC_SLIDCLOSE,10,110,210,10 + COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "à¨ & ¦ â¨¨ ª®¯ª¨ ¢ª«îç¥¨ï ¯¨â ¨ï ª®¬¯ìîâ¥à :", IDC_SPOWERBUTTON,10,140,210,10 + COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "à¨ ¦ â¨¨ &ª®¯ª¨ ¯¥à¥å®¤ ¢ á¯ïé¨© à¥¦¨¬:", IDC_SSLEEPBUTTON,10,170,210,10 + COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "¯ïé¨© à¥¦¨¬" +FONT 8, "MS Sans Serif" +BEGIN + ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 + LTEXT "à¨ ¯¥à¥å®¤¥ ¢ á¯ïé¨© à¥¦¨¬ ª®¬¯ìîâ¥à ¯¥à¥®á¨â á®¤¥à¦¨¬®¥ ®¯¥à â¨¢®© ¯ ¬ïâ¨ ¤¨áª ¨ ¢ëª«îç ¥âáï. à¨ ¢ëå®¤¥ ¨§ á¯ïé¥£® à¥¦¨¬ ª®¬¯ìîâ¥à ¢®§¢à é ¥âáï ¢ ¯à¥¦¥¥ á®áâ®ï¨¥.", + -1,35,5,195,35 + GROUPBOX "¯ïé¨© à¥¦¨¬",-1,5,45,235,25 + CONTROL "& §à¥è¨âì ¯¥à¥å®¤ ¢ á¯ïé¨© à¥¦¨¬",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,55,210,10 + GROUPBOX "¥áâ® ¤¨áª¥ ¤«ï ¯¥à¥å®¤ ¢ á¯ïé¨© à¥¦¨¬",-1,5,80,240,60 + LTEXT "¢®¡®¤® ¬¥áâ ¤¨áª¥:",-1,10,90,100,10 + LTEXT "¥â ¤ ëå",IDC_FREESPACE,130,90,70,10 + LTEXT "à¥¡ã¥âáï ¤«ï á¯ïé¥£® à¥¦¨¬ :",-1,10,100,115,10 + LTEXT "¥â ¤ ëå",IDC_SPACEFORHIBERNATEFILE,130,100,55,10 + LTEXT "«ï ¢®§¬®¦®áâ¨ ¯¥à¥å®¤ ¢ á¯ïé¨© à¥¦¨¬ âà¥¡ã¥âáï ®á¢®¡®¤¨âì ¬¥áâ® ¤¨áª¥.",IDC_TOLESSFREESPACE,10,115,220,20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "«¥ªâà®¯¨â ¨¥" + IDS_CPLDESCRIPTION_1 " áâà®©ª ¯ à ¬¥âà®¢ í¥à£®á¡¥à¥¦¥¨ï ¤«ï ª®¬¯ìîâ¥à ." + IDS_PROCENT "%i%%" + IDS_SOUND "¢ãª" + IDS_TEXT "¥ªáâ" + IDS_CONFIG1 " à ¬¥âàë áå¥¬ë %1" + IDS_CONFIG2 "®¯®«¨â¥«ìë¥ ¯ à ¬¥âàë áå¥¬ë %1" + + IDS_SIZEBYTS "%i ¡ ©â" + IDS_SIZEMB "%i " + + IDS_NOACTION "Do nothing" + + IDS_PowerActionNone1 "¥©áâ¢¨¥ ¥ âà¥¡ã¥âáï" + IDS_PowerActionUnknown "¥â ¤ ëå" + IDS_PowerActionSleep "¤ãé¨© à¥¦¨¬" + IDS_PowerActionHibernate "¯ïé¨© à¥¦¨¬" + IDS_PowerActionShutdown " ¢¥àè¥¨¥ à ¡®âë" + IDS_PowerActionRestart "¥à¥§ £àã§ª " + IDS_PowerActionShutdownOff " ¢¥àè¥¨¥ à ¡®âë ¨ ¢ëª«îç¥¨¥ ¯¨â ¨ï" + IDS_PowerActionWarmEject "¯à®á¨âì ® ã¦®¬ ¤¥©áâ¢¨¨" + IDS_PowerActionNone2 "âáãâáâ¢ã¥â" + + IDS_TIMEOUT1 "ç¥à¥§ 1 ¬¨" + IDS_TIMEOUT2 "ç¥à¥§ 2 ¬¨" + IDS_TIMEOUT3 "ç¥à¥§ 3 ¬¨" + IDS_TIMEOUT4 "ç¥à¥§ 5 ¬¨" + IDS_TIMEOUT5 "ç¥à¥§ 10 ¬¨" + IDS_TIMEOUT6 "ç¥à¥§ 15 ¬¨" + IDS_TIMEOUT7 "ç¥à¥§ 20 ¬¨" + IDS_TIMEOUT8 "ç¥à¥§ 25 ¬¨" + IDS_TIMEOUT9 "ç¥à¥§ 30 ¬¨" + IDS_TIMEOUT10 "ç¥à¥§ 45 ¬¨" + IDS_TIMEOUT11 "ç¥à¥§ 1 ç á" + IDS_TIMEOUT12 "ç¥à¥§ 2 ç á " + IDS_TIMEOUT13 "ç¥à¥§ 3 ç á " + IDS_TIMEOUT14 "ç¥à¥§ 4 ç á " + IDS_TIMEOUT15 "ç¥à¥§ 5 ç á®¢" + IDS_TIMEOUT16 "¨ª®£¤ " +END + Propchange: trunk/reactos/dll/cpl/powercfg/ru.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 22371: use SUBLANG_ENGLISH_US spotted by Usurp
by janderwald＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: janderwald Date: Thu Jun 15 19:53:52 2006 New Revision: 22371 URL: http://svn.reactos.ru/svn/reactos?rev=22371&view=rev Log: use SUBLANG_ENGLISH_US spotted by Usurp Modified: trunk/reactos/dll/cpl/powercfg/en.rc Modified: trunk/reactos/dll/cpl/powercfg/en.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/en.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/en.rc (original) +++ trunk/reactos/dll/cpl/powercfg/en.rc Thu Jun 15 19:53:52 2006 @@ -1,6 +1,6 @@ // English (en) resources by Lohegrim (Lohnegrim at gmx dot net) -LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

1 0

[fireball] 22370: Add code to query volume for its filesystem type
by fireball＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: fireball Date: Thu Jun 15 19:00:37 2006 New Revision: 22370 URL: http://svn.reactos.ru/svn/reactos?rev=22370&view=rev Log: Add code to query volume for its filesystem type Modified: trunk/reactos/base/system/autochk/autochk.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/autochk/autochk… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c (original) +++ trunk/reactos/base/system/autochk/autochk.c Thu Jun 15 19:00:37 2006 @@ -3,16 +3,25 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/autochk/autochk.c * PURPOSE: Filesystem checker - * PROGRAMMERS: Eric Kohl + * PROGRAMMERS: Aleksey Bragin + * Eric Kohl */ /* INCLUDES *****************************************************************/ + +//#define NDEBUG +#include <debug.h> #include <stdio.h> #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> + +/* DEFINES ******************************************************************/ + +#define FS_ATTRIBUTE_BUFFER_SIZE (MAX_PATH * sizeof(WCHAR) + sizeof(FILE_FS_ATTRIBUTE_INFORMATION)) + /* FUNCTIONS ****************************************************************/ @@ -45,6 +54,97 @@ RtlFreeUnicodeString(&UnicodeString); } +// this func is taken from kernel32/file/volume.c +HANDLE +OpenDirectory(LPCWSTR DirName, + BOOLEAN Write) +{ + UNICODE_STRING NtPathU; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE hFile; + + if (!RtlDosPathNameToNtPathName_U(DirName, + &NtPathU, + NULL, + NULL)) + { + DPRINT1("Invalid path!\n"); + return INVALID_HANDLE_VALUE; + } + + InitializeObjectAttributes( + &ObjectAttributes, + &NtPathU, + Write ? FILE_WRITE_ATTRIBUTES : FILE_READ_ATTRIBUTES, + NULL, + NULL); + + Status = NtCreateFile( + &hFile, + Write ? FILE_GENERIC_WRITE : FILE_GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathU.Buffer); + + if (!NT_SUCCESS(Status)) + { + return INVALID_HANDLE_VALUE; + } + + return hFile; +} + +NTSTATUS +GetFileSystem(LPCWSTR Drive, + LPWSTR FileSystemName, + ULONG FileSystemNameSize) +{ + HANDLE FileHandle; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute; + UCHAR Buffer[FS_ATTRIBUTE_BUFFER_SIZE]; + + FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; + + FileHandle = OpenDirectory(Drive, FALSE); + if (FileHandle == INVALID_HANDLE_VALUE) + return STATUS_INVALID_PARAMETER; + + Status = NtQueryVolumeInformationFile(FileHandle, + &IoStatusBlock, + FileFsAttribute, + FS_ATTRIBUTE_BUFFER_SIZE, + FileFsAttributeInformation); + NtClose(FileHandle); + + if (NT_SUCCESS(Status)) + { + if (FileSystemNameSize * sizeof(WCHAR) >= FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) + { + memcpy(FileSystemName, + FileFsAttribute->FileSystemName, + FileFsAttribute->FileSystemNameLength); + FileSystemName[FileFsAttribute->FileSystemNameLength / sizeof(WCHAR)] = 0; + } + else + return STATUS_BUFFER_TOO_SMALL; + } + else + return Status; + + return STATUS_SUCCESS; +} /* Native image's entry point */ int @@ -57,8 +157,17 @@ PROCESS_DEVICEMAP_INFORMATION DeviceMap; ULONG i; NTSTATUS Status; - - PrintString("Autochk 0.0.1\n"); + WCHAR FileSystem[128]; + WCHAR DrivePath[128]; + + PrintString("Autochk 0.0.2\n"); + + // Win2003 passes the only param - "*". Probably means to check all drives + /* + DPRINT("Got %d params\n", argc); + for (i=0; i<argc; i++) + DPRINT("Param %d: %s\n", i, argv[i]); + */ Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessDeviceMap, @@ -73,13 +182,34 @@ if ((DeviceMap.Query.DriveMap & (1 << i)) && (DeviceMap.Query.DriveType[i] == DOSDEVICE_DRIVE_FIXED)) { - PrintString(" Checking drive %c:", 'A'+i); - PrintString(" OK\n"); + swprintf(DrivePath, L"%c:\\", 'A'+i); + Status = GetFileSystem(DrivePath, + FileSystem, + sizeof(FileSystem)); + PrintString(" Checking drive %c: \n", 'A'+i); + + if (NT_SUCCESS(Status)) + { + PrintString(" Filesystem type "); + DisplayString(FileSystem); + PrintString("\n"); + PrintString(" OK\n"); + } + else + { + DPRINT1("Error getting FS information, Status=0x%08X\n", + Status); + } } } PrintString("\n"); return 0; } + else + { + DPRINT1("NtQueryInformationProcess() failed with status=0x%08X\n", + Status); + } return 1; }

1 0

[janderwald] 22369: * add powrprof regression tests * developed by Alex Wurzinger, Johannes Anderwald & Martin Rottensteiner
by janderwald＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: janderwald Date: Thu Jun 15 18:50:42 2006 New Revision: 22369 URL: http://svn.reactos.ru/svn/reactos?rev=22369&view=rev Log: * add powrprof regression tests * developed by Alex Wurzinger, Johannes Anderwald & Martin Rottensteiner Added: trunk/reactos/regtests/winetests/powrprof/ trunk/reactos/regtests/winetests/powrprof/powrprof.rbuild (with props) trunk/reactos/regtests/winetests/powrprof/pwrprof.c (with props) trunk/reactos/regtests/winetests/powrprof/testlist.c (with props) Modified: trunk/reactos/regtests/winetests/directory.rbuild Modified: trunk/reactos/regtests/winetests/directory.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/director… ============================================================================== --- trunk/reactos/regtests/winetests/directory.rbuild (original) +++ trunk/reactos/regtests/winetests/directory.rbuild Thu Jun 15 18:50:42 2006 @@ -26,6 +26,9 @@ <directory name="psapi"> <xi:include href="psapi/psapi.rbuild" /> </directory> +<directory name="powrprof"> + <xi:include href="powrprof/powrprof.rbuild" /> +</directory> <directory name="setupapi"> <xi:include href="setupapi/setupapi.rbuild" /> </directory> Added: trunk/reactos/regtests/winetests/powrprof/powrprof.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/powrprof… ============================================================================== --- trunk/reactos/regtests/winetests/powrprof/powrprof.rbuild (added) +++ trunk/reactos/regtests/winetests/powrprof/powrprof.rbuild Thu Jun 15 18:50:42 2006 @@ -1,0 +1,10 @@ +<module name="powrprof_winetest" type="win32cui" installbase="bin" installname="powrprof_winetest.exe" allowwarnings="true"> + <include base="setupapi_winetest">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>ntdll</library> + <library>powrprof</library> + <file>testlist.c</file> + <file>pwrprof.c</file> +</module> Propchange: trunk/reactos/regtests/winetests/powrprof/powrprof.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/regtests/winetests/powrprof/pwrprof.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/powrprof… ============================================================================== --- trunk/reactos/regtests/winetests/powrprof/pwrprof.c (added) +++ trunk/reactos/regtests/winetests/powrprof/pwrprof.c Thu Jun 15 18:50:42 2006 @@ -1,0 +1,1093 @@ +#include<stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#define STANDALONE +#include "wine/test.h" +#include "winternl.h" +#include "windef.h" +#include "winbase.h" +#include "powrprof.h" +#include "assert.h" + +#include "wine/unicode.h" +/* + LONG WINAPI RegOpenCurrentUser(REGSAM a,PHKEY b) + { + *b = HKEY_CURRENT_USER; + return ERROR_SUCCESS; + } + */ +unsigned int g_NumPwrSchemes = 0; +unsigned int g_NumPwrSchemesEnumerated = 0; +unsigned int g_ActivePwrScheme = 3; +unsigned int g_TempPwrScheme = 99; + +typedef struct _PROCESSOR_POWER_INFORMATION { + ULONG Number; + ULONG MaxMhz; + ULONG CurrentMhz; + ULONG MhzLimit; + ULONG MaxIdleState; + ULONG CurrentIdleState; +} PROCESSOR_POWER_INFORMATION, +*PPROCESSOR_POWER_INFORMATION; + +POWER_POLICY g_PowerPolicy; + +static const WCHAR szMachPowerPoliciesSubKey[] = { 'S', 'O', 'F', 'T', 'W', 'A', 'R', + 'E', '\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', 'n', 'd', + 'o', 'w', 's', '\\', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'V', 'e', 'r', 's', 'i', + 'o', 'n', '\\', 'C', 'o', 'n', 't', 'r', 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', + 'e', 'r', '\\', 'P', 'o', 'w', 'e', 'r', 'C', 'f', 'g', '\\', 'P', 'o', 'w', 'e', + 'r', 'P', 'o', 'l', 'i', 'c', 'i', 'e', 's', 0}; + +static const WCHAR szTempPwrScheme[] = { '9', '9', 0 }; + +ULONG DbgPrint(PCH X,...) +{ + return (ULONG)NULL; +} + +void test_CallNtPowerInformation(void) +{ + DWORD retval; + ADMINISTRATOR_POWER_POLICY apolicy; + ULONGLONG atime, ctime; + PROCESSOR_POWER_INFORMATION ppi, *pppi; + PROCESSOR_POWER_POLICY ppp; + SYSTEM_BATTERY_STATE sbs; + SYSTEM_POWER_CAPABILITIES spc; + SYSTEM_POWER_INFORMATION spi; + SYSTEM_POWER_POLICY spp; + HANDLE x=NULL; + + /* AdministratorPowerPolicy tests */ + retval = CallNtPowerInformation(AdministratorPowerPolicy, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(AdministratorPowerPolicy, 0, 0, &apolicy, sizeof(ADMINISTRATOR_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(AdministratorPowerPolicy, &apolicy, sizeof(ADMINISTRATOR_POWER_POLICY), 0, 0); + ok(retval != STATUS_PRIVILEGE_NOT_HELD, "Privileg not held!!!! more errors to expect"); + ok(retval == STATUS_SUCCESS, "function expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* LastSleepTime tests */ + retval = CallNtPowerInformation(LastSleepTime, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(LastSleepTime, &atime, sizeof(sizeof(ULONGLONG)), 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(LastSleepTime, &atime, sizeof(ULONGLONG), &ctime, sizeof(ULONGLONG)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(LastSleepTime, 0, 0, &atime, sizeof(ULONGLONG)); + ok(retval == STATUS_SUCCESS, "function expected STATUS_SUCCESS but got %d\n",(UINT)retval); + + /* LastWakeTime tests */ + retval = CallNtPowerInformation(LastWakeTime, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(LastWakeTime, &atime, sizeof(sizeof(ULONGLONG)), 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(LastWakeTime, &atime, sizeof(ULONGLONG), &ctime, sizeof(ULONGLONG)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(LastWakeTime, 0, 0, &atime, sizeof(ULONGLONG)); + ok(retval == STATUS_SUCCESS, "function expected STATUS_SUCCESS but got %d\n",(UINT)retval); + + /* ProcessorInformation tests */ + retval = CallNtPowerInformation(ProcessorInformation, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorInformation, 0, 0, &ppi, sizeof(PROCESSOR_POWER_INFORMATION)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorInformation, &ppi, sizeof(PROCESSOR_POWER_INFORMATION), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorInformation, &ppi, sizeof(PROCESSOR_POWER_INFORMATION), &ppi, sizeof(PROCESSOR_POWER_INFORMATION)); + + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorInformation, 0, 0, &pppi, sizeof(PPROCESSOR_POWER_INFORMATION)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorInformation, &pppi, sizeof(PPROCESSOR_POWER_INFORMATION), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorInformation, &pppi, sizeof(PPROCESSOR_POWER_INFORMATION), &pppi, sizeof(PPROCESSOR_POWER_INFORMATION)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* ProcessorPowerPolicyAc tests */ + retval = CallNtPowerInformation(ProcessorPowerPolicyAc, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorPowerPolicyAc, 0, 0, &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorPowerPolicyAc, &ppp, sizeof(PROCESSOR_POWER_POLICY), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorPowerPolicyAc, &ppp, sizeof(PROCESSOR_POWER_POLICY), &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* ProcessorPowerPolicyCurrent tests */ + retval = CallNtPowerInformation(ProcessorPowerPolicyCurrent, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorPowerPolicyCurrent, 0, 0, &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorPowerPolicyCurrent, &ppp, sizeof(PROCESSOR_POWER_POLICY), 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorPowerPolicyCurrent, &ppp, sizeof(PROCESSOR_POWER_POLICY), &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + + /* ProcessorPowerPolicyDc tests */ + retval = CallNtPowerInformation(ProcessorPowerPolicyDc, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorPowerPolicyDc, 0, 0, &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorPowerPolicyDc, &ppp, sizeof(PROCESSOR_POWER_POLICY), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorPowerPolicyDc, &ppp, sizeof(PROCESSOR_POWER_POLICY), &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* SystemBatteryState tests */ + retval = CallNtPowerInformation(SystemBatteryState, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemBatteryState, 0, 0, &sbs, sizeof(SYSTEM_BATTERY_STATE)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemBatteryState, &sbs, sizeof(SYSTEM_BATTERY_STATE), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemBatteryState, &sbs, sizeof(SYSTEM_BATTERY_STATE), &sbs, sizeof(SYSTEM_BATTERY_STATE)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* SystemExecutionState tests */ + retval = CallNtPowerInformation(SystemExecutionState, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* SystemPowerCapabilities tests */ + retval = CallNtPowerInformation(SystemPowerCapabilities, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerCapabilities, 0, 0, &spc, sizeof(SYSTEM_POWER_CAPABILITIES)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerCapabilities, &spc, sizeof(SYSTEM_POWER_CAPABILITIES), 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerCapabilities, &spc, sizeof(SYSTEM_POWER_CAPABILITIES), &spc, sizeof(SYSTEM_POWER_CAPABILITIES)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + + /* SystemPowerInformation tests */ + retval = CallNtPowerInformation(SystemPowerInformation, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerInformation, 0, 0, &spi, sizeof(SYSTEM_POWER_INFORMATION)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerInformation, &spi, sizeof(SYSTEM_POWER_INFORMATION), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerInformation, &spi, sizeof(SYSTEM_POWER_INFORMATION), &spi, sizeof(SYSTEM_POWER_INFORMATION)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerInformation, &spp, sizeof(SYSTEM_POWER_POLICY), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerInformation, &spp, sizeof(SYSTEM_POWER_POLICY), &spi, sizeof(SYSTEM_POWER_INFORMATION)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* SystemPowerPolicyAc tests */ + retval = CallNtPowerInformation(SystemPowerPolicyAc, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerPolicyAc, 0, 0, &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerPolicyAc, &spp, sizeof(SYSTEM_POWER_POLICY), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerPolicyAc, &spp, sizeof(SYSTEM_POWER_POLICY), &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* SystemPowerPolicyCurrent tests */ + retval = CallNtPowerInformation(SystemPowerPolicyCurrent, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerPolicyCurrent, 0, 0, &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerPolicyCurrent, &spp, sizeof(SYSTEM_POWER_POLICY), 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerPolicyCurrent, &spp, sizeof(SYSTEM_POWER_POLICY), &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + + /* SystemPowerPolicyDc tests */ + retval = CallNtPowerInformation(SystemPowerPolicyDc, 0, 0, 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerPolicyDc, 0, 0, &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerPolicyDc, &spp, sizeof(SYSTEM_POWER_POLICY), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerPolicyDc, &spp, sizeof(SYSTEM_POWER_POLICY), &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* SystemReserveHiberFile tests */ +/* + retval = CallNtPowerInformation(SystemReserveHiberFile, 0, 0, 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %ld\n", retval); + bln=TRUE; + retval = CallNtPowerInformation(SystemReserveHiberFile, &bln, sizeof(bln), 0, 0); + ok(retval == STATUS_DISK_FULL, "function result wrong expected STATUS_DISK_FULL but got %ld\n", nret); + bln=FALSE; + retval = CallNtPowerInformation(SystemReserveHiberFile, &bln, sizeof(bln), 0, 0); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %ld\n", nret); + + bln2=TRUE; + nret = CallNtPowerInformation(SystemReserveHiberFile, 0, 0, &bln2, sizeof(bln2)); + ok(nret == STATUS_DATATYPE_MISALIGNMENT, "function result wrong expected STATUS_DATATYPE_MISALIGNMENT but got %ld\n", nret); + bln2=FALSE; + nret = CallNtPowerInformation(SystemReserveHiberFile, 0, 0, &bln2, sizeof(bln2)); + ok(nret == STATUS_DATATYPE_MISALIGNMENT, "function result wrong expected STATUS_DATATYPE_MISALIGNMENT but got %ld\n", nret); + + bln=TRUE; + bln2=TRUE; + nret = CallNtPowerInformation(SystemReserveHiberFile, &bln, sizeof(bln), &bln2, sizeof(bln2)); + ok(nret == STATUS_DATATYPE_MISALIGNMENT, "function result wrong expected STATUS_DATATYPE_MISALIGNMENT but got %ld\n", nret); + bln2=FALSE; + nret = CallNtPowerInformation(SystemReserveHiberFile, &bln, sizeof(bln), &bln2, sizeof(bln2)); + ok(nret == STATUS_DATATYPE_MISALIGNMENT, "function result wrong expected STATUS_DATATYPE_MISALIGNMENT but got %ld\n", nret); + bln=FALSE; + bln2=TRUE; + nret = CallNtPowerInformation(SystemReserveHiberFile, &bln, sizeof(bln), &bln2, sizeof(bln2)); + ok(nret == STATUS_DATATYPE_MISALIGNMENT, "function result wrong expected STATUS_DATATYPE_MISALIGNMENT but got %ld\n", nret); + bln2=FALSE; + nret = CallNtPowerInformation(SystemReserveHiberFile, &bln, sizeof(bln), &bln2, sizeof(bln2)); + ok(nret == STATUS_DATATYPE_MISALIGNMENT, "function result wrong expected STATUS_DATATYPE_MISALIGNMENT but got %ld\n", nret); + */ + + /* VerifyProcessorPowerPolicyAc tests */ + retval = CallNtPowerInformation(VerifyProcessorPowerPolicyAc, 0, 0, 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifyProcessorPowerPolicyAc, 0, 0, &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifyProcessorPowerPolicyAc, &ppp, sizeof(PROCESSOR_POWER_POLICY), 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifyProcessorPowerPolicyAc, &ppp, sizeof(PROCESSOR_POWER_POLICY), &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* VerifyProcessorPowerPolicyDc tests */ + retval = CallNtPowerInformation(VerifyProcessorPowerPolicyDc, 0, 0, 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifyProcessorPowerPolicyDc, 0, 0, &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifyProcessorPowerPolicyDc, &ppp, sizeof(PROCESSOR_POWER_POLICY), 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifyProcessorPowerPolicyDc, &ppp, sizeof(PROCESSOR_POWER_POLICY), &ppp, sizeof(PROCESSOR_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* VerifySystemPolicyAc tests */ + retval = CallNtPowerInformation(VerifySystemPolicyAc, 0, 0, 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifySystemPolicyAc, 0, 0, &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifySystemPolicyAc, &spp, sizeof(SYSTEM_POWER_POLICY), 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifySystemPolicyAc, &spp, sizeof(SYSTEM_POWER_POLICY), &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* VerifySystemPolicyDc tests */ + retval = CallNtPowerInformation(VerifySystemPolicyDc, 0, 0, 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifySystemPolicyDc, 0, 0, &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifySystemPolicyDc, &spp, sizeof(SYSTEM_POWER_POLICY), 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(VerifySystemPolicyDc, &spp, sizeof(SYSTEM_POWER_POLICY), &spp, sizeof(SYSTEM_POWER_POLICY)); + ok(retval == STATUS_SUCCESS, "function result wrong expected STATUS_SUCCESS but got %d\n", (UINT)retval); + + /* SystemPowerStateHandler tests */ + retval = CallNtPowerInformation(SystemPowerStateHandler, 0, 0, 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerStateHandler, 0, 0, x, sizeof(HANDLE)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + + /* ProcessorStateHandler tests */ + retval = CallNtPowerInformation(ProcessorStateHandler, 0, 0, 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorStateHandler, 0, 0, x, sizeof(HANDLE)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + + /* ProcessorStateHandler2 tests */ + retval = CallNtPowerInformation(ProcessorStateHandler2, 0, 0, 0, 0); + ok(retval == STATUS_ACCESS_DENIED, "function result wrong expected STATUS_ACCESS_DENIED but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(ProcessorStateHandler2, 0, 0, x, sizeof(HANDLE)); + ok(retval == STATUS_ACCESS_DENIED, "function result wrong expected STATUS_ACCESS_DENIED but got %d\n", (UINT)retval); + + /* SystemPowerStateNotifyHandler tests */ + retval = CallNtPowerInformation(SystemPowerStateNotifyHandler, 0, 0, 0, 0); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + retval = CallNtPowerInformation(SystemPowerStateNotifyHandler, 0, 0, x, sizeof(HANDLE)); + ok(retval == STATUS_INVALID_PARAMETER, "function result wrong expected STATUS_INVALID_PARAMETER but got %d\n", (UINT)retval); + +} + +/* + @implemented + */ +void test_CanUserWritePwrScheme(void) +{ + DWORD error, retval; + + retval = CanUserWritePwrScheme(); + + error = GetLastError(); + + if (retval) + ok(retval, "function failed?"); + else + ok(error == ERROR_ACCESS_DENIED, "function last error wrong expected ERROR_ACCESS_DENIED but got %d\n", (UINT)error); + +} +BOOLEAN CALLBACK test_callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPWSTR sName, DWORD dwDesc, + LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam ) +{ + ok(uiIndex == g_NumPwrSchemes, "expected power scheme index of %d but got %d\n", g_NumPwrSchemes, uiIndex); + g_NumPwrSchemes++; + + ok(lParam == 0xDEADBEEF, "expected function lParam to be 0xDEADBEEF but got %d\n", (UINT)lParam); + + return TRUE; +} + +BOOLEAN CALLBACK test_callback_stop_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPWSTR sName, DWORD dwDesc, + LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam ) +{ + ok((!uiIndex || g_NumPwrSchemesEnumerated + 1 == uiIndex), "expected power scheme %d but got %d\n",g_NumPwrSchemesEnumerated+1, uiIndex); + g_NumPwrSchemesEnumerated = uiIndex; + + ok(uiIndex <= (UINT)lParam, "enumeration should have already been stopped at index %d current index %d\n", (UINT)lParam, uiIndex); + if (uiIndex == (UINT)lParam) + return FALSE; + else + return TRUE; +} + +void test_DeletePwrScheme(void) +{ + DWORD retval; + HKEY hSubKey = NULL; + + + /* + * try inexistant profile number, should fail + */ + + retval = DeletePwrScheme(0xFFFFFFFF); + ok(!retval, "function should have failed error %x\n",(UINT)GetLastError()); + + /* + * delete active power scheme, should fail + */ + + retval = GetActivePwrScheme(&g_ActivePwrScheme); + ok(retval, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + retval = DeletePwrScheme(g_ActivePwrScheme); + ok(!retval, "function should have failed\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "function should have failed with ERROR_ACCESS_DENIED but got %x\n", (UINT)GetLastError()); + + /* + * delete a temporarly created power scheme + */ + retval = DeletePwrScheme(g_TempPwrScheme); + ok(retval, "function should have succeeded\n"); + +/* + * clean up, delete illegal entry, witch was created for this test + */ + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, szMachPowerPoliciesSubKey, &hSubKey) == ERROR_SUCCESS) + { + if (RegDeleteKeyW(hSubKey, szTempPwrScheme) != STATUS_SUCCESS) + printf("failed to delete subkey %i (testentry)\n", g_TempPwrScheme); + RegCloseKey(hSubKey); + } + +} + +void test_EnumPwrSchemes(void) +{ + BOOLEAN retval; + + /* + * test EnumPwrScheme with null pointer callback + */ + + retval = EnumPwrSchemes(0, 0); + ok(!retval, "function was expected to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER but got %x\n",(UINT)GetLastError()); + + /* + * enumerate power schemes, should succeed + */ + + retval = EnumPwrSchemes(test_callback_EnumPwrScheme, 0xDEADBEEF); + ok(retval, "function was expected to succeed %d\n",retval); + ok(g_NumPwrSchemes, "Warning: no power schemes available\n"); + + /* + * stop enumeration after first power scheme + */ + + retval = EnumPwrSchemes(test_callback_stop_EnumPwrScheme, (LPARAM)0); + ok(!retval, "function was expected to false\n"); + + /* + * enumerate half of all avalailble profiles + */ + + g_NumPwrSchemesEnumerated = 0; + retval = EnumPwrSchemes(test_callback_stop_EnumPwrScheme, (LPARAM)g_NumPwrSchemes / 2); + ok(retval, "function was expected to succeed but got %i\n", (UINT)retval); + ok(g_NumPwrSchemesEnumerated == g_NumPwrSchemes / 2, "function did not enumerate requested num of profiles %d enumerated %d\n", g_NumPwrSchemes / 2, g_NumPwrSchemesEnumerated); + + +} + +void test_GetSetActivePwrScheme(void) +{ + DWORD retval; + UINT current_scheme = 2; + UINT temp_scheme = 0; + + /* + * read active power scheme + */ + + retval = GetActivePwrScheme(&g_ActivePwrScheme); + + ok(retval, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + ok(retval <= g_NumPwrSchemes, "expected index lower as power scheme count %d but got %d\n", g_NumPwrSchemes, g_ActivePwrScheme); + + /* + * sets active power scheme to inexistant profile + * -> corrupts power scheme enumeration on Windows XP SP2 + */ + //corrupts registry + //retval = SetActivePwrScheme(0xFFFFFFFF, 0, 0); + //ok(!retval, "function was expected to fail"); + //current_scheme = min(active_scheme+1, g_NumPwrSchemes-1); + + /* + * sets the active power scheme to profile with index 0 + */ + + retval = SetActivePwrScheme(current_scheme, 0, 0); + ok(retval, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + /* + * read back the active power scheme + */ + + retval = GetActivePwrScheme(&temp_scheme); + ok(retval, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + ok(temp_scheme == current_scheme, "expected %d but got %d\n", (UINT)current_scheme, (UINT)temp_scheme); + + /* + * restore previous active power scheme + */ + + retval = SetActivePwrScheme(g_ActivePwrScheme, 0, 0); + ok(retval, "Warning: failed to restore old active power scheme %d\n", (UINT)g_ActivePwrScheme); +} + +void test_GetCurrentPowerPolicies(void) +{ + GLOBAL_POWER_POLICY gpp; + POWER_POLICY pp; + BOOLEAN ret; + UINT current_scheme = 2; + + g_ActivePwrScheme=3; + ret = GetActivePwrScheme(&g_ActivePwrScheme); + + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + ret = SetActivePwrScheme(0, &gpp, 0); + + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(0, 0, &pp); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(0, &gpp, &pp); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(current_scheme, &gpp, 0); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(current_scheme, 0, &pp); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(current_scheme, &gpp, &pp); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(g_ActivePwrScheme, 0, 0); + ok(ret, "Warning: failed to restore old active power scheme %d\n", (UINT)g_ActivePwrScheme); + + ret = GetCurrentPowerPolicies(0,0); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = GetCurrentPowerPolicies(&gpp,0); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = GetCurrentPowerPolicies(0,&pp); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = GetCurrentPowerPolicies(&gpp,&pp); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + ok(gpp.mach.Revision == 1,"Global Mach Revision was expected to be 1 got %i",(UINT)gpp.mach.Revision); + ok(gpp.user.Revision == 1,"Global User Revision was expected to be 1 got %i",(UINT)gpp.mach.Revision); + ok(pp.mach.Revision == 1,"Mach Revision was expected to be 1 got %i",(UINT)gpp.mach.Revision); + ok(pp.user.Revision == 1,"User Revision was expected to be 1 got %i",(UINT)gpp.mach.Revision); + + + ret = GetActivePwrScheme(&g_ActivePwrScheme); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(0, &gpp, 0); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(0, 0, &pp); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(0, &gpp, &pp); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(current_scheme, &gpp, 0); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(current_scheme, 0, &pp); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(current_scheme, &gpp, &pp); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + + ret = SetActivePwrScheme(g_ActivePwrScheme, 0, 0); + ok(ret, "Warning: failed to restore old active power scheme %d\n", (UINT)g_ActivePwrScheme); + +} + +void test_GetPwrCapabilities(void) +{ + SYSTEM_POWER_CAPABILITIES spc; + BOOLEAN ret; + + ret = GetPwrCapabilities(0); + ok(!ret, "function was expected to fail\n"); + if (!ret) + { + ok(GetLastError() == ERROR_INVALID_PARAMETER,"function was expectet to return ERROR_INVALID_PARAMETER, but returns: %x\n",(UINT)GetLastError()); + } + ret = GetPwrCapabilities(&spc); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); +} + +void test_GetPwrDiskSpindownRange(void) +{ + DWORD retval; + UINT min = 0; + UINT max = 0; + + /* + * invalid parameter checks + */ + + retval = GetPwrDiskSpindownRange(NULL, NULL); + ok(!retval, "function was expected to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected error ERROR_INVALID_PARAMETER but got %x\n", (UINT)GetLastError()); + + retval = GetPwrDiskSpindownRange(&max, NULL); + ok(!retval, "function was expected to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected error ERROR_INVALID_PARAMETER but got %x\n", (UINT)GetLastError()); + + retval = GetPwrDiskSpindownRange(NULL, &min); + ok(!retval, "function was expected to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected error ERROR_INVALID_PARAMETER but got %x\n", (UINT)GetLastError()); + + /* + * read disk spindown range + */ + + retval = GetPwrDiskSpindownRange(&max, &min); + ok(retval, "function was expected to succeed error %x\n",(UINT)GetLastError()); + ok(min <= max, "range mismatch min %d max %d\n",min, max); +} + +void test_IsAdminOverrideActive(void) +{ + ADMINISTRATOR_POWER_POLICY app; + BOOLEAN ret; + + ret = IsAdminOverrideActive(0); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + + ret = IsAdminOverrideActive(&app); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + + app.MinSleep = 0; + app.MaxSleep = 0; + app.MinVideoTimeout = 0; + app.MaxVideoTimeout = 0; + app.MinSpindownTimeout = 0; + app.MaxSpindownTimeout = 0; + + ret = IsAdminOverrideActive(&app); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + + app.MinSleep = 1; + app.MaxSleep = 2; + app.MinVideoTimeout = 3; + app.MaxVideoTimeout = 4; + app.MinSpindownTimeout = 5; + app.MaxSpindownTimeout = 6; + + ret = IsAdminOverrideActive(&app); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + +} + +void test_IsPwrHibernateAllowed(void) +{ +/* + BOOLEAN ret; + + ret = IsPwrHibernateAllowed(); + ok(!ret, "function was expected to fail, error %x\n",(UINT)GetLastError()); + */ +} + +void test_IsPwrShutdownAllowed(void) +{ +/* + BOOLEAN ret; + + ret = IsPwrShutdownAllowed(); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + */ +} + +void test_IsPwrSuspendAllowed(void) +{ +/* + BOOLEAN ret; + + ret = IsPwrSuspendAllowed(); + ok(ret, "function was expected to succed, error %x\n",(UINT)GetLastError()); + */ +} + +void test_ReadGlobalPwrPolicy(void) +{ + GLOBAL_POWER_POLICY gpp; + BOOLEAN ret; + + ret = ReadGlobalPwrPolicy(&gpp); + ok(ret, "function was expected to succeed, error %x\n",(UINT)GetLastError()); + ok(gpp.mach.Revision == 1,"Global Mach Revision was expected to be 1 got %i",(UINT)gpp.mach.Revision); + ok(gpp.user.Revision == 1,"Global User Revision was expected to be 1 got %i",(UINT)gpp.mach.Revision); + + + +} + +void test_ReadProcessorPwrScheme(void) +{ + MACHINE_PROCESSOR_POWER_POLICY mppp; + BOOLEAN ret; + UINT i = 0; + DWORD err; + + do + { + RtlZeroMemory(&mppp, sizeof(MACHINE_PROCESSOR_POWER_POLICY)); + ret = ReadProcessorPwrScheme(i,&mppp); + if (ret) + { + ok(mppp.Revision == 1,"Main Revision was expected to be 1 got %i",(UINT)mppp.Revision); + ok(mppp.ProcessorPolicyAc.Revision == 1,"PowerAC Revision was expected to be 1 got %i",(UINT)mppp.ProcessorPolicyAc.Revision); + ok(mppp.ProcessorPolicyDc.Revision == 1,"PowerDC Revision was expected to be 1 got %i",(UINT)mppp.ProcessorPolicyDc.Revision); + } + else + { + err = GetLastError(); + ok(err == 0,"Failed Error %x\n",(UINT)err); + return; + } + i++; + if (i == g_NumPwrSchemes) + return; + } while (TRUE); + +} + +void test_ReadPwrScheme(void) +{ + DWORD retval; + + /* + * read power scheme with null pointer -> crashs on Windows XP SP2 + */ + //retval = ReadPwrScheme(0, NULL); + //ok(!retval, "function was expected to fail\n"); + //ok(GetLastError() == STATUS_INVALID_PARAMETER, "expected error ... but got %x\n", GetLastError()); + + /* + * read a power scheme with an invalid index, leads to the creation of the key + * -> corrupts power scheme enumeration + */ + //retval = ReadPwrScheme(0xFFFFFFFF, &powerPolicy); + //ok(!retval, "function was expected to fail\n"); + //ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error ERROR_ACCESS_DENIED but got %x\n", GetLastError()); + + /* + * read current active power scheme + */ + + retval = ReadPwrScheme(g_ActivePwrScheme, &g_PowerPolicy); + ok(retval, "function was expected to succeed error %x\n",(UINT)GetLastError()); + +} + +void test_SetSuspendState(void) +{ +// SetSuspendState(FALSE,FALSE,FALSE) +} + +void test_ValidatePowerPolicies(void) +{ + GLOBAL_POWER_POLICY gpp; + POWER_POLICY pp; + BOOLEAN ret; + + SetLastError(0); + ret = ValidatePowerPolicies(0,0); + ok(ret, "function was expected to succeed error %i\n",(UINT)GetLastError()); + + ret = ValidatePowerPolicies(&gpp,0); + ok(!ret, "function was expected to fail return %i\n",(UINT)ret); + ok(GetLastError() == ERROR_REVISION_MISMATCH,"function was expected to fail with ERROR_REVISION_MISMATCH(%i,%i), but error :%i\n",(UINT)gpp.user.Revision,(UINT)gpp.mach.Revision,(UINT)GetLastError()); + + ret = ValidatePowerPolicies(0,&pp); + ok(!ret, "function was expected to fail return %i\n",(UINT)ret); + ok(GetLastError() == ERROR_REVISION_MISMATCH,"function was expected to fail with ERROR_REVISION_MISMATCH, but error :%i\n",(UINT)GetLastError()); + + ret = ValidatePowerPolicies(&gpp,&pp); + ok(!ret, "function was expected to fail return %i\n",(UINT)ret); + ok(GetLastError() == ERROR_REVISION_MISMATCH,"function was expected to fail with ERROR_REVISION_MISMATCH, but error :%i\n",(UINT)GetLastError()); + + gpp.user.Revision = 1; + gpp.mach.Revision = 1; + + ret = ValidatePowerPolicies(&gpp,0); + ok(!ret, "function was expected to fail return %i\n",(UINT)ret); + ok(GetLastError() == ERROR_INVALID_DATA,"function was expected to fail with ERROR_INVALID_DATA, but error :%i\n",(UINT)GetLastError()); + + gpp.mach.LidOpenWakeAc = PowerSystemWorking; + gpp.mach.LidOpenWakeDc = PowerSystemWorking; + + ret = ValidatePowerPolicies(&gpp,0); + ok(!ret, "function was expected to fail return %i\n",(UINT)ret); + ok(GetLastError() == ERROR_INVALID_DATA,"function was expected to fail with ERROR_INVALID_DATA, but error :%i\n",(UINT)GetLastError()); + + gpp.user.PowerButtonAc.Action = PowerActionNone; + gpp.user.PowerButtonDc.Action = PowerActionNone; + gpp.user.SleepButtonAc.Action = PowerActionNone; + gpp.user.SleepButtonDc.Action = PowerActionNone; + gpp.user.LidCloseAc.Action = PowerActionNone; + gpp.user.LidCloseDc.Action = PowerActionNone; + + gpp.user.DischargePolicy[0].Enable=FALSE; + gpp.user.DischargePolicy[1].Enable=FALSE; + gpp.user.DischargePolicy[2].Enable=FALSE; + gpp.user.DischargePolicy[3].Enable=FALSE; + gpp.user.DischargePolicy[4].Enable=FALSE; + ret = ValidatePowerPolicies(&gpp,0); + ok(ret, "function was expected to succeed return %i\n",(UINT)GetLastError()); + if (!ret) + { + ok(GetLastError() == ERROR_INVALID_DATA,"function was expected to fail with ERROR_INVALID_DATA, but error :%i\n",(UINT)GetLastError()); + } + + pp.user.Revision = 1; + pp.mach.Revision = 1; + + ret = ValidatePowerPolicies(0,&pp); + ok(!ret, "function was expected to fail return %i\n",(UINT)ret); + ok(GetLastError() == ERROR_INVALID_DATA || GetLastError() == ERROR_GEN_FAILURE,"function was expected to fail with ERROR_GEN_FAILURE or ERROR_INVALID_DATA, but error :%i\n",(UINT)GetLastError()); + + pp.mach.MinSleepAc = PowerSystemWorking; + pp.mach.MinSleepDc = PowerSystemWorking; + pp.mach.ReducedLatencySleepAc = PowerSystemWorking; + pp.mach.ReducedLatencySleepDc = PowerSystemWorking; + pp.mach.OverThrottledAc.Action = PowerActionNone; + pp.mach.OverThrottledDc.Action = PowerActionNone; + + pp.user.IdleAc.Action = PowerActionWarmEject+1; + pp.user.IdleDc.Action = PowerActionNone-1; + pp.user.MaxSleepAc = PowerSystemMaximum+1; + pp.user.MaxSleepDc = PowerSystemUnspecified; + + ret = ValidatePowerPolicies(0,&pp); + ok(!ret, "function was expected to fail return %i\n",(UINT)GetLastError()); + if (!ret) + { + ok(GetLastError() == ERROR_INVALID_DATA,"function was expected to fail with ERROR_INVALID_DATA, but error :%i\n",(UINT)GetLastError()); + } + + pp.user.IdleAc.Action = PowerActionNone; + pp.user.IdleDc.Action = PowerActionNone; + pp.user.MaxSleepAc = PowerSystemWorking; + pp.user.MaxSleepDc = PowerSystemWorking; + + ret = ValidatePowerPolicies(0,&pp); + ok(ret, "function was expected to succeed, error %i\n",(UINT)GetLastError()); + if (!ret) + { + ok(GetLastError() == ERROR_GEN_FAILURE,"function was expected to fail with ERROR_GEN_FAILURE, but error :%i\n",(UINT)GetLastError()); + } + + ret = ValidatePowerPolicies(&gpp,&pp); + ok(ret, "function was expected to succeed, error %i\n",(UINT)GetLastError()); + if (!ret) + { +// ok(GetLastError() == ERROR_GEN_FAILURE,"function was expected to fail with ERROR_GEN_FAILURE, but error :%i\n",(UINT)GetLastError()); + } + + + ret = GetCurrentPowerPolicies(&gpp,&pp); + ok(ret, "function was expected to succeed error %i\n",(UINT)GetLastError()); + + ret = ValidatePowerPolicies(&gpp,0); + ok(ret, "function was expected to succeed error %i\n",(UINT)GetLastError()); + + ret = ValidatePowerPolicies(0,&pp); + ok(ret, "function was expected to succeed error %i\n",(UINT)GetLastError()); + + ret = ValidatePowerPolicies(&gpp,&pp); + ok(ret, "function was expected to succeed error %i\n",(UINT)GetLastError()); + +} + +void test_WriteGlobalPwrPolicy(void) +{ +// WriteGlobalPwrPolicy(&gpp); +} + +void test_WriteProcessorPwrScheme(void) +{ +// WriteProcessorPwrScheme(0,&mppp); +} + +void test_WritePwrScheme(void) +{ + DWORD retval; + static const WCHAR szTestSchemeName[] = {'P','o','w','r','p','r','o','f',0}; + static const WCHAR szTestSchemeDesc[] = {'P','o','w','r','p','r','o','f',' ','S','c','h','e','m','e',0}; + + /* + * create a temporarly profile, will be deleted in test_DeletePwrScheme + */ + + retval = WritePwrScheme(&g_TempPwrScheme, (LPWSTR)szTestSchemeName, (LPWSTR)szTestSchemeDesc, &g_PowerPolicy); + ok(retval, "Warning: function should have succeeded\n"); +} + +void func_power(void) +{ + test_CallNtPowerInformation(); + test_CanUserWritePwrScheme(); + test_EnumPwrSchemes(); + test_GetSetActivePwrScheme(); + test_ReadPwrScheme(); + test_WritePwrScheme(); + test_DeletePwrScheme(); + test_GetPwrDiskSpindownRange(); + + test_GetCurrentPowerPolicies(); + + test_GetPwrCapabilities(); + test_IsAdminOverrideActive(); + test_IsPwrHibernateAllowed(); + test_IsPwrShutdownAllowed(); + test_IsPwrSuspendAllowed(); + test_ReadGlobalPwrPolicy(); + test_ReadProcessorPwrScheme(); + test_SetSuspendState(); + test_ValidatePowerPolicies(); + test_WriteGlobalPwrPolicy(); + test_WriteProcessorPwrScheme(); + +} + +void func_ros_init(void) +{ + HKEY hUser, hKeyPowrCfg, hKeyGlobalPowrPol, hKeyPowerPolicies, hKeytmp; + DWORD err; + GLOBAL_USER_POWER_POLICY gupp; + GLOBAL_MACHINE_POWER_POLICY gmpp; + USER_POWER_POLICY upp; + MACHINE_POWER_POLICY mpp; + MACHINE_PROCESSOR_POWER_POLICY mppp; + GLOBAL_POWER_POLICY gpp; + POWER_POLICY pp; + + int i; + + static const WCHAR szUserPowrCfgKey[] = { 'C', 'o', 'n', 't', 'r', 'o', 'l', ' ', + 'P', 'a', 'n', 'e', 'l', '\\', 'P', 'o', 'w', 'e', 'r', 'C', 'f', 'g', 0}; + + static const WCHAR szCurrentPowerPolicy[] = {'C', 'u', 'r', 'r', 'e', 'n', 't', 'P', + 'o', 'w', 'e', 'r', 'P', 'o', 'l', 'i', 'c', 'y', 0}; + static const WCHAR szcpp[] = {'3', 0 }; + + static const WCHAR szGlobalPowerPolicy[] = { 'G', 'l', 'o', 'b', 'a', 'l', 'P', 'o', + 'w', 'e', 'r', 'P', 'o', 'l', 'i', 'c', 'y', 0}; + static const WCHAR szPolicies[] = {'P', 'o', 'l', 'i', 'c', 'i', 'e', 's', 0}; + static const WCHAR szPowerPolicies[] = { 'P', 'o', 'w', 'e', 'r', 'P', 'o', 'l', 'i', + 'c', 'i', 'e', 's', 0}; + + static const WCHAR szProcessorPolicies[] = { 'P', 'r', 'o', 'c', 'e', 's', 's', 'o', 'r', + 'P', 'o', 'l', 'i', 'c', 'i', 'e', 's', 0}; + + static const WCHAR szcName[] = {'N', 'a', 'm', 'e', 0}; + static const WCHAR szcDescription[] = {'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'i', 'o', 'n', 0}; + + static WCHAR szName[] = {'N', 'a', 'm', 'e', '(', '0', ')', 0}; + static WCHAR szDescription[] = {'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'i', 'o', 'n', '(', '0', ')', 0}; + + static const WCHAR szMachPowrCfgKey[] = {'S', 'O', 'F', 'T', 'W', 'A', 'R', 'E', '\\', 'M', 'i', + 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', 'n', 'd', 'o', 'w', 's', '\\', 'C', 'u', + 'r', 'r', 'e', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'C', 'o', 'n', 't', 'r', + 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', 'e', 'r', '\\', 'P', 'o', 'w', 'e', 'r', 'C', 'f', 'g', 0}; + + static const WCHAR szLastID[] = {'L', 'a', 's', 't', 'I', 'D', 0}; + static const WCHAR szDiskSpinDownMax[] = {'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'D', 'o', 'w', 'n', 'M', 'a', 'x', 0}; + static const WCHAR szDiskSpinDownMin[] = {'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'D', 'o', 'w', 'n', 'M', 'i', 'n', 0}; + + static const WCHAR szLastIDValue[] = {'5', 0}; + static const WCHAR szDiskSpinDownMaxValue[] = {'3', '6', '0', '0', 0}; + static const WCHAR szDiskSpinDownMinValue[] = {'3', 0}; + + WCHAR tmp[20]; + /* + * Erstelle die Registry-struktur und Daten, welche dafür erforderlich ist damit diese Tests funktionieren + */ + + /* + * User + */ + err = RegOpenCurrentUser(KEY_ALL_ACCESS,&hUser); + ok(err == ERROR_SUCCESS,"Öffnen des Aktuellen Users Fehlgeschlagen\n"); + if (err == ERROR_SUCCESS) + { + err = RegCreateKey(hUser,szUserPowrCfgKey,&hKeyPowrCfg); + ok(err == ERROR_SUCCESS,"Create Key UserPowrCfg failed with error %i\n",(UINT)err); + ok(hKeyPowrCfg != NULL,"Erstellen des Eintrages Powercfg fehlgeschalgen\n"); + err = RegSetValueExW(hKeyPowrCfg,szCurrentPowerPolicy,(DWORD)NULL,REG_SZ,(CONST BYTE *)szcpp,strlenW(szcpp)*sizeof(WCHAR)); + ok(err == ERROR_SUCCESS,"Set Value CurrentPowerPolicy failed with error %i\n",(UINT)err); + err = RegCreateKey(hKeyPowrCfg,szGlobalPowerPolicy,&hKeyGlobalPowrPol); + ok(err == ERROR_SUCCESS,"Create Key GlobalPowerPolicy failed with error %i\n",(UINT)err); + gupp.Revision = 1; + gupp.PowerButtonAc.Action = PowerActionNone; + gupp.PowerButtonDc.Action = PowerActionNone; + gupp.SleepButtonAc.Action = PowerActionNone; + gupp.SleepButtonDc.Action = PowerActionNone; + gupp.LidCloseAc.Action = PowerActionNone; + gupp.LidCloseDc.Action = PowerActionNone; + for (i=0; i<NUM_DISCHARGE_POLICIES; i++) + { + gupp.DischargePolicy[0].Enable=FALSE; + } + + err = RegSetValueExW(hKeyGlobalPowrPol,szPolicies,(DWORD)NULL,REG_BINARY,(CONST BYTE *)&gupp,sizeof(GLOBAL_USER_POWER_POLICY)); + ok(err == ERROR_SUCCESS,"Set Value GlobalPowrPol failed with error %i\n",(UINT)err); + err = RegCloseKey(hKeyGlobalPowrPol); + ok(err == ERROR_SUCCESS,"Close Key GlobalPowrPol failed with error %i\n",(UINT)err); + err = RegCreateKey(hKeyPowrCfg,szPowerPolicies,&hKeyPowerPolicies); + ok(err == ERROR_SUCCESS,"Create Key PowerPolicies failed with error %i\n",(UINT)err); + + upp.Revision = 1; + upp.IdleAc.Action = PowerActionNone; + upp.IdleDc.Action = PowerActionNone; + upp.MaxSleepAc = PowerSystemWorking; + upp.MaxSleepDc = PowerSystemWorking; + upp.VideoTimeoutAc = 0; + upp.VideoTimeoutDc = 0; + upp.SpindownTimeoutAc = 0; + upp.SpindownTimeoutDc = 0; + + for (i = 0; i<6; i++) + { + _itow(i,tmp,10); + err = RegCreateKey(hKeyPowerPolicies,tmp,&hKeytmp); + ok(err == ERROR_SUCCESS,"Create Key PowerPolicies(%i) failed with error %i\n",i,(UINT)err); + szName[5]++; + szDescription[12]++; + err = RegSetValueExW(hKeytmp,szcName,(DWORD)NULL,REG_SZ,(CONST BYTE *)szName,strlenW(szName)*sizeof(WCHAR)); + err = RegSetValueExW(hKeytmp,szcDescription,(DWORD)NULL,REG_SZ,(CONST BYTE *)szDescription,strlenW(szDescription)*sizeof(WCHAR)); + err = RegSetValueExW(hKeytmp,szPolicies,(DWORD)NULL,REG_BINARY,(CONST BYTE *)&upp,sizeof(USER_POWER_POLICY)); + err = RegCloseKey(hKeytmp); + } + err = RegCloseKey(hKeyPowerPolicies); + err = RegCloseKey(hKeyPowrCfg); + err = RegCloseKey(hUser); + } + + /* + * Mach + */ + err = RegCreateKey(HKEY_LOCAL_MACHINE,szMachPowrCfgKey,&hKeyPowrCfg); + ok(err == ERROR_SUCCESS,"Create Key MachPowrCfgKey failed with error %i\n",(UINT)err); + err = RegSetValueExW(hKeyPowrCfg,szLastID,(DWORD)NULL,REG_SZ,(CONST BYTE *)szLastIDValue,strlenW(szLastIDValue)*sizeof(WCHAR)); + err = RegSetValueExW(hKeyPowrCfg,szDiskSpinDownMax,(DWORD)NULL,REG_SZ,(CONST BYTE *)szDiskSpinDownMaxValue,strlenW(szDiskSpinDownMaxValue)*sizeof(WCHAR)); + err = RegSetValueExW(hKeyPowrCfg,szDiskSpinDownMin,(DWORD)NULL,REG_SZ,(CONST BYTE *)szDiskSpinDownMinValue,strlenW(szDiskSpinDownMinValue)*sizeof(WCHAR)); + + err = RegCreateKey(hKeyPowrCfg,szGlobalPowerPolicy,&hKeyGlobalPowrPol); + ok(err == ERROR_SUCCESS,"Create Key Mach GlobalPowerPolicy failed with error %i\n",(UINT)err); + gmpp.Revision = 1; + gmpp.LidOpenWakeAc = PowerSystemWorking; + gmpp.LidOpenWakeDc = PowerSystemWorking; + gmpp.BroadcastCapacityResolution=0; + + err = RegSetValueExW(hKeyGlobalPowrPol,szPolicies,(DWORD)NULL,REG_BINARY,(CONST BYTE *)&gmpp,sizeof(GLOBAL_MACHINE_POWER_POLICY)); + + err = RegCloseKey(hKeyGlobalPowrPol); + err = RegCreateKey(hKeyPowrCfg,szPowerPolicies,&hKeyPowerPolicies); + ok(err == ERROR_SUCCESS,"Create Key Mach PowerPolicies failed with error %i\n",(UINT)err); + + mpp.Revision = 1; + mpp.MinSleepAc = PowerSystemWorking; + mpp.MinSleepDc = PowerSystemWorking; + mpp.ReducedLatencySleepAc = PowerSystemWorking; + mpp.ReducedLatencySleepDc = PowerSystemWorking; + mpp.OverThrottledAc.Action = PowerActionNone; + mpp.OverThrottledDc.Action = PowerActionNone; + mpp.DozeS4TimeoutAc=0; + mpp.DozeS4TimeoutDc=0; + + for (i = 0; i<6; i++) + { + _itow(i,tmp,10); + err = RegCreateKey(hKeyPowerPolicies,tmp,&hKeytmp); + ok(err == ERROR_SUCCESS,"Create Key Mach PowerPolicies(%i) failed with error %i\n",(UINT)i,(UINT)err); + err = RegSetValueExW(hKeytmp,szPolicies,(DWORD)NULL,REG_BINARY,(CONST BYTE *)&mpp,sizeof(MACHINE_POWER_POLICY)); + err = RegCloseKey(hKeytmp); + } + err = RegCloseKey(hKeyPowerPolicies); + + err = RegCreateKey(hKeyPowrCfg,szProcessorPolicies,&hKeyPowerPolicies); + ok(err == ERROR_SUCCESS,"Create Key Mach ProcessorPolicies failed with error %i\n",(UINT)err); + + mppp.Revision = 1; + mppp.ProcessorPolicyAc.Revision = 1; + mppp.ProcessorPolicyDc.Revision = 1; + + for (i = 0; i<6; i++) + { + _itow(i,tmp,10); + err = RegCreateKey(hKeyPowerPolicies,tmp,&hKeytmp); + ok(err == ERROR_SUCCESS,"Create Key Mach ProcessorPolicies(%i) failed with error %i\n",i,(UINT)err); + err = RegSetValueExW(hKeytmp,szPolicies,(DWORD)NULL,REG_BINARY,(CONST BYTE *)&mppp,sizeof(MACHINE_PROCESSOR_POWER_POLICY)); + err = RegCloseKey(hKeytmp); + } + err = RegCloseKey(hKeyPowerPolicies); + + err = RegCloseKey(hKeyPowrCfg); + + err = GetCurrentPowerPolicies(&gpp,&pp); + ok(err, "function was expected to succeed error %i\n",(UINT)GetLastError()); + + err = ValidatePowerPolicies(&gpp,&pp); + ok(err, "function was expected to succeed error %i\n",(UINT)GetLastError()); + + /* + [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\PowerCfg\GlobalPowerPolicy] + "CursorProperties"=... + + */ + +} Propchange: trunk/reactos/regtests/winetests/powrprof/pwrprof.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/regtests/winetests/powrprof/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/powrprof… ============================================================================== --- trunk/reactos/regtests/winetests/powrprof/testlist.c (added) +++ trunk/reactos/regtests/winetests/powrprof/testlist.c Thu Jun 15 18:50:42 2006 @@ -1,0 +1,27 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +/* stdarg.h is needed for Winelib */ +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include "windef.h" +#include "winbase.h" + +struct test +{ + const char *name; + void (*func)(void); +}; + +extern void func_power(void); +extern void func_ros_init(void); + +const struct test winetest_testlist[] = +{ + { "power", func_power }, + { "ros_init", func_ros_init }, + { 0, 0 } +}; + +#define WINETEST_WANT_MAIN +#include "wine/test.h" Propchange: trunk/reactos/regtests/winetests/powrprof/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

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